From b1b8d681adaffa6a489eb78bb60c032b55a4d29a Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 23 七月 2024 10:23:31 +0800
Subject: [PATCH] 修改数采权限

---
 src/components/do/b1-inspect-order-plan/Inspection.vue |   10 ++--------
 src/components/view/b1-inspect-order-plan.vue          |   12 ++++++------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index b7fd57c..5653f45 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -295,8 +295,8 @@
               <span style="margin-left: 4px;">%</span>
             </el-form-item>
           </el-form>
-          <el-button type="primary" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='妫�娴嬩腑蹇�'&&collection" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">鏁版嵁閲囬泦</el-button>
-          <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='妫�娴嬩腑蹇�'&&collection&&collected" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'鍏抽棴缂栬緫':'缂栬緫鏁伴噰'}}</el-button>
+          <el-button type="primary" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='妫�娴嬩腑蹇�'" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">鏁版嵁閲囬泦</el-button>
+          <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='妫�娴嬩腑蹇�'&&collected" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'鍏抽棴缂栬緫':'缂栬緫鏁伴噰'}}</el-button>
         </div>
       </div>
       <div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'">
@@ -845,7 +845,6 @@
         dataAcquisitionEidt:0,
         dataAcquisitionEidtAble:false,
         dataAcquisitionLoading:false,
-        collection:false,
         collected:false
       }
     },
@@ -1286,7 +1285,6 @@
         let power = JSON.parse(sessionStorage.getItem('power'))
         let fileDel = false
         let fileAdd = false
-        let collection = false
         let collected = false
         for (var i = 0; i < power.length; i++) {
 					if (power[i].menuMethod == 'uploadFile') {
@@ -1294,9 +1292,6 @@
 					}
 					if (power[i].menuMethod == 'delfile') {
 						fileDel = true
-					}
-          if (power[i].menuMethod == 'dataCollection') {
-						collection = true
 					}
           if (power[i].menuMethod == 'isItAllowedToModifyTheCollectedValues') {
 						collected = true
@@ -1306,7 +1301,6 @@
 					this.componentData0.do.splice(1, 1)
 				}
         this.fileAdd = fileAdd
-        this.collection = collection
         this.collected = collected
       },
       async getCurrentProduct(id,type){
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index ca954d6..50b9edb 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -233,12 +233,12 @@
 							font: '妫�楠�',
 							type: 'text',
 							method: 'handleInspection',
-							// disabFun: (row, index) => {
-							// 	return row.userId == null || row.insState == 3 || row.insState == 5||JSON.parse(localStorage.getItem("user")).name != row.userName
-							// }
-              disabFun: (row, index) => {
-								return row.userId == null || row.insState == 3 || row.insState == 5
+							disabFun: (row, index) => {
+								return row.userId == null || row.insState == 3 || row.insState == 5||JSON.parse(localStorage.getItem("user")).name != row.userName
 							}
+              // disabFun: (row, index) => {
+							// 	return row.userId == null || row.insState == 3 || row.insState == 5
+							// }
 						}, {
 							id: '',
 							font: '浜ゆ帴',
@@ -254,7 +254,7 @@
 							type: 'text',
 							method: 'handleReview',
 							disabFun: (row, index) => {
-								return row.userId == null || row.insState != 3 || row.verifyUser != 1||JSON.parse(localStorage.getItem("user")).name != row.userName
+								return row.userId == null || row.insState != 3 ||JSON.parse(localStorage.getItem("user")).name != row.userName
 							}
 						}, {
 							id: '',

--
Gitblit v1.9.3