From e8b7070f30068ef331e8f278d4bdf4aa66987ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?= <411641505@qq.com> Date: Mon, 16 Oct 2023 19:16:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/cal/plan/shift.vue | 10 +++++----- src/views/mes/dv/checkplan/machinery.vue | 6 +++--- src/views/mes/dv/checkplan/subject.vue | 6 +++--- src/views/mes/dv/machinerytype/index.vue | 14 -------------- src/views/mes/md/client/index.vue | 12 ++++++------ src/views/mes/md/mditem/components/itembom.vue | 8 ++++---- src/views/mes/md/mditem/components/sop.vue | 2 +- src/views/mes/md/mditem/index.vue | 14 +++++++------- src/views/mes/md/unitmeasure/index.vue | 12 ++++++------ src/views/mes/md/vendor/index.vue | 12 ++++++------ src/views/mes/md/workshop/index.vue | 10 +++++----- .../mes/md/workstation/components/machine.vue | 2 +- src/views/mes/md/workstation/components/tool.vue | 4 ++-- src/views/mes/md/workstation/components/worker.vue | 4 ++-- src/views/mes/pro/process/content.vue | 12 ++++++------ src/views/mes/pro/process/index.vue | 4 ++-- src/views/mes/pro/proroute/index.vue | 4 ++-- src/views/mes/pro/proroute/product.vue | 13 ++++++------- src/views/mes/pro/proroute/routeprocess.vue | 10 +++++----- src/views/mes/pro/proroute/routeproductbom.vue | 4 ++-- src/views/mes/pro/schedule/ganttedit.vue | 2 +- src/views/mes/pro/schedule/proTask.vue | 12 ++++++------ src/views/mes/pro/workorder/bom/bom.vue | 4 ++-- src/views/mes/wm/area/index.vue | 4 ++-- src/views/mes/wm/itemconsume/index.vue | 12 ++++++------ src/views/mes/wm/itemconsume/line.vue | 12 ++++++------ src/views/mes/wm/itemrecpt/line.vue | 8 ++++---- src/views/mes/wm/productproduce/index.vue | 12 ++++++------ src/views/mes/wm/productproduce/line.vue | 12 ++++++------ src/views/mes/wm/productrecpt/index.vue | 8 ++++---- src/views/mes/wm/productrecpt/line.vue | 6 +++--- src/views/mes/wm/productsalse/line.vue | 8 ++++---- src/views/mes/wm/rtsalse/index.vue | 2 +- src/views/mes/wm/transfer/line.vue | 8 ++++---- src/views/mes/wm/wmstock/index.vue | 2 +- 35 files changed, 130 insertions(+), 145 deletions(-) diff --git a/src/views/mes/cal/plan/shift.vue b/src/views/mes/cal/plan/shift.vue index c81211d..3fd05a3 100644 --- a/src/views/mes/cal/plan/shift.vue +++ b/src/views/mes/cal/plan/shift.vue @@ -8,7 +8,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['mes:cal:shift:add']" + v-hasPermi="['mes:cal:calplan:add']" >新增 @@ -19,7 +19,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['mes:cal:shift:edit']" + v-hasPermi="['mes:cal:calplan:edit']" >修改 @@ -30,7 +30,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['mes:cal:shift:remove']" + v-hasPermi="['mes:cal:calplan:remove']" >删除 @@ -52,14 +52,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:cal:shift:edit']" + v-hasPermi="['mes:cal:calplan:edit']" >修改 删除 diff --git a/src/views/mes/dv/checkplan/machinery.vue b/src/views/mes/dv/checkplan/machinery.vue index 4dde239..c3ae145 100644 --- a/src/views/mes/dv/checkplan/machinery.vue +++ b/src/views/mes/dv/checkplan/machinery.vue @@ -9,7 +9,7 @@ size="mini" v-if="optType !='view'" @click="handleAdd" - v-hasPermi="['mes:dv:checkmachinery:add']" + v-hasPermi="['mes:dv:checkplan:add']" >新增 @@ -21,7 +21,7 @@ v-if="optType !='view'" :disabled="multiple" @click="handleDelete" - v-hasPermi="['mes:dv:checkmachinery:remove']" + v-hasPermi="['mes:dv:checkplan:remove']" >删除 @@ -42,7 +42,7 @@ icon="el-icon-delete" v-if="optType !='view'" @click="handleDelete(scope.row)" - v-hasPermi="['mes:dv:checkmachinery:remove']" + v-hasPermi="['mes:dv:checkplan:remove']" >删除 diff --git a/src/views/mes/dv/checkplan/subject.vue b/src/views/mes/dv/checkplan/subject.vue index 143a140..39921c5 100644 --- a/src/views/mes/dv/checkplan/subject.vue +++ b/src/views/mes/dv/checkplan/subject.vue @@ -9,7 +9,7 @@ size="mini" @click="handleAdd" v-if="optType !='view'" - v-hasPermi="['mes:dv:checksubject:add']" + v-hasPermi="['mes:dv:checkplan:add']" >新增 @@ -21,7 +21,7 @@ :disabled="multiple" @click="handleDelete" v-if="optType !='view'" - v-hasPermi="['mes:dv:checksubject:remove']" + v-hasPermi="['mes:dv:checkplan:remove']" >删除 @@ -43,7 +43,7 @@ icon="el-icon-delete" v-if="optType !='view'" @click="handleDelete(scope.row)" - v-hasPermi="['mes:dv:checksubject:remove']" + v-hasPermi="['mes:dv:checkplan:remove']" >删除 diff --git a/src/views/mes/dv/machinerytype/index.vue b/src/views/mes/dv/machinerytype/index.vue index 3b865ce..9db8201 100644 --- a/src/views/mes/dv/machinerytype/index.vue +++ b/src/views/mes/dv/machinerytype/index.vue @@ -25,20 +25,6 @@ - - - 新增 - - - - 新增 @@ -89,7 +89,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['md:md:client:edit']" + v-hasPermi="['mes:md:client:edit']" >修改 @@ -100,7 +100,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['md:md:client:remove']" + v-hasPermi="['mes:md:client:remove']" >删除 @@ -110,7 +110,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['md:md:client:export']" + v-hasPermi="['mes:md:client:export']" >导出 @@ -149,14 +149,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['md:md:client:edit']" + v-hasPermi="['mes:md:client:edit']" >修改 删除 diff --git a/src/views/mes/md/mditem/components/itembom.vue b/src/views/mes/md/mditem/components/itembom.vue index cce08df..6402928 100644 --- a/src/views/mes/md/mditem/components/itembom.vue +++ b/src/views/mes/md/mditem/components/itembom.vue @@ -8,7 +8,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['mes:md:bom:add']" + v-hasPermi="['mes:md:mditem:add']" >新增 @@ -20,7 +20,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['mes:md:bom:remove']" + v-hasPermi="['mes:md:mditem:remove']" >删除 @@ -41,14 +41,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:md:bom:edit']" + v-hasPermi="['mes:md:mditem:edit']" >修改 删除 diff --git a/src/views/mes/md/mditem/components/sop.vue b/src/views/mes/md/mditem/components/sop.vue index 120a3f1..ed48944 100644 --- a/src/views/mes/md/mditem/components/sop.vue +++ b/src/views/mes/md/mditem/components/sop.vue @@ -8,7 +8,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['mes:md:sop:add']" + v-hasPermi="['mes:md:mditem:add']" >新增 diff --git a/src/views/mes/md/mditem/index.vue b/src/views/mes/md/mditem/index.vue index cb0b27e..3866b9c 100644 --- a/src/views/mes/md/mditem/index.vue +++ b/src/views/mes/md/mditem/index.vue @@ -60,7 +60,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['mes:md:item:add']" + v-hasPermi="['mes:md:mditem:add']" >新增 @@ -71,7 +71,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['mes:md:item:edit']" + v-hasPermi="['mes:md:mditem:edit']" >修改 @@ -82,7 +82,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['mes:md:item:remove']" + v-hasPermi="['mes:md:mditem:remove']" >删除 @@ -92,7 +92,7 @@ icon="el-icon-upload2" size="mini" @click="handleImport" - v-hasPermi="['mes:md:item:import']" + v-hasPermi="['mes:md:mditem:import']" >导入 @@ -102,7 +102,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['mes:md:item:export']" + v-hasPermi="['mes:md:mditem:export']" >导出 @@ -158,14 +158,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:md:item:edit']" + v-hasPermi="['mes:md:mditem:edit']" >修改 删除 diff --git a/src/views/mes/md/unitmeasure/index.vue b/src/views/mes/md/unitmeasure/index.vue index 86b8702..7dcdde3 100644 --- a/src/views/mes/md/unitmeasure/index.vue +++ b/src/views/mes/md/unitmeasure/index.vue @@ -31,7 +31,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['mes:unitmeasure:add']" + v-hasPermi="['mes:md:unitmeasure:add']" >新增 @@ -42,7 +42,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['mes:unitmeasure:edit']" + v-hasPermi="['mes:md:unitmeasure:edit']" >修改 @@ -53,7 +53,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['mes:unitmeasure:remove']" + v-hasPermi="['mes:md:unitmeasure:remove']" >删除 @@ -63,7 +63,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['mes:unitmeasure:export']" + v-hasPermi="['mes:md:unitmeasure:export']" >导出 @@ -92,14 +92,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:unitmeasure:edit']" + v-hasPermi="['mes:md:unitmeasure:edit']" >修改 删除 diff --git a/src/views/mes/md/vendor/index.vue b/src/views/mes/md/vendor/index.vue index 81740d8..4fafb6f 100644 --- a/src/views/mes/md/vendor/index.vue +++ b/src/views/mes/md/vendor/index.vue @@ -78,7 +78,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['md:vendor:add']" + v-hasPermi="['mes:md:vendor:add']" >新增 @@ -89,7 +89,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['md:vendor:edit']" + v-hasPermi="['mes:md:vendor:edit']" >修改 @@ -100,7 +100,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['md:vendor:remove']" + v-hasPermi="['mes:md:vendor:remove']" >删除 @@ -110,7 +110,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['md:vendor:export']" + v-hasPermi="['mes:md:vendor:export']" >导出 @@ -149,14 +149,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['md:vendor:edit']" + v-hasPermi="['mes:md:vendor:edit']" >修改 删除 diff --git a/src/views/mes/md/workshop/index.vue b/src/views/mes/md/workshop/index.vue index 5acc706..15d2f4f 100644 --- a/src/views/mes/md/workshop/index.vue +++ b/src/views/mes/md/workshop/index.vue @@ -31,7 +31,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['md:workshop:add']" + v-hasPermi="['mes:md:workshop:add']" >新增 @@ -42,7 +42,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['md:workshop:edit']" + v-hasPermi="['mes:md:workshop:edit']" >修改 @@ -53,7 +53,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['md:workshop:remove']" + v-hasPermi="['mes:md:workshop:remove']" >删除 @@ -86,14 +86,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['md:workshop:edit']" + v-hasPermi="['mes:md:workshop:edit']" >修改 删除 diff --git a/src/views/mes/md/workstation/components/machine.vue b/src/views/mes/md/workstation/components/machine.vue index 1369240..6d12b70 100644 --- a/src/views/mes/md/workstation/components/machine.vue +++ b/src/views/mes/md/workstation/components/machine.vue @@ -10,7 +10,7 @@ type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" - v-hasPermi="['md:workstationmachine:remove']" + v-hasPermi="['mes:md:workstation:remove']" >删除 diff --git a/src/views/mes/md/workstation/components/tool.vue b/src/views/mes/md/workstation/components/tool.vue index 0ce5a0b..8e2680e 100644 --- a/src/views/mes/md/workstation/components/tool.vue +++ b/src/views/mes/md/workstation/components/tool.vue @@ -10,14 +10,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:md:workstationtool:edit']" + v-hasPermi="['mes:md:workstation:edit']" >修改 删除 diff --git a/src/views/mes/md/workstation/components/worker.vue b/src/views/mes/md/workstation/components/worker.vue index e99f446..d1fd8b3 100644 --- a/src/views/mes/md/workstation/components/worker.vue +++ b/src/views/mes/md/workstation/components/worker.vue @@ -10,14 +10,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:md:workstationworker:edit']" + v-hasPermi="['mes:md:workstation:edit']" >修改 删除 diff --git a/src/views/mes/pro/process/content.vue b/src/views/mes/pro/process/content.vue index aa6feea..59866be 100644 --- a/src/views/mes/pro/process/content.vue +++ b/src/views/mes/pro/process/content.vue @@ -8,7 +8,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['mes:pro:processcontent:add']" + v-hasPermi="['mes:pro:process:add']" >新增 @@ -19,7 +19,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['mes:pro:processcontent:edit']" + v-hasPermi="['mes:pro:process:edit']" >修改 @@ -30,7 +30,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['mes:pro:processcontent:remove']" + v-hasPermi="['mes:pro:process:remove']" >删除 @@ -40,7 +40,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['mes:pro:processcontent:export']" + v-hasPermi="['mes:pro:process:export']" >导出 @@ -60,14 +60,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:pro:processcontent:edit']" + v-hasPermi="['mes:pro:process:edit']" >修改 删除 diff --git a/src/views/mes/pro/process/index.vue b/src/views/mes/pro/process/index.vue index d973059..ecc9649 100644 --- a/src/views/mes/pro/process/index.vue +++ b/src/views/mes/pro/process/index.vue @@ -102,14 +102,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['pro:process:edit']" + v-hasPermi="['mes:pro:process:edit']" >修改 删除 diff --git a/src/views/mes/pro/proroute/index.vue b/src/views/mes/pro/proroute/index.vue index 67b14a8..bc08c9a 100644 --- a/src/views/mes/pro/proroute/index.vue +++ b/src/views/mes/pro/proroute/index.vue @@ -103,14 +103,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['pro:proroute:edit']" + v-hasPermi="['mes:pro:proroute:edit']" >修改 删除 diff --git a/src/views/mes/pro/proroute/product.vue b/src/views/mes/pro/proroute/product.vue index f4c8926..0b01430 100644 --- a/src/views/mes/pro/proroute/product.vue +++ b/src/views/mes/pro/proroute/product.vue @@ -31,7 +31,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['mes:pro:routeproduct:add']" + v-hasPermi="['mes:pro:proroute:add']" >新增 @@ -42,7 +42,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['mes:pro:routeproduct:edit']" + v-hasPermi="['mes:pro:proroute:edit']" >修改 @@ -53,7 +53,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['mes:pro:routeproduct:remove']" + v-hasPermi="['mes:pro:proroute:remove']" >删除 @@ -63,7 +63,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['mes:pro:routeproduct:export']" + v-hasPermi="['mes:pro:proroute:export']" >导出 @@ -83,7 +83,6 @@ - diff --git a/src/views/mes/pro/proroute/routeprocess.vue b/src/views/mes/pro/proroute/routeprocess.vue index 94e4608..41ecf43 100644 --- a/src/views/mes/pro/proroute/routeprocess.vue +++ b/src/views/mes/pro/proroute/routeprocess.vue @@ -8,7 +8,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['pro:routeprocess:add']" + v-hasPermi="['mes:pro:proroute:add']" >新增 @@ -19,7 +19,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['pro:routeprocess:edit']" + v-hasPermi="['mes:pro:proroute:edit']" >修改 @@ -30,7 +30,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['pro:routeprocess:remove']" + v-hasPermi="['mes:pro:proroute:remove']" >删除 @@ -71,14 +71,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:pro:routeprocess:edit']" + v-hasPermi="['mes:pro:proroute:edit']" >修改 删除 diff --git a/src/views/mes/pro/proroute/routeproductbom.vue b/src/views/mes/pro/proroute/routeproductbom.vue index 8dc2164..9bd2c23 100644 --- a/src/views/mes/pro/proroute/routeproductbom.vue +++ b/src/views/mes/pro/proroute/routeproductbom.vue @@ -39,14 +39,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['pro:proroute:edit']" + v-hasPermi="['mes:pro:proroute:edit']" >修改 删除 diff --git a/src/views/mes/pro/schedule/ganttedit.vue b/src/views/mes/pro/schedule/ganttedit.vue index c884a1b..97cdbda 100644 --- a/src/views/mes/pro/schedule/ganttedit.vue +++ b/src/views/mes/pro/schedule/ganttedit.vue @@ -9,7 +9,7 @@ icon="el-icon-edit" size="mini" @click="handleUpdate" - v-hasPermi="['mes:pro:schedule:edit']" + v-hasPermi="['mes:pro:protask:edit']" >保存 diff --git a/src/views/mes/pro/schedule/proTask.vue b/src/views/mes/pro/schedule/proTask.vue index 4651dda..e2f2c4a 100644 --- a/src/views/mes/pro/schedule/proTask.vue +++ b/src/views/mes/pro/schedule/proTask.vue @@ -8,7 +8,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['pro:protask:add']" + v-hasPermi="['mes:pro:protask:add']" >新增 @@ -19,7 +19,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['pro:protask:edit']" + v-hasPermi="['mes:pro:protask:edit']" >修改 @@ -30,7 +30,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['pro:protask:remove']" + v-hasPermi="['mes:pro:protask:remove']" >删除 @@ -40,7 +40,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['pro:protask:export']" + v-hasPermi="['mes:pro:protask:export']" >导出 @@ -77,14 +77,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['pro:protask:edit']" + 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 a6eafd6..42399f1 100644 --- a/src/views/mes/pro/workorder/bom/bom.vue +++ b/src/views/mes/pro/workorder/bom/bom.vue @@ -8,7 +8,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['mes:pro:workorderbom:export']" + v-hasPermi="['mes:pro:workorder:export']" >导出 @@ -34,7 +34,7 @@ icon="el-icon-edit" v-if="scope.row.status == 'PREPARE'" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:pro:workorderbom:edit']" + v-hasPermi="['mes:pro:workorder:edit']" >修改 修改 删除 diff --git a/src/views/mes/wm/itemconsume/index.vue b/src/views/mes/wm/itemconsume/index.vue index f5ea526..b143c3b 100644 --- a/src/views/mes/wm/itemconsume/index.vue +++ b/src/views/mes/wm/itemconsume/index.vue @@ -129,7 +129,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['wm:itemconsume:add']" + v-hasPermi="['mes:wm:itemconsume:add']" >新增 @@ -140,7 +140,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['wm:itemconsume:edit']" + v-hasPermi="['mes:wm:itemconsume:edit']" >修改 @@ -151,7 +151,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['wm:itemconsume:remove']" + v-hasPermi="['mes:wm:itemconsume:remove']" >删除 @@ -161,7 +161,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['wm:itemconsume:export']" + v-hasPermi="['mes:wm:itemconsume:export']" >导出 @@ -200,14 +200,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['wm:itemconsume:edit']" + v-hasPermi="['mes:wm:itemconsume:edit']" >修改 删除 diff --git a/src/views/mes/wm/itemconsume/line.vue b/src/views/mes/wm/itemconsume/line.vue index 0017c5e..5ab3bfc 100644 --- a/src/views/mes/wm/itemconsume/line.vue +++ b/src/views/mes/wm/itemconsume/line.vue @@ -151,7 +151,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['wm:itemconsumeline:add']" + v-hasPermi="['mes:wm:itemconsume:add']" >新增 @@ -162,7 +162,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['wm:itemconsumeline:edit']" + v-hasPermi="['mes:wm:itemconsume:edit']" >修改 @@ -173,7 +173,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['wm:itemconsumeline:remove']" + v-hasPermi="['mes:wm:itemconsume:remove']" >删除 @@ -183,7 +183,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['wm:itemconsumeline:export']" + v-hasPermi="['mes:wm:itemconsume:export']" >导出 @@ -218,14 +218,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['wm:itemconsumeline:edit']" + v-hasPermi="['mes:wm:itemconsume:edit']" >修改 删除 diff --git a/src/views/mes/wm/itemrecpt/line.vue b/src/views/mes/wm/itemrecpt/line.vue index de6f6f5..4b20b1e 100644 --- a/src/views/mes/wm/itemrecpt/line.vue +++ b/src/views/mes/wm/itemrecpt/line.vue @@ -8,7 +8,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['mes:wm:itemrecptline:add']" + v-hasPermi="['mes:wm:itemrecpt:add']" >新增 @@ -19,7 +19,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['mes:wm:itemrecptline:remove']" + v-hasPermi="['mes:wm:itemrecpt:remove']" >删除 @@ -54,14 +54,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:wm:itemrecptline:edit']" + v-hasPermi="['mes:wm:itemrecpt:edit']" >修改 删除 diff --git a/src/views/mes/wm/productproduce/index.vue b/src/views/mes/wm/productproduce/index.vue index 664318c..873a34a 100644 --- a/src/views/mes/wm/productproduce/index.vue +++ b/src/views/mes/wm/productproduce/index.vue @@ -129,7 +129,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['wm:productproduce:add']" + v-hasPermi="['mes:wm:productproduce:add']" >新增 @@ -140,7 +140,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['wm:productproduce:edit']" + v-hasPermi="['mes:wm:productproduce:edit']" >修改 @@ -151,7 +151,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['wm:productproduce:remove']" + v-hasPermi="['mes:wm:productproduce:remove']" >删除 @@ -161,7 +161,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['wm:productproduce:export']" + v-hasPermi="['mes:wm:productproduce:export']" >导出 @@ -200,14 +200,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['wm:productproduce:edit']" + v-hasPermi="['mes:wm:productproduce:edit']" >修改 删除 diff --git a/src/views/mes/wm/productproduce/line.vue b/src/views/mes/wm/productproduce/line.vue index 2f404bd..66532ec 100644 --- a/src/views/mes/wm/productproduce/line.vue +++ b/src/views/mes/wm/productproduce/line.vue @@ -143,7 +143,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['wm:productproduceline:add']" + v-hasPermi="['mes:wm:productproduce:add']" >新增 @@ -154,7 +154,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['wm:productproduceline:edit']" + v-hasPermi="['mes:wm:productproduce:edit']" >修改 @@ -165,7 +165,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['wm:productproduceline:remove']" + v-hasPermi="['mes:wm:productproduce:remove']" >删除 @@ -175,7 +175,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['wm:productproduceline:export']" + v-hasPermi="['mes:wm:productproduce:export']" >导出 @@ -209,14 +209,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['wm:productproduceline:edit']" + v-hasPermi="['mes:wm:productproduce:edit']" >修改 删除 diff --git a/src/views/mes/wm/productrecpt/index.vue b/src/views/mes/wm/productrecpt/index.vue index d73cddb..04eb9f3 100644 --- a/src/views/mes/wm/productrecpt/index.vue +++ b/src/views/mes/wm/productrecpt/index.vue @@ -47,7 +47,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['wm:productrecpt:add']" + v-hasPermi="['mes:wm:productrecpt:add']" >新增 @@ -58,7 +58,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['wm:productrecpt:edit']" + v-hasPermi="['mes:wm:productrecpt:edit']" >修改 @@ -69,7 +69,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['wm:productrecpt:remove']" + v-hasPermi="['mes:wm:productrecpt:remove']" >删除 @@ -79,7 +79,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['wm:productrecpt:export']" + v-hasPermi="['mes:wm:productrecpt:export']" >导出 diff --git a/src/views/mes/wm/productrecpt/line.vue b/src/views/mes/wm/productrecpt/line.vue index 6232b40..61110d9 100644 --- a/src/views/mes/wm/productrecpt/line.vue +++ b/src/views/mes/wm/productrecpt/line.vue @@ -8,7 +8,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['wm:productrecptline:add']" + v-hasPermi="['mes:wm:productrecpt:add']" >新增 @@ -57,7 +57,7 @@ icon="el-icon-edit" @click="handleUpdate(scope.row)" v-if="optType != 'view'" - v-hasPermi="['wm:productrecptline:edit']" + v-hasPermi="['mes:wm:productrecpt:edit']" >修改 删除 diff --git a/src/views/mes/wm/productsalse/line.vue b/src/views/mes/wm/productsalse/line.vue index adeb0ff..b43549f 100644 --- a/src/views/mes/wm/productsalse/line.vue +++ b/src/views/mes/wm/productsalse/line.vue @@ -8,7 +8,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['mes:wm:productsalseline:add']" + v-hasPermi="['mes:wm:productsalse:add']" >新增 @@ -19,7 +19,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['mes:wm:productsalseline:edit']" + v-hasPermi="['mes:wm:productsalse:edit']" >修改 @@ -30,7 +30,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['mes:wm:productsalseline:remove']" + v-hasPermi="['mes:wm:productsalse:remove']" >删除 @@ -62,7 +62,7 @@ icon="el-icon-delete" @click="handleDelete(scope.row)" v-if="optType != 'view'" - v-hasPermi="['mes:wm:productsalseline:remove']" + v-hasPermi="['mes:wm:productsalse:remove']" >删除 diff --git a/src/views/mes/wm/rtsalse/index.vue b/src/views/mes/wm/rtsalse/index.vue index 003fa00..22081ed 100644 --- a/src/views/mes/wm/rtsalse/index.vue +++ b/src/views/mes/wm/rtsalse/index.vue @@ -141,7 +141,7 @@ icon="el-icon-video-play" @click="handleExecute(scope.row)" v-if="scope.row.status == 'PREPARE'" - v-hasPermi="['mes:wm:productsalse:edit']" + v-hasPermi="['mes:wm:rtsalse:edit']" >执行退货 diff --git a/src/views/mes/wm/transfer/line.vue b/src/views/mes/wm/transfer/line.vue index 2a2132a..7da205b 100644 --- a/src/views/mes/wm/transfer/line.vue +++ b/src/views/mes/wm/transfer/line.vue @@ -9,7 +9,7 @@ size="mini" @click="handleAdd" v-if="optType != 'view'" - v-hasPermi="['mes:wm:transferline:add']" + v-hasPermi="['mes:wm:transfer:add']" >新增 @@ -22,7 +22,7 @@ :disabled="multiple" @click="handleDelete" v-if="optType != 'view'" - v-hasPermi="['mes:wm:transferline:remove']" + v-hasPermi="['mes:wm:transfer:remove']" >删除 @@ -52,14 +52,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:wm:transferline:edit']" + v-hasPermi="['mes:wm:transfer:edit']" >修改 删除 diff --git a/src/views/mes/wm/wmstock/index.vue b/src/views/mes/wm/wmstock/index.vue index 6335191..a2544e6 100644 --- a/src/views/mes/wm/wmstock/index.vue +++ b/src/views/mes/wm/wmstock/index.vue @@ -97,7 +97,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['wm:wmstock:export']" + v-hasPermi="['mes:wm:wmstock:export']" >导出 From d5b40634bdd9fbaf72b688173bc4788032c28048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?= <411641505@qq.com> Date: Wed, 18 Oct 2023 22:03:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=BE=85=E6=A3=80=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/qc/pending.js | 11 + src/router/index.js | 29 ++ src/views/mes/qc/pendinginspect/index.vue | 176 ++++++++++ src/views/mes/qc/pendinginspect/iqc.vue | 341 ++++++++++++++++++++ src/views/mes/qc/pendinginspect/oqc.vue | 0 src/views/mes/qc/pendinginspect/pqc.vue | 373 ++++++++++++++++++++++ src/views/mes/wm/warehouse/index.vue | 2 +- src/views/system/user/authRole.vue | 2 +- 8 files changed, 932 insertions(+), 2 deletions(-) create mode 100644 src/api/mes/qc/pending.js create mode 100644 src/views/mes/qc/pendinginspect/index.vue create mode 100644 src/views/mes/qc/pendinginspect/iqc.vue create mode 100644 src/views/mes/qc/pendinginspect/oqc.vue create mode 100644 src/views/mes/qc/pendinginspect/pqc.vue diff --git a/src/api/mes/qc/pending.js b/src/api/mes/qc/pending.js new file mode 100644 index 0000000..5fefefc --- /dev/null +++ b/src/api/mes/qc/pending.js @@ -0,0 +1,11 @@ +import request from '@/utils/request' + +// 查询待检验任务清单 +export function listPending(query) { + return request({ + url: '/mes/qc/pending/list', + method: 'get', + params: query + }) +} + diff --git a/src/router/index.js b/src/router/index.js index 9de281e..c39291a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -217,6 +217,35 @@ export const dynamicRoutes = [ meta: { title: '修改生成配置', activeMenu: '/tool/gen' } } ] + }, + { + path: '/mes/qc/pendinginspect/add', + component: Layout, + hidden: true, + permissions: ['mes:qc:pending'], + children: [ + { + path: 'iqc', + component: () => import('@/views/mes/qc/iqc/iqc'), + name: 'iqcadd', + props: true, + meta: {title: '来料检验', activeMenu: '/mes/qc/pendinginspect/iqc'} + }, + { + path: 'pqc', + component: () => import('@/views/mes/qc/pendinginspect/pqc'), + name: 'pqcadd', + props: true, + meta: {title: '过程检验', activeMenu: '/mes/qc/pendinginspect/pqc'} + }, + { + path: 'oqc', + component: () => import('@/views/mes/qc/oqc/index'), + name: 'oqcadd', + props: true, + meta: {title: '出厂检验', activeMenu: '/mes/qc/pendinginspect/oqc'} + } + ] } ] diff --git a/src/views/mes/qc/pendinginspect/index.vue b/src/views/mes/qc/pendinginspect/index.vue new file mode 100644 index 0000000..41ce265 --- /dev/null +++ b/src/views/mes/qc/pendinginspect/index.vue @@ -0,0 +1,176 @@ + + + + \ No newline at end of file diff --git a/src/views/mes/qc/pendinginspect/iqc.vue b/src/views/mes/qc/pendinginspect/iqc.vue new file mode 100644 index 0000000..47c78de --- /dev/null +++ b/src/views/mes/qc/pendinginspect/iqc.vue @@ -0,0 +1,341 @@ + + + \ No newline at end of file diff --git a/src/views/mes/qc/pendinginspect/oqc.vue b/src/views/mes/qc/pendinginspect/oqc.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/mes/qc/pendinginspect/pqc.vue b/src/views/mes/qc/pendinginspect/pqc.vue new file mode 100644 index 0000000..a918d5a --- /dev/null +++ b/src/views/mes/qc/pendinginspect/pqc.vue @@ -0,0 +1,373 @@ + + \ No newline at end of file diff --git a/src/views/mes/wm/warehouse/index.vue b/src/views/mes/wm/warehouse/index.vue index 59d4bbb..217ad7b 100644 --- a/src/views/mes/wm/warehouse/index.vue +++ b/src/views/mes/wm/warehouse/index.vue @@ -53,7 +53,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['wm:warehouse:remove']" + v-hasPermi="['mes:wm:warehouse:remove']" >删除 diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue index ab5e72f..1dbad4b 100644 --- a/src/views/system/user/authRole.vue +++ b/src/views/system/user/authRole.vue @@ -109,7 +109,7 @@ export default { }, /** 关闭按钮 */ close() { - const obj = { path: "/system/user" }; + const obj = { path: "/user/user" }; this.$tab.closeOpenPage(obj); }, }, From 7c11333dfda4506e28973ac0636100a70e91afa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?= <411641505@qq.com> Date: Fri, 20 Oct 2023 09:30:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=BE=85=E6=A3=80?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/qc/pendinginspect/iqc.vue | 14 +- src/views/mes/qc/pendinginspect/oqc.vue | 330 ++++++++++++++++++++++++ src/views/mes/qc/pendinginspect/pqc.vue | 2 +- 3 files changed, 338 insertions(+), 8 deletions(-) diff --git a/src/views/mes/qc/pendinginspect/iqc.vue b/src/views/mes/qc/pendinginspect/iqc.vue index 47c78de..9dc9b36 100644 --- a/src/views/mes/qc/pendinginspect/iqc.vue +++ b/src/views/mes/qc/pendinginspect/iqc.vue @@ -177,7 +177,7 @@ 返回 保 存 - 完成 + 完成 取 消 @@ -231,13 +231,13 @@ export default { } }, created() { - this.getList(); + this.reset(); }, methods: { // 取消按钮 cancel() { - this.open = false; - this.reset(); + const obj = { path: "/mes/qc/pendinginspect" }; + this.$tab.closeOpenPage(obj); }, // 表单重置 reset() { @@ -272,7 +272,7 @@ export default { majQuantity: null, minQuantity: null, checkResult: null, - reciveDate: null, + reciveDate: this.$route.params.recordTime, inspectDate: null, inspector: null, status: "PREPARE", @@ -317,9 +317,9 @@ export default { this.$refs["form"].validate(valid => { if (valid) { this.$modal.confirm('是否完成来料检验单编制？【完成后将不能更改】').then(function(){ - that.form.status = 'CONFIRMED'; + that.form.status = 'FINISHED'; that.submitForm(); - that.open = false; + that.cancel(); }); } }); diff --git a/src/views/mes/qc/pendinginspect/oqc.vue b/src/views/mes/qc/pendinginspect/oqc.vue index e69de29..4b0203d 100644 --- a/src/views/mes/qc/pendinginspect/oqc.vue +++ b/src/views/mes/qc/pendinginspect/oqc.vue @@ -0,0 +1,330 @@ + + \ No newline at end of file diff --git a/src/views/mes/qc/pendinginspect/pqc.vue b/src/views/mes/qc/pendinginspect/pqc.vue index a918d5a..aa96f6d 100644 --- a/src/views/mes/qc/pendinginspect/pqc.vue +++ b/src/views/mes/qc/pendinginspect/pqc.vue @@ -351,7 +351,7 @@ export default { this.$refs["form"].validate(valid => { if (valid) { this.$modal.confirm('是否完成检验单编制？【完成后将不能更改】').then(function(){ - that.form.status = 'CONFIRMED'; + that.form.status = 'FINISHED'; that.submitForm(); that.cancel(); });