From 1db7a0dd89e16d2d24c96081e9eeab3bbca1a8d9 Mon Sep 17 00:00:00 2001 From: zhuzhilei <987324949@qq.com> Date: Thu, 16 Nov 2023 17:03:36 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/pro/workorder/index.vue | 35 ++++++++++++++------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue index cae54e4..e54f88f 100644 --- a/src/views/mes/pro/workorder/index.vue +++ b/src/views/mes/pro/workorder/index.vue @@ -160,9 +160,9 @@ - + - + @@ -227,7 +227,7 @@ + @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'"> @@ -235,11 +235,11 @@ - + - + {{dict.label}} - + - + @@ -272,7 +272,7 @@ > - + @@ -299,7 +299,7 @@ - + @@ -311,7 +311,7 @@ - + @@ -328,12 +328,12 @@ placeholder="请选择需求日期"> - + - + @@ -380,12 +380,12 @@ - - - + + + - +
@@ -641,6 +641,7 @@ export default { } getWorkorder(row.workorderId).then(response => { this.form = response.data; + this.form.workorderType = 'SELF' this.open = true; this.title = "修改生产工单"; this.optType="edit"; @@ -703,7 +704,7 @@ export default { this.form.productCode = obj.itemCode; this.form.productName = obj.itemName; this.form.productSpc = obj.specification; - this.form.unitOfMeasure = obj.unitOfMeasure; + this.form.unitOfMeasure = obj.unitOfMeasure; } }, //客户选择弹出框 From 5d2189d2619dc333791c8e326a09d8ea28536e62 Mon Sep 17 00:00:00 2001 From: zhuzhilei <987324949@qq.com> Date: Fri, 17 Nov 2023 13:31:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/wm/productrecpt/index.vue | 32 ++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/views/mes/wm/productrecpt/index.vue b/src/views/mes/wm/productrecpt/index.vue index 1a6030c..72b380f 100644 --- a/src/views/mes/wm/productrecpt/index.vue +++ b/src/views/mes/wm/productrecpt/index.vue @@ -58,7 +58,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['mes:wm:productrecpt:edit']" + v-hasPermi="['mes:productrecpt:edit']" >修改 @@ -69,7 +69,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['mes:wm:productrecpt:remove']" + v-hasPermi="['mes:productrecpt:remove']" >删除 @@ -110,7 +110,7 @@ icon="el-icon-video-play" v-if="scope.row.status =='PREPARE'" @click="handleExecute(scope.row)" - v-hasPermi="['mes:wm:productrecpt:edit']" + v-hasPermi="['mes:productrecpt:edit']" >执行入库 修改 删除 - + + @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'"> @@ -188,7 +188,7 @@ - + @@ -197,13 +197,13 @@ - 物料信息 + 物料信息
返回 - 保 存 + 保 存 取 消
@@ -302,16 +302,16 @@ export default { }); }, getWarehouseList(){ - getTreeList().then( response =>{ + getTreeList().then( response =>{ this.warehouseOptions = response.data; this.warehouseOptions.map(w =>{ w.children.map(l =>{ - let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName'); + let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName'); l.children = JSON.parse(lstr); }); - - let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName'); - w.children = JSON.parse(wstr); + + let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName'); + w.children = JSON.parse(wstr); }); let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName'); @@ -459,7 +459,7 @@ export default { } }, //选择默认的仓库、库区、库位 - handleWarehouseChanged(obj){ + handleWarehouseChanged(obj){ if(obj !=null){ this.form.warehouseId = obj[0]; this.form.locationId = obj[1]; From 83f16286497d691ec10c7e1d2723fd35cec5ed23 Mon Sep 17 00:00:00 2001 From: zhuzhilei <987324949@qq.com> Date: Fri, 12 Jan 2024 14:55:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/pro/proroute/routeprocess.vue | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/views/mes/pro/proroute/routeprocess.vue b/src/views/mes/pro/proroute/routeprocess.vue index 9951e3d..e8db1dd 100644 --- a/src/views/mes/pro/proroute/routeprocess.vue +++ b/src/views/mes/pro/proroute/routeprocess.vue @@ -304,7 +304,8 @@ /> - + + Date: Fri, 19 Jan 2024 13:18:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?AGV=E7=AB=99=E7=82=B9=E7=BC=96=E7=A0=81UI?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/dv/siteConfiguration/index.vue | 37 ++++++++++---------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/src/views/mes/dv/siteConfiguration/index.vue b/src/views/mes/dv/siteConfiguration/index.vue index e0b5ac3..bef46da 100644 --- a/src/views/mes/dv/siteConfiguration/index.vue +++ b/src/views/mes/dv/siteConfiguration/index.vue @@ -107,24 +107,25 @@ @selection-change="handleSelectionChange" > - - - + + + + + + + + + + + + + + + + + + +