Просмотр исходного кода

Merge branch 'dev1.0' of http://222.90.211.174:3000/suf/factoring-trade-front-end-v2 into dev1.0

sufan месяцев назад: 7
Родитель
Сommit
64b11ec2e6

+ 2 - 1
src/views/purchaseContractManagement/components/PurchaseContractReviewContent.vue

@@ -193,7 +193,8 @@
           :rules="[
             { required: ruleForm.purchContractApproval.approvalConclusion == 'pass', message: '请选择合同签署方式', trigger: 'change' }
           ]">
-          <el-checkbox v-model="ruleForm.purchContractApproval.signMode" @change="createFile" :true-label="1" :false-label="0" :disabled="isView">线上电子签</el-checkbox>
+          <!-- <el-checkbox v-model="ruleForm.purchContractApproval.signMode" @change="createFile" :true-label="1" :false-label="0" :disabled="isView">线上电子签</el-checkbox> -->
+          <el-checkbox v-model="ruleForm.purchContractApproval.signMode" @change="createFile" :true-label="1" :false-label="''" :disabled="isView">线上电子签</el-checkbox>
         </el-form-item>
         <el-form-item label="贸易平台">
           <el-input v-model="ruleForm.purchContractApproval.platform.platformName" style="width: 100%;" disabled></el-input>

+ 1 - 0
src/views/purchaseContractManagement/index.vue

@@ -156,6 +156,7 @@ export default {
         }).then(res => {
           exportFile(res)
         })
+        return
       }
       if (row.taskName === '采购合同审核') {
         this.$router.push({

+ 5 - 5
src/views/refundManage/components/refundApplyContent.vue

@@ -44,7 +44,7 @@
         />
       </div>
       <div v-for="(item, index) in ruleForm.refundsApplyDetails" :key="index + 1" style="width: 100%; display: flex; flex-wrap: wrap;">
-        <cy-info-title style="margin-top: 20px">{{ getApplyDetailsDesc(index) }}</cy-info-title>
+        <cy-info-title style="margin-top: 20px">{{ getApplyDetailsDesc(item) }}</cy-info-title>
         <el-form-item label="申请类型" class="form-required">
           <el-radio-group v-model="item.applyType">
             <el-radio :label="1" :disabled="disabled">退款</el-radio>
@@ -336,11 +336,11 @@ export default {
       // }
     },
     // 获取申请内容标题文案
-    getApplyDetailsDesc(index) {
-      if (index === 0) {
-        return '申请内容(第一组:履约保证金+质保金+收放款执行)'
+    getApplyDetailsDesc(row) {
+      if (row.paymentMatter === 'oaRefundMatter') {
+        return `申请内容(履约保证金+质保金+收放款执行)`
       }
-      return '申请内容(第二组:实退金额)'
+      return `申请内容(实退金额)`
     },
     // 重组基础信息数据
     groupBaseInfoData(targetData) {