Skip to content

W
weiqiao-vue
Commit 20b675df by 宋春膨
Options

Merge remote-tracking branch 'origin/weiqiao-vue3' into weiqiao-vue3

parents f559bbbe d10c881b
Showing with 87 additions and 148 deletions
xjrsoft-vue3/src/views/jcsj/ckwz/components/config.ts
...@@ -8,32 +8,31 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -8,32 +8,31 @@ export const searchFormSchema: FormSchema[] = [
defaultValue: undefined, defaultValue: undefined,
component: 'Input', component: 'Input',
}, },
/* { // {
field: 'parentId', // field: 'parentId',
label: '上级位置', // label: '上级位置',
defaultValue: undefined, // defaultValue: undefined,
component: 'XjrSelect', // component: 'TreeSelectComponent',
componentProps: { // componentProps: {
datasourceType: 'api', // span: 5,
apiConfig: { // defaultValue: '',
path: '/getSjwz', // showLabel: true,
method: 'GET', // isShow: true,
apiId: '4b8c17ba3e6a4cd6ba85e63e3917424a', // required: true,
apiParams: [ // events: {},
{ key: '1', title: 'Query Params', tableInfo: [] }, // rules: [],
{ key: '2', title: 'Header', tableInfo: [] }, // treeConfig: {
{ key: '3', title: 'Body' }, // id: '2008372971650543617',
], // isMultiple: false,
script: // height: 100,
'var sql="select id as value,name as label from roke_stock_location where parent_id = \'\'";\r\nreturn db.select(sql);', // innerParams: [],
}, // type: 2,
labelField: 'label', // isSaveLast: true,
valueField: 'value', // },
mode: 'multiple', // tooltipConfig: { visible: false, title: '提示文本' },
showSearch: true, // style: {},
getPopupContainer: () => document.body, // },
}, // },
},*/
{ {
field: 'locationType', field: 'locationType',
label: '位置类型', label: '位置类型',
...@@ -49,18 +48,12 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -49,18 +48,12 @@ export const searchFormSchema: FormSchema[] = [
getPopupContainer: () => document.body, getPopupContainer: () => document.body,
} }
}, },
{ /* {
field: 'completeName',
label: '显示名称',
defaultValue: undefined,
component: 'Input',
},
{
field: 'note', field: 'note',
label: '备注', label: '备注',
defaultValue: undefined, defaultValue: undefined,
component: 'Input', component: 'Input',
}, },*/
]; ];
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
...@@ -81,13 +74,16 @@ export const columns: BasicColumn[] = [ ...@@ -81,13 +74,16 @@ export const columns: BasicColumn[] = [
resizable: true, resizable: true,
dataIndex: 'parentId', dataIndex: 'parentId',
title: '上级位置', title: '上级位置',
componentType: 'select', componentType: 'tree-select-component',
fixed: false, fixed: false,
sorter: true, sorter: true,
styleConfig: undefined, styleConfig: undefined,
listStyle: undefined, listStyle: undefined,
customRender: ({ record }) => {
return record.parentName || record.parentId || '';
},
}, },
{ {
...@@ -253,56 +249,26 @@ export const formProps: FormProps = { ...@@ -253,56 +249,26 @@ export const formProps: FormProps = {
field: 'parentId', field: 'parentId',
label: '上级位置', label: '上级位置',
type: 'select', type: 'select',
component: 'XjrSelect', component: 'TreeSelectComponent',
colProps: { span: 24 }, colProps: { span: 24 },
componentProps: { componentProps: {
width: '100%', span: 5,
span: 7, defaultValue: '',
placeholder: '请选择下拉选择',
showLabel: true, showLabel: true,
showSearch: false, isShow: true,
isMultiple: false, required: true,
clearable: false, events: {},
disabled: false,
staticOptions: [
{ key: 1, label: '采购入库单', value: '采购入库单' },
{ key: 2, label: '销售出库单', value: '销售出库单' },
{ key: 3, label: '生产领料单', value: '生产领料单' },
{ key: 4, label: '生产入库单', value: '生产入库单' },
{ key: 5, label: '其他入库单', value: '其他入库单' },
{ key: 6, label: '其他出库单', value: '其他出库单' },
{ key: 7, label: '库存调拨单', value: '库存调拨单' },
{ key: 8, label: '库存盘点单', value: '库存盘点单' },
{ key: 9, label: '委外领料单', value: '委外领料单' },
{ key: 10, label: '委外入库单', value: '委外入库单' },
],
defaultSelect: null,
datasourceType: 'api',
params: null,
labelField: 'label',
valueField: 'value',
apiConfig: {
path: '/getSjwz',
method: 'GET',
apiId: '4b8c17ba3e6a4cd6ba85e63e3917424a',
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 roke_stock_location where parent_id = \'\'";\r\nreturn db.select(sql);',
},
dicOptions: [],
required: false,
rules: [], rules: [],
events: { treeConfig: {
change: id: '2008372971650543617',
"\nformActionType.httpRequest({\n requestType: 'get',\n requestUrl: '/magic-api/getLocation', // \n params: {\n id: formModel.parent_id\n },\n errorMessageMode: 'none'\n}).then(res => {\n if (res.length > 0) { \n var parentName = res[0].name;\n formModel.complete_name = parentName + '/' + formModel.name;\n } else {\n formModel.complete_name = formModel.parent_id + '/' + formModel.name;\n\n }\n}).catch(err => {\n console.error('接口请求异常：', err);\n formModel.complete_name = formModel.parent_id + '/' + formModel.name;\n});", isMultiple: false,
height: 100,
innerParams: [],
type: 2,
isSaveLast: true,
}, },
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' }, style: {},
}, },
}, },
{ {
...@@ -321,14 +287,7 @@ export const formProps: FormProps = { ...@@ -321,14 +287,7 @@ export const formProps: FormProps = {
isMultiple: false, isMultiple: false,
clearable: false, clearable: false,
disabled: false, disabled: false,
staticOptions: [
{ key: 1, label: '内部位置', value: '出库内部位置' },
{ key: 2, label: '虚拟位置', value: '虚拟位置' },
{ key: 3, label: '内部调拨客户位置', value: '内部调拨' },
{ key: 4, label: '供应商位置', value: '供应商位置' },
{ key: 5, label: '生产位置', value: '生产位置' },
{ key: 6, label: '中转位置', value: '中转位置' },
],
datasourceType: 'dic', datasourceType: 'dic',
params: { itemId: '2008349355210772481' }, params: { itemId: '2008349355210772481' },
labelField: 'name', labelField: 'name',
......
xjrsoft-vue3/src/views/jcsj/huowei/components/Form.vue
...@@ -222,3 +222,4 @@ ...@@ -222,3 +222,4 @@
}); });
</script> </script>
\ No newline at end of file
xjrsoft-vue3/src/views/jcsj/huowei/components/HuoweiModal.vue
...@@ -163,3 +163,4 @@ ...@@ -163,3 +163,4 @@
</script> </script>
\ No newline at end of file
xjrsoft-vue3/src/views/jcsj/huowei/components/config.ts
...@@ -33,26 +33,25 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -33,26 +33,25 @@ export const searchFormSchema: FormSchema[] = [
field: 'stockLocationId', field: 'stockLocationId',
label: '仓库位置', label: '仓库位置',
defaultValue: undefined, defaultValue: undefined,
component: 'XjrSelect', component: 'TreeSelectComponent',
componentProps: { componentProps: {
datasourceType: 'api', span: 5,
apiConfig: { defaultValue: '',
path: '/getLocationAll', showLabel: true,
method: 'GET', isShow: true,
apiId: '69e28b1debda431f93b97e2d8adcc601', required: true,
apiParams: [ events: {},
{ key: '1', title: 'Query Params', tableInfo: [] }, rules: [],
{ key: '2', title: 'Header', tableInfo: [] }, treeConfig: {
{ key: '3', title: 'Body' }, id: '2008372971650543617',
], isMultiple: false,
script: height: 100,
'var sql="select id as value,name as label from roke_stock_location where delete_mark = 0";\r\nreturn db.select(sql);', innerParams: [],
type: 2,
isSaveLast: true,
}, },
labelField: 'label', tooltipConfig: { visible: false, title: '提示文本' },
valueField: 'value', style: {},
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
}, },
}, },
]; ];
...@@ -101,7 +100,7 @@ export const columns: BasicColumn[] = [ ...@@ -101,7 +100,7 @@ export const columns: BasicColumn[] = [
resizable: true, resizable: true,
dataIndex: 'stockLocationId', dataIndex: 'stockLocationId',
title: '仓库位置', title: '仓库位置',
componentType: 'select', componentType: 'tree-select-component',
fixed: false, fixed: false,
sorter: true, sorter: true,
...@@ -239,7 +238,6 @@ export const formProps: FormProps = { ...@@ -239,7 +238,6 @@ export const formProps: FormProps = {
{ key: 5, label: '生产位置', value: '生产位置' }, { key: 5, label: '生产位置', value: '生产位置' },
{ key: 6, label: '中转位置', value: '中转位置' }, { key: 6, label: '中转位置', value: '中转位置' },
], ],
defaultSelect: null,
datasourceType: 'dic', datasourceType: 'dic',
labelField: 'name', labelField: 'name',
valueField: 'value', valueField: 'value',
...@@ -324,54 +322,31 @@ export const formProps: FormProps = { ...@@ -324,54 +322,31 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '602ff3908f4240b9841bf093f33b64d2', key: '9e1c5a7dc48c4a019479ed0957781e21',
field: 'stockLocationId', field: 'stockLocationId',
label: '仓库位置', label: '仓库位置',
type: 'select', type: 'tree-select-component',
component: 'XjrSelect', component: 'TreeSelectComponent',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '',
componentProps: { componentProps: {
width: '100%',
span: 5, span: 5,
placeholder: '请选择下拉选择', defaultValue: '',
showLabel: true, showLabel: true,
showSearch: false, isShow: true,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [
{ key: 1, label: '内部位置', value: '出库内部位置' },
{ key: 2, label: '虚拟位置', value: '虚拟位置' },
{ key: 3, label: '内部调拨客户位置', value: '内部调拨' },
{ key: 4, label: '供应商位置', value: '供应商位置' },
{ key: 5, label: '生产位置', value: '生产位置' },
{ key: 6, label: '中转位置', value: '中转位置' },
],
defaultSelect: null,
datasourceType: 'api',
labelField: 'label',
valueField: 'value',
apiConfig: {
path: '/getLocationAll',
method: 'GET',
apiId: '69e28b1debda431f93b97e2d8adcc601',
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 roke_stock_location where delete_mark = 0";\r\nreturn db.select(sql);',
},
dicOptions: [],
required: true, required: true,
rules: [],
events: {}, events: {},
isShow: true, rules: [],
treeConfig: {
id: '2008372971650543617',
isMultiple: false,
height: 100,
innerParams: [],
type: 2,
isSaveLast: true,
},
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
params: null, style: {},
itemId: '2008349355210772481',
style: { width: '100%' },
}, },
}, },
{ {
......
xjrsoft-vue3/src/views/jcsj/huowei/components/workflowPermission.ts
...@@ -76,10 +76,11 @@ export const permissionList = [ ...@@ -76,10 +76,11 @@ export const permissionList = [
fieldId: 'stockLocationId', fieldId: 'stockLocationId',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'select', type: 'tree-select-component',
key: '602ff3908f4240b9841bf093f33b64d2', key: '9e1c5a7dc48c4a019479ed0957781e21',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: 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