update

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js

@@ -36,7 +36,7 @@ export default {
                   :class="item.meta.htmlClass??'el-button--primary'"
                   v-if="item.meta.isTop"
                   @click="click(item,selectedRows)"
-                  :disabled="item.meta.disabled && item.meta.disabled.constructor === Function && item.meta.disabled(selectedRows,queryModel)"
+                  v-show="item.meta.disabled && item.meta.disabled.constructor === Function && item.meta.disabled(selectedRows,queryModel)"
                 >
                   <el-icon v-if="item.meta.icon"><svg-icon :name="item.meta.icon" /></el-icon>
                   <span>{{item.meta.title}}</span>
@@ -127,7 +127,7 @@ export default {
                       :class="item.meta.htmlClass??'el-button--primary'"
                       v-if="!item.meta.isTop"
                       @click="click(item,[scope.row])"
-                      :disabled="item.meta.disabled && item.meta.disabled(scope.row)"
+                      v-show="item.meta.disabled && item.meta.disabled(scope.row)"
                     >
                       <el-icon v-if="item.meta.icon"><svg-icon :name="item.meta.icon" /></el-icon>
                       <span>{{item.meta.title}}</span>

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js

@@ -68,7 +68,7 @@ const querySchema = {
 export default function (businessType, meta) {
   let service = null;
   let detailService = null;
-  if (businessType === "JisBBAC") {
+  if (businessType === "JisBBAC" || businessType === "MaiDanJianBBAC" || businessType === "MaiDanJianHBPO") {
     service = "bbac_sa_service";
     detailService = "bbac_sa_detail_service";
   } else if (businessType === "JisHBPO") {

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js

@@ -33,7 +33,7 @@ const schema = {
     invoiceState: {
       title: "发票状态",
       type: "string",
-      input: "select",
+      input: "tabs",
       options: [
         { value: 1, label: "正常" },
         { value: 2, label: "报废" },
@@ -116,6 +116,13 @@ export default function (businessType, type) {
                 value: null,
                 readOnly: true,
               },
+              {
+                logic: "and",
+                column: "invoiceState",
+                action: "equal",
+                value: null,
+                readOnly: true,
+              },
             ],
           },
           skipCount: {

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js

@@ -10,13 +10,13 @@ export default [
           createButton("query", "title=查询&isTop=true"),
           createButton("create", "title=新建&isTop=true"),
           createButton("update", "title=编辑"),
-          createButton("delete", "title=删除&disabled=o=>o.userName==='admin'"),
+          createButton("delete", "title=删除", (o) => o.userName !== "admin"),
           createButton("reset-password", "title=重置密码&method=PUT"),
         ],
       },
       {
         ...createPage("role", "title=角色管理"),
-        children: [createButton("query", "title=查询&isTop=true"), createButton("create", "title=新建&isTop=true"), createButton("delete", "title=删除&disabled=o => o.isStatic")],
+        children: [createButton("query", "title=查询&isTop=true"), createButton("create", "title=新建&isTop=true"), createButton("delete", "title=删除", (o) => o.isStatic)],
       },
       {
         ...createPage("material", "title=物料主数据"),

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js

@@ -2,16 +2,21 @@ import createRoute, { createPage, createButton } from "./utils.js";
 
 // #region 数据输入
 function createInputJieSuanShuju(path, business, client, title = "结算数据") {
-  return {
+  const routes = {
     ...createPage(path, `title=${title}&businessType=${business}&client=${client}`),
     component: "/input/jie-suan",
     children: [
       createButton("query", "title=查询&isTop=true"),
-      createButton("import", "title=导入&isTop=true"),
+      //createButton("import", "title=导入&isTop=true"),
       createButton("export", "title=导出&pattern=row&key=billNum"),
-      createButton("delete", "title=删除&isTop=true"),
+      //createButton("delete", "title=删除&isTop=true"),
     ],
   };
+  if (business !== "MaiDanJianBBAC" && business !== "MaiDanJianHBPO") {
+    routes.children.push(createButton("import", "title=导入&isTop=true"));
+    routes.children.push(createButton("delete", "title=删除&isTop=true"));
+  }
+  return routes;
 }
 
 function createInputFaYunShuJu(path, business, client, title = "发运数据") {
@@ -341,6 +346,7 @@ export default [
           createButton("import", "title=导入开票文件&isTop=true"),
           createButton("approval", "title=财务审核通过&isTop=true"),
           createButton("export-group", "title=导出发票分组&pattern=paged"),
+          createButton("approval", "title=发票重开"),
           createButton("reject", "title=退回&isTop=true"),
           createButton("sync", "title=同步到QAD&isTop=true"),
         ],

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/utils.js

@@ -25,12 +25,15 @@ function createPage(path, meta = null, component = null) {
   };
 }
 
-function createButton(path, meta = null, component = null) {
-  return {
+function createButton(path, meta = null, show = null) {
+  const result = {
     path,
-    component,
     meta: Object.assign(createDefaultRoute("button", "file"), qs.parse(meta)),
   };
+  if (show) {
+    result.meta.show = show;
+  }
+  return result;
 }
 
 export default createRoute;

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/styles/site.css

@@ -96,7 +96,7 @@ a.logo {
 }
 
 .el-form--inline .el-form-item__content {
-  width: 192px;
+  min-width: 192px;
   /* height: 32px; */
 }