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

src/views/receivable/documentary/documentaryReport.vue

@@ -37,8 +37,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="invoiceRiskType" label="应收项">
-                <el-select v-model="recordForm.invoiceRiskType">
+              <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>
                 </el-select>

src/views/receivable/handingFee/invoiceRecord.vue

@@ -191,21 +191,21 @@
       </template>
     </el-dialog>
     <el-dialog v-model="handleSettlementShow" title="标识结清" width="500">
-    <div>
-      <el-form label-width="auto" style="max-width: 600px">
-        <el-form-item label="差额原因">
-          <el-input v-model="settlementPaymentReason" style="width: 100%;" type="textarea" />
-        </el-form-item>
-      </el-form>
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="settlementPaymentComfirm()">
-          确定
-        </el-button>
+      <div>
+        <el-form label-width="auto" style="max-width: 600px">
+          <el-form-item label="差额原因">
+            <el-input v-model="settlementPaymentReason" style="width: 100%;" type="textarea" />
+          </el-form-item>
+        </el-form>
       </div>
-    </template>
-  </el-dialog>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="settlementPaymentComfirm()">
+            确定
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
     <el-image-viewer v-if="imageShow" :url-list="[bigImageUrl]" @close="imageShow = false" />
   </PageMain>
 </template>
@@ -334,13 +334,24 @@ const handleCountRecord = (row) => {
 }
 // 开票明细查询
 const handleInvoiceDetail = (row) => {
-  router.push({
-    path: '/receivable/private/report',
-    query: {
-      activeName: '3',
-      id: row.id
-    }
-  })
+  if (row.invoiceRiskType == '10') {
+    router.push({
+      path: '/receivable/private/report',
+      query: {
+        activeName: '3',
+        id: row.id
+      }
+    })
+  } else {
+    router.push({
+      path: '/receivable/private/report',
+      query: {
+        activeName: '4',
+        id: row.id
+      }
+    })
+  }
+
 }
 // 删除
 const handleDelete = (row) => {
@@ -387,7 +398,7 @@ const settlementPaymentComfirm = () => {
     })
     return
   }
-  api.financeApi.updateSettlementStatus({invoiceId: id.value, settlementPaymentReason: settlementPaymentReason.value}).then((res: any) => {
+  api.financeApi.updateSettlementStatus({ invoiceId: id.value, settlementPaymentReason: settlementPaymentReason.value }).then((res: any) => {
     if (res.code == 200) {
       ElMessage({
         message: res.msg,

src/views/receivable/handingFee/report.vue

@@ -863,8 +863,10 @@ onMounted(() => {
   } else if (route.query.activeName == "3") {
     recordForm2.value.invoiceId = route.query.id
     initData3(['1']);
-  }
-  else {
+  }else if (route.query.activeName == "4") {
+    recordForm3.value.invoiceId = route.query.id
+    initData3(['3']);
+  } else {
     initData1();
   }
 })