ocpview-plus 1.3.2 → 1.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocpview-plus",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "title": "ocpviewPlus",
   "description": "A high quality Service UI components Library with Vue.js",
   "homepage": "",

package/src/components/masterplate/approval.vue

@@ -109,6 +109,9 @@
                                 <span class="status">{{item.act_status_name}}</span>
                             </p>
                             <div>
+                                <p v-if="index === auditLog.length - 1 && item.candidateUserList && item.candidateUserList.length > 0" class="desc">
+                                    待审批人：<span>{{ getCandidateUserText(item.candidateUserList) }}</span>
+                                </p>
                                 <span>{{item.act_time_}}</span>
                                 <p class="desc">意见：<span v-text="getMessage(item.message)"></span></p>
                             </div>
@@ -354,6 +357,7 @@ export default {
             if (data.procinfo && data.procinfo.proclist) {
                 let result = data.procinfo.proclist || [];
                 let copylist = [];
+                let candidateUserList = [];
                 if (data.procinfo.cc && data.procinfo.cc.length > 0) {
                     data.procinfo.cc.forEach(item => {
                         let tmp = {};
@@ -363,13 +367,26 @@ export default {
                         copylist.push(tmp);
                     });
                 }
-                result.forEach(item => {
+                if (data.procinfo && data.procinfo.flowerProgress) {
+                    if (data.procinfo.flowerProgress.length > 0) {
+                        let lastflowerProgress = data.procinfo.flowerProgress[data.procinfo.flowerProgress.length - 1];
+                        if (lastflowerProgress && lastflowerProgress.candidateUserList) {
+                            candidateUserList = lastflowerProgress.candidateUserList;
+                        }
+                    }
+
+                }
+                result.forEach((item, index) => {
                     item.active = false;
                     item.tasklist.forEach(list => {
                         if (list.usernam) {
                             list.userName = list.username.substr(-2, 2);
                         }
                     });
+                    // 判断是否是最后一个item，添加candidateUserList
+                    if (index === result.length - 1) {
+                        item.candidateUserList = candidateUserList;
+                    }
                 });
                
 
@@ -409,6 +426,13 @@ export default {
         '.billrepeal',
         {billno: this.value.billno},
         (data) => {
+            // // 方式1：通过事件  没有生效
+            // this.$emit('approvalOk', '');
+            
+            // 方式2：直接调用父组件方法（兜底）
+            if (this.$parent && typeof this.$parent.approvalOk === 'function') {
+                this.$parent.approvalOk();
+            }
             this.alert(data.msg,null,3);
             this.showDrawer = false;
         }
@@ -426,6 +450,13 @@ export default {
                 '.billreject' ,
                 para,
                 (data) => {
+                    // // 方式1：通过事件  没有生效
+                    // this.$emit('approvalOk', '');
+                    
+                    // 方式2：直接调用父组件方法（兜底）
+                    if (this.$parent && typeof this.$parent.approvalOk === 'function') {
+                        this.$parent.approvalOk();
+                    }
                     this.showDrawer = false;
                     this.alert(data.msg,null,3);
                 }
@@ -449,6 +480,13 @@ export default {
                 param.comment = this.idea;
             }
             this.doPost('.billsubmit', param, (data) => {
+                // // 方式1：通过事件  没有生效
+                // this.$emit('approvalOk', '');
+                
+                // 方式2：直接调用父组件方法（兜底）
+                if (this.$parent && typeof this.$parent.approvalOk === 'function') {
+                    this.$parent.approvalOk();
+                }
                 this.showDrawer = false;
                 this.$nextTick(() =>{
                     setTimeout(() => {
@@ -462,6 +500,13 @@ export default {
                 '.billapproval',
                 {billno: this.value.billno,comment: this.idea},
                 (data) => {
+                    // // 方式1：通过事件  没有生效
+                    // this.$emit('approvalOk', '');
+                    
+                    // 方式2：直接调用父组件方法（兜底）
+                    if (this.$parent && typeof this.$parent.approvalOk === 'function') {
+                        this.$parent.approvalOk();
+                    }
                     this.showDrawer = false;
                     this.alert(data.msg,null,3);
                 });
@@ -670,6 +715,13 @@ export default {
         },
         selectTypeChange() {
             this.clearUser();
+        },
+        // 提前所有待审批人姓名
+        getCandidateUserText(candidateUserList) {
+            if (!candidateUserList || candidateUserList.length === 0) return '';
+            // 提取所有待审批人姓名
+            let approvers = candidateUserList.map(user => user.userName).join('、');
+            return approvers;
         }
     },
     mounted () {

package/src/components/masterplate/contractappendix.vue

@@ -9,12 +9,6 @@
         </p>
         <div style="padding-left:24px">
             <Divider v-if="showTitle" style="margin-top:0px;margin-bottom:10px;"/>
-<!--            <Row v-show="showGrid" type="flex" justify="start" align="middle" :gutter="0" style="margin-bottom:10px;">-->
-<!--                <Button v-if="loadFlag" customIcon="iconfont icon-custom-fileupload" :disabled="btnReadOnly"-->
-<!--                        @click="editGrid">上传-->
-<!--                </Button>-->
-<!--                <Button v-else :loading="true">{{ loadingtext }}</Button>-->
-<!--            </Row>-->
             <Upload v-show="false" id="billiviewUp"
                     multiple
                     ref="billupload"
@@ -63,6 +57,8 @@ export default {
             myConfig: {
                 headStyle: '',
                 readOnly: false,
+                showAddBtn:true,
+                showDelBatchBtn:true,
                 downfile: '',
                 delfile: '',
                 pdffile: '/mss-sysconf-boot/downloadPdf?filekey=',
@@ -90,27 +86,35 @@ export default {
                     name: 'filememo',
                     type: 'ComboBox',
                     dictkey: 'CUSTFILETYPE',
-                    visible: false,
+                    codeWithName: false,
+                    width: 300,
+                    readOnly: true
                 }, {
                     label: '附件类型',
                     name: 'filemode',
                     type: 'TextBox',
                     width: 300,
+                    visible: false,
+                    readOnly: true
                 }, {
                     label: '文件名称',
                     name: 'filename',
-                    type: 'TextBox'
+                    type: 'TextBox',
+                    width: 200,
+                    readOnly: true
                 }, {
                     label: '文件大小',
                     name: 'filesize',
                     render: this.sizeActionRender,
-                    width: 120
+                    width: 120,
+                    readOnly: true
                 }, {
                     label: '上传日期',
                     name: 'ph_timestamp',
                     type: 'DateBox',
                     vtype: 'datetime',
-                    width: 200
+                    width: 150,
+                    readOnly: true
                 }, {
                     label: '操作',
                     key: 'action',
@@ -182,8 +186,11 @@ export default {
         if (!this.myConfig.pdffile) {
             this.myConfig.pdffile = this.OmdUrl.pdffile;
         }
-        this.myConfig.showAddBtn = false;
-        this.myConfig.showDelBatchBtn = false;
+        if (this.myConfig.showTitle !== undefined) {
+            this.showTitle = this.myConfig.showTitle;
+        }
+        // this.myConfig.showAddBtn = true;
+        // this.myConfig.showDelBatchBtn = true;
         this.myConfig.generalOrientation = true;
         if (this.myConfig.fileSize !== undefined) {
             this.fileSize = Number(this.myConfig.fileSize) * 1024;
@@ -450,7 +457,7 @@ export default {
             let obj = {};
             obj.readOnly = value;
             this.setPro(obj);
-            this.$refs.grid.setReadOnly(true);
+            this.$refs.grid.setReadOnly(value);
             this.setBtnReadOnly(value);
         },
         showTxt (params) {
@@ -633,8 +640,7 @@ export default {
             } else {
                 this.btnReadOnly = value;
             }
-        }
-
+        },
     }
 };
 </script>

package/src/components/masterplate/detailgridbox.vue

@@ -0,0 +1,386 @@
+<template>
+<Card :bordered="false" :padding="0" dis-hover>
+    <p  @click="toggle" style="cursor:pointer;" >
+        <Row  type="flex" :gutter="0"  justify="start" align="middle" style="margin-bottom:14px;margin-top:14px;">
+            <Col span="18">
+            <Icon custom='iconfont icon-custom-pack' color="#f3b352" v-show="showForm" size="14" /><Icon  v-show="!showForm" color="#f3b352" custom='iconfont icon-custom-spread' size="14"/>
+                 <span style="margin-left:10px;font-size: 14px;font-weight:bold" v-text="myConfig.title" />
+            </Col>
+            <Col  v-show="showForm"  span="6">
+            <Row  type="flex" justify="end" :gutter="0"  align="middle">
+                <Dropdown  placement="bottom-start"  style="float:right">
+                    <Button style="height:21px" type="info">
+                        更多操作
+                        <Icon type="ios-arrow-down"></Icon>
+                    </Button>
+                    <template #list>
+                        <DropdownMenu>
+                            <DropdownItem>
+                                <Button  @click.stop="openForm" >全部展开</Button>
+                            </DropdownItem>
+                                <DropdownItem >
+                                <Button   @click.stop="closeForm">全部收起</Button>
+                            </DropdownItem>
+                        </DropdownMenu>
+                    </template>
+                </Dropdown>
+            </Row>
+            </Col>
+        </Row>
+    </p>
+    <Divider style="margin-left:24px;margin-bottom:10px;margin-top: 0px;"/>
+    <div style="margin-left:24px;" v-show="showForm" >
+        <Row style="margin-bottom:10px;">
+            <Button  style="padding-left:0px;padding-right:0px" customIcon="iconfont icon-custom-rowadd3"  type="text"  :disabled="btnReadOnly" @click="add" >添加</Button>
+        </Row>
+        <FormDetail v-if="showAdd" ref="addform" :config="myConfig" :isAdd="true"   @doAction="newDoAction" :dictData="dictData"/>
+        <FormDetail v-for="(temp,index) in data"  :ref="temp.curlIndex" :key="temp.curlIndex"  :valueData="temp" :curlIndex="temp.curlIndex" :index="index"  :config="myConfig"  @doAction="doAction" :dictData="dictData"/>
+    </div>
+</Card>
+</template>
+
+<script>
+import FormDetail from './formdetailtwo.vue';
+import random from '../../utils/random_str';
+export default {
+    name:'mddetail',
+    components:{
+        FormDetail
+    },
+    data () {
+        return {
+            readOnly:false,
+            showAdd:false,
+            isGrid:false,
+            myConfig:{
+                title:'',
+                titleType:1,
+                addBtnType:'1',
+                hide:true,
+                addBtnName:'新增',
+                editBtnName:'编辑'
+            },
+            showForm:true,
+            editFlag:false,
+            showBtn:true,
+            iconStyle:'',
+            pStyle:'',
+            data:[],
+            delData:[],
+            btnReadOnly:false
+        };
+    },
+    props:{
+        config:{
+            type:Object,
+            default:null
+        },
+        dictData: {
+            type: Object,
+            default:null
+        }
+    },
+    created () {
+        this.init();
+    },
+    computed: {
+    },
+    methods:{
+        init (){
+            this.myConfig = Object.assign({},this.myConfig,this.config);
+            if (this.myConfig.effectKey) {
+               if (this.myConfig.gridConfig) {
+                   if (this.myConfig.gridConfig.effectKey === undefined) {
+                       this.myConfig.gridConfig.effectKey = this.myConfig.effectKey;
+                   }
+               }
+            }
+            delete this.myConfig.formConfig.name;
+            delete this.myConfig.formConfig.title;
+            delete this.myConfig.gridConfig.name;
+            delete this.myConfig.gridConfig.title;
+        },
+        setShowGrid (value) {
+            this.showForm = value;
+        },
+        toggle () {
+            this.showForm = !this.showForm;
+        },
+        getRowObject(index) {
+            if (index < this.date.length) {
+                if (this.$refs[this.date[index].curlIndex] && this.$refs[this.date[index].curlIndex][0]) {
+                    return this.$refs[this.date[index].curlIndex][0];
+                }
+            }
+            return null;
+        },
+        getRandom() {
+            return random(8);
+        },
+        add (obj) {
+            let row = null;
+            if (this.myConfig.addRowBefore) {
+                row = this.myConfig.addRowBefore();
+                if (row === false) {
+                    return;
+                }
+            }
+            if (!row || row === true) {
+                row = {};
+            }
+            if (obj) {
+                row = Object.assign({},row, obj);
+            }
+            if (!this.showForm) {
+                this.showForm = true;
+            }
+            this.showAdd = false;
+            let self = this;
+            this.$nextTick(() => {
+                this.showAdd  = true;
+                this.$nextTick(() => {
+                    setTimeout(() => {
+                        row.flag = 'I';
+                        self.$refs.addform.clearData();
+                        self.$refs.addform.setData(row);
+                        self.$refs.addform.setFormReadOnly(false);
+                    }, 200);
+                });
+            });
+        },
+        newDoAction (obj) {
+            if (this['new' + obj.name]) {
+                this['new' + obj.name](obj);
+            }
+        },
+        newsaveForm (obj) {
+            let flag = true;
+            let temp = obj.para.data;
+            temp.curlIndex = 'formdetail_' + this.getRandom();
+            temp.flag = 'I';
+            if (this.myConfig.newSaveFormBefore) {
+                flag = this.myConfig.newSaveFormBefore(temp);
+            }
+            if (flag) {
+                this.data.push(temp);
+                this.showAdd = false;
+            }
+
+        },
+        isChange () {
+            let flag = false;
+            if (this.data && this.data.length > 0) {
+                this.data.forEach(el => {
+                    if (!flag) {
+                        if (this.$refs[el.curlIndex] && this.$refs[el.curlIndex][0]) {
+                            flag = this.$refs[el.curlIndex][0].isChange();
+                        }
+                    }
+                });
+            }
+            return flag;
+        },
+        isEdit() {
+            return this.showAdd;
+        },
+        newcancelForm () {
+            this.showAdd = false;
+        },
+        doAction (obj) {
+            if (this[obj.name]) {
+                this[obj.name](obj);
+            }
+        },
+        getData (flag) {
+            let data = [];
+            this.data.forEach(el => {
+                let obj = this.$Method.copy(el);
+                if (!flag) {
+                    delete obj.curlIndex;
+                }
+                data.push(obj);
+            });
+            return data;
+        },
+        setData (data) {
+            this.data = [];
+            this.delData = [];
+            data.forEach(el => {
+                el.curlIndex = 'formdetail_' + this.getRandom();
+            });
+            this.$nextTick(() => {
+                this.data =this.$Method.copy(data);
+            });
+        },
+        setEffectData(data) {
+           this.data.forEach(el => {
+               if (this.$refs[el.curlIndex] && this.$refs[el.curlIndex][0]) {
+                   let tmp = [];
+                   if (this.myConfig.effectKey) {
+                        let tmpIdex = data.findIndex(el2 => el[this.myConfig.effectKey] === el2[this.myConfig.effectKey]);
+                        if (tmpIdex > -1) {
+                            tmp = this.$Method.copy(data[tmpIdex]);
+                        }
+                        this.$refs[el.curlIndex][0].setEffectData(tmp);
+                   }
+               }
+           });
+        },
+
+        saveForm (obj) {
+            let index = this.data.findIndex(el => el.curlIndex === obj.para.curlIndex);
+            if (index > -1) {
+                if (this.data[index].flag === undefined) {
+                    obj.para.data.flag = 'U';
+                }
+                this.data.splice(index, 1, obj.para.data);
+            }
+        },
+        delForm (obj) {
+            this.delCommonForm(obj);
+        },
+        delCommonForm(obj) {
+            let index = this.data.findIndex(el => el.curlIndex === obj.para.curlIndex);
+            let that  = this;
+            if (index > -1) {
+                let form = this.$Method.copy(this.data[index]);
+                if (this.$refs[obj.para.curlIndex] && this.$refs[obj.para.curlIndex][0]) {
+                    form = this.$refs[obj.para.curlIndex][0].getData();
+                }
+                if (this.myConfig.delRowBefore) {
+                    let obj = {};
+                    obj.index = index;
+                    obj.gridObject = that;
+                    obj.form = Object.assign({}, form);
+                    let flag = this.myConfig.delRowBefore(obj);
+                    if (flag === false) {
+                        return;
+                    }
+                }
+                if (form.flag === undefined  || form.flag === 'U') {
+                    form.flag = 'D';
+                    delete form.index;
+                    delete form.curlIndex;
+                    this.delData.push(form);
+                }
+                this.data.splice(index, 1);
+            }
+        },
+        editForm(obj) {
+            this.showAdd = false;
+            if (this.$refs.addform) {
+                this.$refs.addform.clearData(obj);
+            }
+        },
+        setReadOnly(value) {
+            this.readOnly = value;
+            this.$nextTick(() => {
+                this.data.forEach(el => {
+                    if (this.$refs[el.curlIndex] && this.$refs[el.curlIndex][0]) {
+                        this.$refs[el.curlIndex][0].setReadOnly(value);
+                    }
+                });
+            });
+            if (this.readOnly) {
+                this.showAdd = false;
+            }
+            this.setBtnReadOnly(value);
+        },
+        clearData () {
+            this.data = [];
+            this.delData = [];
+            this.showAdd = false;
+            if (this.$refs.addform) {
+                this.$refs.addform.clearData();
+            }
+        },
+        getChangeData() {
+            return this.getCommonChangeData(this.data);
+        },
+        getCommonChangeData(data) {
+            let changeData = [];
+            if (data.length > 0) {
+                data.forEach(el => {
+                    if (this.$refs[el.curlIndex] && this.$refs[el.curlIndex][0]) {
+                        if (this.$refs[el.curlIndex][0].isChange()) {
+                            changeData.push(this.$refs[el.curlIndex][0].getChangeData());
+                        }
+                    }
+                });
+            }
+            return changeData.concat(this.delData);
+        },
+        editDetails() {
+            if (this.checkIsEdit()) {
+                this.editFlag = true;
+                this.setReadOnly(false);
+            } else {
+                this.editFlag = false;
+                this.setReadOnly(true);
+            }
+        },
+        checkIsEdit() {
+            let flag = true;
+            if (this.myConfig.editObjectBefore) {
+                flag = this.myConfig.editObjectBefore(this.myConfig.name);
+            }
+            return flag;
+        },
+        save () {
+            if (this.checkValidate()){
+                return;
+            }
+            let obj = {};
+            obj.name = 'saveDetails';
+            obj.detailsname = this.myConfig.name;
+            this.editFlag = false;
+            this.$emit('doAction', obj);
+        },
+        delRowData (obj) {
+            this.delForm(obj);
+        },
+        checkValidate () {
+            let flag = false;
+            this.data.some(el => {
+                if (this.$refs[el.curlIndex] && this.$refs[el.curlIndex][0]) {
+                    flag = this.$refs[el.curlIndex][0].checkValidate();
+                    if (flag) {
+                        return true;
+                    }
+                }
+            });
+            if (flag) {
+                this.alert('必填项不允许为空');
+            }
+            return flag;
+        },
+        cancel() {
+            this.editFlag = false;
+            this.delData = [];
+        },
+        setShowBtn(value) {
+            this.showBtn = value;
+        },
+        setBtnReadOnly(value) {
+            this.btnReadOnly = value;
+        },
+        openForm () {
+            this.data.forEach(el => {
+                if (this.$refs[el.curlIndex] && this.$refs[el.curlIndex][0]) {
+                    this.$refs[el.curlIndex][0].setShowForm(true);
+                }
+            });
+        },
+        closeForm() {
+            this.data.forEach(el => {
+                if (this.$refs[el.curlIndex] && this.$refs[el.curlIndex][0]) {
+                    this.$refs[el.curlIndex][0].setShowForm(false);
+                }
+            });
+            this.showAdd = false;
+        },
+    },
+    mounted () {
+    }
+};
+</script>

package/src/components/masterplate/editgridcard2.vue

@@ -1,8 +1,22 @@
 <template>
 <Card ref="card"  :bordered="false" :padding="0" dis-hover>
+    <div v-if="$slots.header">
+        <slot name="header"></slot>
+    </div>
+    <Row class-name="row-box" v-else v-show="showGrid" type="flex" justify="start"  align="middle" :gutter="0"  style="margin-bottom: 10px;">
+        <Col v-if="showAddBtn">
+            <Button  :style="btnStyle" customIcon="iconfont icon-custom-rowadd3"  type="text"  :disabled="myConfig.readOnly" @click="addRow" >添加</Button>
+        </Col>
+        <Col v-if="showAddBtn && showDelBatchBtn">
+            <Divider  type="vertical"  style="margin: 0 6px 0 6px;"/>
+        </Col>
+        <Col v-if="showDelBatchBtn">
+            <Button :style="btnStyle" customIcon="iconfont icon-custom-rowdel3"  type="text" :disabled="myConfig.readOnly" @click="delBatchRow">删除</Button>
+        </Col>
+    </Row>
     <Row  style="margin-top: 10px;">
         <Table ref="table"  :row-class-name="rowClassName" :loading="loading" :size="myConfig.tableSize"  :stripe="myConfig.showStripe"  :border="myConfig.showBorder"  :height="tableHeight" :maxHeight="tableMaxHeight" :show-header="myConfig.showHeader" @on-selection-change="OnSelectionChange" :columns="tableColumns"  :data="data" @on-column-width-resize="onColumnWidthResize" :show-summary="myConfig.showSummary"  :summary-method="handleSummary">
-             <template  v-for="config in soltTableColumns" v-slot:[config.key]="{ index }" :key="'show_' + config.key">          
+             <template  v-for="config in soltTableColumns" v-slot:[config.key]="{ index }" :key="'show_' + config.key">
                 <div @click="EditCell(index,config)"  :class="config.cellClassName">
                     <ControlBox v-if="editIndex === index && editKey=== config.key"   :autofocus="true" :config="getCellConfig(index,config)"  :valueData="getCurRow(index)" @inputValue="input" :editIndex="index" @doAction="doAction"></ControlBox>
                     <ShowText v-else :label="formatValue(index,config)"  :contentAlign="config.contentAlign"  :class="IsCellError(index,config)" :config="config" :rowIndex="index"></ShowText>
@@ -41,8 +55,9 @@ export default {
                 showAppendixCol:false,
                 appedixLable:'附件'
             },
-            showAddBtn:true,
-            showDelBatchBtn:true,
+            btnStyle:'padding-left:0px;padding-right:0px',
+            showAddBtn:false,
+            showDelBatchBtn:false,
             showGrid:true,
             showTitle:true,
             actionAppendixConfig:{
@@ -55,6 +70,9 @@ export default {
 
         };
     },
+    created () {
+        this.myConfig = Object.assign({}, this.myConfig, this.config);
+    },
     methods: {
         customInit2() {
             if (this.myConfig.showTitle !== undefined) {
@@ -67,13 +85,13 @@ export default {
                 if (!el.width && !el.minWidth) {
                     el.minWidth = 60;
                 }
-            }); 
+            });
             if (this.myConfig.showAppendixCol) {
                 this.actionAppendixConfig.label = this.myConfig.appedixLable;
                 this.myConfig.items.push(this.actionAppendixConfig);
             }
 
-            
+
         },
         toggle () {
             this.showGrid = !this.showGrid;

package/src/components/masterplate/lefttreerightdetails.vue

@@ -105,8 +105,6 @@ export default {
         this.myConfig.gridConfig.overrideData = this.gridOverrideData;
         this.myConfig.gridConfig.showCondition = false;
         this.myConfig.gridConfig.resources = this.myConfig.resources;
-        this.myConfig.gridConfig.method = this.myConfig.classPrefix + '.search';
-        this.myConfig.gridConfig.response = this.myConfig.response;
         this.myConfig.gridConfig.tableSize ='small';
         this.myConfig.gridConfig.showBorder = false;
         this.myConfig.gridConfig.pageShowSizer = false;
@@ -116,6 +114,12 @@ export default {
         if (this.myConfig.gridConfig.title !== undefined) {
             this.myConfig.gridtitle = this.myConfig.gridConfig.title;
         }
+        if (!this.myConfig.gridConfig.method) {
+            this.myConfig.gridConfig.method = this.myConfig.classPrefix + '.search';
+        }
+        if (!this.myConfig.gridConfig.response) {
+            this.myConfig.gridConfig.response = this.myConfig.response;
+        }
 
         this.myConfig.gridConfig.multiSelect = false;
         if (this.myConfig.treeConfig.items) {