From c5e887e4d4b8e2e282d04c6840e41bd71cc97332 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: Tue, 8 Aug 2023 14:32:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B9=B0=E5=8D=95=E4=BB=B6-H?=
=?UTF-8?q?BPO=E5=A4=9A=E4=B8=AA=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=BA=93?=
=?UTF-8?q?=E5=AD=98=E8=B0=83=E6=95=B4=E8=A1=A8=E7=95=8C=E9=9D=A2=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=B0=86businessTyped?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../wwwroot/components/list/index.js | 9 +-
.../wwwroot/models/businessType.js | 13 +
.../wwwroot/models/inventory/adjust.js | 200 +++++
.../wwwroot/models/inventory/backup.js | 6 +-
.../wwwroot/models/inventory/balance.js | 2 +-
.../wwwroot/models/inventory/inventory.js | 23 +-
.../wwwroot/models/inventory/log.js | 92 ++-
.../wwwroot/models/inventory/vmi.js | 60 +-
.../models/invoice/invoice_map_group.js | 6 +-
.../jis-bbac/input/bbac_sa_detail_service.js | 49 +-
.../models/jis-bbac/input/bbac_sa_service.js | 54 +-
.../settlement/bbac_can_sa_detail_service.js | 18 +-
.../jis-hbpo/input/hbpo_sa_detail_service.js | 48 +-
.../models/jis-hbpo/input/hbpo_sa_service.js | 62 +-
.../settlement/hbpo_can_sa_detail_service.js | 18 +-
.../wwwroot/models/job-service.js | 4 +-
.../models/pub_can_sa_detail_service.js | 16 +-
.../wwwroot/router/business.js | 716 ++++++++++++++----
.../contrast/bj_pub_sa_detail_jobservice.js | 12 +-
.../bj/input/bj_pub_sa_detail_service.js | 2 +-
.../views/bj/input/bj_pub_sa_service.js | 2 +-
.../bj/input/bj_pub_se_detail_service.js | 2 +-
.../contrast/in_pub_sa_detail_jobservice.js | 12 +-
.../in/input/in_pub_sa_detail_service.js | 2 +-
.../views/in/input/in_pub_sa_service.js | 2 +-
.../in/input/in_pub_se_detail_service.js | 2 +-
.../wwwroot/views/inventory/adjust.js | 15 +
.../views/invoice/invoice_map_group.js | 61 +-
.../bbac_jit_pub_sa_detail_jobservice.js | 12 +-
.../hbpo_jit_pub_sa_detail_jobservice.js | 12 +-
.../input/bbac_jit_pub_sa_detail_service.js | 2 +-
.../jit/input/bbac_jit_pub_sa_service.js | 2 +-
.../input/bbac_jit_pub_se_detail_service.js | 2 +-
.../input/hbpo_jit_pub_sa_detail_service.js | 2 +-
.../jit/input/hbpo_jit_pub_sa_service.js | 2 +-
.../input/hbpo_jit_pub_se_detail_service.js | 2 +-
.../contrast/md_pub_sa_detail_jobservice.js | 24 +
.../md/input/md_pub_sa_detail_service.js | 16 +
.../views/md/input/md_pub_sa_service.js | 16 +
.../md/input/md_pub_se_detail_service.js | 16 +
.../md/settlement/md_pub_ba_detail_service.js | 15 +
.../views/md/settlement/md_pub_ba_service.js | 15 +
.../md_pub_can_sa_detail_service.js | 15 +
.../md/settlement/md_pub_can_sa_service.js | 15 +
.../md/settlement/md_pub_not_sa_service.js | 15 +
.../md/settlement/md_pub_pd_detail_service.js | 15 +
.../views/md/settlement/md_pub_pd_service.js | 15 +
47 files changed, 1292 insertions(+), 429 deletions(-)
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/businessType.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/adjust.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/adjust.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/contrast/md_pub_sa_detail_jobservice.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/input/md_pub_sa_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/input/md_pub_sa_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/input/md_pub_se_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_ba_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_ba_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_can_sa_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_can_sa_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_not_sa_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_pd_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_pd_service.js
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 4d54071d..ad0dcd04 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
@@ -836,10 +836,11 @@ export default {
}
function isNotJit() {
return (
- route.meta.businessType !== 3 ||
- route.meta.businessType !== 4 ||
- route.meta.businessType !== 7 ||
- route.meta.businessType !== 8
+ route.meta.businessType !== "ZhiGongJianBBAC" ||
+ route.meta.businessType !== "ZhiGongJianHBPO" ||
+ route.meta.businessType !== "BeiJian" ||
+ route.meta.businessType !== "YinDuJian" ||
+ route.meta.businessType !== "MaiDanJianHBPO"
);
}
onMounted(async () => {
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/businessType.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/businessType.js
new file mode 100644
index 00000000..d42f18ee
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/businessType.js
@@ -0,0 +1,13 @@
+const options = [
+ { value: 0, label: "未定义" },
+ { value: 1, label: "JisBBAC" },
+ { value: 2, label: "JisHBPO" },
+ { value: 3, label: "直供件BBAC" },
+ { value: 4, label: "直供件HBPO" },
+ { value: 5, label: "买单件BBAC" },
+ { value: 6, label: "买单件HBPO" },
+ { value: 7, label: "备件" },
+ { value: 8, label: "印度件" },
+];
+const businessType = { title: "业务类型", type: "string", input: "select", options };
+export default businessType;
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/adjust.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/adjust.js
new file mode 100644
index 00000000..01d5910d
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/adjust.js
@@ -0,0 +1,200 @@
+import { billType, codeType, changedType, subBillType } from "./inventory.js";
+
+const schema = {
+ title: "库存事务日志",
+ type: "object",
+ properties: {
+ changedNumber: {
+ title: "变动单号",
+ type: "string",
+ },
+ changedTime: {
+ title: "变动时间",
+ type: "string",
+ input: "dateTime",
+ },
+ changedType,
+ changedBy: {
+ title: "变动人",
+ type: "string",
+ },
+ partCode: {
+ title: "调整LU零件号",
+ type: "string",
+ },
+ customerPartCode: {
+ title: "调整客户零件号",
+ type: "string",
+ },
+ orderNum: {
+ title: "EDI原始订单号",
+ type: "string",
+ },
+ billType,
+ subBillType,
+ reMark: {
+ title: "备注",
+ type: "string",
+ },
+ vinCode: {
+ title: "调整生产码",
+ type: "string",
+ },
+ codeType,
+ qty: {
+ title: "调整生产码",
+ type: "number",
+ },
+ billTime: {
+ title: "发运日期",
+ type: "string",
+ },
+ billNum: {
+ title: "WMS发运单号",
+ type: "string",
+ },
+ deliverTime: {
+ title: "订单日期",
+ type: "string",
+ input: "datetime",
+ },
+ erpToLoc: {
+ title: "ERP库位",
+ type: "string",
+ },
+ },
+};
+
+const baseUrl = "settleaccount/vmi";
+const queryUrl = `${baseUrl}/log`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const createUrl = `${baseUrl}/create`;
+const updateUrl = `${baseUrl}/update/%s`;
+const deleteUrl = `${baseUrl}/delete-list`;
+const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
+const exportUrl = `${baseUrl}/export`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+const importMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+ return {
+ query: {
+ url: queryUrl,
+ method: queryMethod,
+ hasFilter: true,
+ schema: {
+ title: "通用代码",
+ type: "object",
+ properties: {
+ filters: {
+ title: "项目",
+ type: "array",
+ hidden: true,
+ items: {
+ type: "object",
+ properties: {
+ logic: {
+ type: "int",
+ },
+ column: {
+ type: "string",
+ },
+ action: {
+ type: "int",
+ },
+ value: {
+ type: "string",
+ },
+ },
+ },
+ default: [
+ {
+ logic: "and",
+ column: "erpToLoc",
+ action: "like",
+ value: null,
+ readOnly: true,
+ },
+ {
+ logic: "and",
+ column: "createdDate",
+ action: "like",
+ value: null,
+ readOnly: true,
+ },
+ {
+ logic: "and",
+ column: "lu",
+ action: "like",
+ value: null,
+ readOnly: true,
+ },
+ {
+ logic: "and",
+ column: "tmpe4",
+ action: "like",
+ value: null,
+ readOnly: true,
+ },
+ {
+ logic: "and",
+ column: "vinCode",
+ action: "like",
+ value: null,
+ readOnly: true,
+ },
+ {
+ logic: "and",
+ column: "codeType",
+ action: "like",
+ value: null,
+ readOnly: true,
+ },
+ {
+ logic: "and",
+ column: "proType",
+ action: "like",
+ value: null,
+ readOnly: true,
+ },
+ ],
+ },
+ skipCount: {
+ hidden: true,
+ default: 0,
+ },
+ maxResultCount: {
+ hidden: true,
+ default: 10,
+ },
+ sorting: {
+ hidden: true,
+ },
+ },
+ },
+ },
+ table: {
+ schema: schema,
+ },
+ edit: {
+ detailsUrl,
+ createUrl,
+ updateUrl,
+ deleteUrl,
+ importUrl,
+ exportUrl,
+ detailsMethod,
+ createMethod,
+ updateMethod,
+ deleteMethod,
+ importMethod,
+ exportMethod,
+ schema: schema,
+ },
+ };
+}
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/backup.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/backup.js
index 07e27b50..e0b82612 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/backup.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/backup.js
@@ -10,6 +10,7 @@ const updateUrl = `${baseUrl}/update/%s`;
const deleteUrl = `${baseUrl}/delete-list`;
const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
const exportUrl = `${baseUrl}/backup-export`;
+const invokeUrl = "settleaccount/vmi/invoke";
const queryMethod = "POST";
const detailsMethod = "POST";
const createMethod = "POST";
@@ -17,6 +18,7 @@ const updateMethod = "POST";
const deleteMethod = "POST";
const importMethod = "POST";
const exportMethod = "POST";
+const invokeMethod = "POST";
export default function () {
return {
@@ -92,7 +94,7 @@ export default function () {
},
{
logic: "and",
- column: "proType",
+ column: "billType",
action: "like",
value: null,
readOnly: true,
@@ -123,12 +125,14 @@ export default function () {
deleteUrl,
importUrl,
exportUrl,
+ invokeUrl,
detailsMethod,
createMethod,
updateMethod,
deleteMethod,
importMethod,
exportMethod,
+ invokeMethod,
schema: schema,
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/balance.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/balance.js
index 55a1df18..7cb02e44 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/balance.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/balance.js
@@ -80,7 +80,7 @@ export default function () {
},
{
logic: "and",
- column: "proType",
+ column: "billType",
action: "like",
value: null,
readOnly: true,
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/inventory.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/inventory.js
index 10feea32..edc500a9 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/inventory.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/inventory.js
@@ -16,7 +16,26 @@ const options2 = [
{ value: "08", label: "后左轮眉" },
{ value: "09", label: "后右轮眉" },
];
-const proType = { title: "发货类型", type: "number", input: "select", options: options1 };
+const options3 = [
+ { value: 0, label: "无" },
+ { value: 1, label: "保险杠BBAC" },
+ { value: 2, label: "保险杠HBPO" },
+ { value: 3, label: "买单件保险杠BBAC" },
+ { value: 4, label: "买单件保险杠HBPO" },
+ { value: 5, label: "买单件小件BBAC" },
+ { value: 6, label: "买单件小件HBPO" },
+ { value: 7, label: "小件BBAC" },
+ { value: 8, label: "小件HBPO" },
+ { value: 9, label: "JIT直供件BBAC" },
+ { value: 10, label: "JIT直供件HBPO" },
+];
+const options4 = [
+ { value: "In", label: "入库" },
+ { value: "Out", label: "出库" },
+];
+const billType = { title: "发货类型", type: "number", input: "select", options: options1 };
const codeType = { title: "生产码类型", type: "string", input: "select", options: options2 };
+const subBillType = { title: "发货子类型", type: "number", input: "select", options: options3 };
+const changedType = { title: "变动类型", type: "string", input: "select", options: options4 };
-export { proType, codeType };
+export { billType, codeType, subBillType, changedType };
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/log.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/log.js
index b692765b..55bc5f3e 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/log.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/log.js
@@ -1,4 +1,4 @@
-import { proType, codeType } from "./inventory.js";
+import { billType, codeType, changedType, subBillType } from "./inventory.js";
//变动单据号、发生时间、生产码类型、、订单号、库位、变动数、EDI顺序号、备注、变动类型(In、Out标识)、发货类型(JIS\JIT\买单件\备件等)、
//实扣LU零件号、实扣客户零件号、结算LU零件号、结算客户零件号、实扣生产码、结算生产码
@@ -7,38 +7,94 @@ const schema = {
title: "库存事务日志",
type: "object",
properties: {
- orderNumber: {
+ changedNumber: {
title: "变动单号",
type: "string",
},
- createdDate: {
- title: "发生时间",
+ changedTime: {
+ title: "变动时间",
type: "string",
+ input: "dateTime",
},
- codeType,
- tmpe4: {
- title: "订单号",
+ changedType,
+ changedBy: {
+ title: "变动人",
type: "string",
},
- erpToLoc: {
- title: "库位",
+ partCode: {
+ title: "实扣厂内零件号",
type: "string",
},
- count: {
- title: "变动数",
- type: "number",
+ partCode2: {
+ title: "结算厂内零件号",
+ type: "string",
+ },
+ customerPartCode: {
+ title: "结算客户零件号",
+ type: "string",
},
- changedType: {
- title: "变动类型",
+ realCode: {
+ title: "WMS实发生产码",
type: "string",
},
- proType,
vinCode: {
- title: "生产码",
+ title: "EDI订单生产码",
+ type: "string",
+ },
+ settlementVinCode: {
+ title: "结算生产码",
+ type: "string",
+ },
+ codeType: {
+ title: "生产码类型",
+ type: "string",
+ },
+ billType,
+ subBillType,
+ qty: {
+ title: "数量",
+ type: "number",
+ },
+ billTime: {
+ title: "发运日期",
+ type: "string",
+ input: "datetime",
+ },
+ deliverTime: {
+ title: "订单日期",
+ type: "string",
+ input: "datetime",
+ },
+ seq: {
+ title: "EDI顺序号",
+ type: "string",
+ },
+ orderNum: {
+ title: "客户订单号",
+ type: "string",
+ },
+ uniqueCode: {
+ title: "塑件唯一码",
+ type: "string",
+ },
+ matchNumber: {
+ title: "EDI总成号",
+ type: "string",
+ },
+ pjsNum: {
+ title: "PJIS生产顺序号",
+ type: "string",
+ },
+ isReplenished: {
+ title: "是否补货",
+ type: "boolean",
+ },
+ erpToLoc: {
+ title: "ERP库位",
type: "string",
},
- lu: {
- title: "LU零件号",
+ configcode: {
+ title: "配置码",
type: "string",
},
},
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/vmi.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/vmi.js
index 88d6c4e7..676754e2 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/vmi.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/vmi.js
@@ -1,4 +1,4 @@
-import { proType, codeType } from "./inventory.js";
+import { billType, codeType, subBillType } from "./inventory.js";
export default function () {
return {
@@ -10,10 +10,6 @@ export default function () {
// hidden: true,
// showForList: false,
// },
- erpToLoc: {
- title: "ERP库位",
- type: "string",
- },
lu: {
title: "LU零件号",
type: "string",
@@ -27,47 +23,30 @@ export default function () {
type: "string",
},
codeType,
- proType,
- // codeType: {
- // title: "生产码类型",
- // type: "string",
- // input: "select",
- // options: [
- // { value: "01", label: "前保" },
- // { value: "02", label: "后保" },
- // { value: "03", label: "门槛" },
- // ],
- // },
- // proType: {
- // title: "发货类型",
- // type: "string",
- // input: "select",
- // options: [
- // { value: "JIS", label: "JIS" },
- // { value: "JIT", label: "JIT" },
- // { value: "买单件", label: "买单件" },
- // { value: "备件", label: "备件" },
- // ],
- // },
+ billType,
qty: {
title: "数量",
type: "string",
},
- shippingDate: {
+ billTime: {
title: "发运日期",
type: "string",
- input: "date",
+ input: "datetime",
},
- creationTime: {
+ deliverTime: {
title: "订单日期",
type: "string",
- input: "date",
+ input: "datetime",
+ },
+ erpToLoc: {
+ title: "ERP库位",
+ type: "string",
},
- seqNumber: {
+ seq: {
title: "EDI顺序号",
type: "string",
},
- tmpe4: {
+ orderNum: {
title: "客户订单号",
type: "string",
},
@@ -83,10 +62,23 @@ export default function () {
title: "PJIS生产顺序号",
type: "string",
},
- desc: {
+ reMark: {
title: "备注",
type: "string",
},
+ configcode: {
+ title: "配置码",
+ type: "string",
+ },
+ factory: {
+ title: "工厂",
+ type: "string",
+ },
+ subBillType,
+ realCode: {
+ title: "WMS实发生产码",
+ type: "string",
+ },
},
};
}
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_map_group.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_map_group.js
index fb73d173..5a91b60f 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_map_group.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_map_group.js
@@ -40,13 +40,11 @@ const exportUrl = "settleaccount/invoice_service/export";
const rejectUrl = "settleaccount/invoice_service/reject";
const passedUrl = "settleaccount/invoice_service/approval-passed";
const sync_qadUrl = "settleaccount/invoice_service/sync_qad";
-const importJsonUrl = "settleaccount/vmi/excel-to-json";
const queryMethod = "POST";
const exportMethod = "POST";
const rejectMethod = "POST";
const passedMethod = "POST";
const sync_qadMethod = "POST";
-const importJsonMethod = "POST";
export default function () {
return {
@@ -111,12 +109,12 @@ export default function () {
rejectUrl,
passedUrl,
sync_qadUrl,
- importJsonUrl,
+ // importJsonUrl,
exportMethod,
rejectMethod,
passedMethod,
sync_qadMethod,
- importJsonMethod,
+ // importJsonMethod,
schema: schema,
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_detail_service.js
index 139f6002..05d203ab 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_detail_service.js
@@ -2,39 +2,31 @@ const schema = {
title: "JIS结算数据",
type: "object",
properties: {
- project: {
- title: "项目",
+ settleDate: {
+ title: "结算日期",
type: "string",
- readOnly: true,
- showForList: true,
- rules: [
- {
- required: true,
- },
- ],
+ input: "dateTime",
},
- value: {
- title: "值",
+ groupNum: {
+ title: "结算分组号",
type: "string",
- readOnly: true,
- showForList: true,
- rules: [
- {
- required: true,
- },
- ],
},
- description: {
- title: "描述",
+ deliveryDate: {
+ title: "到货日期",
+ type: "string",
+ input: "dateTime",
+ },
+ lu: {
+ title: "客户零件号",
+ type: "string",
+ },
+ qty: {
+ title: "结算数量",
+ type: "number",
+ },
+ pn: {
+ title: "生产号",
type: "string",
- input: "textarea",
- showForList: true,
- rules: [
- {
- required: true,
- },
- { max: 60 },
- ],
},
},
};
@@ -42,7 +34,6 @@ const schema = {
const queryUrl = "settleaccount/bbac_sa_service/detail_query";
const queryMethod = "POST";
-
export default function () {
return {
query: {
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_service.js
index d66111b1..4fa76483 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_service.js
@@ -1,58 +1,42 @@
import version from "../../version.js";
+import businessType from "../../businessType.js";
const schema = {
title: "JIS结算数据",
type: "object",
properties: {
version,
- project: {
- title: "项目",
+ billNum: {
+ title: "结算单据",
type: "string",
- readOnly: true,
- showForList: true,
- rules: [
- {
- required: true,
- },
- ],
},
- value: {
- title: "值",
+ dnBillNum: {
+ title: "出库单号",
type: "string",
- readOnly: true,
- showForList: true,
- rules: [
- {
- required: true,
- },
- ],
},
- description: {
- title: "描述",
+ state: {
+ title: "状态",
+ type: "string",
+ },
+ recordCount: {
+ title: "明细记录行数",
+ type: "string",
+ },
+ site: {
+ title: "工厂地点",
type: "string",
- input: "textarea",
- showForList: true,
- rules: [
- {
- required: true,
- },
- { max: 60 },
- ],
},
+ businessType,
},
};
const baseUrl = "settleaccount/bbac_sa_service";
const queryUrl = "settleaccount/bbac_sa_service/get-list";
-const createUrl = "settleaccount/bbac_sa_service/create";
const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
-const exportUrl = `${baseUrl}/export`;
+const importUrl = `${baseUrl}/import`;
const queryMethod = "POST";
-const createMethod = "POST";
const deleteMethod = "POST";
const importMethod = "POST";
-const exportMethod = "POST";
export default function () {
return {
@@ -113,14 +97,10 @@ export default function () {
schema: schema,
},
edit: {
- createUrl,
deleteUrl,
importUrl,
- exportUrl,
- createMethod,
deleteMethod,
importMethod,
- exportMethod,
schema: schema,
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_detail_service.js
index df59ea5a..fdd619e1 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_detail_service.js
@@ -2,14 +2,14 @@ const schema = {
title: "发票分组号明细",
type: "object",
properties: {
- settleBillNum: {
- title: "关联结算单号",
- type: "int",
- },
- site: {
- title: "工厂地点",
- type: "string",
- },
+ // settleBillNum: {
+ // title: "关联结算单号",
+ // type: "int",
+ // },
+ // site: {
+ // title: "工厂地点",
+ // type: "string",
+ // },
version: {
title: "期间",
type: "string",
@@ -46,7 +46,7 @@ const schema = {
title: "结算数量",
type: "decimal",
},
- groupNumy: {
+ groupNum: {
title: "结算分组号",
type: "string",
},
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_detail_service.js
index 1e9cd04b..30adaf80 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_detail_service.js
@@ -2,39 +2,31 @@ const schema = {
title: "JIS结算数据",
type: "object",
properties: {
- project: {
- title: "项目",
+ settleDate: {
+ title: "结算日期",
type: "string",
- readOnly: true,
- showForList: true,
- rules: [
- {
- required: true,
- },
- ],
+ input: "dateTime",
},
- value: {
- title: "值",
+ groupNum: {
+ title: "结算分组号",
type: "string",
- readOnly: true,
- showForList: true,
- rules: [
- {
- required: true,
- },
- ],
},
- description: {
- title: "描述",
+ deliveryDate: {
+ title: "到货日期",
+ type: "string",
+ input: "dateTime",
+ },
+ lu: {
+ title: "客户零件号",
+ type: "string",
+ },
+ qty: {
+ title: "结算数量",
+ type: "number",
+ },
+ pn: {
+ title: "生产号",
type: "string",
- input: "textarea",
- showForList: true,
- rules: [
- {
- required: true,
- },
- { max: 60 },
- ],
},
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_service.js
index 89b4f191..a2023300 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_service.js
@@ -1,62 +1,40 @@
import version from "../../version.js";
+import businessType from "../../businessType.js";
+import state from "../../state.js";
const schema = {
title: "JIS结算数据",
type: "object",
properties: {
version,
- project: {
- title: "项目",
+ billNum: {
+ title: "结算单据",
type: "string",
- readOnly: true,
- showForList: true,
- rules: [
- {
- required: true,
- },
- ],
},
- value: {
- title: "值",
+ dnBillNum: {
+ title: "出库单号",
type: "string",
- readOnly: true,
- showForList: true,
- rules: [
- {
- required: true,
- },
- ],
},
- description: {
- title: "描述",
+ state,
+ recordCount: {
+ title: "明细记录行数",
+ type: "string",
+ },
+ site: {
+ title: "工厂地点",
type: "string",
- input: "textarea",
- showForList: true,
- rules: [
- {
- required: true,
- },
- { max: 60 },
- ],
},
+ businessType,
},
};
const baseUrl = "settleaccount/hbpo_sa_service";
-const queryUrl = `${baseUrl}/get-list`;
-const detailsUrl = `${baseUrl}/get/%s`;
-const createUrl = `${baseUrl}/create`;
-const updateUrl = `${baseUrl}/update/%s`;
+const queryUrl = "settleaccount/hbpo_sa_service/get-list";
const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
-const exportUrl = `${baseUrl}/export`;
+const importUrl = `${baseUrl}/import`;
const queryMethod = "POST";
-const detailsMethod = "POST";
-const createMethod = "POST";
-const updateMethod = "POST";
const deleteMethod = "POST";
const importMethod = "POST";
-const exportMethod = "POST";
export default function () {
return {
@@ -117,18 +95,10 @@ export default function () {
schema: schema,
},
edit: {
- detailsUrl,
- createUrl,
- updateUrl,
deleteUrl,
importUrl,
- exportUrl,
- detailsMethod,
- createMethod,
- updateMethod,
deleteMethod,
importMethod,
- exportMethod,
schema: schema,
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_detail_service.js
index f35e23c3..e5318eb4 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_detail_service.js
@@ -2,14 +2,14 @@ const schema = {
title: "可结算单明细",
type: "object",
properties: {
- settleBillNum: {
- title: "关联结算单号",
- type: "int",
- },
- site: {
- title: "工厂地点",
- type: "string",
- },
+ // settleBillNum: {
+ // title: "关联结算单号",
+ // type: "int",
+ // },
+ // site: {
+ // title: "工厂地点",
+ // type: "string",
+ // },
version: {
title: "期间",
type: "string",
@@ -46,7 +46,7 @@ const schema = {
title: "结算数量",
type: "decimal",
},
- groupNumy: {
+ groupNum: {
title: "结算分组号",
type: "string",
},
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js
index 26c0708f..f4777357 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js
@@ -42,11 +42,11 @@ const schema = {
const queryUrl = "settleaccount/Job/list";
const deleteUrl = "settleaccount/Job/delete";
-const exportUrl = "settleaccount/pub_sa_detail_service/export";
+const exportUrl = "settleaccount/getblobfile/download/%s";
const compareUrl = "settleaccount/pub_sa_detail_service/pub-sa-se-compare";
const queryMethod = "POST";
const deleteMethod = "POST";
-const exportMethod = "POST";
+const exportMethod = "GET";
const compareMethod = "POST";
export default function () {
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_can_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_can_sa_detail_service.js
index 50f174b6..0ceb12e6 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_can_sa_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_can_sa_detail_service.js
@@ -6,14 +6,14 @@ const schema = {
type: "object",
properties: {
state,
- settleBillNum: {
- title: "关联结算单号",
- type: "string",
- },
- site: {
- title: "工厂地点",
- type: "string",
- },
+ // settleBillNum: {
+ // title: "关联结算单号",
+ // type: "string",
+ // },
+ // site: {
+ // title: "工厂地点",
+ // type: "string",
+ // },
businessType: {
title: "业务分类",
type: "EnumBusinessType",
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
index 122a5406..acfe90da 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
@@ -61,24 +61,6 @@ export default [
isTop: true,
},
},
- {
- path: "delete",
- meta: {
- type: "button",
- title: "删除",
- icon: "file",
- isTop: true,
- },
- },
- {
- path: "import",
- meta: {
- type: "button",
- title: "导入",
- icon: "file",
- isTop: true,
- },
- },
{
path: "export",
meta: {
@@ -218,6 +200,8 @@ export default [
type: "button",
title: "下载",
icon: "file",
+ pattern: "paged",
+ isHidden: true,
},
},
],
@@ -272,6 +256,8 @@ export default [
type: "button",
title: "下载",
icon: "file",
+ pattern: "paged",
+ isHidden: true,
},
},
],
@@ -586,24 +572,6 @@ export default [
isTop: true,
},
},
- {
- path: "delete",
- meta: {
- type: "button",
- title: "删除",
- icon: "file",
- isTop: true,
- },
- },
- {
- path: "import",
- meta: {
- type: "button",
- title: "导入",
- icon: "file",
- isTop: true,
- },
- },
{
path: "export",
meta: {
@@ -743,6 +711,8 @@ export default [
type: "button",
title: "下载",
icon: "file",
+ pattern: "paged",
+ isHidden: true,
},
},
],
@@ -797,6 +767,8 @@ export default [
type: "button",
title: "下载",
icon: "file",
+ pattern: "paged",
+ isHidden: true,
},
},
],
@@ -1211,7 +1183,7 @@ export default [
path: "hbpo_jit_pub_sa_detail_service",
meta: {
type: "page",
- title: "4",
+ title: "HBPO结算数据明细",
icon: "file",
isHidden: true,
},
@@ -1291,7 +1263,7 @@ export default [
type: "page",
title: "BBAC发运与结算比对",
icon: "file",
- businessType: 3,
+ businessType: "ZhiGongJianBBAC",
},
children: [
{
@@ -1336,6 +1308,8 @@ export default [
type: "button",
title: "下载",
icon: "file",
+ pattern: "paged",
+ isHidden: true,
},
},
],
@@ -1346,7 +1320,7 @@ export default [
type: "page",
title: "HBPO发运与结算比对",
icon: "file",
- businessType: 4,
+ businessType: "ZhiGongJianHBPO",
},
children: [
{
@@ -1391,6 +1365,8 @@ export default [
type: "button",
title: "下载",
icon: "file",
+ pattern: "paged",
+ isHidden: true,
},
},
],
@@ -1694,24 +1670,6 @@ export default [
isTop: true,
},
},
- {
- path: "delete",
- meta: {
- type: "button",
- title: "删除",
- icon: "file",
- isTop: true,
- },
- },
- {
- path: "import",
- meta: {
- type: "button",
- title: "导入",
- icon: "file",
- isTop: true,
- },
- },
{
path: "export",
meta: {
@@ -1778,7 +1736,7 @@ export default [
type: "page",
title: "发运与结算比对",
icon: "file",
- businessType: 7,
+ businessType: "BeiJian",
},
children: [
{
@@ -1823,6 +1781,8 @@ export default [
type: "button",
title: "下载",
icon: "file",
+ pattern: "paged",
+ isHidden: true,
},
},
],
@@ -2126,24 +2086,6 @@ export default [
isTop: true,
},
},
- {
- path: "delete",
- meta: {
- type: "button",
- title: "删除",
- icon: "file",
- isTop: true,
- },
- },
- {
- path: "import",
- meta: {
- type: "button",
- title: "导入",
- icon: "file",
- isTop: true,
- },
- },
{
path: "export",
meta: {
@@ -2210,7 +2152,7 @@ export default [
type: "page",
title: "发运与结算比对",
icon: "file",
- businessType: 8,
+ businessType: "YinDuJian",
},
children: [
{
@@ -2255,6 +2197,8 @@ export default [
type: "button",
title: "下载",
icon: "file",
+ pattern: "paged",
+ isHidden: true,
},
},
],
@@ -2487,114 +2431,541 @@ export default [
},
],
},
+ //不知道自主起的名字
{
- path: "invoice",
+ path: "md",
meta: {
type: "group",
- title: "财务审核",
+ title: "买单件HBPO",
icon: "folder",
},
children: [
{
- path: "invoice_map_group",
+ path: "input",
meta: {
- type: "page",
- title: "财务审核",
+ type: "group",
+ title: "数据输入",
icon: "file",
},
children: [
{
- path: "query",
- meta: {
- type: "button",
- title: "查询",
- icon: "file",
- isTop: true,
- },
- },
- {
- path: "reject",
- meta: {
- type: "button",
- title: "退回",
- icon: "file",
- isTop: true,
- },
- },
- {
- path: "importInvocie",
- meta: {
- type: "button",
- title: "导入发票号",
- icon: "file",
- isTop: true,
- pattern: "paged",
- },
- },
- {
- path: "passed ",
+ path: "md_pub_sa_service",
meta: {
- type: "button",
- title: "审核通过",
+ type: "page",
+ title: "结算数据",
icon: "file",
- isTop: true,
- pattern: "paged",
},
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ {
+ path: "import",
+ meta: {
+ type: "button",
+ title: "导入",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ {
+ path: "delete",
+ meta: {
+ type: "button",
+ title: "删除",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ {
+ path: "export",
+ meta: {
+ type: "button",
+ title: "导出",
+ icon: "file",
+ isTop: true,
+ pattern: "paged",
+ },
+ },
+ ],
},
{
- path: "sync_qad ",
+ path: "md_pub_sa_detail_service",
meta: {
- type: "button",
- title: "同步寄售库至QAD",
+ type: "page",
+ title: "结算数据明细",
icon: "file",
- isTop: true,
- pattern: "paged",
+ isHidden: true,
},
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ {
+ path: "export",
+ meta: {
+ type: "button",
+ title: "导出",
+ icon: "file",
+ isTop: true,
+ pattern: "paged",
+ },
+ },
+ ],
},
- ],
- },
- {
- path: "invoice_wait_detail",
- meta: {
- type: "page",
- title: "待开票明细",
- icon: "file",
- isHidden: true,
- },
- children: [
{
- path: "query",
+ path: "md_pub_se_detail_service",
meta: {
- type: "button",
- title: "查询",
+ type: "page",
+ title: "发运数据",
icon: "file",
- isTop: true,
},
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ {
+ path: "export",
+ meta: {
+ type: "button",
+ title: "导出",
+ icon: "file",
+ isTop: true,
+ pattern: "paged",
+ },
+ },
+ {
+ path: "synchronous",
+ meta: {
+ type: "button",
+ title: "手动同步",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ ],
},
],
},
{
- path: "invoice_grp",
+ path: "contrast",
meta: {
- type: "page",
- title: "发票分组",
+ type: "group",
+ title: "数据对比",
icon: "file",
- isHidden: true,
},
children: [
{
- path: "query",
+ path: "md_pub_sa_detail_jobservice",
meta: {
- type: "button",
- title: "查询",
+ type: "page",
+ title: "发运与结算比对",
icon: "file",
- isTop: true,
+ businessType: "MaiDanJianHBPO",
},
- },
- ],
- },
- {
- path: "invoice_not_settle",
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ {
+ path: "compare",
+ meta: {
+ type: "button",
+ title: "生成对比",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ {
+ path: "delete",
+ meta: {
+ type: "button",
+ title: "删除",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ {
+ path: "update-data",
+ meta: {
+ type: "button",
+ title: "更新结算数据状态",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ {
+ path: "export",
+ meta: {
+ type: "button",
+ title: "下载",
+ icon: "file",
+ pattern: "paged",
+ isHidden: true,
+ },
+ },
+ ],
+ },
+ ],
+ },
+ {
+ path: "settlement",
+ meta: {
+ type: "group",
+ title: "结算开票",
+ icon: "folder",
+ },
+ children: [
+ {
+ path: "md_pub_can_sa_service",
+ meta: {
+ type: "page",
+ title: "可结算单",
+ icon: "file",
+ },
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ {
+ path: "export",
+ meta: {
+ type: "button",
+ title: "导出",
+ icon: "file",
+ isTop: true,
+ pattern: "paged",
+ },
+ },
+ {
+ path: "generateInvoice",
+ meta: {
+ type: "button",
+ title: "生成发票数据",
+ icon: "file",
+ isTop: true,
+ pattern: "paged",
+ },
+ },
+ ],
+ },
+ {
+ path: "md_pub_not_sa_service",
+ meta: {
+ type: "page",
+ title: "不可结算单",
+ icon: "file",
+ },
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ {
+ path: "export",
+ meta: {
+ type: "button",
+ title: "导出",
+ icon: "file",
+ isTop: true,
+ pattern: "paged",
+ },
+ },
+ {
+ path: "generateSettlementOrder",
+ meta: {
+ type: "button",
+ title: "生成可结算单",
+ icon: "file",
+ isTop: true,
+ pattern: "paged",
+ },
+ },
+ ],
+ },
+ {
+ path: "md_pub_ba_service",
+ meta: {
+ type: "page",
+ title: "商务审批",
+ icon: "file",
+ },
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ {
+ path: "reject",
+ meta: {
+ type: "button",
+ title: "退回",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ {
+ path: "export",
+ meta: {
+ type: "button",
+ title: "导出",
+ icon: "file",
+ isTop: true,
+ pattern: "paged",
+ },
+ },
+ {
+ path: "received ",
+ meta: {
+ type: "button",
+ title: "客户已收票",
+ icon: "file",
+ isTop: true,
+ pattern: "paged",
+ },
+ },
+ ],
+ },
+ {
+ path: "md_pub_ba_detail_service",
+ meta: {
+ type: "page",
+ title: "商务审批明细",
+ icon: "file",
+ isHidden: true,
+ },
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ ],
+ },
+ {
+ path: "md_pub_pd_service",
+ meta: {
+ type: "page",
+ title: "寄售库库存扣减审批",
+ icon: "file",
+ },
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ {
+ path: "reject",
+ meta: {
+ type: "button",
+ title: "退回",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ {
+ path: "export",
+ meta: {
+ type: "button",
+ title: "导出",
+ icon: "file",
+ isTop: true,
+ pattern: "paged",
+ },
+ },
+ {
+ path: "approvalPassed ",
+ meta: {
+ type: "button",
+ title: "审核通过",
+ icon: "file",
+ isTop: true,
+ pattern: "paged",
+ },
+ },
+ ],
+ },
+ {
+ path: "md_pub_pd_detail_service",
+ meta: {
+ type: "page",
+ title: "寄售库库存扣减审批明细",
+ icon: "file",
+ isHidden: true,
+ },
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ ],
+ },
+ ],
+ },
+ ],
+ },
+ {
+ path: "invoice",
+ meta: {
+ type: "group",
+ title: "财务审核",
+ icon: "folder",
+ },
+ children: [
+ {
+ path: "invoice_map_group",
+ meta: {
+ type: "page",
+ title: "财务审核",
+ icon: "file",
+ },
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ {
+ path: "reject",
+ meta: {
+ type: "button",
+ title: "退回",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ {
+ path: "importInvocie",
+ meta: {
+ type: "button",
+ title: "导入发票号",
+ icon: "file",
+ isTop: true,
+ pattern: "paged",
+ },
+ },
+ {
+ path: "passed ",
+ meta: {
+ type: "button",
+ title: "审核通过",
+ icon: "file",
+ isTop: true,
+ pattern: "paged",
+ },
+ },
+ {
+ path: "sync_qad ",
+ meta: {
+ type: "button",
+ title: "同步寄售库至QAD",
+ icon: "file",
+ isTop: true,
+ pattern: "paged",
+ },
+ },
+ ],
+ },
+ {
+ path: "invoice_wait_detail",
+ meta: {
+ type: "page",
+ title: "待开票明细",
+ icon: "file",
+ isHidden: true,
+ },
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ ],
+ },
+ {
+ path: "invoice_grp",
+ meta: {
+ type: "page",
+ title: "发票分组",
+ icon: "file",
+ isHidden: true,
+ },
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ ],
+ },
+ {
+ path: "invoice_not_settle",
meta: {
type: "page",
title: "不可开票明细清单",
@@ -2781,13 +3152,58 @@ export default [
},
},
{
- path: "backups",
+ path: "invoke",
meta: {
type: "button",
title: "手动备份",
icon: "file",
isTop: true,
- pattern: "paged",
+ },
+ },
+ ],
+ },
+ {
+ path: "adjust",
+ meta: {
+ type: "page",
+ title: "技术库存调整表",
+ icon: "file",
+ },
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ {
+ path: "create",
+ meta: {
+ type: "button",
+ title: "新建",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ {
+ path: "update",
+ meta: {
+ type: "button",
+ title: "编辑",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ {
+ path: "import",
+ meta: {
+ type: "button",
+ title: "导入",
+ icon: "file",
+ isTop: true,
},
},
],
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/contrast/bj_pub_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/contrast/bj_pub_sa_detail_jobservice.js
index b24eca11..973c4b5a 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/contrast/bj_pub_sa_detail_jobservice.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/contrast/bj_pub_sa_detail_jobservice.js
@@ -1,10 +1,11 @@
import AppList from "../../../components/list/index.js";
import html from "html";
import useConfig from "../../../models/job-service.js";
+import { ref, onMounted, onUnmounted } from "vue";
export default {
components: { AppList },
- template: html``,
+ template: html``,
setup() {
const config = useConfig();
config.query.schema.title = "发运与结算";
@@ -12,7 +13,12 @@ export default {
console.log(item.path, item, rows);
};
config.query.schema.properties.name.default = "备件结算与发运数据对比";
- config.query.schema.properties.businessType.default = 7;
- return { config, onCommand };
+ config.query.schema.properties.businessType.default = "BeiJian";
+ const appListRef = ref(null);
+ onMounted(() =>
+ PubSub.subscribe(config.query.schema.properties.businessType.default, async () => await appListRef.value.load())
+ );
+ onUnmounted(() => PubSub.unsubscribe(config.query.schema.properties.businessType.default));
+ return { config, onCommand, appListRef };
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_sa_detail_service.js
index e9427598..578b28ff 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_sa_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_sa_detail_service.js
@@ -9,7 +9,7 @@ export default {
const onCommand = async (item, rows) => {
console.log(item.path, item, rows);
};
- config.query.schema.properties.businessType.default=7;
+ config.query.schema.properties.businessType.default="BeiJian";
return { config, onCommand };
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_sa_service.js
index 9ce95bce..d47e2c02 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_sa_service.js
@@ -10,7 +10,7 @@ export default {
const onCommand = async (item, rows) => {
console.log(item.path, item, rows);
};
- config.query.schema.properties.businessType.default=7;
+ config.query.schema.properties.businessType.default="BeiJian";
return { config, onCommand };
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_se_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_se_detail_service.js
index ca74b249..e3413577 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_se_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_se_detail_service.js
@@ -10,7 +10,7 @@ export default {
const onCommand = async (item, rows) => {
console.log(item.path, item, rows);
};
- config.query.schema.properties.businessType.default = 7;
+ config.query.schema.properties.businessType.default = "BeiJian";
return { config, onCommand };
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/contrast/in_pub_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/contrast/in_pub_sa_detail_jobservice.js
index 25046753..83d64074 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/contrast/in_pub_sa_detail_jobservice.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/contrast/in_pub_sa_detail_jobservice.js
@@ -1,18 +1,24 @@
import AppList from "../../../components/list/index.js";
import html from "html";
import useConfig from "../../../models/job-service.js";
+import { ref, onMounted, onUnmounted } from "vue";
export default {
components: { AppList },
- template: html``,
+ template: html``,
setup() {
const config = useConfig();
config.query.schema.title = "发运与结算";
const onCommand = async (item, rows) => {
console.log(item.path, item, rows);
};
- config.query.schema.properties.businessType.default = 8;
+ config.query.schema.properties.businessType.default = "YinDuJian";
config.query.schema.properties.name.default = "印度件结算与发运数据对比";
- return { config, onCommand };
+ const appListRef = ref(null);
+ onMounted(() =>
+ PubSub.subscribe(config.query.schema.properties.name.default, async () => await appListRef.value.load())
+ );
+ onUnmounted(() => PubSub.unsubscribe(config.query.schema.properties.businessType.default));
+ return { config, onCommand, appListRef };
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_sa_detail_service.js
index 121ca2a7..b4ef7753 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_sa_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_sa_detail_service.js
@@ -10,7 +10,7 @@ export default {
const onCommand = async (item, rows) => {
console.log(item.path, item, rows);
};
- config.query.schema.properties.businessType.default = 8;
+ config.query.schema.properties.businessType.default = "YinDuJian";
return { config, onCommand };
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_sa_service.js
index af7274b3..0358ab5a 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_sa_service.js
@@ -10,7 +10,7 @@ export default {
const onCommand = async (item, rows) => {
console.log(item.path, item, rows);
};
- config.query.schema.properties.businessType.default = 8;
+ config.query.schema.properties.businessType.default = "YinDuJian";
return { config, onCommand };
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_se_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_se_detail_service.js
index 57ad119d..6bed30cd 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_se_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_se_detail_service.js
@@ -10,7 +10,7 @@ export default {
const onCommand = async (item, rows) => {
console.log(item.path, item, rows);
};
- config.query.schema.properties.businessType.default = 8;
+ config.query.schema.properties.businessType.default = "YinDuJian";
return { config, onCommand };
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/adjust.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/adjust.js
new file mode 100644
index 00000000..96da44ab
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/adjust.js
@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/inventory/adjust.js";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ return { config, onCommand };
+ },
+};
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_map_group.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_map_group.js
index 71b57c21..ba203786 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_map_group.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_map_group.js
@@ -5,6 +5,7 @@ import useConfig from "../../../models/invoice/invoice_map_group.js";
import request from "../../../request/index.js";
import AppTable from "../../components/table/index.js";
import { ElMessageBox } from "element-plus";
+import { post } from "../../../request/index.js";
export default {
components: { AppList, AppTable },
@@ -54,9 +55,9 @@ export default {
-
-
-
+
+
+
@@ -101,19 +102,21 @@ export default {
-
-
-
-
- 确定
-
+
+
+
+
+
+
+
+ 确定
下一页
@@ -133,10 +136,23 @@ export default {
}
`,
setup() {
+ const fileList = ref([]);
+ // const load = async () => {};
+ // const editFormModel = ref(null);
+ // const editFormMode = ref(null);
+ // const defaultImportModel = config.import?.schema ? schemaToModel(config.import.schema) : {};
+ // const importModel = ref(defaultImportModel);
const openImportHandler = async () => {
- const data = {};
- const response = await request("settleaccount/vmi/excel-to-json", data, { method: "POST" });
- console.log(response.data);
+ const url = "settleaccount/vmi/excel-to-json";
+ const method = "POST";
+ const formData = new FormData();
+ if (config.query.schema.properties.businessType?.default) {
+ formData.append("businessType", config.query.schema.properties.businessType.default);
+ }
+ for (let i = 0; i < fileList.value.length; i++) {
+ formData.append(`files`, fileList.value[i].raw);
+ }
+ await post(url, formData, method);
};
const formInline = reactive({
oldInvBillNum: "",
@@ -149,6 +165,7 @@ export default {
groupNum: "",
});
//create
+ const invoiceValue = ref([]);
const submitForm = () => {
const newFormInline = { ...formInline };
invoiceValue.value.push(newFormInline);
@@ -159,12 +176,10 @@ export default {
};
//delete
const selectedRows = ref([]);
- const invoiceValue = ref([]);
- const deleteRow = () => {
+ const deleteRow = async () => {
const indexes = selectedRows.value.map((row) => invoiceValue.value.indexOf(row));
- indexes.sort((a, b) => b - a);
indexes.forEach((index) => {
- invoiceValue.value.splice(index, 1);
+ invoiceValue.value.splice(index, 10000000000);
});
selectedRows.value = [];
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/bbac_jit_pub_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/bbac_jit_pub_sa_detail_jobservice.js
index 80af731e..45c57f8e 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/bbac_jit_pub_sa_detail_jobservice.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/bbac_jit_pub_sa_detail_jobservice.js
@@ -1,18 +1,24 @@
import AppList from "../../../components/list/index.js";
import html from "html";
import useConfig from "../../../models/job-service.js";
+import { ref, onMounted, onUnmounted } from "vue";
export default {
components: { AppList },
- template: html``,
+ template: html``,
setup() {
const config = useConfig();
config.query.schema.title = "发运与结算";
const onCommand = async (item, rows) => {
console.log(item.path, item, rows);
};
- config.query.schema.properties.businessType.default = 3;
+ config.query.schema.properties.businessType.default = "ZhiGongJianBBAC";
config.query.schema.properties.name.default = "直供件BBAC结算与发运数据对比";
- return { config, onCommand };
+ const appListRef = ref(null);
+ onMounted(() =>
+ PubSub.subscribe(config.query.schema.properties.name.default, async () => await appListRef.value.load())
+ );
+ onUnmounted(() => PubSub.unsubscribe(config.query.schema.properties.businessType.default));
+ return { config, onCommand, appListRef };
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/hbpo_jit_pub_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/hbpo_jit_pub_sa_detail_jobservice.js
index 88d0f9a4..c761e842 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/hbpo_jit_pub_sa_detail_jobservice.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/hbpo_jit_pub_sa_detail_jobservice.js
@@ -1,18 +1,24 @@
import AppList from "../../../components/list/index.js";
import html from "html";
import useConfig from "../../../models/job-service.js";
+import { ref, onMounted, onUnmounted } from "vue";
export default {
components: { AppList },
- template: html``,
+ template: html``,
setup() {
const config = useConfig();
config.query.schema.title = "发运与结算";
const onCommand = async (item, rows) => {
console.log(item.path, item, rows);
};
- config.query.schema.properties.businessType.default = 4;
+ config.query.schema.properties.businessType.default = "ZhiGongJianHBPO";
config.query.schema.properties.name.default = "直供件HBPO结算与发运数据对比";
- return { config, onCommand };
+ const appListRef = ref(null);
+ onMounted(() =>
+ PubSub.subscribe(config.query.schema.properties.name.default, async () => await appListRef.value.load())
+ );
+ onUnmounted(() => PubSub.unsubscribe(config.query.schema.properties.businessType.default));
+ return { config, onCommand, appListRef };
},
};
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_sa_detail_service.js
index 00d64c05..29ea6e38 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_sa_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_sa_detail_service.js
@@ -10,7 +10,7 @@ export default {
const onCommand = async (item, rows) => {
console.log(item.path, item, rows);
};
- config.query.schema.properties.businessType.default = 3;
+ config.query.schema.properties.businessType.default = "ZhiGongJianBBAC";
return { config, onCommand };
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_sa_service.js
index ba56665f..edc6cf7a 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_sa_service.js
@@ -10,7 +10,7 @@ export default {
const onCommand = async (item, rows) => {
console.log(item.path, item, rows);
};
- config.query.schema.properties.businessType.default = 3;
+ config.query.schema.properties.businessType.default = "ZhiGongJianBBAC";
return { config, onCommand };
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_se_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_se_detail_service.js
index 7b03245d..72b36273 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_se_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_se_detail_service.js
@@ -10,7 +10,7 @@ export default {
const onCommand = async (item, rows) => {
console.log(item.path, item, rows);
};
- config.query.schema.properties.businessType.default = 3;
+ config.query.schema.properties.businessType.default = "ZhiGongJianBBAC";
return { config, onCommand };
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_sa_detail_service.js
index f58aeccd..d44b7336 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_sa_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_sa_detail_service.js
@@ -10,7 +10,7 @@ export default {
const onCommand = async (item, rows) => {
console.log(item.path, item, rows);
};
- config.query.schema.properties.businessType.default = 4;
+ config.query.schema.properties.businessType.default = "ZhiGongJianHBPO";
return { config, onCommand };
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_sa_service.js
index 669374cb..426ecbdf 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_sa_service.js
@@ -10,7 +10,7 @@ export default {
const onCommand = async (item, rows) => {
console.log(item.path, item, rows);
};
- config.query.schema.properties.businessType.default = 4;
+ config.query.schema.properties.businessType.default = "ZhiGongJianHBPO";
return { config, onCommand };
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_se_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_se_detail_service.js
index 9dbf9d93..70f00a7c 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_se_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_se_detail_service.js
@@ -10,7 +10,7 @@ export default {
const onCommand = async (item, rows) => {
console.log(item.path, item, rows);
};
- config.query.schema.properties.businessType.default = 4;
+ config.query.schema.properties.businessType.default = "ZhiGongJianHBPO";
return { config, onCommand };
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/contrast/md_pub_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/contrast/md_pub_sa_detail_jobservice.js
new file mode 100644
index 00000000..be428ba6
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/contrast/md_pub_sa_detail_jobservice.js
@@ -0,0 +1,24 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/job-service.js";
+import { ref, onMounted, onUnmounted } from "vue";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ config.query.schema.title = "发运与结算";
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ config.query.schema.properties.businessType.default = "MaiDanJianHBPO";
+ // config.query.schema.properties.name.default = "直供件BBAC结算与发运数据对比";
+ const appListRef = ref(null);
+ onMounted(() =>
+ PubSub.subscribe(config.query.schema.properties.name.default, async () => await appListRef.value.load())
+ );
+ onUnmounted(() => PubSub.unsubscribe(config.query.schema.properties.businessType.default));
+ return { config, onCommand, appListRef };
+ },
+};
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/input/md_pub_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/input/md_pub_sa_detail_service.js
new file mode 100644
index 00000000..4abac8a5
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/input/md_pub_sa_detail_service.js
@@ -0,0 +1,16 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/pub_sa_detail_service.js";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ config.query.schema.properties.businessType.default = "MaiDanJianHBPO";
+ return { config, onCommand };
+ },
+};
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/input/md_pub_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/input/md_pub_sa_service.js
new file mode 100644
index 00000000..f7e199b1
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/input/md_pub_sa_service.js
@@ -0,0 +1,16 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/pub_sa_service.js";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ config.query.schema.properties.businessType.default = "MaiDanJianHBPO";
+ return { config, onCommand };
+ },
+};
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/input/md_pub_se_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/input/md_pub_se_detail_service.js
new file mode 100644
index 00000000..13f6260c
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/input/md_pub_se_detail_service.js
@@ -0,0 +1,16 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/pub_se_detail_service.js";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ config.query.schema.properties.businessType.default = "MaiDanJianHBPO";
+ return { config, onCommand };
+ },
+};
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_ba_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_ba_detail_service.js
new file mode 100644
index 00000000..330af3df
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_ba_detail_service.js
@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/pub_ba_detail_service";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ return { config, onCommand };
+ },
+};
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_ba_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_ba_service.js
new file mode 100644
index 00000000..a17bee4c
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_ba_service.js
@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/pub_ba_service.js";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ return { config, onCommand };
+ },
+};
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_can_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_can_sa_detail_service.js
new file mode 100644
index 00000000..8ba02935
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_can_sa_detail_service.js
@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/pub_can_sa_detail_service.js";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ return { config, onCommand };
+ },
+};
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_can_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_can_sa_service.js
new file mode 100644
index 00000000..0afe7c1b
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_can_sa_service.js
@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/pub_can_sa_service.js";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ return { config, onCommand };
+ },
+};
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_not_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_not_sa_service.js
new file mode 100644
index 00000000..5fcd3054
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_not_sa_service.js
@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/pub_not_sa_service.js";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ return { config, onCommand };
+ },
+};
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_pd_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_pd_detail_service.js
new file mode 100644
index 00000000..59e1fd72
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_pd_detail_service.js
@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/pub_pd_detail_service.js";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ return { config, onCommand };
+ },
+};
\ No newline at end of file
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_pd_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_pd_service.js
new file mode 100644
index 00000000..72204c7c
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/md/settlement/md_pub_pd_service.js
@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/pub_pd_service.js";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ return { config, onCommand };
+ },
+};
\ No newline at end of file