车间报工

src/api/jixiaoguanli/jitairibaobiao.js

@@ -903,6 +903,14 @@ export const  reportName= (params) => {
 	params
   })
 }
+//获取员工姓名-优化后
+export const  getStaffNameTwo= (params) => {
+  return service({
+    url:'/mes_server/reporting_work/getStaffNameTwo',
+    method: 'get',
+    params
+  })
+}
 //获取报工单其他信息
 export const  reportInfo= (params) => {
   return service({
@@ -989,21 +997,21 @@ export const MachineDetailList = (params) => {
   })
 }
 
-//获取机台
-export const  reportGetJtbh= (params) => {
-  return service({
-    url:'/mes_server/machine_production_report/getJtbh',
-    method: 'get',
-    params
-  })
-}
-//定额代号查询比例
-export const  dedhGetRate= (params) => {
-  return service({
-    url:'/mes_server/machine_production_report/dedhGetRate',
-    method: 'get',
-    params
-  })
+//获取机台
+export const  reportGetJtbh= (params) => {
+  return service({
+    url:'/mes_server/machine_production_report/getJtbh',
+    method: 'get',
+    params
+  })
+}
+//定额代号查询比例
+export const  dedhGetRate= (params) => {
+  return service({
+    url:'/mes_server/machine_production_report/dedhGetRate',
+    method: 'get',
+    params
+  })
 }
 //设备运行跟踪---换型清场
 export const remodelGetTab = (data) => {
@@ -1094,4 +1102,4 @@ export const RemodelDetail = (params) => {
     method: 'get',
     params
   })
-}
+}

src/view/performance/chejianbaogong.vue

@@ -430,7 +430,7 @@
 
 
 				<el-col :span="3">
-				  <el-input v-model="formDatas.code1" @keyup.enter.native="getbzyg($event, '1')" placeholder="" class="hei—input"/>
+				  <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="" />
@@ -587,6 +587,17 @@
           </el-dialog>
 
 
+<!--          组员及分配比例-->
+          <el-dialog v-model="blModel" :before-close="() => blModel = false">
+            <el-form>
+              <div>
+                <el-table :data="employeeData" border  @row-click="tablebllick">
+                  <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="complaintsShow"
@@ -2157,9 +2168,9 @@
             </el-row>
             <!-- </el-scrollbar> -->
             <template #footer>
-              <div class="dialog-footer">
-                <el-button @click="bzcloseDialog">取 消</el-button>
-                <el-button type="primary" @click="bzchanliangenterDialog">确 定</el-button>
+              <div class="dialog-footer" style="margin-right: 200px">
+                <el-button @click="bzcloseDialog" style="width: 110px;height: 50px;font-size: 24px;">取 消</el-button>
+                <el-button type="primary" @click="bzchanliangenterDialog" style="width: 110px;height: 50px;font-size: 24px;">确 定</el-button>
               </div>
             </template>
           </el-dialog>
@@ -2231,7 +2242,7 @@ import {
 
 import {
   EquipmentSchedulingEdit,
-  teamDel
+  teamDel, workOrderListDetail
 } from "@/api/yunyin/yunying";
 
 import {
@@ -2265,6 +2276,7 @@ import {
   facilityInspectionItem,
   reportProduceInfo,
   reportName,
+  getStaffNameTwo,
   reportInfo,
   reportMachineMac,
   facilityWorklist,
@@ -2823,7 +2835,8 @@ const getygsubmit = (event, inputName) => {
 		   // console.log(variableValue)
 		   GetYg(variableValue,inputName)
 }
-
+const blModel = ref(false)
+const employeeData = ref('')
 const getbzyg = async (value,key) => {
   let bzyg=''
   bzyg=`code${key}`
@@ -2831,16 +2844,60 @@ const getbzyg = async (value,key) => {
   bzxm=`name${key}`
   const response = await getYg({sczl_bh:formDatas.value[bzyg]});
   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 tablebllick = async (row) => {
+  console.log(row.员工编号)
+  console.log(row.ygxm)
+  // formDatas.value['code1']=row.ygxm
+  // formDatas.value['name1']=row.员工编号
+  // 寻找下一个空的代码和名称字段
+  let nextIndex = 1;
+  while (formDatas.value[`code${nextIndex}`] !== '' && formDatas.value[`name${nextIndex}`] !== '') {
+    nextIndex++;
+    if (nextIndex > 8) {
+      // 如果所有字段都已经填满，则不做任何事情并退出函数
+      return;
+    }
+  }
+  // 将选定的值分配给下一个空的代码和名称字段
+  formDatas.value[`code${nextIndex}`] = row.ygxm;
+  formDatas.value[`name${nextIndex}`] = row.员工编号;
+  blModel.value = false;
+};
+// const getbzyg = async (value,key) => {
+//   let bzyg=''
+//   bzyg=`code${key}`
+//   let bzxm=''
+//   bzxm=`name${key}`
+//   const response = await getYg({sczl_bh:formDatas.value[bzyg]});
+//   console.log(response)
+//   if (response.code === 0) {
+//     blModel.value = true;
+//     formDatas.value[bzxm]=response.data[0].ygxm
+// 	  formDatas.value[bzyg]=response.data[0].员工编号
+//   }
+// }
 
 const getxunchayg = async (value) => {
   const response = await getYg({sczl_bh:xunchaData.value.sczl_bh});
   if (response.code === 0) {
     xunchaData.value.sczl_name=response.data[0].ygxm
-	xunchaData.value.sczl_bh=response.data[0].员工编号
+	  xunchaData.value.sczl_bh=response.data[0].员工编号
+  //   response.data.forEach(item => {
+  //     const { ygxm, 员工编号 } = item;
+  //     // 假设 bzxm 和 bzyg 是动态的属性名称
+  //     xunchaData.value[bzxm] = ygxm;
+  //     xunchaData.value[bzyg] = 员工编号;
+  //   });
   }
 }
 const getlaliaoyg = async (value) => {
@@ -5033,6 +5090,7 @@ const bzryplanUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
 ::v-deep .el-form-item__label {
   color: #000000 !important;
   font-weight: bold;
+  font-size: 12px;
 }
 ::v-deep .el-tabs__item {
   /*color: #000000 !important;*/