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

src/views/platform/platformReport.vue

@@ -71,13 +71,6 @@
                 <el-input v-model="recordForm1.receiver"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item prop="a" label="保险公司">
-                <el-select v-model="recordForm1.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>
-            </el-col>
             <el-col :span="8">
               <el-form-item prop="settlementTime" label="结算时间">
                 <el-date-picker v-model="recordForm1.settlementTime" type="daterange" format="YYYY-MM-DD"
@@ -94,11 +87,10 @@
         <el-table height="calc(100% - 142px)" :data="recordData1" show-summary
           :summary-method="val => getSummaries(val, ['totalReceivable','settledAmount','unSettledAmount'])">
           <el-table-column prop="receiver" label="对接人"></el-table-column>
-          <el-table-column prop="companyName" label="保险公司"></el-table-column>
-          <el-table-column prop="totalReceivable" label="应收总计" width="150"></el-table-column>
-          <el-table-column prop="settledAmount" label="已结算总计" width="150"></el-table-column>
-          <el-table-column prop="unSettledAmount" label="未结算总计" width="150"></el-table-column>
-          <el-table-column prop="totalPaymentDifference" label="回款差额" width="200"></el-table-column>
+          <el-table-column prop="totalReceivable" label="应收总计" ></el-table-column>
+          <el-table-column prop="settledAmount" label="已结算总计" ></el-table-column>
+          <el-table-column prop="unSettledAmount" label="未结算总计" ></el-table-column>
+          <el-table-column prop="totalPaymentDifference" label="回款差额" ></el-table-column>
 
         </el-table>
         <div class="pagination">

src/views/receivable/documentary/documentaryRecord.vue

@@ -60,7 +60,7 @@
               :props="companyIdprops" style="width: 100%;" @change="handleCompanyChange" />
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="display: flex; align-items: start; justify-content: flex-end">
+        <el-col :span="24" style="display: flex; align-items: start; justify-content: flex-end">
           <el-button type="primary" @click="search">查询</el-button>
           <el-button plain type="primary" @click="reset">重置</el-button>
         </el-col>

src/views/receivable/documentary/documentaryReport.vue

@@ -30,7 +30,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item prop="status" label="结算状态">
-                <el-select v-model="recordForm.status">
+                <el-select v-model="recordForm.status" clearable>
                   <el-option v-for="item in optionObj['settlement_status']" :key="item.value" :value="item.value"
                     :label="item.label"></el-option>
                 </el-select>
@@ -44,6 +44,12 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item prop="signingTime" label="签单时间" >
+                <el-date-picker v-model="recordForm.signingTime" type="monthrange" format="YYYY-MM"
+                value-format="YYYY-MM" />
+              </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>
@@ -500,6 +506,8 @@ const view = (scope) => {
 const initData1 = () => {
   api.settlementApi.followCompanySuperviseSettlementReport({
     companyId: recordForm.value.companyId,
+    signingStartTime: recordForm.value.signingTime?.[0],
+    signingEndTime: recordForm.value.signingTime?.[1],
     startTime: recordForm.value.time?.[0],
     endTime: recordForm.value.time?.[1],
     invoiceStartTime: recordForm.value.invoiceTime?.[0],

src/views/receivable/documentary/index.vue

@@ -129,7 +129,7 @@
           </div>
           <span class="col-108 m-r-8">
             <el-button class="radius-2px width-100"
-              :disabled="selectedList.some(item => item.invoiceStatusName === '已开票')"
+              :disabled="selectedList.some(item => item.invoiceStatusName === '已开票' || item.disableFlag === '1')  "
               @click="handleBatchEdit">批量修改比例</el-button>
           </span>
           <span class="col-108 m-r-8">
@@ -141,7 +141,7 @@
               </el-button>
               <template #dropdown>
                 <el-dropdown-menu>
-                  <el-dropdown-item command="删除">删除</el-dropdown-item>
+                  <el-dropdown-item  :disabled="selectedList.some(item =>item.disableFlag === '1')" command="删除">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </template>
             </el-dropdown>

src/views/receivable/handingFee/invoiceRecord.vue

@@ -7,6 +7,11 @@
             <el-input v-model="form.recordId"></el-input>
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item prop="invoiceNo" label="开票号">
+            <el-input v-model="form.invoiceNo"></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item prop="companyId" label="保险公司">
             <el-select v-model="form.companyId" placeholder="请选择" clearable filterable @change="companyChange">
@@ -56,7 +61,7 @@
               format="YYYY-MM-DD HH:mm:ss" />
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="display: flex; align-items: start; justify-content: flex-end">
+        <el-col :span="24" style="display: flex; align-items: start; justify-content: flex-end">
           <el-button type="primary" @click="search">查询</el-button>
           <el-button plain type="primary" @click="reset">重置</el-button>
         </el-col>