Skip to content

W
weiqiao-vue
Commit d02b3597 by 张珈源
Options

feat(kcpd): 更新库存盘点功能字段配置 

- 将搜索表单中的仓库位置、产品类型、产品字段替换为盘点日期、盘点编码、盘点状态字段
- 修改表格列配置以匹配新的数据字段结构
- 更新工作流权限配置中的字段映射关系
- 调整日期范围选择器的时间字段映射配置
- 移除原有的创建日期字段并整合到新的盘点日期字段中
parent 67c6395a
Showing with 150 additions and 91 deletions
xjrsoft-vue3/src/api/ckgl/kcpd/model/KcpdModel.ts
......@@ -4,11 +4,11 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
* @description: MesWarehouseInventory分页参数 模型
*/
export interface MesWarehouseInventoryPageParams extends BasicPageParams {
ckwz: string;
pdrq: string;
cplx: string;
pdbh: string;
cp: string;
zt: string;
}
/**
......@@ -17,13 +17,11 @@ export interface MesWarehouseInventoryPageParams extends BasicPageParams {
export interface MesWarehouseInventoryPageModel {
id: string;
ckwz: string;
pdbh: string;
cplx: string;
pdrq: string;
cp: string;
createDate: string;
zt: string;
bz: string;
}
......@@ -42,6 +40,12 @@ export interface MesWarehouseInventoryModel {
cp: string;
pdrq: string;
pdbh: string;
zt: string;
bz: string;
p1: string;
......
xjrsoft-vue3/src/views/ckgl/kcpd/components/config.ts
......@@ -3,66 +3,32 @@ import { BasicColumn } from '/@/components/Table';
export const searchFormSchema: FormSchema[] = [
{
field: 'ckwz',
label: '仓库位置',
field: 'pdrq',
label: '盘点日期',
defaultValue: undefined,
component: 'XjrSelect',
component: 'RangePicker',
componentProps: {
datasourceType: 'api',
apiConfig: {
path: '/getStoreLocation',
method: 'GET',
apiId: 'd55f1866db284ecd8b038a3956b9c5b7',
apiParams: [
{ key: '1', title: 'Query Params', tableInfo: [] },
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql="select id as value,name as label from mes_storage_location where delete_mark = 0 ";\r\nreturn db.select(sql);',
},
labelField: 'label',
valueField: 'value',
mode: 'multiple',
showSearch: true,
format: 'YYYY-MM-DD HH:mm:ss',
style: { width: '100%' },
getPopupContainer: () => document.body,
},
},
{
field: 'cplx',
label: '产品类型',
field: 'pdbh',
label: '盘点编码',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'dic',
params: { itemId: '2003761375221407745' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
component: 'Input',
},
{
field: 'cp',
label: '产品',
field: 'zt',
label: '盘点状态',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'api',
apiConfig: {
path: '/scgl/scjh/getAllProduct',
method: 'GET',
apiId: 'f4fbb57f2f18425e97918a031c8aa7d8',
apiParams: [
{ key: '1', title: 'Query Params', tableInfo: [] },
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
"var sql = 'select *,id as value,cpmc as label from mes_base_product_info where delete_mark=0';\r\nreturn db.select(sql)",
},
labelField: 'label',
datasourceType: 'dic',
params: { itemId: '2018581306872238081' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
......@@ -74,9 +40,9 @@ export const searchFormSchema: FormSchema[] = [
export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'ckwz',
title: '仓库位置',
componentType: 'select',
dataIndex: 'pdbh',
title: '盘点编码',
componentType: 'auto-code',
fixed: false,
sorter: true,
......@@ -87,9 +53,9 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'cplx',
title: '产品类型',
componentType: 'select',
dataIndex: 'pdrq',
title: '盘点日期',
componentType: 'date',
fixed: false,
sorter: true,
......@@ -100,8 +66,8 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'cp',
title: '产品',
dataIndex: 'zt',
title: '盘点状态',
componentType: 'select',
fixed: false,
......@@ -113,19 +79,6 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'createDate',
title: '盘点日期',
componentType: 'date',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'bz',
title: '备注',
componentType: 'input',
......@@ -382,8 +335,8 @@ export const formProps: FormProps = {
span: 4,
placeholder: '请选择仓库位置',
showLabel: true,
showSearch: true,
isMultiple: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [
......@@ -392,7 +345,6 @@ export const formProps: FormProps = {
{ key: 3, label: 'Option 3', value: 'Option 3' },
],
datasourceType: 'api',
params: null,
labelField: 'label',
valueField: 'value',
apiConfig: {
......@@ -414,7 +366,6 @@ export const formProps: FormProps = {
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2010539474382962690',
defaultSelect: null,
style: { width: '100%' },
},
},
......@@ -433,10 +384,10 @@ export const formProps: FormProps = {
componentProps: {
width: '100%',
span: 4,
placeholder: '请选择产品类型',
placeholder: '请选择产品类型类型',
showLabel: true,
showSearch: true,
isMultiple: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [
......@@ -480,8 +431,8 @@ export const formProps: FormProps = {
span: 4,
placeholder: '请选择产品',
showLabel: true,
showSearch: true,
isMultiple: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [
......@@ -521,7 +472,7 @@ export const formProps: FormProps = {
list: [
{
key: '6be9efdbb1b7492f943ec14cb58e2d39',
field: 'createDate',
field: 'pdrq',
label: '盘点日期',
type: 'date',
component: 'DatePicker',
......@@ -586,6 +537,80 @@ export const formProps: FormProps = {
},
],
},
{
span: 8,
list: [
{
key: '8a6000a1cd5d485787f7dc14308dd70f',
field: 'pdbh',
label: '盘点编码',
type: 'auto-code',
component: 'AutoCodeRule',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 7,
placeholder: '请输入盘点编码',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
showLabel: true,
autoCodeRule: 'kcpd',
required: false,
isShow: false,
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
],
},
{
span: 8,
list: [
{
key: '7feeb7d43eda46a3919bcf32e64948b6',
field: 'zt',
label: '盘点状态',
type: 'select',
component: 'XjrSelect',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 7,
placeholder: '请选择盘点状态',
showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [
{ key: 1, label: 'Option 1', value: 'Option 1' },
{ key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' },
],
defaultSelect: null,
datasourceType: 'dic',
params: { itemId: '2018581306872238081' },
labelField: 'name',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7',
},
dicOptions: [],
required: false,
rules: [],
events: {},
isShow: false,
tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2018581306872238081',
style: { width: '100%' },
},
},
],
},
],
componentProps: {
gutter: 16,
......@@ -731,7 +756,6 @@ export const formProps: FormProps = {
{ key: 3, label: 'Option 3', value: 'Option 3' },
],
datasourceType: 'api',
params: null,
labelField: 'label',
valueField: 'value',
apiConfig: {
......@@ -753,7 +777,6 @@ export const formProps: FormProps = {
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2010539474382962690',
defaultSelect: null,
listStyle: "return 'border: 0'",
},
},
......
xjrsoft-vue3/src/views/ckgl/kcpd/components/workflowPermission.ts
......@@ -100,7 +100,7 @@ export const permissionList = [
isSaveTable: false,
tableName: '',
fieldName: '盘点日期',
fieldId: 'createDate',
fieldId: 'pdrq',
isSubTable: false,
showChildren: true,
type: 'date',
......@@ -127,6 +127,38 @@ export const permissionList = [
defaultValue: '',
},
{
required: false,
view: true,
edit: false,
disabled: true,
isSaveTable: false,
tableName: '',
fieldName: '盘点编码',
fieldId: 'pdbh',
isSubTable: false,
showChildren: true,
type: 'auto-code',
key: '8a6000a1cd5d485787f7dc14308dd70f',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '盘点状态',
fieldId: 'zt',
isSubTable: false,
showChildren: true,
type: 'select',
key: '7feeb7d43eda46a3919bcf32e64948b6',
children: [],
options: {},
},
{
required: true,
view: true,
edit: true,
......
xjrsoft-vue3/src/views/ckgl/kcpd/index.vue
......@@ -184,7 +184,7 @@
formConfig: {
labelWidth: 100,
schemas: searchFormSchema,
fieldMapToTime: [],
fieldMapToTime: [['pdrq', ['pdrqStart', 'pdrqEnd'], 'YYYY-MM-DD HH:mm:ss ', true],],
showResetButton: false,
},
bordered:false,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment