Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

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

@@ -21,20 +21,13 @@ export default {
       if (input) {
         result.push({
           ...createRoute("input", "数据输入"),
-          children: [
+          children: [{ ...createRoute("jie-suan", "结算数据", page) }, { ...createRoute("fa-yun", "发运数据", page) }, { ...createRoute("edi", "EDI数据", page) }],
-            { ...createRoute("jie-suan", "结算数据", page) },
-            { ...createRoute("fa-yun", "发运数据", page) },
-            { ...createRoute("edi", "EDI数据", page) },
-          ],
         });
       }
       if (compare) {
         result.push({
           ...createRoute("compare", "数据比对"),
-          children: [
+          children: [{ ...createRoute("fa-yun", "EDI与发运数据", page) }, { ...createRoute("jie-suan", "EDI、发运与计算数据比对", page) }],
-            { ...createRoute("fa-yun", "EDI与发运数据", page) },
-            { ...createRoute("jie-suan", "EDI、发运与计算数据比对", page) },
-          ],
         });
       }
       if (settle) {

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-tabs style="height:100%;">
-                <el-descriptions-item label="发票号">{{setup3Model.invbillNum}}</el-descriptions-item>
+                <template v-for="item in setup3Model.items">
-                <el-descriptions-item label="业务类型">{{businessTypes.options.find(o=>o.value===setup3Model.businesType)?.label}}</el-descriptions-item>
+                  <el-tab-pane :label="item.invbillNum">
-                <el-descriptions-item label="未税金额">{{setup3Model.tax}}</el-descriptions-item>
+                    <el-descriptions border>
-                <el-descriptions-item label="税额">{{setup3Model.businesType}}</el-descriptions-item>
+                      <el-descriptions-item label="发票号">{{item.invbillNum}}</el-descriptions-item>
-                <el-descriptions-item label="税率">{{setup3Model.businesType}}</el-descriptions-item>
+                      <el-descriptions-item label="业务类型">{{businessTypes.options.find(o=>o.value===item.businesType)?.label}}</el-descriptions-item>
-              </el-descriptions>
+                      <el-descriptions-item label="未税金额">{{item.tax}}</el-descriptions-item>
-              <app-table :data="setup3Model.detail" :columns="setup2columns" />
+                      <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>
@@ -127,7 +132,7 @@ export default {
           <el-button type="primary" @click="setupRef-=1" v-if="setupRef>1&&setupRef<4">上一步</el-button>
         </span>
         <span class="dialog-footer">
-          <el-button type="primary" @click="next" v-if="setupRef<3">下一步</el-button>
+          <el-button type="primary" @click="next" v-if="setupRef<4">下一步</el-button>
         </span>
       </template>
     </el-dialog>
@@ -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: [],
@@ -564,6 +571,14 @@ export default {
       }
     };
     const next = async () => {
+      let service = null;
+      if (props.businessType === "JisBBAC") {
+        service = "bbac_ba_service";
+      } else if (props.usinessType === "JisHBPO") {
+        service = "hbpo_ba_service";
+      } else {
+        service = "pub_ba_service";
+      }
       if (setupRef.value === 1) {
         try {
           // setupRef.value += 1;
@@ -587,47 +602,31 @@ export default {
               });
             });
           } else if (result.data?.code === 400) {
-            ElMessage({
+            // ElMessage({
-              type: "error",
+            //   type: "error",
-              message: "操作失败",
+            //   message: "操作失败",
-            });
+            // });
             window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`));
           }
         } catch (e) {
           console.log(e);
         }
       } else if (setupRef.value === 2) {
-        let service = null;
+        const url = `settleaccount/${service}/reissue-invoice-list`;
-        if (props.businessType === "JisBBAC") {
-          service = "bbac_ba_service";
-        } else if (props.usinessType === "JisHBPO") {
-          service = "hbpo_ba_service";
-        } else {
-          service = "pub_ba_service";
-        }
-        const url = `settleaccount/${service}}/reissue-invoice-list`;
         const result = await request(url, adjList.value, { method: "POST" });
         if (!result.errors) {
           //setup3的数据来源
-          setup3Model.value = result.data.data;
+          setup3Model.value = result.data;
           setupRef.value += 1;
         } else if (result.data?.code === 400 && result.data.fileName) {
-          ElMessage({
-            type: "error",
-            message: "操作失败",
-          });
           window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`));
         }
       } else if (setupRef.value === 3) {
-        const url = `settleaccount/${service}}/reissue-invoice-extend`;
+        const url = `settleaccount/${service}/reissue-invoice-extend`;
         const result = await request(url, adjList.value, { method: "POST" });
         if (!result.errors) {
           setupRef.value += 1;
         } else if (result.data?.code === 400 && result.data.fileName) {
-          ElMessage({
-            type: "error",
-            message: "操作失败",
-          });
           window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`));
         }
       } else {