Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/receivable/documentary/index.vue

@@ -129,7 +129,7 @@
             <el-button class="radius-2px width-100" type="primary" @click="handleExport(1)">导出</el-button>
           </div>
           <span class="col-108 m-r-8">
-            <el-button class="radius-2px width-100" @click="handleBatchEdit">批量修改比例</el-button>
+            <el-button class="radius-2px width-100" :disabled="selectedList.some(item => item.invoiceStatusName === '已开票')" @click="handleBatchEdit">批量修改比例</el-button>
           </span>
           <span class="col-108 m-r-8">
             <el-dropdown class="width-100" trigger="click" placement="bottom" @command="dropdownCommand">
@@ -903,6 +903,7 @@ const handleBatchEditSubmit = async () => {
   if (code === 200) {
     ElMessage.success(msg)
     batchEditShow.value = false
+    search()
   }
 }
 const downloadImportTemplate = () => {

src/views/receivable/handingFee/index.vue

@@ -131,7 +131,7 @@
             <el-button class="radius-2px width-100" type="primary" @click="handleExport">导出</el-button>
           </div>
           <span class="col-108 m-r-8">
-            <el-button class="radius-2px width-100" @click="handleBatchEdit">批量修改比例</el-button>
+            <el-button class="radius-2px width-100" :disabled="selectedList.some(item => item.invoiceStatusName === '已开票')" @click="handleBatchEdit">批量修改比例</el-button>
           </span>
           <span class="col-108 m-r-8">
             <el-dropdown class="width-100" trigger="click" placement="bottom" @command="dropdownCommand">
@@ -904,6 +904,7 @@ const handleBatchEditSubmit = async () => {
   if (code === 200) {
     ElMessage.success(msg)
     batchEditShow.value = false
+    search()
   }
 }
 let importModifyCallback = ref()// 导入数据回调

src/views/receivable/handingFee/report.vue

@@ -5,10 +5,9 @@
         <el-form v-model="recordForm" label-width="80">
           <el-row :gutter="20">
             <el-col :span="8">
-              <el-form-item prop="a" label="保险公司">
-                <el-select v-model="recordForm.companyId" placeholder="请选择" clearable filterable>
-                  <el-option v-for="item in companyList" :key="item.id" :value="item.id" :label="item.name"></el-option>
-                </el-select>
+              <el-form-item prop="companyId" label="保险公司">
+                <el-cascader filterable clearable placeholder="请选择" v-model="recordForm.companyId"
+                  :options="companyList" :props="companyIdprops" style="width: 100%;" @change="handleCompanyChange" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -45,6 +44,12 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item prop="time" label="签单时间">
+                <el-date-picker v-model="recordForm.signTimeRange" type="daterange" format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
             <el-col :span="24" style="height: 50px; display: flex; align-items: start; justify-content: flex-end">
               <el-button type="primary" @click="handleSearch(1)">查询</el-button>
               <el-button plain type="primary" @click="handleReset(1)">重置</el-button>
@@ -55,6 +60,7 @@
           show-summary>
           <el-table-column prop="companyName" label="保险公司" width="300"></el-table-column>
           <el-table-column prop="totalReceivable" label="应收金额"></el-table-column>
+          <el-table-column prop="totalOverinflatedAmount" label="虚增金额合计"></el-table-column>
           <el-table-column prop="superviseFee" label="应收手续费"></el-table-column>
           <el-table-column prop="SxfInvoicedAmount" label="已开票"></el-table-column>
           <el-table-column prop="sxfSettledAmount" label="已结算"></el-table-column>
@@ -369,6 +375,18 @@ const settlement_status = ref([
     label: '全部'
   },
 ])
+const companyIdprops = {
+  expandTrigger: 'hover' as const,
+  value: 'id',
+  label: 'name',
+  checkStrictly: true,
+}
+// 保险公司选择器改变时触发
+const handleCompanyChange = (e) => {
+  console.log(e)
+
+  recordForm.value.companyId = e[e.length - 1] || ''
+}
 let activeName = ref('1')
 const handleClick = (e) => {
   pages.value = 1
@@ -393,7 +411,7 @@ const CredentialList = ref([])//凭证图片
 // 保险公司
 let companyList = ref([])
 const initCompany = () => {
-  api.insuranceApi.leftList('').then((res: any) => {
+  api.agreementApi.findTree({ name: "", systemCode: localStorage.getItem('login_system') }).then((res: any) => {
     if (res.code == 200) {
       companyList.value = res.data
     }
@@ -490,6 +508,8 @@ const initData1 = () => {
     invoiceEndTime: recordForm.value.invoiceTime?.[1],
     settlementStartTime: recordForm.value.settlementTime?.[0],
     settlementEndTime: recordForm.value.settlementTime?.[1],
+    signingStartTime: recordForm.value.signTimeRange?.[0],
+    signingEndTime: recordForm.value.signTimeRange?.[1],
     status: recordForm.value.status,
     invoiceStatus: recordForm.value.invoiceStatus,
     invoiceTypes: ['1', '3'],
@@ -785,6 +805,7 @@ const handleOrderDetail = (type: any) => {
     }
   })
 }
+
 onMounted(() => {
   initOption();
   initCompany();