瀏覽代碼

bug提测试

hbchen 1 年之前
父節點
當前提交
39bbce1400

+ 1 - 11
src/views/financialManagement/contractProgress-component/Compliance.vue

@@ -64,7 +64,6 @@
       contract_code:'',
       company_name:'',
       currency_unit:'CNY',
-      new_company:0,
       seller_ids:'',
       seller_id:0,
       contract_status:'',
@@ -179,7 +178,6 @@
     compliance.form.contract_code='',
     compliance.form.company_name='',
     compliance.form.currency_unit='CNY',
-    compliance.form.new_company=0,
     compliance.form.seller_ids='',
     compliance.form.seller_id='',
     compliance.form.contract_status='',
@@ -245,14 +243,8 @@
     if(compliance.form.has_payment==0){
       compliance.form.has_invoice=1
     }
+    // 新签 -- 新客户 其余的算老客户
     compliance.form.contract_type = value[1]
-    if(compliance.form.contract_type==1){
-      // 新签 -- 新客户
-      compliance.form.new_company = 1
-    }else{
-      // 续约、补充 -- 老客户
-      compliance.form.new_company = 0
-    }
     if(compliance.form.contract_type!=4){
       // 新签、续约
       compliance.form.relate_contract_main_code=''
@@ -744,7 +736,6 @@
     compliance.form.supplement =1
     compliance.form.company_name = props.supplementaryInfo.company_name
     compliance.form.currency_unit = props.supplementaryInfo.currency_unit
-    compliance.form.new_company = parseInt(props.supplementaryInfo.new_company)
     compliance.form.start_date = props.supplementaryInfo.start_date
     compliance.form.end_date = props.supplementaryInfo.end_date
     compliance.contractValidityDate = [compliance.form.start_date,compliance.form.end_date]
@@ -758,7 +749,6 @@
     compliance.form.contract_code=props.detailInfo.contract_code
     compliance.form.company_name=props.detailInfo.company_name
     compliance.form.currency_unit=props.detailInfo.currency_unit
-    compliance.form.new_company=props.detailInfo.new_company
     compliance.form.seller_ids=props.detailInfo.seller_ids
     compliance.form.seller_id=props.detailInfo.seller_id || props.detailInfo.rai_seller_id
     compliance.form.contract_status=props.detailInfo.contract_status

+ 0 - 2
src/views/financialManagement/contractProgress.vue

@@ -261,7 +261,6 @@
         contract_code:res.data.contract_code,
         company_name:res.data.company_name,
         currency_unit:res.data.currency_unit,
-        new_company:res.data.new_company,
         seller_ids:res.data.seller_ids,
         seller_id:res.data.seller_id,
         seller_name:res.data.seller_name,
@@ -319,7 +318,6 @@
         supplement:1,
         company_name:res.data.company_name,
         currency_unit:res.data.list[0]?.currency_unit,
-        new_company:parseInt(res.data.new_company),
         start_date : res.data.start_date,
         end_date:res.data.end_date,
         services:res.data.services

+ 2 - 2
src/views/financialStatistics/commodityPayment.vue

@@ -446,9 +446,9 @@ const moment = inject('$moment')
           <el-table-column label="序号" align="center" prop="serialNumber" >
           </el-table-column>
           <el-table-column label="客户名称" prop="company_name" align="center" show-overflow-tooltip ></el-table-column>
-          <el-table-column label="是否新客户" prop="new_company" align="center">
+          <el-table-column label="是否新客户" prop="contract_type" align="center">
             <template #default="{row}">
-              {{ row.new_company==1?'是':'否' }}
+              {{ row.contract_type==1?'是':'否' }}
             </template>
           </el-table-column>
           <el-table-column label="合同有效期" prop="date" align="center" show-overflow-tooltip ></el-table-column>