ocpview-plus 1.3.3 → 1.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocpview-plus",
-  "version": "1.3.3",
+  "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

@@ -88,27 +88,33 @@ export default {
                     dictkey: 'CUSTFILETYPE',
                     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',

package/src/components/masterplate/listdetails.vue

@@ -9,7 +9,7 @@
         </Card>
       </template>
     </BillDetailForm>
-    <ApprovalBox ref="approval" :config="billApprovalConfig"/>
+    <ApprovalBox ref="approval" :config="billApprovalConfig" @approvalOk="approvalOk" />
     <Modal class-name="efuture-billapprovalmainframe" v-model="showApproval" fullscreen title="报批单" footer-hide>
         <iframe  frameborder="0" ref="billapprovalmainframe" style="width:100%;height:100%;" border="0"></iframe>
     </Modal>