Browse Source

fix(合同审批):否决

sufan 3 weeks ago
parent
commit
9730a1ead5

+ 1 - 1
src/views/financingManage/components/ContractApprovalContent.vue

@@ -22,7 +22,7 @@
         <el-radio-group v-model="ruleForm.conclusion" :disabled="disabled">
         <el-radio-group v-model="ruleForm.conclusion" :disabled="disabled">
           <el-radio label="pass">通过</el-radio>
           <el-radio label="pass">通过</el-radio>
           <el-radio label="back">退回</el-radio>
           <el-radio label="back">退回</el-radio>
-          <el-radio label="vite">否决</el-radio>
+          <el-radio label="veto">否决</el-radio>
         </el-radio-group>
         </el-radio-group>
       </el-form-item>
       </el-form-item>
       <el-form-item
       <el-form-item

+ 1 - 1
src/views/financingManage/components/ContractConclusion.vue

@@ -6,7 +6,7 @@
         <el-radio-group v-model="ruleForm.conclusion" :disabled="disabled">
         <el-radio-group v-model="ruleForm.conclusion" :disabled="disabled">
           <el-radio label="pass">通过</el-radio>
           <el-radio label="pass">通过</el-radio>
           <el-radio label="back">退回</el-radio>
           <el-radio label="back">退回</el-radio>
-          <el-radio label="vite">否决</el-radio>
+          <el-radio label="veto">否决</el-radio>
         </el-radio-group>
         </el-radio-group>
       </el-form-item>
       </el-form-item>
       <template v-if="ruleForm.conclusion === 'pass'">
       <template v-if="ruleForm.conclusion === 'pass'">

+ 5 - 4
src/views/financingManage/components/PaymentApproveContent.vue

@@ -6,6 +6,7 @@
         <el-radio-group v-model="ruleForm.approvalConclusion" :disabled="disabled">
         <el-radio-group v-model="ruleForm.approvalConclusion" :disabled="disabled">
           <el-radio label="pass">通过</el-radio>
           <el-radio label="pass">通过</el-radio>
           <el-radio label="back">退回</el-radio>
           <el-radio label="back">退回</el-radio>
+          <el-radio label="veto">否决</el-radio>
         </el-radio-group>
         </el-radio-group>
       </el-form-item>
       </el-form-item>
       <el-form-item
       <el-form-item
@@ -111,7 +112,7 @@
           />
           />
         </el-form-item>
         </el-form-item>
       </template>
       </template>
-   
+
     </el-form>
     </el-form>
   </div>
   </div>
 </template>
 </template>
@@ -206,14 +207,14 @@ export default {
           this.$refs.ruleFormFile.validate(valid => {
           this.$refs.ruleFormFile.validate(valid => {
             if (valid) {
             if (valid) {
               const receivablesFileIds = this.$refs.receivablesFiles.getFileLists.map(item => item.id)
               const receivablesFileIds = this.$refs.receivablesFiles.getFileLists.map(item => item.id)
-             
+
               if (!receivablesFileIds.length) {
               if (!receivablesFileIds.length) {
                 this.$message.warning('请上传应收账款登记附件')
                 this.$message.warning('请上传应收账款登记附件')
                 return
                 return
               }
               }
               let mortgageFileIds = []
               let mortgageFileIds = []
               let ownershipFileIds = []
               let ownershipFileIds = []
-              if(this.hasCollateralInfo) {
+              if (this.hasCollateralInfo) {
                 mortgageFileIds = this.$refs.mortgageFiles.getFileLists.map(item => item.id)
                 mortgageFileIds = this.$refs.mortgageFiles.getFileLists.map(item => item.id)
                 ownershipFileIds = this.$refs.ownershipFiles.getFileLists.map(item => item.id)
                 ownershipFileIds = this.$refs.ownershipFiles.getFileLists.map(item => item.id)
                 if (!mortgageFileIds.length) {
                 if (!mortgageFileIds.length) {
@@ -225,7 +226,7 @@ export default {
                   return
                   return
                 }
                 }
               }
               }
-           
+
               const params = {
               const params = {
                 ...this.ruleFormFile,
                 ...this.ruleFormFile,
                 receivablesFileIds,
                 receivablesFileIds,

+ 4 - 1
src/views/financingManage/index.vue

@@ -39,6 +39,7 @@
         </div>
         </div>
         <cy-comm-table
         <cy-comm-table
           ref="commTable"
           ref="commTable"
+          :key="tableKey"
           v-loading="loading"
           v-loading="loading"
           :columns="columns"
           :columns="columns"
           :data="tableData"
           :data="tableData"
@@ -273,7 +274,8 @@ export default {
           },
           },
           width: 135
           width: 135
         }
         }
-      ]
+      ],
+      tableKey: 1
     }
     }
   },
   },
   computed: {
   computed: {
@@ -440,6 +442,7 @@ export default {
     handleTabClick(tab) {
     handleTabClick(tab) {
       this.activeName = tab.name
       this.activeName = tab.name
       this.fetchData('search')
       this.fetchData('search')
+      this.tableKey += 1
     }
     }
   }
   }
 }
 }