liuhairui 1 рік тому
батько
коміт
1d95f873e9

+ 2 - 1
src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -2439,6 +2439,7 @@ const treeData = ref({})
 const getCustomdata = async () => {
   try {
     const data  = await getCustom()
+    console.log(data)
     treeData.value = data.data;
   } catch (error) {
     console.error('Error fetching custom data:', error);
@@ -3618,7 +3619,7 @@ const createROLuckyExcel = (files) => {
   display: flex;
 }
 .JKWTree-tree {
-  width: 300px;
+  /*width: 300px;*/
   background-color: #fff;
   /*background-color: rgba(241, 224, 224, 0.99);*/
   padding: 10px;

+ 1 - 1
src/view/yunyin/renliziyuan/renyuanjibenziliao.vue

@@ -584,7 +584,7 @@ const _ygjbzledit = async ()=>{
   display: flex;
 }
 .JKWTree-tree {
-  width: 300px;
+  /*width: 300px;*/
   background-color: #fff;
   padding: 10px;
   margin-right: 20px;

+ 40 - 11
src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -439,7 +439,6 @@
           <div class="JKWTree-tree" style="height: 200px">
             <h3>工单管理</h3>
             <el-tree :data="treeData.data"  @node-click="handleNodeClick"></el-tree>
-<!--            <el-tree :data="treeData.data" class="treecolor"  @node-click="handleNodeClick"></el-tree>-->
           </div>
         </layout-sider>
 
@@ -2930,7 +2929,6 @@ const yycpzlhandleCancel = () => {onyycpzllist.value = false;};
 
 // =========== 左侧树侧形结构 ===========
 const treeData = reactive({data:[]});
-// const treeData = ref({})
 const defaultProps = {
   children: 'children',
   label: 'label'
@@ -2938,22 +2936,53 @@ const defaultProps = {
 //工单资料菜单列表
 const DataListdata = async () => {
   try {
-    const data = await DataList();
-    for (let key in data.data) {
+    const response = await DataList();
+    const dataList = response.data;
+    // 首先清空treeData.data
+    treeData.data.length = 0;
+    // 遍历接口返回的data对象
+    for (let key in dataList) {
       // 忽略 "productingAll" 和 "progressAll"
       if (key !== "productingAll" && key !== "progressAll") {
-        let temp = data.data[key];
-        let object = {};
-        object.id = temp[0];
-        object.label = data.data[key];
-        object.children = [];
-        treeData.data.push(object);
+        let workOrders = dataList[key];
+        let categoryObject = {
+          id: key,
+          label: key,
+          children: []
+        };
+        // 遍历该分类下的工单数组
+        workOrders.forEach((workOrder) => {
+          let workOrderObject = {
+            id: workOrder.split('【')[0], // 假设编号在'【'之前
+            label: workOrder
+          };
+          categoryObject.children.push(workOrderObject);
+        });
+        treeData.data.push(categoryObject);
       }
     }
   } catch (error) {
     console.error(error);
   }
 };
+// const DataListdata = async () => {
+//   try {
+//     const data = await DataList();
+//     for (let key in data.data) {
+//       // 忽略 "productingAll" 和 "progressAll"
+//       if (key !== "productingAll" && key !== "progressAll") {
+//         let temp = data.data[key];
+//         let object = {};
+//         object.id = temp[0];
+//         object.label = data.data[key];
+//         object.children = [];
+//         treeData.data.push(object);
+//       }
+//     }
+//   } catch (error) {
+//     console.error(error);
+//   }
+// };
 DataListdata();
 
 //点击左侧树形获取编号
@@ -3958,7 +3987,7 @@ const luckyexcelCloseDialog = () => {
   display: flex;
 }
 .JKWTree-tree {
-  width: 300px;
+  /*width: 300px;*/
   background-color: #fff;
   padding: 10px;
   margin-right: 20px;