1.款项信息针对多条开票信息进行修改

2.修改资产绩效申报与提成比例下限新增校验
3.资产相关页面优化

src/views/assets/orderDetail.vue

@@ -810,35 +810,35 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row>
+            <el-row v-for="(invoice, id) in invoiceData.financeInvoiceVoList" :key="id">
               <el-col :xs="24" :sm="12" :lg="6" :span="6">
                 <el-form-item label="开票类型：" prop="type" label-width="120px" class="postInfo-container-item">
-                  <el-input v-model="invoiceData.type" class="filter-item" />
+                  <el-input v-model="invoice.type" class="filter-item" />
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6" :span="6">
                 <el-form-item label="发票抬头：" prop="title" label-width="120px" class="postInfo-container-item">
-                  <el-input v-model="invoiceData.title" class="filter-item" />
+                  <el-input v-model="invoice.title" class="filter-item" />
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6" :span="6">
                 <el-form-item label="税号：" prop="taxNo" label-width="120px" class="postInfo-container-item">
-                  <el-input v-model="invoiceData.taxNo" class="filter-item" />
+                  <el-input v-model="invoice.taxNo" class="filter-item" />
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6" :span="6">
                 <el-form-item label="开户银行：" prop="bankName" label-width="120px" class="postInfo-container-item">
-                  <el-input v-model="invoiceData.bankName" class="filter-item" />
+                  <el-input v-model="invoice.bankName" class="filter-item" />
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6" :span="6">
                 <el-form-item label="银行地址：" prop="bankAddress" label-width="120px" class="postInfo-container-item">
-                  <el-input v-model="invoiceData.bankAddress" class="filter-item" />
+                  <el-input v-model="invoice.bankAddress" class="filter-item" />
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6" :span="6">
                 <el-form-item label="联系电话：" prop="bankTel" label-width="120px" class="postInfo-container-item">
-                  <el-input v-model="invoiceData.bankTel" class="filter-item" />
+                  <el-input v-model="invoice.bankTel" class="filter-item" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -3039,14 +3039,14 @@ export default {
       const curNode = this.currentNode.nodeCode;
       if (curNode === 'REVIEW_STATEMENT' || curNode === 'CHECK_REPORT') {
         if (this.assetsEvaluationTarget.some(item => !item.checkValue)) {
-          this.initProQuality(curNode);
-        } else {
           this.$notify({
             title: '警告',
             message: '评估对象需要进行审核定价',
             type: 'error',
             duration: 3000
           });
+        } else {
+          this.initProQuality(curNode);
         }
       } else {
         this.initProQuality(curNode);

src/views/assets/todoList.vue

@@ -102,7 +102,7 @@
                         <span>{{ row.clientManagerName }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" align="center" width="100" fixed="right">
+                <el-table-column label="操作" align="center" width="120" fixed="right">
                     <template slot-scope="{row}">
                         <el-button type="danger" size="mini" @click="orderDetail(row)">任务处理</el-button>
                     </template>

src/views/income/assets/checkList.vue

@@ -158,7 +158,7 @@ export default {
         },
         checkDetail(row) {
             let backPath = '/income/assets/declare/check';
-            this.$router.push(`/income/assets/declare/detail?businessId=${row.businessId}&businessType=${row.businessType}&doWorkflow=${true}&back=${backPath}`)
+            this.$router.push(`/income/assets/declare/detail?businessId=${row.businessId}&businessType=${row.businessType}&doWorkflow=${true}&back=${backPath}&couldEdit=${true}`)
         }
     }
 

src/views/income/assets/declareDetail.vue

@@ -63,7 +63,7 @@
             v-if="declareForm.businessType === 'COMMISSION_DECLARE_ASSET_EVALUATE'">
             <el-form-item label="提成比例：" prop="ratio" label-width="140px" class="postInfo-container-item">
               <el-input v-model="declareForm.ratio" type="number"
-                :disabled="declareForm.businessType !== 'COMMISSION_DECLARE_ASSET_EVALUATE' || nodeBusinessInfo.nodeCode !== 'DEPARTMENT_LEADER_CHECK'">
+                :disabled="declareForm.businessType !== 'COMMISSION_DECLARE_ASSET_EVALUATE' || nodeBusinessInfo.nodeCode !== 'DEPARTMENT_LEADER_CHECK' || !couldEdit">
                 <template #suffix>
                   %
                 </template>
@@ -74,7 +74,7 @@
             v-if="declareForm.businessType === 'COMMISSION_DECLARE_ASSET_EVALUATE'">
             <el-form-item label="提成下限：" prop="definedLowLimitAmount" label-width="180px" class="postInfo-container-item">
               <el-input v-model="declareForm.definedLowLimitAmount" type="number"
-                :disabled="declareForm.businessType !== 'COMMISSION_DECLARE_ASSET_EVALUATE' || nodeBusinessInfo.nodeCode !== 'DEPARTMENT_LEADER_CHECK'">
+                :disabled="declareForm.businessType !== 'COMMISSION_DECLARE_ASSET_EVALUATE' || nodeBusinessInfo.nodeCode !== 'DEPARTMENT_LEADER_CHECK' || !couldEdit">
                 <template #suffix>
                   元
                 </template>
@@ -108,7 +108,7 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="12" :span="6"
-            v-if="declareForm.businessType === 'COMMISSION_DECLARE_ASSET_EVALUATE' && nodeBusinessInfo.nodeCode === 'DEPARTMENT_LEADER_CHECK'">
+            v-if="declareForm.businessType === 'COMMISSION_DECLARE_ASSET_EVALUATE' && nodeBusinessInfo.nodeCode === 'DEPARTMENT_LEADER_CHECK' && couldEdit">
             <el-button @click="updateAssetsCommissionDeclare()" style="margin-left: 30px;" type="danger" round>
               修改提成比例与下限
             </el-button>
@@ -173,6 +173,7 @@ export default {
   data() {
     return {
       activeNames: ['board'],
+      couldEdit: true,
       nodeBusinessInfo: {
         currentNodePermission: {
           commit: true,
@@ -211,10 +212,27 @@ export default {
 
       },
       users: [],
-      cates: []
+      cates: [],
+      currentNode: {
+        flowId: null,
+        pnodeId: null,
+        nodeId: null,
+        flowCode: null,
+        nodeName: "",
+        nodeCode: null,
+        state: "",
+        instanceId: null,
+        sequence: null,
+        restartable: null,
+        reversible: null,
+        skippable: null,
+        terminable: null,
+        tasks: []
+      }
     }
   },
   created() {
+    this.couldEdit = this.$route.query.couldEdit === 'true';
     this.nodeBusinessInfo.businessId = this.$route.query.businessId;
     this.nodeBusinessInfo.mainBusiness = this.$route.query.businessType;
     this.declareForm.businessType = this.$route.query.businessType;
@@ -224,7 +242,6 @@ export default {
     this.getDeclareDetail();
   },
   methods: {
-
     getCurrentNodeInfo() {
       if (this.nodeBusinessInfo.businessId) {
         this.$api.workNodeInstance.currentNode({
@@ -232,6 +249,7 @@ export default {
           "businessId": this.nodeBusinessInfo.businessId
         }).then(res => {
           if (res.code === 200 && res.data != null) {
+            this.currentNode = res.data;
             this.nodeBusinessInfo.currentInstanceNodeId = res.data.instanceId;
             this.nodeBusinessInfo.nodeCode = res.data.nodeCode;
           }
@@ -269,6 +287,7 @@ export default {
       declareDTO.id = this.businessId;
       declareDTO.ratio = this.declareForm.ratio;
       declareDTO.definedLowLimitAmount = this.declareForm.definedLowLimitAmount;
+      declareDTO.recordId = this.currentNode.tasks[0].recordId;
       this.$api.commissonDeclare.updateAssetsCommissionDeclare(declareDTO).then(res => {
         if (res.code === 200 && res.data) {
           this.$notify({

src/views/income/assets/evaluate.vue

@@ -314,7 +314,7 @@ export default {
             })
         },
         checkDetail(id) {
-            this.$router.push(`/income/assets/declare/detail?businessId=${id}&businessType=COMMISSION_DECLARE_ASSET_EVALUATE&doWorkflow=${false}&back=${'/income/assets/declare/evaluate'}`)
+            this.$router.push(`/income/assets/declare/detail?businessId=${id}&businessType=COMMISSION_DECLARE_ASSET_EVALUATE&doWorkflow=${false}&back=${'/income/assets/declare/evaluate'}&couldEdit=${false}`)
         },
         // 打开绩效比例分配弹窗
         openAssetsAchievementRatioDialog(row) {