Merge branch 'master' into test

src/views/bpm/handleTask/components/financialManage/payableManage/components/detailDialog.vue

@@ -3,7 +3,7 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="130px">
       <headerTitle title="基本信息"></headerTitle>
       <el-row :gutter="12">
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item
             label="应付日期"
             prop="payableDate"
@@ -18,7 +18,7 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item
             label="应付金额"
             prop="payableTotalPrice"
@@ -34,9 +34,7 @@
             ></el-input-number>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="12">
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item
             label="会计科目"
             prop="accountingSubjectId"
@@ -56,7 +54,9 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+      </el-row>
+      <el-row :gutter="12">
+        <el-col :span="8">
           <el-form-item
             label="发票编码"
             prop="invoiceCode"
@@ -65,9 +65,7 @@
             <el-input disabled v-model="form.invoiceCode"></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="12">
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item
             label="来源类型"
             prop="sourceType"
@@ -79,7 +77,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item
             label="来源编码"
             prop="sourceCode"
@@ -91,7 +89,7 @@
       </el-row>
 
       <el-row :gutter="12">
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item
             label="公司名称"
             prop="contactName"
@@ -100,7 +98,7 @@
             <el-input disabled v-model="form.contactName"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="附件">
             <fileMain v-model="form.files"></fileMain>
           </el-form-item>

src/views/bpm/handleTask/components/financialManage/receivableManage/components/detailDialog.vue

@@ -3,7 +3,7 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="130px">
       <headerTitle title="基本信息"></headerTitle>
       <el-row :gutter="12">
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item
             label="应收日期"
             prop="receivableDate"
@@ -18,7 +18,7 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item
             label="应收金额"
             prop="receivableTotalPrice"
@@ -34,9 +34,7 @@
             ></el-input-number>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="12">
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item
             label="会计科目"
             prop="accountingSubjectId"
@@ -56,7 +54,9 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+      </el-row>
+      <el-row :gutter="12">
+        <el-col :span="8">
           <el-form-item
             label="发票编码"
             prop="invoiceCode"
@@ -65,9 +65,7 @@
             <el-input disabled v-model="form.invoiceCode"></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="12">
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item
             label="来源类型"
             prop="sourceType"
@@ -79,7 +77,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item
             label="来源编码"
             prop="sourceCode"
@@ -91,7 +89,7 @@
       </el-row>
 
       <el-row :gutter="12">
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item
             label="公司名称"
             prop="contactName"
@@ -100,7 +98,7 @@
             <el-input disabled v-model="form.contactName"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="附件">
             <fileMain v-model="form.files"></fileMain>
           </el-form-item>

src/views/bpm/handleTask/components/purchaseOrder/accountstatement/addAccountDialog.vue

@@ -45,7 +45,7 @@ export default {
   },
   computed: {},
   created() {
-    // this.permissionType = this.tabOptions.find(item => item.key == this.taskDefinitionKey).permissionType
+    this.permissionType = this.tabOptions.find(item => item.key == this.taskDefinitionKey).permissionType
 
   },
   mounted() {

src/views/bpm/handleTask/components/saleOrder/accountstatement/addAccountDialog.vue

@@ -45,8 +45,8 @@ export default {
   },
   computed: {},
   created() {
-    // this.permissionType = this.tabOptions.find(item => item.key == this.taskDefinitionKey).permissionType
-
+    console.log('taskDefinitionKey~~~', this.taskDefinitionKey)
+    this.permissionType = this.tabOptions.find(item => item.key == this.taskDefinitionKey).permissionType
   },
   mounted() {
 

src/views/bpm/handleTask/components/saleOrder/accountstatement/saleForm.vue

@@ -208,10 +208,10 @@
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row v-if="dialogType == 'view'">
+    <el-row>
       <el-col :span="12">
         <el-form-item prop="repliedFiles" label="回执附件">
-          <fileMain v-model="dataForm.repliedFiles" type="view"></fileMain>
+          <fileMain v-model="dataForm.repliedFiles" :type="dialogType == 'view' && taskDefinitionKey != 'uploadReceipt' ? 'view' : 'add'"></fileMain>
         </el-form-item>
       </el-col>
     </el-row>
@@ -261,6 +261,7 @@
           return {};
         }
       },
+      taskDefinitionKey: '',
       datasource: {
         type: Array,
         default: () => {

src/views/bpm/handleTask/components/saleOrder/accountstatement/submit.vue

@@ -23,12 +23,14 @@
         type="success"
         size="mini"
         @click="handleAudit(1)"
+        v-click-once
       >通过
       </el-button>
       <el-button
         icon="el-icon-circle-close"
         type="danger"
         size="mini"
+        v-click-once
         @click="rejectTask(0)">驳回
       </el-button>