diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/jia-ge-dan.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/jia-ge-dan.js index eb9118f2..68bd158b 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/jia-ge-dan.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/jia-ge-dan.js @@ -1,3 +1,4 @@ +import { codeType } from "../_options.js"; const schema = { title: "备件价格单", type: "object", @@ -38,6 +39,7 @@ const schema = { type: "boolean", title: "是否已停用", }, + codeType }, }; @@ -108,6 +110,13 @@ export default function (service) { value: null, readOnly: true, }, + { + logic: "and", + column: "codeType", + action: "equal", + value: null, + readOnly: true, + }, ], }, skipCount: { diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/xiao-shou.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/xiao-shou.js index b4c8cbb8..3a5d862d 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/xiao-shou.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/xiao-shou.js @@ -106,15 +106,15 @@ export default function () { }, { logic: "and", - column: "codeType", - action: "equal", + column: "contractNo", + action: "like", value: null, readOnly: true, }, { logic: "and", - column: "contractNo", - action: "like", + column: "codeType", + action: "equal", value: null, readOnly: true, },