From 5158e3a5a16a4174c1086310ca10b4f0450d16bb Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 15 五月 2024 08:57:35 +0800
Subject: [PATCH] 各个模块权限功能
---
north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue | 17 ----
north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java | 5 +
north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue | 12 ++
north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue | 2
north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue | 11 ++
north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue | 13 ++
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue | 18 ++-
north-glass-erp/src/main/java/com/example/erp/controller/pp/BasicDataProduceController.java | 6 +
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 11 ++
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue | 9 ++
north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue | 2
north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue | 15 +++
north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue | 2
north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue | 2
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java | 7 +
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java | 8 ++
north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue | 2
north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue | 12 ++
north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue | 2
north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | 11 ++
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 13 +++
23 files changed, 141 insertions(+), 43 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
index 31a42fb..fd3e4e5 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
@@ -7,8 +7,11 @@
import {ElDatePicker, ElMessage} from "element-plus";
import request from "@/utils/request";
import {Search} from "@element-plus/icons-vue";
+import useUserInfoStore from '@/stores/userInfo'
+
//璇█鑾峰彇
const {t} = useI18n()
+const userStore = useUserInfoStore()
let router = useRouter()
//瀹氫箟鏁版嵁杩斿洖缁撴灉
let produceList = ref([])
@@ -270,7 +273,14 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit');" link type="primary" size="small">{{$t('basicData.edit')}}</el-button>
+<!-- <el-button @click="getTableRow(row,'edit');" link type="primary" size="small">{{$t('basicData.edit')}}</el-button>-->
+ <el-button @click="getTableRow(row,'edit')"
+ v-if="userStore.user.permissions.indexOf('MaintenanceAndRepair.edit') > -1"
+ link
+ type="primary"
+ size="small">
+ {{ $t('basicData.edit') }}
+ </el-button>
<el-button link size="small" type="primary" @click="getTableRow(row,'delete')">鍒犻櫎</el-button>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue
index 2ef6277..68778d5 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue
@@ -19,23 +19,6 @@
basic_name: '',
d_basic_name: '',
})
-const getTableRow = (row,type) =>{
- switch (type) {
- case 'edit' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/reportingWorks/ReportingWorkDetail', query: { id: row.id }})
- break
- }
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
- case 'setType':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍙嶅鐘舵��')
- break
- }
- }
-}
//琛ㄥ熬姹傚拰
const sumNum = (list, field) => {
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
index 93e80c6..d840238 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
@@ -7,8 +7,10 @@
import {ElDatePicker, ElMessage} from "element-plus";
import {Search} from "@element-plus/icons-vue";
import { useI18n } from 'vue-i18n'
+import useUserInfoStore from '@/stores/userInfo'
//璇█鑾峰彇
const { t } = useI18n()
+const userStore = useUserInfoStore()
let router=useRouter()
const getTableRow = (row,type) =>{
switch (type) {
@@ -300,7 +302,14 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('basicData.edit')}}</el-button>
+<!-- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('basicData.edit')}}</el-button>-->
+ <el-button @click="getTableRow(row,'edit')"
+ v-if="userStore.user.permissions.indexOf('SelectAddProcess.edit') > -1"
+ link
+ type="primary"
+ size="small">
+ {{ $t('basicData.edit') }}
+ </el-button>
</template>
<template #num1_filter="{ column, $panel }">
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index c32560c..018e489 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -12,8 +12,10 @@
import BasicTable from '@/components/sd/product/BasicTable.vue'
import {VXETable} from "vxe-table";
import { useI18n } from 'vue-i18n'
+import useUserInfoStore from '@/stores/userInfo'
//璇█鑾峰彇
const { t } = useI18n()
+const userStore = useUserInfoStore()
let productGlassTypeStore = useProductGlassTypeStore()
let router = useRouter()
let props = defineProps({
@@ -378,7 +380,14 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }" >
- <el-button @click="getTableRow(row,'select')" link type="primary" size="small">{{$t('basicData.edit')}}
+<!-- <el-button @click="getTableRow(row,'select')" link type="primary" size="small">{{$t('basicData.edit')}}-->
+<!-- </el-button>-->
+ <el-button @click="getTableRow(row,'select')"
+ v-if="userStore.user.permissions.indexOf('SelectProcessCard.edit') > -1"
+ link
+ type="primary"
+ size="small">
+ {{ $t('basicData.edit') }}
</el-button>
<el-button v-if="row.layoutStatus=='鍙帓鐗�'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composing')}}</el-button>
<el-button v-else-if="row.layoutStatus=='涓嶅彲鎺掔増'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composingOk')}}</el-button>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
index a8e72fc..8955d30 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
@@ -7,8 +7,10 @@
import {useRouter} from 'vue-router'
import {useI18n} from 'vue-i18n'
import {changeFilterEvent, filterChanged} from "@/hook"
+import useUserInfoStore from '@/stores/userInfo'
//璇█鑾峰彇
const {t} = useI18n()
+const userStore = useUserInfoStore()
let router = useRouter()
const getTableRow = (row, type) => {
switch (type) {
@@ -215,9 +217,15 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button link size="small" type="primary" @click="getTableRow(row,'edit')">{{ $t('basicData.edit') }}
+<!-- <el-button link size="small" type="primary" @click="getTableRow(row,'edit')">{{ $t('basicData.edit') }}-->
+<!-- </el-button>-->
+ <el-button @click="getTableRow(row,'edit')"
+ v-if="userStore.user.permissions.indexOf('SplittingDetails.edit') > -1"
+ link
+ type="primary"
+ size="small">
+ {{ $t('basicData.edit') }}
</el-button>
-
</template>
<template #num1_filter="{ column, $panel }">
diff --git a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue
index cfeb275..d716359 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue
@@ -7,8 +7,11 @@
import {ElMessage} from "element-plus";
import { useI18n } from 'vue-i18n'
import {changeFilterEvent, filterChanged} from "@/hook"
+import useUserInfoStore from '@/stores/userInfo'
+
//璇█鑾峰彇
const { t } = useI18n()
+const userStore = useUserInfoStore()
let router=useRouter()
//瀹氫箟鏁版嵁杩斿洖缁撴灉
let produceList = ref([])
@@ -204,8 +207,14 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit');" link type="primary" size="small">{{$t('basicData.edit')}}</el-button>
-<!-- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>-->
+<!-- <el-button @click="getTableRow(row,'edit');" link type="primary" size="small">{{$t('basicData.edit')}}</el-button>-->
+ <el-button @click="getTableRow(row,'edit')"
+ v-if="userStore.user.permissions.indexOf('SelectProductionBasicData.edit') > -1"
+ link
+ type="primary"
+ size="small">
+ {{ $t('basicData.edit') }}
+ </el-button>
<el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
<template #reference>
<el-button link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue b/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
index 79c7c12..51c9642 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
@@ -52,7 +52,7 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue b/north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue
index f42ccba..73e00f2 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue
@@ -52,7 +52,7 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
index 5f98653..6e45163 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
@@ -52,7 +52,7 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue b/north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue
index b539323..abfce13 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue
@@ -52,7 +52,7 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue b/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
index 857e9ed..1e9575f 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
@@ -52,7 +52,7 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue b/north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue
index 001499b..1761d11 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue
@@ -29,7 +29,7 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
index a85c9a9..5e0fda1 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
@@ -52,7 +52,7 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue b/north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue
index e96ec37..93874c3 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue
@@ -52,7 +52,7 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue
index 4a4cbea..0773c2e 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue
@@ -386,7 +386,14 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>
+<!-- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>-->
+ <el-button @click="getTableRow(row,'edit')"
+ v-if="userStore.user.permissions.indexOf('QualityInspectionReview.edit') > -1"
+ link
+ type="primary"
+ size="small">
+ {{ $t('basicData.edit') }}
+ </el-button>
<el-button v-if="row.damageDetails.qualityInsStatus===1" @click="getTableRow(row,'setType')" link type="primary" size="small">瀹℃牳</el-button>
<el-button v-else disabled @click="getTableRow(row,'setType')" link type="primary" size="small">瀹℃牳</el-button>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
index f5af339..c937fbd 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
@@ -8,8 +8,11 @@
import {Search} from "@element-plus/icons-vue";
import { useI18n } from 'vue-i18n'
import SelectProduct from "@/views/sd/product/SelectProduct.vue";
+import useUserInfoStore from "@/stores/userInfo";
+
//璇█鑾峰彇
const { t } = useI18n()
+const userStore = useUserInfoStore()
let router=useRouter()
const getTableRow = (row,type) =>{
switch (type) {
@@ -32,11 +35,6 @@
break
}
}
-}
-
-
-function padLeftZero(str) {
- return ('00' + str).substr(str.length)
}
//鎻愪氦鐨勮〃鍗�
@@ -354,8 +352,14 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>
-<!-- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>-->
+<!-- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>-->
+ <el-button @click="getTableRow(row,'edit')"
+ v-if="userStore.user.permissions.indexOf('SelectReportingWorks.edit') > -1"
+ link
+ type="primary"
+ size="small">
+ {{ $t('basicData.edit') }}
+ </el-button>
<el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
<template #reference>
<el-button link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
index f2abf94..c75941c 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -11,8 +11,10 @@
import BasicTable from '@/components/sd/product/BasicTable.vue'
import {VXETable} from "vxe-table";
import { useI18n } from 'vue-i18n'
+import useUserInfoStore from '@/stores/userInfo'
//璇█鑾峰彇
const { t } = useI18n()
+const userStore = useUserInfoStore()
let productGlassTypeStore = useProductGlassTypeStore()
let router = useRouter()
@@ -344,8 +346,17 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0" @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('workOrder.transferOrder')}}</el-button>
-<!-- <el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
+<!-- <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0" @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('workOrder.transferOrder')}}</el-button>-->
+ <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0"
+ @click="getTableRow(row,'edit')"
+ v-if="userStore.user.permissions.indexOf('SelectWorkOrder.edit') > -1"
+ link
+ type="primary"
+ size="small">
+ {{$t('workOrder.transferOrder')}}
+ </el-button>
+
+ <!-- <el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
<el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
<template #reference>
<el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/BasicDataProduceController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/BasicDataProduceController.java
index bd885a7..c97e20f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/BasicDataProduceController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/BasicDataProduceController.java
@@ -1,5 +1,6 @@
package com.example.erp.controller.pp;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.pp.BasicDataProduce;
@@ -27,6 +28,7 @@
}
@ApiOperation("鏌ヨ鎵�鏈夊熀纭�鏁版嵁鎺ュ彛")
+ @SaCheckPermission("SelectProductionBasicData.search")
@PostMapping ("/selectBasic")
public Result selectBasic() {
return Result.seccess(basicDateProduceService.selectBasicSv());
@@ -41,6 +43,7 @@
}
@ApiOperation("鍒犻櫎鍩虹鏁版嵁鎺ュ彛")
+ @SaCheckPermission("SelectProductionBasicData.delete")
@PostMapping("/deleteBasic/{id}")
public Result deleteBasic(@PathVariable String id){
if(basicDateProduceService.deleteBasicSv(id)){
@@ -66,6 +69,7 @@
}
@ApiOperation("鐝粍鍩虹鏁版嵁娣诲姞鎺ュ彛")
+ @SaCheckPermission("AddTeamGroup.add")
@PostMapping("/saveTeamGroup")
public Result saveTeamGroup( @RequestBody Map<String,Object> object){
if(basicDateProduceService.saveTeamGroupSv(object)){
@@ -77,6 +81,7 @@
}
@ApiOperation("娆＄牬绫诲瀷鍩虹鏁版嵁娣诲姞鎺ュ彛")
+ @SaCheckPermission("AddBreakageType.add")
@PostMapping("/saveBreakageType")
public Result saveBreakageType( @RequestBody Map<String,Object> object){
if(basicDateProduceService.saveBreakageTypeSv(object)){
@@ -88,6 +93,7 @@
}
@ApiOperation("娆＄牬鍘熷洜鍩虹鏁版嵁娣诲姞鎺ュ彛")
+ @SaCheckPermission("AddBreakageReason.add")
@PostMapping("/saveBreakageReason")
public Result saveBreakageReason( @RequestBody Map<String,Object> object){
if(basicDateProduceService.saveBreakageReasonSv(object)){
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java
index 7e2580d..47840af 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java
@@ -1,5 +1,6 @@
package com.example.erp.controller.pp;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.exception.ServiceException;
@@ -21,6 +22,7 @@
DeviceMaintenanceService deviceMaintenanceService;
@ApiOperation("璁惧鏂板鎺ュ彛")
+ @SaCheckPermission("AddMachine.add")
@PostMapping("/saveMachine")
public Result saveTeamGroup( @RequestBody Map<String,Object> object){
if(deviceMaintenanceService.saveMachineSv(object)){
@@ -37,6 +39,7 @@
}
@ApiOperation("淇濆吇缁翠慨鏂板鎺ュ彛")
+ @SaCheckPermission("AddMaintenanceAndRepair.add")
@PostMapping("/saveMaintenanceAndRepair")
public Result saveMaintenanceAndRepair( @RequestBody Map<String,Object> object){
if(deviceMaintenanceService.saveMaintenanceAndRepairSv(object)){
@@ -58,6 +61,7 @@
@ApiOperation("鍒犻櫎缁翠慨淇濆吇璁板綍鎺ュ彛")
+ @SaCheckPermission("MaintenanceAndRepair.delete")
@PostMapping("/deleteMaintenance/{id}")
public Result deleteMaintenance(@PathVariable String id){
if(deviceMaintenanceService.deleteMaintenanceSv(id)){
@@ -69,6 +73,7 @@
}
@ApiOperation("鏌ヨ璁惧绠＄悊鎺ュ彛")
+ @SaCheckPermission("SelectMachine.search")
@PostMapping ("/selectMachine")
public Result selectMachine() {
return Result.seccess(deviceMaintenanceService.selectMachineSv());
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
index 09ae89a..6af1dbf 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
@@ -1,5 +1,6 @@
package com.example.erp.controller.pp;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.DeliveryDetail;
@@ -26,6 +27,7 @@
//娴佺▼鍗＄鐞嗘煡璇�
@ApiOperation("娴佺▼鍗＄鐞嗘煡璇㈡帴鍙�")
+ @SaCheckPermission("SelectProcessCard.search")
@PostMapping ("/flowCard/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
public Result dateProcess(
@PathVariable Integer pageNum,
@@ -39,6 +41,7 @@
//鍒嗘灦鏌ヨ
@ApiOperation("鍒嗘灦鏌ヨ鎺ュ彛")
+ @SaCheckPermission("SelectAddProcess.search")
@PostMapping ("/selectAddProcess/{selectTime1}/{selectTime2}")
public Result selectAddProcess(
@PathVariable Date selectTime1,
@@ -49,8 +52,8 @@
//鍒嗘灦鏄庣粏鏌ヨ
@ApiOperation("鍒嗘灦鏄庣粏鏌ヨ鎺ュ彛")
+ @SaCheckPermission("SplittingDetails.search")
@PostMapping ("/detailsSelect/{orderId}")
-
public Result detailsSelect(
@PathVariable String orderId,
@RequestBody FlowCard flowCard){
@@ -61,6 +64,7 @@
//鍒犻櫎娴佺▼鍗�
@ApiOperation("鍒犻櫎娴佺▼鍗℃帴鍙�")
+ @SaCheckPermission("SelectProcessCard.delete")
@PostMapping("/deleteFlowCard/{orderId}/{processId}")
public Result deleteOrderWork(
@PathVariable String orderId,
@@ -76,6 +80,7 @@
//淇敼鎺掔増鐘舵��
@ApiOperation("淇敼鎺掔増鐘舵�佹帴鍙�")
+ @SaCheckPermission("SelectProcessCard.review")
@PostMapping("/updateLayoutStatus/{processId}/{state}")
public Result updateLayoutStatus(
@PathVariable String processId,
@@ -102,6 +107,7 @@
//娣诲姞娴佺▼鍗�
@ApiOperation("娴佺▼鍗″垱寤烘帴鍙�")
+ @SaCheckPermission("AddProcessCard.add")
@PostMapping("/addFlowCard")
public Result AddOrderWork( @RequestBody Map<String,Object> object){
if(flowCardService.addFlowCardSv(object)){
@@ -137,6 +143,7 @@
}
//娴佺▼鍗℃槑缁嗘煡璇�
@ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
+ @SaCheckPermission("SelectDetailProcessCard.search")
@PostMapping ("/flowCardDetail/{processId}")
public Result flowCardDetail(
@PathVariable String processId,
@@ -146,6 +153,7 @@
}
@ApiOperation("娴佺▼鍗℃墦鍗版煡璇㈡帴鍙�")
+ @SaCheckPermission("SelectPrintFlowCard.search")
@PostMapping ("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}")
public Result selectPrintFlowCard(
@PathVariable Date selectTime1,
@@ -157,6 +165,7 @@
}
@ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
+ @SaCheckPermission("PrintFlowCard.search")
@PostMapping ("/selectPrint/{orderId}")
public Result selectPrint(
@PathVariable String orderId,
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java
index 3f5f84d..6b54924 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java
@@ -1,5 +1,6 @@
package com.example.erp.controller.pp;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.pp.ProductionScheduling;
@@ -22,6 +23,7 @@
//鏌ヨ绗竴娆℃帓鐗堟暟鎹�
@ApiOperation("鍔犺浇鏃舵煡璇㈡帓鐗堟暟鎹帴鍙�")
+ @SaCheckPermission("ProductionScheduling.search")
@PostMapping ("/selectLastScheduling/{selectTime1}/{selectTime2}/{processes}/{orderId}")
public Result selectLastScheduling(
@PathVariable String selectTime1,
@@ -34,6 +36,7 @@
}
//鐐瑰嚮鏌ヨ鎺掔増鏁版嵁
@ApiOperation("鐐瑰嚮鏌ヨ鎺掔増鏁版嵁鎺ュ彛")
+ @SaCheckPermission("ProductionScheduling.search")
@PostMapping ("/selectScheduling/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
public Result selectScheduling(
@PathVariable String selectTime1,
@@ -48,6 +51,7 @@
//鐐瑰嚮鏌ヨ鎺掔増鏁版嵁锛堝甫璁㈠崟鍙锋煡璇級
@ApiOperation("鏍规嵁鏉′欢鏌ヨ鎺掔増鏁版嵁鎺ュ彛")
+ @SaCheckPermission("ProductionScheduling.search")
@PostMapping ("/selectSchedulingNot/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
public Result selectSchedulingNot(
@PathVariable String selectTime1,
@@ -62,6 +66,7 @@
//娣诲姞鎺掍骇鏁版嵁
@ApiOperation("娣诲姞鎺掍骇鏁版嵁鎺ュ彛")
+ @SaCheckPermission("ProductionScheduling.add")
@PostMapping("/addScheduling")
public Result addScheduling( @RequestBody Map<String,Object> object){
@@ -75,6 +80,7 @@
//鍒犻櫎鎺掍骇鏁版嵁
@ApiOperation("鍒犻櫎鎺掍骇鏁版嵁鎺ュ彛")
+ @SaCheckPermission("ProductionScheduling.delete")
@PostMapping("/deleteScheduling")
public Result deleteScheduling( @RequestBody Map<String,Object> object) throws Exception{
@@ -87,6 +93,7 @@
}
@ApiOperation("鎺掔増瀹℃牳鎺ュ彛")
+ @SaCheckPermission("ProductionScheduling.review")
@PostMapping("/examineScheduling")
public Result examineScheduling( @RequestBody Map<String,Object> object){
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
index 9be9808..adc050d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
@@ -1,5 +1,6 @@
package com.example.erp.controller.pp;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.pp.DamageDetails;
@@ -31,12 +32,14 @@
//娴佺▼鍗¤繘搴�
@ApiOperation("娴佺▼鍗¤繘搴�")
+ @SaCheckPermission("ProcessCardProgress.search")
@PostMapping ("/processCardProgress/{orderId}")
public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns){
return Result.seccess(reportService.processCardProgressSv(orderId,columns));
}
@ApiOperation("璺ㄥ伐搴忔鐮�")
+ @SaCheckPermission("CrossProcessBreaking.search")
@PostMapping("/crossProcessBreaking/{pageNum}/{pageSize}/{selectDate}")
public Result getOrderReport(@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
@@ -47,6 +50,7 @@
}
@ApiOperation("鍦ㄥ埗鍝佹姤琛�")
+ @SaCheckPermission("WorkInProgress.search")
@PostMapping("/workInProgress/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}")
public Result workInProgress(
@PathVariable Date selectTime1,
@@ -60,6 +64,7 @@
}
@ApiOperation("宸ュ簭寰呭畬鎴愭姤琛�")
+ @SaCheckPermission("ProcessToBeCompleted.search")
@PostMapping("/selectProcessToBeCompleted/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}")
public Result selectProcessToBeCompleted(
@PathVariable Date selectTime1,
@@ -73,6 +78,7 @@
}
@ApiOperation("娆＄牬鏄庣粏鎶ヨ〃")
+ @SaCheckPermission("DamageReport.search")
@PostMapping("/damageReport/{selectTime1}/{selectTime2}")
public Result damageReport(
@PathVariable Date selectTime1,
@@ -82,6 +88,7 @@
}
@ApiOperation("鍒嗘灦鏄庣粏鎶ヨ〃")
+ @SaCheckPermission("SplittingDetailsOutside.search")
@PostMapping("/splittingDetailsOutside/{orderId}")
public Result splittingDetailsOutside(
@PathVariable String orderId,
@@ -91,6 +98,7 @@
}
@ApiOperation("鍝佽川鎶ヨ〃")
+ @SaCheckPermission("QualityReport.search")
@PostMapping("/qualityReport/{selectTime1}/{selectTime2}")
public Result qualityReport(
@PathVariable Date selectTime1,
@@ -101,6 +109,7 @@
}
@ApiOperation("鎴愬搧鐜囨姤琛�")
+ @SaCheckPermission("Yield.search")
@PostMapping("/yield/{selectTime1}/{selectTime2}/{selectProcesses}")
public Result yield(
@PathVariable Date selectTime1,
@@ -112,12 +121,14 @@
}
@ApiOperation("鐢熶骇鍙戣揣杩涘害")
+ @SaCheckPermission("ProductionSchedule.search")
@PostMapping ("/productionSchedule/{orderId}")
public Result productionSchedule(@PathVariable String orderId, @RequestBody List<Integer> columns){
return Result.seccess(reportService.productionScheduleSv(orderId,columns));
}
@ApiOperation("浠诲姟瀹屾垚鎯呭喌姹囨�昏繘搴�")
+ @SaCheckPermission("TaskCompletionStatus.search")
@PostMapping ("/taskCompletionStatus/{selectTime1}/{selectTime2}")
public Result taskCompletionStatus(@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@@ -126,6 +137,7 @@
}
@ApiOperation("璁㈠崟璁″垝鍒嗚В")
+ @SaCheckPermission("OrderPlanDecomposition.search")
@PostMapping ("/orderPlanDecomposition/{selectTime1}/{selectTime2}")
public Result orderPlanDecomposition(@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@@ -134,6 +146,7 @@
}
@ApiOperation("鍘熺墖棰嗘枡")
+ @SaCheckPermission("RawMaterialRequisition.search")
@PostMapping ("/rawMaterialRequisition/{selectTime1}/{selectTime2}")
public Result rawMaterialRequisition(@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
index 5725a3c..f96ec19 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
@@ -1,5 +1,6 @@
package com.example.erp.controller.pp;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.pp.FlowCard;
@@ -39,12 +40,14 @@
}
@ApiOperation("鎶ュ伐鏂板")
+ @SaCheckPermission("AddReportingWork.add")
@PostMapping ("/saveReportingWork")
public Result SaveReportingWork(@RequestBody Map<String,Object> reportingWork) {
return Result.seccess(reportingWorkService.SaveReportingWorkSv(reportingWork));
}
@ApiOperation("鎶ュ伐瀹℃牳")
+ @SaCheckPermission("AddReportingWork.review")
@PostMapping ("/reviewReportingWork")
public Result ReviewReportingWork(@RequestBody Map<String,String> reportingWork) {
return Result.seccess(reportingWorkService.ReviewReportingWorkSv(reportingWork));
@@ -56,12 +59,14 @@
return Result.seccess(reportingWorkService.selectUpdateReportingWorkSv(reportingWorkId));
}
@ApiOperation("鎶ュ伐淇敼")
+ @SaCheckPermission("AddReportingWork.update")
@PostMapping ("/updateReportingWork/{reviewState}")
public Result updateReportingWork(@PathVariable String reviewState,@RequestBody Map<String,Object> reportingWork) {
return Result.seccess(reportingWorkService.updateReportingWork(reportingWork,reviewState));
}
@ApiOperation("鎶ュ伐鏌ヨ鎺ュ彛")
+ @SaCheckPermission("SelectReportingWorks.search")
@PostMapping ("/selectReportingWork/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{orderId}")
public Result selectReportingWork(
@PathVariable Integer pageNum,
@@ -75,6 +80,7 @@
}
@ApiOperation("鍒犻櫎鎶ュ伐鎺ュ彛")
+ @SaCheckPermission("SelectReportingWorks.delete")
@PostMapping("/deleteWork/{reportingWorkId}/{processId}/{thisProcess}")
public Result deleteWork(@PathVariable String reportingWorkId,@PathVariable String processId,@PathVariable String thisProcess){
if(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess)){
@@ -86,6 +92,7 @@
}
@ApiOperation("璐ㄦ瀹℃牳鏌ヨ鎺ュ彛")
+ @SaCheckPermission("QualityInspectionReview.search")
@PostMapping ("/selectQualityTesting/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{state}/{processId}")
public Result selectQualityTesting(
@PathVariable Integer pageNum,
@@ -100,6 +107,7 @@
}
@ApiOperation("璐ㄦ瀹℃牳瀹℃牳")
+ @SaCheckPermission("QualityInspectionReview.review")
@PostMapping ("/updateQualityStatus/{reportingWorkId}/{username}")
public Result updateQualityStatus(@PathVariable String reportingWorkId,@PathVariable String username) {
if(reportingWorkService.updateQualityStatusSv(reportingWorkId,username)){
--
Gitblit v1.8.0