Browse Source

增加启用类型enabletype

master
zhouhongjun 1 year ago
parent
commit
6c024273f9
  1. 26
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js
  2. 6
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/jia-ge-dan.js
  3. 6
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/xiao-shou.js
  4. 4
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs
  5. 4
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs
  6. 4
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceYinDu.cs

26
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 };

6
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,

6
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,

4
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<PagedResultDto<PriceListDto>> 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")
{

4
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<PagedResultDto<PriceListBJDto>> 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")
{

4
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<PagedResultDto<PriceListYinDuDto>> 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")
{

Loading…
Cancel
Save