From 0e36598aa8e532c63defe48f2e56e9c38a1f3973 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Sun, 8 Oct 2023 10:20:47 +0800 Subject: [PATCH] [CI SKIP] --- .../wwwroot/models/_options.js | 22 +++++++++++++++++-- .../wwwroot/models/settle/inventory.js | 3 ++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js index 2d592780..3d3f27ea 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js @@ -20,7 +20,7 @@ const stateOptions = [ { value: 8, label: "已提交QAD" }, { value: 9, label: "红冲" }, ]; -const state = { title: "状态", type: "number", input: "select", options: stateOptions }; +const state = { title: "扣减单状态", type: "number", input: "select", options: stateOptions }; const state2 = Object.assign(Object.assign({}, state), { options: stateOptions.filter((a) => parseInt(a.value) > 0).filter((a) => parseInt(a.value) !== 6 && parseInt(a.value) !== 7), }); @@ -157,5 +157,23 @@ const codeType = { ], }; +const invState = { + title: "发票状态", + type: "string", + input: "select", + options: [ + { value: 0, label: "未结状态" }, + { value: 1, label: "已开票" }, + { value: 2, label: "商务已审核" }, + { value: 3, label: "财务已审核" }, + { value: 4, label: "客户已收票" }, + { value: 5, label: "已扣减" }, + { value: 6, label: "扣减进行中" }, + { value: 7, label: "撤销扣减进行中" }, + { value: 8, label: "已提交QAD" }, + { value: 9, label: "红冲" }, + ], +}; + export default businessType; -export { version, state, state2, state3, transType, deliverBillType, deliverSubBillType, proType, billState, codeType }; +export { version, state, state2, state3, transType, deliverBillType, deliverSubBillType, proType, billState, codeType, invState }; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/inventory.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/inventory.js index 2550f18b..63281713 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/inventory.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/inventory.js @@ -1,5 +1,5 @@ //库存扣减 -import { version, state3 } from "../_options.js"; +import { version, state3, invState } from "../_options.js"; const schema = { title: "寄售库库存扣减审批", @@ -7,6 +7,7 @@ const schema = { properties: { version, state: state3, + invState, billNum: { title: "发票号", type: "string",