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

src/views/platform/platformReport.vue

@@ -7,33 +7,39 @@
             <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-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="time" label="时间">
+              <el-form-item prop="time" label="创建时间">
                 <el-date-picker v-model="recordForm.time" type="daterange" format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item prop="time" label="结算时间">
+                <el-date-picker v-model="recordForm.settlementTime" type="daterange" format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item prop="status" label="结算状态">
                 <el-select v-model="recordForm.status">
-              <el-option v-for="item in optionObj['settlement_status']" :key="item.value" :value="item.value" :label="item.label"></el-option>
+                  <el-option v-for="item in optionObj['settlement_status']" :key="item.value" :value="item.value"
+                    :label="item.label"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24" style="height: 50px; display: flex; align-items: start; justify-content: flex-end">
+            <el-col :span="16" style="height: 50px; display: flex; align-items: start; justify-content: flex-end">
               <el-button type="primary" @click="initData1()">查询</el-button>
               <el-button plain type="primary" @click="handleReset(1)">重置</el-button>
             </el-col>
           </el-row>
         </el-form>
-        <el-table height="calc(100% - 100px)" :data="recordData" row-key="companyId"
-          :summary-method="getSummaries" show-summary>
-          <el-table-column prop="companyName" label="保险公司" ></el-table-column>
+        <el-table height="calc(100% - 100px)" :data="recordData" row-key="companyId" :summary-method="getSummaries"
+          show-summary>
+          <el-table-column prop="companyName" label="保险公司"></el-table-column>
           <!--                    <el-table-column type="expand" label="合作保险公司" width="200">
                                             <template #default>
                                                 展开
@@ -264,22 +270,13 @@ const getSummaries = (param) => {
   return sums
 }
 
-
-const handleSearch1 = () => {
-  initData1()
-}
-const handleReset1 = () => {
-
-}
-const view = (scope) => {
-
-}
-
 const initData1 = () => {
   api.settlementApi.companySuperviseSettlementReport({
     companyId: recordForm.value.companyId,
     startTime: recordForm.value.time?.[0],
     endTime: recordForm.value.time?.[1],
+    settlementStartTime: recordForm.value.settlementTime?.[0],
+    settlementEndTime: recordForm.value.settlementTime?.[1],
     status: recordForm.value.status,
     agreementType: '1'
   }).then((res: any) => {
@@ -403,7 +400,7 @@ const handleExport1 = () => {
   })
 }
 
-const optionObj=ref({})
+const optionObj = ref({})
 const initOption = () => {
   let list = ['settlement_status']
   list.forEach(item => {

src/views/receivable/documentary/documentaryReport.vue

@@ -12,11 +12,23 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="time" label="时间">
+              <el-form-item prop="time" label="创建时间">
                 <el-date-picker v-model="recordForm.time" type="daterange" format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item prop="time" label="开票时间">
+                <el-date-picker v-model="recordForm.invoiceTime" type="daterange" format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="time" label="结算时间">
+                <el-date-picker v-model="recordForm.settlementTime" type="daterange" format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item prop="status" label="结算状态">
                 <el-select v-model="recordForm.status">
@@ -25,7 +37,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24" style="height: 50px; display: flex; align-items: start; justify-content: flex-end">
+            <el-col :span="8" 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>
             </el-col>
@@ -418,6 +430,10 @@ const initData1 = () => {
     companyId: recordForm.value.companyId,
     startTime: recordForm.value.time?.[0],
     endTime: recordForm.value.time?.[1],
+    invoiceStartTime: recordForm.value.invoiceTime?.[0],
+    invoiceEndTime: recordForm.value.invoiceTime?.[1],
+    settlementStartTime: recordForm.value.settlementTime?.[0],
+    settlementEndTime: recordForm.value.settlementTime?.[1],
     status: recordForm.value.status,
     invoiceTypes: ['2', '4'],
     agreementType: '2'

src/views/receivable/handingFee/report.vue

@@ -12,11 +12,23 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="time" label="时间">
+              <el-form-item prop="time" label="创建时间">
                 <el-date-picker v-model="recordForm.time" type="daterange" format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item prop="time" label="开票时间">
+                <el-date-picker v-model="recordForm.invoiceTime" type="daterange" format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="time" label="结算时间">
+                <el-date-picker v-model="recordForm.settlementTime" type="daterange" format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item prop="status" label="结算状态">
                 <el-select v-model="recordForm.status">
@@ -25,7 +37,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24" style="height: 50px; display: flex; align-items: start; justify-content: flex-end">
+            <el-col :span="8" 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>
             </el-col>
@@ -429,6 +441,10 @@ const initData1 = () => {
     companyId: recordForm.value.companyId,
     startTime: recordForm.value.time?.[0],
     endTime: recordForm.value.time?.[1],
+    invoiceStartTime: recordForm.value.invoiceTime?.[0],
+    invoiceEndTime: recordForm.value.invoiceTime?.[1],
+    settlementStartTime: recordForm.value.settlementTime?.[0],
+    settlementEndTime: recordForm.value.settlementTime?.[1],
     status: recordForm.value.status,
     invoiceTypes: ['1', '3'],
     agreementType: '2'

src/views/receivable/handingFee/ticket.vue

@@ -173,25 +173,28 @@
         </el-form-item>
         <el-form-item prop="receivableSupervisePremium" label="应收金额">
           <el-input-number v-model="countForm.receivableSupervisePremium" style="width: 100%;" :min="0" :precision="4"
+            controls-position="right" @change="isSettlement?handleChange():handleChange1()" />
+        </el-form-item>
+        <el-form-item v-if="isSettlement" prop="actualReceivedAmount" label="实收金额">
+          <el-input-number v-model="countForm.actualReceivedAmount" style="width: 100%;" :min="0" :precision="4"
             controls-position="right" @change="handleChange" />
         </el-form-item>
-        <el-form-item prop="overinflatedAmount" label="虚增金额">
+        <el-form-item v-if="isSettlement" prop="actualReceivedAmount" label="回款差额">
+          <el-input v-model="countForm.paymentDifference" disabled></el-input>
+        </el-form-item>
+        <el-form-item v-else prop="overinflatedAmount" label="虚增金额">
           <el-input v-model="countForm.overinflatedAmount" disabled></el-input>
         </el-form-item>
-        <el-form-item prop="actualReceivedAmount" label="差额原因">
+        <el-form-item v-if="isSettlement" prop="actualReceivedAmount" label="差额原因">
+          <el-input v-model="countForm.paymentReason" placeholder="请输入"></el-input>
+        </el-form-item>
+        <el-form-item v-else prop="actualReceivedAmount" label="虚增金额原因">
           <el-input v-model="countForm.paymentReason" placeholder="请输入"></el-input>
         </el-form-item>
         <el-form-item prop="invoiceTime" label="开票日期">
           <el-date-picker v-model="countForm.invoiceTime" style="width: 100%;" type="date"
             value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD" />
         </el-form-item>
-        <el-form-item v-if="isSettlement" prop="actualReceivedAmount" label="实收金额">
-          <el-input-number v-model="countForm.actualReceivedAmount" style="width: 100%;" :min="0" :precision="4"
-            controls-position="right" @change="handleChange1" />
-        </el-form-item>
-        <el-form-item v-if="isSettlement" prop="actualReceivedAmount" label="回款差额">
-          <el-input v-model="countForm.paymentDifference" disabled></el-input>
-        </el-form-item>
         <el-form-item v-if="isSettlement" prop="receivePaymentDate" label="收款日期">
           <el-date-picker v-model="countForm.receivePaymentDate" style="width: 100%;" type="date"
             value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD" />
@@ -522,12 +525,14 @@ const calBeforeInvoice = async (params: any) => {
 
 /** 计算实收金额与应收监管保费的差值，并将结果赋值给付款差额字段 */
 const handleChange = async () => {
+  if(!isSettlement.value) return
   const num = await calSub(countForm.value.actualReceivedAmount, countForm.value.receivableSupervisePremium)
   countForm.value.paymentDifference = num
 }
 /** 计算应收监管保费差额并更新虚增金额 */
 
 const handleChange1 = async () => {
+  if(!isSettlement.value) return
   const num = await calSub(countForm.value.receivableSupervisePremium, receivableSupervisePremium.value)
   countForm.value.overinflatedAmount = num
 }