From ed3deb1d8599a402dd4ca23263afbc5ae54daa37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E6=97=AD=E4=B9=8B?= <12930972+jiang-xuzhi@user.noreply.gitee.com> Date: Mon, 31 Jul 2023 13:15:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BA=86=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=B6=88=E6=81=AF=E5=BC=B9=E7=AA=97=E7=9A=84=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=EF=BC=8C=E5=92=8CJIS=E5=8F=91=E8=BF=90=E7=9A=84?= =?UTF-8?q?=E5=88=97=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/components/list/index.js | 6 +- .../wwwroot/models/centralized-control.js | 1 - .../jis-bbac/input/bbac_se_detail_service.js | 106 ++++++++++++++---- .../jis-hbpo/input/hbpo_se_detail_service.js | 104 +++++++++++++---- .../wwwroot/models/purchase_price_service.js | 1 - .../views/base-data/centralized-control.js | 11 +- .../wwwroot/views/base-data/user.js | 30 ++++- 7 files changed, 200 insertions(+), 59 deletions(-) diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js index 0951985a..045a2190 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js +++ b/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({ diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/centralized-control.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/centralized-control.js index 41586761..b8c925af 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/centralized-control.js +++ b/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, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js index 84149e1a..ce588c53 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js +++ b/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, - shippingDate: { + wmsBillNum: { + title: "发货单号", + type: "string", + }, + num: { + title: "单据编号", + type: "string", + }, + billTime: { title: "发货时间", type: "string", input: "datetime", }, - wmsBillNum: { - title: "发运单号", + oper: { + 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: { - title: "生产号", + batch: { + title: "批次", type: "string", }, - keyCode: { - title: "组合键值(LU+PN)", + mesConfigCode: { + title: "MES配置码", type: "string", }, - qty: { - title: "数量", - type: "number", + fromLoc: { + title: "来源库位", + type: "string", }, - seqNumber: { - title: "日顺序号", + toLoc: { + title: "目标库位", type: "string", }, - assemblyCode: { - title: "小总成号", + refVinCode: { + title: "参照订单生产码", type: "string", }, - injectionCode: { - title: "注塑码", + billCharacter: { + title: "单据性质", type: "string", }, - beginDate: { - title: "订单时间", + refBillNum: { + 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", }, }, }; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js index 9b22c3b3..d7bb45fc 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js +++ b/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, - shippingDate: { + wmsBillNum: { + title: "发货单号", + type: "string", + }, + num: { + title: "单据编号", + type: "string", + }, + billTime: { title: "发货时间", type: "string", input: "datetime", }, - wmsBillNum: { - title: "发运单号", + oper: { + 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: { - title: "生产号", + batch: { + title: "批次", type: "string", }, - keyCode: { - title: "组合键值(LU+PN)", + mesConfigCode: { + title: "MES配置码", type: "string", }, - qty: { - title: "数量", - type: "number", + fromLoc: { + title: "来源库位", + type: "string", }, - seqNumber: { - title: "日顺序号", + toLoc: { + title: "目标库位", type: "string", }, - assemblyCode: { - title: "小总成号", + refVinCode: { + title: "参照订单生产码", type: "string", }, - injectionCode: { - title: "注塑码", + billCharacter: { + title: "单据性质", type: "string", }, - beginDate: { - title: "订单时间", + refBillNum: { + 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", }, }, }; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js index f501aca5..e8fa348b 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js +++ b/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, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/centralized-control.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/centralized-control.js index afd243f5..bf48003a 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/centralized-control.js +++ b/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("删除", "提示", { - type: "warning", - message: format(`确认${item.path === "open-version" ? "启用" : "停用"}选中的%s行数据吗？`, rows.length), - }); + await ElMessageBox.confirm( + format(`确认${item.path === "open-version" ? "启用" : "停用"}选中的%s行数据吗？`, rows.length), + "提示", + { + type: "warning", + } + ); const url = `${config.baseUrl}/${item.path}`; await request( url, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/user.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/user.js index e6df244e..837804b7 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/user.js +++ b/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,10 +17,30 @@ 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 }); - ElMessage({ - type: "info", - message: format("用户%s的密码已经成功重置为123456", rows[0].userName), - }); + 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: "操作取消", + }); + } + } } }; return { config, onCommand }; From 7b49c416d28c5ee33b728eeb226bebff77ebdb56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E6=97=AD=E4=B9=8B?= <12930972+jiang-xuzhi@user.noreply.gitee.com> Date: Mon, 31 Jul 2023 17:05:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BA=86BusinessType?= =?UTF-8?q?=E5=92=8Cinvoice=E6=94=B9=E5=8F=98=E4=BA=86=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=88=97=E5=90=8D=EF=BC=8C=E6=B6=88=E9=99=A4=E4=BA=86=E7=A9=BA?= =?UTF-8?q?=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/components/list/index.js | 2 - .../wwwroot/models/material-relationship.js | 6 +- .../wwwroot/models/material.js | 10 +- .../models/price-list-app-service-bj.js | 2 +- .../wwwroot/models/price-list.js | 13 +-- .../wwwroot/models/pub_se_detail_service.js | 85 +++++++++----- .../tb_re-parts-relationship_service.js | 9 +- .../wwwroot/router/business.js | 44 ------- .../bj/input/bj_pub_se_detail_service.js | 1 + .../in/input/in_pub_se_detail_service.js | 1 + .../views/invoice/invoice_map_group.js | 108 ++++++++++++++---- .../input/bbac_jit_pub_se_detail_service.js | 1 + .../input/hbpo_jit_pub_se_detail_service.js | 1 + 13 files changed, 169 insertions(+), 114 deletions(-) diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js index 045a2190..3410b231 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js @@ -261,7 +261,6 @@ export default { -