Browse Source

前端:

解决问题166、167;增加发票状态7和8;控制已作废发票不显示导出发票分组按钮;寄售库扣减审批添加退回按钮,更新调用地址和参数
master
wanggang 1 year ago
parent
commit
81d4c5e054
  1. 2
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js
  2. 5
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/material-relationship.js
  3. 2
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js
  4. 5
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
  5. 4
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/inventory.js

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

@ -16,6 +16,8 @@ const stateOptions = [
{ value: 4, label: "客户已收票" },
{ value: 5, label: "已扣减" },
{ value: 6, label: "已提交扣减" },
{ value: 7, label: "已提交撤销扣减" },
{ value: 8, label: "已提交QAD" },
];
const state = { title: "状态", type: "number", input: "select", options: stateOptions };
const state2 = Object.assign(Object.assign({}, state), { options: stateOptions.filter((a) => parseInt(a.value) > 0) });

5
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/material-relationship.js

@ -88,10 +88,7 @@ export default function () {
import: {
schema: {
properties: {
isBj: {
title: "是否为备件",
type: "boolean",
},
businessType
},
},
},

2
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js

@ -37,7 +37,7 @@ export default [
children: [createButton("query", "title=查询&isTop=true"), createButton("import", "title=导入&isTop=true"), createButton("export", "title=导出&isTop=true&pattern=paged")],
},
{
...createPage("parts-relationship", "title=厂内替换件关系"),
...createPage("parts-relationship", "title=变更新旧LU关系"),
children: [createButton("query", "title=查询&isTop=true"), createButton("import", "title=导入&isTop=true"), createButton("export", "title=导出&isTop=true&pattern=paged")],
},
{

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

@ -101,7 +101,7 @@ function createCommerceCheckList(path, business, client, title = "商务审批")
"title=退回",
(_, q) => q.filters.some((o) => o.column === "state" && o.value === 1) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
),
createButton("export-group", "title=导出发票分组&pattern=paged"),
createButton("export-group", "title=导出发票分组&pattern=paged", (r, _) => r.invoiceState !== 2),
createButton(
"receive",
"title=客户已收票&isTop=true",
@ -122,6 +122,7 @@ function createVmiOutCheckList(path, business, client, title = "寄售库库存
children: [
createButton("query", "title=查询&isTop=true"),
createButton("approval", "title=扣减审核通过&isTop=true"),
createButton("reject", "title=退回&isTop=true"),
createButton("export", "title=导出&isTop=true&pattern=paged"),
],
};
@ -372,7 +373,7 @@ export default [
"title=财务审核通过&isTop=true",
(_, q) => q.filters.some((o) => o.column === "state" && o.value === 2) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
),
createButton("export-group", "title=导出发票分组&pattern=paged"),
createButton("export-group", "title=导出发票分组&pattern=paged", (r, _) => r.invoiceState !== 2),
//createButton("approval", "title=发票重开"),
createButton(
"reject",

4
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/inventory.js

@ -26,8 +26,8 @@ export default {
: item.path === "reject"
? `确认退回选中的${rows.length}行数据吗?`
: `确认选中的${rows.length}行数据客户已收票吗?`;
const data = item.path === "approval" ? rows.map((o) => o.billNum) : item.path === "reject" ? rows[0]["invGroupNum"] : rows.map((o) => o.invbillNum);
const url = item.path === "approval" ? config.edit.approvalUrl : item.path === "reject" ? config.edit.rejectUrl : config.edit.receivedUrl;
const data = rows.map((o) => o.invbillNum);
const url = config.edit.approvalUrl;
await appListRef.value.onClick(async () => await request(url, data, { method: "POST" }), message, true);
}
} else if (item.path === "export-group") {

Loading…
Cancel
Save