From 0415a9cb4d377e5836f0b34a27cb7c3b64cfc0a3 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Sun, 28 Apr 2024 14:39:19 +0800 Subject: [PATCH 01/84] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptAssembleRecordMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index ec3ff66c1..8ea8c882c 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -57,7 +57,7 @@ :allSchemas="ProductreceiptRecordMain.allSchemas" :detailAllSchemas="ProductreceiptRecordDetail.allSchemas" :detailAllSchemasRules="ProductreceiptRecordDetailRules" - :apiPage="ProductreceiptRecordDetailApi.getProductreceiptRecordDetailPage" + :apiPage="ProductreceiptRecordDetailApi.getProductreceiptRecordDetailPageAssemble" :buttondataTable="buttondataTable" @tableFormButton="tableFormButton" /> From 642380b57c95c821fd860d77e42f642b866d8dd9 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Sun, 28 Apr 2024 14:54:26 +0800 Subject: [PATCH 02/84] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=94=B6=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreceiptRecordMain.data.ts | 162 +++++++++++++----- .../customerreceiptRequestMain.data.ts | 89 +++++++--- .../productscrapRequestMain/index.vue | 1 + 3 files changed, 189 insertions(+), 63 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts index de3b7aadd..458147c5a 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts @@ -40,6 +40,19 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ width: 180 }, }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, + isForm: false, + sort: 'custom', + table: { + width: 150 + }, + }, { label: '客户代码', field: 'customerCode', @@ -55,6 +68,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '承运商', @@ -63,6 +77,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:1000, }, { label: '运输方式', @@ -71,6 +86,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:1000, }, { label: '车牌号', @@ -79,6 +95,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:1000, }, { label: '申请时间', @@ -91,6 +108,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -111,6 +129,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -131,6 +150,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -151,6 +171,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -168,6 +189,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到仓库代码', @@ -176,13 +198,14 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '从库区类型范围', field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -195,13 +218,14 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到库区类型范围', field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -214,6 +238,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '出库事务类型', @@ -222,6 +247,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '入库事务类型', @@ -230,6 +256,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '业务类型', @@ -238,6 +265,8 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, + }, { label: '部门', @@ -246,13 +275,14 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '接口类型', field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -265,6 +295,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -277,6 +308,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -293,6 +325,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, // { // label: '代码', @@ -308,7 +341,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: true, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -396,6 +429,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive table: { width: 180 }, + isTable: false, }, // { // label: '销售订单号', @@ -436,6 +470,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, }, { label: '物料描述2', @@ -444,107 +479,138 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, }, { - label: '从批次', - field: 'fromBatch', + label: '批次', + field: 'batch', sort: 'custom', table: { width: 150 }, }, { - label: '到批次', - field: 'toBatch', + label: '包装代码', + field: 'packingNumber', sort: 'custom', table: { width: 150 }, }, - // { - // label: '包装号', - // field: 'packingNumber', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, { - label: '从包装号', - field: 'fromPackingNumber', + label: '包装规格', + field: 'packUnit', sort: 'custom', table: { width: 150 }, }, { - label: '到包装号', - field: 'toPackingNumber', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '从器具号', - field: 'fromContainerNumber', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '到器具号', - field: 'toContainerNumber', + label: '从库位', + field: 'fromLocationCode', sort: 'custom', table: { width: 150 }, }, { - label: '数量', - field: 'qty', + label: '到库位', + field: 'toLocationCode', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } }, + { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '从批次', + field: 'fromBatch', sort: 'custom', table: { width: 150 }, + isTable: false, }, { - label: '从库位代码', - field: 'fromLocationCode', + label: '到批次', + field: 'toBatch', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + + }, + + { + label: '从包装号', + field: 'fromPackingNumber', sort: 'custom', table: { width: 150 }, + isTable: false, + }, { - label: '到库位代码', - field: 'toLocationCode', + label: '到包装号', + field: 'toPackingNumber', sort: 'custom', table: { width: 150 }, + isTable: false, + + }, + { + label: '从器具号', + field: 'fromContainerNumber', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + + }, + { + label: '到器具号', + field: 'toContainerNumber', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, }, + + { label: '库存状态', field: 'inventoryStatus', dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -559,7 +625,9 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive }, form: { component: 'InputNumber', - } + }, + isTable: false, + }, { label: '金额', @@ -568,6 +636,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', } @@ -579,6 +648,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable: false, }, { label: '到库位组代码', @@ -587,6 +657,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable: false, }, { label: '从库区代码', @@ -595,6 +666,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable: false, }, { label: '到库区代码', @@ -603,6 +675,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable: false, }, { label: '从货主代码', @@ -611,6 +684,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable: false, }, { label: '到货主代码', @@ -619,6 +693,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable: false, }, { label: '项目代码', @@ -627,6 +702,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable: false, }, // { // label: '任务明细ID', @@ -649,7 +725,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -662,6 +738,8 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable: false, + }, { label: '创建时间', @@ -674,6 +752,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -690,6 +769,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable: false, }, ])) diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts index 6ac929cec..8508f6f4e 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts @@ -38,30 +38,30 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( isSearch: true, }, { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, - isForm: false, + label: '发货记录单号', + field: 'deliverRecordNumber', sort: 'custom', table: { width: 150 }, + isSearch: true, }, { - label: '发货记录单号', - field: 'deliverRecordNumber', + label: '发货计划单号', + field: 'deliverPlanNumber', sort: 'custom', table: { width: 150 }, - isSearch: true, }, { - label: '发货计划单号', - field: 'deliverPlanNumber', + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, + isForm: false, sort: 'custom', table: { width: 150 @@ -83,6 +83,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '承运商', @@ -91,6 +92,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + sortTableDefault:1000, }, { label: '运输方式', @@ -99,6 +101,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + sortTableDefault:1000, }, { label: '车牌号', @@ -107,6 +110,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + sortTableDefault:1000, }, { label: '申请时间', @@ -119,6 +123,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -139,6 +144,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -156,6 +162,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '到仓库代码', @@ -165,13 +172,14 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '从库区类型范围', field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -183,7 +191,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', isForm: false, table: { @@ -195,6 +203,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( field: 'fromAreaCodes', sort: 'custom', isForm: false, + isTable: false, table: { width: 150 }, @@ -204,6 +213,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( field: 'toAreaCodes', sort: 'custom', isForm: false, + isTable: false, table: { width: 150 }, @@ -215,13 +225,15 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - isForm: false + isForm: false, + isTable: false, }, { label: '部门', field: 'departmentCode', sort: 'custom', isForm: false, + isTable: false, table: { width: 150 }, @@ -255,7 +267,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -276,7 +288,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -297,7 +309,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -353,6 +365,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( valueFormat: 'x', } }, + isTable: false, isForm: false }, { @@ -370,6 +383,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( valueFormat: 'x', } }, + isTable: false, isForm: false }, { @@ -391,6 +405,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( valueFormat: 'x', } }, + isTable: false, isForm: false }, { @@ -400,6 +415,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, isForm: false }, { @@ -468,6 +484,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive row['processCode'] = val[0]['code'] }else if(formField == 'itemCode'){ row['itemCode'] = val[0]['itemCode'] + row['uom'] = val[0]['uom'] row['bomVersion'] = '' row['childList'] = [] // 查询标准价格 From efd02dcf122bd2f056bcb2b87ba06456e06aac9a Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Sun, 28 Apr 2024 15:12:36 +0800 Subject: [PATCH 03/84] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E5=A4=8D=20pl?= =?UTF-8?q?anMaserCode=E6=94=B9=E4=B8=BA"planMasterCode"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/productOffline/index.vue | 2 +- src/views/mes/productionPlan/productionPlan.data.ts | 2 +- src/views/mes/workScheduling/index.vue | 10 +++++----- src/views/mes/workScheduling/workScheduling.data.ts | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/views/mes/productOffline/index.vue b/src/views/mes/productOffline/index.vue index 3a01037f6..194031539 100644 --- a/src/views/mes/productOffline/index.vue +++ b/src/views/mes/productOffline/index.vue @@ -83,7 +83,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { const setV = {} setV[formField] = val[0][searchField] setV['workBillno'] = val[0]['schedulingCode']//工单编码 - setV['planCode'] = val[0]['planMaserCode']//计划编码 + setV['planCode'] = val[0]['planMasterCode']//计划编码 setV['processCode'] = val[0]['workingNode']//工序编码 setV['stationCode'] = val[0]['currentWorkstation']//工位编码 // 以上字段的值从job_mes_work_scheduling表中获取 diff --git a/src/views/mes/productionPlan/productionPlan.data.ts b/src/views/mes/productionPlan/productionPlan.data.ts index 5e6a4bbd1..7fe70e582 100644 --- a/src/views/mes/productionPlan/productionPlan.data.ts +++ b/src/views/mes/productionPlan/productionPlan.data.ts @@ -213,7 +213,7 @@ export const workscheduling = useCrudSchemas(reactive([ }, { label: '计划编号', - field: 'planMaserCode', + field: 'planMasterCode', sort: 'custom', isSearch: true, table: { diff --git a/src/views/mes/workScheduling/index.vue b/src/views/mes/workScheduling/index.vue index 59b9e7fe0..848251919 100644 --- a/src/views/mes/workScheduling/index.vue +++ b/src/views/mes/workScheduling/index.vue @@ -29,7 +29,7 @@ > - - = - - + + + + + @@ -210,6 +211,7 @@ const deleteNode=(row)=>{ processData.value.splice(processData.value.indexOf(row),1) graph.value.removeNode(row.code) } +const productCode=ref() //初始化图形组件 const graph = ref() const rowData = ref() @@ -219,6 +221,7 @@ const openDetail = (row: any) => { titleNameRef.value = rowData.value.processrouteCode titleValueRef.value = rowData.value.processName processRouteId.value = rowData.value.id + productCode.value=rowData.value.productCode routeVersion.value=rowData.value.routeVersion remarksData.data = { tableId: rowData.value.id, @@ -261,11 +264,17 @@ const getProcessInfo = async (id: any) => { /** 获取产品信息 */ const getItembasicInfo = async (code: String) => { const res = await ProcessrouteApi.getProductInfo(code) + console.log('productData',res) productData.value = res } /** 获取物料列表 */ -const getItembasicPage = async (code) => { - return await ProcessrouteApi.getItembasicPage(code); +const getProcessBomList = async (pcode,processCode) => { + let params={ + code:pcode ,//"产品编码" + //version:version,//bom版本" + processCode:processCode + } + return await ProcessrouteApi.getProcessBomList(params); } /** 查询模具基本信息列表 */ const getPatternPage = async (code) => { @@ -290,7 +299,7 @@ const getWorkstationPage = async (code) => { // } /**获取工艺路线定义的工序列表 */ const getProcessList = async (code) => { - console.log('code',code) + //console.log('code',code) const res = await ProcessrouteApi.getProcessrouteNodeList(code) processData.value = res //return res @@ -299,15 +308,15 @@ const getProcessList = async (code) => { const nodeClick = (e, x, y, node, view) => { Promise.all([ getProcessInfo(node.id), - getItembasicPage(node.id), + getProcessBomList(productCode.value,node.id), getPatternPage(node.id), getWorkstationPage(node.id) - ]).then(([processIndoList,itembasicPage, patternPage,workstationInfoList]) => { + ]).then(([processIndoList,basicBom, patternPage,workstationInfoList]) => { // 在这里处理所有异步操作的结果 - message.info(JSON.stringify(processIndoList)) - console.log(processIndoList) + //message.info(JSON.stringify(processIndoList)) + console.log('basicBom',basicBom) //获取绑定的物料信息 - materialData.value = itembasicPage.list + materialData.value = basicBom //获取绑定的模具信息 mouldData.value = patternPage.list //获取绑定的工位信息 From 3fa440547a9e34ef3d5e901b59761dc0abd3eb96 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Mon, 29 Apr 2024 11:53:34 +0800 Subject: [PATCH 22/84] =?UTF-8?q?=E4=BF=AE=E6=94=B9Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspectionTemplate/addForm.vue | 2 +- .../inspectionRequest/inspectionMain.data.ts | 105 +++--------------- 2 files changed, 15 insertions(+), 92 deletions(-) diff --git a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue index cd63b2c85..729e1fcef 100644 --- a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue +++ b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue @@ -783,7 +783,7 @@ const submitForm = async () => { console.log(99,arr2) if (arr2 && arr2.length > 0) { const str = arr2.map((item) => item.description).join(',') - message.error(`${str}上限值应大目标值大于下限值`) + message.error(`${str}上限值应大于目标值大于下限值`) return } if (formType.value == 'create') { diff --git a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts b/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts index 9d2643818..68489bf6c 100644 --- a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts +++ b/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts @@ -15,10 +15,10 @@ export const InspectionMainRules = reactive({ requestInspectionNum: [required,{ validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'}], referenceCertificateRow: [{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}], inspectionType: [required], + minPackageQty: [required], }) export const InspectionMain = useCrudSchemas(reactive([ - { label: '申请编码', field: 'number', @@ -311,15 +311,6 @@ export const InspectionMain = useCrudSchemas(reactive([ width: 150 } }, - // { - // label: '检验方案编码', - // field: 'inspectionSchemeCode', - // sort: 'custom', - // isSearch: false, - // table: { - // width: 150 - // } - // }, { label: '检验类型', field: 'inspectionType', @@ -335,77 +326,19 @@ export const InspectionMain = useCrudSchemas(reactive([ width: 175 } }, - // { - // label: '检验阶段', - // field: 'inspectionStage', - // sort: 'custom', - // isSearch: false, - // form: { - // component: 'InputNumber', - // value: 0, - // componentProps: { - // disabled: true - // } - // }, - // table: { - // width: 130 - // } - // }, - // { - // label: '检验严格性', - // field: 'inspectionStringency', - // sort: 'custom', - // isSearch: false, - // dictType: DICT_TYPE.INSPECTION_SEVERITY, - // dictClass: 'string', - // form: { - // componentProps: { - // disabled: true - // } - // }, - // table: { - // width: 150 - // } - // }, - // { - // label: '检验申请包装列表', - // field: 'applicationPackageCode', - // sort: 'custom', - // isSearch: false, - // table: { - // width: 150 - // } - // }, - // { - // label: '检验水平', - // field: 'inspectionLevel', - // dictType: DICT_TYPE.INSPECTION_LEVEL, - // sort: 'custom', - // isSearch: false, - // table: { - // width: 150 - // } - // }, - // { - // label: 'AQL值', - // field: 'aqlValue', - // sort: 'custom', - // isSearch: false, - // dictType: DICT_TYPE.BASIC_AQL, - // table: { - // width: 150 - // } - // }, - // { - // label: '是否可用', - // field: 'available', - // sort: 'custom', - // isSearch: false, - // dictType: DICT_TYPE.TRUE_FALSE, - // table: { - // width: 150 - // } - // }, + { + label: '小包装数', + field: 'minPackageQty', + sort: 'custom', + isSearch: false, + form: { + component: 'InputNumber', + value: 0 + }, + table: { + width: 150 + } + }, { label: '操作', field: 'action', @@ -498,15 +431,5 @@ export const InspectionRequestPackage = useCrudSchemas(reactive([ table:{ width:150 } - }, - { - label: '操作', - field: 'action', - isForm: false, - isTable:true, - table: { - width: 120, - fixed: 'right' - } } ])) From aafb817be312a13c1bc6c9f1b683022351cc5afc Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 29 Apr 2024 12:16:34 +0800 Subject: [PATCH 23/84] =?UTF-8?q?=E4=B8=BB=E5=AD=90=E8=A1=A8=E5=90=88?= =?UTF-8?q?=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockupMainJob/stockupMainJob.data.ts | 103 ++++++++++++------ .../stockupMainRecord.data.ts | 62 +++++++++-- .../stockup/stockupMainRequest/index.vue | 15 ++- .../stockupMainRequest.data.ts | 58 +++++++--- .../productreceiptRequestMain/index.vue | 16 ++- .../productreceiptRequestMain.data.ts | 59 +++++++++- .../index.vue | 19 +++- .../productreceiptAssembleRequestMain.data.ts | 60 +++++++++- 8 files changed, 326 insertions(+), 66 deletions(-) diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts index ae116f734..6946ee9f8 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts @@ -17,7 +17,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ }, }, { - label: '发货记录单号', + label: '发货计划单号', field: 'deliverPlanNumber', sort: 'custom', isForm: false, @@ -33,24 +33,27 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false }, { - label: '从仓库代码', + label: '从仓库', field: 'fromWarehouseCode', sort: 'custom', isForm: false, table: { width: 150 }, + sortTableDefault:1000 }, { - label: '到仓库代码', + label: '到仓库', field: 'toWarehouseCode', sort: 'custom', isForm: false, table: { width: 150 }, + sortTableDefault:1000 }, { label: '状态', @@ -58,7 +61,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ dictType: DICT_TYPE.REQUEST_STATUS, dictClass: 'string', isSearch: true, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -73,6 +76,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, search: { component: 'DatePicker', componentProps: { @@ -97,6 +101,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, search: { component: 'DatePicker', componentProps: { @@ -122,6 +127,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, search: { component: 'DatePicker', componentProps: { @@ -142,11 +148,13 @@ export const StockupMainJob = useCrudSchemas(reactive([ label: '部门', field: 'departmentCode', sort: 'custom', + isTable: false, }, { label: '承接人用户名', field: 'acceptUserName', sort: 'custom', + isTable: false, table: { width: 150 }, @@ -159,6 +167,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, search: { component: 'DatePicker', componentProps: { @@ -182,6 +191,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '完成时间', @@ -191,6 +201,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, search: { component: 'DatePicker', componentProps: { @@ -212,7 +223,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -224,7 +235,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -235,17 +246,19 @@ export const StockupMainJob = useCrudSchemas(reactive([ label: '业务类型', field: 'businessType', sort: 'custom', - form: { - component: 'SelectV2' - }, - table: { - width: 120 - }, + isTable: false, + form: { + component: 'SelectV2' + }, + table: { + width: 120 + }, }, { label: '备注', field: 'remark', sort: 'custom', + isTable: false, }, { label: '自动完成', @@ -254,6 +267,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 120 }, + isTable: false, }, { label: '允许修改库位', @@ -262,6 +276,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '允许修改数量', @@ -270,6 +285,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '允许大于推荐数量', @@ -278,6 +294,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, }, { label: '允许小于推荐数量', @@ -286,6 +303,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, }, { label: '允许修改库存状态', @@ -294,6 +312,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'Radio' }, @@ -305,6 +324,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '允许部分完成', @@ -313,6 +333,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '允许修改批次', @@ -321,6 +342,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '允许修改箱码', @@ -329,6 +351,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '从库区代码范围', @@ -337,6 +360,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到库区代码范围', @@ -345,6 +369,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '入库库存状态范围', @@ -353,6 +378,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, }, { label: '出库库存状态范围', @@ -361,6 +387,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, }, { label: '创建者', @@ -369,6 +396,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 120 }, + isTable: false, }, { label: '创建时间', @@ -378,6 +406,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, search: { component: 'DatePicker', componentProps: { @@ -412,6 +441,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true }, { label: '包装号', @@ -421,6 +451,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true }, { label: '批次', @@ -430,6 +461,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true }, { label: '库存状态', @@ -439,6 +471,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ form: { component: 'Radio' }, + hiddenInMain:true, table: { width: 120 }, @@ -451,6 +484,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ table: { width: 120 }, + hiddenInMain:true, }, { label: '器具号', @@ -460,27 +494,11 @@ export const StockupDetailJob = useCrudSchemas(reactive([ table: { width: 120 }, + hiddenInMain:true, }, + { - label: '从库位代码', - field: 'fromLocationCode', - sort: 'custom', - isSearch: true, - table: { - width: 120 - }, - }, - { - label: '到库位代码', - field: 'toLocationCode', - sort: 'custom', - isSearch: true, - table: { - width: 120 - }, - }, - { - label: '物品代码', + label: '物料代码', field: 'itemCode', sort: 'custom', isSearch: true, @@ -505,6 +523,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ table: { width: 120 }, + hiddenInMain:true, }, { label: '物品描述2', @@ -514,6 +533,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ table: { width: 120 }, + hiddenInMain:true, }, { label: '项目代码', @@ -523,6 +543,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ table: { width: 120 }, + hiddenInMain:true, }, { label: '数量', @@ -550,11 +571,30 @@ export const StockupDetailJob = useCrudSchemas(reactive([ } } }, + { + label: '从库位', + field: 'fromLocationCode', + sort: 'custom', + isSearch: true, + table: { + width: 120 + }, + }, + { + label: '到库位', + field: 'toLocationCode', + sort: 'custom', + isSearch: true, + table: { + width: 120 + }, + }, { label: '备注', field: 'remark', sort: 'custom', isSearch: true, + hiddenInMain:true, }, { label: '创建时间', @@ -562,6 +602,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isSearch: true, + hiddenInMain:true, search: { component: 'DatePicker', componentProps: { diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts index b44bd6867..8e1a229d2 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts @@ -17,7 +17,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ }, }, { - label: '发货记录单号', + label: '发货计划单号', field: 'deliverPlanNumber', sort: 'custom', isForm: false, @@ -33,6 +33,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, }, { label: '任务单号', @@ -42,22 +43,25 @@ export const StockupMainRecord = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, }, { - label: '从仓库代码', + label: '从仓库', field: 'fromWarehouseCode', sort: 'custom', table: { width: 150 }, + sortTableDefault:1000 }, { - label: '到仓库代码', + label: '到仓库', field: 'toWarehouseCode', sort: 'custom', table: { width: 150 }, + sortTableDefault:1000 }, { label: '出库事务类型', @@ -65,7 +69,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, table: { width: 150 }, @@ -76,7 +80,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ field: 'inTransactionType', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -88,7 +92,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 180 @@ -99,6 +103,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ field: 'fromAreaCodes', sort: 'custom', isSearch: true, + isTable: false, table: { width: 180 }, @@ -108,7 +113,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 180 @@ -118,6 +123,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ label: '到库区代码范围', field: 'toAreaCodes', sort: 'custom', + isTable: false, table: { width: 180 }, @@ -138,6 +144,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -157,6 +164,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -174,6 +182,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -199,6 +208,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -223,6 +233,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, isForm: false, }, { @@ -232,13 +243,14 @@ export const StockupMainRecord = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '接口类型', field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -251,13 +263,14 @@ export const StockupMainRecord = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '是否可用', field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -278,6 +291,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ table: { width: 100 }, + isTable: false, }, { label: '操作', @@ -303,6 +317,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true }, { label: '包装号', @@ -312,6 +327,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { label: '批次', @@ -321,6 +337,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { label: '从器具号', @@ -330,9 +347,10 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { - label: '物品代码', + label: '物料代码', field: 'itemCode', sort: 'custom', isSearch: true, @@ -357,6 +375,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true + }, { label: '物品描述2', @@ -366,6 +386,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true + }, { label: '项目代码', @@ -375,6 +397,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { label: '数量', @@ -406,6 +429,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { label: '从货主代码', @@ -415,9 +439,10 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { - label: '从库位代码', + label: '从库位', field: 'fromLocationCode', sort: 'custom', isSearch: true, @@ -433,6 +458,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { label: '从库区代码', @@ -442,6 +468,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { label: '到货主代码', @@ -451,6 +478,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { label: '到器具号', @@ -460,9 +488,10 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { - label: '到库位代码', + label: '到库位', field: 'toLocationCode', sort: 'custom', isSearch: true, @@ -475,6 +504,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ field: 'toLocationGroupCode', sort: 'custom', isSearch: true, + hiddenInMain: true, table: { width: 150 }, @@ -484,6 +514,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ field: 'toAreaCode', sort: 'custom', isSearch: true, + hiddenInMain: true, table: { width: 150 }, @@ -493,6 +524,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ field: 'singlePrice', sort: 'custom', isSearch: true, + hiddenInMain: true, table: { width: 150 }, @@ -502,6 +534,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ field: 'amount', sort: 'custom', isSearch: true, + hiddenInMain: true, table: { width: 150 }, @@ -512,6 +545,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', isTable: true, + hiddenInMain: true, sort: 'custom', table: { width: 150 @@ -524,6 +558,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ dictClass: 'string', isSearch: true, isTable: true, + hiddenInMain: true, sort: 'custom', table: { width: 150 @@ -546,6 +581,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true, search: { component: 'DatePicker', componentProps: { @@ -561,6 +597,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ field: 'remark', sort: 'custom', isSearch: true, + hiddenInMain: true, table: { width: 150 }, @@ -569,6 +606,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '操作', field: 'action', isForm: false, + hiddenInMain: true, table: { width: 150, fixed: 'right' diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue index d6549f63a..0797f4453 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue @@ -43,6 +43,8 @@ const setV = {} setV[formField] = val[0][searchField] if (type == 'tableForm') { + // if(formField == 'itemCode') { + // row['itemCode'] = val[0]['code'] + // row['uom'] = val[0]['uom'] + // } if(formField == 'itemCode') { - row['itemCode'] = val[0]['code'] - row['uom'] = val[0]['uom'] + val.forEach(item=>{ + if(tableData.value.find(item1=>item1['id'] == item['id'])) return + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['uom'] = item['uom'] + newRow['itemCode'] = item['code'] + tableData.value.push(newRow) + }) } if(formField == 'toLocationCode'){ row['toLocationCode'] = val[0]['code'] diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts index eafa982ad..4d95a75b1 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts @@ -81,13 +81,14 @@ export const StockupMainRequest = useCrudSchemas(reactive([ } }, { - label: '从仓库代码', + label: '从仓库', field: 'fromWarehouseCode', sort: 'custom', isSearch: false, table: { width: 120 }, + sortTableDefault:1000, // form: { // // labelMessage: '信息提示说明！！！', // componentProps: { @@ -107,7 +108,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ isForm: false }, { - label: '到仓库代码', + label: '到仓库', field: 'toWarehouseCode', sort: 'custom', isSearch: false, @@ -115,13 +116,15 @@ export const StockupMainRequest = useCrudSchemas(reactive([ width: 120 }, isForm: false, + sortTableDefault:1000, + }, { label: '从库区类型范围', field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -136,6 +139,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ table: { width: 160 }, + isTable: false, isForm: false }, { @@ -143,6 +147,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ field: 'businessType', sort: 'custom', isSearch: false, + isTable: false, form: { value: 'Stockup', componentProps: { @@ -168,6 +173,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + isTable: false, table: { width: 180 }, @@ -179,6 +185,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isSearch: false, + isTable: false, search: { component: 'DatePicker', componentProps: { @@ -204,6 +211,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isSearch: false, + isTable: false, search: { component: 'DatePicker', componentProps: { @@ -229,6 +237,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isSearch: false, + isTable: false, search: { component: 'DatePicker', componentProps: { @@ -255,6 +264,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, formatter: (_: Recordable, __: TableColumn, cellValue: number) => { return userDeptArray.find((account) => account.id == cellValue)?.name }, @@ -278,7 +288,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ dictClass: 'string', isSearch: true, isForm: false, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -289,13 +299,14 @@ export const StockupMainRequest = useCrudSchemas(reactive([ field: 'remark', sort: 'custom', isSearch: false, + isTable: false, }, { label: '自动提交', field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -316,7 +327,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -337,7 +348,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -379,7 +390,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -394,6 +405,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -405,7 +417,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ }, dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', tableForm: { disabled: true, @@ -424,7 +436,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ }, dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', - isTable: true, + isTable: false, tableForm: { disabled: true, type: 'Select', @@ -477,6 +489,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true }, // { // label: '包装号', @@ -565,7 +578,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ // } // }, { - label: '物品代码', + label: '物料代码', field: 'itemCode', sort: 'custom', isSearch: true, @@ -573,7 +586,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ width: 150 }, tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 + isInpuFocusShow: false, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', searchField: 'code', searchTitle: '物料基础信息', @@ -620,6 +633,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ table: { width: 120 }, + hiddenInMain: true }, { label: '物品描述2', @@ -630,6 +644,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ table: { width: 120 }, + hiddenInMain: true }, { label: '项目代码', @@ -640,12 +655,18 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ table: { width: 120 }, + hiddenInMain: true }, { label: '数量', field: 'qty', sort: 'custom', isSearch: true, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 + }, }, { label: '计量单位', @@ -668,7 +689,15 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ } }, { - label: '到库位代码', + label: '从库位', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到库位', field: 'toLocationCode', sort: 'custom', isSearch: true, @@ -719,6 +748,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ field: 'remark', sort: 'custom', isSearch: true, + hiddenInMain: true }, { label: '创建时间', @@ -729,6 +759,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ table: { width: 120 }, + hiddenInMain: true, search: { component: 'DatePicker', componentProps: { @@ -748,6 +779,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ width: 150, fixed: 'right' }, + hiddenInMain: true, isTableForm:false, } ])) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 1c32efa9a..de72d02f2 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -55,7 +55,15 @@ @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" - /> + > + + if (formField == 'secondPackUnit') { row['secondPackUnit'] = val[0]['packUnit'] row['secondPackQty'] = val[0]['packQty'] + }else if (formField == 'itemCode') { + row['uom'] = val[0]['uom'] + row['produceDate'] = dayjs().valueOf() } // 明细查询页赋值 row[formField] = val[0][searchField] @@ -544,6 +555,9 @@ const handleDeleteTable = (item, index) => { // 主子数据 提交 const submitForm = async (formType, data) => { + tableData.value.forEach((row, index) => { + row['expireDate'] = row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf() + }) data.type = 'predict' data.subList = tableData.value // 拼接子表数据参数 if(data.subList.find(item => (item.qty <= 0))) { diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 2b2d3db60..a17068459 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -122,6 +122,54 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '生产线代码', + field: 'productionLineCode', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + tableForm:{ + isInpuFocusShow: true, + searchListPlaceholder: '请选择生产线代码', + searchField: 'code', + searchTitle: '生产线信息', + searchAllSchemas: Productionline.allSchemas, + searchPage: ProductionlineApi.getProductionlinePage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + },{ + key: 'workshopCode', + value: 'workshopCode', + message: '请填写车间代码！', + isMainValue: true + }] + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择生产线代码', + searchField: 'code', + searchTitle: '生产线信息', + searchAllSchemas: Productionline.allSchemas, + searchPage: ProductionlineApi.getProductionlinePage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + },{ + key: 'workshopCode', + value: 'workshopCode', + message: '请填写车间代码！', + isMainValue: true + }] + } + } + }, { label: '班组', field: 'team', @@ -515,6 +563,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTableForm: false, tableForm:{ isInpuFocusShow: true, searchListPlaceholder: '请选择生产线代码', @@ -990,9 +1039,13 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 180 }, - tableForm: { - type: 'FormDate', - valueFormat: 'x', + // tableForm: { + // type: 'FormDate', + // valueFormat: 'x', + // }, + tableForm:{ + type: 'slot', + disabled: true }, form: { component: 'DatePicker', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index e0ede38f8..aa20da612 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -55,7 +55,15 @@ @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" - /> + > + + diff --git a/src/views/mes/workSchedulingQaform/workSchedulingQaform.data.ts b/src/views/mes/workSchedulingQaform/workSchedulingQaform.data.ts new file mode 100644 index 000000000..eaaf4d434 --- /dev/null +++ b/src/views/mes/workSchedulingQaform/workSchedulingQaform.data.ts @@ -0,0 +1,208 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const WorkSchedulingQaformRules = reactive({ + concurrencyStamp: [required], +}) + +export const WorkSchedulingQaform = useCrudSchemas(reactive([ + { + label: '删除时间', + field: 'deleteTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '主键', + field: 'id', + sort: 'custom', + isForm: false, + }, + { + label: '状态', + field: 'status', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + form: { + component: 'Radio' + }, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + iisSearch: false, + isTable: false, + isForm: false, + isDetail:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + }, + { + label: '删除用户名', + field: 'deleter', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '位置ID', + field: 'siteId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '主计划编号', + field: 'planMasterCode', + sort: 'custom', + isSearch: true, + }, + { + label: '工单编号', + field: 'schedulingCode', + sort: 'custom', + isSearch: true, + }, + { + label: '工序编号', + field: 'nodeCode', + sort: 'custom', + isSearch: true, + }, + { + label: '检验单编号', + field: 'qaFormNo', + sort: 'custom', + isSearch: true, + }, + { + label: '检验单名称', + field: 'qaFormName', + sort: 'custom', + isSearch: true, + }, + { + label: '检验类型', + field: 'qaFormType', + sort: 'custom', + isSearch: true, + + }, + { + label: '检验时间', + field: 'qaTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '检测数量', + field: 'qaCount', + sort: 'custom', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '检测合格数量', + field: 'qaCountPassed', + sort: 'custom', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '检测不合格数量', + field: 'qaCountNotpassed', + sort: 'custom', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '合格率', + field: 'qaPassRate', + sort: 'custom', + isSearch: true, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) From d45b05941128c23519966f8d7e50a1df7ed26d49 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 29 Apr 2024 17:09:05 +0800 Subject: [PATCH 33/84] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index e6e708d22..20c906e6b 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -542,6 +542,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + isForm:false, isTable: false, }, { From 15e63dbdbc35a89b33504d76998d198101c432d7 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 29 Apr 2024 17:11:34 +0800 Subject: [PATCH 34/84] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionMain/productionMain.data.ts | 243 ++++++++++------- .../productionMainAssemble.data.ts | 232 +++++++++------- .../productionMainAssembleSparePart.data.ts | 231 +++++++++------- .../productionMainPredictSparePart.data.ts | 235 +++++++++------- .../productreceiptRecordMain.data.ts | 250 +++++++++-------- .../productreceiptAssembleRecordMain.data.ts | 251 ++++++++++-------- .../productreceiptscrapRecordMain.data.ts | 249 +++++++++-------- 7 files changed, 956 insertions(+), 735 deletions(-) diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index 907eaef3e..af732e6da 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -44,6 +44,24 @@ export const ProductionMain = useCrudSchemas(reactive([ isForm: false, isSearch: true, }, + { + label: '计划类型', + field: 'planType', + dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Select', + value: 'predict', + componentProps: { + disabled: true + } + } + }, { label: '状态', field: 'status', @@ -61,7 +79,6 @@ export const ProductionMain = useCrudSchemas(reactive([ // disabled: true // } // }, - isForm:false, isSearch: true, }, { @@ -78,7 +95,7 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '机台', + label: '车间', field: 'workshop', sort: 'custom', table: { @@ -101,6 +118,15 @@ export const ProductionMain = useCrudSchemas(reactive([ } } }, + { + label: '机台', + field: 'abc', + sort: 'custom', + table: { + width: 150 + }, + isForm: true + }, { label: '生产线', field: 'productionLine', @@ -131,8 +157,8 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '班次', - field: 'shift', + label: '班组', + field: 'team', sort: 'custom', table: { width: 150 @@ -141,11 +167,11 @@ export const ProductionMain = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, - searchListPlaceholder: '请选择班次', + searchListPlaceholder: '请选择班组', searchField: 'code', - searchTitle: '班次信息', - searchAllSchemas: Shift.allSchemas, - searchPage: ShiftApi.getShiftPage, + searchTitle: '班组信息', + searchAllSchemas: Team.allSchemas, + searchPage: TeamApi.getTeamPage, searchCondition:[{ key: 'available', value: 'TRUE', @@ -155,8 +181,8 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '班组', - field: 'team', + label: '班次', + field: 'shift', sort: 'custom', table: { width: 150 @@ -165,11 +191,11 @@ export const ProductionMain = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, - searchListPlaceholder: '请选择班组', + searchListPlaceholder: '请选择班次', searchField: 'code', - searchTitle: '班组信息', - searchAllSchemas: Team.allSchemas, - searchPage: TeamApi.getTeamPage, + searchTitle: '班次信息', + searchAllSchemas: Shift.allSchemas, + searchPage: ShiftApi.getShiftPage, searchCondition:[{ key: 'available', value: 'TRUE', @@ -186,6 +212,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -195,6 +222,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -208,6 +236,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 120 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -229,6 +258,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -250,6 +280,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -267,6 +298,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { value: 'ProductReceipt', componentProps: { @@ -275,24 +307,7 @@ export const ProductionMain = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '计划类型', - field: 'planType', - dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Select', - value: 'predict', - componentProps: { - disabled: true - } - } - }, + { label: '备注', field: 'remark', @@ -307,7 +322,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -326,7 +341,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -347,7 +362,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -368,7 +383,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -478,6 +493,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -491,6 +507,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -509,6 +526,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -522,6 +540,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -634,6 +653,14 @@ export const ProductionDetail = useCrudSchemas(reactive([ }], }, }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, { label: 'Bom版本', field: 'bomVersion', @@ -682,8 +709,8 @@ export const ProductionDetail = useCrudSchemas(reactive([ }, }, { - label: '合格数量', - field: 'goodQty', + label: '计划数量', + field: 'planQty', sort: 'custom', table: { width: 150 @@ -691,25 +718,39 @@ export const ProductionDetail = useCrudSchemas(reactive([ form: { component: 'InputNumber', componentProps: { - min: 1, + min: 0, precision: 6 } }, tableForm: { type: 'InputNumber', - min: 1, + min: 0, precision: 6 }, - isTableForm: false, - isForm: false }, { - label: '不合格数量', - field: 'notGoodQty', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + type: 'Select' + } + }, + { + label: '合格数量', + field: 'goodQty', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, form: { component: 'InputNumber', componentProps: { @@ -726,26 +767,38 @@ export const ProductionDetail = useCrudSchemas(reactive([ isForm: false }, { - label: '单据号', - field: 'number', + label: '不合格数量', + field: 'notGoodQty', sort: 'custom', table: { - width: 180 + width: 150 }, - isTableForm: false, + hiddenInMain: true, form: { + component: 'InputNumber', componentProps: { - disabled: true + min: 1, + precision: 6 } - } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 + }, + isTableForm: false, + isForm: false }, { - label: '备注', - field: 'remark', + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, + isTableForm: false, + isForm: false, }, { label: '创建时间', @@ -758,6 +811,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true, form: { component: 'DatePicker', componentProps: { @@ -771,49 +825,55 @@ export const ProductionDetail = useCrudSchemas(reactive([ isForm: false, }, { - label: '创建者', - field: 'creator', + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false, + hiddenInMain: true, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + tableForm: { + type: 'Select', + default: 'TRUE' + }, + // isTableForm: false, + // isForm: false }, { - label: '计划数量', - field: 'planQty', + label: '单据号', + field: 'number', sort: 'custom', table: { - width: 150 + width: 180 }, + isTable: false, + isTableForm: false, form: { - component: 'InputNumber', componentProps: { - min: 0, - precision: 6 + disabled: true } - }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 6 - }, + } }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isSearch: true, - isTable: true, + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - tableForm:{ - type: 'Select' - } + isTable: false, }, { label: '最后更新时间', @@ -826,6 +886,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -845,35 +906,11 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isTableForm: false, isForm: false, }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - tableForm: { - type: 'Select', - default: 'TRUE' - }, - // isTableForm: false, - // isForm: false - }, + { label: '操作', hiddenInMain:true, diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts index 87e117682..42815a1fb 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts @@ -44,6 +44,24 @@ export const ProductionMain = useCrudSchemas(reactive([ isForm: false, isSearch: true, }, + { + label: '计划类型', + field: 'planType', + dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Select', + value: 'assemble', + componentProps: { + disabled: true + } + } + }, { label: '状态', field: 'status', @@ -61,7 +79,6 @@ export const ProductionMain = useCrudSchemas(reactive([ // disabled: true // } // }, - isForm:false, isSearch: true, }, { @@ -131,8 +148,8 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '班次', - field: 'shift', + label: '班组', + field: 'team', sort: 'custom', table: { width: 150 @@ -141,11 +158,11 @@ export const ProductionMain = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, - searchListPlaceholder: '请选择班次', + searchListPlaceholder: '请选择班组', searchField: 'code', - searchTitle: '班次信息', - searchAllSchemas: Shift.allSchemas, - searchPage: ShiftApi.getShiftPage, + searchTitle: '班组信息', + searchAllSchemas: Team.allSchemas, + searchPage: TeamApi.getTeamPage, searchCondition:[{ key: 'available', value: 'TRUE', @@ -155,8 +172,8 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '班组', - field: 'team', + label: '班次', + field: 'shift', sort: 'custom', table: { width: 150 @@ -165,11 +182,11 @@ export const ProductionMain = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, - searchListPlaceholder: '请选择班组', + searchListPlaceholder: '请选择班次', searchField: 'code', - searchTitle: '班组信息', - searchAllSchemas: Team.allSchemas, - searchPage: TeamApi.getTeamPage, + searchTitle: '班次信息', + searchAllSchemas: Shift.allSchemas, + searchPage: ShiftApi.getShiftPage, searchCondition:[{ key: 'available', value: 'TRUE', @@ -186,6 +203,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -195,6 +213,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -208,6 +227,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 120 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -229,6 +249,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -250,6 +271,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -267,6 +289,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { value: 'ProductReceipt', componentProps: { @@ -275,24 +298,7 @@ export const ProductionMain = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '计划类型', - field: 'planType', - dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Select', - value: 'assemble', - componentProps: { - disabled: true - } - } - }, + { label: '备注', field: 'remark', @@ -307,7 +313,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -326,7 +332,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -347,7 +353,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -368,7 +374,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -478,6 +484,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -491,6 +498,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -509,6 +517,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -522,6 +531,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -634,6 +644,14 @@ export const ProductionDetail = useCrudSchemas(reactive([ }], }, }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, { label: 'Bom版本', field: 'bomVersion', @@ -682,8 +700,8 @@ export const ProductionDetail = useCrudSchemas(reactive([ }, }, { - label: '合格数量', - field: 'goodQty', + label: '计划数量', + field: 'planQty', sort: 'custom', table: { width: 150 @@ -691,25 +709,39 @@ export const ProductionDetail = useCrudSchemas(reactive([ form: { component: 'InputNumber', componentProps: { - min: 1, + min: 0, precision: 6 } }, tableForm: { type: 'InputNumber', - min: 1, + min: 0, precision: 6 }, - isTableForm: false, - isForm: false }, { - label: '不合格数量', - field: 'notGoodQty', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + type: 'Select' + } + }, + { + label: '合格数量', + field: 'goodQty', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, form: { component: 'InputNumber', componentProps: { @@ -726,26 +758,38 @@ export const ProductionDetail = useCrudSchemas(reactive([ isForm: false }, { - label: '单据号', - field: 'number', + label: '不合格数量', + field: 'notGoodQty', sort: 'custom', table: { - width: 180 + width: 150 }, - isTableForm: false, + hiddenInMain: true, form: { + component: 'InputNumber', componentProps: { - disabled: true + min: 1, + precision: 6 } - } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 + }, + isTableForm: false, + isForm: false }, { - label: '备注', - field: 'remark', + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 }, + isTableForm: false, + isForm: false, + hiddenInMain: true, }, { label: '创建时间', @@ -758,6 +802,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true, form: { component: 'DatePicker', componentProps: { @@ -771,49 +816,56 @@ export const ProductionDetail = useCrudSchemas(reactive([ isForm: false, }, { - label: '创建者', - field: 'creator', + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false, + hiddenInMain: true, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + tableForm: { + type: 'Select', + default: 'TRUE' + }, + // isTableForm: false, + // isForm: false }, { - label: '计划数量', - field: 'planQty', + label: '单据号', + field: 'number', sort: 'custom', table: { - width: 150 + width: 180 }, + isTable: false, + isTableForm: false, form: { - component: 'InputNumber', componentProps: { - min: 0, - precision: 6 + disabled: true } - }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 6 - }, + } }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isSearch: true, - isTable: true, + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - tableForm:{ - type: 'Select' - } + isTable: false, + }, { label: '最后更新时间', @@ -826,6 +878,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -845,35 +898,10 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isTableForm: false, isForm: false, }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - tableForm: { - type: 'Select', - default: 'TRUE' - }, - // isTableForm: false, - // isForm: false - }, { label: '操作', hiddenInMain:true, diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts index 0fdb4e951..08b6d9f17 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts @@ -44,6 +44,24 @@ export const ProductionMain = useCrudSchemas(reactive([ isForm: false, isSearch: true, }, + { + label: '计划类型', + field: 'planType', + dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Select', + value: 'assembleSparePart', + componentProps: { + disabled: true + } + } + }, { label: '状态', field: 'status', @@ -130,8 +148,8 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '班次', - field: 'shift', + label: '班组', + field: 'team', sort: 'custom', table: { width: 150 @@ -140,11 +158,11 @@ export const ProductionMain = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, - searchListPlaceholder: '请选择班次', + searchListPlaceholder: '请选择班组', searchField: 'code', - searchTitle: '班次信息', - searchAllSchemas: Shift.allSchemas, - searchPage: ShiftApi.getShiftPage, + searchTitle: '班组信息', + searchAllSchemas: Team.allSchemas, + searchPage: TeamApi.getTeamPage, searchCondition:[{ key: 'available', value: 'TRUE', @@ -154,8 +172,8 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '班组', - field: 'team', + label: '班次', + field: 'shift', sort: 'custom', table: { width: 150 @@ -164,11 +182,11 @@ export const ProductionMain = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, - searchListPlaceholder: '请选择班组', + searchListPlaceholder: '请选择班次', searchField: 'code', - searchTitle: '班组信息', - searchAllSchemas: Team.allSchemas, - searchPage: TeamApi.getTeamPage, + searchTitle: '班次信息', + searchAllSchemas: Shift.allSchemas, + searchPage: ShiftApi.getShiftPage, searchCondition:[{ key: 'available', value: 'TRUE', @@ -185,6 +203,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -194,6 +213,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -207,6 +227,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 120 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -228,6 +249,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -249,6 +271,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -272,26 +295,10 @@ export const ProductionMain = useCrudSchemas(reactive([ disabled: true } }, + isTable: false, isForm: false, }, - { - label: '计划类型', - field: 'planType', - dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Select', - value: 'assembleSparePart', - componentProps: { - disabled: true - } - } - }, + { label: '备注', field: 'remark', @@ -306,7 +313,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -325,7 +332,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -346,7 +353,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -367,7 +374,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -477,6 +484,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -490,6 +498,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -508,6 +517,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -521,6 +531,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -633,6 +644,14 @@ export const ProductionDetail = useCrudSchemas(reactive([ }], }, }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, { label: 'Bom版本', field: 'bomVersion', @@ -681,8 +700,8 @@ export const ProductionDetail = useCrudSchemas(reactive([ }, }, { - label: '合格数量', - field: 'goodQty', + label: '计划数量', + field: 'planQty', sort: 'custom', table: { width: 150 @@ -690,25 +709,39 @@ export const ProductionDetail = useCrudSchemas(reactive([ form: { component: 'InputNumber', componentProps: { - min: 1, + min: 0, precision: 6 } }, tableForm: { type: 'InputNumber', - min: 1, + min: 0, precision: 6 }, - isTableForm: false, - isForm: false }, { - label: '不合格数量', - field: 'notGoodQty', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + type: 'Select' + } + }, + { + label: '合格数量', + field: 'goodQty', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, form: { component: 'InputNumber', componentProps: { @@ -725,26 +758,38 @@ export const ProductionDetail = useCrudSchemas(reactive([ isForm: false }, { - label: '单据号', - field: 'number', + label: '不合格数量', + field: 'notGoodQty', sort: 'custom', table: { - width: 180 + width: 150 }, - isTableForm: false, + hiddenInMain: true, form: { + component: 'InputNumber', componentProps: { - disabled: true + min: 1, + precision: 6 } - } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 + }, + isTableForm: false, + isForm: false }, { - label: '备注', - field: 'remark', + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, + isTableForm: false, + isForm: false, }, { label: '创建时间', @@ -757,6 +802,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true, form: { component: 'DatePicker', componentProps: { @@ -770,49 +816,55 @@ export const ProductionDetail = useCrudSchemas(reactive([ isForm: false, }, { - label: '创建者', - field: 'creator', + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false, + hiddenInMain: true, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + tableForm: { + type: 'Select', + default: 'TRUE' + }, + // isTableForm: false, + // isForm: false }, { - label: '计划数量', - field: 'planQty', + label: '单据号', + field: 'number', sort: 'custom', table: { - width: 150 + width: 180 }, + isTable: false, + isTableForm: false, form: { - component: 'InputNumber', componentProps: { - min: 0, - precision: 6 + disabled: true } - }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 6 - }, + } }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isSearch: true, - isTable: true, + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - tableForm:{ - type: 'Select' - } + isTable: false, }, { label: '最后更新时间', @@ -825,6 +877,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -844,35 +897,11 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isTableForm: false, isForm: false, }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - tableForm: { - type: 'Select', - default: 'TRUE' - }, - // isTableForm: false, - // isForm: false - }, + { label: '操作', hiddenInMain:true, diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts index 4121421c6..a8d893c0a 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts @@ -44,6 +44,24 @@ export const ProductionMain = useCrudSchemas(reactive([ isForm: false, isSearch: true, }, + { + label: '计划类型', + field: 'planType', + dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Select', + value: 'predictSparePart', + componentProps: { + disabled: true + } + } + }, { label: '状态', field: 'status', @@ -61,7 +79,6 @@ export const ProductionMain = useCrudSchemas(reactive([ // disabled: true // } // }, - isForm:false, isSearch: true, }, { @@ -78,7 +95,7 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '机台', + label: '车间', field: 'workshop', sort: 'custom', table: { @@ -131,8 +148,8 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '班次', - field: 'shift', + label: '班组', + field: 'team', sort: 'custom', table: { width: 150 @@ -141,11 +158,11 @@ export const ProductionMain = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, - searchListPlaceholder: '请选择班次', + searchListPlaceholder: '请选择班组', searchField: 'code', - searchTitle: '班次信息', - searchAllSchemas: Shift.allSchemas, - searchPage: ShiftApi.getShiftPage, + searchTitle: '班组信息', + searchAllSchemas: Team.allSchemas, + searchPage: TeamApi.getTeamPage, searchCondition:[{ key: 'available', value: 'TRUE', @@ -155,8 +172,8 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '班组', - field: 'team', + label: '班次', + field: 'shift', sort: 'custom', table: { width: 150 @@ -165,11 +182,11 @@ export const ProductionMain = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, - searchListPlaceholder: '请选择班组', + searchListPlaceholder: '请选择班次', searchField: 'code', - searchTitle: '班组信息', - searchAllSchemas: Team.allSchemas, - searchPage: TeamApi.getTeamPage, + searchTitle: '班次信息', + searchAllSchemas: Shift.allSchemas, + searchPage: ShiftApi.getShiftPage, searchCondition:[{ key: 'available', value: 'TRUE', @@ -178,6 +195,7 @@ export const ProductionMain = useCrudSchemas(reactive([ } } }, + { label: '物料代码', field: 'detailItemCode', @@ -186,6 +204,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -195,6 +214,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -208,6 +228,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 120 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -229,6 +250,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -250,6 +272,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -267,6 +290,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { value: 'ProductReceipt', componentProps: { @@ -275,24 +299,7 @@ export const ProductionMain = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '计划类型', - field: 'planType', - dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Select', - value: 'predictSparePart', - componentProps: { - disabled: true - } - } - }, + { label: '备注', field: 'remark', @@ -307,7 +314,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -326,7 +333,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -347,7 +354,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -368,7 +375,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -478,6 +485,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -491,6 +499,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -509,6 +518,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -522,6 +532,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -634,6 +645,14 @@ export const ProductionDetail = useCrudSchemas(reactive([ }], }, }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, { label: 'Bom版本', field: 'bomVersion', @@ -682,8 +701,8 @@ export const ProductionDetail = useCrudSchemas(reactive([ }, }, { - label: '合格数量', - field: 'goodQty', + label: '计划数量', + field: 'planQty', sort: 'custom', table: { width: 150 @@ -691,25 +710,39 @@ export const ProductionDetail = useCrudSchemas(reactive([ form: { component: 'InputNumber', componentProps: { - min: 1, + min: 0, precision: 6 } }, tableForm: { type: 'InputNumber', - min: 1, + min: 0, precision: 6 }, - isTableForm: false, - isForm: false }, { - label: '不合格数量', - field: 'notGoodQty', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + type: 'Select' + } + }, + { + label: '合格数量', + field: 'goodQty', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, form: { component: 'InputNumber', componentProps: { @@ -726,27 +759,40 @@ export const ProductionDetail = useCrudSchemas(reactive([ isForm: false }, { - label: '单据号', - field: 'number', + label: '不合格数量', + field: 'notGoodQty', sort: 'custom', table: { - width: 180 + width: 150 }, - isTableForm: false, + hiddenInMain: true, form: { + component: 'InputNumber', componentProps: { - disabled: true + min: 1, + precision: 6 } - } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 + }, + isTableForm: false, + isForm: false }, { - label: '备注', - field: 'remark', + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, + isTableForm: false, + isForm: false, }, + { label: '创建时间', field: 'createTime', @@ -758,6 +804,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true, form: { component: 'DatePicker', componentProps: { @@ -771,49 +818,55 @@ export const ProductionDetail = useCrudSchemas(reactive([ isForm: false, }, { - label: '创建者', - field: 'creator', + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, + hiddenInMain: true, sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + tableForm: { + type: 'Select', + default: 'TRUE' + }, + // isTableForm: false, + // isForm: false }, { - label: '计划数量', - field: 'planQty', + label: '单据号', + field: 'number', sort: 'custom', table: { - width: 150 + width: 180 }, + isTable: false, + isTableForm: false, form: { - component: 'InputNumber', componentProps: { - min: 0, - precision: 6 + disabled: true } - }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 6 - }, + } }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isSearch: true, - isTable: true, + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - tableForm:{ - type: 'Select' - } + isTable: false, }, { label: '最后更新时间', @@ -826,6 +879,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -845,35 +899,10 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isTableForm: false, isForm: false, }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - tableForm: { - type: 'Select', - default: 'TRUE' - }, - // isTableForm: false, - // isForm: false - }, { label: '操作', hiddenInMain:true, diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts index fdc79bef9..a4002349f 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts @@ -16,7 +16,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ isSearch: true }, { - label: '申请单号', + label: '申请单据号', field: 'requestNumber', sort: 'custom', table: { @@ -40,6 +40,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '车间代码', @@ -48,6 +49,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '班组', @@ -56,6 +58,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '班次', @@ -64,6 +67,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '收货类型', @@ -74,6 +78,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -83,6 +88,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '入库事务类型', @@ -91,6 +97,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '执行时间', @@ -103,6 +110,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -123,6 +131,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -144,6 +153,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -164,6 +174,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -180,13 +191,14 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '接口类型', field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -199,6 +211,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '备注', @@ -207,6 +220,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建者', @@ -215,6 +229,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -223,6 +238,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + isTable: false, sort: 'custom', table: { width: 180 @@ -251,13 +267,14 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到库区类型范围', field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -270,6 +287,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '是否可用', @@ -277,7 +295,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: true, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -371,147 +389,129 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( }, }, { - label: '包装号', - field: 'packingNumber', + label: '物料代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, }, { - label: '器具号', - field: 'containerNumber', + label: '物料名称', + field: 'itemName', sort: 'custom', table: { width: 150 }, }, { - label: '批次', - field: 'batch', + label: '物料描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, }, { - label: '生产日期', - field: 'produceDate', - formatter: dateFormatter2, - detail: { - dateFormat: 'YYYY-MM-DD' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width: '100%'}, - type: 'date', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x', - } - }, - }, - { - label: '过期日期', - field: 'expireDate', - formatter: dateFormatter2, - detail: { - dateFormat: 'YYYY-MM-DD' - }, + label: '物料描述2', + field: 'itemDesc2', sort: 'custom', table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width: '100%'}, - type: 'date', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x', - } + width: 150 }, }, { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, + label: '批次', + field: 'batch', sort: 'custom', table: { width: 150 }, }, { - label: '到货主代码', - field: 'toOwnerCode', + label: '包装号', + field: 'packingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '到库位代码', - field: 'toLocationCode', + label: '包装规格', + field: 'packUnit', + // dictType: DICT_TYPE.PACK_UNIT, + // dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '到库位组代码', - field: 'toLocationGroupCode', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '到库区代码', - field: 'toAreaCode', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '订单号', - field: 'woNumber', + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '订单行', - field: 'woLine', + label: '生产日期', + field: 'produceDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, sort: 'custom', table: { - width: 150 + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } }, }, { - label: '包装数量', - field: 'packQty', + label: '目标库位', + field: 'toLocationCode', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } }, { - label: '包装规格', - field: 'packUnit', - // dictType: DICT_TYPE.PACK_UNIT, - // dictClass: 'string', - isTable: true, + label: '项目代码', + field: 'projectCode', sort: 'custom', table: { width: 150 @@ -526,102 +526,134 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( }, }, { - label: '物料代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '备注', - field: 'remark', + label: '器具号', + field: 'containerNumber', sort: 'custom', table: { width: 150 }, + isTable: false }, { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, + label: '过期日期', + field: 'expireDate', + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, }, + { - label: '创建者', - field: 'creator', + label: '到货主代码', + field: 'toOwnerCode', sort: 'custom', table: { width: 150 }, + isTable: false, + }, + { - label: '物料名称', - field: 'itemName', + label: '到库位组代码', + field: 'toLocationGroupCode', sort: 'custom', table: { width: 150 }, + isTable: false, }, { - label: '物料描述1', - field: 'itemDesc1', + label: '到库区代码', + field: 'toAreaCode', sort: 'custom', table: { width: 150 }, + isTable: false, }, { - label: '物料描述2', - field: 'itemDesc2', + label: '订单号', + field: 'woNumber', sort: 'custom', table: { width: 150 }, + isTable: false, }, { - label: '项目代码', - field: 'projectCode', + label: '订单行', + field: 'woLine', sort: 'custom', table: { width: 150 }, + isTable: false, }, { - label: '数量', - field: 'qty', + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', } }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 }, + isTable: false, }, // { // label: '任务明细ID', @@ -644,7 +676,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts index 0de0fb58e..cda78051b 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts @@ -40,6 +40,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '车间代码', @@ -48,6 +49,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '班组', @@ -56,6 +58,8 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, + }, { label: '班次', @@ -64,6 +68,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '收货类型', @@ -77,6 +82,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ tableForm: { disabled: true }, + isTable: false, isForm: false }, { @@ -86,6 +92,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '入库事务类型', @@ -94,6 +101,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '执行时间', @@ -106,6 +114,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -126,6 +135,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -147,6 +157,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -167,6 +178,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -183,13 +195,14 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '接口类型', field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -202,6 +215,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '备注', @@ -210,6 +224,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建者', @@ -218,6 +233,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -230,6 +246,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -254,13 +271,14 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到库区类型范围', field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -273,6 +291,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '是否可用', @@ -280,7 +299,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: true, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -374,16 +393,32 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( }, }, { - label: '包装号', - field: 'packingNumber', + label: '物料代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, }, { - label: '器具号', - field: 'containerNumber', + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物料描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 @@ -397,6 +432,67 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( width: 150 }, }, + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '包装规格', + field: 'packUnit', + // dictType: DICT_TYPE.PACK_UNIT, + // dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '器具号', + field: 'containerNumber', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, { label: '生产日期', field: 'produceDate', @@ -418,6 +514,30 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( } }, }, + { + label: '目标库位', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '项目', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + }, { label: '过期日期', field: 'expireDate', @@ -429,6 +549,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -439,17 +560,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( } }, }, - { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, + { label: '到货主代码', field: 'toOwnerCode', @@ -457,15 +568,9 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, - { - label: '到库位代码', - field: 'toLocationCode', - sort: 'custom', - table: { - width: 150 - }, - }, + { label: '到库位组代码', field: 'toLocationGroupCode', @@ -473,6 +578,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '到库区代码', @@ -481,6 +587,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '订单号', @@ -489,6 +596,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '订单行', @@ -497,6 +605,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '包装数量', @@ -505,37 +614,13 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', } }, - { - label: '包装规格', - field: 'packUnit', - // dictType: DICT_TYPE.PACK_UNIT, - // dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 180 - }, - }, - { - label: '物料代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - }, + + { label: '备注', field: 'remark', @@ -543,6 +628,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -555,6 +641,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -571,60 +658,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, - }, - { - label: '物料名称', - field: 'itemName', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '物料描述1', - field: 'itemDesc1', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '物料描述2', - field: 'itemDesc2', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, + isTable: false, }, // { // label: '任务明细ID', @@ -647,7 +681,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -662,6 +696,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( width: 150, fixed: 'right' }, + hiddenInMain: true, isTableForm:false, } ])) diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts index 6c3fc3bcf..ddab2a7b8 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts @@ -40,6 +40,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '车间代码', @@ -48,6 +49,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '班组', @@ -56,6 +58,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '班次', @@ -64,6 +67,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '出库事务类型', @@ -72,6 +76,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '入库事务类型', @@ -80,6 +85,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '执行时间', @@ -92,6 +98,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -112,6 +119,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -133,6 +141,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -153,6 +162,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -169,13 +179,14 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '接口类型', field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -188,6 +199,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '备注', @@ -196,6 +208,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建者', @@ -204,6 +217,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -216,6 +230,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -240,13 +255,14 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到库区类型范围', field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -259,6 +275,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '是否可用', @@ -266,7 +283,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: true, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -360,16 +377,32 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( }, }, { - label: '包装号', - field: 'packingNumber', + label: '物料代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, }, { - label: '器具号', - field: 'containerNumber', + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物料描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 @@ -383,6 +416,58 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( width: 150 }, }, + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '包装规格', + field: 'packUnit', + // dictType: DICT_TYPE.PACK_UNIT, + // dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, { label: '生产日期', field: 'produceDate', @@ -404,6 +489,30 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( } }, }, + { + label: '目标库位', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '项目', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + }, { label: '过期日期', field: 'expireDate', @@ -415,6 +524,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -426,32 +536,36 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( }, }, { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150 }, + isTable: false, + form: { + component: 'InputNumber', + } }, { - label: '到货主代码', - field: 'toOwnerCode', + label: '器具号', + field: 'containerNumber', sort: 'custom', table: { width: 150 }, + isTable: false, }, { - label: '到库位代码', - field: 'toLocationCode', + label: '到货主代码', + field: 'toOwnerCode', sort: 'custom', table: { width: 150 }, + isTable: false, }, + { label: '到库位组代码', field: 'toLocationGroupCode', @@ -459,6 +573,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '到库区代码', @@ -467,6 +582,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '订单号', @@ -475,6 +591,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '订单行', @@ -483,44 +600,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, - }, - { - label: '包装数量', - field: 'packQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, - { - label: '包装规格', - field: 'packUnit', - // dictType: DICT_TYPE.PACK_UNIT, - // dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 180 - }, - }, - { - label: '物料代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, + isTable: false, }, { label: '备注', @@ -529,6 +609,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -541,6 +622,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -557,61 +639,9 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, - { - label: '物料名称', - field: 'itemName', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '物料描述1', - field: 'itemDesc1', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '物料描述2', - field: 'itemDesc2', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, + // { // label: '任务明细ID', // field: 'jobDetailId', @@ -633,7 +663,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -648,6 +678,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( width: 150, fixed: 'right' }, + hiddenInMain:true, isTableForm:false, } ])) From 8f024feb75d45a91f410935a0333b4326ebb6612 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 29 Apr 2024 17:12:43 +0800 Subject: [PATCH 35/84] =?UTF-8?q?=E5=AD=90=E8=A1=A8=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=A0=E9=99=A4=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoice/supplierinvoiceRequestMain/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 8c1efe249..9c2271c45 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -139,7 +139,10 @@ :apiUpdate="SupplierinvoiceRequestDetailApi.updateSupplierinvoiceRequestDetail" :apiPage="SupplierinvoiceRequestDetailApi.getSupplierinvoiceRequestDetailPage" :apiDelete="SupplierinvoiceRequestDetailApi.deleteSupplierinvoiceRequestDetail" - :Echo="Echo" + :Echo="Echo" + :detailButtonIsShowEdit="false" + :detailButtonIsShowDelete="false" + :detailButtonIsShowAdd="false" @buttonBaseClick="detailButtonBaseClick" @tableFormButton="tableFormButton" /> From d9c71a1a7f7cefd437eddcbc37a76a70534ec9b8 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 29 Apr 2024 17:14:38 +0800 Subject: [PATCH 36/84] =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=90=88=E6=A0=BC?= =?UTF-8?q?=EF=BC=8C=E5=90=88=E6=A0=BC=E6=95=B0=E9=87=8F=E7=AD=89=E4=BA=8E?= =?UTF-8?q?=E6=95=B0=E9=87=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/inspectionRecord/addForm.vue | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/views/qms/inspection/inspectionRecord/addForm.vue b/src/views/qms/inspection/inspectionRecord/addForm.vue index 2cf053675..4891365bc 100644 --- a/src/views/qms/inspection/inspectionRecord/addForm.vue +++ b/src/views/qms/inspection/inspectionRecord/addForm.vue @@ -136,14 +136,20 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any tableSchemas.value.tableFormColumns.map(item=>{ item.tableForm.disabled = true }) + // 评估代码值是1，接收时候，使用决策下拉列表是全部合格 + if(row.estimateCode == 1){ + data.value.useDecision = '1' + }else{ + data.value.useDecision ='' + } // 全部合格时合格数量==数量 - if(row.useDecision == 1){ + if(data.value.useDecision == 1){ data.value.packageList.forEach(item=>{ item.qualifiedAmount = item.amount }) } // 让步接收和部分合格 - else if(row.useDecision == 2 || row.useDecision == 6){ + else if(data.value.useDecision == 2 || data.value.useDecision == 6){ tableSchemas.value.tableFormColumns.map(item=>{ if(item.field == 'noQualifiedAmount'){ item.tableForm.disabled = false @@ -153,20 +159,17 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any }) } // 全不合格只能输入不合格数量 - else if(row.useDecision == 3){ + else if(data.value.useDecision == 3){ data.value.packageList.forEach(item=>{ item.noQualifiedAmount = item.amount }) } - else if(row.useDecision == 4){ + else if(data.value.useDecision == 4){ data.value.packageList.forEach(item=>{ item.frozenAmount = item.amount }) } - // 评估代码值是1，接收时候，使用决策下拉列表是全部合格 - if(row.estimateCode == 1){ - data.value.useDecision = '1' - } + nextTick(() => { formMainRef.value.setValues( data.value) }) @@ -241,6 +244,7 @@ const tableFormBlur = (field, val,row)=>{ row.qualifiedAmount = 0 }else{ row.qualifiedAmount = row.amount - val + row.qualifiedAmount = row.qualifiedAmount.toFixed(2) } } From cbab1934ab812f387daa794c7bcf484f66436101 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Mon, 29 Apr 2024 17:23:44 +0800 Subject: [PATCH 37/84] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5=20=E7=8F=AD=E7=BB=84=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=20=E7=A6=BB?= =?UTF-8?q?=E7=BA=BF=E7=99=BB=E8=AE=B0=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/orderDay/index.ts | 3 +- .../mes/orderDay/components/schedule.vue | 32 +++++++++++++------ .../mes/productOffline/productOffline.data.ts | 4 +-- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/api/mes/orderDay/index.ts b/src/api/mes/orderDay/index.ts index 0ccc0f3ee..89fafea88 100644 --- a/src/api/mes/orderDay/index.ts +++ b/src/api/mes/orderDay/index.ts @@ -18,6 +18,7 @@ export interface OrderDayVO { startTime: Date endTime: Date taskMode: string + batchCode:string } // 查询生产日计划列表 @@ -104,4 +105,4 @@ export const publishPlan = async (data: OrderDayVO) => { //终止计划 export const stopPlan = async (id) => { return await request.post({ url: `/mes/orderday/stopPlan/`+id }) -} \ No newline at end of file +} diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue index 3a79d518e..ad4eb54f2 100644 --- a/src/views/mes/orderDay/components/schedule.vue +++ b/src/views/mes/orderDay/components/schedule.vue @@ -70,7 +70,7 @@ - + @@ -260,7 +260,14 @@ const workstationData=ref([]) const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const graphJson =ref() -const currentNode = ref({}) +const currentNode = ref({ + attrs:{ + title:{ + text:'' + } + }, + id:'' +}) /*班组数据*/ const teamData = ref([]) /*班组弹窗搜索条件*/ @@ -283,6 +290,8 @@ const closeTeamUser = () =>{ const workerData=ref([]) /*查询班组接口参数*/ const teamParams = ref({ + workshopCode:'', + productionLineCode:'', teamGroup: '', name: '', pageNo:1, @@ -304,6 +313,8 @@ const searchTeamList = () => { } /** 打开弹窗 */ const open = async (type: string, row?: any, titleName?: any) => { + currentNode.value.attrs.title.text='' + currentNode.value.id='' //首次打开页面，将数据清空 workerData.value = [] equipmentData.value = [] @@ -424,7 +435,7 @@ const opensearchTable = ( false, //true ) - + } const publishPlan=()=>{ message.confirm("确认发布当前计划？","question").then(async () => { @@ -441,11 +452,11 @@ const publishPlan=()=>{ }).catch(() => { message.info("已取消发布") }) - - + + } const doPublishPlan= ()=>{ - + let data ={ updateId: detailData.value.id, status: detailData.value.status, @@ -464,9 +475,10 @@ const doPublishPlan= ()=>{ planDate: detailData.value.planDate, startTime: detailData.value.planDate, endTime: detailData.value.endTime, - taskMode: detailData.value.taskMode -} - + taskMode: detailData.value.taskMode, + batchCode:detailData.value.batchCode, + } + let res = OrderDayApi.publishPlan(data) console.log("---doPublishPlan-- 458--",res) if(res.code===0){ @@ -567,6 +579,8 @@ const opensearchTableUser = async ( teamParams.value.teamGroup = '' teamParams.value.name = '' teamParams.value.pageNo = 1 + teamParams.value.workshopCode = detailData.value.workroomCode + teamParams.value.productionLineCode = detailData.value.lineCode var teamList = await getTeamList(teamParams.value) teamData.value = teamList.list totalTeam.value = teamList.total diff --git a/src/views/mes/productOffline/productOffline.data.ts b/src/views/mes/productOffline/productOffline.data.ts index 95a1784df..1cc932791 100644 --- a/src/views/mes/productOffline/productOffline.data.ts +++ b/src/views/mes/productOffline/productOffline.data.ts @@ -48,8 +48,8 @@ export const ProductOffline = useCrudSchemas(reactive([ searchAllSchemas: workscheduling.allSchemas, // 查询弹窗所需类 searchPage: ProductOfflineApi.getworkSchedulingPage, // 查询弹窗所需分页方法 searchCondition: [{ - key: 'flagDo', - value: '3', + key: 'status', + value: '1', action: '==', isSearch: true, isMainValue: false From 097b4df621398dc468a04dad495b78ddfa2fb94a Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 29 Apr 2024 17:41:44 +0800 Subject: [PATCH 38/84] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionplan/productionMain/index.vue | 25 +++++++++++----- .../productionMain/productionMain.data.ts | 6 +++- .../productputawayRequestMain/index.vue | 24 ++++++++++----- .../productputawayRequestMain.data.ts | 1 + .../productredressRequestMain/index.vue | 29 ++++++++++++------- .../productredressRequestMain.data.ts | 1 + 6 files changed, 58 insertions(+), 28 deletions(-) diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue index f92e3bbe8..27bf09a11 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue @@ -42,6 +42,8 @@ nextTick(async() => { if (type == 'tableForm') { // 明细查询页赋值 - await ItemBasicApi.getItembasicPage({ - code: row['itemCode'] - }).then(res => { - row['uom'] = res?.list[0].uom - }).catch(err =>{ - console.log(err); - }) - row[formField] = val[0][searchField] + // await ItemBasicApi.getItembasicPage({ + // code: row['itemCode'] + // }).then(res => { + // row['uom'] = res?.list[0].uom + // }).catch(err =>{ + // console.log(err); + // }) + if(formField=='itemCode'){ + row[formField] = val[0][searchField] + val.forEach(item=>{ + if(tableData.value.find(item1=>item1['id'] == item['id'])) return + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + tableData.value.push(newRow) + }) + } } else { const setV = {} if(formField == 'workshop'){ diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index af732e6da..e8b547ebc 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -635,6 +635,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ } }, tableForm:{ + multiple:true, isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 @@ -740,7 +741,10 @@ export const ProductionDetail = useCrudSchemas(reactive([ width: 150 }, tableForm:{ - type: 'Select' + type: 'Select', + disabled: true, + dictType: DICT_TYPE.UOM, + dictClass: 'string' } }, { diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue index 7133a4331..9aa2e429b 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue @@ -42,6 +42,8 @@ nextTick(() => { if (type == 'tableForm') { // 明细查询页赋值 - row[formField] = val[0][searchField] - row['poLine'] = val[0]['itemCode'] - row['packingNumber'] = val[0]['packingNumber'] - row['containerNumber'] = val[0]['containerNumber'] - row['batch'] = val[0]['batch'] - row['uom'] = val[0]['uom'] - row['inventoryStatus'] = val[0]['inventoryStatus'] - row['fromLocationCode'] = val[0]['locationCode'] + if(tableData.value.find(item1=>item1['id'] == item['id'])) return + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + newRow['poLine'] = item['itemCode'] + newRow['packingNumber'] = item['packingNumber'] + newRow['containerNumber'] = item['containerNumber'] + newRow['batch'] = item['batch'] + newRow['uom'] = item['uom'] + newRow['qty'] = item['qty'] + newRow['inventoryStatus'] = item['inventoryStatus'] + newRow['fromLocationCode'] = item['locationCode'] + tableData.value.push(newRow) + }) } else { const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts index 260b97875..66cd24c8b 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts @@ -447,6 +447,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive width: 150 }, tableForm:{ + multiple:true, isInpuFocusShow: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue index de28b40f4..6e88e7416 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue @@ -42,6 +42,8 @@ { nextTick(() => { if (type == 'tableForm') { - if (formField == 'itemCode') { - row['itemCode'] = val[0]['itemCode'] - row['qty'] = val[0]['qty'] - row['uom'] = val[0]['uom'] - row['packingNumber'] = val[0]['packingNumber'] - row['batch'] = val[0]['batch'] - row['packQty'] = val[0]['packQty'] - row['packUnit'] = val[0]['packUnit'] - row['inventoryStatus'] = val[0]['inventoryStatus'] - row['toLocationCode'] = val[0]['locationCode'] - } // 明细查询页赋值 row[formField] = val[0][searchField] + if (formField == 'itemCode') { + if(tableData.value.find(item1=>item1['id'] == item['id'])) return + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['itemCode'] = item['itemCode'] + newRow['qty'] = item['qty'] + newRow['uom'] = item['uom'] + newRow['packingNumber'] = item['packingNumber'] + newRow['batch'] = item['batch'] + newRow['packQty'] = item['packQty'] + newRow['packUnit'] = item['packUnit'] + newRow['inventoryStatus'] = item['inventoryStatus'] + newRow['toLocationCode'] = item['locationCode'] + tableData.value.push(newRow) + }) + } } else { const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts index b70dabe87..5b447e22d 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts @@ -332,6 +332,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive } }, tableForm:{ + multiple:true, isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 From 4281a92b105f410a50322221a8b9ae10d3bf0cfc Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 30 Apr 2024 08:35:32 +0800 Subject: [PATCH 39/84] =?UTF-8?q?=E5=BC=95=E5=85=A5=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceipt/productreceiptRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index de72d02f2..bb3a3282c 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -143,7 +143,7 @@ import * as ItembasicApi from '@/api/wms/itembasic' import * as PackageApi from '@/api/wms/package' import { formatTime } from '@/utils/index' import { getAccessToken } from '@/utils/auth' - +import dayjs from 'dayjs' // 制品收货申请 // 预生产收货申请 defineOptions({ name: 'ProductreceiptRequestMain' }) From b351f4705c0b9df26d7de14d7f407c51128b32a6 Mon Sep 17 00:00:00 2001 From: zhousq Date: Tue, 30 Apr 2024 09:15:42 +0800 Subject: [PATCH 40/84] =?UTF-8?q?2024-04-30=20=E5=A2=9E=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=A0=A1=E9=AA=8C=E3=80=81=E4=BF=AE=E6=94=B9=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/orderDay/components/BasicFormV2.vue | 4 ++++ src/views/mes/orderDay/components/orderDetail.vue | 2 +- src/views/mes/orderDay/components/schedule.vue | 13 ++++++++----- src/views/mes/orderDay/index.vue | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/views/mes/orderDay/components/BasicFormV2.vue b/src/views/mes/orderDay/components/BasicFormV2.vue index 8715c9abb..a6863b0ad 100644 --- a/src/views/mes/orderDay/components/BasicFormV2.vue +++ b/src/views/mes/orderDay/components/BasicFormV2.vue @@ -324,6 +324,10 @@ const submitForm = async () => { if (!elForm) return const valid = await elForm.validate() if (!valid) return + if(formRef.value.formModel.startTime>formRef.value.formModel.endTime){ + message.warning('开始时间不能大于结束时间！') + return + } // 针对主子表 明细校验 if (props.isBusiness) { formLoading.value = true diff --git a/src/views/mes/orderDay/components/orderDetail.vue b/src/views/mes/orderDay/components/orderDetail.vue index 486efad04..3e7b0e7ad 100644 --- a/src/views/mes/orderDay/components/orderDetail.vue +++ b/src/views/mes/orderDay/components/orderDetail.vue @@ -102,7 +102,7 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'Detail' -const activeName = ref('processRouteInfo') +const activeName = ref('processInfo') const props = defineProps({ allSchemas: { type: Object, diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue index ad4eb54f2..f9d48a015 100644 --- a/src/views/mes/orderDay/components/schedule.vue +++ b/src/views/mes/orderDay/components/schedule.vue @@ -190,6 +190,7 @@ @@ -480,12 +481,14 @@ const doPublishPlan= ()=>{ } let res = OrderDayApi.publishPlan(data) - console.log("---doPublishPlan-- 458--",res) - if(res.code===0){ + + res.then(()=>{ message.success("计划发布成功") - }else { - message.error(res.msg) - } + }).catch((err)=>{ + //console.log("---doPublishPlan-- 458--",res.msg) + message.error("计划发布失败！") + }) + } // 弹层确定返回所选数据 diff --git a/src/views/mes/orderDay/index.vue b/src/views/mes/orderDay/index.vue index 857c364a2..fc421c5e3 100644 --- a/src/views/mes/orderDay/index.vue +++ b/src/views/mes/orderDay/index.vue @@ -214,7 +214,7 @@ const isShowMainButton = (row,val) => { const butttondata = (row) => { //console.log('row2',row) return [ - defaultButtons.mainListEditBtn({ hide: isShowMainButton(row,['1']),hasPermi:'mes:orderDay:update'}), // 编辑 + //defaultButtons.mainListEditBtn({ hide: isShowMainButton(row,['1']),hasPermi:'mes:orderDay:update'}), // 编辑 defaultButtons.mainListDeleteBtn({ hide: isShowMainButton(row,['1']),hasPermi:'mes:orderDay:delete'}), // 删除 defaultButtons.mainListHandleBtn({label: '排产', name: 'publish', From b1bf52fc23e94fe45672049bf49b95c86e3b11ee Mon Sep 17 00:00:00 2001 From: zhousq Date: Tue, 30 Apr 2024 10:06:23 +0800 Subject: [PATCH 41/84] =?UTF-8?q?2024-04-30=20=E4=BF=AE=E5=A4=8D=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/orderDay/components/schedule.vue | 2 +- src/views/mes/orderDay/orderDay.data.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue index f9d48a015..636560369 100644 --- a/src/views/mes/orderDay/components/schedule.vue +++ b/src/views/mes/orderDay/components/schedule.vue @@ -484,7 +484,7 @@ const doPublishPlan= ()=>{ res.then(()=>{ message.success("计划发布成功") - }).catch((err)=>{ + }).catch(()=>{ //console.log("---doPublishPlan-- 458--",res.msg) message.error("计划发布失败！") }) diff --git a/src/views/mes/orderDay/orderDay.data.ts b/src/views/mes/orderDay/orderDay.data.ts index 23b0177c5..3c97730b6 100644 --- a/src/views/mes/orderDay/orderDay.data.ts +++ b/src/views/mes/orderDay/orderDay.data.ts @@ -335,7 +335,7 @@ export const OrderDay = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'datetime', + type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, From 613d4febfe68fd56cf6930f87ea08da33b0af9ac Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 30 Apr 2024 10:36:39 +0800 Subject: [PATCH 42/84] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain.data.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 2f3ff2b4d..45d569204 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -96,6 +96,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + disabled:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本 searchField: 'number', // 查询弹窗赋值字段 @@ -782,6 +783,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive disabled:false } }, + isTable: false, isForm:false, tableForm:{ type:'InputNumber', @@ -791,7 +793,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } }, { - label: '数量', + label: '退货数量', field: 'qty', sort: 'custom', table: { From 440452fe88946eec321998cf319ed291dc75b790 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 30 Apr 2024 10:37:54 +0800 Subject: [PATCH 43/84] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverPlanMain/deliverPlanMain.data.ts | 264 +++++++++++++----- 1 file changed, 195 insertions(+), 69 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index bca93fa19..150705354 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -52,6 +52,18 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ isForm: false, isSearch: true }, + { + label: '状态', + field: 'status', + sort: 'custom', + table: { + width: 150 + }, + dictType: DICT_TYPE.PLAN_STATUS, + dictClass: 'string', + isSearch: true, + isForm:false, + }, { label: '客户代码', field: 'customerCode', @@ -63,6 +75,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择客户代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -77,6 +90,51 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ } } }, + { + label: '客户月台', + field: 'customerDockCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: true, + // tableForm:{ + // isInpuFocusShow: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择客户月台代码', + // searchField: 'code', + // searchTitle: '客户月台基础信息', + // searchAllSchemas: Customerdock.allSchemas, + // searchPage: CustomerDockApi.pageCustomerCodeToCustomerDock, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // },{ + // key: 'customerCode', + // value: 'customerCode', + // isMainValue: true + // }] + // }, + form: { + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择客户月台代码', + searchField: 'code', + searchTitle: '客户月台基础信息', + searchAllSchemas: Customerdock.allSchemas, + searchPage: CustomerDockApi.pageCustomerCodeToCustomerDock, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + },{ + key: 'customerCode', + value: 'customerCode', + isMainValue: true + }] + } + }, + }, { label: '发货类型', field: 'deliverType', @@ -116,16 +174,9 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, isTable: false, }, + { label: '创建时间', field: 'createTime', @@ -137,6 +188,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -154,6 +206,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -167,6 +220,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -187,6 +241,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -196,25 +251,13 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ } }, }, - { - label: '状态', - field: 'status', - sort: 'custom', - table: { - width: 150 - }, - dictType: DICT_TYPE.PLAN_STATUS, - dictClass: 'string', - isSearch: true, - isForm:false, - }, { label: '是否可用', field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: true, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -229,12 +272,21 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ } } }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + }, { label: '自动提交', field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -255,7 +307,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -276,7 +328,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -299,6 +351,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -312,6 +365,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -413,6 +467,35 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ // } // } // }, + { + label: '客户代码', + field: 'customerCode', + sort: 'custom', + table: { + width: 150 + }, + isTable:false, + isTableForm: false, + tableForm:{ + isInpuFocusShow: true, + searchListPlaceholder: '请选择客户代码', + searchField: 'code', + searchTitle: '客户信息', + searchAllSchemas: Customer.allSchemas, + searchPage: CustomerApi.getCustomerPage + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择客户代码', + searchField: 'code', + searchTitle: '客户信息', + searchAllSchemas: Customer.allSchemas, + searchPage: CustomerApi.getCustomerPage + } + } + }, { label: '客户月台', field: 'customerDockCode', @@ -420,6 +503,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, tableForm:{ isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择客户月台代码', @@ -456,30 +540,6 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ } }, }, - { - label: '项目', - field: 'project', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 180 - }, - isTableForm: false, - form: { - componentProps: { - disabled: true - } - } - }, { label: '物料代码', field: 'itemCode', @@ -488,6 +548,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ width: 150 }, tableForm:{ + multiple:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', searchField: 'itemCode', @@ -524,6 +585,55 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ } } }, + { + label: '计划数量', + field: 'planQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 0, + precision: 6 + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true, + type: 'Select' + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '到仓库代码', + field: 'toWarehouseCode', + sort: 'custom', + isForm: false, + table: { + width: 150 + }, + }, { label: '到库位代码', field: 'toLocationCode', @@ -570,6 +680,34 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ } }, }, + { + label: '项目', + field: 'project', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isTableForm: false, + isForm: false, + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + isTableForm: false, + form: { + componentProps: { + disabled: true + } + } + }, + + { label: '备注', field: 'remark', @@ -577,6 +715,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -589,6 +728,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -607,6 +747,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isTableForm: false, isForm: false, }, @@ -617,6 +758,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', componentProps: { @@ -630,26 +772,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ precision: 6 } }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - disabled: true, - type: 'Select' - }, - form: { - componentProps: { - disabled: true - } - } - }, + { label: '最后更新时间', field: 'updateTime', @@ -661,6 +784,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -679,6 +803,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isTableForm: false, isForm: false, }, @@ -687,7 +812,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -712,6 +837,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ width: 150, fixed: 'right' }, + hiddenInMain: true, isTableForm:false, } ])) From 75b6214f16da9a214a116ead288830cbe4d775c1 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Tue, 30 Apr 2024 10:48:24 +0800 Subject: [PATCH 44/84] =?UTF-8?q?=E6=89=93=E5=BC=80=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=B1=95=E7=A4=BA=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=B7=A5=E5=BA=8F=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/orderDay/components/schedule.vue | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue index 636560369..3b31342b3 100644 --- a/src/views/mes/orderDay/components/schedule.vue +++ b/src/views/mes/orderDay/components/schedule.vue @@ -378,12 +378,18 @@ const getProcessBom=async (code:any) => { let res = await orderDayconfigApi.getOrderDayBomByOrder(queryParams) materialsData.value=res } +const currentStartNode = ref({ + id:'' +}) //获取配置的工艺路线信息 const getProcessroute = async () => { let res = await orderDayconfigApi.getConfigProcessRoute(queryParams) - //console.log('ddddd',res) graphJson.value=JSON.parse(res.newGraphData) - + //首次打开弹窗，默认打开一个工序的数据 + currentStartNode.value.id = graphJson.value.cells[0].id + // 手动触发点击事件 + nodeClick('','','',currentStartNode.value,'') + currentNode.value = graphJson.value.cells[0] graph.value?.fromJSON(graphJson.value.cells) } //获取配置的工序信息 @@ -407,6 +413,7 @@ const getConfigProcessEquipment= async (code:any) => { equipmentData.value = await orderDayconfigApi.getConfigProcessEquipment(queryParams) } const nodeClick = (e, x, y, node, view) => { + console.log(node.id) getProcessBom(node.id) getConfigProcessWorkstation(node.id) getConfigProcessWorker(node.id) @@ -481,14 +488,14 @@ const doPublishPlan= ()=>{ } let res = OrderDayApi.publishPlan(data) - + res.then(()=>{ message.success("计划发布成功") }).catch(()=>{ //console.log("---doPublishPlan-- 458--",res.msg) message.error("计划发布失败！") }) - + } // 弹层确定返回所选数据 From ad63ddc5d5e01c8bb3abe3cf5eb47bd349d87cec Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 30 Apr 2024 10:48:50 +0800 Subject: [PATCH 45/84] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain.data.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 45d569204..334390767 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -690,6 +690,16 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } } }, + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isTableForm: true + }, { label: '替代批次', field: 'altBatch', From 5964039157b0b4cfa2d61f8a5fc49961df6b8378 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 30 Apr 2024 11:15:38 +0800 Subject: [PATCH 46/84] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain/purchasereturnRequestMain.data.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 334390767..805c58a68 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -773,6 +773,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } }, tableForm:{ + disabled:true, type:'InputNumber', min:0, precision: 6 @@ -794,6 +795,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } }, isTable: false, + isTableForm: false, isForm:false, tableForm:{ type:'InputNumber', From 2790143f45713a77cd634fea5aecf66ca5654aa0 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 30 Apr 2024 11:24:48 +0800 Subject: [PATCH 47/84] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturn/purchasereturnRequestMain/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 8474dc7d1..6fb742c7a 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -209,7 +209,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => if (res) tableData.value = res tableData.value.forEach((item) => { item.batch = item.toBatch - item.packingNumber = item.toPackingNumber + + item.packingNumber = '' item.containerNumber = item.toContainerNumber item.receiptQty = item.qty item.toLocationGroupCode = null From 8cd01e035fa83269a2ad50b3db8f153413702a5e Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 30 Apr 2024 11:49:49 +0800 Subject: [PATCH 48/84] =?UTF-8?q?=E5=88=B0=E5=BA=93=E4=BD=8D=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparereceiptRequestMain/sparereceiptRequestMain.data.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts index 73e0c4892..0bea96be7 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts @@ -1301,6 +1301,9 @@ export const PurchasereceiptRequestDetailRules = reactive({ itemCode: [ { required: true, message: '请输入物料代码', trigger: 'change' } ], + defaultToLocationCode: [ + { required: true, message: '请选择到库位代码', trigger: 'blur' } + ], }) From a35a603ebd230c082dbdaf5c1a9d2131c458239e Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 30 Apr 2024 11:51:31 +0800 Subject: [PATCH 49/84] =?UTF-8?q?=E5=88=B6=E5=93=81=E4=B8=8A=E6=9E=B6/?= =?UTF-8?q?=E5=9B=9E=E6=94=B6=20=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E7=9A=84?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=BA=93=E5=AD=98=E7=8A=B6=E6=80=81=E8=B5=8B?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productputawayRequestMain.data.ts | 20 +++++++++- .../productredressRequestMain.data.ts | 37 ++++++++++++------- 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts index 66cd24c8b..0638e6352 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts @@ -1,6 +1,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' import * as getRequestsettingApi from '@/api/wms/requestsetting/index' +import * as getBusinessTypeApi from '@/api/wms/businesstype/index' import * as BalanceApi from '@/api/wms/balance' import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' @@ -14,8 +15,15 @@ const queryParams = { pageSize:10, pageNo:1, code:'ProductPutawayRequest' +} +const businessTypeQueryParams = { + pageSize:10, + pageNo:1, + code:'ProductPutaway' } const data = await getRequestsettingApi.getRequestsettingPage(queryParams) + const businessTypeValue = await getBusinessTypeApi.getBusinesstypePage(businessTypeQueryParams) + const businessTypeData =businessTypeValue?.list[0]||{} const requestsettingData =data?.list[0]||{} // 获取当前操作人的部门 @@ -454,7 +462,11 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法 + searchPage: BalanceApi.getBalancePageByBusinessType, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'businessType', + value: businessTypeData.code, + }] }, form: { // labelMessage: '信息提示说明！！！', @@ -464,7 +476,11 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法 + searchPage: BalanceApi.getBalancePageByBusinessType, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'businessType', + value: businessTypeData.code, + }] } } }, diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts index 5b447e22d..dcc05b9a8 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts @@ -3,7 +3,14 @@ import { dateFormatter } from '@/utils/formatTime' import * as BalanceApi from '@/api/wms/balance' import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' - +import * as getBusinessTypeApi from '@/api/wms/businesstype/index' +const businessTypeQueryParams = { + pageSize:10, + pageNo:1, + code:'Productredress' +} +const businessTypeValue = await getBusinessTypeApi.getBusinesstypePage(businessTypeQueryParams) +const businessTypeData =businessTypeValue?.list[0]||{} // 表单校验 export const ProductredressRequestMainRules = reactive({ autoCommit: [required], @@ -316,13 +323,14 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法 - searchCondition:[ - { - key: 'inventoryStatus', - value: 'OK', - isMainValue: false - },{ +  searchPage: BalanceApi.getBalancePageByBusinessType, // 查询弹窗所需分页方法 +        searchCondition: [{ +          key: 'businessType', +          value: businessTypeData.code, + action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 + isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 +        },{ key: 'packingNumber', // 查询列表中字段 value: '', // 指查询具体值 action: 'isNotStr', // 查询拼接条件 @@ -338,12 +346,13 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法 - searchCondition:[ - { - key: 'inventoryStatus', - value: 'OK', - isMainValue: false + searchPage: BalanceApi.getBalancePageByBusinessType, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'businessType', + value: businessTypeData.code, + action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 + isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 },{ key: 'packingNumber', // 查询列表中字段 value: '', // 指查询具体值 From 5c3d0825c3f38529412ba41ef296bdf0e04b335e Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 30 Apr 2024 11:55:15 +0800 Subject: [PATCH 50/84] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRequestMain/index.vue | 40 +++++-------------- .../purchasereceiptRequestMain.data.ts | 2 +- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index faa674a8f..6db8c5f17 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -418,42 +418,24 @@ const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAcces // 标签打印 const searchTableRef = ref() const labelPrint = async (row) => { - console.log("------------",row); tableObject.loading = true - const subTableDFata = await PackageApi.getLabel(row.masterId) - tableObject.loading = false - const tableObject1 = { - // 当前页 - currentPage: 1, - // 导出加载中 - exportLoading: false, - // 加载中 - loading: false, - // 页数 - pageSize: subTableDFata.length, - params:null, - // 排序 - sort: { - order: '', // 排序规则 - prop: '' // 排序字段 - }, - // 总条数 - total: subTableDFata.length, - // 表格数据 - tableList: subTableDFata, - currentRow:null - } - console.log("标签打印",subTableDFata,tableObject1,SupplierdeliverRequestPackage.allSchemas) + const defaultParams = {'moduleName':'supplier','recordNumber':row.number} + const {tableObject:tableObjectPrint ,tableMethods} = useTable({ + defaultParams, + getListApi: PackageApi.getLabelDetailPage // 分页接口 + }) + // 获得表格的各种操作 + const { getList:getListPrint } = tableMethods + getListPrint() + tableObject.loading = false const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns - tableColumns.forEach((item) => { item.width = item.table?.width || 150 }) - searchTableRef.value.openData("标签信息",tableObject1,{tableColumns},true) - - // window.open(src.value + '&asn_number=' + row.asnNumber) + searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true) } + // 批量打印---采购收货申请 const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => { console.log('批量打印',val) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 8a8f397c9..c3aca280e 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -802,7 +802,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive Date: Tue, 30 Apr 2024 13:43:44 +0800 Subject: [PATCH 51/84] =?UTF-8?q?2024-04-30=20=E5=B7=A5=E8=89=BA=E8=B7=AF?= =?UTF-8?q?=E7=BA=BF=E9=85=8D=E7=BD=AE=E4=BC=98=E5=8C=96=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=A1=B5=EF=BC=8C=E8=81=94=E5=8A=A8=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processroute/components/configDialog.vue | 146 +++++++-- .../processroute/components/graphbase.data.ts | 6 +- .../mes/workScheduling/components/Detail.vue | 295 ++++++++++-------- src/views/mes/workScheduling/index.vue | 6 +- .../mes/workScheduling/workScheduling.data.ts | 18 +- 5 files changed, 309 insertions(+), 162 deletions(-) diff --git a/src/views/mes/processroute/components/configDialog.vue b/src/views/mes/processroute/components/configDialog.vue index c10f2af27..571e045fb 100644 --- a/src/views/mes/processroute/components/configDialog.vue +++ b/src/views/mes/processroute/components/configDialog.vue @@ -12,8 +12,8 @@
- {{ titleValueRef }} - [{{ titleNameRef }}] + {{ titleNameRef }} + [{{ titleValueRef }}] @@ -37,7 +37,7 @@ >添加工序
- + @@ -48,6 +48,17 @@ +
@@ -81,8 +92,9 @@ 工艺路线基本信息 -

工艺路线名称：{{ productData.name }}

-

工艺路线编码：{{ productData.name }}

+ +

工艺路线名称：{{titleNameRef}}

+

工艺路线编码：{{titleValueRef}}

产品名称：{{ productData.name }}

产品编码：{{ productData.code }}

产品描述：{{ productData.desc1 }}

@@ -92,23 +104,34 @@ > - + + @@ -121,7 +144,7 @@ > @@ -154,6 +177,7 @@ const message = useMessage() // 消息弹窗 //const { t } = useI18n() // 国际化 const route = useRoute() // 路由信息 const routeName = ref() +const currentNode=ref({code:'',name:''}) routeName.value = route.name routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'ProcessRouteConfig' //const updateKey = ref(0) @@ -165,6 +189,22 @@ const tableProcess = ref() const productData = ref({ name: '', code: '', desc1: '--' }) //产品数据 const materialData=ref() const mouldData = ref() +const page=ref({ + total:0, + current:1, + size:5 +}) +const pageM=ref({ + total:0, + current:1, + size:5 +}) +const showProcessNodeData=ref() //工序分页数据展示 +const showMaterialsData=ref() //物料信息分页展示 +const productCode=ref() +//初始化图形组件 +const graph = ref() +const rowData = ref() const workStationList = ref() //工位数据 // 附件默认数据 const annexData = reactive({ @@ -203,23 +243,25 @@ const searchTableSuccess = (formField, searchField, val, type, row) => { if(val.length>0){ val.forEach(item=>{ if(processData.value.find(obj=>obj.code==item.code)==undefined){ - processData.value.push({code:item.code,name:item.name})} + processData.value.push({code:item.code,name:item.name}) + page.value.total=processData.value.length + showProcessNodeData.value=processData.value.slice((page.value.current-1)*page.value.size,page.value.size) + } }) } } const deleteNode=(row)=>{ processData.value.splice(processData.value.indexOf(row),1) + page.value.total=processData.value.length + page.value.current=1 graph.value.removeNode(row.code) } -const productCode=ref() -//初始化图形组件 -const graph = ref() -const rowData = ref() + const openDetail = (row: any) => { rowData.value = row console.log('rowData',rowData.value) - titleNameRef.value = rowData.value.processrouteCode - titleValueRef.value = rowData.value.processName + titleNameRef.value = rowData.value.processName + titleValueRef.value =rowData.value.processrouteCode processRouteId.value = rowData.value.id productCode.value=rowData.value.productCode routeVersion.value=rowData.value.routeVersion @@ -264,7 +306,7 @@ const getProcessInfo = async (id: any) => { /** 获取产品信息 */ const getItembasicInfo = async (code: String) => { const res = await ProcessrouteApi.getProductInfo(code) - console.log('productData',res) + //console.log('productData',res) productData.value = res } /** 获取物料列表 */ @@ -302,28 +344,37 @@ const getProcessList = async (code) => { //console.log('code',code) const res = await ProcessrouteApi.getProcessrouteNodeList(code) processData.value = res + showProcessNodeData.value=processData.value.slice((page.value.current-1)*page.value.size,page.value.size) //return res } // 并行执行所有异步操作 const nodeClick = (e, x, y, node, view) => { + currentNode.value.code=node.id + currentNode.value.name=node.attrs.title.text Promise.all([ getProcessInfo(node.id), getProcessBomList(productCode.value,node.id), getPatternPage(node.id), getWorkstationPage(node.id) - ]).then(([processIndoList,basicBom, patternPage,workstationInfoList]) => { + ]).then(([processInfoList,basicBom, patternPage,workstationInfoList]) => { // 在这里处理所有异步操作的结果 //message.info(JSON.stringify(processIndoList)) - console.log('basicBom',basicBom) + //console.log('basicBom',basicBom) //获取绑定的物料信息 materialData.value = basicBom + pageM.value.total=materialData.value.length + pageM.value.current=1 + showMaterialsData.value=materialData.value.slice((pageM.value.current-1)*pageM.value.size,pageM.value.size) //获取绑定的模具信息 mouldData.value = patternPage.list //获取绑定的工位信息 workStationList.value = workstationInfoList.list }).catch(error => { - console.error("Error:", error); + //console.error("Error:", error); materialData.value = [] + showMaterialsData.value=[] + pageM.value.total=materialData.value.length + pageM.value.current=1 mouldData.value = [] workStationList.value = [] }); @@ -362,6 +413,7 @@ const userAddNode = (row) => { // ] }) } + nodeClick(undefined,undefined, undefined, node_template, graph.value) } } //------- @@ -382,7 +434,7 @@ const saveResult = async () => { return } let gdata = { - processrouteCode: titleNameRef.value, + processrouteCode: titleValueRef.value, routeVersion:routeVersion.value, graphJson: graph.value.toJSON(), processrouteId: processRouteId.value @@ -442,6 +494,58 @@ const deleteAnnexSuccess = async () => { getFileList() getChangeRecordList() } + +const handleCurrentChange=(value: number)=>{ + let index=(value-1)*page.value.size + page.value.current=value + //console.log('index',index) + showProcessNodeData.value=processData.value.slice(index,index+page.value.size) + //console.log('processData.value-472',processData.value) + //console.log('showProcessNodeData.value-472',showProcessNodeData.value) +} +const handlePrevClick=(value: number)=>{ + page.value.current=value-1 + if(page.value.current==0) { + page.value.current=1 + } + // let index=(value-1)*page.value.size + // showProcessNodeData.value=processData.value.slice(index,page.value.size) + // console.log('showProcessNodeData.value-472',showProcessNodeData.value) +} +const handleNextClick=(value: number)=>{ + page.value.current=value+1 + if(page.value.current>page.value.total/page.value.size) { + page.value.current=page.value.total/page.value.size -1 + } + // let index=(value+1)*page.value.size + // showProcessNodeData.value=processData.value.slice(index,page.value.size) + // console.log('showProcessNodeData.value-472',showProcessNodeData.value) +} +const handleCurrentChangeM=(value: number)=>{ + let index=(value-1)*pageM.value.size + pageM.value.current=value + //console.log('index',index) + showMaterialsData.value=materialData.value.slice(index,index+pageM.value.size) + +} +const handlePrevClickM=(value: number)=>{ + pageM.value.current=value-1 + if(pageM.value.current==0) { + pageM.value.current=1 + } + // let index=(value-1)*page.value.size + // showProcessNodeData.value=processData.value.slice(index,page.value.size) + // console.log('showProcessNodeData.value-472',showProcessNodeData.value) +} +const handleNextClickM=(value: number)=>{ + pageM.value.current=value+1 + if(pageM.value.current>pageM.value.total/page.value.size) { + pageM.value.current=page.value.total/pageM.value.size -1 + } + // let index=(value+1)*page.value.size + // showProcessNodeData.value=processData.value.slice(index,page.value.size) + // console.log('showProcessNodeData.value-472',showProcessNodeData.value) +} // 验证图形 onUnmounted?.(() => {}) const emit = defineEmits(['close']) diff --git a/src/views/mes/processroute/components/graphbase.data.ts b/src/views/mes/processroute/components/graphbase.data.ts index cf14d8073..8426a4415 100644 --- a/src/views/mes/processroute/components/graphbase.data.ts +++ b/src/views/mes/processroute/components/graphbase.data.ts @@ -138,7 +138,7 @@ export const start_node = ref({ id: 'startNode', label: '开始', x: 50, - y: 200, + y: 100, attrs: { body: { rx: 20, @@ -151,8 +151,8 @@ export const start_node = ref({ //结束节点的定义 export const end_node = ref({ id: 'endNode', - x: 200, - y: 200, + x: 400, + y: 100, label: '结束', attrs: { body: { diff --git a/src/views/mes/workScheduling/components/Detail.vue b/src/views/mes/workScheduling/components/Detail.vue index c58a01025..b42ae5cd2 100644 --- a/src/views/mes/workScheduling/components/Detail.vue +++ b/src/views/mes/workScheduling/components/Detail.vue @@ -28,7 +28,16 @@
- + + - + diff --git a/src/views/mes/itemRequestMain/itemRequestMain.data.ts b/src/views/mes/itemRequestMain/itemRequestMain.data.ts new file mode 100644 index 000000000..602571af5 --- /dev/null +++ b/src/views/mes/itemRequestMain/itemRequestMain.data.ts @@ -0,0 +1,170 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const ItemRequestMainRules = reactive({ + concurrencyStamp: [required], +}) + +export const ItemRequestMain = useCrudSchemas(reactive([ + { + label: '删除时间', + field: 'deleteTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '主键', + field: 'id', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '状态', + field: 'status', + sort: 'custom', + isSearch: true, + form: { + component: 'Radio' + }, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: true, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + }, + { + label: '删除用户名', + field: 'deleter', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '位置ID', + field: 'siteId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '计划编码', + field: 'planDayCode', + sort: 'custom', + isSearch: true, + }, + { + label: '工单编码', + field: 'workBillNo', + sort: 'custom', + isSearch: true, + }, + { + label: '批次编码', + field: 'batchCode', + sort: 'custom', + isSearch: true, + }, + { + label: '申请单号', + field: 'requestBillNo', + sort: 'custom', + isSearch: true, + }, + { + label: '工位编码', + field: 'workstationCode', + sort: 'custom', + isSearch: true, + }, + { + label: '产品编码', + field: 'productCode', + sort: 'custom', + isSearch: true, + }, + { + label: '工序编码', + field: 'processCode', + sort: 'custom', + isSearch: true, + }, + { + label: '类型（1:叫料、2:补料）', + field: 'requestType', + sort: 'custom', + isSearch: true, + form: { + component: 'SelectV2' + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) From 69d184c49e96067ed60b1872a40e760d167487bf Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 6 May 2024 11:11:37 +0800 Subject: [PATCH 76/84] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=95=8C=E9=9D=A2=E6=94=B9=E4=B8=BA=E5=B8=A6?= =?UTF-8?q?=E5=87=BA=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=BF=A1=E6=81=AF=EF=BC=88=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=8F=B7=E3=80=81=E4=BE=9B=E5=BA=94=E5=95=86=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E3=80=81=E6=95=B0=E9=87=8F=E3=80=81=E5=8D=95=E4=BD=8D=EF=BC=89?= =?UTF-8?q?=E4=B8=94=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverInspectionDetail/index.ts | 5 +++ .../supplierdeliverInspectionDetail.data.ts | 36 +++++++++++++++++-- .../supplierdeliverRequestMain/index.vue | 13 +++++-- 3 files changed, 48 insertions(+), 6 deletions(-) diff --git a/src/api/wms/supplierdeliverInspectionDetail/index.ts b/src/api/wms/supplierdeliverInspectionDetail/index.ts index cd689c6f7..c17a4d8f5 100644 --- a/src/api/wms/supplierdeliverInspectionDetail/index.ts +++ b/src/api/wms/supplierdeliverInspectionDetail/index.ts @@ -28,6 +28,11 @@ export const getSupplierdeliverInspectionDetail = async (id: number) => { return await request.get({ url: `/wms/supplierdeliver-inspection-detail/get?id=` + id }) } +// 查询供应商发货申请质子列表 +export const getSupplierdeliverDetailInfo = async (id: number) => { + return await request.get({ url: `/wms/supplierdeliver-inspection-detail/queryByMasterId?masterId=` + id }) +} + // 新增供应商发货申请质检信息子 export const createSupplierdeliverInspectionDetail = async (data: SupplierdeliverInspectionDetailVO) => { return await request.post({ url: `/wms/supplierdeliver-inspection-detail/create`, data }) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts index 3fee7b3d7..e125b7976 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts @@ -26,6 +26,14 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive