ocpview-plus 1.3.5 → 1.3.7

package/package.json

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

package/src/components/masterplate/RewriteListdetails/indexV3.vue

@@ -38,7 +38,7 @@
                 </Card>
             </template>
         </BillDetailForm>
-        <ApprovalBox ref="approval" :config="billApprovalConfig" />
+        <ApprovalBox ref="approval" :config="billApprovalConfig" @onSubmitBefore="onSubmitBefore" />
         <Modal
             class-name="efuture-billapprovalmainframe"
             v-model="showApproval"
@@ -315,7 +315,14 @@ export default {
         },
         handleSuccessAfter(response, file, fileList) {
             this.$emit('handleSuccessAfter' , response, file, fileList);
-        }
+        },
+        onSubmitBefore() {
+            let flag = true;
+            if (this.$parent.onSubmitBefore() !== undefined) {
+                flag = this.$parent.onSubmitBefore();
+            }
+            return flag;
+        },
     },
     mounted() {},
 };

package/src/components/masterplate/approval.vue

@@ -3,15 +3,15 @@
     <Modal  title="人员列表" width="660" v-model="showuser">
          <Row style="margin-bottom:14px" type="flex"  justify="start" align="middle" >
                 <Col span='6' v-if="!showapproval">
-                  已选抄送人:<span style="color:#AF292E">{{selectuserdata.length}}</span><span v-text="info"></span> 
+                  已选抄送人:<span style="color:#AF292E">{{selectuserdata.length}}</span><span v-text="info"></span>
                 </Col>
                  <Col span='6' v-if="showapproval">
-                  已选审批<span v-text="info"></span> :<span style="color:#AF292E">{{selectuserdata.length}}</span><span v-text="info"></span> 
+                  已选审批<span v-text="info"></span> :<span style="color:#AF292E">{{selectuserdata.length}}</span><span v-text="info"></span>
                 </Col>
                 <Col span='18'>
                     <Row type="flex"  justify="end" align="middle" >
                             <Button type="text" custom-icon="iconfont icon-custom-quanshan"    @click="delAll" >全部删除</Button>
-                     </Row>   
+                     </Row>
                 </Col>
         </Row>
         <Row type="flex" justify="start" style="min-height:82px;border:1px dashed #DCDFE6;padding:10px">
@@ -21,12 +21,12 @@
             <template #title>
             <Row v-if="!showapproval"  type="flex"  justify="start" align="middle" >
                 <Col span='4'>
-                  已勾选:<span style="color:#AF292E">{{select.length}}</span><span v-text="info"></span> 
+                  已勾选:<span style="color:#AF292E">{{select.length}}</span><span v-text="info"></span>
                 </Col>
                 <Col span='20'>
                     <Row type="flex"  justify="end" align="middle" >
                         <Input  placeholder="请输入用户名称/工号/手机号"  v-model="searchValue"  search style="width: 380px;border-radius:20px;margin-top:10xp" @on-search="searchUser" @on-enter="searchUser"/>
-                    </Row>   
+                    </Row>
                 </Col>
             </Row>
              <Row  v-else type="flex"  justify="start" align="middle" >
@@ -71,7 +71,7 @@
                 </Col>
             </Row>
         </div>
-        </template>    
+        </template>
     </Modal>
     <Drawer class-name="efutureapproval" title="工作流" v-model="showDrawer" :width="534">
         <div class="drawer-box">
@@ -105,7 +105,7 @@
                         </div>
                         <div class="right">
                             <p class="top">
-                                <span style="font-size:16px;font-weight">{{item.describe_}}</span>
+                                <span style="font-size:16px;">{{item.describe_}}</span>
                                 <span class="status">{{item.act_status_name}}</span>
                             </p>
                             <div>
@@ -117,7 +117,7 @@
                             </div>
                             <div class="card" v-if="item.tasklist.length > 1">
                                 <ul class="main">
-                                    <Row type="flex" justify="start" :gutter="16">  
+                                    <Row type="flex" justify="start" :gutter="16">
                                     <Col v-for="(tmp, index2) in item.tasklist"  :key="'task_' + index2" v-show="index2 < maxUser || (index2 >= maxUser && tmp.active)" >
                                         <li class="user-list">
                                         <div class="user">
@@ -134,12 +134,12 @@
                                     </Col>
                                     </Row>
                                 </ul>
-                                <Row v-if="item.tasklist > maxUser" type="flex" justify="center" align="middle"> 
+                                <Row v-if="item.tasklist > maxUser" type="flex" justify="center" align="middle">
                                         <Col>
                                         <Button  v-if="!item.active" icon="ios-arrow-down" type="text"  @click="showGroupUser(index)">展开 </Button>
                                             <Button  v-if="item.active" icon="ios-arrow-up" type="text" @click="showGroupUser(index)"> 收起</Button>
                                         </Col>
-                                    </Row>    
+                                    </Row>
                             </div>
                         </div>
                     </li>
@@ -169,7 +169,7 @@
                  <FormItem v-show="false" label="审批:">
                     <Row type="flex" justify="start" align="middle" >
                         <Col span='2'>
-                            <span style="color:#AF292E;cursor:pointer"> {{approvals.length}}</span> <span v-text="info2"></span> 
+                            <span style="color:#AF292E;cursor:pointer"> {{approvals.length}}</span> <span v-text="info2"></span>
                         </Col>
                         <Col span='22'>
                             <Row type="flex" justify="end" align="middle">
@@ -190,24 +190,24 @@
             </Form>
             <Row type="flex" v-if="showBtn" justify="end"  :gutter="10"  style="padding-top:20px;padding-bottom:4px">
                 <Col v-if="showSubmit">
-                    <Button  customIcon="iconfont icon-custom-submit"  @click="onSubmit" >提交</Button>   
+                    <Button  customIcon="iconfont icon-custom-submit"  @click="onSubmit" >提交</Button>
                 </Col>
                  <Col v-if="showReset">
-                    <Button  customIcon="iconfont icon-custom-recall"  @click="billBack" >撤回</Button>   
+                    <Button  customIcon="iconfont icon-custom-recall"  @click="billBack" >撤回</Button>
                 </Col>
                 <Col v-show="false">
-                    <Button  customIcon="iconfont icon-custom-jiaqian"  @click="billBack" >加签</Button>   
+                    <Button  customIcon="iconfont icon-custom-jiaqian"  @click="billBack" >加签</Button>
                 </Col>
                  <Col v-if="showReject">
-                    <Button  customIcon="iconfont icon-custom-reject"  @click="reject" >驳回</Button>   
+                    <Button  customIcon="iconfont icon-custom-reject"  @click="reject" >驳回</Button>
                 </Col>
                  <Col v-if="showApprove">
-                    <Button  customIcon="iconfont icon-custom-approve"  @click="submitApprove" >审批</Button>   
+                    <Button  customIcon="iconfont icon-custom-approve"  @click="submitApprove" >审批</Button>
                 </Col>
             </Row>
-        </div>   
+        </div>
     </Drawer>
-  </div> 
+  </div>
 </template>
 
 <script>
@@ -259,7 +259,7 @@ export default {
         };
     },
     created() {
-        this.myConfig = Object.assign({}, this.myConfig, this.config); 
+        this.myConfig = Object.assign({}, this.myConfig, this.config);
     },
     computed: {
         contentStyle () {
@@ -296,7 +296,13 @@ export default {
     },
     methods: {
         onSubmit() {
-            this.billSubmit();
+            let flag = true;
+            if (this.$parent.onSubmitBefore() !== undefined) {
+                flag = this.$parent.onSubmitBefore();
+            }
+            if (flag) {
+                this.billSubmit();
+            }
         },
         setData(config) {
             this.clearData();
@@ -388,7 +394,7 @@ export default {
                         item.candidateUserList = candidateUserList;
                     }
                 });
-               
+
 
                 if (data.procinfo.btnlist) {
                     data.procinfo.btnlist.forEach(el => {
@@ -428,7 +434,7 @@ export default {
         (data) => {
             // // 方式1：通过事件  没有生效
             // this.$emit('approvalOk', '');
-            
+
             // 方式2：直接调用父组件方法（兜底）
             if (this.$parent && typeof this.$parent.approvalOk === 'function') {
                 this.$parent.approvalOk();
@@ -452,7 +458,7 @@ export default {
                 (data) => {
                     // // 方式1：通过事件  没有生效
                     // this.$emit('approvalOk', '');
-                    
+
                     // 方式2：直接调用父组件方法（兜底）
                     if (this.$parent && typeof this.$parent.approvalOk === 'function') {
                         this.$parent.approvalOk();
@@ -482,7 +488,7 @@ export default {
             this.doPost('.billsubmit', param, (data) => {
                 // // 方式1：通过事件  没有生效
                 // this.$emit('approvalOk', '');
-                
+
                 // 方式2：直接调用父组件方法（兜底）
                 if (this.$parent && typeof this.$parent.approvalOk === 'function') {
                     this.$parent.approvalOk();
@@ -496,13 +502,13 @@ export default {
             });
         },
         submitApprove() {
-            this.doPost(    
+            this.doPost(
                 '.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();
@@ -519,7 +525,7 @@ export default {
             if (this.approvals.length === 0) {
                 this.alert('审批人不能为空');
                 return;
-            } 
+            }
             let param = {
                 billno: this.value.billno,
                 userid: this.getUserCode(),
@@ -537,7 +543,7 @@ export default {
                 param,
                 (data) => {
                     this.alert(data.msg,null,3);
-           
+
             }
       );
         },
@@ -564,7 +570,7 @@ export default {
             });
         },
         open () {
-            this.showDrawer = true; 
+            this.showDrawer = true;
         },
         addUser() {
             this.userdata = [];
@@ -661,10 +667,10 @@ export default {
                 if (index > -1) {
                     let index2 = temp.findIndex(el3 => el3.userCode === el.userCode);
                     if (index2 > -1) {
-                        temp2.push(this.$Method.copy(el)); 
+                        temp2.push(this.$Method.copy(el));
                     }
                 } else {
-                    temp2.push(this.$Method.copy(el)); 
+                    temp2.push(this.$Method.copy(el));
                 }
             });
             temp.forEach(el => {
@@ -674,7 +680,7 @@ export default {
                 }
             })
             this.selectuserdata = temp2;
-        },        
+        },
         userCancel() {
             this.showuser = false;
         },
@@ -684,7 +690,7 @@ export default {
                 this.curlSelectType = this.selectType;
             } else {
                 this.copy = this.$Method.copy(this.selectuserdata);
-           
+
             }
             this.showuser = false;
         },

package/src/components/masterplate/billdetailform.vue

@@ -239,14 +239,15 @@ export default {
                     let billmoduleid = data.billmoduleid;
                     this.$refs.detail_appenndix[0].setData(billno,billmoduleid);
                 }
-            } else if (this.billAppendixConfig.showAppendix2) {
-                if (this.$refs.detail_appenndix2 && this.$refs.detail_appenndix2[0]) {
-                    let data = this.getData();
-                    let billno = data[this.billAppendixConfig.appendixKey];
-                    let billmoduleid = data.billmoduleid;
-                    this.$refs.detail_appenndix2[0].setData(billno,billmoduleid);
-                }
             }
+            // else if (this.billAppendixConfig.showAppendix2) {
+            //     if (this.$refs.detail_appenndix2 && this.$refs.detail_appenndix2[0]) {
+            //         let data = this.getData();
+            //         let billno = data[this.billAppendixConfig.appendixKey];
+            //         let billmoduleid = data.billmoduleid;
+            //         this.$refs.detail_appenndix2[0].setData(billno,billmoduleid);
+            //     }
+            // }
         },
         doAction (obj) {
             if (obj.name === 'editGrid' || obj.name === 'cancelGrid') {

package/src/components/masterplate/contractappendix.vue

@@ -81,6 +81,7 @@ export default {
                         {code: 'I', name: '新增'}, {code: 'D', name: '删除'}],
                     visible: false,
                     width: 100,
+                    readOnly: true
                 }, {
                     label: '附件类型',
                     name: 'filememo',
@@ -100,7 +101,7 @@ export default {
                     label: '文件名称',
                     name: 'filename',
                     type: 'TextBox',
-                    width: 200,
+                    minWidth: 200,
                     readOnly: true
                 }, {
                     label: '文件大小',
@@ -120,7 +121,7 @@ export default {
                     key: 'action',
                     align: 'center',
                     render: this.actionRender,
-                    minWidth: 100
+                    width: 350,
                 }]
             },
             loadFlag: false,
@@ -163,7 +164,12 @@ export default {
                     icon: 'custom-filerecall',
                     name: 'recall',
                     text: '撤回'
-                }
+                },
+                {
+                    icon: 'custom-fileupload',
+                    name: 'reupFile',
+                    text: '变更'
+                },
             ]
         };
     },
@@ -279,7 +285,7 @@ export default {
                 if (this.myConfig.readOnly) {
                     del.readOnly = true;
                 }
-                if (params.row.scenetype !== '0') {
+                if (params.row.scenetype !== '0' && params.row.modflag !== 'M') {
                     btnConfig.items.push(del);
                 }
             } else {
@@ -301,6 +307,9 @@ export default {
                 if (params.row.modflag === 'N') {
                     btnConfig.items.push(recall);
                 }
+                if ((!params.row.filekey || params.row.filekey !== '') && params.row.modflag === 'N') {
+                    btnConfig.items.push(this.$Method.copy(this.rowBtnData[5]));
+                }
             }
             return h('div', [
                 h(resolveComponent('RowBtnToolbar'), {
@@ -321,6 +330,9 @@ export default {
                         if (val.name === 'recall') {
                             this.recall(params);
                         }
+                        if (val.name === 'reupFile') {
+                            this.reupFile(params);
+                        }
                     }
                 })
             ]);
@@ -378,7 +390,7 @@ export default {
                     return;
                 }
                 if (params.row.modflag === 'I') {
-                    this.delCommon(params.row.filekey, 'Y');
+                    this.delCommon(params.row.filekey, 'N');
                     this.$refs.grid.delRow(params.index);
                 }
                 if (params.row.modflag === 'N') {
@@ -622,6 +634,25 @@ export default {
                 document.querySelector('#billiviewUp input').click();
             }
         },
+        reupFile (params) {
+            if (this.myConfig.beforeUpload) {
+                this.myConfig.beforeUpload();
+            }
+            if (!this.billno) {
+                this.alert('单据主健信息为空,不允许上传');
+                return;
+            }
+            if (this.checkIsEdit()) {
+                this.$nextTick(() => {
+                    this.$refs.billupload.clearFiles();
+                });
+                if (this.myConfig.readOnly) {
+                    this.setReadOnly(false);
+                }
+                this.filememo = params.row.filememo;
+                document.querySelector('#billiviewUp input').click();
+            }
+        },
         isChange () {
             return this.$refs.grid.isChange();
         },

package/src/components/masterplate/layouttemplate.vue

@@ -1,6 +1,6 @@
 <template>
 <div>
-   <component ref="layout" :is="uiLayoutType" :config="uiconfig" :dictData="globalConfig.dictData" :moduleMethod="globalConfig.userModuleMethod" @handleSuccessAfter="handleSuccessAfter" @doAction="doAction" />
+   <component ref="layout" :is="uiLayoutType" :config="uiconfig" :dictData="globalConfig.dictData" :moduleMethod="globalConfig.userModuleMethod" @handleSuccessAfter="handleSuccessAfter" @onSubmitBefore="onSubmitBefore" @doAction="doAction" />
    <Modal title="附件" v-model="showDetailAppendix" :width="appendixCurrentWidth" :footer-hide="true">
         <AppendixBoxs v-if="detalAppendixFlag" ref="detailappendix" :config="billDetailAppendixConfig"  @doAction="doAction"/>
     </Modal>