Merge branch 'crm_17.1' into debug

src/views/financialManagement/contractProgress-component/Compliance.vue

@@ -83,7 +83,8 @@
       services_amount:'',
       services_Qy_amount:'',
       service_remark:'',
-      remark:""
+      remark:"",
+      wx_user_name:'', //单账号签约时
     },
     rules:{
       contract_source:{required:true,message:'合同来源不能为空',trigger:'change'},
@@ -171,6 +172,7 @@
     compliance.form.crm_contract_id=0,
     compliance.form.contract_code='',
     compliance.form.company_name='',
+    compliance.form.wx_user_name='',
     compliance.form.currency_unit='CNY',
     compliance.form.seller_ids='',
     compliance.form.seller_id='',
@@ -301,6 +303,7 @@
       compliance.form.has_payment=0
       compliance.form.has_invoice=1
       compliance.form.company_name=selectItem.company_name
+      compliance.form.wx_user_name=selectItem.wx_user_name
       compliance.form.relate_contract_code=''
       compliance.form.actual_pay_companies=''
     }
@@ -316,6 +319,7 @@
         compliance.form.has_invoice = 0;
         compliance.form.relate_contract_code = res.data.RelationContractDetailList.map((it) => it.ContractCode).join(",");
         compliance.form.company_name = selectItem.company_name;
+        compliance.form.wx_user_name = selectItem.wx_user_name;
         compliance.form.actual_pay_companies = res.data.RelationContractDetailList.map((it) => it.CompanyName).join(",");
       }
       compliance.contractTypeCheck = [compliance.form.has_payment, selectItem.contract_type_int];
@@ -390,7 +394,7 @@
     contractInfoForm.value && 
     contractInfoForm.value.validateField([
       'contract_code','company_name','contract_type','seller_ids',
-      'start_date','contract_amount','relate_contract_code','actual_pay_companies'
+      'start_date','contract_amount','relate_contract_code','actual_pay_companies','wx_user_name'
     ])
   }
 
@@ -705,6 +709,7 @@ const getContractSearchListFunT = async (value,cb) => {
   const setSupplementaryData=()=>{
     compliance.form.supplement =1
     compliance.form.company_name = props.supplementaryInfo.company_name
+    compliance.form.wx_user_name = props.supplementaryInfo.wx_user_name
     compliance.form.currency_unit = props.supplementaryInfo.currency_unit
     compliance.form.start_date = props.supplementaryInfo.start_date
     compliance.form.end_date = props.supplementaryInfo.end_date
@@ -720,6 +725,7 @@ const getContractSearchListFunT = async (value,cb) => {
     compliance.form.crm_contract_id=props.detailInfo.crm_contract_id
     compliance.form.contract_code=props.detailInfo.contract_code
     compliance.form.company_name=props.detailInfo.company_name
+    compliance.form.wx_user_name=props.detailInfo.wx_user_name
     compliance.form.currency_unit=props.detailInfo.currency_unit
     compliance.form.seller_ids=props.detailInfo.seller_ids
     compliance.form.seller_id=props.detailInfo.seller_id || props.detailInfo.rai_seller_id
@@ -865,6 +871,9 @@ const getContractSearchListFunT = async (value,cb) => {
               key="seller-single" >
               </el-cascader>
             </el-form-item>
+            <el-form-item label="联系人姓名" prop="wx_user_name" >
+              <div class="user-name-box">{{compliance.form.wx_user_name}}（单账号签约）</div>
+            </el-form-item>
             <el-form-item label="合同金额" id="contractInfo-contractAmount"
             prop="contract_amount">
               <el-input v-model.trim="compliance.form.contract_amount"
@@ -1100,4 +1109,14 @@ const getContractSearchListFunT = async (value,cb) => {
 .dialog-custom{
   min-width: 800px;
 }
+.user-name-box {
+  display: flex;
+  align-items: center;
+  width: 320px;
+  height: 40px;
+  border-radius: 8px;
+  background-color: #f5f7fa;
+  padding: 20px;
+  box-sizing: border-box;
+}
 </style>