فهرست منبع

测试bug修复

hbchen 2 سال پیش
والد
کامیت
70bc885e64
1فایلهای تغییر یافته به همراه8 افزوده شده و 8 حذف شده
  1. 8 8
      src/views/financialManagement/contractProgress.vue

+ 8 - 8
src/views/financialManagement/contractProgress.vue

@@ -83,8 +83,8 @@
       has_payment:{required:true,message:'请选择是否是代付',trigger:'change'},
       // sign_date:{required:true,message:'签订日不能为空',trigger:'change'},
       // agreed_pay_time:{required:true,message:'约定付款时间不能为空',trigger:'blur'}
-      relate_contract_code:{required:true,message:'实际使用方不能为空',trigger:'blur'},
-      // actual_company_name:{required:true,message:'关联合同不能为空',trigger:'blur'}
+      actual_company_name:{required:true,message:'实际使用方不能为空',trigger:'blur'},
+      // relate_contract_code:{required:true,message:'关联合同不能为空',trigger:'blur'}
 
     },
     moneyData:{
@@ -749,12 +749,12 @@
                       <el-radio :label="0">否</el-radio>
                     </el-radio-group>
                   </el-form-item>
-                  <el-form-item label="实际使用方" prop="relate_contract_code" v-if="contractInfo.form.contract_type==3">
-                    <el-input v-model="contractInfo.form.relate_contract_code"
+                  <el-form-item label="实际使用方" prop="actual_company_name" v-if="contractInfo.form.contract_type==3">
+                    <el-input v-model="contractInfo.form.actual_company_name"
                     placeholder="请输入实际使用方" />
                   </el-form-item>
-                  <el-form-item label="关联合同" prop="actual_company_name" v-if="contractInfo.form.contract_type==3 || contractInfo.form.contract_type==4">
-                    <el-input v-model="contractInfo.form.actual_company_name"
+                  <el-form-item label="关联合同" prop="relate_contract_code" v-if="contractInfo.form.contract_type==3 || contractInfo.form.contract_type==4">
+                    <el-input v-model="contractInfo.form.relate_contract_code"
                     placeholder="请输入关联合同" />
                   </el-form-item>
                   <el-form-item label="合同状态" prop="contract_status">
@@ -829,7 +829,7 @@
             </div>
           </div>
           <!-- 开票登记 -->
-          <div class="info-box" v-if="contractInfo.operationtype!='compliance' && contractInfo.form.has_payment!=1" 
+          <div class="info-box" v-if="contractInfo.operationtype!='compliance' && contractInfo.form.has_payment && contractInfo.form.has_payment!=1" 
           style="margin-top:20px ;" id="info-invoice-box" v-permission="['financial:list:invoice','financial:list:placement','financial:list:viewIandP','or']">
             <div class="info-box-head">开票登记{{contractInfo.moneyData.waitInvoiceMoney==0?'':'(待开票)'}}</div>
             <div class="info-row" >
@@ -891,7 +891,7 @@
             </div>
           </div>
           <!-- 到款登记 -->
-          <div class="info-box" v-if="contractInfo.operationtype!='compliance' && contractInfo.form.has_payment!=1" 
+          <div class="info-box" v-if="contractInfo.operationtype!='compliance' && contractInfo.form.has_payment && contractInfo.form.has_payment!=1" 
           v-permission="['financial:list:invoice','financial:list:placement','financial:list:viewIandP','or']"
           style="margin-top:20px ;" id="info-invoice-box">
             <div class="info-box-head">到款登记{{contractInfo.moneyData.waitPlacementMoney==0?'':'(待到款)'}}</div>