From 7d9dcd8efd3fc7e499eef91d52509885e208e06f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A1=BE=E6=9C=89=E9=91=AB?= Date: Mon, 24 Feb 2025 17:16:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/dvplanSelect/index.vue | 6 - src/views/dashboard/PanelGroup.vue | 8 +- src/views/mes/cal/plan/index.vue | 4 - src/views/mes/cg/order/index.vue | 13 +- src/views/mes/cg/plan/index.vue | 7 +- src/views/mes/cg/quotation/index.vue | 19 +- src/views/mes/dv/checkplan/index.vue | 6 - src/views/mes/dv/checkrecord/index.vue | 4 - src/views/mes/dv/machinerytype/index.vue | 3 - src/views/mes/dv/maintenrecord/index.vue | 4 - src/views/mes/gys/qualification/index.vue | 10 +- src/views/mes/gys/record/index.vue | 6 +- src/views/mes/md/itemtype/index.vue | 2 - src/views/mes/pro/feedback/index.vue | 4 - src/views/mes/pro/schedule/index.vue | 2 - src/views/mes/pro/workorder/bom/bom.vue | 4 - src/views/mes/pro/workorder/index.vue | 8 - src/views/mes/qc/ipqc/index.vue | 4 - src/views/mes/qc/iqc/iqc.vue | 4 - src/views/mes/qc/oqc/index.vue | 4 - src/views/mes/qc/pendinginspect/index.vue | 6 - src/views/mes/wm/arrivalnotice/index.vue | 345 +++++++++++++------ src/views/mes/wm/issue/index.vue | 5 - src/views/mes/wm/itemrecpt/index.vue | 6 - src/views/mes/wm/outsourceissue/index.vue | 6 - src/views/mes/wm/outsourcerecpt/index.vue | 6 - src/views/mes/wm/package/index.vue | 4 - src/views/mes/wm/productrecpt/index.vue | 6 - src/views/mes/wm/productsalse/index.vue | 398 ++++++++++++++-------- src/views/mes/wm/rtissue/index.vue | 6 - src/views/mes/wm/rtsalse/index.vue | 6 - src/views/mes/wm/rtvendor/index.vue | 6 - src/views/mes/wm/transfer/index.vue | 4 - src/views/system/dept/index.vue | 3 - 34 files changed, 515 insertions(+), 414 deletions(-) diff --git a/src/components/dvplanSelect/index.vue b/src/components/dvplanSelect/index.vue index b8986ff..b5f3e37 100644 --- a/src/components/dvplanSelect/index.vue +++ b/src/components/dvplanSelect/index.vue @@ -77,24 +77,18 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-if="scope.row.status =='PREPARE'" - v-hasPermi="['mes:dv:checkplan:edit']" >修改 删除 停用 diff --git a/src/views/dashboard/PanelGroup.vue b/src/views/dashboard/PanelGroup.vue index 6e16dd7..85af3d2 100644 --- a/src/views/dashboard/PanelGroup.vue +++ b/src/views/dashboard/PanelGroup.vue @@ -9,7 +9,7 @@
设备总数
- + @@ -22,7 +22,7 @@
运行中
- + @@ -35,7 +35,7 @@
待机
- + @@ -48,7 +48,7 @@
故障
- + diff --git a/src/views/mes/cal/plan/index.vue b/src/views/mes/cal/plan/index.vue index c74bf34..84c3245 100644 --- a/src/views/mes/cal/plan/index.vue +++ b/src/views/mes/cal/plan/index.vue @@ -132,17 +132,13 @@ size="mini" type="text" icon="el-icon-edit" - v-if="scope.row.status =='PREPARE'" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:cal:calplan:edit']" >修改 删除 diff --git a/src/views/mes/cg/order/index.vue b/src/views/mes/cg/order/index.vue index 1d213a3..b2206ce 100644 --- a/src/views/mes/cg/order/index.vue +++ b/src/views/mes/cg/order/index.vue @@ -190,7 +190,6 @@ - - - diff --git a/src/views/mes/dv/machinerytype/index.vue b/src/views/mes/dv/machinerytype/index.vue index 684937b..4a6942a 100644 --- a/src/views/mes/dv/machinerytype/index.vue +++ b/src/views/mes/dv/machinerytype/index.vue @@ -54,15 +54,12 @@ type="text" icon="el-icon-plus" @click="handleAdd(scope.row)" - v-hasPermi="['mes:dv:machinerytype:add']" >新增 删除 diff --git a/src/views/mes/dv/maintenrecord/index.vue b/src/views/mes/dv/maintenrecord/index.vue index 86d3fb4..b9911db 100644 --- a/src/views/mes/dv/maintenrecord/index.vue +++ b/src/views/mes/dv/maintenrecord/index.vue @@ -119,16 +119,12 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-if="scope.row.status === 'PREPARE'" - v-hasPermi="['dv:maintenrecord:edit']" >修改 删除 diff --git a/src/views/mes/gys/qualification/index.vue b/src/views/mes/gys/qualification/index.vue index 9643cd0..17d5fbc 100644 --- a/src/views/mes/gys/qualification/index.vue +++ b/src/views/mes/gys/qualification/index.vue @@ -22,7 +22,10 @@ placeholder="请选择资质类型" clearable > - + + + + @@ -163,7 +166,10 @@ - + + + + diff --git a/src/views/mes/gys/record/index.vue b/src/views/mes/gys/record/index.vue index bd8341a..7a46e9d 100644 --- a/src/views/mes/gys/record/index.vue +++ b/src/views/mes/gys/record/index.vue @@ -118,8 +118,8 @@ {{ parseTime(scope.row.cooperationTime, "{y}-{m}-{d}") }} - - + + - + diff --git a/src/views/mes/md/itemtype/index.vue b/src/views/mes/md/itemtype/index.vue index b8a25f4..91fd3ea 100644 --- a/src/views/mes/md/itemtype/index.vue +++ b/src/views/mes/md/itemtype/index.vue @@ -81,12 +81,10 @@ v-hasPermi="['mes:md:itemtype:add']" >新增 删除 diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue index 2155083..1abed52 100644 --- a/src/views/mes/pro/feedback/index.vue +++ b/src/views/mes/pro/feedback/index.vue @@ -148,16 +148,12 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:pro:feedback:edit']" - v-if="scope.row.status =='PREPARE'" >修改 删除 diff --git a/src/views/mes/pro/schedule/index.vue b/src/views/mes/pro/schedule/index.vue index 9b2f6d9..a8f2827 100644 --- a/src/views/mes/pro/schedule/index.vue +++ b/src/views/mes/pro/schedule/index.vue @@ -130,9 +130,7 @@ size="mini" type="text" icon="el-icon-edit" - v-if="scope.row.status =='CONFIRMED'" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:pro:protask:edit']" >排产 diff --git a/src/views/mes/pro/workorder/bom/bom.vue b/src/views/mes/pro/workorder/bom/bom.vue index 8ee2bcc..adc8c2e 100644 --- a/src/views/mes/pro/workorder/bom/bom.vue +++ b/src/views/mes/pro/workorder/bom/bom.vue @@ -32,9 +32,7 @@ size="mini" type="text" icon="el-icon-edit" - v-if="scope.row.status == 'PREPARE'" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:pro:workorder:edit']" >修改 生成工单 diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue index c6e7b84..35bc1cd 100644 --- a/src/views/mes/pro/workorder/index.vue +++ b/src/views/mes/pro/workorder/index.vue @@ -182,33 +182,25 @@ size="mini" type="text" icon="el-icon-edit" - v-if="scope.row.status =='PREPARE'" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:pro:workorder:edit']" >修改 新增 完成 删除 修改 删除 diff --git a/src/views/mes/qc/iqc/iqc.vue b/src/views/mes/qc/iqc/iqc.vue index ac0198b..bf99c8a 100644 --- a/src/views/mes/qc/iqc/iqc.vue +++ b/src/views/mes/qc/iqc/iqc.vue @@ -181,17 +181,13 @@ size="mini" type="text" icon="el-icon-edit" - v-if="scope.row.status =='PREPARE'" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:qc:iqc:edit']" >修改 删除 修改 删除 diff --git a/src/views/mes/qc/pendinginspect/index.vue b/src/views/mes/qc/pendinginspect/index.vue index 63cdab3..035494b 100644 --- a/src/views/mes/qc/pendinginspect/index.vue +++ b/src/views/mes/qc/pendinginspect/index.vue @@ -53,24 +53,18 @@ type="text" icon="el-icon-edit" @click="handleAddIQC(scope.row)" - v-if="scope.row.qcType == 'IQC'" - v-hasPermi="['mes:qc:iqc:edit']" >来料检验 过程检验 出货检验 diff --git a/src/views/mes/wm/arrivalnotice/index.vue b/src/views/mes/wm/arrivalnotice/index.vue index d8f3afc..38ab406 100644 --- a/src/views/mes/wm/arrivalnotice/index.vue +++ b/src/views/mes/wm/arrivalnotice/index.vue @@ -1,6 +1,13 @@ diff --git a/src/views/mes/wm/issue/index.vue b/src/views/mes/wm/issue/index.vue index 3b79c50..2dae091 100644 --- a/src/views/mes/wm/issue/index.vue +++ b/src/views/mes/wm/issue/index.vue @@ -127,23 +127,18 @@ size="mini" type="text" icon="el-icon-video-play" - v-if="scope.row.status =='PREPARE'" @click="handleExecute(scope.row)" - v-hasPermi="['mes:wm:issueheader:edit']" >执行领出 修改 删除 diff --git a/src/views/mes/wm/itemrecpt/index.vue b/src/views/mes/wm/itemrecpt/index.vue index 8621bf4..2e6b7ab 100644 --- a/src/views/mes/wm/itemrecpt/index.vue +++ b/src/views/mes/wm/itemrecpt/index.vue @@ -123,25 +123,19 @@ size="mini" type="text" icon="el-icon-video-play" - v-if="scope.row.status =='PREPARE'" @click="handleExecute(scope.row)" - v-hasPermi="['mes:wm:itemrecpt:edit']" >执行入库 修改 删除 diff --git a/src/views/mes/wm/outsourceissue/index.vue b/src/views/mes/wm/outsourceissue/index.vue index 98d2d11..f46bfbe 100644 --- a/src/views/mes/wm/outsourceissue/index.vue +++ b/src/views/mes/wm/outsourceissue/index.vue @@ -105,25 +105,19 @@ size="mini" type="text" icon="el-icon-video-play" - v-if="scope.row.status =='PREPARE'" @click="handleExecute(scope.row)" - v-hasPermi="['mes:wm:outsourceissue:edit']" >执行发料 修改 删除 diff --git a/src/views/mes/wm/outsourcerecpt/index.vue b/src/views/mes/wm/outsourcerecpt/index.vue index 326a572..49b727e 100644 --- a/src/views/mes/wm/outsourcerecpt/index.vue +++ b/src/views/mes/wm/outsourcerecpt/index.vue @@ -109,25 +109,19 @@ size="mini" type="text" icon="el-icon-video-play" - v-if="scope.row.status =='PREPARE'" @click="handleExecute(scope.row)" - v-hasPermi="['mes:wm:outsourcerecpt:edit']" >执行入库 修改 删除 diff --git a/src/views/mes/wm/package/index.vue b/src/views/mes/wm/package/index.vue index 1bf2c21..52742ff 100644 --- a/src/views/mes/wm/package/index.vue +++ b/src/views/mes/wm/package/index.vue @@ -106,16 +106,12 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:wm:package:edit']" - v-if="scope.row.status =='PREPARE'" >修改 删除 diff --git a/src/views/mes/wm/productrecpt/index.vue b/src/views/mes/wm/productrecpt/index.vue index b4bc749..3e44fc2 100644 --- a/src/views/mes/wm/productrecpt/index.vue +++ b/src/views/mes/wm/productrecpt/index.vue @@ -116,25 +116,19 @@ size="mini" type="text" icon="el-icon-video-play" - v-if="scope.row.status =='PREPARE'" @click="handleExecute(scope.row)" - v-hasPermi="['mes:wm:productrecpt:edit']" >执行入库 修改 删除 diff --git a/src/views/mes/wm/productsalse/index.vue b/src/views/mes/wm/productsalse/index.vue index 9fd6d5e..f700dd8 100644 --- a/src/views/mes/wm/productsalse/index.vue +++ b/src/views/mes/wm/productsalse/index.vue @@ -1,6 +1,13 @@ diff --git a/src/views/mes/wm/rtissue/index.vue b/src/views/mes/wm/rtissue/index.vue index f59a339..c36f6bc 100644 --- a/src/views/mes/wm/rtissue/index.vue +++ b/src/views/mes/wm/rtissue/index.vue @@ -99,25 +99,19 @@ size="mini" type="text" icon="el-icon-video-play" - v-if="scope.row.status =='PREPARE'" @click="handleExecute(scope.row)" - v-hasPermi="['mes:wm:rtissue:edit']" >执行退料 修改 删除 diff --git a/src/views/mes/wm/rtsalse/index.vue b/src/views/mes/wm/rtsalse/index.vue index 64f3e00..489f313 100644 --- a/src/views/mes/wm/rtsalse/index.vue +++ b/src/views/mes/wm/rtsalse/index.vue @@ -124,24 +124,18 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-if="scope.row.status == 'PREPARE'" - v-hasPermi="['mes:wm:rtsalse:edit']" >修改 删除 执行退货 diff --git a/src/views/mes/wm/rtvendor/index.vue b/src/views/mes/wm/rtvendor/index.vue index 9ec67b6..ad4918b 100644 --- a/src/views/mes/wm/rtvendor/index.vue +++ b/src/views/mes/wm/rtvendor/index.vue @@ -116,25 +116,19 @@ size="mini" type="text" icon="el-icon-video-play" - v-if="scope.row.status =='PREPARE'" @click="handleExecute(scope.row)" - v-hasPermi="['mes:wm:rtvendor:edit']" >执行退货 修改 删除 diff --git a/src/views/mes/wm/transfer/index.vue b/src/views/mes/wm/transfer/index.vue index 754b714..2d1f1ee 100644 --- a/src/views/mes/wm/transfer/index.vue +++ b/src/views/mes/wm/transfer/index.vue @@ -145,16 +145,12 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-if="scope.row.status == 'PREPARE'" - v-hasPermi="['mes:wm:transfer:edit']" >修改 删除 diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 704a780..7b8d693 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -83,15 +83,12 @@ type="text" icon="el-icon-plus" @click="handleAdd(scope.row)" - v-hasPermi="['system:dept:add']" >新增 删除