Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

src/api/yunyin/yunying.js

@@ -780,11 +780,11 @@ export const MachineList = (params) => {
     })
 }
 //班组维护->删除当前班组
-export const teamDel = (params) => {
+export const teamDel = (data) => {
     return service({
         url: '/mes_server/facility/teamDel',
-        method: 'get',
-        params
+        method: 'post',
+        data
     })
 }
 

src/view/performance/chejianbaogong.vue

@@ -101,8 +101,9 @@
 	   highlight-current-row="true"
 	   border
 	
-     :row-style="{ height: '20px'}"
-     :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+      :row-style="{ height: '20px'}"
+      :cell-style="{ padding: '0px' }"
+	  :header-row-style="{ height: '20px',color:'red' }"
 	   style="width:100%;height: 30vh; "
 	   @row-dblclick="handleSelectClick"
 	 >
@@ -326,29 +327,28 @@
 		   style="font-size: 50px;font-weight: bold;" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
             <div>
 			<el-table ref="multipleTable"
-                        :row-style="{ height: '20px' }"
-                        :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-                        :header-cell-style="{ padding: '0px' }"
-                        :show-overflow-tooltip="true"
-                        :cell-class-name="bzryplanUsageCellClass"
-                        @row-click="BZhandle"
-                        style="width: 100%;height: 250px;margin-top: 0px;" border tooltip-effect="dark"
+			            :row-style="{ height: '20px' }"
+			            :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+			            :header-cell-style="{ padding: '0px' }"
+			            :show-overflow-tooltip="true"
+			            highlight-current-row="true" @row-click="BZhandle"
+			            style="width: 100%;height: 250px;margin-top: 0px;" border tooltip-effect="dark" 
 						:data="bzData" row-key="ID" @selection-change="BZSelectionChange">
-              <!-- <el-table-column type="selection" width="55" /> -->
-              <el-table-column align="left" label="机台" prop="JTMC" width="80"/>
-              <el-table-column align="left" label="班组" prop="班组号" width="60"/>
-              <el-table-column align="left" label="组员1" prop="0" width="200"/>
-              <el-table-column align="left" label="组员2" prop="1" width="200"/>
-			        <el-table-column align="left" label="组员3" prop="2" width="200"/>
-              <el-table-column align="left" label="组员4" prop="3" width="195"/>
-              <el-table-column align="left" label="组员5" prop="4" width="70"/>
-              <el-table-column align="left" label="组员6" prop="5" width="70"/>
-              <el-table-column align="left" label="组员7" prop="6" width="70"/>
-              <el-table-column align="left" label="组员8" prop="7" width="70"/>
-              <el-table-column align="left" label="组员9" prop="8" width="70"/>
-              <el-table-column align="left" label="特殊组员" prop="9" width="200"/>
-              <el-table-column align="left" label="UNIQID" prop="ID" width="75"/>
-            </el-table>
+			  <!-- <el-table-column type="selection" width="55" /> -->
+			  <el-table-column align="left" label="机台" prop="JTMC" width="70"/>
+			  <el-table-column align="left" label="班组" prop="班组号" width="60"/>
+			  <el-table-column align="left" label="组员1" prop="0" width="195"/>
+			  <el-table-column align="left" label="组员2" prop="1" width="195"/>
+					  <el-table-column align="left" label="组员3" prop="2" width="195"/>
+			  <el-table-column align="left" label="组员4" prop="3" width="195"/>
+			  <el-table-column align="left" label="组员5" prop="4" width="195"/>
+			  <el-table-column align="left" label="组员6" prop="5" width="100"/>
+			  <el-table-column align="left" label="组员7" prop="6" width="100"/>
+			  <el-table-column align="left" label="组员8" prop="7" width="100"/>
+			  <el-table-column align="left" label="组员9" prop="8" width="100"/>
+			  <el-table-column align="left" label="特殊组员" prop="9" width="100"/>
+			  <el-table-column align="left" label="UNIQID" prop="ID" width="100"/>
+			</el-table>
 			</div>
 
 
@@ -481,7 +481,7 @@
 			  				   <span></span>
 			  				 </el-col> -->
 			  				<el-col :span="3">
-			  				  <el-input v-model="formDatas.name1"  placeholder="" />
+			  				  <el-input v-model="formDatas.name1" style="color:#00FF00" placeholder="" />
 			  				</el-col>
 			  				<el-col :span="3">
 			  				  <el-input v-model="formDatas.name2"  placeholder="" />
@@ -571,11 +571,11 @@
 			  				</el-col> -->
 			  </el-row>
 			</div>
-			<div style="height: 17vh; width: 15vh;margin-top: 5vh;">
+			<div style="height: 50vh; width: 15vh;margin-top: 3vh;">
 				<el-button type="text"></el-button>
 				 <el-button style="margin-bottom: 1vh; width:15vh;background-color:cornflowerblue;" @click="addBz" >新         增</el-button>
 				 <el-button  style="margin-bottom: 1vh;width:15vh;background-color:cornflowerblue;" @click="selectBz" >更新当前班组</el-button>
-<!--				 <el-button style="margin-bottom: 1vh;" @click="delBz" >删除当前班组</el-button>-->
+				 <el-button style="margin-bottom: 1vh;width:15vh;background-color:cornflowerblue;" @click="delBz" >删除当前班组</el-button>
 			</div>
 			</div>
 			</div>
@@ -2183,6 +2183,7 @@ import {
 
 import {
   EquipmentSchedulingEdit,
+  teamDel
 } from "@/api/yunyin/yunying";
 
 import {
@@ -4273,9 +4274,11 @@ const BZhandle = (val) => {
   // }
 };
 const addBz = async() => {
+  // selectedOption.value='YS-JY06-002||印品质量检测机(JP1020-18)'
   console.log(selectedOption.value)
   console.log(BZMC.value)
   console.log(currentBz.value.ID)
+  console.log(selectedOption.value.split('|')[0])
   const response = await MachineTeamAdd({
     sczl_jtbh:  selectedOption.value.split('|')[0],
     sczl_bzdh:  BZMC.value,
@@ -4301,6 +4304,7 @@ const addBz = async() => {
     sczl_rate10: formDatas.value.percentage8,
     sys_id: `【${formData.value.addr} ${JTMC}】`
   })
+  // console.log()
   if (response.code === 0) {
     ElMessage({
       type: 'success',
@@ -4391,21 +4395,26 @@ const selectBz = async() => {
 	}
 }
 const delBz = async() => {
+	
+	const UniqId=currentBz.value.ID
 	if(currentBz.value){
 		ElMessageBox.confirm('确定要删除吗?', '提示', {
 		    confirmButtonText: '确定',
 		    cancelButtonText: '取消',
 		    type: 'warning'
 		}).then(() => {
-      const response = teamDel(currentBz.value.ID)
-      if(response.code===0){
-        ElMessage({
-          type: 'success',
-          message: '成功'
-        })
-      }
+      const response = teamDel({UniqId:UniqId})
+	  response.then(result => {
+	    if(result.code===0){
+	      ElMessage({
+	        type: 'success',
+	        message: '成功'
+	      })
+	    		console.log(response)
+	    		FacilityProduction()
+	    }
+	  });      
 		    })
-    FacilityProduction()
     currentBz.value={}
 	}
 }
@@ -4749,10 +4758,20 @@ const bzryplanUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
 /* 选中某行时的背景色*/
 :deep(.el-table__body tr.current-row)>td {
   background: #ff80ff !important;
+  
 }
 /*设备作业清单背景颜色*/
 :deep(.el-table__body .back-color-row) {
-  background: #ff80ff !important;
+  background: #ff80ff !important; 
+}
+:deep(.el-table__cell) {
+  color: red;
+}
+
+
+
+.el-input{
+	color:red,
 }
 
 </style>