Merge branch 'bug-fix'

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

@@ -561,6 +561,7 @@
             // 预登记过来的
             params={...params,contract_register_id:props.supplementaryInfo.id}
           }
+          // console.log(params);
           // 新增
           contractRegisterCheck({company_name:compliance.form.company_name,
             start_date:compliance.form.start_date,end_date:compliance.form.end_date,seller_ids:compliance.form.seller_ids}).then(res=>{
@@ -739,9 +740,8 @@
     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]
-    compliance.form.has_payment = props.supplementaryInfo.has_payment
-    compliance.form.contract_type = props.supplementaryInfo.contract_type
-    compliance.contractTypeCheck=[compliance.form.has_payment,compliance.form.contract_type]
+    compliance.contractTypeCheck=[props.supplementaryInfo.has_payment,props.supplementaryInfo.contract_type]
+    contractTypeChange(compliance.contractTypeCheck)
     serviceDataHandle(props.supplementaryInfo.services)
   }
 

src/views/financialStatistics/businessIncome.vue

@@ -152,13 +152,13 @@
             <el-radio-button v-for="item in customerTypeArray" :key="item.value" class="dimension-radio"
             :label="item.value" >{{ item.label }}</el-radio-button>
           </el-radio-group>
-          <el-date-picker v-model="invoiceTime" type="monthrange"
-          start-placeholder="开始日期" end-placeholder="结束日期" style="max-width: 238px;margin:0 30px 8px 0;"
-          value-format="YYYY-MM"></el-date-picker>
           <el-cascader :options="sellerArray" v-model="sellersCheckList" clearable placeholder="请选择销售"
           collapse-tags :show-all-levels="false" collapse-tags-tooltip key="seller" filterable 
           style="max-width: 238px;margin:0 30px 8px 0;"
           :props="{multiple:true,label:'seller_name',value:'seller_id',children:'child',emitPath:false}" ></el-cascader>
+          <el-date-picker v-model="invoiceTime" type="monthrange"
+          start-placeholder="开始日期" end-placeholder="结束日期" style="max-width: 238px;margin:0 30px 8px 0;"
+          value-format="YYYY-MM"></el-date-picker>
         </div>
         <el-button @click="exportData" type="primary" size="large" style="width: 118px;" :loading="loading.export">导出数据</el-button>
       </div>