财务管理系统1.1修改内容

src/views/financialManagement/contractProgress.vue

@@ -52,8 +52,9 @@
       end_date:'',
       contract_amount:'',
       contract_type:'',
-      pay_contract_code:'',
-      pay_company_name:'',
+      has_payment:'',
+      relate_contract_code:'',
+      actual_company_name:'',
       sign_date:'',
       agreed_pay_time:'',
       services:[],
@@ -79,10 +80,11 @@
         trigger:'blur'
       }],
       contract_type:{required:true,message:'合同类型不能为空',trigger:'change'},
+      has_payment:{required:true,message:'请选择是否是代付',trigger:'change'},
       // sign_date:{required:true,message:'签订日不能为空',trigger:'change'},
       // agreed_pay_time:{required:true,message:'约定付款时间不能为空',trigger:'blur'}
-      pay_contract_code:{required:true,message:'代付方不能为空',trigger:'blur'},
-      pay_company_name:{required:true,message:'关联合同不能为空',trigger:'blur'}
+      relate_contract_code:{required:true,message:'实际使用方不能为空',trigger:'blur'},
+      // actual_company_name:{required:true,message:'关联合同不能为空',trigger:'blur'}
 
     },
     moneyData:{
@@ -235,8 +237,9 @@
       end_date:'',
       contract_amount:'',
       contract_type:'',
-      pay_contract_code:'',
-      pay_company_name:'',
+      has_payment:'',
+      relate_contract_code:'',
+      actual_company_name:'',
       sign_date:'',
       agreed_pay_time:'',
       services:[],
@@ -260,10 +263,12 @@
   const contractTypeChange=(value)=>{
     // console.log(value);
     if(value!=3){
-      contractInfo.form.pay_contract_code=''
+      contractInfo.form.relate_contract_code=''
+    }else{
+      contractInfo.form.has_payment=''
     }
     if(value!=4 && value!=3){
-      contractInfo.form.pay_company_name=''
+      contractInfo.form.actual_company_name=''
     }
   }
 
@@ -327,7 +332,7 @@
       contractInfo.varietyDiaType='edit'
       contractInfo.serviceType = !!smallService?2:hasBigService?1:0
       contractInfo.checkedService=contractInfo.form.services.map(item => item.ServiceTemplateId)
-      contractInfo.checkedPermission=smallService?smallService.ChartPermissionIds:[]
+      contractInfo.checkedPermission=smallService?smallService.ChartPermissionIds||[]:[]
     })
     contractInfo.form.company_name=selectItem.company_name
     contractInfo.form.crm_contract_id=selectItem.contract_id
@@ -338,12 +343,12 @@
     contractInfo.form.seller_name=selectItem.seller_name
     contractInfo.form.seller_id=selectItem.seller_id
     contractInfo.form.contract_type=selectItem.contract_type_key
-    contractInfo.form.pay_contract_code=selectItem.pay_contract_code
-    contractInfo.form.pay_company_name=selectItem.pay_company_name
+    contractInfo.form.relate_contract_code=selectItem.relate_contract_code
+    contractInfo.form.actual_company_name=selectItem.actual_company_name
     contractInfoForm.value && 
     contractInfoForm.value.validateField([
       'contract_code','company_name','contract_type','seller_id',
-      'start_date','contract_amount','pay_contract_code','pay_company_name'
+      'start_date','contract_amount','relate_contract_code','actual_company_name'
     ])
   }
   // 销售选中
@@ -603,8 +608,9 @@
         end_date:res.data.end_date,
         contract_amount:res.data.contract_amount,
         contract_type:res.data.contract_type,
-        pay_contract_code:res.data.pay_contract_code,
-        pay_company_name:res.data.pay_company_name,
+        has_payment:res.data.has_payment,
+        relate_contract_code:res.data.relate_contract_code,
+        actual_company_name:res.data.actual_company_name,
         sign_date:res.data.sign_date,
         agreed_pay_time:res.data.agreed_pay_time,
         service_remark:res.data.service_remark,
@@ -736,12 +742,18 @@
                       <el-option :label="item.label" :value="item.id" v-for="item in contractTypeArray" :key="item.id"></el-option>
                     </el-select>
                   </el-form-item>
-                  <el-form-item label="代付方" prop="pay_contract_code" v-if="contractInfo.form.contract_type==3">
-                    <el-input v-model="contractInfo.form.pay_contract_code"
-                    placeholder="请输入代付方" />
+                  <el-form-item label="是否代付" prop="has_payment" v-if="[1,2,4].includes(contractInfo.form.contract_type)">
+                    <el-radio-group v-model="contractInfo.form.has_payment" style="min-width:286px;width: 15vw;">
+                      <el-radio :label="1">是</el-radio>
+                      <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"
+                    placeholder="请输入实际使用方" />
                   </el-form-item>
-                  <el-form-item label="关联合同" prop="pay_company_name" v-if="contractInfo.form.contract_type==3 || contractInfo.form.contract_type==4">
-                    <el-input v-model="contractInfo.form.pay_company_name"
+                  <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"
                     placeholder="请输入关联合同" />
                   </el-form-item>
                   <el-form-item label="合同状态" prop="contract_status">
@@ -816,7 +828,7 @@
             </div>
           </div>
           <!-- 开票登记 -->
-          <div class="info-box" v-if="contractInfo.operationtype!='compliance'" 
+          <div class="info-box" v-if="contractInfo.operationtype!='compliance' && 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" >
@@ -878,7 +890,8 @@
             </div>
           </div>
           <!-- 到款登记 -->
-          <div class="info-box" v-if="contractInfo.operationtype!='compliance'" v-permission="['financial:list:invoice','financial:list:placement','financial:list:viewIandP','or']"
+          <div class="info-box" v-if="contractInfo.operationtype!='compliance' && 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>
             <div class="info-row" >

src/views/financialManagement/financialList.vue

@@ -123,7 +123,7 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
     }
     let {file}=e
     if(!file.name.endsWith('xlsx')){
-      ElMessage.warning('请上传以.xlxs结尾的文件')
+      ElMessage.warning('请上传以.xlsx结尾的文件')
       return
     }
     financial.importLoading=true
@@ -328,11 +328,11 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
                         删除
                       </span>
                       <span class="table-option-buttons" v-permission="'financial:list:invoice'"
-                      @click="registration('invoice',row.contract_register_id)" v-if="row.contract_type!==3">
+                      @click="registration('invoice',row.contract_register_id)" v-if="row.has_payment!=1">
                         开票登记
                       </span>
                       <span class="table-option-buttons" v-permission="'financial:list:placement'"
-                      @click="registration('placement',row.contract_register_id)" v-if="row.contract_type!==3">
+                      @click="registration('placement',row.contract_register_id)" v-if="row.has_payment!=1">
                         到款登记
                       </span>
                       <span class="table-option-buttons" @click="changeContractStatus(row)">