From 2e6b9aaba821fd57f3d56a49f73f207227942e9b 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: Sun, 29 Oct 2023 23:04:54 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/pro/schedule/index.vue | 1 + src/views/mes/pro/workorder/index.vue | 77 ++++++++++++++++++++++++--- 2 files changed, 71 insertions(+), 7 deletions(-) diff --git a/src/views/mes/pro/schedule/index.vue b/src/views/mes/pro/schedule/index.vue index 57604d0..2f475dc 100644 --- a/src/views/mes/pro/schedule/index.vue +++ b/src/views/mes/pro/schedule/index.vue @@ -322,6 +322,7 @@ export default { pageSize: 10, workorderCode: null, workorderName: null, + workorderType: 'SELF', //这里的排产要排除自产之外的外协和外购 orderSource: null, sourceCode: null, productId: null, diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue index 6aee0e8..51ff35d 100644 --- a/src/views/mes/pro/workorder/index.vue +++ b/src/views/mes/pro/workorder/index.vue @@ -59,6 +59,14 @@ @keyup.enter.native="handleQuery" /> + + + + + + @@ -143,7 +143,7 @@ export default { }, props: { optType: undefined, - workorder: undefined + workorder: undefined, }, created() { this.getList(); diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue index 51ff35d..fc7a94e 100644 --- a/src/views/mes/pro/workorder/index.vue +++ b/src/views/mes/pro/workorder/index.vue @@ -190,7 +190,7 @@ size="mini" type="text" icon="el-icon-plus" - v-if="scope.row.status =='CONFIRMED'" + v-if="scope.row.status =='CONFIRMED' && scope.row.workorderType =='SELF'" @click="handleAdd(scope.row)" v-hasPermi="['mes:pro:workorder:update']" >新增 From b56400ec0e24b1571bcca1078b2da2bb53d5a410 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, 30 Oct 2023 22:50:53 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/workorderSelect/single.vue | 4 ++++ src/views/mes/wm/issue/index.vue | 2 +- src/views/mes/wm/itemrecpt/index.vue | 3 +-- src/views/mes/wm/productrecpt/index.vue | 2 +- src/views/mes/wm/rtissue/index.vue | 2 +- src/views/mes/wm/rtvendor/index.vue | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/components/workorderSelect/single.vue b/src/components/workorderSelect/single.vue index 583a055..03d5697 100644 --- a/src/components/workorderSelect/single.vue +++ b/src/components/workorderSelect/single.vue @@ -103,6 +103,9 @@ name: 'WorkOrderSelectSingle', components: {}, dicts: ['mes_order_status','mes_workorder_sourcetype'], + props:{ + workorder: undefined //外部传入的工单过滤信息 + }, data() { return { showFlag: false, @@ -129,6 +132,7 @@ queryParams: { workorderCode: null, workorderName: null, + workorderType: this.workorder.workorderType, orderSource: null, sourceCode: null, productId: null, diff --git a/src/views/mes/wm/issue/index.vue b/src/views/mes/wm/issue/index.vue index d1748fb..9c4e229 100644 --- a/src/views/mes/wm/issue/index.vue +++ b/src/views/mes/wm/issue/index.vue @@ -125,7 +125,7 @@ { - debugger; this.form = response.data; this.warehouseInfo[0] = response.data.warehouseId; this.warehouseInfo[1] = response.data.locationId; diff --git a/src/views/mes/wm/productrecpt/index.vue b/src/views/mes/wm/productrecpt/index.vue index 04eb9f3..1a6030c 100644 --- a/src/views/mes/wm/productrecpt/index.vue +++ b/src/views/mes/wm/productrecpt/index.vue @@ -107,7 +107,7 @@ Date: Mon, 30 Oct 2023 22:51:22 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E5=8F=91=E6=96=99?= =?UTF-8?q?=E5=92=8C=E5=A4=96=E5=8D=8F=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/wm/oursourcerecptline.js | 44 ++ src/api/mes/wm/outsourceissue.js | 52 +++ src/api/mes/wm/outsourceissueline.js | 44 ++ src/api/mes/wm/outsourcerecpt.js | 44 ++ src/views/mes/wm/outsourceissue/index.vue | 507 ++++++++++++++++++++++ src/views/mes/wm/outsourceissue/line.vue | 368 ++++++++++++++++ src/views/mes/wm/outsourcerecpt/index.vue | 456 +++++++++++++++++++ src/views/mes/wm/outsourcerecpt/line.vue | 442 +++++++++++++++++++ 8 files changed, 1957 insertions(+) create mode 100644 src/api/mes/wm/oursourcerecptline.js create mode 100644 src/api/mes/wm/outsourceissue.js create mode 100644 src/api/mes/wm/outsourceissueline.js create mode 100644 src/api/mes/wm/outsourcerecpt.js create mode 100644 src/views/mes/wm/outsourceissue/index.vue create mode 100644 src/views/mes/wm/outsourceissue/line.vue create mode 100644 src/views/mes/wm/outsourcerecpt/index.vue create mode 100644 src/views/mes/wm/outsourcerecpt/line.vue diff --git a/src/api/mes/wm/oursourcerecptline.js b/src/api/mes/wm/oursourcerecptline.js new file mode 100644 index 0000000..ae07149 --- /dev/null +++ b/src/api/mes/wm/oursourcerecptline.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询外协入库单行列表 +export function listOursourcerecptline(query) { + return request({ + url: '/mes/wm/oursourcerecptline/list', + method: 'get', + params: query + }) +} + +// 查询外协入库单行详细 +export function getOursourcerecptline(lineId) { + return request({ + url: '/mes/wm/oursourcerecptline/' + lineId, + method: 'get' + }) +} + +// 新增外协入库单行 +export function addOursourcerecptline(data) { + return request({ + url: '/mes/wm/oursourcerecptline', + method: 'post', + data: data + }) +} + +// 修改外协入库单行 +export function updateOursourcerecptline(data) { + return request({ + url: '/mes/wm/oursourcerecptline', + method: 'put', + data: data + }) +} + +// 删除外协入库单行 +export function delOursourcerecptline(lineId) { + return request({ + url: '/mes/wm/oursourcerecptline/' + lineId, + method: 'delete' + }) +} diff --git a/src/api/mes/wm/outsourceissue.js b/src/api/mes/wm/outsourceissue.js new file mode 100644 index 0000000..1baab0d --- /dev/null +++ b/src/api/mes/wm/outsourceissue.js @@ -0,0 +1,52 @@ +import request from '@/utils/request' + +// 查询外协领料单头列表 +export function listOutsourceissue(query) { + return request({ + url: '/mes/wm/outsourceissue/list', + method: 'get', + params: query + }) +} + +// 查询外协领料单头详细 +export function getOutsourceissue(issueId) { + return request({ + url: '/mes/wm/outsourceissue/' + issueId, + method: 'get' + }) +} + +// 新增外协领料单头 +export function addOutsourceissue(data) { + return request({ + url: '/mes/wm/outsourceissue', + method: 'post', + data: data + }) +} + +// 修改外协领料单头 +export function updateOutsourceissue(data) { + return request({ + url: '/mes/wm/outsourceissue', + method: 'put', + data: data + }) +} + +// 删除外协领料单头 +export function delOutsourceissue(issueId) { + return request({ + url: '/mes/wm/outsourceissue/' + issueId, + method: 'delete' + }) +} + +//执行发料 +export function execute(issueId) { + return request({ + url: '/mes/wm/outsourceissue/' + issueId, + method: 'put' + }) +} \ No newline at end of file diff --git a/src/api/mes/wm/outsourceissueline.js b/src/api/mes/wm/outsourceissueline.js new file mode 100644 index 0000000..4d31a80 --- /dev/null +++ b/src/api/mes/wm/outsourceissueline.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询外协领料单行列表 +export function listOutsourceissueline(query) { + return request({ + url: '/mes/wm/outsourceissueline/list', + method: 'get', + params: query + }) +} + +// 查询外协领料单行详细 +export function getOutsourceissueline(lineId) { + return request({ + url: '/mes/wm/outsourceissueline/' + lineId, + method: 'get' + }) +} + +// 新增外协领料单行 +export function addOutsourceissueline(data) { + return request({ + url: '/mes/wm/outsourceissueline', + method: 'post', + data: data + }) +} + +// 修改外协领料单行 +export function updateOutsourceissueline(data) { + return request({ + url: '/mes/wm/outsourceissueline', + method: 'put', + data: data + }) +} + +// 删除外协领料单行 +export function delOutsourceissueline(lineId) { + return request({ + url: '/mes/wm/outsourceissueline/' + lineId, + method: 'delete' + }) +} diff --git a/src/api/mes/wm/outsourcerecpt.js b/src/api/mes/wm/outsourcerecpt.js new file mode 100644 index 0000000..7c63954 --- /dev/null +++ b/src/api/mes/wm/outsourcerecpt.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询外协入库单列表 +export function listOutsourcerecpt(query) { + return request({ + url: '/mes/wm/outsourcerecpt/list', + method: 'get', + params: query + }) +} + +// 查询外协入库单详细 +export function getOutsourcerecpt(recptId) { + return request({ + url: '/mes/wm/outsourcerecpt/' + recptId, + method: 'get' + }) +} + +// 新增外协入库单 +export function addOutsourcerecpt(data) { + return request({ + url: '/mes/wm/outsourcerecpt', + method: 'post', + data: data + }) +} + +// 修改外协入库单 +export function updateOutsourcerecpt(data) { + return request({ + url: '/mes/wm/outsourcerecpt', + method: 'put', + data: data + }) +} + +// 删除外协入库单 +export function delOutsourcerecpt(recptId) { + return request({ + url: '/mes/wm/outsourcerecpt/' + recptId, + method: 'delete' + }) +} diff --git a/src/views/mes/wm/outsourceissue/index.vue b/src/views/mes/wm/outsourceissue/index.vue new file mode 100644 index 0000000..7598b36 --- /dev/null +++ b/src/views/mes/wm/outsourceissue/index.vue @@ -0,0 +1,507 @@ + + + diff --git a/src/views/mes/wm/outsourceissue/line.vue b/src/views/mes/wm/outsourceissue/line.vue new file mode 100644 index 0000000..6dad54b --- /dev/null +++ b/src/views/mes/wm/outsourceissue/line.vue @@ -0,0 +1,368 @@ + + + diff --git a/src/views/mes/wm/outsourcerecpt/index.vue b/src/views/mes/wm/outsourcerecpt/index.vue new file mode 100644 index 0000000..d2587a5 --- /dev/null +++ b/src/views/mes/wm/outsourcerecpt/index.vue @@ -0,0 +1,456 @@ + + + diff --git a/src/views/mes/wm/outsourcerecpt/line.vue b/src/views/mes/wm/outsourcerecpt/line.vue new file mode 100644 index 0000000..d430b15 --- /dev/null +++ b/src/views/mes/wm/outsourcerecpt/line.vue @@ -0,0 +1,442 @@ + + + From 1f6ca71eb822f8272c8b24f62e4ee9e691f6207d 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: Tue, 31 Oct 2023 21:58:13 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E6=A0=B8=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/md/sip.js | 44 ++++ src/api/mes/wm/outsourcerecpt.js | 9 + src/router/index.js | 2 +- src/views/mes/md/mditem/components/sip.vue | 231 +++++++++++++++++++++ src/views/mes/wm/outsourceissue/index.vue | 2 + src/views/mes/wm/outsourcerecpt/index.vue | 14 +- src/views/mes/wm/stocktaking/index.vue | 165 ++++----------- src/views/mes/wm/stocktaking/line.vue | 6 +- src/views/mes/wm/stocktaking/result.vue | 6 +- 9 files changed, 356 insertions(+), 123 deletions(-) create mode 100644 src/api/mes/md/sip.js create mode 100644 src/views/mes/md/mditem/components/sip.vue diff --git a/src/api/mes/md/sip.js b/src/api/mes/md/sip.js new file mode 100644 index 0000000..8f4d7e7 --- /dev/null +++ b/src/api/mes/md/sip.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询产品Sip列表 +export function listSip(query) { + return request({ + url: '/mes/md/sip/list', + method: 'get', + params: query + }) +} + +// 查询产品Sip详细 +export function getSip(sipId) { + return request({ + url: '/mes/md/sip/' + sipId, + method: 'get' + }) +} + +// 新增产品Sip +export function addSip(data) { + return request({ + url: '/mes/md/sip', + method: 'post', + data: data + }) +} + +// 修改产品Sip +export function updateSip(data) { + return request({ + url: '/mes/md/sip', + method: 'put', + data: data + }) +} + +// 删除产品Sip +export function delSip(sipId) { + return request({ + url: '/mes/md/sip/' + sipId, + method: 'delete' + }) +} diff --git a/src/api/mes/wm/outsourcerecpt.js b/src/api/mes/wm/outsourcerecpt.js index 7c63954..fc8c546 100644 --- a/src/api/mes/wm/outsourcerecpt.js +++ b/src/api/mes/wm/outsourcerecpt.js @@ -42,3 +42,12 @@ export function delOutsourcerecpt(recptId) { method: 'delete' }) } + + +//执行入库 +export function execute(recptId) { + return request({ + url: '/mes/wm/outsourcerecpt/' + recptId, + method: 'put' + }) +} \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index c39291a..de1226c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -226,7 +226,7 @@ export const dynamicRoutes = [ children: [ { path: 'iqc', - component: () => import('@/views/mes/qc/iqc/iqc'), + component: () => import('@/views/mes/qc/pendinginspect/iqc'), name: 'iqcadd', props: true, meta: {title: '来料检验', activeMenu: '/mes/qc/pendinginspect/iqc'} diff --git a/src/views/mes/md/mditem/components/sip.vue b/src/views/mes/md/mditem/components/sip.vue new file mode 100644 index 0000000..ee1a1e5 --- /dev/null +++ b/src/views/mes/md/mditem/components/sip.vue @@ -0,0 +1,231 @@ + + + \ No newline at end of file diff --git a/src/views/mes/wm/outsourceissue/index.vue b/src/views/mes/wm/outsourceissue/index.vue index 7598b36..608e2a3 100644 --- a/src/views/mes/wm/outsourceissue/index.vue +++ b/src/views/mes/wm/outsourceissue/index.vue @@ -114,6 +114,7 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" + v-if="scope.row.status =='PREPARE'" 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 d2587a5..352d39f 100644 --- a/src/views/mes/wm/outsourcerecpt/index.vue +++ b/src/views/mes/wm/outsourcerecpt/index.vue @@ -117,6 +117,7 @@ size="mini" type="text" icon="el-icon-edit" + v-if="scope.row.status =='PREPARE'" @click="handleUpdate(scope.row)" v-hasPermi="['mes:wm:outsourcerecpt:edit']" >修改 @@ -124,6 +125,7 @@ size="mini" type="text" icon="el-icon-delete" + v-if="scope.row.status =='PREPARE'" @click="handleDelete(scope.row)" v-hasPermi="['mes:wm:outsourcerecpt:remove']" >删除 @@ -243,7 +245,7 @@ diff --git a/src/views/mes/wm/stocktaking/line.vue b/src/views/mes/wm/stocktaking/line.vue index 728ac12..01a3b7f 100644 --- a/src/views/mes/wm/stocktaking/line.vue +++ b/src/views/mes/wm/stocktaking/line.vue @@ -336,6 +336,10 @@ import { listStocktakingline, getStocktakingline, delStocktakingline, addStockta export default { name: "Stocktakingline", + props:{ + optType: null, + takingId: null, + }, data() { return { // 遮罩层 @@ -360,7 +364,7 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - takingId: null, materialStockId: null, itemId: null, itemCode: null, itemName: null, specification: null, unitOfMeasure: null, unitName: null, quantity: null, takingQuantity: null, warehouseId: null, warehouseCode: null, warehouseName: null, locationId: null, locationCode: null, locationName: null, areaId: null, areaCode: null, areaName: null, takingStatus: null, }, + takingId: this.takingId, materialStockId: null, itemId: null, itemCode: null, itemName: null, specification: null, unitOfMeasure: null, unitName: null, quantity: null, takingQuantity: null, warehouseId: null, warehouseCode: null, warehouseName: null, locationId: null, locationCode: null, locationName: null, areaId: null, areaCode: null, areaName: null, takingStatus: null, }, // 表单参数 form: {}, // 表单校验 diff --git a/src/views/mes/wm/stocktaking/result.vue b/src/views/mes/wm/stocktaking/result.vue index 91cad58..93ec02a 100644 --- a/src/views/mes/wm/stocktaking/result.vue +++ b/src/views/mes/wm/stocktaking/result.vue @@ -212,6 +212,10 @@ import { listStocktakingresult, getStocktakingresult, delStocktakingresult, addS export default { name: "Stocktakingresult", + props:{ + optType: null, + takingId: null, + }, data() { return { // 遮罩层 @@ -236,7 +240,7 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - takingId: null, itemId: null, itemCode: null, itemName: null, specification: null, unitOfMeasure: null, unitName: null, quantity: null, takingQuantity: null, takingStatus: null, }, + takingId: this.takingId, itemId: null, itemCode: null, itemName: null, specification: null, unitOfMeasure: null, unitName: null, quantity: null, takingQuantity: null, takingStatus: null, }, // 表单参数 form: {}, // 表单校验 From 0a120dd3bdb8a8331c7fc1006bb27bb7bfa22de0 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, 1 Nov 2023 22:31:42 +0800 Subject: [PATCH 06/11] =?UTF-8?q?SN=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/wm/sn/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/mes/wm/sn/index.vue b/src/views/mes/wm/sn/index.vue index fb34578..5f2fb02 100644 --- a/src/views/mes/wm/sn/index.vue +++ b/src/views/mes/wm/sn/index.vue @@ -284,7 +284,7 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.download('wm/sn/export', { + this.download('/mes/wm/sn/export', { ...this.queryParams }, `sn_${new Date().getTime()}.xlsx`) }, From 4b9ad6b455b3a96ba3c92aa618b738dfa579f593 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, 1 Nov 2023 22:45:17 +0800 Subject: [PATCH 07/11] =?UTF-8?q?SN=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/wm/sn/index.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/views/mes/wm/sn/index.vue b/src/views/mes/wm/sn/index.vue index 5f2fb02..b5ea1f9 100644 --- a/src/views/mes/wm/sn/index.vue +++ b/src/views/mes/wm/sn/index.vue @@ -76,12 +76,12 @@ type="text" @click="handleView(scope.row)" v-hasPermi="['mes:wm:sn:query']" - >{{scope.row.genDate}} + >{{scope.row.snNum}} @@ -90,7 +90,7 @@ size="mini" type="text" icon="el-icon-edit" - @click="handleUpdate(scope.row)" + @click="handleExport(scope.row)" v-hasPermi="['mes:wm:sn:edit']" >导出/打印 { + debugger; this.snList = response.rows; this.total = response.total; this.loading = false; @@ -283,7 +284,9 @@ export default { }).catch(() => {}); }, /** 导出按钮操作 */ - handleExport() { + handleExport(row) { + this.queryParams.itemCode = row.itemCode; + this.queryParams.gen_date = row.genDate; this.download('/mes/wm/sn/export', { ...this.queryParams }, `sn_${new Date().getTime()}.xlsx`) From 2eae03319cfdbc651134d08d8a444f7f1dde744c 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, 3 Nov 2023 12:27:42 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/workorderSelect/single.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/workorderSelect/single.vue b/src/components/workorderSelect/single.vue index 03d5697..66d90df 100644 --- a/src/components/workorderSelect/single.vue +++ b/src/components/workorderSelect/single.vue @@ -104,7 +104,11 @@ components: {}, dicts: ['mes_order_status','mes_workorder_sourcetype'], props:{ - workorder: undefined //外部传入的工单过滤信息 + workorder: { + type: Object, + default: function(){ + return {'workorderType': 'SELF'} + }} //外部传入的工单过滤信息 }, data() { return { From d35d8d201b3ad1483f268b78439a69d92827482b 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: Tue, 7 Nov 2023 22:38:53 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=9D=83=E9=99=90?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/pro/schedule/index.vue | 8 ++++---- src/views/mes/qc/iqc/iqcline.vue | 2 +- src/views/mes/qc/qctemplate/templateindex.vue | 10 +++++----- src/views/mes/qc/qctemplate/templateproduct.vue | 10 +++++----- src/views/mes/wm/outsourceissue/line.vue | 4 ++-- src/views/mes/wm/package/line.vue | 8 ++++---- src/views/mes/wm/stocktaking/line.vue | 12 ++++++------ 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/views/mes/pro/schedule/index.vue b/src/views/mes/pro/schedule/index.vue index 2f475dc..91400b9 100644 --- a/src/views/mes/pro/schedule/index.vue +++ b/src/views/mes/pro/schedule/index.vue @@ -72,8 +72,8 @@ 重置 - - + +
@@ -94,7 +94,7 @@ size="mini" type="text" @click="handleView(scope.row)" - v-hasPermi="['mes:pro:workorder:query']" + v-hasPermi="['mes:pro:protask:query']" >{{scope.row.workorderCode}} @@ -132,7 +132,7 @@ icon="el-icon-edit" v-if="scope.row.status =='CONFIRMED'" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:pro:workorder:edit']" + v-hasPermi="['mes:pro:protask:edit']" >排产 diff --git a/src/views/mes/qc/iqc/iqcline.vue b/src/views/mes/qc/iqc/iqcline.vue index d8238cb..784338b 100644 --- a/src/views/mes/qc/iqc/iqcline.vue +++ b/src/views/mes/qc/iqc/iqcline.vue @@ -24,7 +24,7 @@ type="text" icon="el-icon-edit" @click="handleDefect(scope.row)" - v-hasPermi="['mes:qc:iqcline:edit']" + v-hasPermi="['mes:qc:iqc:edit']" v-if="optType !='view'" >缺陷记录 diff --git a/src/views/mes/qc/qctemplate/templateindex.vue b/src/views/mes/qc/qctemplate/templateindex.vue index 1804114..a737bd8 100644 --- a/src/views/mes/qc/qctemplate/templateindex.vue +++ b/src/views/mes/qc/qctemplate/templateindex.vue @@ -8,7 +8,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['mes:qc:templateindex:add']" + v-hasPermi="['mes:qc:qctemplate:add']" >新增 @@ -19,7 +19,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['mes:qc:templateindex:edit']" + v-hasPermi="['mes:qc:qctemplate:edit']" >修改 @@ -30,7 +30,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['mes:qc:templateindex:remove']" + v-hasPermi="['mes:qc:qctemplate:remove']" >删除 @@ -57,14 +57,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:qc:templateindex:edit']" + v-hasPermi="['mes:qc:qctemplate:edit']" >修改 删除 diff --git a/src/views/mes/qc/qctemplate/templateproduct.vue b/src/views/mes/qc/qctemplate/templateproduct.vue index 90cd529..919c64b 100644 --- a/src/views/mes/qc/qctemplate/templateproduct.vue +++ b/src/views/mes/qc/qctemplate/templateproduct.vue @@ -8,7 +8,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['mes:qc:templateproduct:add']" + v-hasPermi="['mes:qc:qctemplate:add']" >新增 @@ -19,7 +19,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['mes:qc:templateproduct:edit']" + v-hasPermi="['mes:qc:qctemplate:edit']" >修改 @@ -30,7 +30,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['mes:qc:templateproduct:remove']" + v-hasPermi="['mes:qc:qctemplate:remove']" >删除 @@ -66,14 +66,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:qc:templateproduct:edit']" + v-hasPermi="['mes:qc:qctemplate:edit']" >修改 删除 diff --git a/src/views/mes/wm/outsourceissue/line.vue b/src/views/mes/wm/outsourceissue/line.vue index 6dad54b..25c92e1 100644 --- a/src/views/mes/wm/outsourceissue/line.vue +++ b/src/views/mes/wm/outsourceissue/line.vue @@ -56,7 +56,7 @@ icon="el-icon-edit" @click="handleUpdate(scope.row)" v-if="optType != 'view'" - v-hasPermi="['mes:wm:issueheader:edit']" + v-hasPermi="['mes:wm:outsourceissue:edit']" >修改 删除 diff --git a/src/views/mes/wm/package/line.vue b/src/views/mes/wm/package/line.vue index 240faff..df7088e 100644 --- a/src/views/mes/wm/package/line.vue +++ b/src/views/mes/wm/package/line.vue @@ -8,7 +8,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['mes:wm:packageline:add']" + v-hasPermi="['mes:wm:package:add']" >新增 @@ -20,7 +20,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['mes:wm:packageline:remove']" + v-hasPermi="['mes:wm:package:remove']" >删除 @@ -47,14 +47,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:wm:packageline:edit']" + v-hasPermi="['mes:wm:package:edit']" >修改 删除 diff --git a/src/views/mes/wm/stocktaking/line.vue b/src/views/mes/wm/stocktaking/line.vue index 01a3b7f..89cf34f 100644 --- a/src/views/mes/wm/stocktaking/line.vue +++ b/src/views/mes/wm/stocktaking/line.vue @@ -164,7 +164,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['wm:stocktakingline:add']" + v-hasPermi="['mes:wm:stocktaking:add']" >新增 @@ -175,7 +175,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['wm:stocktakingline:edit']" + v-hasPermi="['mes:wm:stocktaking:edit']" >修改 @@ -186,7 +186,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['wm:stocktakingline:remove']" + v-hasPermi="['mes:wm:stocktaking:remove']" >删除 @@ -196,7 +196,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['wm:stocktakingline:export']" + v-hasPermi="['mes:wm:stocktaking:export']" >导出 @@ -233,14 +233,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['wm:stocktakingline:edit']" + v-hasPermi="['mes:wm:stocktaking:edit']" >修改 删除 From efb73ef9dd117b6a977012689ad2a069a674362f 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: Sat, 11 Nov 2023 18:33:50 +0800 Subject: [PATCH 10/11] =?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/components/TaskSelect/taskSelectSingle.vue | 4 ++-- src/components/stockSelect/multi.vue | 2 +- src/views/mes/dv/machinerytype/index.vue | 6 +++--- src/views/mes/md/bom/index.vue | 14 +++++++------- src/views/mes/qc/pendinginspect/index.vue | 6 +++--- src/views/mes/qc/qctemplate/index.vue | 2 +- src/views/mes/tm/tool/index.vue | 5 +++-- src/views/mes/wm/stocktaking/result.vue | 12 ++++++------ src/views/mes/wm/warehouse/index.vue | 2 +- 9 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/components/TaskSelect/taskSelectSingle.vue b/src/components/TaskSelect/taskSelectSingle.vue index 33c179d..e7ffe96 100644 --- a/src/components/TaskSelect/taskSelectSingle.vue +++ b/src/components/TaskSelect/taskSelectSingle.vue @@ -86,14 +86,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/components/stockSelect/multi.vue b/src/components/stockSelect/multi.vue index 77291e5..ab3b7c3 100644 --- a/src/components/stockSelect/multi.vue +++ b/src/components/stockSelect/multi.vue @@ -103,7 +103,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['wm:wmstock:export']" + v-hasPermi="['mes:wm:wmstock:export']" >导出 diff --git a/src/views/mes/dv/machinerytype/index.vue b/src/views/mes/dv/machinerytype/index.vue index 9db8201..1c4d4ad 100644 --- a/src/views/mes/dv/machinerytype/index.vue +++ b/src/views/mes/dv/machinerytype/index.vue @@ -47,14 +47,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['dv:machinerytype:edit']" + v-hasPermi="['mes:dv:machinerytype:edit']" >修改 新增 删除 diff --git a/src/views/mes/md/bom/index.vue b/src/views/mes/md/bom/index.vue index cd72c9c..400b4a5 100644 --- a/src/views/mes/md/bom/index.vue +++ b/src/views/mes/md/bom/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']" >导出 @@ -148,14 +148,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/qc/pendinginspect/index.vue b/src/views/mes/qc/pendinginspect/index.vue index 41ce265..b363fee 100644 --- a/src/views/mes/qc/pendinginspect/index.vue +++ b/src/views/mes/qc/pendinginspect/index.vue @@ -54,7 +54,7 @@ icon="el-icon-edit" @click="handleAddIQC(scope.row)" v-if="scope.row.qcType == 'IQC'" - v-hasPermi="['mes:qc:qcindex:edit']" + v-hasPermi="['mes:qc:iqc:edit']" >来料检验 过程检验 出货检验 diff --git a/src/views/mes/qc/qctemplate/index.vue b/src/views/mes/qc/qctemplate/index.vue index 903aad4..2345e29 100644 --- a/src/views/mes/qc/qctemplate/index.vue +++ b/src/views/mes/qc/qctemplate/index.vue @@ -90,7 +90,7 @@ {{scope.row.templateCode}} diff --git a/src/views/mes/tm/tool/index.vue b/src/views/mes/tm/tool/index.vue index 40e4ea8..d0a8354 100644 --- a/src/views/mes/tm/tool/index.vue +++ b/src/views/mes/tm/tool/index.vue @@ -126,15 +126,16 @@ + + - diff --git a/src/views/mes/wm/stocktaking/result.vue b/src/views/mes/wm/stocktaking/result.vue index 93ec02a..b997767 100644 --- a/src/views/mes/wm/stocktaking/result.vue +++ b/src/views/mes/wm/stocktaking/result.vue @@ -84,7 +84,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['wm:stocktakingresult:add']" + v-hasPermi="['mes:wm:stocktaking:add']" >新增 @@ -95,7 +95,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['wm:stocktakingresult:edit']" + v-hasPermi="['mes:wm:stocktaking:edit']" >修改 @@ -106,7 +106,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['wm:stocktakingresult:remove']" + v-hasPermi="['mes:wm:stocktaking:remove']" >删除 @@ -116,7 +116,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['wm:stocktakingresult:export']" + v-hasPermi="['mes:wm:stocktaking:export']" >导出 @@ -142,14 +142,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['wm:stocktakingresult:edit']" + v-hasPermi="['mes:wm:stocktaking:edit']" >修改 删除 diff --git a/src/views/mes/wm/warehouse/index.vue b/src/views/mes/wm/warehouse/index.vue index 217ad7b..35b1718 100644 --- a/src/views/mes/wm/warehouse/index.vue +++ b/src/views/mes/wm/warehouse/index.vue @@ -86,7 +86,7 @@ type="text" icon="el-icon-s-shop" @click="handleLocation(scope.row.warehouseId)" - v-hasPermi="['mes:wm:warehouse:edit','mes:wm:warehouse:list']" + v-hasPermi="['mes:wm:location:edit','mes:wm:location:list']" >库区 Date: Mon, 13 Nov 2023 22:19:38 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E8=8A=82=E5=81=87=E6=97=A5=E3=80=81?= =?UTF-8?q?=E6=8E=92=E4=BA=A7=E6=9D=83=E9=99=90=E5=AD=97=E7=AC=A6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 2 +- src/views/mes/cal/holiday/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index de1226c..8a46228 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -180,7 +180,7 @@ export const dynamicRoutes = [ path: '/mes/pro/schedule', component: Layout, hidden: true, - permissions: ['mes:pro:schedule:edit'], + permissions: ['mes:pro:protask:edit'], children: [ { path: 'ganttedit', diff --git a/src/views/mes/cal/holiday/index.vue b/src/views/mes/cal/holiday/index.vue index ca6fae5..aee1e10 100644 --- a/src/views/mes/cal/holiday/index.vue +++ b/src/views/mes/cal/holiday/index.vue @@ -42,7 +42,7 @@
- 确 定 + 确 定 取 消