up

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js

@@ -19,7 +19,6 @@ export default {
             <app-table :data="model.invoicE_MAP_GROUP" :columns="columns1" />
           </el-scrollbar>
         </el-tab-pane>
-
         <el-tab-pane :label="columns2.title" v-if="model.invoicE_WAIT_DETAIL?.length">
           <el-scrollbar>
             <app-table :data="model.invoicE_WAIT_DETAIL" :columns="columns2" />
@@ -83,7 +82,7 @@ export default {
         <el-row style="width:100%;height:100%;padding:10px;">
           <el-col :span="12" style="height:100%;padding:0 5px 0 0;">
             <el-scrollbar>
-              <app-table ref="setup2table1Ref" :data="model.invoicE_WAIT_DETAIL" :columns="setup2columns" />
+              <app-table ref="setup2table1Ref" :data="model.invoicE_WAIT_DETAIL??model.invoicE_WAIT_DETAIL_BBAC??model.invoicE_WAIT_DETAIL_BJ" :columns="setup2columns" />
             </el-scrollbar>
           </el-col>
           <el-col :span="12" style="height:100%;padding:0 0 0 5px;">
@@ -97,14 +96,20 @@ export default {
         <el-row style="width:100%;height:100%;padding:10px;">
           <el-col style="height:100%;padding:0 5px 0 0;">
             <el-scrollbar>
-              <el-descriptions>
-                <el-descriptions-item label="发票号">{{setup3Model.invbillNum}}</el-descriptions-item>
-                <el-descriptions-item label="业务类型">{{businessTypes.options.find(o=>o.value===setup3Model.businesType)?.label}}</el-descriptions-item>
-                <el-descriptions-item label="未税金额">{{setup3Model.tax}}</el-descriptions-item>
-                <el-descriptions-item label="税额">{{setup3Model.businesType}}</el-descriptions-item>
-                <el-descriptions-item label="税率">{{setup3Model.businesType}}</el-descriptions-item>
-              </el-descriptions>
-              <app-table v-if="setup3Model.detail" :data="setup3Model.detail" :columns="setup2columns" />
+              <el-tabs style="height:100%;">
+                <template v-for="item in setup3Model.items">
+                  <el-tab-pane :label="item.invbillNum">
+                    <el-descriptions border>
+                      <el-descriptions-item label="发票号">{{item.invbillNum}}</el-descriptions-item>
+                      <el-descriptions-item label="业务类型">{{businessTypes.options.find(o=>o.value===item.businesType)?.label}}</el-descriptions-item>
+                      <el-descriptions-item label="未税金额">{{item.tax}}</el-descriptions-item>
+                      <el-descriptions-item label="税额">{{item.businesType}}</el-descriptions-item>
+                      <el-descriptions-item label="税率">{{item.businesType}}</el-descriptions-item>
+                    </el-descriptions>
+                    <app-table v-if="item.detail" :data="item.detail" :columns="setup2columns" />
+                  </el-tab-pane>
+                </template>
+              </el-tabs>
             </el-scrollbar>
           </el-col>
         </el-row>
@@ -193,7 +198,9 @@ export default {
     watch(show, (value) => context.emit("update:modelValue", value));
     const loading = ref(false);
     const model = ref({
-      invoicE_WAIT_DETAIL: [],
+      invoicE_WAIT_DETAIL: null,
+      invoicE_WAIT_DETAIL_BBAC: null,
+      invoicE_WAIT_DETAIL_BJ: null,
       invoicE_MAP_GROUP: [],
       invoicE_NOT_SETTLE: [],
       adJ_DETAIL: [],
@@ -610,7 +617,6 @@ export default {
         if (!result.errors) {
           //setup3的数据来源
           setup3Model.value = result.data;
-          setup3Model.value.detail = adjList.value;
           setupRef.value += 1;
         } else if (result.data?.code === 400 && result.data.fileName) {
           window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`));