From a9a2e8fb0245fe1b4069e2e4919c326a74c293fb Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Fri, 18 Aug 2023 08:55:35 +0800
Subject: [PATCH] update

---
 .../wwwroot/models/compare/compare.js         |  1 +
 .../wwwroot/views/settle/_check.js            | 39 +++++++++++++------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/compare/compare.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/compare/compare.js
index 264312e6..73edfb30 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/compare/compare.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/compare/compare.js
@@ -131,6 +131,7 @@ export default function (businessType, type) {
           name: {
             type: "string",
             hidden: true,
+            default: name,
           },
           stateName,
           businessType: {
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js
index 6f8d38d5..c24971d4 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js
@@ -4,6 +4,7 @@ import { ref, nextTick, onMounted, watch } from "vue";
 import request from "../../request/index.js";
 import AppForm from "../../components/form/index.js";
 import AppTable from "../../components/table/index.js";
+import { getUrl } from "../../request/index.js";
 
 export default {
   components: { AppForm, AppTable },
@@ -42,7 +43,7 @@ export default {
         </span>
       </template>
     </el-drawer>
-    <el-dialog class="re-open" v-model="setupDialogVisable" :close-on-click-modal="false" align-center destroy-on-close style="width:50%;height:80%">
+    <el-dialog class="re-open" v-model="setupDialogVisable" :close-on-click-modal="false" align-center destroy-on-close style="width:100%;height:100%">
       <template #header>发票重开</template>
       <el-steps :active="setupRef" align-center style="height:60px;">
         <el-step title="调整明细列表" />
@@ -65,6 +66,22 @@ export default {
           </el-row>
         </el-scrollbar>
       </div>
+      <div v-show="setupRef===2" style="height:100%;">
+        <el-row style="padding:14px 0;height:60px;">
+          <el-col>
+            <el-button type="primary" @click="showAddAdjDialog">新建</el-button>
+            <el-button type="primary" @click="showImportAdjDialog">导入</el-button>
+            <el-button type="primary" @click="deleteAdj">删除</el-button>
+          </el-col>
+        </el-row>
+        <el-scrollbar ref="scrollRef">
+          <el-row style="height:100%;">
+            <el-col style="height:calc(100% - 180px);">
+              <app-table ref="adjListRef" :data="adjList" :columns="columns5" />
+            </el-col>
+          </el-row>
+        </el-scrollbar>
+      </div>
       <template #footer>
         <span class="dialog-footer">
           <el-button type="primary" @click="setupRef-=1" v-if="setupRef>1">上一步</el-button>
@@ -378,16 +395,16 @@ export default {
     const next = async () => {
       if (setupRef.value === 1) {
         try {
-          const url = "settleaccount/adj_service/check-import";
-          const result = await request(url, adjList.value, { method: "POST" });
-          if (!result.errors) {
-            if (result.data?.code === 200) {
-              //明细对比逻辑处理
-              setupRef += 1;
-            } else if (result.data?.code === 400 && result.data.fileName) {
-              window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`));
-            }
-          }
+          // const url = "settleaccount/adj_service/check-import";
+          // const result = await request(url, adjList.value, { method: "POST" });
+          // if (!result.errors) {
+          //   if (result.data?.code === 200) {
+          //     setupRef.value += 1;
+          //   } else if (result.data?.code === 400 && result.data.fileName) {
+          //     window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`));
+          //   }
+          // }
+          setupRef.value += 1;
         } catch (e) {
           console.log(e);
         }