Commit fdd3e5d3 by sunhaiwei

生产入库页面修改库管员和物料编码

parent aed57ecc
...@@ -433,34 +433,61 @@ export const formProps: FormProps = { ...@@ -433,34 +433,61 @@ export const formProps: FormProps = {
span: 8, span: 8,
list: [ list: [
{ {
key: '6948582a4bcc4ed59c2a9e20b0eb0a40', key: '5138ee5cb107492e994b7e0b9e69be26',
field: 'kgy', field: 'kgy',
label: '库管员', label: '库管员',
type: 'input', type: 'associate-popup',
component: 'Input', component: 'MultiplePopup',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '',
componentProps: { componentProps: {
popupType: 'associate',
width: '100%', width: '100%',
span: 7, span: 7,
defaultValue: '', placeholder: '请选择库管员',
placeholder: '请输入库管员',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
allowClear: false,
showLabel: true, showLabel: true,
disabled: false,
datasourceType: 'api',
labelField: 'label',
valueField: 'value',
pageSize: 10,
assoTitle: '库管员',
apiConfig: {
path: '/test3/getUserByName',
method: 'GET',
apiId: 'b0e85dd1dd054888a1452a3261938b28',
apiParams: [
{
key: '1',
title: 'Query Params',
tableInfo: [
{
name: 'name',
value: null,
description: null,
required: false,
dataType: null,
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: '',
},
],
},
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql = \'select id as "value", name as "label" from xjr_user WHERE delete_mark = 0 ?{name, and name like concat("%",#{name},"%")}\'\r\nreturn db.select(sql);\r\n',
outputParams: [{ name: 'label', tableTitle: '用户名', show: true, width: 150 }],
},
dicOptions: [],
required: false, required: false,
rules: [], rules: [],
events: {}, events: {},
listStyle: '',
isSave: false,
isShow: true, isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' }, style: { width: '100%' },
}, },
...@@ -785,6 +812,100 @@ export const formProps: FormProps = { ...@@ -785,6 +812,100 @@ export const formProps: FormProps = {
mainKey: 'mesWarehouseProductInfoList', mainKey: 'mesWarehouseProductInfoList',
columns: [ columns: [
{ {
key: '9f9255da541c4ab6987fb95a9cd10fe0',
title: '物料编码',
dataIndex: 'wlid',
componentType: 'MultiplePopup',
componentProps: {
popupType: 'associate',
width: '100%',
span: '',
placeholder: '请选择物料编码',
showLabel: true,
disabled: false,
datasourceType: 'api',
labelField: 'label',
valueField: 'value',
pageSize: 10,
assoTitle: '物料信息',
apiConfig: {
path: '/jcxx/wlInfoList',
method: 'GET',
apiId: '58a1e5be580f4cc991e444e95142bbe7',
apiParams: [
{
key: '1',
title: 'Query Params',
tableInfo: [
{
name: 'keyword',
value: null,
description: null,
required: false,
dataType: 'String',
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: '',
},
],
},
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql ="select *,id as value,cpbh as label from mes_base_product_info where delete_mark = 0"+\r\n\' ?{keyword, AND cpmc LIKE CONCAT("%", #{keyword}, "%")}\';\r\nreturn db.select(sql);',
outputParams: [
{
name: 'label',
tableTitle: '物料编码',
bindField: 'wlbm',
show: true,
width: 150,
component: '67758677bce44720b4af09091d5590f3',
bindTable: 'mes_warehouse_product_info',
},
{
name: 'cpmc',
tableTitle: '物料名称',
bindField: 'wlmc',
show: true,
width: 150,
component: '90eb56185b5c419b9f0d7d6179beed9b',
bindTable: 'mes_warehouse_product_info',
},
{
name: 'gg',
tableTitle: '规格',
bindField: 'gg',
show: true,
width: 150,
component: 'e5b7433c899c4af095639be8726ede96',
bindTable: 'mes_warehouse_product_info',
},
{
name: 'xh',
tableTitle: '型号',
bindField: 'xh',
show: true,
width: 150,
component: '3d33a3a9e46545c5ba831660038ebc88',
bindTable: 'mes_warehouse_product_info',
},
],
},
dicOptions: [],
required: false,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{
key: '67758677bce44720b4af09091d5590f3', key: '67758677bce44720b4af09091d5590f3',
title: '物料编码', title: '物料编码',
dataIndex: 'wlbm', dataIndex: 'wlbm',
...@@ -802,12 +923,12 @@ export const formProps: FormProps = { ...@@ -802,12 +923,12 @@ export const formProps: FormProps = {
disabled: false, disabled: false,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: true, required: false,
rules: [], rules: [],
events: {}, events: {},
listStyle: '', listStyle: '',
isSave: false, isSave: false,
isShow: true, isShow: false,
scan: false, scan: false,
bordered: true, bordered: true,
isShowAi: false, isShowAi: false,
...@@ -915,9 +1036,7 @@ export const formProps: FormProps = { ...@@ -915,9 +1036,7 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
min: 0, min: 0,
max: null,
step: 1, step: 1,
maxlength: null,
disabled: false, disabled: false,
showLabel: true, showLabel: true,
controls: true, controls: true,
...@@ -967,9 +1086,7 @@ export const formProps: FormProps = { ...@@ -967,9 +1086,7 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
min: 0, min: 0,
max: null,
step: 1, step: 1,
maxlength: null,
disabled: false, disabled: false,
showLabel: true, showLabel: true,
controls: true, controls: true,
...@@ -1160,6 +1277,100 @@ export const formProps: FormProps = { ...@@ -1160,6 +1277,100 @@ export const formProps: FormProps = {
mainKey: 'mesWarehouseProductChangeList', mainKey: 'mesWarehouseProductChangeList',
columns: [ columns: [
{ {
key: 'c2c87879074c465cbf872c30f274f080',
title: '物料编码',
dataIndex: 'wlid',
componentType: 'MultiplePopup',
componentProps: {
popupType: 'associate',
width: '100%',
span: '',
placeholder: '请选择物料编码',
showLabel: true,
disabled: false,
datasourceType: 'api',
labelField: 'label',
valueField: 'value',
pageSize: 10,
assoTitle: '物料信息',
apiConfig: {
path: '/jcxx/wlInfoList',
method: 'GET',
apiId: '58a1e5be580f4cc991e444e95142bbe7',
apiParams: [
{
key: '1',
title: 'Query Params',
tableInfo: [
{
name: 'keyword',
value: null,
description: null,
required: false,
dataType: 'String',
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: '',
},
],
},
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql ="select *,id as value,cpbh as label from mes_base_product_info where delete_mark = 0"+\r\n\' ?{keyword, AND cpmc LIKE CONCAT("%", #{keyword}, "%")}\';\r\nreturn db.select(sql);',
outputParams: [
{
name: 'label',
tableTitle: '物料编码',
bindField: 'wlbm',
show: true,
width: 150,
component: 'd1de0271a0aa489e8fbed33e705c4f5a',
bindTable: 'mes_warehouse_product_change',
},
{
name: 'cpmc',
tableTitle: '物料名称',
bindField: 'wlmc',
show: true,
width: 150,
component: '0f703bdd6bbe49f1ac1bac1b332090f2',
bindTable: 'mes_warehouse_product_change',
},
{
name: 'gg',
tableTitle: '规格',
bindField: 'gg',
show: true,
width: 150,
component: 'c35ad73504024d5ba769b876b00733d2',
bindTable: 'mes_warehouse_product_change',
},
{
name: 'xh',
tableTitle: '型号',
bindField: 'xh',
show: true,
width: 150,
component: '431253da65194e0290f806281603a46f',
bindTable: 'mes_warehouse_product_change',
},
],
},
dicOptions: [],
required: false,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{
key: 'd1de0271a0aa489e8fbed33e705c4f5a', key: 'd1de0271a0aa489e8fbed33e705c4f5a',
title: '物料编码', title: '物料编码',
dataIndex: 'wlbm', dataIndex: 'wlbm',
...@@ -1170,7 +1381,6 @@ export const formProps: FormProps = { ...@@ -1170,7 +1381,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入物料编码', placeholder: '请输入物料编码',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -1183,7 +1393,7 @@ export const formProps: FormProps = { ...@@ -1183,7 +1393,7 @@ export const formProps: FormProps = {
events: {}, events: {},
listStyle: '', listStyle: '',
isSave: false, isSave: false,
isShow: true, isShow: false,
scan: false, scan: false,
bordered: true, bordered: true,
isShowAi: false, isShowAi: false,
...@@ -1201,7 +1411,6 @@ export const formProps: FormProps = { ...@@ -1201,7 +1411,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入物料名称', placeholder: '请输入物料名称',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -1232,7 +1441,6 @@ export const formProps: FormProps = { ...@@ -1232,7 +1441,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入规格', placeholder: '请输入规格',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -1263,7 +1471,6 @@ export const formProps: FormProps = { ...@@ -1263,7 +1471,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入型号', placeholder: '请输入型号',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -1294,7 +1501,6 @@ export const formProps: FormProps = { ...@@ -1294,7 +1501,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入批次号', placeholder: '请输入批次号',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -1325,7 +1531,6 @@ export const formProps: FormProps = { ...@@ -1325,7 +1531,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入货位', placeholder: '请输入货位',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -1356,9 +1561,7 @@ export const formProps: FormProps = { ...@@ -1356,9 +1561,7 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
min: 0, min: 0,
max: null,
step: 1, step: 1,
maxlength: null,
disabled: false, disabled: false,
showLabel: true, showLabel: true,
controls: true, controls: true,
...@@ -1383,7 +1586,6 @@ export const formProps: FormProps = { ...@@ -1383,7 +1586,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入备注', placeholder: '请输入备注',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
......
...@@ -76,11 +76,10 @@ export const permissionList = [ ...@@ -76,11 +76,10 @@ export const permissionList = [
fieldId: 'kgy', fieldId: 'kgy',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'associate-popup',
key: '6948582a4bcc4ed59c2a9e20b0eb0a40', key: '5138ee5cb107492e994b7e0b9e69be26',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -223,6 +222,21 @@ export const permissionList = [ ...@@ -223,6 +222,21 @@ export const permissionList = [
showChildren: false, showChildren: false,
tableName: 'mesWarehouseProductInfoList', tableName: 'mesWarehouseProductInfoList',
fieldName: '物料编码', fieldName: '物料编码',
fieldId: 'wlid',
type: 'MultiplePopup',
key: '9f9255da541c4ab6987fb95a9cd10fe0',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesWarehouseProductInfoList',
fieldName: '物料编码',
fieldId: 'wlbm', fieldId: 'wlbm',
type: 'Input', type: 'Input',
key: '67758677bce44720b4af09091d5590f3', key: '67758677bce44720b4af09091d5590f3',
...@@ -403,6 +417,21 @@ export const permissionList = [ ...@@ -403,6 +417,21 @@ export const permissionList = [
showChildren: false, showChildren: false,
tableName: 'mesWarehouseProductChangeList', tableName: 'mesWarehouseProductChangeList',
fieldName: '物料编码', fieldName: '物料编码',
fieldId: 'wlid',
type: 'MultiplePopup',
key: 'c2c87879074c465cbf872c30f274f080',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesWarehouseProductChangeList',
fieldName: '物料编码',
fieldId: 'wlbm', fieldId: 'wlbm',
type: 'Input', type: 'Input',
key: 'd1de0271a0aa489e8fbed33e705c4f5a', key: 'd1de0271a0aa489e8fbed33e705c4f5a',
......
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