Browse Source

修改了部分businessType,直供件等的导出,分页增加一页可看十个数据,消除部分报错和空格

master
姜旭之 1 year ago
parent
commit
93d2e34c48
  1. 2
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
  2. 4
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_can_detail_service.js
  3. 4
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/settlement/in_pub_can_sa_detail_service.js
  4. 4
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js
  5. 20
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_service.js
  6. 4
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_detail_service.js
  7. 4
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js
  8. 5
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_edi_service.js
  9. 21
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js
  10. 4
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_detail_service.js
  11. 4
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_can_sa_detail_service.js
  12. 5
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js
  13. 2
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js
  14. 4
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_sa_detail_service.js
  15. 4
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_sa_service.js
  16. 4
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_se_detail_service.js
  17. 2
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/contrast/bj_pub_sa_detail_jobservice.js
  18. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_sa_detail_service.js
  19. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_sa_service.js
  20. 2
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/contrast/in_pub_sa_detail_jobservice.js
  21. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_sa_detail_service.js
  22. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_sa_service.js
  23. 5
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_map_group.js
  24. 2
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/bbac_jit_pub_sa_detail_jobservice.js
  25. 6
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/hbpo_jit_pub_sa_detail_jobservice.js
  26. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_sa_detail_service.js
  27. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_sa_service.js
  28. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_sa_detail_service.js
  29. 1
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_sa_service.js

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

@ -371,7 +371,7 @@ export default {
const config = reactive(props.config); const config = reactive(props.config);
// 分页 // 分页
const pageModel = reactive({ const pageModel = reactive({
sizeList: [1, 50, 100], sizeList: [1, 10, 50, 100],
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
total: 0, total: 0,

4
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_can_detail_service.js

@ -11,8 +11,8 @@ const schema = {
type: "string", type: "string",
}, },
version: { version: {
title: "版本", title: "期间",
type: "int", type: "string",
}, },
price: { price: {
title: "单价", title: "单价",

4
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/settlement/in_pub_can_sa_detail_service.js

@ -11,8 +11,8 @@ const schema = {
type: "string", type: "string",
}, },
version: { version: {
title: "版本", title: "期间",
type: "int", type: "string",
}, },
price: { price: {
title: "单价", title: "单价",

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

@ -153,8 +153,8 @@ export default function () {
default: [ default: [
{ {
logic: "and", logic: "and",
column: "version", column: "wmsBillNum",
action: "equal", action: "like",
value: null, value: null,
readOnly: true, readOnly: true,
}, },

20
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_service.js

@ -51,16 +51,18 @@ const schema = {
}, },
}; };
const queryUrl = "settleaccount/b-bAC_BA_SERVICE/main-query"; const queryUrl = "settleaccount/bbac_ba_service/main-query";
const exportUrl = "settleaccount/b-bAC_BA_SERVICE/export"; const exportUrl = "settleaccount/bbac_ba_service/export";
const invoiceUrl = "settleaccount/b-bAC_BA_SERVICE/generate-invoice"; const invoiceUrl = "settleaccount/bbac_ba_service/generate-invoice";
const rejectUrl = "settleaccount/b-bAC_BA_SERVICE/reject"; const receivedUrl = "settleaccount/bbac_ba_service/received";
const receivedUrl = "/api/settleaccount/h-bPO_BA_SERVICE/received"; const rejectUrl = "settleaccount/bbac_ba_service/reject";
const reissueUrl = "settleaccount/bbac_ba_service/reissue-invoice";
const queryMethod = "POST"; const queryMethod = "POST";
const exportMethod = "POST"; const exportMethod = "POST";
const invoiceMethod = "POST"; const invoiceMethod = "POST";
const rejectMethod = "POST";
const receivedMethod = "POST"; const receivedMethod = "POST";
const rejectMethod = "POST";
const reissueMethod = "POST";
export default function () { export default function () {
return { return {
@ -123,12 +125,14 @@ export default function () {
edit: { edit: {
exportUrl, exportUrl,
invoiceUrl, invoiceUrl,
rejectUrl,
receivedUrl, receivedUrl,
rejectUrl,
reissueUrl,
exportMethod, exportMethod,
invoiceMethod, invoiceMethod,
rejectMethod,
receivedMethod, receivedMethod,
rejectMethod,
reissueMethod,
schema: schema, schema: schema,
}, },
}; };

4
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_detail_service.js

@ -11,8 +11,8 @@ const schema = {
type: "string", type: "string",
}, },
version: { version: {
title: "版本", title: "期间",
type: "int", type: "string",
}, },
price: { price: {
title: "单价", title: "单价",

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

@ -152,8 +152,8 @@ export default function () {
default: [ default: [
{ {
logic: "and", logic: "and",
column: "version", column: "wmsBillNum",
action: "equal", action: "like",
value: null, value: null,
readOnly: true, readOnly: true,
}, },

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

@ -46,9 +46,8 @@ const schema = {
}, },
}; };
const baseUrl = "settleaccount/code-setting"; const queryUrl = "settleaccount/hbpo_se_edi_service/get-list";
const queryUrl = `${baseUrl}/get-list`; const exportUrl = "settleaccount/hbpo_se_edi_service/export";
const exportUrl = `${baseUrl}/export`;
const queryMethod = "POST"; const queryMethod = "POST";
const exportMethod = "POST"; const exportMethod = "POST";

21
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js

@ -51,17 +51,18 @@ const schema = {
}, },
}; };
const baseUrl = "settleaccount/h-bPO_BA_SERVICE"; const queryUrl = "settleaccount/hbpo_ba_service/main-query";
const queryUrl = `${baseUrl}/main-query`; const exportUrl = "settleaccount/hbpo_ba_service/export";
const detailsUrl = `${baseUrl}/get/%s`; const invoiceUrl = "settleaccount/hbpo_ba_service/generate-invoice";
const exportUrl = `${baseUrl}/export`; const receivedUrl = "settleaccount/hbpo_ba_service/received";
const invoiceUrl = "settleaccount/h-bPO_BA_SERVICE/generate-invoice"; const rejectUrl = "settleaccount/hbpo_ba_service/reject";
const receivedUrl = "settleaccount/h-bPO_BA_SERVICE/received"; const reissueUrl = "settleaccount/hbpo_ba_service/reissue-invoice";
const queryMethod = "POST"; const queryMethod = "POST";
const detailsMethod = "POST";
const exportMethod = "POST"; const exportMethod = "POST";
const invoiceMethod = "POST"; const invoiceMethod = "POST";
const receivedMethod = "POST"; const receivedMethod = "POST";
const rejectMethod = "POST";
const reissueMethod = "POST";
export default function () { export default function () {
return { return {
@ -122,14 +123,16 @@ export default function () {
schema: schema, schema: schema,
}, },
edit: { edit: {
detailsUrl,
exportUrl, exportUrl,
invoiceUrl, invoiceUrl,
receivedUrl, receivedUrl,
detailsMethod, rejectUrl,
reissueUrl,
exportMethod, exportMethod,
invoiceMethod, invoiceMethod,
receivedMethod, receivedMethod,
rejectMethod,
reissueMethod,
schema: schema, schema: schema,
}, },
}; };

4
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_detail_service.js

@ -11,8 +11,8 @@ const schema = {
type: "string", type: "string",
}, },
version: { version: {
title: "版本", title: "期间",
type: "int", type: "string",
}, },
price: { price: {
title: "单价", title: "单价",

4
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_can_sa_detail_service.js

@ -11,8 +11,8 @@ const schema = {
type: "string", type: "string",
}, },
version: { version: {
title: "版本", title: "期间",
type: "int", type: "string",
}, },
price: { price: {
title: "单价", title: "单价",

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

@ -11,7 +11,6 @@ const stateName = {
{ label: "等待执行", value: "Enqueued" }, { label: "等待执行", value: "Enqueued" },
], ],
}; };
const schema = { const schema = {
title: "数据对比", title: "数据对比",
type: "object", type: "object",
@ -108,6 +107,10 @@ export default function () {
sorting: { sorting: {
hidden: true, hidden: true,
}, },
businessType: {
hidden: true,
default: 0,
},
}, },
}, },
}, },

2
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js

@ -79,7 +79,7 @@ export default function () {
default: [ default: [
{ {
logic: "and", logic: "and",
column: "version", column: "lu",
action: "like", action: "like",
value: null, value: null,
readOnly: true, readOnly: true,

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

@ -119,6 +119,10 @@ export default function () {
sorting: { sorting: {
hidden: true, hidden: true,
}, },
businessType: {
hidden: true,
default: 0,
},
}, },
}, },
}, },

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

@ -73,6 +73,10 @@ export default function () {
sorting: { sorting: {
hidden: true, hidden: true,
}, },
businessType: {
hidden: true,
default: 0,
},
}, },
}, },
}, },

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

@ -118,8 +118,8 @@ export default function () {
default: [ default: [
{ {
logic: "and", logic: "and",
column: "version", column: "wmsBillNum",
action: "equal", action: "like",
value: null, value: null,
readOnly: true, readOnly: true,
}, },

2
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/contrast/bj_pub_sa_detail_jobservice.js

@ -11,6 +11,8 @@ export default {
const onCommand = async (item, rows) => { const onCommand = async (item, rows) => {
console.log(item.path, item, rows); console.log(item.path, item, rows);
}; };
config.query.schema.properties.name.default = "备件结算与发运数据对比";
config.query.schema.properties.businessType.default = 7;
return { config, onCommand }; return { config, onCommand };
}, },
}; };

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_sa_detail_service.js

@ -9,6 +9,7 @@ export default {
const onCommand = async (item, rows) => { const onCommand = async (item, rows) => {
console.log(item.path, item, rows); console.log(item.path, item, rows);
}; };
config.query.schema.properties.businessType.default=7;
return { config, onCommand }; return { config, onCommand };
}, },
}; };

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_sa_service.js

@ -10,6 +10,7 @@ export default {
const onCommand = async (item, rows) => { const onCommand = async (item, rows) => {
console.log(item.path, item, rows); console.log(item.path, item, rows);
}; };
config.query.schema.properties.businessType.default=7;
return { config, onCommand }; return { config, onCommand };
}, },
}; };

2
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/contrast/in_pub_sa_detail_jobservice.js

@ -11,6 +11,8 @@ export default {
const onCommand = async (item, rows) => { const onCommand = async (item, rows) => {
console.log(item.path, item, rows); console.log(item.path, item, rows);
}; };
config.query.schema.properties.businessType.default = 8;
config.query.schema.properties.name.default = "印度件结算与发运数据对比";
return { config, onCommand }; return { config, onCommand };
}, },
}; };

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_sa_detail_service.js

@ -10,6 +10,7 @@ export default {
const onCommand = async (item, rows) => { const onCommand = async (item, rows) => {
console.log(item.path, item, rows); console.log(item.path, item, rows);
}; };
config.query.schema.properties.businessType.default = 8;
return { config, onCommand }; return { config, onCommand };
}, },
}; };

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_sa_service.js

@ -10,6 +10,7 @@ export default {
const onCommand = async (item, rows) => { const onCommand = async (item, rows) => {
console.log(item.path, item, rows); console.log(item.path, item, rows);
}; };
config.query.schema.properties.businessType.default = 8;
return { config, onCommand }; return { config, onCommand };
}, },
}; };

5
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_map_group.js

@ -79,10 +79,11 @@ export default {
bussiessType: "bussiessType", bussiessType: "bussiessType",
}, },
], ],
invoicE_MAP_GROUP: [{ version: 1111, invbillNum: "INV230725142640-001", inGroupNum: "INV2023" }], invoicE_MAP_GROUP: [
{ version: 1111, invbillNum: "INV230725142640-001", inGroupNum: "INV2023", settleGroupNum: "1111", amt: 1111 },
],
invoicE_NOT_SETTLE: [{ version: "version" }], invoicE_NOT_SETTLE: [{ version: "version" }],
}); });
const onCommand = async (item, rows) => { const onCommand = async (item, rows) => {
drawer.value = true; drawer.value = true;
loading.value = true; loading.value = true;

2
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/bbac_jit_pub_sa_detail_jobservice.js

@ -11,6 +11,8 @@ export default {
const onCommand = async (item, rows) => { const onCommand = async (item, rows) => {
console.log(item.path, item, rows); console.log(item.path, item, rows);
}; };
config.query.schema.properties.businessType.default = 3;
config.query.schema.properties.name.default = "直供件BBAC结算与发运数据对比";
return { config, onCommand }; return { config, onCommand };
}, },
}; };

6
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/hbpo_jit_pub_sa_detail_jobservice.js

@ -7,10 +7,12 @@ export default {
template: html`<app-list :config="config" @command="onCommand" />`, template: html`<app-list :config="config" @command="onCommand" />`,
setup() { setup() {
const config = useConfig(); const config = useConfig();
config.query.schema.title = "发运与结算二次"; config.query.schema.title = "发运与结算";
const onCommand = async (item, rows) => { const onCommand = async (item, rows) => {
console.log(item.path, item, rows); console.log(item.path, item, rows);
}; };
config.query.schema.properties.businessType.default = 4;
config.query.schema.properties.name.default = "直供件HBPO结算与发运数据对比";
return { config, onCommand }; return { config, onCommand };
}, },
}; };

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_sa_detail_service.js

@ -10,6 +10,7 @@ export default {
const onCommand = async (item, rows) => { const onCommand = async (item, rows) => {
console.log(item.path, item, rows); console.log(item.path, item, rows);
}; };
config.query.schema.properties.businessType.default = 3;
return { config, onCommand }; return { config, onCommand };
}, },
}; };

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_sa_service.js

@ -10,6 +10,7 @@ export default {
const onCommand = async (item, rows) => { const onCommand = async (item, rows) => {
console.log(item.path, item, rows); console.log(item.path, item, rows);
}; };
config.query.schema.properties.businessType.default = 3;
return { config, onCommand }; return { config, onCommand };
}, },
}; };

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_sa_detail_service.js

@ -10,6 +10,7 @@ export default {
const onCommand = async (item, rows) => { const onCommand = async (item, rows) => {
console.log(item.path, item, rows); console.log(item.path, item, rows);
}; };
config.query.schema.properties.businessType.default = 4;
return { config, onCommand }; return { config, onCommand };
}, },
}; };

1
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_sa_service.js

@ -10,6 +10,7 @@ export default {
const onCommand = async (item, rows) => { const onCommand = async (item, rows) => {
console.log(item.path, item, rows); console.log(item.path, item, rows);
}; };
config.query.schema.properties.businessType.default = 4;
return { config, onCommand }; return { config, onCommand };
}, },
}; };

Loading…
Cancel
Save