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

src/view/performance/chejianbaogong.vue

@@ -14,7 +14,8 @@
 			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 70px" @click="pd_gdprintonClick" >工单打印</el-button>
 			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 95px" @click="gzSel" >员工工资查询</el-button>
 			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 70px" @click="oncomplaints" >客诉记录</el-button>
-		</div>
+      <el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 120px" @click="deldbcl_onclick" :disabled="dbclSelection === ''"   title="当班产量明细" >当班产量明细删除</el-button>
+    </div>
 		</header>
     <el-container>
       <!-- <el-aside width="200px">
@@ -158,7 +159,7 @@
                       :header-cell-style="{ padding: '0px' }"
                       @row-dblclick="ybupdateCompanyFunc"
                       style="width: 100%;height: 400px;color:purple;font-weight: bold;" border tooltip-effect="dark"
-                      :data="CLMXData" row-key="ID" @selection-change="dbclmxhandleSelectionChange">
+                      :data="CLMXData" row-key="ID" @selection-change="dbclmxSelectionChange">
               <el-table-column type="selection" width="55" />
               <el-table-column align="left" label="生产时段" prop="生产时间段"  width="180"/>
               <el-table-column align="left" label="工单编号" prop="工单编号" width="120" />
@@ -361,33 +362,16 @@
 								<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="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="3"><el-input v-model="formDatas.code1" @keyup.enter.native="getbzyg($event, '1')"/></el-col>
+          <el-col :span="3"><el-input v-model="formDatas.code2" @keyup.enter.native="getbzyg($event, '2')"/></el-col>
+          <el-col :span="3"><el-input v-model="formDatas.code3" @keyup.enter.native="getbzyg($event, '3')"/></el-col>
+          <el-col :span="3"><el-input v-model="formDatas.code4" @keyup.enter.native="getbzyg($event, '4')"/></el-col>
+          <el-col :span="3"><el-input v-model="formDatas.code5" @keyup.enter.native="getbzyg($event, '5')"/></el-col>
+          <el-col :span="3"><el-input v-model="formDatas.code6" @keyup.enter.native="getbzyg($event, '6')"/></el-col>
+          <el-col :span="3"><el-input v-model="formDatas.code7" @keyup.enter.native="getbzyg($event, '7')"/></el-col>
+          <el-col :span="3"><el-input v-model="formDatas.code8" @keyup.enter.native="getbzyg($event, '8')"/></el-col>
 			  </el-row>
 			 <el-row :gutter="10" style="margin-top: 1px;font-weight: bold;color:purple">
-<!--              <el-col :span="2"><span></span></el-col> -->
           <el-col :span="3"><el-input v-model="formDatas.name1"  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>
@@ -411,7 +395,7 @@
 			<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;font-size: 2.0vh;font-weight: bold; color: white;" @click="addBz"  >新         增</el-button>
-				 <el-button  style="margin-bottom: 1vh;width:15vh;background-color:cornflowerblue;font-size: 2.0vh;font-weight: bold; color: white;" @click="selectBz" >更新当前班组</el-button>
+				 <el-button style="margin-bottom: 1vh;width:15vh;background-color:cornflowerblue;font-size: 2.0vh;font-weight: bold; color: white;" @click="selectBz" >更新当前班组</el-button>
 				 <el-button style="margin-bottom: 1vh;width:15vh;background-color:cornflowerblue;font-size: 2.0vh;font-weight: bold; color: white;" @click="delBz" >删除当前班组</el-button>
 			</div>
 			</div>
@@ -2245,6 +2229,9 @@ const handleNodeClick = (nodeData,node) => {
 // });
 const classbz=ref([])
 const FacilityProduction = async (addr) => {
+  if(JTMC === '' || JTMC === null){
+    return false;
+  }
   const response = await facilityProduction({machine:JTMC});
   if (response.code === 0) {
     if(response.data){
@@ -2275,40 +2262,27 @@ const FacilityProduction = async (addr) => {
         }
         formData.value.class=classbz.value.join(',')
       }
-      //      for (let i = 1; i <= 10; i++) {
-      //        if (response.data.班组成员) {
-      // // formData.value.['sczl_bh12'] = response.data.班组成员[i]['编号'];
-      // // formData.value['sczl_name12'] = response.data.班组成员[i]['名字'];
-      // //  console.log(formData)
-      // // console.log(response.data[sczl_bh]['员工姓名'])
-      // // console.log(formData.value.sczl_bh)
-      // // console.log(sczl_name)
-      //        } else {
-      // console.log(555555555555555)
-      //          // 如果字段不存在，可以在这里进行处理
-      //          // console.log('2');
-      // // formData.value[sczl_bh] = response.data[sczl_bh]['员工编号'];
-      // // formData.value[sczl_name] = response.data[sczl_bh]['员工姓名'];
-      // // console.log(formData.value.sczl_bh)
-      // // console.log(sczl_name)
-      //        }
-      //      }
       if(response.data.工单编号){
         InspectionRecord()
         FacilityDetail()
       }
     }
-	   const responses = await MachineDetailList({workshop:CJMC});
-	   if(responses.code===0){
-		   responses.data.map(item=>{
-			   if(item.设备编号==JTMC){
-				   formData.value.status=item.状态
-			   }
-		   })
-	   }
+     //完工1
+    if(CJMC === '' || CJMC === null){
+      console.log("CJMC空")
+      return false;
+    }else{
+      const responses = await MachineDetailList({workshop:CJMC});
+      if(responses.code===0){
+        responses.data.map(item=>{
+          if(item.设备编号==JTMC){
+            formData.value.status=item.状态
+          }
+        })
+      }
+    }
 		FacilityWorklist()
 		FacilityTeam(JTMC)
-
   }
 }
 //设备工作清单
@@ -2587,29 +2561,31 @@ const InspectionRecord = async () => {
 const FacilityDetail = async () => {
   formData.value.production_now=0
   formData.value.production_all=0
+  console.log("machine--->"+JTMC)
+  console.log("Gd_gdbh--->"+formData.value.工单编号)
+  console.log("team--->"+BZMC.value)
   const response = await facilityDetail({ machine: JTMC, Gd_gdbh: formData.value.工单编号, team:BZMC.value });
+  console.log("facilityDetail--》返回的数据")
+  console.log(response)
   if (response.code === 0) {
     if(response.data === null){
       formData.value.上机时间=currentDate+' 08:30:00'
     }else{
       formData.value.上机时间=currentDate.split('-')[0]+'-'+response.data[0]['生产时间段'].split('>')[1]+':00'
     }
-    console.log(response.data)
     CLMXData.splice(0, CLMXData.length, ...Object.values(response.data));
-	formData.value.production_now=response.data[0].产量
-	formData.value.production_all=response.data.total.产量
+    formData.value.production_now=response.data[0].产量
+    formData.value.production_all=response.data.total.产量
   }
 };
+
 //员工编号回车事件
 const getygsubmit = (event, inputName) => {
-	  // console.log(inputName)
-		  let combinedString = 'sczl_bh' + inputName;
-		   // console.log(combinedString)
-		  //  let variableName = 'sczl_gdbh'+inputName;
-		   let variableValue = eval('formData3.value.' + combinedString);
-		   // console.log(variableValue)
-		   GetYg(variableValue,inputName)
+  let combinedString = 'sczl_bh' + inputNme;
+  let variableValue = eval('formData3.value.' + combinedString);
+  GetYg(variableValue,inputName)
 }
+
 const blModel = ref(false)
 const employeeData = ref('')
 const getbzyg = async (value,key) => {
@@ -2617,6 +2593,7 @@ const getbzyg = async (value,key) => {
   bzyg=`code${key}`
   let bzxm=''
   bzxm=`name${key}`
+  console.log(formDatas.value[bzyg])
   const response = await getYg({sczl_bh:formDatas.value[bzyg]});
   console.log(response)
   if (response.code === 0) {
@@ -2649,12 +2626,10 @@ const tablebllickHandler = async (row, column, event) => {
   formDatas.value[`code${nextIndex}`] = row.员工编号;
   formDatas.value[`name${nextIndex}`] = row.ygxm;
   blModel.value = false;
-
   clicked.value = true;
   setTimeout(() => {
     clicked.value = false;
   }, 300); // 300毫秒内再次点击将不会触发事件，你可以根据需要调整这个延迟时间
-
 };
 
 const getxunchayg = async (value) => {
@@ -2970,9 +2945,12 @@ function onDel() {
 
 }
 //完工按钮
+//完工1
 function onOver() {
+  // console.log(wangongbh.value)
+  // return;
   if(formData.value.工单编号 === '' || formData.value.工单编号 === null){
-    ElMessage({type: 'warning', message: '请选择完工工单'})
+    ElMessage({type: 'warning', message: '请选择切换完工工单'})
     return false;
   }else{
     SetProcessStatus()
@@ -2981,15 +2959,12 @@ function onOver() {
 }
 //完工事件
 const SetProcessStatus = async () => {
-  // const RESCODE={
-	//  order:'2311114',
-	//  yjno:'01',
-	//  gxh:'01',
-  // }
-  console.log(formData.value.工单编号,formData.value.印件号,formData.value.工序号);
+  console.log(formData.value.工单编号);
+  console.log(formData.value.印件号);
+  console.log(formData.value.工序号);
   const response = await setProcessStatus({order:formData.value.工单编号,yjno:formData.value.印件号,gxh:formData.value.工序号});
   console.log(response)
-  if (response.code === 0) {
+  if (response.code === 0) {1
 	  FacilityProduction()
   }
 }
@@ -3146,8 +3121,44 @@ const complaintsShow = ref(false)
 const complaintsData = ref([])
 function oncomplaints() {
 	Complaints()
+}
 
+const dbclSelection = ref('')
+//当班产量明细复选框
+const dbclmxSelectionChange = (selection, type) => {
+  console.log(selection)
+  const ids = selection.map(item => {
+    return item.UniqId
+  })
+  console.log(ids.join(','))
+  dbclSelection.value = ids.join(',')
 }
+
+//当班产量明细
+const deldbcl_onclick = async () => {
+  console.log(dbclSelection.value)
+  if (dbclSelection.value !== '') {
+    try {
+      //产量上报数据删除
+      const res1 = await ChanliangDel({UniqId: dbclSelection.value})
+      if(res1.code === 0){
+        ElMessage.success('当班产量明细删除成功')
+        //当班产量明细
+        const response = await facilityDetail({ machine: JTMC, Gd_gdbh: formData.value.工单编号, team: BZMC.value });
+        console.log(response);
+        if (response.code === 0) {
+          CLMXData.splice(0, CLMXData.length, ...Object.values(response.data));
+          formData.value.production_now=response.data[0].产量
+          formData.value.production_all=response.data.total.产量
+        }
+      }
+    } catch(err) {
+      ElMessage.error(err)
+    }
+  }
+}
+
+
 // 客诉记录表格填充
 const Complaints = async() => {
 	complaintsData.value=[]
@@ -3588,14 +3599,16 @@ const SubmitPatrolRecord = async () => {
 	  xunchaVisible.value=false
   }
 }
+const isSubmitting = ref(false)
 
 
 //日产量上报
 function onchanliang() {
+  ReportInfo();
+  isSubmitting.value = false
   //获取机台号
   console.log(JTMC.split("#")[0]);
   //日产量上报 4.1获取报工单其他信息
-  ReportInfo();
 }
 
 // 获取当前日期
@@ -3673,11 +3686,10 @@ const ReportInfo = async () => {
   // getTableData()
 }
 
-const isSubmitting = ref(false)
 //日产量上报提交按钮
 const chanliangenterDialog = async () => {
-  isSubmitting.value = false
   SubmitDailyProduction()
+  isSubmitting.value = false
 }
 const bzchanliangenterDialog = async () => {
   chanliangEdits()
@@ -3733,12 +3745,13 @@ const SubmitDailyProduction = async () => {
     bom: formData3.value.formattedArray
   }
   console.log(restoredData)
+  //4.2日产量上报 添加
   const response = await submitDailyProduction(restoredData);
   console.log(response)
   if (response.code === 0) {
-    isSubmitting.value = true
-    chanliangVisible.value=false
     FacilityDetail()
+    isSubmitting.value = true
+    chanliangVisible.value = false
     ElMessage({type: 'success',message: '成功'})
   }
 }
@@ -4632,10 +4645,12 @@ const updateCompanyFunc = async(row) => {
     }
 }
 const rowws = ref(null)
+const wangongbh = ref(null)
 //设备作业清单单机
 const yjupdateCompanyFunc = async(row) => {
   console.log(row)
   rowws.value = row
+  wangongbh.value = row['工单编号|质量信息'].replace(/\|$/, '')
   console.log("通过 "+row['工单编号|质量信息'].replace(/\|$/, '')+" 获取右上角数据↓↓↓↓↓")
   const res = await Procedure({ Gd_gdbh: row['工单编号|质量信息'].replace(/\|$/, '') })
   console.log(res)
@@ -4684,7 +4699,7 @@ const MachineWorkOrderEdits = async(row) => {
 			})
   console.log(res)
     if (res.code === 0) {
-    SetMachineStatus(row)
+      SetMachineStatus(row)
     }
 }
 //设置机台状态

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -15,6 +15,7 @@
 			<el-button type="primary" icon="edit"   @click="onxzhscsclick"     class="bt" title="修正核算参数">修正核算参数</el-button>
 			<el-button type="primary" class="bt" @click="onADD" v-if="AddType === true">新增</el-button>
 			<el-button type="primary" class="bt" @click="onDel"  v-if="DelType === true" >删除</el-button>
+        <el-button type="primary" icon="edit"   @click="deldbcl_onclick" :disabled="dbclSelection === ''"   class="bt" title="当班产量明细" >当班产量明细删除</el-button>
 			<!-- <el-button type="primary" @click="onClear2" >换型清场</el-button> -->
 		</header>
 
@@ -165,7 +166,7 @@
             </div>
             <el-tabs v-model="activName" type="card" @tab-click="handleClick">
 
-                        <el-tab-pane label="设备作业清单"  @click="showTable('印件资料')"  name="first">
+                        <el-tab-pane label="设备作业清单"  @click="showTable('印件资料')"  name="first"  :class="{ 'active-tab': activeTab === 'first' }" >
                           <el-table ref="multipleTable"
                                     :show-overflow-tooltip="true"
                                     highlight-current-row="true"
@@ -224,9 +225,9 @@
                                   :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                                   :header-cell-style="{ padding: '0px' }"
                                   @row-dblclick="ybupdateCompanyFunc"
-                                  style="width: 100%;height: 400px" border tooltip-effect="dark" :data="CLMXData" row-key="ID" @selection-change="handleSelectionChange"
+                                  style="width: 100%;height: 400px" border tooltip-effect="dark" :data="CLMXData" row-key="ID" @selection-change="dbclmxSelectionChange"
                                   >
-            <!--              <el-table-column type="selection" width="55" />-->
+                          <el-table-column type="selection" width="55" />
                           <el-table-column align="left" sortable label="生产时段" prop="生产时间段"  width="180"/>
                           <el-table-column align="left" sortable label="工单编号" prop="工单编号" width="85" />
                           <el-table-column align="left" sortable label="产品名称" prop="产品名称" width="150" />
@@ -334,213 +335,74 @@
           			</el-row>
           			<div style="display: flex;">
           			<div class="groupbox float-div" style="height: 17vh; width: 130vh;">
-          			    <span class="grouptitle">组员及分配比例</span>
+                  <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-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-col :span="3"><el-input v-model="formDatas.code1" @keyup.enter.native="getbzyg($event, '1')"/></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.code2" @keyup.enter.native="getbzyg($event, '2')" /></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.code3" @keyup.enter.native="getbzyg($event, '3')"/></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.code4" @keyup.enter.native="getbzyg($event, '4')"/></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.code5" @keyup.enter.native="getbzyg($event, '5')"/></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.code6" @keyup.enter.native="getbzyg($event, '6')"/></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.code7" @keyup.enter.native="getbzyg($event, '7')"/></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.code8" @keyup.enter.native="getbzyg($event, '8')"/></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-col :span="3"><el-input v-model="formDatas.name1" style="color:#00FF00"/></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.name2"/></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.name3"/></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.name4"/></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.name5"/></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.name6"/></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.name7"/></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.name8"/></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-col :span="3"><el-input v-model="formDatas.percentage1"/></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.percentage2"/></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.percentage3"/></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.percentage4"/></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.percentage5"/></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.percentage6"/></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.percentage7"/></el-col>
+                    <el-col :span="3"><el-input v-model="formDatas.percentage8"/></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>
+          				 <el-button style="margin-bottom: 1vh; width:15vh;background-color:cornflowerblue;font-size: 2.0vh;font-weight: bold; color: white;" @click="addBz" >新 增</el-button>
+          				 <el-button style="margin-bottom: 1vh; width:15vh;background-color:cornflowerblue;font-size: 2.0vh;font-weight: bold; color: white;" @click="selectBz" >更新当前班组</el-button>
+          				 <el-button style="margin-bottom: 1vh; width:15vh;background-color:cornflowerblue;font-size: 2.0vh;font-weight: bold; color: white;" @click="delBz" >删除当前班组</el-button>
           			</div>
           			</div>
           			</div>
           </el-dialog>
 
 
+          <!-- 组员及分配比例         -->
+          <el-dialog v-model="blModel" :before-close="() => blModel = false" style="width: 20%">
+            <el-form>
+              <div>
+                <el-table :data="employeeData" border :show-overflow-tooltip="true" :cell-class-name="blplanUsageCellClass"  @row-click="tablebllickHandler($event)">
+                  <el-table-column prop="员工编号" label="员工编号"></el-table-column>
+                  <el-table-column prop="ygxm" label="员工姓名"></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </el-dialog>
+
         <el-dialog
           v-model="dianjianVisible"
           title="设备点检记录"
@@ -998,7 +860,6 @@
 
 
 		<div v-if="dateOn" >
-
 					  <el-tabs v-model="activName" type="card" @tab-click="handleClick">
 					    <el-tab-pane label="当日上报产量"  @click="showTable('工艺资料')"  name="first">
 					      <el-table ref="multipleTable"
@@ -1029,25 +890,25 @@
 					        <el-table-column align="left" label="组员8" prop="组员8" width="70" />
 					        <el-table-column align="left" label="组员9" prop="组员9" width="70" />
 					        <el-table-column align="left" label="组员10" prop="组员10" width="70" />
-							<el-table-column align="left" label="制程废品" prop="制程废品" width="85" />
-							<el-table-column align="left" label="制程次品" prop="制程次品" width="85" />
-							<el-table-column align="left" label="前工序废" prop="前工序废" width="85" />
-							<el-table-column align="left" label="来料异常" prop="来料异常"  width="85"/>
-							<el-table-column align="left" label="装版工时" prop="装版工时" width="85" />
-							<el-table-column align="left" label="保养工时" prop="保养工时" width="85" />
-							<el-table-column align="left" label="打样工时" prop="打样工时" width="85"/>
-							<el-table-column align="left" label="异常总工时" prop="异常总工时" width="85"/>
-							<el-table-column align="left" label="异常补时" prop="异常补时" width="85"/>
-							<el-table-column align="left" label="异常类型" prop="异常类型"  width="110"/>
-							<el-table-column align="left" label="通电工时" prop="通电工时" width="85"/>
-							<el-table-column align="left" label="码开始行" prop="码开始行" width="85" />
-							<el-table-column align="left" label="码结束行" prop="码结束行" width="85" />
-							<el-table-column align="left" label="码包" prop="码包" width="70" />
-							<el-table-column align="left" label="主电表" prop="主电表"  width="70"/>
-							<el-table-column align="left" label="辅电表" prop="辅电表" width="70" />
-							<el-table-column align="left" label="色度数" prop="色度数" width="70" />
-							<el-table-column align="left" label="用户" prop="用户" width="210" />
-							<el-table-column align="left" label="更新时间" prop="更新时间" width="160" />
+                  <el-table-column align="left" label="制程废品" prop="制程废品" width="85" />
+                  <el-table-column align="left" label="制程次品" prop="制程次品" width="85" />
+                  <el-table-column align="left" label="前工序废" prop="前工序废" width="85" />
+                  <el-table-column align="left" label="来料异常" prop="来料异常"  width="85"/>
+                  <el-table-column align="left" label="装版工时" prop="装版工时" width="85" />
+                  <el-table-column align="left" label="保养工时" prop="保养工时" width="85" />
+                  <el-table-column align="left" label="打样工时" prop="打样工时" width="85"/>
+                  <el-table-column align="left" label="异常总工时" prop="异常总工时" width="85"/>
+                  <el-table-column align="left" label="异常补时" prop="异常补时" width="85"/>
+                  <el-table-column align="left" label="异常类型" prop="异常类型"  width="110"/>
+                  <el-table-column align="left" label="通电工时" prop="通电工时" width="85"/>
+                  <el-table-column align="left" label="码开始行" prop="码开始行" width="85" />
+                  <el-table-column align="left" label="码结束行" prop="码结束行" width="85" />
+                  <el-table-column align="left" label="码包" prop="码包" width="70" />
+                  <el-table-column align="left" label="主电表" prop="主电表"  width="70"/>
+                  <el-table-column align="left" label="辅电表" prop="辅电表" width="70" />
+                  <el-table-column align="left" label="色度数" prop="色度数" width="70" />
+                  <el-table-column align="left" label="用户" prop="用户" width="210" />
+                  <el-table-column align="left" label="更新时间" prop="更新时间" width="160" />
 					      </el-table>
 					    </el-tab-pane>
 
@@ -1462,14 +1323,8 @@
 		  </div>
 		</el-dialog>
 
-		<el-dialog
-		  v-model="chanliangVisible"
-		  destroy-on-close
-		  width="60%"
-		  style="height: 110vh;"
-		  :before-close="closechanliangVisible"
-		  :title="type2 === 'create' ? '新增' : '修改'"
-		>
+		<el-dialog v-model="chanliangVisible" destroy-on-close
+		  width="70%" style="height: 110vh;" :before-close="closechanliangVisible" :title="type2 === 'create' ? '新增' : '修改'">
 		  <el-row :gutter="24">
 		    <el-col :span="6">
 		      <el-form-item label="工单编号:" prop="flatFeed" class="mab">
@@ -1513,14 +1368,7 @@
 			<el-row :gutter="24">
 			  <el-col :span="6">
 			    <el-form-item label="日期:" prop="flatFeed" class="mab">
-                 <!-- <el-input v-model="formdata3.value.rq"  id="日期"  @keydown="ent1($event)" @blur="getJtbhsubmit()" :clearable="true" style="width: 100px;" /> -->
-				 <el-date-picker
-				         v-model="formdata3.value.rq"
-				         type="datetime"
-				         format="YYYY/MM/DD"
-				         value-format="YYYY-MM-DD"
-						 @keydown="ent1($event)"
-				       />
+				 <el-date-picker v-model="formdata3.value.rq" type="datetime" format="YYYY/MM/DD" value-format="YYYY-MM-DD" @keydown="ent1($event)"/>
 			    </el-form-item>
 			  </el-col>
 			  <el-col :span="6">
@@ -1530,21 +1378,7 @@
 			  </el-col>
 			  <el-col :span="7">
 			    <el-form-item label="开工时间:" prop="flatFeed" class="mab">
-			     <!-- <el-input v-model="formdata3.value.starttime"  id="日期"  @keydown="ent1($event)" @blur="getJtbhsubmit()" style="width: 100px;" /> -->
-				 <!-- <el-date-picker
-				         v-model="formdata3.value.starttime"
-				         type="datetime"
-				         format="YYYY/MM/DD hh:mm:ss"
-				         value-format="YYYY-MM-DD h:m:s"
-						 @keydown="ent1($event)"
-				       /> -->
-					   <el-date-picker
-					            v-model="formdata3.value.starttime"
-					           type="datetime"
-					           placeholder="Pick a Date"
-					           format="YYYY/MM/DD HH:mm:ss"
-							   @keydown="ent1($event)"
-					         />
+					   <el-date-picker v-model="formdata3.value.starttime" type="datetime"  format="YYYY/MM/DD HH:mm:ss" @keydown="ent1($event)" />
 			    </el-form-item>
 			  </el-col>
 				<el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
@@ -1730,124 +1564,50 @@
 			  <div>拉料人员</div>
 		  </div>
 
-
 		    <el-row :gutter="10" style="margin-top: 1vh;">
-		  		  	 <el-col :span="2">
-		  		  	   <el-input v-model="formdata3.value.bzdh" id="bzdh"  @keydown="ent1($event)"  placeholder="" />
-		  		  	 </el-col>
-		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员1['编号']" id="bh1"  @keydown="ent($event, 'bzdh', 'bh1', 'bh2')" @keyup.enter.native="GetYg($event, '1')"  placeholder="" />
-		  		     </el-col>
-		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员2['编号']" id="bh2"  @keydown="ent($event, 'bh1', 'bh2', 'bh3')" @keyup.enter.native="GetYg($event, '2')"  placeholder="" />
-		  		     </el-col>
-		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员3['编号']" id="bh3"  @keydown="ent($event, 'bh2', 'bh3', 'bh4')" @keyup.enter.native="GetYg($event, '3')"  placeholder="" />
-		  		     </el-col>
-		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员4['编号']" id="bh4"  @keydown="ent($event, 'bh3', 'bh4', 'bh5')" @keyup.enter.native="GetYg($event, '4')"  placeholder="" />
-		  		     </el-col>
-		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员5['编号']" id="bh5"  @keydown="ent($event, 'bh4', 'bh5', 'bh6')" @keyup.enter.native="GetYg($event, '5')"  placeholder="" />
-		  		     </el-col>
-		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员6['编号']" id="bh6"  @keydown="ent($event, 'bh5', 'bh6', 'bh7')" @keyup.enter.native="GetYg($event, '6')"  placeholder="" />
-		  			</el-col>
-		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员7['编号']" id="bh7"  @keydown="ent($event, 'bh6', 'bh7', 'bh8')" @keyup.enter.native="GetYg($event, '7')"  placeholder="" />
-		  			</el-col>
-		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员8['编号']" id="bh8"  @keydown="ent($event, 'bh7', 'bh8', 'bh9')" @keyup.enter.native="GetYg($event, '8')"  placeholder="" />
-		  			</el-col>
-		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员9['编号']" id="bh9"  @keydown="ent($event, 'bh8', 'bh9', 'bh10')" @keyup.enter.native="GetYg($event, '9')"  placeholder="" />
-		  			</el-col>
-		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员10['编号']" id="bh10"  @keydown="ent($event, 'bh9', 'bh10', 'bh11')" @keyup.enter.native="GetYg($event, '10')"  placeholder="" />
-		  			</el-col>
-		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.拉料['编号']" id="bh11" @keydown="ent($event, 'bh10', 'bh11', 'rate1')" @keyup.enter.native="GetYg($event, '11')"  placeholder="" />
-		  			</el-col>
-		  		   </el-row>
-
-
-
-		  		  <el-row :gutter="10" style="margin-top: 10px;">
-		  		  	 <el-col :span="2">
-
-		  		  	 </el-col>
-		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员1['姓名']" id="name1"    placeholder="" />
-		  		     </el-col>
-		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员2['姓名']" id="name2"   placeholder="" />
-		  		     </el-col>
-		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员3['姓名']" id="name3"   placeholder="" />
-		  		     </el-col>
-		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员4['姓名']" id="name4"  placeholder="" />
-		  		     </el-col>
-		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员5['姓名']" id="name5"   placeholder="" />
-		  		     </el-col>
-		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员6['姓名']" id="name6"   placeholder="" />
-		  			</el-col>
-		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员7['姓名']" id="name7"    placeholder="" />
-		  			</el-col>
-		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员8['姓名']" id="name8"    placeholder="" />
-		  			</el-col>
-		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员9['姓名']" id="name9"    placeholder="" />
-		  			</el-col>
-		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员10['姓名']" id="name10"    placeholder="" />
-		  			</el-col>
-		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.拉料['姓名']" id="name11"    placeholder="" />
-		  			</el-col>
-		  		   </el-row>
-
-		  		  <el-row :gutter="10" style="margin-top: 10px;">
-		  		  	 <el-col :span="2">
-
-		  		  	 </el-col>
-		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员1['比例']" id="rate1"  @keydown="ent($event, 'bh11', 'rate1', 'rate2')"   placeholder="" />
-		  		     </el-col>
-		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员2['比例']" id="rate2"  @keydown="ent($event, 'rate1', 'rate2', 'rate3')"   placeholder="" />
-		  		     </el-col>
-		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员3['比例']" id="rate3"  @keydown="ent($event, 'rate2', 'rate3', 'rate4')"   placeholder="" />
-		  		     </el-col>
-		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员4['比例']" id="rate4"  @keydown="ent($event, 'rate3', 'rate4', 'rate5')"  placeholder="" />
-		  		     </el-col>
-		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员5['比例']" id="rate5"  @keydown="ent($event, 'rate4', 'rate5', 'rate6')"  placeholder="" />
-		  		     </el-col>
-		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员6['比例']" id="rate6"  @keydown="ent($event, 'rate5', 'rate6', 'rate7')"  placeholder="" />
-		  			</el-col>
-		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员7['比例']" id="rate7"  @keydown="ent($event, 'rate6', 'rate7', 'rate8')"  placeholder="" />
-		  			</el-col>
-		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员8['比例']" id="rate8"  @keydown="ent($event, 'rate7', 'rate8', 'rate9')"  placeholder="" />
-		  			</el-col>
-		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员9['比例']" id="rate9"  @keydown="ent($event, 'rate8', 'rate9', 'rate10')"  placeholder="" />
-		  			</el-col>
-		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员10['比例']" id="rate10"  @keydown="ent($event, 'rate9', 'rate10', '工单编号')"  placeholder="" />
-		  			</el-col>
-		  			<el-col :span="2">
-		  			</el-col>
-		  		   </el-row>
+          <el-col :span="2"><el-input v-model="formdata3.value.bzdh" id="bzdh"  @keydown="ent1($event)"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员1['编号']" id="bh1"   @keyup.enter.native="GetYg($event, '1')"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员2['编号']" id="bh2"   @keyup.enter.native="GetYg($event, '2')"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员3['编号']" id="bh3"   @keyup.enter.native="GetYg($event, '3')"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员4['编号']" id="bh4"   @keyup.enter.native="GetYg($event, '4')"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员5['编号']" id="bh5"   @keyup.enter.native="GetYg($event, '5')"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员6['编号']" id="bh6"   @keyup.enter.native="GetYg($event, '6')"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员7['编号']" id="bh7"   @keyup.enter.native="GetYg($event, '7')"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员8['编号']" id="bh8"   @keyup.enter.native="GetYg($event, '8')"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员9['编号']" id="bh9"   @keyup.enter.native="GetYg($event, '9')"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员10['编号']" id="bh10" @keyup.enter.native="GetYg($event, '10')"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.拉料['编号']" id="bh11"   @keyup.enter.native="GetYg($event, '11')"/></el-col>
+		  	</el-row>
+
+        <el-row :gutter="10" style="margin-top: 10px;">
+          <el-col :span="2"></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员1['姓名']" id="name1"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员2['姓名']" id="name2"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员3['姓名']" id="name3"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员4['姓名']" id="name4"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员5['姓名']" id="name5"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员6['姓名']" id="name6"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员7['姓名']" id="name7"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员8['姓名']" id="name8"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员9['姓名']" id="name9"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员10['姓名']" id="name10"/></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.拉料['姓名']" id="name11"/></el-col>
+        </el-row>
+
+        <el-row :gutter="10" style="margin-top: 10px;">
+          <el-col :span="2"></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员1['比例']" id="rate1"  @keydown="ent($event, 'bh11', 'rate1', 'rate2')"   placeholder="" /></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员2['比例']" id="rate2"  @keydown="ent($event, 'rate1', 'rate2', 'rate3')"   placeholder="" /></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员3['比例']" id="rate3"  @keydown="ent($event, 'rate2', 'rate3', 'rate4')"   placeholder="" /></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员4['比例']" id="rate4"  @keydown="ent($event, 'rate3', 'rate4', 'rate5')"  placeholder="" /></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员5['比例']" id="rate5"  @keydown="ent($event, 'rate4', 'rate5', 'rate6')"  placeholder="" /></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员6['比例']" id="rate6"  @keydown="ent($event, 'rate5', 'rate6', 'rate7')"  placeholder="" /></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员7['比例']" id="rate7"  @keydown="ent($event, 'rate6', 'rate7', 'rate8')"  placeholder="" /></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员8['比例']" id="rate8"  @keydown="ent($event, 'rate7', 'rate8', 'rate9')"  placeholder="" /></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员9['比例']" id="rate9"  @keydown="ent($event, 'rate8', 'rate9', 'rate10')"  placeholder="" /></el-col>
+          <el-col :span="2"><el-input v-model="formdata3.value.组员10['比例']" id="rate10"  @keydown="ent($event, 'rate9', 'rate10', '工单编号')"  placeholder="" /></el-col>
+          <el-col :span="2"></el-col>
+         </el-row>
 
 
 		  <!-- </el-scrollbar> -->
@@ -1871,6 +1631,18 @@
 		</el-dialog>
 
 
+          <!--         当日上报产量 组员及分配比例-->
+          <el-dialog v-model="blModellist" :before-close="() => blModellist = false" style="width: 20%">
+            <el-form>
+              <div>
+                <el-table :data="employeeDatalist" border :show-overflow-tooltip="true" :cell-class-name="blplanUsageCellClass"  @row-click="tablebllickHandlerlist($event)">
+                  <el-table-column prop="员工编号" label="员工编号"></el-table-column>
+                  <el-table-column prop="ygxm" label="员工姓名"></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </el-dialog>
+
 		<el-dialog v-model="hesuanVisible" :before-close="closehesuanVisible" title="核算参数调整" destroy-on-close width="20%" style="height: 50%;">
 		  <div>
 		    <el-radio-group v-model="selected" @change="agreeChange" style="display: flex; flex-direction: column;">
@@ -2026,7 +1798,7 @@ import {
 } from '@/api/company'
 import {
   EquipmentSchedulingEdit, Procedure,
-  teamDel
+  teamDel, WorkList, WorkOrderDel
 } from "@/api/yunyin/yunying";
 import {
   facilityTab,
@@ -2547,7 +2319,43 @@ const InspectionRecord = async () => {
 	  console.log(JYData);
   }
 }
+const dbclSelection = ref('')
+//当班产量明细复选框
+const dbclmxSelectionChange = (selection, type) => {
+  console.log(selection)
+  const ids = selection.map(item => {
+    return item.UniqId
+  })
+  console.log(ids.join(','))
+  dbclSelection.value = ids.join(',')
+}
+
 //当班产量明细
+const deldbcl_onclick = async () => {
+  console.log(dbclSelection.value)
+  if (dbclSelection.value !== '') {
+    try {
+      //产量上报数据删除
+      const res1 = await ChanliangDel({UniqId: dbclSelection.value})
+      if(res1.code === 0){
+        ElMessage.success('当班产量明细删除成功')
+        //当班产量明细
+        const response = await facilityDetail({ machine: JTMC, Gd_gdbh: formData.value.工单编号, team: BZMC.value });
+        console.log(response);
+        if (response.code === 0) {
+          CLMXData.splice(0, CLMXData.length, ...Object.values(response.data));
+          formData.value.production_now=response.data[0].产量
+          formData.value.production_all=response.data.total.产量
+        }
+      }
+    } catch(err) {
+      ElMessage.error(err)
+    }
+  }
+}
+
+
+
 const FacilityDetail = async () => {
 	console.log('123123')
 	console.log(JTMC)
@@ -3389,19 +3197,60 @@ function onBZ() {
 	detailShow.value=true
 	console.log('2222')
 }
+
+const blModel = ref(false)
+const employeeData = ref('')
 const getbzyg = async (value,key) => {
   let bzyg=''
   bzyg=`code${key}`
   let bzxm=''
   bzxm=`name${key}`
-  console.log(formDatas.value[bzxm])
-  console.log(formDatas.value[bzyg])
   const response = await getYg({sczl_bh:formDatas.value[bzyg]});
+  console.log(response)
   if (response.code === 0) {
-    formDatas.value[bzxm]=response.data[0].ygxm
-	formDatas.value[bzyg]=response.data[0].员工编号
+    if(response.data.length === 1){
+      formDatas.value[bzxm]= response.data[0].ygxm
+      formDatas.value[bzyg]= response.data[0].员工编号
+    }else{
+      blModel.value = true;
+      console.log(response.data)
+      employeeData.value = response.data // 假设响应数据是数组
+    }
   }
 }
+
+const clicked = ref(false);
+const tablebllickHandler = async (row, column, event) => {
+  if (clicked.value) {
+    // 如果已经点击过一次，则不再执行操作
+    return;
+  }
+  let nextIndex = 1;
+  while (formDatas.value[`code${nextIndex}`] !== '' && formDatas.value[`name${nextIndex}`] !== '') {
+    nextIndex++;
+    if (nextIndex > 8) {
+      // 如果所有字段都已经填满，则不做任何事情并退出函数
+      return;
+    }
+  }
+  // 将选定的值分配给下一个空的代码和名称字段
+  formDatas.value[`code${nextIndex}`] = row.员工编号;
+  formDatas.value[`name${nextIndex}`] = row.ygxm;
+  blModel.value = false;
+  clicked.value = true;
+  setTimeout(() => {
+    clicked.value = false;
+  }, 300); // 300毫秒内再次点击将不会触发事件，你可以根据需要调整这个延迟时间
+};
+
+const blplanUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
+  if (column.property === '员工编号' || column.property === 'ygxm') {
+    return 'plan-usage-low';
+  }
+}
+
+
+
 const addBz = async() => {
   // selectedOption.value='YS-JY06-002||印品质量检测机(JP1020-18)'
   console.log(selectedOption.value)
@@ -3718,10 +3567,10 @@ function gytableDatadoubleClick(row, column, event) {
 const uid=ref()
 const _Gd_gdbh=ref()
 function getUid(row, column, event) {
- console.log(row.工单编号)
- uid.value=row.UniqId
- _Gd_gdbh.value=row.工单编号
- console.log(uid.value)
+ console.log(row)
+ uid.value=row['UniqId']
+ _Gd_gdbh.value=row['工单编号']
+ console.log("UniqId"+uid.value)
 }
 //获取详细信息
 const MachineChanliang = async(value) => {
@@ -3840,51 +3689,100 @@ const MachineChanliang = async(value) => {
 	})
 }
 
+
  //获取员工信息
- const GetYg = (event,inputName) => {
-	 console.log(eval(`formdata3.value.组员${inputName}['编号']`))
-	 if(eval(`formdata3.value.组员${inputName}['编号']`)===""){
-		 console.log("123")
-	 }else{
-		 const value=ref()
-		 if(inputName==='11'){
-		 		 value.value=formdata3.value.拉料['编号']
-		 }else{
-		 		value.value= eval(`formdata3.value.组员${inputName}['编号']`)
-		 }
-
-		 	EmployeeData({code:value.value}).then(response=>{
-		 		if (response.code === 0) {
-		 			if(inputName==='1'){
-		 			  formdata3.value.组员1['姓名']='123';
-		 			}else if(inputName==='2'){
-		 			  formdata3.value.组员2['姓名']=response.data[0].员工姓名;
-		 			}else if(inputName==='3'){
-		 			  formdata3.value.组员3['姓名']=response.data[0].员工姓名;
-		 			}else if(inputName==='4'){
-		 			  formdata3.value.组员4['姓名']=response.data[0].员工姓名;
-		 			}else if(inputName==='5'){
-		 			  formdata3.value.组员5['姓名']=response.data[0].员工姓名;
-		 			}else if(inputName==='6'){
-		 			  formdata3.value.组员6['姓名']=response.data[0].员工姓名;
-		 			}else if(inputName==='7'){
-		 			  formdata3.value.组员7['姓名']=response.data[0].员工姓名;
-		 			}else if(inputName==='8'){
-		 			  formdata3.value.组员8['姓名']=response.data[0].员工姓名;
-		 			}else if(inputName==='9'){
-		 			  formdata3.value.组员9['姓名']=response.data[0].员工姓名;
-		 			}else if(inputName==='10'){
-		 			  formdata3.value.组员10['姓名']=response.data[0].员工姓名;
-		 			}else if(inputName==='11'){
-		 		          formdata3.value.拉料['姓名']=response.data[0].员工姓名;
-		            }
-		 		}else{
-		 			// formdata3.value['sczl_bh'+inputName+'_name'] = '';
-		 		}
-		 	})
-	 }
+ // const GetYg = (event,inputName) => {
+const GetYg = async (value,key) => {
+  let bzyg=''
+  bzyg=`组员${key}`
+  let bzxm=''
+  bzxm=`组员${key}`
+  // console.log(formdata3.value[bzyg]['编号'])
+
+  const response = await getYg({sczl_bh:formdata3.value[bzyg]['编号']});
+  // console.log(response)
+
+  if (response.code === 0) {
+    if(response.data.length === 1){
+      formdata3.value[bzxm]['姓名'] = response.data[0].ygxm
+      formdata3.value[bzyg]['编号'] = response.data[0].员工编号
+    }else{
+      blModellist.value = true;
+      // console.log(response.data)
+      employeeDatalist.value = response.data // 假设响应数据是数组
+    }
+  }
+
+	 // if(eval(`formdata3.value.组员${inputName}['编号']`)===""){
+		//  console.log("123")
+	 // }else{
+		//  const value=ref()
+		//  if(inputName==='11'){
+		//  		 value.value=formdata3.value.拉料['编号']
+		//  }else{
+		//  		value.value= eval(`formdata3.value.组员${inputName}['编号']`)
+		//  }
+		//  	EmployeeData({code:value.value}).then(response=>{
+		//  		if (response.code === 0) {
+		//  			if(inputName==='1'){
+		//  			  formdata3.value.组员1['姓名']='123';
+		//  			}else if(inputName==='2'){
+		//  			  formdata3.value.组员2['姓名']=response.data[0].员工姓名;
+		//  			}else if(inputName==='3'){
+		//  			  formdata3.value.组员3['姓名']=response.data[0].员工姓名;
+		//  			}else if(inputName==='4'){
+		//  			  formdata3.value.组员4['姓名']=response.data[0].员工姓名;
+		//  			}else if(inputName==='5'){
+		//  			  formdata3.value.组员5['姓名']=response.data[0].员工姓名;
+		//  			}else if(inputName==='6'){
+		//  			  formdata3.value.组员6['姓名']=response.data[0].员工姓名;
+		//  			}else if(inputName==='7'){
+		//  			  formdata3.value.组员7['姓名']=response.data[0].员工姓名;
+		//  			}else if(inputName==='8'){
+		//  			  formdata3.value.组员8['姓名']=response.data[0].员工姓名;
+		//  			}else if(inputName==='9'){
+		//  			  formdata3.value.组员9['姓名']=response.data[0].员工姓名;
+		//  			}else if(inputName==='10'){
+		//  			  formdata3.value.组员10['姓名']=response.data[0].员工姓名;
+		//  			}else if(inputName==='11'){
+		//  		          formdata3.value.拉料['姓名']=response.data[0].员工姓名;
+		//             }
+		//  		}else{
+		//  			// formdata3.value['sczl_bh'+inputName+'_name'] = '';
+		//  		}
+		//  	})
+	 // }
 
  }
+const clickedlist = ref(false);
+const blModellist = ref(false)
+const employeeDatalist = ref('')
+const tablebllickHandlerlist = async (row, column, event) => {
+  // console.log(row.员工编号)
+  // console.log(row.ygxm)
+    if (clickedlist.value) {
+      // 如果已经点击过一次，则不再执行操作
+      return;
+    }
+    let nextIndex = 1;
+    while (formdata3.value[`组员${nextIndex}`]['编号'] !== '') {
+      nextIndex++;
+      if (nextIndex > 10) {
+        // 如果所有字段都已经填满，则不做任何事情并退出函数
+        return;
+      }
+    }
+    // 将选定的值分配给下一个空的代码和名称字段
+    formdata3.value[`组员${nextIndex-1}`]['编号'] = row.员工编号;
+    formdata3.value[`组员${nextIndex-1}`]['姓名'] = row.ygxm;
+    blModellist.value = false;
+    clickedlist.value = true;
+    setTimeout(() => {
+      clickedlist.value = false;
+    }, 300); // 300毫秒内再次点击将不会触发事件，你可以根据需要调整这个延迟时间
+  };
+
+
  //追加字体颜色和不可输入
  const setColorReadonly = (id) => {
  	const newInput = document.getElementById(id)
@@ -4546,30 +4444,31 @@ const deleteCompanyFunc = async (row) => {
         getTableData()
     }
 }
-//键盘 input框跳转
-const ent = (event,id1,id2,id3) => {
-  if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
-	if(id3!=''){
-      document.getElementById(id3).focus()
-    }
-  } else if (event.keyCode === 38) { // 向上箭头
-    if(id1!=''){
-      document.getElementById(id1).focus()
-    }
-  }else if (event.keyCode === 8) { // 删除箭头
-    if(id1!='' && document.getElementById(id2).value===''){
-      document.getElementById(id1).focus()
-    }
-  }else if (event.keyCode === 37) { // 向左箭头
-    if(id1!='' && document.getElementById(id2).selectionStart==0){
-      document.getElementById(id1).focus()
-    }
-  }else if (event.keyCode === 39) { // 向右箭头
-    if(id3!='' && document.getElementById(id2).selectionStart == document.getElementById(id2).value.length){
-      document.getElementById(id3).focus()
-    }
-  }
-}
+
+// //键盘 input框跳转
+// const ent = (event,id1,id2,id3) => {
+//   if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
+// 	if(id3!=''){
+//       document.getElementById(id3).focus()
+//     }
+//   } else if (event.keyCode === 38) { // 向上箭头
+//     if(id1!=''){
+//       document.getElementById(id1).focus()
+//     }
+//   }else if (event.keyCode === 8) { // 删除箭头
+//     if(id1!='' && document.getElementById(id2).value===''){
+//       document.getElementById(id1).focus()
+//     }
+//   }else if (event.keyCode === 37) { // 向左箭头
+//     if(id1!='' && document.getElementById(id2).selectionStart==0){
+//       document.getElementById(id1).focus()
+//     }
+//   }else if (event.keyCode === 39) { // 向右箭头
+//     if(id3!='' && document.getElementById(id2).selectionStart == document.getElementById(id2).value.length){
+//       document.getElementById(id3).focus()
+//     }
+//   }
+// }
 // 弹窗控制标记
 const dialogFormVisible = ref(false)
 const dianjianVisible = ref(false)
@@ -4697,7 +4596,7 @@ const enterDialog = async () => {
 
 </script>
 
-<style>
+<style scoped>
 	/* .button-container {
 	  display: flex;
 	  flex-wrap: wrap;
@@ -4745,10 +4644,14 @@ const enterDialog = async () => {
 .JKWTree-content {
   flex: 1;
 }
-/* 选中某行时的背景色*/
-.el-table__body tr.current-row>td {
+/*!* 选中某行时的背景色*/
+:deep(.el-table__body tr.current-row)>td {
   background: #ff80ff !important;
 }
+  ::v-deep  .el-tabs--card > .el-tabs__header .el-tabs__item.is-active {
+    color: white;        /* 文字颜色 */
+    background-color: #4d70ff; /* 背景颜色 */
+  }
 .groupbox
       {margin:10px;
       width:500px;
@@ -4762,4 +4665,10 @@ const enterDialog = async () => {
      width:150px;
      text-align:center;
      background-color:white}
+
+:deep(.plan-usage-low div) {
+  color: blue !important;
+  font-size: 16px;
+  font-weight: bold;
+}
 </style>