工序导入

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);
       });

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">
@@ -31,9 +29,7 @@
 
       </div>
     </div>
-</div>
+  </div>
-
-
 </template>
 
 <script>
@@ -65,6 +61,7 @@ export default {
       sourceDetailsData: [
 
       ],
+      typeData: [],
       treeData: [],
       treeLoading: true,
       deletedDetailsData: [
@@ -88,7 +85,7 @@ export default {
   created() {
     this.optionsInit();
 
-        this.$nextTick(() => {
+    this.$nextTick(() => {
 
       this.tableHeight = this.$mk.getWindowSize().height - 260;
       this.treeInit();
@@ -99,6 +96,23 @@ export default {
   // 动作
   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 => {
@@ -107,15 +121,13 @@ export default {
 
           if (col.title in item) {
             let v = item[col.title];
-            if(col.options){
+            if (col.options) {
-              col.options.forEach(op=>{
+              v = this.getOptionValue({ options: col.options, label: v });
-                if(op.label == v){
+            } else if (col.field == "sort_id") {
-                  row[col.field] = op.value;
+              v = this.getTypeId(v);
-                } 
-              })
-            }else{
-              row[col.field] = v;
             } 
+            console.log(col.options)
+            row[col.field] = v;
           }
         })
         rows.push(row);
@@ -144,15 +156,16 @@ export default {
         keyName: 'id', // 主键字段名 
         listFieldName: 'MesProcesses',
 
-        exportFileTitle :"工序",
+        exportFileTitle: "工序",
         enabledExport: true,
         enabledImport: true,
         enabledImportTemplate: true,
         exportColumns: [
-          { title: '编码',field:"code" },
+          { title: '编码', field: "code" },
-          { title: '工序名称',field:"name" },
+          { title: '工序名称', field: "name" },
-          { title: '工序描述',field:"desc" },
+          { title: '工序描述', field: "desc" },
-          { title: '计工方式',field:"work_type",options:settings.options_work_type }
+          { 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/",
@@ -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;
@@ -453,7 +467,7 @@ export default {
         }
 
 
-      }else{
+      } else {
         this.$refs.listPage.onSearch(null);
       }