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

src/views/receivable/documentary/documentaryRecord.vue

@@ -527,6 +527,7 @@ const getSummaries = (param) => {
 onMounted(() => {
   if (route.query.invoiceType) {
     form.value.partnerCompanyId = route.query.partnerCompanyId || ''
+    form.value.signMonth = route.query.signMonth || ''
     if (route.query.invoiceType == '2') {
       form.value.accountsReceivable = '10'
     } else {

src/views/receivable/documentary/documentaryReport.vue

@@ -37,7 +37,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="invoiceRiskType" label="应收项" >
+              <el-form-item prop="invoiceRiskType" label="应收项">
                 <el-select v-model="recordForm.invoiceRiskType" clearable>
                   <el-option value="2" label="车险"></el-option>
                   <el-option value="4" label="非车险"></el-option>
@@ -45,9 +45,14 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="signingTime" label="签单时间" >
+              <el-form-item prop="signingTime" label="签单时间">
                 <el-date-picker v-model="recordForm.signingTime" type="monthrange" format="YYYY-MM"
-                value-format="YYYY-MM" />
+                  value-format="YYYY-MM" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="signMonth" label="月份">
+                <el-date-picker v-model="recordForm.signMonth" style="width: 100%;" type="month" 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">
@@ -332,7 +337,7 @@
       </el-tab-pane> -->
     </el-tabs>
   </PageMain>
-  <el-dialog  v-model="viewCredential" title="查看凭证" width="400">
+  <el-dialog v-model="viewCredential" title="查看凭证" width="400">
     <div class="text-center text-[14px] text-[#999] pb-[20px]">点击图片放大预览</div>
     <el-image style="width: 100%; height: 300px" :src="CredentialList[0]" :zoom-rate="1.2" :max-scale="7"
       :min-scale="0.2" :preview-src-list="CredentialList" show-progress :initial-index="4" alt="凭证图片" fit="cover" />
@@ -519,6 +524,7 @@ const view = (scope) => {
 
 const initData1 = () => {
   api.settlementApi.followCompanySuperviseSettlementReport({
+    ...recordForm.value,
     companyId: recordForm.value.companyId,
     signingStartTime: recordForm.value.signingTime?.[0],
     signingEndTime: recordForm.value.signingTime?.[1],
@@ -540,6 +546,7 @@ const initData1 = () => {
 }
 const initData2 = () => {
   api.settlementApi.followSettlementExcel({
+    ...recordForm1.value,
     agreementType: '2',
     settlementId: recordForm1.value.settlementId,
     partnerCompanyId: recordForm1.value.partnerCompanyId,
@@ -623,13 +630,16 @@ const handleReset = (type) => {
   switch (type) {
     case 1:
       recordForm.value = {
+        signMonth: '',
         companyId: '',
         time: [],
         status: ''
-      }
+      },
+       initData1()
       break;
     case 2:
       recordForm1.value = {
+        signMonth: '',
         settlementId: '',
         companyId: '',
         invoiceParty: '',
@@ -638,34 +648,17 @@ const handleReset = (type) => {
         settlementPerson: '',
         settlementTime: [],
         invoiceId: ''
-      }
-      break;
-    case 3:
-      recordForm2.value = {
-        invoiceId: '',
-        companyId: '',
-        invoiceParty: '',
-        settlementPerson: '',
-        settlementTime: [],
-        status: ''
-      }
-      break;
-    case 4:
-      recordForm3.value = {
-        invoiceId: '',
-        companyId: '',
-        invoiceParty: '',
-        settlementPerson: '',
-        settlementTime: [],
-        status: ''
-      }
+      },
+       initData2()
       break;
+
   }
 }
 // 结算明细
 const handleSettlementDetail = (row) => {
   activeName.value = '2'
   recordForm1.value.partnerCompanyId = row.partnerCompanyId
+  recordForm1.value.signMonth = row.month
   if (row.invoiceType == '2') {
     recordForm1.value.invoiceRiskType = '10'
   } else {
@@ -680,6 +673,7 @@ const handleInvoiceRecord = (row) => {
     query: {
       partnerCompanyId: row.partnerCompanyId,
       invoiceType: row.invoiceType,
+      signMonth: row.month,
     }
   })
 }