Skip to content

W
weiqiao-vue
Commit 98af2fbc by 张珈源
Options

feat(ckgl): 更新库存管理模块的字段配置和组件设置 

- 在盘点模块中添加产品编号和仓库字段映射
- 更新库存预看模块的字段类型为数字输入并调整列配置
- 修改其他出入库模块的业务伙伴字段为业务组织字段
- 添加调拨日期和来源单据搜索条件
- 更新工作流权限配置中的字段定义
- 优化API接口参数模型以支持新字段
- 调整表单组件的数据绑定和显示配置
- 完善导出功能的注释文档
parent 231c57c7
Showing with 446 additions and 144 deletions
xjrsoft-vue3/src/api/ckgl/kcpd/index.ts
...@@ -93,6 +93,11 @@ export async function deleteMesWarehouseInventory(ids: string[], mode: ErrorMess ...@@ -93,6 +93,11 @@ export async function deleteMesWarehouseInventory(ids: string[], mode: ErrorMess
); );
} }
/**
* @description: 导出MesWarehouseInventory
*/
export async function exportMesWarehouseInventory( export async function exportMesWarehouseInventory(
params?: object, params?: object,
mode: ErrorMessageMode = 'modal' mode: ErrorMessageMode = 'modal'
......
xjrsoft-vue3/src/api/ckgl/kcpd/model/KcpdModel.ts
...@@ -135,6 +135,8 @@ export interface MesWarehouseInventoryRelaModel { ...@@ -135,6 +135,8 @@ export interface MesWarehouseInventoryRelaModel {
cplx: string; cplx: string;
ck: string;
wz: string; wz: string;
pch: string; pch: string;
......
xjrsoft-vue3/src/api/ckgl/kcyk/model/KcykModel.ts
...@@ -10,13 +10,13 @@ export interface MesWarehouseProfitandlossPageParams extends BasicPageParams { ...@@ -10,13 +10,13 @@ export interface MesWarehouseProfitandlossPageParams extends BasicPageParams {
ck: string; ck: string;
hw: string;
pch: string; pch: string;
ykzt: string; ykzt: string;
ywzz: string; ywzz: string;
pddid: string;
} }
/** /**
...@@ -25,12 +25,16 @@ export interface MesWarehouseProfitandlossPageParams extends BasicPageParams { ...@@ -25,12 +25,16 @@ export interface MesWarehouseProfitandlossPageParams extends BasicPageParams {
export interface MesWarehouseProfitandlossPageModel { export interface MesWarehouseProfitandlossPageModel {
id: string; id: string;
ywzz: string;
cpbm: string; cpbm: string;
cpmc: string; cpmc: string;
ck: string; ck: string;
hw: string;
pch: string; pch: string;
xtsl: string; xtsl: string;
...@@ -42,10 +46,6 @@ export interface MesWarehouseProfitandlossPageModel { ...@@ -42,10 +46,6 @@ export interface MesWarehouseProfitandlossPageModel {
ce: string; ce: string;
ykzt: string; ykzt: string;
ywzz: string;
pddid: string;
} }
/** /**
...@@ -66,6 +66,8 @@ export interface MesWarehouseProfitandlossModel { ...@@ -66,6 +66,8 @@ export interface MesWarehouseProfitandlossModel {
ck: string; ck: string;
hw: string;
xtsl: string; xtsl: string;
pdsl: string; pdsl: string;
......
xjrsoft-vue3/src/api/ckgl/qtck/model/QtckModel.ts
...@@ -4,10 +4,14 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; ...@@ -4,10 +4,14 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
* @description: MesWarehouseOtherout分页参数 模型 * @description: MesWarehouseOtherout分页参数 模型
*/ */
export interface MesWarehouseOtheroutPageParams extends BasicPageParams { export interface MesWarehouseOtheroutPageParams extends BasicPageParams {
ywhb: string; ywzz: string;
ywlx: string; ywlx: string;
dbrq: string;
lydj: string;
ck: string; ck: string;
} }
...@@ -17,7 +21,7 @@ export interface MesWarehouseOtheroutPageParams extends BasicPageParams { ...@@ -17,7 +21,7 @@ export interface MesWarehouseOtheroutPageParams extends BasicPageParams {
export interface MesWarehouseOtheroutPageModel { export interface MesWarehouseOtheroutPageModel {
id: string; id: string;
ywhb: string; ywzz: string;
ywlx: string; ywlx: string;
...@@ -38,7 +42,7 @@ export interface MesWarehouseOtheroutModel { ...@@ -38,7 +42,7 @@ export interface MesWarehouseOtheroutModel {
deleteMark: string; deleteMark: string;
ywhb: string; ywzz: string;
ywlx: string; ywlx: string;
......
xjrsoft-vue3/src/api/ckgl/qtrk/model/QtrkModel.ts
...@@ -4,7 +4,7 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; ...@@ -4,7 +4,7 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
* @description: MesWarehouseOther分页参数 模型 * @description: MesWarehouseOther分页参数 模型
*/ */
export interface MesWarehouseOtherPageParams extends BasicPageParams { export interface MesWarehouseOtherPageParams extends BasicPageParams {
ywhb: string; ywzz: string;
ywlx: string; ywlx: string;
...@@ -13,8 +13,6 @@ export interface MesWarehouseOtherPageParams extends BasicPageParams { ...@@ -13,8 +13,6 @@ export interface MesWarehouseOtherPageParams extends BasicPageParams {
lydj: string; lydj: string;
ck: string; ck: string;
cgy: string;
} }
/** /**
...@@ -23,7 +21,7 @@ export interface MesWarehouseOtherPageParams extends BasicPageParams { ...@@ -23,7 +21,7 @@ export interface MesWarehouseOtherPageParams extends BasicPageParams {
export interface MesWarehouseOtherPageModel { export interface MesWarehouseOtherPageModel {
id: string; id: string;
ywhb: string; ywzz: string;
ywlx: string; ywlx: string;
...@@ -42,7 +40,9 @@ export interface MesWarehouseOtherPageModel { ...@@ -42,7 +40,9 @@ export interface MesWarehouseOtherPageModel {
export interface MesWarehouseOtherModel { export interface MesWarehouseOtherModel {
id: string; id: string;
ywhb: string; deleteMark: string;
ywzz: string;
ywlx: string; ywlx: string;
...@@ -54,6 +54,74 @@ export interface MesWarehouseOtherModel { ...@@ -54,6 +54,74 @@ export interface MesWarehouseOtherModel {
cgy: string; cgy: string;
p1: string;
p2: string;
p3: string;
p4: string;
p5: string;
p6: string;
p7: string;
p8: string;
p9: string;
p10: string;
p11: string;
p12: string;
p13: string;
p14: string;
p15: string;
p16: string;
p17: string;
p18: string;
p19: string;
p20: string;
p21: string;
p22: string;
p23: string;
p24: string;
p25: string;
p26: string;
p27: string;
p28: string;
p29: string;
p30: string;
createDate: string;
createUserId: string;
modifyDate: string;
modifyUserId: string;
mesWarehouseOtherInfoList?: MesWarehouseOtherInfoModel; mesWarehouseOtherInfoList?: MesWarehouseOtherInfoModel;
} }
...@@ -63,6 +131,8 @@ export interface MesWarehouseOtherModel { ...@@ -63,6 +131,8 @@ export interface MesWarehouseOtherModel {
export interface MesWarehouseOtherInfoModel { export interface MesWarehouseOtherInfoModel {
id: string; id: string;
deleteMark: string;
qtid: string; qtid: string;
cp: string; cp: string;
...@@ -80,6 +150,74 @@ export interface MesWarehouseOtherInfoModel { ...@@ -80,6 +150,74 @@ export interface MesWarehouseOtherInfoModel {
hw: string; hw: string;
bz: string; bz: string;
p1: string;
p2: string;
p3: string;
p4: string;
p5: string;
p6: string;
p7: string;
p8: string;
p9: string;
p10: string;
p11: string;
p12: string;
p13: string;
p14: string;
p15: string;
p16: string;
p17: string;
p18: string;
p19: string;
p20: string;
p21: string;
p22: string;
p23: string;
p24: string;
p25: string;
p26: string;
p27: string;
p28: string;
p29: string;
p30: string;
createDate: string;
createUserId: string;
modifyDate: string;
modifyUserId: string;
} }
/** /**
......
xjrsoft-vue3/src/views/ckgl/kcpd/components/Form.vue
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
}); });
} }
} }
onMounted(async () => { onMounted(async () => {
try { try {
if (props.fromPage == FromPageType.MENU) { if (props.fromPage == FromPageType.MENU) {
...@@ -334,4 +334,3 @@ ...@@ -334,4 +334,3 @@
}); });
</script> </script>
\ No newline at end of file
xjrsoft-vue3/src/views/ckgl/kcpd/components/config.ts
...@@ -45,6 +45,7 @@ async function handleStartInventory(_schema, formModel, formActionType) { ...@@ -45,6 +45,7 @@ async function handleStartInventory(_schema, formModel, formActionType) {
const list = const list =
(inventoryList || []).map((item: InventoryItem) => ({ (inventoryList || []).map((item: InventoryItem) => ({
id: item.id, id: item.id,
cpbh: item.cpbh,
cp: item.cpmc, cp: item.cpmc,
cplx: item.cplx, cplx: item.cplx,
wz: item.hw, wz: item.hw,
...@@ -52,6 +53,7 @@ async function handleStartInventory(_schema, formModel, formActionType) { ...@@ -52,6 +53,7 @@ async function handleStartInventory(_schema, formModel, formActionType) {
pdsl: item.pdsl ?? 0, pdsl: item.pdsl ?? 0,
zbid: item.zbid, zbid: item.zbid,
ywzz: item.ywzz, ywzz: item.ywzz,
ck: item.ck,
})) || []; })) || [];
await formActionType?.setFieldsValue?.({ mesWarehouseInventoryRelaList: list }); await formActionType?.setFieldsValue?.({ mesWarehouseInventoryRelaList: list });
formActionType?.showMessage?.(list.length ? '开始盘点成功' : '未查询到匹配数据'); formActionType?.showMessage?.(list.length ? '开始盘点成功' : '未查询到匹配数据');
...@@ -837,6 +839,37 @@ export const formProps: FormProps = { ...@@ -837,6 +839,37 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '6baef041c82842dc9adb2d4cfb7b5ad3',
title: '产品编号',
dataIndex: 'cpbh',
componentType: 'Input',
defaultValue: '',
componentProps: {
width: '100%',
span: '',
defaultValue: '',
placeholder: '请输入产品编号',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
allowClear: false,
showLabel: true,
required: false,
rules: [],
events: {},
listStyle: '',
isSave: false,
isShow: false,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{
key: '63c46f68444c4092aff3d711a0e4f1c4', key: '63c46f68444c4092aff3d711a0e4f1c4',
title: '产品', title: '产品',
dataIndex: 'cp', dataIndex: 'cp',
...@@ -918,6 +951,37 @@ export const formProps: FormProps = { ...@@ -918,6 +951,37 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '14b12cc2cf3a40bdae1fa6869902252a',
title: '仓库',
dataIndex: 'ck',
componentType: 'Input',
defaultValue: '',
componentProps: {
width: '100%',
span: '',
defaultValue: '',
placeholder: '请输入仓库',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
allowClear: false,
showLabel: true,
required: false,
rules: [],
events: {},
listStyle: '',
isSave: false,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{
key: '4e325b4ad3cf470d92af7e0d090e0a6d', key: '4e325b4ad3cf470d92af7e0d090e0a6d',
title: '位置', title: '位置',
dataIndex: 'wz', dataIndex: 'wz',
......
xjrsoft-vue3/src/views/ckgl/kcpd/components/workflowPermission.ts
...@@ -210,6 +210,21 @@ export const permissionList = [ ...@@ -210,6 +210,21 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
tableName: 'mesWarehouseInventoryRelaList', tableName: 'mesWarehouseInventoryRelaList',
fieldName: '产品编号',
fieldId: 'cpbh',
type: 'Input',
key: '6baef041c82842dc9adb2d4cfb7b5ad3',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesWarehouseInventoryRelaList',
fieldName: '产品', fieldName: '产品',
fieldId: 'cp', fieldId: 'cp',
type: 'XjrSelect', type: 'XjrSelect',
...@@ -240,6 +255,21 @@ export const permissionList = [ ...@@ -240,6 +255,21 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
tableName: 'mesWarehouseInventoryRelaList', tableName: 'mesWarehouseInventoryRelaList',
fieldName: '仓库',
fieldId: 'ck',
type: 'Input',
key: '14b12cc2cf3a40bdae1fa6869902252a',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesWarehouseInventoryRelaList',
fieldName: '位置', fieldName: '位置',
fieldId: 'wz', fieldId: 'wz',
type: 'XjrSelect', type: 'XjrSelect',
......
xjrsoft-vue3/src/views/ckgl/kcyk/components/workflowPermission.ts
...@@ -57,6 +57,23 @@ export const permissionList = [ ...@@ -57,6 +57,23 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '货位',
fieldId: 'hw',
isSubTable: false,
showChildren: true,
type: 'input',
key: '54500356c99e4d06a53a79a442d348e0',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '批次号', fieldName: '批次号',
fieldId: 'pch', fieldId: 'pch',
isSubTable: false, isSubTable: false,
...@@ -78,8 +95,8 @@ export const permissionList = [ ...@@ -78,8 +95,8 @@ export const permissionList = [
fieldId: 'xtsl', fieldId: 'xtsl',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'number',
key: 'c29582cdbd274b0cbd798fe5a4642cc9', key: 'c2620adb8c7e41578bfb7b20e9355d5c',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -95,8 +112,8 @@ export const permissionList = [ ...@@ -95,8 +112,8 @@ export const permissionList = [
fieldId: 'pdsl', fieldId: 'pdsl',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'number',
key: 'c04bb88244fe43349bebf968fdce3ce9', key: 'dd2024cad3a14e06b5e961826ec9a1e4',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -129,8 +146,8 @@ export const permissionList = [ ...@@ -129,8 +146,8 @@ export const permissionList = [
fieldId: 'ce', fieldId: 'ce',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'number',
key: '10186fcaa02b4481be4c236037f0783a', key: '3668d0679a244117acf2ce4bbc5e14dd',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
......
xjrsoft-vue3/src/views/ckgl/kcyk/index.vue
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
//展示在列表内的按钮 //展示在列表内的按钮
const actionButtons = ref<string[]>(["create"]); const actionButtons = ref<string[]>(["create"]);
const buttonConfigs = computed(()=>{ const buttonConfigs = computed(()=>{
const list = [{"isUse":true,"name":"生成单据","code":"create","icon":"ant-design:download-outlined","isDefault":false,"setting":[],"showType":"inline","buttonType":"primary"}] const list = [{"buttonId":"2016441785685393408","name":"生成单据","code":"create","icon":"ant-design:download-outlined","isDefault":false,"isUse":true,"setting":[],"showType":"inline","buttonType":"primary"}]
return filterButtonAuth(list); return filterButtonAuth(list);
}) })
...@@ -337,4 +337,4 @@ ...@@ -337,4 +337,4 @@
</style> </style>
\ No newline at end of file
xjrsoft-vue3/src/views/ckgl/qtck/components/config.ts
...@@ -3,8 +3,8 @@ import { BasicColumn } from '/@/components/Table'; ...@@ -3,8 +3,8 @@ import { BasicColumn } from '/@/components/Table';
export const searchFormSchema: FormSchema[] = [ export const searchFormSchema: FormSchema[] = [
{ {
field: 'ywhb', field: 'ywzz',
label: '业务伙伴', label: '业务组织',
defaultValue: undefined, defaultValue: undefined,
component: 'Input', component: 'Input',
}, },
...@@ -15,6 +15,24 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -15,6 +15,24 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input', component: 'Input',
}, },
{ {
field: 'dbrq',
label: '调拨日期',
defaultValue: undefined,
component: 'RangePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm:ss',
style: { width: '100%' },
getPopupContainer: () => document.body,
},
},
{
field: 'lydj',
label: '来源单据',
defaultValue: undefined,
component: 'Input',
},
{
field: 'ck', field: 'ck',
label: '仓库', label: '仓库',
defaultValue: undefined, defaultValue: undefined,
...@@ -34,8 +52,8 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -34,8 +52,8 @@ export const searchFormSchema: FormSchema[] = [
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'ywhb', dataIndex: 'ywzz',
title: '业务伙伴', title: '业务组织',
componentType: 'input', componentType: 'input',
fixed: false, fixed: false,
...@@ -194,8 +212,8 @@ export const formProps: FormProps = { ...@@ -194,8 +212,8 @@ export const formProps: FormProps = {
list: [ list: [
{ {
key: '47ec86ca7bf342d798e4ef44e302f987', key: '47ec86ca7bf342d798e4ef44e302f987',
field: 'ywhb', field: 'ywzz',
label: '业务伙伴', label: '业务组织',
type: 'input', type: 'input',
component: 'Input', component: 'Input',
colProps: { span: 24 }, colProps: { span: 24 },
...@@ -204,7 +222,7 @@ export const formProps: FormProps = { ...@@ -204,7 +222,7 @@ export const formProps: FormProps = {
width: '100%', width: '100%',
span: 7, span: 7,
defaultValue: '', defaultValue: '',
placeholder: '请输入业务伙伴', placeholder: '请输入业务组织',
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -584,14 +602,21 @@ export const formProps: FormProps = { ...@@ -584,14 +602,21 @@ export const formProps: FormProps = {
{ key: 2, label: 'Option 2', value: 'Option 2' }, { key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' }, { key: 3, label: 'Option 3', value: 'Option 3' },
], ],
datasourceType: 'dic', datasourceType: 'api',
params: { itemId: '2010541442849521665' }, params: null,
labelField: 'name', labelField: 'label',
valueField: 'value', valueField: 'value',
apiConfig: { apiConfig: {
path: 'CodeGeneration/selection', path: '/getStoreLocation',
method: 'GET', method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7', apiId: 'd55f1866db284ecd8b038a3956b9c5b7',
apiParams: [
{ key: '1', title: 'Query Params', tableInfo: [] },
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql="select name as value,name as label from mes_storage_location where delete_mark = 0 ";\r\nreturn db.select(sql);',
}, },
dicOptions: [], dicOptions: [],
required: false, required: false,
...@@ -600,6 +625,7 @@ export const formProps: FormProps = { ...@@ -600,6 +625,7 @@ export const formProps: FormProps = {
isShow: true, isShow: true,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2010541442849521665', itemId: '2010541442849521665',
defaultSelect: null,
listStyle: "return 'border: 0'", listStyle: "return 'border: 0'",
}, },
}, },
......
xjrsoft-vue3/src/views/ckgl/qtck/components/workflowPermission.ts
...@@ -6,8 +6,8 @@ export const permissionList = [ ...@@ -6,8 +6,8 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '业务伙伴', fieldName: '业务组织',
fieldId: 'ywhb', fieldId: 'ywzz',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'input',
......
xjrsoft-vue3/src/views/ckgl/qtck/index.vue
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
//展示在列表内的按钮 //展示在列表内的按钮
const actionButtons = ref<string[]>(["view","edit","delete"]); const actionButtons = ref<string[]>(["view","edit","delete"]);
const buttonConfigs = computed(()=>{ const buttonConfigs = computed(()=>{
const list = [{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isEnableLock":true},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true}] const list = [{"buttonId":"2010602997717409792","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2010602997717409793","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2010602997717409794","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2010602997717409795","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
return filterButtonAuth(list); return filterButtonAuth(list);
}) })
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
formConfig: { formConfig: {
labelWidth: 100, labelWidth: 100,
schemas: searchFormSchema, schemas: searchFormSchema,
fieldMapToTime: [], fieldMapToTime: [['dbrq', ['dbrqStart', 'dbrqEnd'], 'YYYY-MM-DD HH:mm:ss ', true],],
showResetButton: false, showResetButton: false,
}, },
bordered:false, bordered:false,
...@@ -382,4 +382,4 @@ ...@@ -382,4 +382,4 @@
</style> </style>
\ No newline at end of file
xjrsoft-vue3/src/views/ckgl/qtrk/components/config.ts
...@@ -3,8 +3,8 @@ import { BasicColumn } from '/@/components/Table'; ...@@ -3,8 +3,8 @@ import { BasicColumn } from '/@/components/Table';
export const searchFormSchema: FormSchema[] = [ export const searchFormSchema: FormSchema[] = [
{ {
field: 'ywhb', field: 'ywzz',
label: '业务伙伴', label: '业务组织',
defaultValue: undefined, defaultValue: undefined,
component: 'Input', component: 'Input',
}, },
...@@ -47,19 +47,13 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -47,19 +47,13 @@ export const searchFormSchema: FormSchema[] = [
getPopupContainer: () => document.body, getPopupContainer: () => document.body,
}, },
}, },
{
field: 'cgy',
label: '仓管员',
defaultValue: undefined,
component: 'Input',
},
]; ];
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'ywhb', dataIndex: 'ywzz',
title: '业务伙伴', title: '业务组织',
componentType: 'input', componentType: 'input',
fixed: false, fixed: false,
...@@ -218,8 +212,8 @@ export const formProps: FormProps = { ...@@ -218,8 +212,8 @@ export const formProps: FormProps = {
list: [ list: [
{ {
key: '47ec86ca7bf342d798e4ef44e302f987', key: '47ec86ca7bf342d798e4ef44e302f987',
field: 'ywhb', field: 'ywzz',
label: '业务伙伴', label: '业务组织',
type: 'input', type: 'input',
component: 'Input', component: 'Input',
colProps: { span: 24 }, colProps: { span: 24 },
...@@ -228,7 +222,7 @@ export const formProps: FormProps = { ...@@ -228,7 +222,7 @@ export const formProps: FormProps = {
width: '100%', width: '100%',
span: 7, span: 7,
defaultValue: '', defaultValue: '',
placeholder: '请输入业务伙伴', placeholder: '请输入业务组织',
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -657,14 +651,21 @@ export const formProps: FormProps = { ...@@ -657,14 +651,21 @@ export const formProps: FormProps = {
{ key: 2, label: 'Option 2', value: 'Option 2' }, { key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' }, { key: 3, label: 'Option 3', value: 'Option 3' },
], ],
datasourceType: 'dic', datasourceType: 'api',
params: { itemId: '2010541442849521665' }, params: null,
labelField: 'name', labelField: 'label',
valueField: 'value', valueField: 'value',
apiConfig: { apiConfig: {
path: 'CodeGeneration/selection', path: '/getStoreLocation',
method: 'GET', method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7', apiId: 'd55f1866db284ecd8b038a3956b9c5b7',
apiParams: [
{ key: '1', title: 'Query Params', tableInfo: [] },
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql="select name as value,name as label from mes_storage_location where delete_mark = 0 ";\r\nreturn db.select(sql);',
}, },
dicOptions: [], dicOptions: [],
required: false, required: false,
...@@ -673,6 +674,7 @@ export const formProps: FormProps = { ...@@ -673,6 +674,7 @@ export const formProps: FormProps = {
isShow: true, isShow: true,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2010541442849521665', itemId: '2010541442849521665',
defaultSelect: null,
listStyle: "return 'border: 0'", listStyle: "return 'border: 0'",
}, },
}, },
......
xjrsoft-vue3/src/views/ckgl/qtrk/components/workflowPermission.ts
...@@ -6,8 +6,8 @@ export const permissionList = [ ...@@ -6,8 +6,8 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '业务伙伴', fieldName: '业务组织',
fieldId: 'ywhb', fieldId: 'ywzz',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'input',
......
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