Browse Source

修改页面结构,更改进入界面version空值查询所有,搜索条件可以清空数据,寄售库的字段重新修正,手动同步按钮

master
姜旭之 1 year ago
parent
commit
25faf70c5f
  1. 2
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js
  2. 4
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
  3. 4
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac-edi-se-compare.js
  4. 5
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/hbpo-edi-se-compare.js
  5. 15
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/adjust.js
  6. 6
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/backup.js
  7. 6
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/balance.js
  8. 8
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/inventory.js
  9. 26
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/log.js
  10. 14
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/vmi.js
  11. 8
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_map_group.js
  12. 5
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_service.js
  13. 16
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js
  14. 5
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_service.js
  15. 15
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js
  16. 4
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js
  17. 2
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/version.js
  18. 1775
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
  19. 2
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/jit-hbpo/input/hbpo_jit_pub_sa_service.js

2
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js

@ -76,7 +76,7 @@ export default {
</template> </template>
<template v-else> <template v-else>
<el-input <el-input
:clearable="!!schema.clearable" clearable
:disabled="getDisabled()" :disabled="getDisabled()"
:placeholder="schema.title" :placeholder="schema.title"
v-model="model[prop]" v-model="model[prop]"

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

@ -618,6 +618,10 @@ export default {
} finally { } finally {
editFormloading.value = false; editFormloading.value = false;
} }
} else if (item.path === "sync") {
const url = config.edit.syncUrl;
const method = config.edit.syncMethod;
await request(url, null, { method });
} else if (item === "filter") { } else if (item === "filter") {
editFormTitle.value = t("自定义查询"); editFormTitle.value = t("自定义查询");
dialogVisible.value = true; dialogVisible.value = true;

4
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac-edi-se-compare.js

@ -55,12 +55,12 @@ export default function () {
url: queryUrl, url: queryUrl,
method: queryMethod, method: queryMethod,
autoSubmit: true, autoSubmit: true,
disableQueryOnLoad: true, disableQueryOnLoad: false,
schema: { schema: {
title: "数据对比", title: "数据对比",
type: "object", type: "object",
properties: { properties: {
type: Object.assign({ defaultSelected: true }, version), type: Object.assign({ defaultSelected: false }, version),
name: { name: {
type: "string", type: "string",
default: null, default: null,

5
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/hbpo-edi-se-compare.js

@ -54,14 +54,13 @@ export default function () {
query: { query: {
url: queryUrl, url: queryUrl,
method: queryMethod, method: queryMethod,
autoSubmit: true, autoSubmit: true,
disableQueryOnLoad: true, disableQueryOnLoad: false,
schema: { schema: {
title: "数据对比", title: "数据对比",
type: "object", type: "object",
properties: { properties: {
type: Object.assign({ defaultSelected: true }, version), type: Object.assign({ defaultSelected: false }, version),
name: { name: {
type: "string", type: "string",
default: null, default: null,

15
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/adjust.js

@ -4,6 +4,11 @@ const schema = {
title: "库存事务日志", title: "库存事务日志",
type: "object", type: "object",
properties: { properties: {
logType: {
title: "库存事务分类",
type: "string",
hidden: true,
},
changedNumber: { changedNumber: {
title: "变动单号", title: "变动单号",
type: "string", type: "string",
@ -11,7 +16,7 @@ const schema = {
changedTime: { changedTime: {
title: "变动时间", title: "变动时间",
type: "string", type: "string",
input: "dateTime", input: "datetime",
}, },
changedType, changedType,
changedBy: { changedBy: {
@ -91,6 +96,7 @@ export default function () {
title: "通用代码", title: "通用代码",
type: "object", type: "object",
properties: { properties: {
logTypes: { type: "array", hidden: true, default: ["Type500", "Type600"] },
filters: { filters: {
title: "项目", title: "项目",
type: "array", type: "array",
@ -162,6 +168,13 @@ export default function () {
value: null, value: null,
readOnly: true, readOnly: true,
}, },
// {
// logic: "and",
// column: "logType",
// action: "in",
// value: "Type500, Type600",
// readOnly: true,
// },
], ],
}, },
skipCount: { skipCount: {

6
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/backup.js

@ -73,7 +73,7 @@ export default function () {
}, },
{ {
logic: "and", logic: "and",
column: "lu", column: "partCode",
action: "like", action: "like",
value: null, value: null,
readOnly: true, readOnly: true,
@ -88,14 +88,14 @@ export default function () {
{ {
logic: "and", logic: "and",
column: "codeType", column: "codeType",
action: "like", action: "equal",
value: null, value: null,
readOnly: true, readOnly: true,
}, },
{ {
logic: "and", logic: "and",
column: "billType", column: "billType",
action: "like", action: "equal",
value: null, value: null,
readOnly: true, readOnly: true,
}, },

6
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/balance.js

@ -59,7 +59,7 @@ export default function () {
}, },
{ {
logic: "and", logic: "and",
column: "lu", column: "partCode",
action: "like", action: "like",
value: null, value: null,
readOnly: true, readOnly: true,
@ -74,14 +74,14 @@ export default function () {
{ {
logic: "and", logic: "and",
column: "codeType", column: "codeType",
action: "like", action: "equal",
value: null, value: null,
readOnly: true, readOnly: true,
}, },
{ {
logic: "and", logic: "and",
column: "billType", column: "billType",
action: "like", action: "equal",
value: null, value: null,
readOnly: true, readOnly: true,
}, },

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

@ -33,9 +33,9 @@ const options4 = [
{ value: "In", label: "入库" }, { value: "In", label: "入库" },
{ value: "Out", label: "出库" }, { value: "Out", label: "出库" },
]; ];
const billType = { title: "发货类型", type: "number", input: "select", options: options1 }; const billType = { title: "发货类型", type: "number", input: "select", options: options1, clearable: true };
const codeType = { title: "生产码类型", type: "string", input: "select", options: options2 }; const codeType = { title: "生产码类型", type: "string", input: "select", options: options2, clearable: true };
const subBillType = { title: "发货子类型", type: "number", input: "select", options: options3 }; const subBillType = { title: "发货子类型", type: "number", input: "select", options: options3, clearable: true };
const changedType = { title: "变动类型", type: "string", input: "select", options: options4 }; const changedType = { title: "变动类型", type: "string", input: "select", options: options4, clearable: true };
export { billType, codeType, subBillType, changedType }; export { billType, codeType, subBillType, changedType };

26
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/log.js

@ -14,7 +14,7 @@ const schema = {
changedTime: { changedTime: {
title: "变动时间", title: "变动时间",
type: "string", type: "string",
input: "dateTime", input: "datetime",
}, },
changedType, changedType,
changedBy: { changedBy: {
@ -22,7 +22,7 @@ const schema = {
type: "string", type: "string",
}, },
partCode: { partCode: {
title: "实扣厂内零件号", title: "LU零件号",
type: "string", type: "string",
}, },
partCode2: { partCode2: {
@ -45,10 +45,7 @@ const schema = {
title: "结算生产码", title: "结算生产码",
type: "string", type: "string",
}, },
codeType: { codeType,
title: "生产码类型",
type: "string",
},
billType, billType,
subBillType, subBillType,
qty: { qty: {
@ -126,6 +123,7 @@ export default function () {
title: "通用代码", title: "通用代码",
type: "object", type: "object",
properties: { properties: {
// logTypes: { type: "array", hidden: true, default: ["Type200", "Type400"] },
filters: { filters: {
title: "项目", title: "项目",
type: "array", type: "array",
@ -157,42 +155,42 @@ export default function () {
}, },
{ {
logic: "and", logic: "and",
column: "createdDate", column: "billTime",
action: "like", action: "like",
value: null, value: null,
readOnly: true, readOnly: true,
}, },
{ {
logic: "and", logic: "and",
column: "lu", column: "billType",
action: "like", action: "equal",
value: null, value: null,
readOnly: true, readOnly: true,
}, },
{ {
logic: "and", logic: "and",
column: "tmpe4", column: "vinCode",
action: "like", action: "like",
value: null, value: null,
readOnly: true, readOnly: true,
}, },
{ {
logic: "and", logic: "and",
column: "vinCode", column: "codeType",
action: "like", action: "equal",
value: null, value: null,
readOnly: true, readOnly: true,
}, },
{ {
logic: "and", logic: "and",
column: "codeType", column: "partCode",
action: "like", action: "like",
value: null, value: null,
readOnly: true, readOnly: true,
}, },
{ {
logic: "and", logic: "and",
column: "proType", column: "orderNum",
action: "like", action: "like",
value: null, value: null,
readOnly: true, readOnly: true,

14
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/vmi.js

@ -10,18 +10,22 @@ export default function () {
// hidden: true, // hidden: true,
// showForList: false, // showForList: false,
// }, // },
lu: { // lu: {
title: "LU零件号", // title: "LU零件号",
type: "string", // type: "string",
}, // },
partCode: { partCode: {
title: "客户零件号", title: "LU零件号",
type: "string", type: "string",
}, },
vinCode: { vinCode: {
title: "生产码", title: "生产码",
type: "string", type: "string",
}, },
customerPartCode: {
title: "客户零件号",
type: "string",
},
codeType, codeType,
billType, billType,
qty: { qty: {

8
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_map_group.js

@ -16,10 +16,10 @@ const schema = {
type: "string", type: "string",
link: true, link: true,
}, },
settleGroupNum: { // settleGroupNum: {
title: "结算分组号", // title: "结算分组号",
type: "string", // type: "string",
}, // },
amt: { amt: {
title: "金额", title: "金额",
type: "decimal", type: "decimal",

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

@ -30,10 +30,9 @@ const schema = {
}, },
}; };
const baseUrl = "settleaccount/bbac_sa_service";
const queryUrl = "settleaccount/bbac_sa_service/get-list"; const queryUrl = "settleaccount/bbac_sa_service/get-list";
const deleteUrl = `${baseUrl}/delete-list`; const deleteUrl = "settleaccount/bbac_sa_service/delete-list";
const importUrl = `${baseUrl}/import`; const importUrl = "settleaccount/bbac_sa_service/import";
const queryMethod = "POST"; const queryMethod = "POST";
const deleteMethod = "POST"; const deleteMethod = "POST";
const importMethod = "POST"; const importMethod = "POST";

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

@ -111,15 +111,11 @@ const schema = {
}; };
const queryUrl = "settleaccount/bbac_se_detail_service/get-list"; const queryUrl = "settleaccount/bbac_se_detail_service/get-list";
// const deleteUrl = `${baseUrl}/delete-list`;
// const importUrl = `${baseUrl}/import`;
const exportUrl = "settleaccount/bbac_se_detail_service/export"; const exportUrl = "settleaccount/bbac_se_detail_service/export";
const invokeUrl = "settleaccount/bbacse-sync/invoke"; const syncUrl = "settleaccount/bbacse-sync/invoke";
const queryMethod = "POST"; const queryMethod = "POST";
// const deleteMethod = "POST";
// const importMethod = "POST";
const exportMethod = "POST"; const exportMethod = "POST";
const invokeMethod = "POST"; const syncMethod = "POST";
export default function () { export default function () {
return { return {
@ -180,14 +176,10 @@ export default function () {
schema: schema, schema: schema,
}, },
edit: { edit: {
// deleteUrl,
// importUrl,
exportUrl, exportUrl,
invokeUrl, syncUrl,
// deleteMethod,
// importMethod,
exportMethod, exportMethod,
invokeMethod, syncMethod,
schema: schema, schema: schema,
}, },
}; };

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

@ -28,10 +28,9 @@ const schema = {
}, },
}; };
const baseUrl = "settleaccount/hbpo_sa_service";
const queryUrl = "settleaccount/hbpo_sa_service/get-list"; const queryUrl = "settleaccount/hbpo_sa_service/get-list";
const deleteUrl = `${baseUrl}/delete-list`; const deleteUrl = "settleaccount/hbpo_sa_service/delete-list";
const importUrl = `${baseUrl}/import`; const importUrl = "settleaccount/hbpo_sa_service/import";
const queryMethod = "POST"; const queryMethod = "POST";
const deleteMethod = "POST"; const deleteMethod = "POST";
const importMethod = "POST"; const importMethod = "POST";

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

@ -1,5 +1,3 @@
import version from "../../version.js";
const schema = { const schema = {
title: "JIS发运数据", title: "JIS发运数据",
type: "object", type: "object",
@ -112,13 +110,12 @@ const schema = {
}, },
}; };
const baseUrl = "settleaccount/hbpo_se_detail_service"; const queryUrl = "settleaccount/hbpo_se_detail_service/get-list";
const queryUrl = `${baseUrl}/get-list`; const exportUrl = "settleaccount/hbpo_se_detail_service/export";
const exportUrl = `${baseUrl}/export`; const syncUrl = "settleaccount/hbpose-sync/invoke";
const invokeUrl = "settleaccount/hbpose-sync/invoke";
const queryMethod = "POST"; const queryMethod = "POST";
const exportMethod = "POST"; const exportMethod = "POST";
const invokeMethod = "POST"; const syncMethod = "POST";
export default function () { export default function () {
return { return {
@ -180,9 +177,9 @@ export default function () {
}, },
edit: { edit: {
exportUrl, exportUrl,
invokeUrl, syncUrl,
exportMethod, exportMethod,
invokeMethod, syncMethod,
schema: schema, schema: schema,
}, },
}; };

4
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js

@ -55,12 +55,12 @@ export default function () {
url: queryUrl, url: queryUrl,
method: queryMethod, method: queryMethod,
autoSubmit: true, autoSubmit: true,
disableQueryOnLoad: true, disableQueryOnLoad: false,
schema: { schema: {
title: "数据对比", title: "数据对比",
type: "object", type: "object",
properties: { properties: {
type: Object.assign({ defaultSelected: true }, version), type: Object.assign({ defaultSelected: false }, version),
name: { name: {
type: "string", type: "string",
default: null, default: null,

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

@ -5,5 +5,5 @@ export default {
url: "settleaccount/centralized-control/get-all", url: "settleaccount/centralized-control/get-all",
value: "version", value: "version",
label: "version", label: "version",
clearable: false, clearable: true,
}; };

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

File diff suppressed because it is too large

2
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/jit-hbpo/input/hbpo_jit_pub_sa_service.js

@ -1,6 +1,6 @@
import AppList from "../../../../components/list/index.js"; import AppList from "../../../../components/list/index.js";
import html from "html"; import html from "html";
import useConfig from "../../../../models/pub_sa_detail_service.js"; import useConfig from "../../../../models/pub_sa_service.js";
export default { export default {
components: { AppList }, components: { AppList },

Loading…
Cancel
Save