From 25e1359d1994433bb4ae08349c15d78460f434dc Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Mon, 5 Jun 2023 11:56:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/application/mk/basic-pages/list.vue       | 12 ++-
 .../Mes/MesProcesses/MesProcesses/List.vue    | 82 +++++++++++--------
 2 files changed, 59 insertions(+), 35 deletions(-)

diff --git a/src/application/mk/basic-pages/list.vue b/src/application/mk/basic-pages/list.vue
index bf5e3d2..aacb96c 100644
--- a/src/application/mk/basic-pages/list.vue
+++ b/src/application/mk/basic-pages/list.vue
@@ -156,7 +156,17 @@ export default {
         };
         for (let i = 0; i < this.options.exportColumns.length; i++) {
           let item = this.options.exportColumns[i];
-          jsonRow[item.title] = row[item.field] || '';
+          var v = "";
+          if(item.dataField){
+           v = row[item.dataField];
+            if(item.textField && v){
+              v = v[item.textField]
+            }
+          }else{
+            v = row[item.field] || '';
+          }
+       
+           jsonRow[item.title] = v;
         }
         jsonRows.push(jsonRow);
       });
diff --git a/src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue b/src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue
index 172e5a4..642da48 100644
--- a/src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue
+++ b/src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue
@@ -1,8 +1,6 @@
 <template>
-
-
-<div class="page-body">
-  <div class="split_wrapper">
+  <div class="page-body">
+    <div class="split_wrapper">
       <div class="left">
         <div class="treepanel">
           <div class="treepanel-header">
@@ -23,7 +21,7 @@
             </a-tree>
           </div>
         </div>
- 
+
       </div>
       <div class="right">
 
@@ -31,9 +29,7 @@
 
       </div>
     </div>
-</div>
-
-
+  </div>
 </template>
 
 <script>
@@ -65,12 +61,13 @@ export default {
       sourceDetailsData: [
 
       ],
+      typeData: [],
       treeData: [],
       treeLoading: true,
       deletedDetailsData: [
 
       ],
-      selectedKeys: [], 
+      selectedKeys: [],
       selectedKey: null,
       tableHeight: 500
     };
@@ -87,38 +84,53 @@ export default {
   // 创建完成
   created() {
     this.optionsInit();
-    
-        this.$nextTick(() => {
+
+    this.$nextTick(() => {
 
       this.tableHeight = this.$mk.getWindowSize().height - 260;
       this.treeInit();
 
     });
-    
+
   },
   // 动作
   methods: {
 
+
+    getTypeId(name) {
+      for (let i = 0; i < this.typeData.length; i++) {
+        if (this.typeData[i].name == name) {
+          return this.typeData[i].id;
+        }
+      }
+      return 0;
+    },
+    getOptionValue({ label, options }) {
+      for (let i = 0; i < options.length; i++) {
+        if (options[i].label == label) {
+          return options[i].value;
+        }
+      }
+      return '';
+    },
     pageImport({ data }) {
-      let rows = []; 
-      data.forEach(item => { 
+      let rows = [];
+      data.forEach(item => {
         let row = {};
         this.pageOptions.exportColumns.forEach(col => {
 
           if (col.title in item) {
             let v = item[col.title];
-            if(col.options){
-              col.options.forEach(op=>{
-                if(op.label == v){
-                  row[col.field] = op.value;
-                } 
-              })
-            }else{
-              row[col.field] = v;
+            if (col.options) {
+              v = this.getOptionValue({ options: col.options, label: v });
+            } else if (col.field == "sort_id") {
+              v = this.getTypeId(v);
             } 
+            console.log(col.options)
+            row[col.field] = v;
           }
         })
-        rows.push(row); 
+        rows.push(row);
       });
 
       this.$mk.post({
@@ -144,15 +156,16 @@ export default {
         keyName: 'id', // 主键字段名 
         listFieldName: 'MesProcesses',
 
-        exportFileTitle :"工序",
+        exportFileTitle: "工序",
         enabledExport: true,
         enabledImport: true,
         enabledImportTemplate: true,
         exportColumns: [
-          { title: '编码',field:"code" },
-          { title: '工序名称',field:"name" },
-          { title: '工序描述',field:"desc" },
-          { title: '计工方式',field:"work_type",options:settings.options_work_type }
+          { title: '编码', field: "code" },
+          { title: '工序名称', field: "name" },
+          { title: '工序描述', field: "desc" },
+          { title: '计工方式', field: "work_type", options: settings.options_work_type },
+          { title: '工序分类', field: "sort_id", dataField: 'mes_processes_sort', textField: "name" }
         ],
         addPageUrl: "/MesProcesses/MesProcessesAdd",
         editPageUrl: "/MesProcesses/MesProcessesUpdate/",
@@ -243,8 +256,8 @@ export default {
             //{ field: 'process_segment_id', sortable: true, title: '工序段id', width: 250 }, // 工序段id
             //{ field: 'title', sortable: true, title: '工序名称', width: 250 }, // 工序名称
             { field: 'code', sortable: true, title: '工序编码', width: 250 }, // 工序编码
-            { field: 'name', sortable: true, title: '工序名称', width: 250 },  
-            
+            { field: 'name', sortable: true, title: '工序名称', width: 250 },
+
             { field: 'mes_processes_sort', formatter: 'formatRef', params: { dataType: "object", textField: "name" }, title: '工序分类', width: 250 },
 
             { field: 'desc', sortable: true, title: '工序描述', width: 250 }, // 工序描述
@@ -297,6 +310,7 @@ export default {
           title: "工序分类",
           key: "root"
         };
+        this.typeData = r.data.MesProcessesSort;
         let at = toArrayTree(r.data.MesProcessesSort, { parentKey: "parent_id" });
         console.log(at);
         treedata[childrenFieldName] = at;
@@ -414,7 +428,7 @@ export default {
         }
       };
       return find(this.treeData);
-    }, 
+    },
     reloadData() {
       if (this.selectedKey) {
         this.loadData(this.selectedKey);
@@ -441,7 +455,7 @@ export default {
 
       if (key && key != "root") {
         var node = this.findTreeNode(key);
-        if (node.children && node.children.length) { 
+        if (node.children && node.children.length) {
           var ids = this.getAllChildrenIds(node.children);
           this.$refs.listPage.onSearch({
             sort_id: [node.id, ...ids].join(',')
@@ -453,7 +467,7 @@ export default {
         }
 
 
-      }else{
+      } else {
         this.$refs.listPage.onSearch(null);
       }
 
@@ -568,7 +582,7 @@ export default {
   background: white;
   padding: 8px;
 }
- 
+
 .toolbarbtns .ant-btn {
   margin-right: 10px;
 }