Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev

pages/mes/prodReport/index.vue

@@ -87,8 +87,10 @@
         <u-button type="primary" @click="commonClick('FinshTask')">完成作业</u-button>
         
         <!-- <u-button type="primary" @click="commonClick('KnifeTemp2')">刀模版上下机2</u-button> -->
-        <u-button type="primary" @click="commonClick('MaterialRequest')">补料申请</u-button>
-        <u-button type="primary" @click="commonClick('MaterialReturn')">退料申请</u-button>
+		<u-button type="primary" @click="commonClick('MaterialRequest')" v-if="!buttonShow || buttonShow.MaterialRequestView === '1'">补料申请</u-button>
+        <!-- <u-button type="primary" @click="commonClick('MaterialRequest')">补料申请</u-button> -->
+		<u-button type="primary" @click="commonClick('MaterialReturn')" v-if="!buttonShow || buttonShow.MaterialReturnView === '1'">退料申请</u-button>
+<!--        <u-button type="primary" @click="commonClick('MaterialReturn')">退料申请</u-button> -->
         <u-button type="primary" @click="commonClick('ViewPpicture')">查看图片</u-button>
         <u-button type="warning" @click="commonClick('abnormal')">异常报告</u-button>
         <!-- <u-button type="primary" @click="commonClick('StockIn')">完工入库申请</u-button> -->
@@ -1786,6 +1788,10 @@ export default {
           break;
         case 'StartTask':
           let status = false;
+		   if(this.tableSelectData.length>1){
+		  		  this.$u.toast('不允许同时操作多条任务');
+		  		  return;
+		  	  }
           this.tableSelectData.forEach((item) => {
             if (item.status === 'BEGINNING') {
               status = true;
@@ -1809,14 +1815,26 @@ export default {
         case 'StopTask':
           this.stopCause();
           this.stopReason = '';
+		  if(this.tableSelectData.length>1){
+		  		  this.$u.toast('不允许同时操作多条任务');
+		  		  return;
+		  }
           this.stopReasonVisible = true;
           break;
         case 'FinshTask':
+		  if(this.tableSelectData.length>1){
+		 		  this.$u.toast('不允许同时操作多条任务');
+		 		  return;
+		 	  }
           this.tableSelectData.forEach((item) => {
             this.changeStatus(item.taskId, item.taskWorkunitId, 'FINISHED', item.workunitId);
           });
           break;
         case 'Prod':
+		 if(this.tableSelectData.length>1){
+				  this.$u.toast('不允许同时操作多条任务');
+				  return;
+			  }
           if (this.tableSelectData[0].status === 'PREPARE') {
             this.$u.toast('工序未开工');
             return;
@@ -1876,6 +1894,10 @@ export default {
       this.jobAssignmentForm.workunitName = this.$refs.workunitRef.tableSelectData[0].workunitName;
     },
     doEditProd(){
+		 if(this.tableSelectData.length>1){
+				  this.$u.toast('不允许同时操作多条任务');
+				  return;
+			  }
       // console.log('vuex_workstation', this.$store.state.vuex_workunit)
       const datas = Object.assign({}, this.tableSelectData[0]);
       this.$refs['editFeeding'].getList().then(() => {
@@ -1898,6 +1920,7 @@ export default {
     },
     async knifeTempShow() {
       if (this.tableSelectData.length > 1) {
+		this.$u.toast('不允许同时操作多条任务');  
         return;
       }
       const params = {
@@ -2858,6 +2881,10 @@ export default {
     },
 
     doException() {
+		 if(this.tableSelectData.length>1){
+				  this.$u.toast('不允许同时操作多条任务');
+				  return;
+			  }
       this.ExceptionForms = {
         abnormalType: null,
         abnormalReason: null
@@ -3008,7 +3035,11 @@ export default {
       });
     },
     feedingInspectionShow() {
-      this.feedingInspectionVisible = true;
+	  if(this.tableSelectData.length>1){
+		  this.$u.toast('不允许同时操作多条任务');
+		  return;
+	  }
+	  this.feedingInspectionVisible = true;
       this.getPemissionScan();
       this.feedingInspectionLoadAndScan();
     },
@@ -3060,6 +3091,10 @@ export default {
       });
     },
     recoilMaterialShow() {
+	if(this.tableSelectData.length>1){
+				  this.$u.toast('不允许同时操作多条任务');
+				  return;
+      }
       this.recoilMaterialVisible = true;
       this.getPemissionScan();
       this.recoilMaterialLoadAndScan();
@@ -3201,6 +3236,10 @@ export default {
       });
     },
     viewiPctureShow() {
+		 if(this.tableSelectData.length>1){
+				  this.$u.toast('不允许同时操作多条任务');
+				  return;
+			  }
       this.materialReturn = true;
       // this.viewSopPicture = this.tableSelectData[0];
       const taskInfo = this.tableSelectData[0];