Эх сурвалжийг харах

员工姓名缩写生成,设备运行班组维护

Lexie 1 жил өмнө
parent
commit
a321daef1c

+ 2 - 1
src/view/job/related/related.vue

@@ -600,7 +600,8 @@ const GetYg = async () => {
   console.log(response) 
   if (response.code === 0) {
 	console.log(response.data.ygxm) 
-	formData.value.关联人员姓名=response.data.ygxm
+	formData.value.关联人员姓名=response.data.ygxm
+	formData.value.关联人员工号=response.data.员工编号
   }
 }
 function onflushed() {

+ 2 - 0
src/view/job/rewards/rewards.vue

@@ -1231,8 +1231,10 @@ const GetYg = (event, inputName) => {
                 // 设置值
                 if (inputName >= 1 && inputName <= 9) {
                     detailData['jlname' + inputName] = response.data.ygxm;
+					detailData['JL_bh' + inputName] = response.data.员工编号;
                 } else if (inputName >= 10 && inputName <= 18) {
                     detailData['zrname' + (inputName - 9)] = response.data.ygxm;
+					detailData['sczl_bh' + (inputName - 9)] = response.data.员工编号;					
                 }
             }
         });

+ 1 - 0
src/view/job/sampling/sampling.vue

@@ -567,6 +567,7 @@ const handleGetYg = async() => {
     const res = await getYg({ sczl_bh: detailData.Sczl_bh })
     if (res.code === 0) {
       detailData.name = res.data.ygxm
+	  detailData.Sczl_bh= res.data.员工编号
     }
   } catch (e) {
     console.log(e)

+ 1 - 0
src/view/performance/07-otherDocuments/index.vue

@@ -510,6 +510,7 @@ const handleYgbhEnter = async() => {
   const res = await getYg({ sczl_bh: detailData.Sczl_bh1 })
   if (res.code === 0) {
     detailData.name = res.data.ygxm
+	detailData.Sczl_bh1 = res.data.员工编号
   }
 }
 

+ 3 - 1
src/view/performance/08-timesheet/index.vue

@@ -756,8 +756,10 @@ const moveFocus = async(event) => {
         }
         const res = await getYg({ sczl_bh })
         if (res.code === 0) {
-          const { data: { ygxm }} = res
+          const { data: { 员工编号,ygxm }} = res
+		  console.log((index - 1) / 5 + 1)
           detailData[`name${(index - 1) / 5 + 1}`] = ygxm
+		  detailData[`wgjs_bh${(index - 1) / 5 + 1}`] = 员工编号
         }
       }
       break

+ 1 - 0
src/view/performance/Dayreports.vue

@@ -1472,6 +1472,7 @@ const GetYg = (event,inputName) => {
 			if (response.code === 0) {
 				//设置比例
 				formData.value['sczl_bh'+inputName+'_name'] = response.data.ygxm;
+				formData.value['sczl_bh'+inputName] = response.data.员工编号;
 			}else{
 				formData.value['sczl_bh'+inputName+'_name'] = '';
 			}

+ 1 - 0
src/view/performance/MachineDocuments.vue

@@ -987,6 +987,7 @@ const getYgMcsubmit = (inputName) => {
 		getYg({sczl_bh:value}).then(response=>{
 			if (response.code === 0) {
 				formData.value['sczl_bh' + inputName+'_name']=response.data.ygxm
+				formData.value['sczl_bh' + inputName]=response.data.员工编号
 				setColorReadonly('name'+inputName)
 			}else{
 				formData.value['sczl_bh' + inputName+'_name']='';

+ 4 - 2
src/view/performance/Manualdocuments.vue

@@ -822,8 +822,10 @@ const ent = (event, inputName) => {
 	if(value){
 		getYg({sczl_bh:value}).then(response => {
 			if (response.code == 0) {
-				let Bname = 'sczl_bh' + inputName+'_name';
-				formData.value[Bname]=response.data.ygxm;
+				let Bname = 'sczl_bh' + inputName+'_name';
+				let Bbh = 'sczl_bh' + inputName;
+				formData.value[Bname]=response.data.ygxm;
+				formData.value[Bbh]=response.data.员工编号;
 				//设置姓名样式
 				unsetColorReadonly('cl'+inputName)
 				unsetColorReadonly('fp'+inputName)

+ 5 - 1
src/view/performance/chejianbaogong.vue

@@ -2767,6 +2767,7 @@ const getbzyg = async (value,key) => {
   const response = await getYg({sczl_bh:formDatas.value[bzyg]});
   if (response.code === 0) {
     formDatas.value[bzxm]=response.data.ygxm
+	formDatas.value[bzyg]=response.data.员工编号
   }
 }
 
@@ -2789,7 +2790,11 @@ const GetYg = async (value,inputName) => {
   if (response.code === 0) {
 	// console.log(response.data.ygxm)
 	let Bname = 'sczl_name' + inputName;
+	let Bbh = 'sczl_bh' + inputName;
+	console.log(Bbh)
 	formData3.value[Bname]=response.data.ygxm
+	formData3.value[Bbh]=response.data.员工编号
+	
 	// console.log(formData.value[Bname])
   }
 }
@@ -4328,7 +4333,6 @@ const addBz = async() => {
       type: 'success',
       message: '成功'
     })
-    FacilityProduction()
   }
 }
 

+ 486 - 299
src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -12,7 +12,7 @@
 			<el-button type="primary" class="bt" @click="onClear" >换型清场</el-button>
 			<el-button type="primary" class="bt" @click="onDel"  v-if="DelType === true" >删除</el-button>
 			<el-button type="primary" class="bt" @click="onADD" v-if="AddType === true">新增</el-button>
-			<el-button type="primary" class="bt" @click="onADD" v-if="AddType === true">核算参数调整</el-button>
+			<el-button type="primary" class="bt" @click="hesuan" v-if="AddType === true">核算参数调整</el-button>
 			<el-button type="primary" class="bt" @click="onADD" v-if="AddType === true">修正核算参数</el-button>
 			<!-- <el-button type="primary" @click="onClear2" >换型清场</el-button> -->
 		</header>
@@ -280,258 +280,263 @@
                       </el-tabs>
           </div>
 		  
-          <el-dialog v-model="detailShow" style="width: 1000px" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
-            <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"
-                        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="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="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="85"/>
-              <el-table-column align="left" label="UNIQID" prop="ID" width="75"/>
-            </el-table>
-          			
-          			
-          			 
-          				
-          			<el-row :gutter="20">
-          			 <el-col :span="10">
-          			   <el-form-item label="机台编号" prop="id">
-          			 <el-select v-model="selectedOption" placeholder="请选择">
-          			   <el-option
-          			     v-for="item in dropdownOptions"
-          			     :key="item.value"
-          			     :label="item.label"
-          			     :value="item.value"
-          			   ></el-option>
-          			 </el-select>
-          			   </el-form-item>
-          			 </el-col>
-          			 <el-col :span="10">
-          			   <el-form-item label="班组编号" prop="id">
-          				<el-input v-model="BZMC" :clearable="true" placeholder="" />			 
-          			   </el-form-item>
-          			 </el-col>
-          			</el-row> 	
-          			<div style="display: flex;">
-          			<div class="groupbox float-div" style="height: 17vh; width: 800px;">
-          			    <span class="grouptitle">组员及分配比例</span>
-          				<el-row :gutter="10" style="margin-top: 0px; height: 5vh;">
-          								 <el-col :span="2">
-          								   <span></span>
-          								 </el-col>
-          								<el-col :span="2">
-          								  
-          								</el-col>
-          								<el-col :span="2">
-          								  
-          								</el-col>
-          								<el-col :span="2">
-          								  
-          								</el-col>
-          								<el-col :span="2">
-          								  
-          								</el-col>
-          								<el-col :span="2">
-          								 
-          								</el-col>
-          								<el-col :span="2">
-          								 
-          								</el-col>
-          								<el-col :span="2">
-          								  
-          								</el-col>
-          								<el-col :span="2">
-          								  
-          								</el-col>
-          								<el-col :span="3">
-          								  
-          								</el-col>
-          								<el-col :span="3">
-          								 <el-form-item label="特殊组员" prop="id">
-          								 						 
-          								 </el-form-item>
-          								</el-col>
-          				</el-row>
-          				<el-row :gutter="10" style="margin-top: 0px;">
-          				 <!-- <el-col :span="1">
-          				   <span></span>
-          				 </el-col> -->
-          				 
-          				 
-          				
-          				
-          				
-          				
-          				
-          				<el-col :span="3">
-          				  <el-input v-model="formDatas.code1" :clearable="true" placeholder="" />
-          				</el-col>
-          				<el-col :span="3">
-          				  <el-input v-model="formDatas.code2" :clearable="true" placeholder="" />
-          				</el-col>
-          				<el-col :span="3">
-          				  <el-input v-model="formDatas.code3" :clearable="true" placeholder="" />
-          				</el-col>
-          				<el-col :span="3">
-          				  <el-input v-model="formDatas.code4" :clearable="true" placeholder="" />
-          				</el-col>
-          				<el-col :span="3">
-          				  <el-input v-model="formDatas.code5" :clearable="true" placeholder="" />
-          				</el-col>
-          				<el-col :span="3">
-          				  <el-input v-model="formDatas.code6" :clearable="true" placeholder="" />
-          				</el-col>
-          				<el-col :span="3">
-          				  <el-input v-model="formDatas.code7" :clearable="true" placeholder="" />
-          				</el-col>
-          				<el-col :span="3">
-          				  <el-input v-model="formDatas.code8" :clearable="true" placeholder="" />
-          				</el-col>
-          				<!-- <el-col :span="2">
-          				  <el-input v-model="formData.name" :clearable="true" placeholder="瞿春生" />
-          				</el-col>
-          				<el-col :span="2">
-          				  <el-input v-model="percentage" :clearable="true" placeholder="11.0" />
-          				</el-col>
-          				<el-col :span="2">
-          				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="打包废纸" />
-          				</el-col>
-          				<el-col :span="2">
-          				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="是" />
-          				</el-col>
-          				<el-col :span="2">
-          				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="ZI00401" />
-          				</el-col>
-          				<el-col :span="2">
-          				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="瞿春生" />
-          				</el-col>
-          				<el-col :span="2">
-          				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
-          				</el-col>
-          				<el-col :span="2">
-          				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
-          				</el-col>
-          				<el-col :span="2">
-          				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
-          				</el-col> -->
-          			  </el-row>
-          			 <el-row :gutter="10" style="margin-top: 1px;">
-          			  				 <!-- <el-col :span="2">
-          			  				   <span></span>
-          			  				 </el-col> -->
-          			  				<el-col :span="3">
-          			  				  <el-input v-model="formDatas.name1" :clearable="true" placeholder="" />
-          			  				</el-col>
-          			  				<el-col :span="3">
-          			  				  <el-input v-model="formDatas.name2" :clearable="true" placeholder="" />
-          			  				</el-col>
-          			  				<el-col :span="3">
-          			  				  <el-input v-model="formDatas.name3" :clearable="true" placeholder="" />
-          			  				</el-col>
-          			  				<el-col :span="3">
-          			  				  <el-input v-model="formDatas.name4" :clearable="true" placeholder="" />
-          			  				</el-col>
-          							<el-col :span="3">
-          							  <el-input v-model="formDatas.name5" :clearable="true" placeholder="" />
-          							</el-col>
-          							<el-col :span="3">
-          							  <el-input v-model="formDatas.name6" :clearable="true" placeholder="" />
-          							</el-col>
-          							<el-col :span="3">
-          							  <el-input v-model="formDatas.name7" :clearable="true" placeholder="" />
-          							</el-col>
-          							<el-col :span="3">
-          							  <el-input v-model="formDatas.name8" :clearable="true" placeholder="" />
-          							</el-col>
-          			  	<!-- 			<el-col :span="2">
-          			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="是" />
-          			  				</el-col>
-          			  				<el-col :span="2">
-          			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="ZI00401" />
-          			  				</el-col>
-          			  				<el-col :span="2">
-          			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="瞿春生" />
-          			  				</el-col>
-          			  				<el-col :span="2">
-          			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
-          			  				</el-col>
-          			  				<el-col :span="2">
-          			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
-          			  				</el-col>
-          			  				<el-col :span="2">
-          			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
-          			  				</el-col> -->
-          			  </el-row>
-          			  <el-row :gutter="10" style="margin-top: 1px;">
-          			  				 <!-- <el-col :span="2">
-          			  				   <span></span>
-          			  				 </el-col> -->
-          			  				<el-col :span="3">
-          			  				  <el-input v-model="formDatas.percentage1" :clearable="true" placeholder="" />
-          			  				</el-col>
-          			  				<el-col :span="3">
-          			  				  <el-input v-model="formDatas.percentage2" :clearable="true" placeholder="" />
-          			  				</el-col>
-          			  				<el-col :span="3">
-          			  				  <el-input v-model="formDatas.percentage3" :clearable="true" placeholder="" />
-          			  				</el-col>
-          			  				<el-col :span="3">
-          			  				  <el-input v-model="formDatas.percentage4" :clearable="true" placeholder="" />
-          			  				</el-col>
-          							<el-col :span="3">
-          							  <el-input v-model="formDatas.percentage5" :clearable="true" placeholder="" />
-          							</el-col>
-          							<el-col :span="3">
-          							  <el-input v-model="formDatas.percentage6" :clearable="true" placeholder="" />
-          							</el-col>
-          							<el-col :span="3">
-          							  <el-input v-model="formDatas.percentage5" :clearable="true" placeholder="" />
-          							</el-col>
-          							<el-col :span="3">
-          							  <el-input v-model="formDatas.percentage6" :clearable="true" placeholder="" />
-          							</el-col>
-          			  			<!-- 	<el-col :span="2">
-          			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="是" />
-          			  				</el-col>
-          			  				<el-col :span="2">
-          			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="ZI00401" />
-          			  				</el-col>
-          			  				<el-col :span="2">
-          			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="瞿春生" />
-          			  				</el-col>
-          			  				<el-col :span="2">
-          			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
-          			  				</el-col>
-          			  				<el-col :span="2">
-          			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
-          			  				</el-col>
-          			  				<el-col :span="2">
-          			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
-          			  				</el-col> -->
-          			  </el-row>
-          			</div>
-          			<div style="height: 17vh; width: 100px;margin-top: 30px;">
-          				<el-button type="text"></el-button>
-          				<!-- <el-button style="margin-bottom: 5px;" @click="" >新增</el-button> -->
-          				<el-button style="margin-bottom: 5px;" @click="selectBz" >更新当前班组</el-button>
-          				<!-- <el-button @click="delBz" >删除当前班组</el-button> -->
-          			</div>
-          			</div>
+          <el-dialog v-model="detailShow"
+           fullscreen
+           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' ,color:'blue'}" :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="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>
+          
+          
+          
+            <div style="margin-top:100px;">
+          			<el-row :gutter="20">
+          			 <el-col :span="10">
+          			   <el-form-item label="机台编号" prop="id">
+          			 <el-select v-model="selectedOption" placeholder="请选择">
+          			   <el-option
+          			     v-for="item in dropdownOptions"
+          			     :key="item.value"
+          			     :label="item.label"
+          			     :value="item.value"
+          			   ></el-option>
+          			 </el-select>
+          			   </el-form-item>
+          			 </el-col>
+          			 <el-col :span="10">
+          			   <el-form-item label="班组编号" prop="id">
+          				<el-input v-model="BZMC"  placeholder="" />
+          			   </el-form-item>
+          			 </el-col>
+          			</el-row>
+          			<div style="display: flex;">
+          			<div class="groupbox float-div" style="height: 17vh; width: 130vh;">
+          			    <span class="grouptitle">组员及分配比例</span>
+          				<el-row :gutter="10" style="margin-top: 0px; height: 5vh;">
+          								 <el-col :span="2">
+          								   <span></span>
+          								 </el-col>
+          								<el-col :span="2">
+          
+          								</el-col>
+          								<el-col :span="2">
+          
+          								</el-col>
+          								<el-col :span="2">
+          
+          								</el-col>
+          								<el-col :span="2">
+          
+          								</el-col>
+          								<el-col :span="2">
+          
+          								</el-col>
+          								<el-col :span="2">
+          
+          								</el-col>
+          								<el-col :span="2">
+          
+          								</el-col>
+          								<el-col :span="2">
+          
+          								</el-col>
+          								<el-col :span="3">
+          
+          								</el-col>
+          								<el-col :span="3">
+          								 <el-form-item label="特殊组员" prop="id">
+          
+          								 </el-form-item>
+          								</el-col>
+          				</el-row>
+          				<el-row :gutter="10" style="margin-top: 0px;">
+          				 <!-- <el-col :span="1">
+          				   <span></span>
+          				 </el-col> -->
+          
+          
+          
+          
+          
+          
+          
+          				<el-col :span="3">
+          				  <el-input v-model="formDatas.code1" @keyup.enter.native="getbzyg($event, '1')" placeholder="" />
+          				</el-col>
+          				<el-col :span="3">
+          				  <el-input v-model="formDatas.code2" @keyup.enter.native="getbzyg($event, '2')"  placeholder="" />
+          				</el-col>
+          				<el-col :span="3">
+          				  <el-input v-model="formDatas.code3" @keyup.enter.native="getbzyg($event, '3')" placeholder="" />
+          				</el-col>
+          				<el-col :span="3">
+          				  <el-input v-model="formDatas.code4" @keyup.enter.native="getbzyg($event, '4')" placeholder="" />
+          				</el-col>
+          				<el-col :span="3">
+          				  <el-input v-model="formDatas.code5" @keyup.enter.native="getbzyg($event, '5')" placeholder="" />
+          				</el-col>
+          				<el-col :span="3">
+          				  <el-input v-model="formDatas.code6" @keyup.enter.native="getbzyg($event, '6')" placeholder="" />
+          				</el-col>
+          				<el-col :span="3">
+          				  <el-input v-model="formDatas.code7" @keyup.enter.native="getbzyg($event, '7')" placeholder="" />
+          				</el-col>
+          				<el-col :span="3">
+          				  <el-input v-model="formDatas.code8" @keyup.enter.native="getbzyg($event, '8')" placeholder="" />
+          				</el-col>
+          				<!-- <el-col :span="2">
+          				  <el-input v-model="formData.name"  placeholder="瞿春生" />
+          				</el-col>
+          				<el-col :span="2">
+          				  <el-input v-model="percentage"  placeholder="11.0" />
+          				</el-col>
+          				<el-col :span="2">
+          				  <el-input v-model="formData.qczl_NumDesc"  placeholder="打包废纸" />
+          				</el-col>
+          				<el-col :span="2">
+          				  <el-input v-model="formData.qczl_NumDesc"  placeholder="是" />
+          				</el-col>
+          				<el-col :span="2">
+          				  <el-input v-model="formData.qczl_NumDesc"  placeholder="ZI00401" />
+          				</el-col>
+          				<el-col :span="2">
+          				  <el-input v-model="formData.qczl_NumDesc"  placeholder="瞿春生" />
+          				</el-col>
+          				<el-col :span="2">
+          				  <el-input v-model="formData.qczl_NumDesc"  placeholder="11.0" />
+          				</el-col>
+          				<el-col :span="2">
+          				  <el-input v-model="formData.qczl_NumDesc"  placeholder="11.0" />
+          				</el-col>
+          				<el-col :span="2">
+          				  <el-input v-model="formData.qczl_NumDesc"  placeholder="11.0" />
+          				</el-col> -->
+          			  </el-row>
+          			 <el-row :gutter="10" style="margin-top: 1px;">
+          			  				 <!-- <el-col :span="2">
+          			  				   <span></span>
+          			  				 </el-col> -->
+          			  				<el-col :span="3">
+          			  				  <el-input v-model="formDatas.name1" style="color:#00FF00" placeholder="" />
+          			  				</el-col>
+          			  				<el-col :span="3">
+          			  				  <el-input v-model="formDatas.name2"  placeholder="" />
+          			  				</el-col>
+          			  				<el-col :span="3">
+          			  				  <el-input v-model="formDatas.name3"  placeholder="" />
+          			  				</el-col>
+          			  				<el-col :span="3">
+          			  				  <el-input v-model="formDatas.name4"  placeholder="" />
+          			  				</el-col>
+          							<el-col :span="3">
+          							  <el-input v-model="formDatas.name5"  placeholder="" />
+          							</el-col>
+          							<el-col :span="3">
+          							  <el-input v-model="formDatas.name6"  placeholder="" />
+          							</el-col>
+          							<el-col :span="3">
+          							  <el-input v-model="formDatas.name7"  placeholder="" />
+          							</el-col>
+          							<el-col :span="3">
+          							  <el-input v-model="formDatas.name8"  placeholder="" />
+          							</el-col>
+          			  	<!-- 			<el-col :span="2">
+          			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="是" />
+          			  				</el-col>
+          			  				<el-col :span="2">
+          			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="ZI00401" />
+          			  				</el-col>
+          			  				<el-col :span="2">
+          			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="瞿春生" />
+          			  				</el-col>
+          			  				<el-col :span="2">
+          			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="11.0" />
+          			  				</el-col>
+          			  				<el-col :span="2">
+          			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="11.0" />
+          			  				</el-col>
+          			  				<el-col :span="2">
+          			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="11.0" />
+          			  				</el-col> -->
+          			  </el-row>
+          			  <el-row :gutter="10" style="margin-top: 1px;">
+          			  				 <!-- <el-col :span="2">
+          			  				   <span></span>
+          			  				 </el-col> -->
+          			  				<el-col :span="3">
+          			  				  <el-input v-model="formDatas.percentage1"  placeholder="" />
+          			  				</el-col>
+          			  				<el-col :span="3">
+          			  				  <el-input v-model="formDatas.percentage2"  placeholder="" />
+          			  				</el-col>
+          			  				<el-col :span="3">
+          			  				  <el-input v-model="formDatas.percentage3"  placeholder="" />
+          			  				</el-col>
+          			  				<el-col :span="3">
+          			  				  <el-input v-model="formDatas.percentage4"  placeholder="" />
+          			  				</el-col>
+          							<el-col :span="3">
+          							  <el-input v-model="formDatas.percentage5"  placeholder="" />
+          							</el-col>
+          							<el-col :span="3">
+          							  <el-input v-model="formDatas.percentage6"  placeholder="" />
+          							</el-col>
+          							<el-col :span="3">
+          							  <el-input v-model="formDatas.percentage7"  placeholder="" />
+          							</el-col>
+          							<el-col :span="3">
+          							  <el-input v-model="formDatas.percentage8"  placeholder="" />
+          							</el-col>
+          			  			<!-- 	<el-col :span="2">
+          			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="是" />
+          			  				</el-col>
+          			  				<el-col :span="2">
+          			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="ZI00401" />
+          			  				</el-col>
+          			  				<el-col :span="2">
+          			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="瞿春生" />
+          			  				</el-col>
+          			  				<el-col :span="2">
+          			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="11.0" />
+          			  				</el-col>
+          			  				<el-col :span="2">
+          			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="11.0" />
+          			  				</el-col>
+          			  				<el-col :span="2">
+          			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="11.0" />
+          			  				</el-col> -->
+          			  </el-row>
+          			</div>
+          			<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;width:15vh;background-color:cornflowerblue;" @click="delBz" >删除当前班组</el-button>
+          			</div>
+          			</div>
+          			</div>
           </el-dialog>
 
 
@@ -1826,9 +1831,23 @@
 		</el-dialog>
 		
 		
-		<el-dialog v-model="hesuanVisible" :before-close="closehesuanVisible" title="核算参数调整"
-		  destroy-on-close width="80%" style="height: 100%;">
+		<el-dialog v-model="hesuanVisible" :before-close="closehesuanVisible" title="核算参数调整" destroy-on-close width="20%" style="height: 40%;">
+		  <div style="display: flex; align-items: center;">
+		    <label>参数类型:</label>
+		    <el-radio v-model="selectedOption" label="难度调整系数"></el-radio>
+		  </div>
+		
+		  <div style="margin-top: 10px;margin-left: 70px;">
+		    <el-radio v-model="selectedOption" label="凹印版距"></el-radio>
+		  </div>
+		  
+		  <div style="margin-top: 10px;margin-left: 70px;">
+		    <el-radio v-model="selectedOption" label="色度数"></el-radio>
+		  </div>
 		  
+		  <div style="margin-top: 10px;margin-left: 70px;">
+			  
+		  </div>
 		</el-dialog>
 		
 		<Shebeizhuangtai
@@ -1858,7 +1877,10 @@ import {
   findCompany,
   getCompanyList
 } from '@/api/company'
-
+import {
+  EquipmentSchedulingEdit,
+  teamDel
+} from "@/api/yunyin/yunying";
 import {
   facilityTab,
   facilitychanLiang,
@@ -1901,7 +1923,10 @@ import {
    AdditionalInspectionRecordAdd,
    ProcessInspectionRecordsItemAdd
 } from '@/api/jixiaoguanli/jitairibaobiao'
-
+import {
+MachineTeamAdd,
+  setMachineTeam,
+} from '@/api/jixiaoguanli/baogong'
 import {
   FieldInspectionRecord
 } from "@/api/mes/job";
@@ -1984,7 +2009,9 @@ const handleNodeClick = (nodeData,node) => {
 		  // FacilityDetail()
           console.log(node.label); // 第三级节点
 	   }      
-}
+}
+
+const hesuanVisible = ref(false)
 const MachineVisible = ref(false)
 const machineData = reactive([])
 
@@ -2348,6 +2375,10 @@ const Chanliangdel = async() => {
 		  message: '失败'
 		})
 	}
+}
+//核算调整
+function hesuan(){
+	hesuanVisible.value=true
 }
 //制程检验
 const zhichengstatus=ref(false)
@@ -3004,32 +3035,136 @@ function onBZ() {
 	fetchData()
 	detailShow.value=true
 	console.log('2222')
+}
+const addBz = async() => {
+  // selectedOption.value='YS-JY06-002||印品质量检测机(JP1020-18)'
+  console.log(selectedOption.value)
+  console.log(BZMC.value)
+  console.log(selectedOption.value.split('|')[0])
+  const response = await MachineTeamAdd({
+    sczl_jtbh:  selectedOption.value.split('|')[0],
+    sczl_bzdh:  BZMC.value,
+    sczl_bh1:   formDatas.value.code1,
+    sczl_bh2:   formDatas.value.code2,
+    sczl_bh3:   formDatas.value.code3,
+    sczl_bh4:   formDatas.value.code4,
+    sczl_bh5:   formDatas.value.code5,
+    sczl_bh6:   formDatas.value.code6,
+    sczl_bh7:   formDatas.value.code7,
+    sczl_bh8:   formDatas.value.code10,
+    sczl_bh9:   formDatas.value.code9,
+    sczl_bh10:   formDatas.value.code8,
+    sczl_rate1: formDatas.value.percentage1,
+    sczl_rate2: formDatas.value.percentage2,
+    sczl_rate3: formDatas.value.percentage3,
+    sczl_rate4: formDatas.value.percentage4,
+    sczl_rate5: formDatas.value.percentage5,
+    sczl_rate6: formDatas.value.percentage6,
+    sczl_rate7: formDatas.value.percentage7,
+    sczl_rate8: formDatas.value.percentage10,
+    sczl_rate9: formDatas.value.percentage9,
+    sczl_rate10: formDatas.value.percentage8,
+    sys_id: sys_id
+  })
+  // console.log()
+  if (response.code === 0) {
+    ElMessage({
+      type: 'success',
+      message: '成功'
+    })
+	FacilityTeam(JTMC)
+	fetchData()
+    // FacilityProduction()
+  }
 }
 const currentBz ={}
-const selectBz = async() => {
-	if(currentBz.value){
-		BZMC.value=currentBz.value.班组号
-		let sczl_bhkey=''
-		let sczl_namekey=''
-		if (currentBz.value) {
-		  for (let i = 1; i <= 6; i++) {
-		  	sczl_bhkey=`sczl_bh${i}`
-		    sczl_namekey=`sczl_name${i}`
-		    formData.value[sczl_bhkey] = '';
-		    formData.value[sczl_namekey] = '';
-		  }
-		  for (let i = 1; i <= Math.min(Object.keys(currentBz.value).length-4, 6); i++) {
-			sczl_bhkey=`sczl_bh${i}`
-			sczl_namekey=`sczl_name${i}`
-			console.log(currentBz.value[i-1].split(' '))
-		    formData.value[sczl_bhkey] = currentBz.value[i-1].split(' ')[0];
-		    formData.value[sczl_namekey] = currentBz.value[i-1].split(' ')[1];
-		    classbz.value[i-1]=currentBz.value[i-1].split(' ')[0]
-		  }
-		  formData.value.class=classbz.value.join(',')
-		}
-		currentBz.value={}
-	}
+const selectBz = async() => {
+	if(currentBz.value){
+		BZMC.value=currentBz.value.班组号
+		let sczl_bhkey=''
+		let sczl_namekey=''
+    if (currentBz.value[9]) {
+      for (let i = 1; i <= 9; i++) {
+        sczl_bhkey=`sczl_bh${i}`
+        sczl_namekey=`sczl_name${i}`
+        formData.value[sczl_bhkey] = '';
+        formData.value[sczl_namekey] = '';
+      }
+      formData.value.sczl_bh10 = currentBz.value[9].split(' ')[0];
+      formData.value.sczl_name10=currentBz.value[9].split(' ')[1]
+      for (let i = 1; i <= Math.min(Object.keys(currentBz.value).length-5, 6); i++) {
+        sczl_bhkey=`sczl_bh${i}`
+        sczl_namekey=`sczl_name${i}`
+        console.log(currentBz.value[i-1].split(' '))
+        formData.value[sczl_bhkey] = currentBz.value[i-1].split(' ')[0];
+        formData.value[sczl_namekey] = currentBz.value[i-1].split(' ')[1];
+        classbz.value[i-1]=currentBz.value[i-1].split(' ')[0]
+      }
+      classbz.value.push(currentBz.value[9].split(' ')[0])
+      formData.value.class=classbz.value.join(',')
+      console.log(formData.value)
+    }else{
+      for (let i = 1; i <= 10; i++) {
+        sczl_bhkey=`sczl_bh${i}`
+        sczl_namekey=`sczl_name${i}`
+        formData.value[sczl_bhkey] = '';
+        formData.value[sczl_namekey] = '';
+      }
+      for (let i = 1; i <= Math.min(Object.keys(currentBz.value).length-4, 6); i++) {
+        sczl_bhkey=`sczl_bh${i}`
+        sczl_namekey=`sczl_name${i}`
+        console.log(currentBz.value[i-1].split(' '))
+        formData.value[sczl_bhkey] = currentBz.value[i-1].split(' ')[0];
+        formData.value[sczl_namekey] = currentBz.value[i-1].split(' ')[1];
+        classbz.value[i-1]=currentBz.value[i-1].split(' ')[0]
+      }
+      formData.value.class=classbz.value.join(',')
+    }
+		const response = await setMachineTeam({
+			machine: JTMC.split("#")[0],
+			order:formData.value.工单编号,
+			yjno:formData.value.印件号,
+			gy_name:formData.value.工序名称,
+			sczl_bzdh:BZMC.value,
+			status:'生产',
+			production_now:0,
+			production_all:0,
+			team_id:currentBz.value.ID
+			})
+		if(response.code===0){
+			ElMessage({
+			  type: 'success',
+			  message: '成功'
+			})
+      FacilityProduction()
+    }
+		// currentBz.value={}
+	}
+}
+const delBz = async() => {
+	
+	const UniqId=currentBz.value.ID
+	if(currentBz.value){
+		ElMessageBox.confirm('确定要删除吗?', '提示', {
+		    confirmButtonText: '确定',
+		    cancelButtonText: '取消',
+		    type: 'warning'
+		}).then(() => {
+      const response = teamDel({UniqId:UniqId})
+	  response.then(result => {
+	    if(result.code===0){
+	      ElMessage({
+	        type: 'success',
+	        message: '成功'
+	      })
+	    		console.log(response)
+	    		FacilityTeam(JTMC)
+	    		fetchData()
+	    }
+	  });      
+		    })
+    currentBz.value={}
+	}
 }
 
 // 下拉框选项数据
@@ -3131,23 +3266,75 @@ const formDatas = ref({
 
 
 //班组单击
-const BZhandle = (val, row) => {
-  formDatas.value  = {};
-  for (const key in val) {
-    if (val[key] === 0) {
-      break;
-    }
-    const parts = val[key].split(/[\s()]+/);
-    const code = parts[0];
-    const name = parts[1];
-    const percentage = parts[2];
-
-    // 根据索引填充不同的字段
-    const index = parseInt(key) + 1; // 索引从1开始
-    formDatas.value['code' + index] = code;
-    formDatas.value['name' + index] = name;
-    formDatas.value['percentage' + index] = percentage;
-  }
+const BZhandle = (val) => {
+  currentBz.value = val
+  formDatas.value = {};
+  let sczl_bhkey = ''
+  let sczl_namekey = ''
+  let percentagekey = ''
+  if (currentBz.value[9]) {
+    for (let i = 1; i <= 9; i++) {
+      sczl_bhkey = `code${i}`
+      sczl_namekey = `name${i}`
+      percentagekey = `percentage${i}`
+      formDatas.value[sczl_bhkey] = '';
+      formDatas.value[sczl_namekey] = '';
+      formDatas.value[percentagekey] = '';
+    }
+    formDatas.value.code8 = currentBz.value[9].split(' ')[0];
+    formDatas.value.name8 = currentBz.value[9].split(' ')[1]
+    formDatas.value.percentage8 = parseFloat(currentBz.value[9].split(' ')[2].split('(')[1].split(')')[0])/100
+    for (let i = 1; i <= Math.min(Object.keys(currentBz.value).length - 5, 6); i++) {
+      sczl_bhkey = `code${i}`
+      sczl_namekey = `name${i}`
+      percentagekey = `percentage${i}`
+      formDatas.value[sczl_bhkey] = currentBz.value[i - 1].split(' ')[0];
+      formDatas.value[sczl_namekey] = currentBz.value[i - 1].split(' ')[1];
+      if(isNaN(parseFloat(currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0]))){
+        formDatas.value[percentagekey] = currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0];
+      }else{
+        formDatas.value[percentagekey] = parseFloat(currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0])/100;
+      }
+    }
+  } else {
+    for (let i = 1; i <= 10; i++) {
+      sczl_bhkey = `code${i}`
+      sczl_namekey = `name${i}`
+      percentagekey = `percentage${i}`
+      formDatas.value[sczl_bhkey] = '';
+      formDatas.value[sczl_namekey] = '';
+      formDatas.value[percentagekey] = '';
+    }
+    for (let i = 1; i <= Math.min(Object.keys(currentBz.value).length - 4, 6); i++) {
+      sczl_bhkey = `code${i}`
+      sczl_namekey = `name${i}`
+      percentagekey = `percentage${i}`
+      formDatas.value[sczl_bhkey] = currentBz.value[i - 1].split(' ')[0];
+      formDatas.value[sczl_namekey] = currentBz.value[i - 1].split(' ')[1];
+      if(isNaN(parseFloat(currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0]))){
+        formDatas.value[percentagekey] = currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0];
+      }else{
+        formDatas.value[percentagekey] = parseFloat(currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0])/100;
+      }
+    }
+  }
+  console.log(formDatas)
+  // for (const key in val) {
+  //   if (val[key] === 0) {
+  //     break;
+  //   }
+  //   const parts = val[key].split(/[\s()]+/);
+  //   const code = parts[0];
+  //   const name = parts[1];
+  //   const percentage = parts[2];
+  //
+  //   // 根据索引填充不同的字段
+  //   const index = parseInt(key) + 1; // 索引从1开始
+  //   formDatas.value['code' + index] = code;
+  //   formDatas.value['name' + index] = name;
+  //   formDatas.value['percentage' + index] = percentage;
+	  BZMC.value=val.班组号
+  // }
 };
 
 const chanliangVisible = ref(false)