update

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[prop]).format('YYYY-MM-DD HH:mm:ss')}}</template>
+            <template v-if="item.input==='datetime'">{{dayjs(model[key]).format('YYYY-MM-DD HH:mm:ss')}}</template>
             <template v-else>{{row[key]}}</template>
           </div>
         </div>

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

@@ -8,6 +8,7 @@ import extraProperties from "../../models/_extraProperties.js";
 import { getUrl } from "../../request/index.js";
 import businessTypes from "../../models/_options.js";
 import { required, trim } from "../../utils/validation.js";
+import { delay } from "../../utils/index.js";
 
 export default {
   components: { AppForm, AppTable },
@@ -51,6 +52,7 @@ export default {
           <el-button type="primary" @click="showSetupDialog" v-if="isBusiness&&data.invbillNum&&model.adJ_DETAIL.length===0&&row.invoiceState===1&&(row.state===3||row.state===4)">
             报废重开
           </el-button>
+          <el-button type="primary" @click="showSetupDialog"> 报废重开 </el-button>
         </span>
       </template>
     </el-drawer>
@@ -62,6 +64,7 @@ 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);">
           <el-row style="padding:14px 0;height:60px;">
             <el-col>
@@ -97,11 +100,11 @@ export default {
             <el-col style="height:100%;padding:0 5px 0 0;">
               <el-scrollbar>
                 <el-tabs style="height:100%;">
-                <template v-for="item in setup3Model">
+                  <template v-for="(item,index) in setup3Model">
-                  <el-tab-pane :label="item.invbillNum??'null'">
+                    <el-tab-pane :label="item.invbillNum??('发票'+(index+1))">
                       <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="业务类型">{{businessTypes.options.find(o=>o.value===item.businessType)?.label}}</el-descriptions-item>
                         <el-descriptions-item label="未税金额">{{item.amt}}</el-descriptions-item>
                         <el-descriptions-item label="税后金额">{{item.taxAmt}}</el-descriptions-item>
                         <el-descriptions-item label="税额">{{item.realAmt }}</el-descriptions-item>
@@ -128,12 +131,13 @@ export default {
             </el-col>
           </el-row>
         </div>
+      </div>
       <template #footer v-if="setupRef!==4">
         <span class="dialog-footer">
-          <el-button type="primary" @click="setupRef-=1" v-if="setupRef>1&&setupRef<4">上一步</el-button>
+          <el-button type="primary" @click="setupRef-=1" :disabled="loading" v-if="setupRef>1&&setupRef<4">上一步</el-button>
         </span>
         <span class="dialog-footer">
-          <el-button type="primary" @click="next" v-if="setupRef<4">下一步</el-button>
+          <el-button type="primary" @click="next" :disabled="loading" v-if="setupRef<4">下一步</el-button>
         </span>
       </template>
     </el-dialog>
@@ -155,7 +159,7 @@ export default {
     <el-dialog style="width:480px;height:480px;" align-center destroy-on-close :close-on-click-modal="false" v-model="importDialogVisible">
       <template #header>导入调整明细</template>
       <el-scrollbar>
-        <el-row v-loading="loading">
+        <el-row>
           <el-col>
             <app-form ref="importAdjFromRef" v-if="importDialogVisible&&importAdjModel" :schema="importAdjSchema" v-model="importAdjModel" :hideButton="true" inline />
           </el-col>
@@ -581,6 +585,8 @@ export default {
       } else {
         service = "pub_ba_service";
       }
+      try {
+        loading.value = true;
         if (setupRef.value === 1) {
           try {
             // setupRef.value += 1;
@@ -603,11 +609,7 @@ export default {
                   addDiff(o, list1, ".amt");
                 });
               });
-          } else if (result.data?.code === 400) {
+            } else if (result.data?.code === 400 && result.data.fileName) {
-            // ElMessage({
-            //   type: "error",
-            //   message: "操作失败",
-            // });
               window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`));
             }
           } catch (e) {
@@ -638,6 +640,10 @@ export default {
             refreshRef.value = true;
           });
         }
+      } finally {
+        await delay(5000);
+        loading.value = false;
+      }
     };
     const drawerClosed = () => {
       context.emit("complete");