From 69f8da31cdbec62a27cd21c3814db63a5ea466cd Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 13 Sep 2023 09:04:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/components/table/index.js              |  2 +-
 .../wwwroot/models/input/jie-suan.js               |  8 ++++----
 .../wwwroot/views/settle/_check.js                 | 14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js
index 600f5437..6b5e29aa 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js
@@ -39,7 +39,7 @@ export default {
         </template>
         <div class="cell el-table__cell" :class="key" v-else-if="!item.hidden">
           <div class="cell">
-            <template v-if="item.input==='datetime'">{{dayjs(model[key]).format('YYYY-MM-DD HH:mm:ss')}}</template>
+            <template v-if="item.input==='datetime'">{{dayjs(row[key]).format('YYYY-MM-DD HH:mm:ss')}} {{}}</template>
             <template v-else>{{row[key]}}</template>
           </div>
         </div>
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js
index 9d6bd941..ed1229f6 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js
@@ -1,12 +1,12 @@
 import businessType, { version, state } from "../_options.js";
 
-export default function (businessType, meta) {
+export default function (type, meta) {
   let service = null;
   let detailService = null;
-  if (businessType === "JisBBAC" || businessType === "MaiDanJianBBAC") {
+  if (type === "JisBBAC" || type === "MaiDanJianBBAC") {
     service = "bbac_sa_service";
     detailService = "bbac_sa_detail_service";
-  } else if (businessType === "JisHBPO" || businessType === "MaiDanJianHBPO") {
+  } else if (type === "JisHBPO" || type === "MaiDanJianHBPO") {
     service = "hbpo_sa_service";
     detailService = "hbpo_sa_detail_service";
   } else {
@@ -100,7 +100,7 @@ export default function (businessType, meta) {
         { label: 1046, value: 1046 },
       ],
       input: "select",
-      hidden: true,
+      hideForList: true,
       default: meta.client === "bbac-1040" ? 1040 : 1046,
     };
     querySchema.properties.filters.default.push({
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 8b509301..c5ad76ec 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
@@ -63,8 +63,8 @@ export default {
         <el-step title="发票预览" />
         <el-step title="重开成功" />
       </el-steps>
-      <div v-loading="loading">
-        <div class="setup1" v-show="setupRef===1" style="height:calc(100% - 120px);">
+      <div v-loading="loading" style="height:calc(100% - 60px);">
+        <div class="setup1" v-show="setupRef===1" style="height:100%;">
           <el-row style="padding:14px 0;height:60px;">
             <el-col>
               <el-button type="primary" @click="showAddAdjDialog">新建</el-button>
@@ -80,7 +80,7 @@ export default {
             </el-row>
           </el-scrollbar>
         </div>
-        <div class="setup2" v-show="setupRef===2" style="height:calc(100% - 60px);background:#ebeef5;">
+        <div class="setup2" v-show="setupRef===2" style="height:100%;background:#ebeef5;">
           <el-row style="width:100%;height:100%;padding:10px;">
             <el-col :span="12" style="height:100%;padding:0 5px 0 0;">
               <el-scrollbar>
@@ -94,7 +94,7 @@ export default {
             </el-col>
           </el-row>
         </div>
-        <div class="setup3" v-show="setupRef===3" style="height:calc(100% - 60px);">
+        <div class="setup3" v-show="setupRef===3" style="height:100%;">
           <el-row style="width:100%;height:100%;padding:10px;">
             <el-col style="height:100%;padding:0 5px 0 0;">
               <el-scrollbar>
@@ -117,7 +117,7 @@ export default {
             </el-col>
           </el-row>
         </div>
-        <div class="setup4" v-show="setupRef===4" style="height:calc(100% - 60px);">
+        <div class="setup4" v-show="setupRef===4" style="height:100%;">
           <el-row style="width:100%;height:100%;padding:10px;">
             <el-col style="height:100%;padding:0 5px 0 0;">
               <el-scrollbar>
@@ -488,7 +488,7 @@ export default {
       },
     };
     const defaultAdjModel = schemaToModel(adjSchema);
-    const adjModel = ref(Object.assign({ invBillNum: "" }, defaultAdjModel));
+    const adjModel = ref(null);
     const addAdjFormRef = ref(null);
     const showAddAdjDialog = () => {
       adjModel.value = Object.assign({}, defaultAdjModel);
@@ -498,7 +498,7 @@ export default {
       try {
         const valid = await addAdjFormRef.value.validate();
         if (valid) {
-          adjList.value.unshift(adjModel.value);
+          adjList.value.unshift(Object.assign({}, adjModel.value));
           addDialogVisible.value = false;
           nextTick(() => {
             scrollRef.value.update();