diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts index b4130fb73..054531516 100644 --- a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts @@ -88,6 +88,18 @@ export const Area = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '拉动方式', + field: 'pullType', + dictType: DICT_TYPE.PULL_TYPE, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, { label: '是否是功能区', field: 'isFunctional', diff --git a/src/views/wms/basicDataManage/itemPull/index.vue b/src/views/wms/basicDataManage/itemPull/index.vue index 9116b5b54..8644df072 100644 --- a/src/views/wms/basicDataManage/itemPull/index.vue +++ b/src/views/wms/basicDataManage/itemPull/index.vue @@ -82,12 +82,6 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { const setV = {} setV[formField] = val[0][searchField] - if('itemCode'==formField){ - setV['itemName'] = val[0]['name'] - setV['backNumber'] = val[0]['backNumber'] - setV['receivedNumber'] = val[0]['receivedNumber'] - setV['productionLine'] = val[0]['itemGroup'] - } formRef.setValues(setV) }) } @@ -211,7 +205,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ItemPullApi.exportItemPull(tableObject.params) - download.excel(data, '品番拉动配置.xlsx') + download.excel(data, '补充方式配置.xlsx') } catch { } finally { exportLoading.value = false @@ -226,7 +220,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '品番拉动配置导入模版.xlsx' + templateTitle: '补充方式配置导入模版.xlsx' }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/itemPull/itemPull.data.ts b/src/views/wms/basicDataManage/itemPull/itemPull.data.ts index 7ffdbbb44..ed7be7ec6 100644 --- a/src/views/wms/basicDataManage/itemPull/itemPull.data.ts +++ b/src/views/wms/basicDataManage/itemPull/itemPull.data.ts @@ -11,7 +11,7 @@ import { Area } from '@/views/wms/basicDataManage/factoryModeling/areabasic/area export const ItemPullRules = reactive({ defaultErpLocationCode: [required], replenishType: [required], - pullTypeList: [required] + supplierCode: [required] }) export const ItemPull = useCrudSchemas( @@ -21,7 +21,6 @@ export const ItemPull = useCrudSchemas( field: 'defaultErpLocationCode', sort: 'custom', table: { - width: 150, fixed: 'left' }, form: { @@ -48,100 +47,12 @@ export const ItemPull = useCrudSchemas( } } }, - { - label: '品番', - field: 'itemCode', - sort: 'custom', - isSearch: true, - table: { - width: 180 - }, - form: { - // labelMessage: '信息提示说明!!!', - componentProps: { - enterSearch: true, //可输入回车 - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择品番', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '物料基础信息', // 查询弹窗标题 - searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 - searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 - searchCondition: [ - { - key: 'available', - value: 'TRUE', - isMainValue: false - }, - { - key: 'defaultErpLocationCode', - value: 'defaultErpLocationCode', - isMainValue: true - } - ], - verificationParams: [ - { - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: 'true', - isFormModel: true - } - ] // 失去焦点校验参数 - } - } - }, - { - label: '品名', - field: 'itemName', - sort: 'custom', - form: { - componentProps: { - disabled: true - } - }, - isSearch: false - }, - { - label: '背番', - field: 'backNumber', - sort: 'custom', - form: { - componentProps: { - disabled: true - } - }, - isSearch: true - }, - { - label: '受入号', - field: 'receivedNumber', - sort: 'custom', - form: { - componentProps: { - disabled: true - } - }, - isSearch: false - }, - { - label: '生产线区分', - field: 'productionLine', - sort: 'custom', - form: { - componentProps: { - disabled: true - } - }, - isSearch: false - }, { label: '供应商代码', field: 'supplierCode', sort: 'custom', isSearch: true, table: { - width: 150 }, form: { // labelMessage: '信息提示说明!!!', @@ -182,26 +93,6 @@ export const ItemPull = useCrudSchemas( isSearch: true, isTable: true, table: { - width: 120 - } - }, - { - label: '拉动方式', - field: 'pullTypeList', - dictType: DICT_TYPE.PULL_TYPE, - dictClass: 'string', - // dictAllOption:true,// 全选按钮 - // dictAllValue:'全选', - isTable: true, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'Select', - componentProps: { - multiple: true - } } }, { @@ -223,7 +114,6 @@ export const ItemPull = useCrudSchemas( }, sort: 'custom', table: { - width: 180 }, isTable: true, form: { @@ -251,7 +141,6 @@ export const ItemPull = useCrudSchemas( field: 'action', isForm: false, table: { - width: 150, fixed: 'right' } }