From 6c024273f9242626868ce5a71e8b5938cc82b202 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Fri, 3 Nov 2023 14:15:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=AF=E7=94=A8=E7=B1=BB?= =?UTF-8?q?=E5=9E=8Benabletype?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/models/_options.js | 26 +++++++++++++++++-- .../wwwroot/models/base-data/jia-ge-dan.js | 6 ++--- .../wwwroot/models/base-data/xiao-shou.js | 6 ++--- .../Entities/Prices/PriceListAppService.cs | 4 +-- .../Entities/Prices/PriceListAppServiceBJ.cs | 4 +-- .../Prices/PriceListAppServiceYinDu.cs | 4 +-- 6 files changed, 36 insertions(+), 14 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 bcc20532..053f3176 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 @@ -135,7 +135,7 @@ const billState = { ], }; -const codeType = { +const enableType = { title: "启用类型", type: "string", input: "select", @@ -152,6 +152,28 @@ const codeType = { ], }; +const codeType = { + title: "生产码类型", + type: "string", + input: "select", + options: [ + { value: "01", label: "前保" }, + { value: "03", label: " 左门槛" }, + { value: "04", label: "右门槛" }, + { value: "05", label: "扰流板" }, + { value: "06", label: "前左轮眉" }, + { value: "07", label: "前右轮眉 " }, + { value: "08", label: "后左轮眉" }, + { value: "09", label: "后右轮眉" }, + ], + clearable: true, + rules: [ + { + required: true, + }, + ], +}; + const invState = { title: "发票状态", type: "string", @@ -184,4 +206,4 @@ const taskState = { }; export default businessType; -export { version, state, state2, state3, transType, deliverBillType, deliverSubBillType, proType, billState, codeType, invState, taskState }; +export { version, state, state2, state3, transType, deliverBillType, deliverSubBillType, proType, billState, codeType, invState, taskState, enableType }; 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 68bd158b..ef7d930d 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,4 +1,4 @@ -import { codeType } from "../_options.js"; +import { enableType } from "../_options.js"; const schema = { title: "备件价格单", type: "object", @@ -39,7 +39,7 @@ const schema = { type: "boolean", title: "是否已停用", }, - codeType + enableType }, }; @@ -112,7 +112,7 @@ export default function (service) { }, { logic: "and", - column: "codeType", + column: "enableType", action: "equal", value: null, readOnly: true, 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 3a5d862d..6d0b901f 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 @@ -1,4 +1,4 @@ -import { codeType } from "../_options.js"; +import { enableType } from "../_options.js"; const schema = { title: "销售价格单", type: "object", @@ -38,7 +38,7 @@ const schema = { type: "boolean", title: "是否已停用", }, - codeType + enableType }, }; @@ -113,7 +113,7 @@ export default function () { }, { logic: "and", - column: "codeType", + column: "enableType", action: "equal", value: null, readOnly: true, diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs index dd6d14fa..5e1971f6 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs @@ -222,10 +222,10 @@ namespace Win.Sfs.SettleAccount.Entities.Prices [HttpPost] public async Task> GetListAsync(RequestDto input) { - var ls = input.Filters.Where(p => p.Column == "codeType").ToList(); + var ls = input.Filters.Where(p => p.Column == "enableType").ToList(); if (ls.Count > 0) { - var entiy = input.Filters.Where(p => p.Column == "codeType").FirstOrDefault(); + var entiy = input.Filters.Where(p => p.Column == "enableType").FirstOrDefault(); var value = entiy.Value; if (value == "03") { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs index b52dad85..b4754c75 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs @@ -207,10 +207,10 @@ namespace Win.Sfs.SettleAccount.Entities.Prices [HttpPost] public async Task> GetListAsync(RequestDto input) { - var ls = input.Filters.Where(p => p.Column == "codeType").ToList(); + var ls = input.Filters.Where(p => p.Column == "enableType").ToList(); if (ls.Count > 0) { - var entiy = input.Filters.Where(p => p.Column == "codeType").FirstOrDefault(); + var entiy = input.Filters.Where(p => p.Column == "enableType").FirstOrDefault(); var value = entiy.Value; if (value == "03") { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceYinDu.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceYinDu.cs index 970c38bf..e50edd57 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceYinDu.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceYinDu.cs @@ -202,10 +202,10 @@ namespace Win.Sfs.SettleAccount.Entities.Prices [HttpPost] public async Task> GetListAsync(RequestDto input) { - var ls = input.Filters.Where(p => p.Column == "codeType").ToList(); + var ls = input.Filters.Where(p => p.Column == "enableType").ToList(); if (ls.Count > 0) { - var entiy = input.Filters.Where(p => p.Column == "codeType").FirstOrDefault(); + var entiy = input.Filters.Where(p => p.Column == "enableType").FirstOrDefault(); var value = entiy.Value; if (value == "03") {