更改了用户消息弹窗的确认，和JIS发运的列名

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

@@ -535,9 +535,8 @@ export default {
         if (item.meta.isTop) {
           // 批量删除
           try {
-            await ElMessageBox.confirm("删除", "提示", {
+            await ElMessageBox.confirm(format("确认删除选中的%s行数据吗？", rows.length), "提示", {
               type: "warning",
-              message: format("确认删除选中的%s行数据吗？", rows.length),
             });
             const response = await request(
               url,
@@ -561,9 +560,8 @@ export default {
         } else {
           // 单个删除
           try {
-            await ElMessageBox.confirm("删除", "提示", {
+            await ElMessageBox.confirm(format("确认删除当前行数据吗？", rows[0]), "提示", {
               type: "warning",
-              message: format("确认删除当前行数据吗？", rows[0]),
             });
             await request(url, null, { method: config.edit.deleteMethod });
             ElMessage({

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/centralized-control.js

@@ -122,7 +122,6 @@ export default function () {
     table: {
       schema: schema,
     },
-
     edit: {
       detailsUrl,
       createUrl,

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js

@@ -1,51 +1,111 @@
-import version from "../../version.js";
-
 const schema = {
   title: "JIS发运数据",
   type: "object",
   properties: {
-    version,
+    wmsBillNum: {
-    shippingDate: {
+      title: "发货单号",
+      type: "string",
+    },
+    num: {
+      title: "单据编号",
+      type: "string",
+    },
+    billTime: {
       title: "发货时间",
       type: "string",
       input: "datetime",
     },
-    wmsBillNum: {
+    oper: {
-      title: "发运单号",
+      title: "发货人",
+      type: "string",
+    },
+    orderNum: {
+      title: "排序单号",
+      type: "string",
+    },
+    seq: {
+      title: "订单序号",
+      type: "string",
+    },
+    realCode: {
+      title: "实际生产码",
+      type: "string",
+    },
+    vinCode: {
+      title: "订单生产码",
+      type: "string",
+    },
+    codeType: {
+      title: "生产码类型",
+      type: "string",
+    },
+    realPartCode: {
+      title: "实际零件号",
       type: "string",
     },
-    lu: {
+    partCode: {
       title: "零件号",
       type: "string",
     },
-    pn: {
+    batch: {
-      title: "生产号",
+      title: "批次",
       type: "string",
     },
-    keyCode: {
+    mesConfigCode: {
-      title: "组合键值(LU+PN)",
+      title: "MES配置码",
       type: "string",
     },
-    qty: {
+    fromLoc: {
-      title: "数量",
+      title: "来源库位",
-      type: "number",
+      type: "string",
     },
-    seqNumber: {
+    toLoc: {
-      title: "日顺序号",
+      title: "目标库位",
       type: "string",
     },
-    assemblyCode: {
+    refVinCode: {
-      title: "小总成号",
+      title: "参照订单生产码",
       type: "string",
     },
-    injectionCode: {
+    billCharacter: {
-      title: "注塑码",
+      title: "单据性质",
       type: "string",
     },
-    beginDate: {
+    refBillNum: {
-      title: "订单时间",
+      title: "发货关联单号",
+      type: "string",
+    },
+    erpToLoc: {
+      title: "Erp目标库位",
+      type: "string",
+    },
+    origiCode: {
+      title: "原生产码",
+      type: "string",
+    },
+    remark: {
+      title: "备注",
+      type: "string",
+    },
+    uniqueCode: {
+      title: "塑件唯一码",
+      type: "string",
+    },
+    pjsNum: {
+      title: "PJS顺序号",
+      type: "string",
+    },
+    matchNumber: {
+      title: "虚拟小总成",
+      type: "string",
+    },
+    deliverCode: {
+      title: "发货条码",
+      type: "string",
+    },
+    position: {
+      title: "客户位置",
       type: "string",
-      input: "datetime",
     },
   },
 };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js

@@ -4,48 +4,110 @@ const schema = {
   title: "JIS发运数据",
   type: "object",
   properties: {
-    version,
+    wmsBillNum: {
-    shippingDate: {
+      title: "发货单号",
+      type: "string",
+    },
+    num: {
+      title: "单据编号",
+      type: "string",
+    },
+    billTime: {
       title: "发货时间",
       type: "string",
       input: "datetime",
     },
-    wmsBillNum: {
+    oper: {
-      title: "发运单号",
+      title: "发货人",
+      type: "string",
+    },
+    orderNum: {
+      title: "排序单号",
+      type: "string",
+    },
+    seq: {
+      title: "订单序号",
+      type: "string",
+    },
+    realCode: {
+      title: "实际生产码",
+      type: "string",
+    },
+    vinCode: {
+      title: "订单生产码",
+      type: "string",
+    },
+    codeType: {
+      title: "生产码类型",
+      type: "string",
+    },
+    realPartCode: {
+      title: "实际零件号",
       type: "string",
     },
-    lu: {
+    partCode: {
       title: "零件号",
       type: "string",
     },
-    pn: {
+    batch: {
-      title: "生产号",
+      title: "批次",
       type: "string",
     },
-    keyCode: {
+    mesConfigCode: {
-      title: "组合键值(LU+PN)",
+      title: "MES配置码",
       type: "string",
     },
-    qty: {
+    fromLoc: {
-      title: "数量",
+      title: "来源库位",
-      type: "number",
+      type: "string",
     },
-    seqNumber: {
+    toLoc: {
-      title: "日顺序号",
+      title: "目标库位",
       type: "string",
     },
-    assemblyCode: {
+    refVinCode: {
-      title: "小总成号",
+      title: "参照订单生产码",
       type: "string",
     },
-    injectionCode: {
+    billCharacter: {
-      title: "注塑码",
+      title: "单据性质",
       type: "string",
     },
-    beginDate: {
+    refBillNum: {
-      title: "订单时间",
+      title: "发货关联单号",
+      type: "string",
+    },
+    erpToLoc: {
+      title: "Erp目标库位",
+      type: "string",
+    },
+    origiCode: {
+      title: "原生产码",
+      type: "string",
+    },
+    remark: {
+      title: "备注",
+      type: "string",
+    },
+    uniqueCode: {
+      title: "塑件唯一码",
+      type: "string",
+    },
+    pjsNum: {
+      title: "PJS顺序号",
+      type: "string",
+    },
+    matchNumber: {
+      title: "虚拟小总成",
+      type: "string",
+    },
+    deliverCode: {
+      title: "发货条码",
+      type: "string",
+    },
+    position: {
+      title: "客户位置",
       type: "string",
-      input: "datetime",
     },
   },
 };

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

@@ -78,7 +78,6 @@ export default function () {
     table: {
       schema: schema,
     },
-
     edit: {
       importUrl,
       exportUrl,

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/centralized-control.js

@@ -15,10 +15,13 @@ export default {
     const onCommand = async (item, rows, load) => {
       if (item.path === "open-version" || item.path === "closed-version") {
         try {
-          await ElMessageBox.confirm("删除", "提示", {
+          await ElMessageBox.confirm(
+            format(`确认${item.path === "open-version" ? "启用" : "停用"}选中的%s行数据吗？`, rows.length),
+            "提示",
+            {
               type: "warning",
-            message: format(`确认${item.path === "open-version" ? "启用" : "停用"}选中的%s行数据吗？`, rows.length),
+            }
-          });
+          );
           const url = `${config.baseUrl}/${item.path}`;
           await request(
             url,

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

@@ -3,7 +3,7 @@ import html from "html";
 import useConfig from "../../models/user.js";
 import request from "../../request/index.js";
 import { format } from "../../utils/index.js";
-import { ElMessage } from "element-plus";
+import { ElMessage, ElMessageBox } from "element-plus";
 
 export default {
   components: { AppList },
@@ -17,11 +17,31 @@ export default {
       if (item.path === "%s/reset-password") {
         const url = format(item.path, rows[0].id);
         await request(`base/user/${url}`, null, { method: item.meta.method });
+        try {
+          await ElMessageBox.confirm(format("是否重置用户%s密码", rows[0].userName), "提示", {
+            type: "warning",
+          });
+          await ElMessage({
+            type: "info",
+            message: "密码已经成功重置为123456",
+          });
+          const url = `${config.baseUrl}/${item.path}`;
+          await request(
+            url,
+            rows.map((o) => o.id),
+            { method: "POST" }
+          );
+          console.log(context);
+          await load();
+        } catch (error) {
+          if (error === "cancel") {
             ElMessage({
               type: "info",
-          message: format("用户%s的密码已经成功重置为123456", rows[0].userName),
+              message: "操作取消",
             });
           }
+        }
+      }
     };
     return { config, onCommand };
   },