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

src/view/DecisionSupport/operation/operation.vue

@@ -44,7 +44,7 @@
                         @row-dblclick="updateCompanyFunc"
                         @selection-change="handleSelectionChange"
                         :show-overflow-tooltip="true">
-                <el-table-column align="left" label="设备编号"   prop="设备编号"  width="81" />
+                <el-table-column align="left" label="设备编号"   prop="设备编号"  width="110" />
                 <el-table-column align="left" sortable label="设备名称"   prop="设备名称"  width="280" />
                 <el-table-column align="left" sortable label="产量"   prop="产量" width="110" />
                 <el-table-column align="left" sortable label="设备运行工时" prop="设备运行工时" width="150" />
@@ -80,16 +80,17 @@
                           @selection-change="selectionChange($event, '印件资料')"
                           style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="jqtabledata" row-key="ID">
                   <el-table-column type="selection" width="30" />
-                  <el-table-column align="left" sortable label="设备编号" prop="设备编号"  width="100"/>
+                  <el-table-column align="left" sortable label="设备编号" prop="设备编号"  width="110"/>
                   <el-table-column align="left" sortable label="设备名称" prop="设备名称"  width="340"/>
-                  <el-table-column align="left" sortable label="日期" prop="日期"  width="100"/>
+                  <el-table-column align="left" sortable label="日期" prop="日期"  width="110"/>
+				  <el-table-column align="left" sortable label="工单编号" prop="工单编号"  width="110"/>
                   <el-table-column align="left" sortable label="印件名称" prop="印件名称"  width="340"/>
                   <el-table-column align="left" sortable label="工序名称" prop="工序名称"  width="110"/>
                   <el-table-column align="left" sortable label="产量" prop="产量"  width="110"/>
-                  <el-table-column align="left" sortable label="设备运行工时" prop="设备运行工时"  width="110"/>
+                  <el-table-column align="left" sortable label="设备运行工时" prop="设备运行工时"  width="140"/>
                   <el-table-column align="left" sortable label="保养工时" prop="保养工时"  width="110"/>
-                  <el-table-column align="left" sortable label="打样总工时" prop="打样总工时"  width="120"/>
-                  <el-table-column align="left" sortable label="打样补产工时" prop="打样补产工时"  width="110"/>
+                  <el-table-column align="left" sortable label="打样总工时" prop="打样总工时"  width="140"/>
+                  <el-table-column align="left" sortable label="打样补产工时" prop="打样补产工时"  width="140"/>
                   <el-table-column align="left" sortable label="装板补产工时" prop="装板补产工时"  width="160"/>
                   <el-table-column align="left" sortable label="异常停机工时" prop="异常停机工时"  width="160"/>
                   <el-table-column align="left" sortable label="墨色数" prop="墨色数"  width="160"/>
@@ -1385,16 +1386,33 @@ const treeData = ref([]);
 //工单资料菜单列表
 const DataListdata = async () => {
   try {
-    const response = await OutputSstatisticsMenu();
-    const dataList = response.data;
-    dataList.forEach((item) => {
-    let obj = {};
-    obj.label = item.date;
-    obj.children = [];
-    item.sbbh.forEach((child) => {
-        obj.children.push({label: child});
-    });
-    treeData.value.push(obj);
+	  
+	  const response = await OutputSstatisticsMenu();
+	  const dataList = response.data;
+	  dataList.forEach((item) => {
+	      let obj = {};
+	      obj.label = item.date;
+	      obj.children = [];
+	      item.sbbh.forEach((child, index) => {
+	          obj.children.push({
+	              label: child,
+	              parentDate: item.date // 添加上级日期并避免重复
+	          });
+	      });
+	      console.log(obj);
+	      treeData.value.push(obj);
+	  
+ //    const response = await OutputSstatisticsMenu();
+ //    const dataList = response.data;
+ //    dataList.forEach((item) => {
+ //    let obj = {};
+ //    obj.label = item.date;
+ //    obj.children = [];
+ //    item.sbbh.forEach((child) => {
+ //        obj.children.push({label: child});
+ //    });
+	// console.log(obj)
+ //    treeData.value.push(obj);
 });
   } catch (error) {
     console.error(error);
@@ -1444,19 +1462,24 @@ const handleNodeClick = async (node) => {
     // 给当前点击的节点改变颜色
     clickedNode.querySelector('.el-tree-node__label').style.color = 'red';
   }
+  console.log(node)
   tabledate2.value=[]
   if(node.children !==undefined ){
-    params.value.mouth= node.label
+    // params.value.mouth= node.label
+	params.value.mouth= node.parentDate
   }
  if (node.children === undefined){
+	 params.value.mouth = node.parentDate
    params.value.sist = node.label
     MachineList(params.value)
  }
- console.log();
+ // console.log();
   // _WorkList_page(); 
 };
   const MachineList = async(params)=>{
   try {
+	  console.log(params)
+	  console.log(12312312321)
     const MachineListData = await MachineOperation(params);
     let data = MachineListData.data
     for (var key in data){

src/view/DecisionSupport/outputsum/index.vue

@@ -1476,8 +1476,12 @@ const DataListdata = async () => {
     obj.label = item.date;
     obj.children = [];
     item.sbbh.forEach((child) => {
-        obj.children.push({label: child});
+        obj.children.push({
+            label: child,
+            parentDate: item.date // 添加上级日期并避免重复
+        });
     });
+	console.log(obj)
     treeData.value.push(obj);
 });
   } catch (error) {
@@ -1526,12 +1530,16 @@ const handleNodeClick = async (node) => {
     // 给当前点击的节点改变颜色
     clickedNode.querySelector('.el-tree-node__label').style.color = 'red';
   }
+    console.log(node)
+	
   tabledate2.value=[]
   if(node.children !==undefined ){
-    params.value.mouth= node.label
+	  params.value.mouth= node.parentDate
+    // params.value.mouth= node.label
   }
  if (node.children === undefined){
    params.value.sist = node.label
+   params.value.mouth= node.parentDate
     ProductList(params.value)
  }
   // _WorkList_page(); 
@@ -2301,7 +2309,10 @@ const _getSH = async () => {
     const map = {};
     // 构建树形结构
     data.forEach(item => {
-      map[item.sys_bh] = { ...item, children: [], label: `${item.sys_bh}---${item.sys_mc}---${item.sys_rate0}---${item.sys_rate1}` };
+      map[item.sys_bh] = {
+		  ...item, children: [],
+		   label: `${item.sys_bh}---${item.sys_mc}---${item.sys_rate0}---${item.sys_rate1}`
+	   };
     });
     data.forEach(item => {
       if (item.sys_bh.length === 3) {

src/view/performance/09-workOrderVerification/index.vue

@@ -731,6 +731,7 @@
 	let selectData = [] // 将const改为let
 
 	const handleFpslEnter = async (index, row) => {
+		selectIndex = index
 		if(dialogSelectVisible1.value){
 			return
 		}
@@ -805,6 +806,7 @@
 			name
 		} = row
 		const index = selectIndex
+		console.log(index);
 		detailData.table[index].fp_gxmc = sczl_gxmc
 		detailData.table[index].fp_bz = sczl_bzdh
 		detailData.table[index].fp_bh = sczl_bh1

src/view/performance/Dayreports.vue

@@ -68,7 +68,7 @@
               id="tab"
               row-key="ID"
               highlight-current-row="true"
-              border
+              border  
               :row-style="{ height: '0px' }"
               :header-row-style="{ height: '20px' }"
               :header-cell-style="{ padding: '0px' }"
@@ -376,7 +376,7 @@
                 layout="total, sizes, prev, pager, next, jumper"
                 v-model:current-page="page"
                 v-model:page-size="limit"
-                :page-sizes="[10, 30, 50, 100]"
+                :page-sizes="[10, 30, 50, 100,1000]"
                 :total="total"
                 @current-change="handleCurrentChange"
                 @size-change="handleSizeChange"

src/view/performance/chejianbaogong.vue

@@ -2429,11 +2429,14 @@ const FacilityProduction = async (addr) => {
 //设备工作清单
 const FacilityWorklist = async () => {
 	console.log(JTMC)
-	console.log(23123131232131312321)
 	if (!JTMC.endsWith('#')) {
 	  JTMC += '#';
 	}
   const response = await facilityWorklist({machine:JTMC});
+  
+  console.log("设备运行跟踪数据 ↓↓↓↓↓↓↓↓↓↓↓")
+  console.log(response)
+  
   if (response.code === 0) {
 	sbzyData.splice(0, sbzyData.length, ...response.data);
 	response.data.map(item=>{
@@ -2445,9 +2448,9 @@ const FacilityWorklist = async () => {
 	if(formData.value.工单编号 === undefined){
 		 return false;
 	}
-	console.log(formData.value.工单编号)
     const res = await facilityProcedure({ Gd_gdbh: formData.value.工单编号 })
-  	console.log(res)
+  	console.log("印件及工序已完成板数 ↓↓↓↓↓↓↓↓↓↓↓")
+	console.log(res) 
 	if (res.code === 0) {
 	    selectData.value = res.data
 	}
@@ -2589,15 +2592,19 @@ const gyupdateCompanyFunc = async (row) => {
 }
 //班组人员及分配比例右键
 const bzonRightClick = async (row) => {
-  console.log(roww.value)
-  ElMessageBox.confirm('确定切换班组吗?', '提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-	  console.log(1121111)
-    SetMachineTeams(roww.value)
-  })
+	 console.log(roww.value)
+	if(roww.value === null || roww.value === ''){
+		   ElMessage({type: 'warning',message: '请选择 设备作业清单工单后，再操作此功能' })
+	}else{
+		  ElMessageBox.confirm('确定切换班组吗?', '提示', {
+			confirmButtonText: '确定',
+			cancelButtonText: '取消',
+			type: 'warning'
+		  }).then(() => {
+				console.log(1121111)
+				SetMachineTeams(roww.value)
+		  })
+	} 
 }
 //数据接口调用
 const SetMachineTeams = async(row) => {
@@ -4927,41 +4934,46 @@ const addBz = async() => {
   // console.log(selectedOption.value)
   console.log("机台编号"+selectedOption.value.split('|')[0])
   console.log("班组编号"+BZMC.value)
-  // return false;
-  //班组维护->班组添加【接口】
-  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: '【'+MAC.value+'/'+JTMC+'】'
-  })
-  if (response.code === 0) {
-    FacilityProduction()
-    ElMessage({ type: 'success',message: '成功' });
-
-
-
+  console.log(formDatas.value.code1)
+  if(formDatas.value.code1 === '' || formDatas.value.code1 === null){
+	  ElMessage({
+	    type: 'warning',
+	    message: '组员为空请添加组员'
+	  })
+  }else{
+	  // 班组维护->班组添加【接口】
+	  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: '【'+MAC.value+'/'+JTMC+'】'
+	  })
+	  if (response.code === 0) {
+	    FacilityProduction()
+	    ElMessage({ type: 'success',message: '成功' });
+	  }
   }
 
+
   // console.log("新增班组刷新")
   // console.log(BZMC.value)
   // const facilityTeamlist = await facilityTeam({ machine:BZMC.value});
@@ -5227,14 +5239,18 @@ const yjupdateCompanyFunc = async(row) => {
 //设备作业清单右键
 const yjonRightClick = async(row) => {
   console.log(rowws.value)
-  ElMessageBox.confirm('确定切换当前工单为工作工单吗?', '提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-	    location.reload();
-    setMachineTeams(rowws.value)
-  })
+  if(rowws.value === null || rowws.value === ''){
+	   ElMessage({type: 'warning',message: '请选择 设备作业清单工单后，再操作此功能' })
+  }else{
+	  ElMessageBox.confirm('确定切换当前工单为工作工单吗?', '提示', {
+	    confirmButtonText: '确定',
+	    cancelButtonText: '取消',
+	    type: 'warning'
+	  }).then(() => {
+	  	    location.reload();
+	    setMachineTeams(rowws.value)
+	  })
+  } 
 }
 
 const setMachineTeams = async(row) => {

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -955,6 +955,7 @@
 							<el-table-column  align="left" label="工序" prop="工序"  width="100"/>
 							<el-table-column  align="left" label="组员1" prop="组员1"  width="100"/>
 							<el-table-column  align="left" label="组员2" prop="组员2"  width="100"/>
+							<el-table-column  align="left" label="组员3" prop="组员3"  width="100"/>
 							<el-table-column  align="left" label="更新时间" prop="更新时间"  width="160"/>
 			  </el-table>
 			</el-tab-pane>