Merge branches 'techPool_466' and 'fixed'

src/views/dashboard/index.vue

@@ -105,7 +105,7 @@
         axisLabel:{
           color:'#999',
           formatter:(value)=>{
-            return value/10000
+            return Math.round(value*10)/10000
           }
         }
       },

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

@@ -9,6 +9,7 @@
   import financialCommon from '../composition/common'
 
   const contractSourceArray=['非CRM合同导入','CRM合同导入']
+  const contractOwnereArray=['实际使用方','代付方']
   // 合同状态数组
   const contractStatusArray=financialCommon().contractStatusArray
   // 合同类型数组
@@ -226,10 +227,6 @@
       setComplianceDetail()
     }
   }) 
-
-  watch(()=>compliance.form.has_invoice,(value)=>{
-    console.log(value);
-  }) 
   
 // --------------------------------------------------------方法
 
@@ -238,7 +235,7 @@
     if(!value) return 
     compliance.form.has_payment = value[0]
     if(compliance.form.has_payment==0){
-      compliance.form.has_invoice=true
+      compliance.form.has_invoice=1
     }
     compliance.form.contract_type = value[1]
     if(compliance.form.contract_type==1){
@@ -305,14 +302,14 @@
     if(selectItem.contract_business_type_int==2){
       // 代付合同
       compliance.form.has_payment=1
-      compliance.form.has_invoice=true
+      compliance.form.has_invoice=1
       compliance.form.company_name=selectItem.actual_company_name
       compliance.form.relate_contract_code=selectItem.relate_contract_code
       compliance.form.actual_pay_companies=selectItem.company_name
     }else{
       //自付合同 也可能是非标代付
       compliance.form.has_payment=0
-      compliance.form.has_invoice=true
+      compliance.form.has_invoice=1
       compliance.form.company_name=selectItem.company_name
       compliance.form.relate_contract_code=''
       compliance.form.actual_pay_companies=''
@@ -323,7 +320,7 @@
       //非标代付合同
       if(res.data.RelationContractDetailList && res.data.RelationContractDetailList.length>0 && selectItem.contract_business_type_int==1){
         compliance.form.has_payment=1
-        compliance.form.has_invoice=false
+        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.actual_pay_companies=res.data.RelationContractDetailList.map(it => it.CompanyName).join(',')
@@ -393,7 +390,6 @@
     // compliance.form.contract_type 1-新签 2-续约 4-补充
     compliance.form.contract_type=selectItem.contract_type_int==3?4:selectItem.contract_type_int
     compliance.form.relate_contract_main_code=!compliance.form.has_payment?selectItem.relate_contract_main_code:''
-    // compliance.contractTypeCheck = [compliance.form.has_payment,compliance.form.contract_type]
     contractInfoForm.value && 
     contractInfoForm.value.validateField([
       'contract_code','company_name','contract_type','seller_ids',
@@ -565,11 +561,11 @@
           compliance.form.actual_pay_companies=''
         }
 
-        if(compliance.form.has_invoice){
-          compliance.form.has_invoice=1
-        }else{
-          compliance.form.has_invoice=0
-        }
+        // if(compliance.form.has_invoice){
+        //   compliance.form.has_invoice=1
+        // }else{
+        //   compliance.form.has_invoice=0
+        // }
         // 检验合同名称或者合同有效期是否重复
         if(compliance.form.contract_register_id){
           // 编辑
@@ -889,14 +885,14 @@
               <el-input v-model="compliance.form.contract_code" placeholder="请输入合同编号"
               v-if="compliance.form.contract_source==0" >
                 <template #prefix v-if="compliance.form.has_payment==1">
-                  <span>{{ compliance.form.has_invoice?'代付方':'实际使用方' }}</span>
+                  <span>{{ compliance.form.has_invoice==1?'代付方':'实际使用方' }}</span>
                 </template>
               </el-input>
               <scrollableSelect :loadMoreMethod="loadContractNoMore" v-model="compliance.form.contract_code" placeholder="请搜索合同编号" v-else
               :searchMethod="contractNoSearch" @change="selectContractNo" useLoading :isLoading="contractNoInfo.contractNoLoading" 
               >
                 <template #prefix v-if="compliance.form.has_payment==1">
-                  <span>{{ compliance.form.has_invoice?'代付方':'实际使用方' }}</span>
+                  <span>{{ compliance.form.has_invoice==1?'代付方':'实际使用方' }}</span>
                 </template>
                 <el-option :label="item.contract_code" :value="item.contract_code" v-for="item in contractNoInfo.contractNoArray" :key="item.contract_id"></el-option>
               </scrollableSelect>
@@ -943,14 +939,22 @@
               <el-cascader :options="contractTypeArray" placeholder="请选择合同类型" @change="contractTypeChange"
               v-model="compliance.contractTypeCheck" :clearable="false" key="contractType">
               </el-cascader>
-              <el-checkbox v-model="compliance.form.has_invoice" style="margin-left: 20px;"
-              v-show="compliance.form.has_payment==1">（开票、到款）</el-checkbox>
+              <!-- <el-checkbox v-model="compliance.form.has_invoice" style="margin-left: 20px;"
+              v-show="compliance.form.has_payment==1">（开票、到款）</el-checkbox> -->
             </el-form-item>
             <el-form-item label="关联主合同" prop="relate_contract_main_code" 
             v-if="compliance.form.contract_type==4">
               <el-input v-model="compliance.form.relate_contract_main_code" 
               placeholder="请输入关联主合同" />
             </el-form-item>
+            <el-form-item label="合同所属方" prop="has_invoice"
+            :rules="{required:true,message:'合同所属方不能为空',trigger:'blur'}"
+            v-if="compliance.form.has_payment==1">
+              <el-select v-model="compliance.form.has_invoice" 
+                placeholder="请选择合同所属方" >
+                  <el-option :label="item" :value="index" v-for="(item,index) in contractOwnereArray" :key="item"></el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="代付方" prop="actual_pay_companies" class="actual_pay_companies"
             :rules="compliance.form.contract_source==0?{required:true,message:'代付方不能为空',trigger:'blur'}:{required:false}"
             v-if="compliance.form.has_payment==1">
@@ -961,9 +965,9 @@
                 </el-tooltip>
               </div>
             </el-form-item>
-            <el-form-item :label="compliance.form.has_invoice?'关联客户合同':'关联代付合同'" prop="relate_contract_code" v-if="compliance.form.has_payment">
+            <el-form-item :label="compliance.form.has_invoice==1?'关联客户合同':'关联代付合同'" prop="relate_contract_code" v-if="compliance.form.has_payment">
               <el-input v-model="compliance.form.relate_contract_code" 
-              :placeholder="compliance.form.has_invoice?'请输入实际使用方合同编号':'请输入代付合同编号'" />
+              :placeholder="compliance.form.has_invoice==1?'请输入实际使用方合同编号':'请输入代付合同编号'" />
             </el-form-item>
             <el-form-item label="合同状态" prop="contract_status">
               <el-select v-model="compliance.form.contract_status" 

src/views/financialManagement/contractProgress.vue

@@ -274,7 +274,7 @@
         contract_amount:res.data.contract_amount,
         contract_type:res.data.contract_type,
         has_payment:res.data.has_payment,
-        has_invoice:res.data.has_invoice==1,
+        has_invoice:res.data.has_invoice,
         actual_pay_companies:res.data.actual_pay_companies,
         relate_contract_code:res.data.relate_contract_code,
         relate_contract_main_code:res.data.relate_contract_main_code,
@@ -354,7 +354,7 @@
             </div>
           </div>
           <!-- 开票登记 -->
-          <div class="info-box" v-if="operationtype!='compliance' && detailInfo.has_invoice" 
+          <div class="info-box" v-if="operationtype!='compliance' && detailInfo.has_invoice==1" 
           :style="{order:operationtype=='invoice'?2:0}"
           style="margin-top:20px ;" v-permission="['financial:list:invoice','financial:list:placement','financial:list:viewIandP','or']">
             <div class="info-box-head" @click="unfoldOrFlod(1)"
@@ -370,7 +370,7 @@
             </div>
           </div>
           <!-- 到款登记 -->
-          <div class="info-box" v-if="operationtype!='compliance' && detailInfo.has_invoice" 
+          <div class="info-box" v-if="operationtype!='compliance' && detailInfo.has_invoice==1" 
           v-permission="['financial:list:invoice','financial:list:placement','financial:list:viewIandP','or']"
           style="margin-top:20px;order: 1;">
             <div class="info-box-head" @click="unfoldOrFlod(2)"

src/views/financialManagement/invoice/invoiceList.vue

@@ -95,7 +95,7 @@ invoice.placementList()
           <el-table-column label="开票日" align="center" prop="invoice_time" show-overflow-tooltip></el-table-column>
           <el-table-column label="销售" align="center" prop="seller_name" ></el-table-column>
           <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip></el-table-column>
-          <el-table-column label="操作" width="120" align="center">
+          <!-- <el-table-column label="操作" width="120" align="center">
             <template #default="{row}">
               <div class="table-options" style="justify-content: center;">
                 <span class="table-option-buttons" style="margin-right: 0;"
@@ -104,7 +104,7 @@ invoice.placementList()
                 </span>
               </div>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <template #empty>
             <div class="table-no-data">
               <img src="@/assets/img/icon/empty-data.png" />

src/views/financialManagement/placement/placementList.vue

@@ -77,7 +77,7 @@ placement.placementList()
           <el-table-column label="换算金额（元）" align="center" prop="amount" show-overflow-tooltip></el-table-column>
           <el-table-column label="到款日" align="center" prop="invoice_time" show-overflow-tooltip></el-table-column>
           <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip></el-table-column>
-          <el-table-column label="操作" width="120" align="center">
+          <!-- <el-table-column label="操作" width="120" align="center">
             <template #default="{row}">
               <div class="table-options" style="justify-content: center;">
                 <span class="table-option-buttons" style="margin-right: 0;"
@@ -86,7 +86,7 @@ placement.placementList()
                 </span>
               </div>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <template #empty>
             <div class="table-no-data">
               <img src="@/assets/img/icon/empty-data.png" />