liuhairui 1 жил өмнө
parent
commit
22356fd427

+ 34 - 12
src/view/DecisionSupport/operation/operation.vue

@@ -1385,16 +1385,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 +1461,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){

+ 2 - 2
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"

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

@@ -2450,7 +2450,7 @@ const FacilityWorklist = async () => {
 	}
     const res = await facilityProcedure({ Gd_gdbh: formData.value.工单编号 })
   	console.log("印件及工序已完成板数 ↓↓↓↓↓↓↓↓↓↓↓")
-	console.log(res)
+	console.log(res) 
 	if (res.code === 0) {
 	    selectData.value = res.data
 	}