Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

components/page/dataGrid.vue

@@ -21,6 +21,9 @@
         </div>
         <div class="btns">
             <slot name="buttons"></slot>
+            <Button @click="export2Excel" v-if="exportTitle.length>0">
+                导出
+            </Button>
             <Button v-if="set&&type=='table'" @click="config=!config">
                 <Icon type="md-build" title="列设置" />
             </Button>
@@ -64,6 +67,7 @@
             </li>
         </ul>
     </Drawer>
+
     <FooterToolbar v-if="batch" v-show="footerToolbar">
         <div class="tip">已选{{selectItems.length}}项</div>
         <slot name="batch"></slot>
@@ -212,6 +216,10 @@ export default {
             type: Number,
             default: 40,
         },
+        exportTitle: {
+            type: String,
+            default: "",
+        }
     },
     created() {
         this.columns.forEach((u) => {
@@ -462,6 +470,81 @@ export default {
             this.footerToolbar = false;
             this.$refs.table.selectAll(false);
         },
+
+        //导出excel
+        export2Excel() {
+            //当前显示数据
+            var where = [];
+            var conditions = this.conditions;
+            if (conditions) {
+                Object.keys(conditions).forEach((u) => {
+                    let v = conditions[u].value;
+                    let op = conditions[u].op;
+                    if (!this.$u.isNull(v)) {
+                        if (op == "Range") {
+                            let times = [];
+                            v.map((u) => {
+                                if (!this.$u.isNull(u)) {
+                                    times.push(this.$u.toTime(u));
+                                }
+                            });
+                            v = times.join(",");
+                        } else if (op.indexOf("In") > -1) {
+                            v = v.join(",");
+                        }
+                        if (!this.$u.isNull(v)) {
+                            where.push({
+                                fieldName: u,
+                                fieldValue: v,
+                                conditionalType: op,
+                            });
+                        }
+                    }
+                });
+            }
+            let searchs = {
+                pageIndex: 1,
+                conditions: where,
+                pageSize: 1000
+            }
+            this.$api.post(this.action, searchs).then((r) => {
+                let list = []
+                list = r.result.items;
+                const tHeader = []; // 设置Excel的表格第一行的标题
+                const filterVal = []; //list里对象的属性
+                var tempCol = [];
+                var columnsCur = this.$u.clone(this.columnsNow); //导出列标题信息griddata  this.$refs.grid.columnsCur
+                columnsCur.forEach((el) => {
+                    if ((el.hide && !el.import) || (!el.hide && el.key != "action" && el.type != "selection" && el.key != "ico")) {
+                        if (el.code) {
+                            tempCol.push({
+                                key: el.key,
+                                code: el.code
+                            }); //临时存放code数据字典的字段及对应的数据字典code
+                        }
+                        tHeader.push(el.title);
+                        filterVal.push(el.key);
+                    }
+                });
+                list.forEach((e) => {
+                    //给导出数据增加数据字典对应的name
+                    tempCol.forEach((ele) => {
+                        e[ele.key] = this.$u.dirName(
+                            this.$store.getters.dictionaryByKey(ele.code),
+                            e[ele.key]
+                        );
+                    });
+                });
+                let nowDate = this.$u.getNowTime(); //年月日时分秒yyyyMMddhhmmss
+                //获取导出数据结束
+                this.$u.outExcel(this.exportTitle +
+                    "(" + nowDate + ")",
+                    tHeader,
+                    filterVal,
+                    list
+                );
+            });
+        },
     },
     computed: {
         columnsNow() {

components/page/import/api.js

+import Api from '@/plugins/request'
+import { getJSON } from 'js-cookie';
+export default {
+  index: `${systemUrl}/importcenter/paged`,
+  paged(params) {
+    return Api.post(`${systemUrl}/importcenter/paged`, params);
+  },
+  get(params) {
+    return Api.get(`${systemUrl}/importcenter/get`, params);
+  },
+  create(params) {
+    return Api.post(`${systemUrl}/importcenter/create`, params);
+  },
+  update(params) {
+    return Api.post(`${systemUrl}/importcenter/update`, params);
+  },
+  delete(id) {
+    return Api.delete(`${systemUrl}/importcenter/delete`, {
+      params: {
+        id: id
+      }
+    });
+  },
+  deletes(params) {
+    return Api.post(`${systemUrl}/importcenter/batchdelete`, params);
+  },
+  openExcel(params) {//处理时打开以前上传的excel返回数据
+    return Api.post(`${systemUrl}/importcenter/open`, params);
+  },
+  importUser(params) {//用户管理导入
+    return Api.post(`${systemUrl}/userimportservice/import`, params);
+  },
+  updateimportstatus(params) {//用户管理导入
+    return Api.post(`${systemUrl}/importcenter/updateimportstatus`, params);
+  },
+  
+}

components/page/import/detailExcel.vue

+<template>
+<div class="h100">
+    <Tabs type="card" width="100">
+        <TabPane label="excel数据">
+            <TablePaste hide-table :input-props="inputProps" @on-success="handleSuccess" @on-error="handleError" />
+        </TabPane>
+        <TabPane label="预览">
+            <Table :border="true" :columns="columnsImport" :data="excelData" :height="tableHeight" ref="tableExcel" class="tableCommon"></Table>
+        </TabPane>
+    </Tabs>
+
+</div>
+</template>
+
+<script>
+import Api from "./api";
+export default {
+    name: "detailExcel",
+    data() {
+        return {
+            entity: {},
+            downUrl: fileUrlDown,
+            fileUrlPath: "",
+            excelRows: 100,
+            tableHeight: '',
+            inputProps: {
+                rows: 10,
+                placeholder: "请从Excel复制一段表格数据，粘贴在这里",
+            },
+            columnsImport: [],
+            excelData: []
+
+        };
+    },
+    props: {
+        eid: Number,
+    },
+    created() {
+        this.excelRows = parseInt((window.innerHeight - 231) / 21) + 1;
+        this.inputProps.rows = this.excelRows
+        this.tableHeight = window.innerHeight - 200
+    },
+    mounted() {
+        window.onresize = () => {
+            ///浏览器窗口大小变化
+            return (() => {
+                window.screenHeight = window.innerHeight;
+                this.excelRows = parseInt((window.screenHeight - 231) / 21) + 1;
+                this.inputProps.rows = this.excelRows
+                this.tableHeight = window.innerHeight - 200
+
+            })();
+        };
+    },
+    methods: {
+        handleClose() {
+            this.$emit("on-close");
+        },
+        downFile(path) {
+            //alert(path)
+            let truePath = path;
+            if (truePath.length > 2) {
+                if (
+                    truePath.substring(0, 7).toLowerCase() == "http://" ||
+                    truePath.substring(0, 8).toLowerCase() == "https://"
+                ) {
+                    window.open(truePath, "_blank");
+                } else {
+                    this.fileUrlPath = this.downUrl + path;
+                    window.open(this.fileUrlPath, "_blank");
+                }
+            }
+        },
+        //粘贴excel成功
+        handleSuccess(tableData) {
+            //初始化数据
+            this.excelData = [];
+            this.columnsImport = [];
+            //处理colum和data
+            let tabColum = tableData.columns
+            let tabData = tableData.data
+            let arrData = []
+            tabData.forEach(ele => {
+                let objData = {}
+                tabColum.forEach(el => {
+                    objData[el.title] = ele[el.key]
+                })
+                arrData.push(objData)
+            })
+            //处理title和key一致
+            tabColum.forEach(el => {
+                el.key = el.title
+            })
+
+            this.columnsImport = tabColum;
+            this.columnsImport.unshift({
+                type: 'index',
+                width: 80,
+                align: 'right',
+                title: '序号'
+            })
+            this.excelData = arrData;
+            this.$emit("on-datalength", this.excelData.length)
+        },
+        //粘贴excel失败
+        handleError(tableData, errorIndex) {
+            //console.log(tableData, errorIndex);
+            this.$Message.error("表格数据有误");
+        },
+        //粘贴excel相关end
+
+    },
+    watch: {
+        eid(v) {
+            if (v > 0) {
+                this.load(v);
+            }
+        },
+    },
+};
+</script>

components/page/opration.vue

 <template>
-  <Tooltip trigger="hover" v-if="title" :content="title" placement="top-end">
+<Tooltip trigger="hover" v-if="title" :content="title" placement="top-end">
     <a class="op" :class="css" @click="handler">
-      <slot>
-        <Icon v-if="type=='icon'" :type="icon" />
-        <span v-else="type=='text'" v-text="text"></span>
-      </slot>
+        <slot>
+            <Icon v-if="type=='icon'" :type="icon" :color="color" />
+            <span v-else="type=='text'" v-text="text"></span>
+        </slot>
     </a>
-  </Tooltip>
-  <a class="op" v-else :class="css" @click="handler">
+</Tooltip>
+<a class="op" v-else :class="css" @click="handler">
     <slot>
-      <Icon v-if="type=='icon'" :type="icon" />
-      <span v-else="type=='text'" v-text="text"></span>
+        <Icon v-if="type=='icon'" :type="icon" :color="color" />
+        <span v-else="type=='text'" v-text="text"></span>
     </slot>
-  </a>
+</a>
 </template>
+
 <script>
 export default {
-  name: "op",
-  props: {
-    icon: {
-      type: String
-    },
-    oprate: {
-      type: String
-    },
-    type: {
-      type: String,
-      default: "text"
+    name: "op",
+    props: {
+        icon: {
+            type: String
+        },
+        oprate: {
+            type: String
+        },
+        type: {
+            type: String,
+            default: "text"
+        },
+        title: {
+            type: String,
+        },
+        msg: {
+            type: String,
+            default: "确认要删除吗？"
+        },
+        color: {
+            type: String
+        }
     },
-    title: {
-      type: String,
+    data() {
+        return {
+            text: "",
+            css: "detail"
+        };
     },
-    msg: {
-      type: String,
-      default: "确认要删除吗？"
-    }
-  },
-  data() {
-    return {
-      text: "",
-      css: "detail"
-    };
-  },
-  created() {
-    var oprates = {
-      detail: "查看",
-      edit: "编辑",
-      add: "添加",
-      delete: "删除",
-      remove: "删除"
-    };
+    created() {
+        var oprates = {
+            detail: "查看",
+            edit: "编辑",
+            add: "添加",
+            delete: "删除",
+            remove: "删除"
+        };
 
-    if (oprates[this.oprate]) {
-      this.text = oprates[this.oprate];
-      this.css = this.oprate;
-    } else if (this.oprate) {
-      this.css = this.oprate;
-    } else if (this.type == "icon") {
-      this.css = "icon";
-    }
-  },
-  methods: {
-    handler() {
-      if (this.oprate == "delete"||this.oprate == "remove") {
-        this.$Modal.confirm({
-          title: this.title,
-          content: "<p>" + this.msg + "</p>",
-          onOk: () => {
-            this.$emit("click", event);
-          }
-        });
-      } else {
-        this.$emit("click", event);
-      }
+        if (oprates[this.oprate]) {
+            this.text = oprates[this.oprate];
+            this.css = this.oprate;
+        } else if (this.oprate) {
+            this.css = this.oprate;
+        } else if (this.type == "icon") {
+            this.css = "icon";
+        }
+    },
+    methods: {
+        handler() {
+            if (this.oprate == "delete" || this.oprate == "remove") {
+                this.$Modal.confirm({
+                    title: this.title,
+                    content: "<p>" + this.msg + "</p>",
+                    onOk: () => {
+                        this.$emit("click", event);
+                    }
+                });
+            } else {
+                this.$emit("click", event);
+            }
+        }
     }
-  }
 };
 </script>
+
 <style lang="less">
 a.op {
-  display: inline;
-  margin: 0 3px;
+    display: inline;
+    margin: 0 3px;
 }
-</style>
\ No newline at end of file
+</style>

npm-shrinkwrap.json

@@ -11753,7 +11753,7 @@
       "dependencies": {
         "source-map": {
           "version": "0.6.1",
-          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
+          "resolved": "http://r.cnpmjs.org/source-map/download/source-map-0.6.1.tgz",
           "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true,
           "optional": true

pages/import/index.vue

 <template>
 <div class="h100">
-    <DataGrid :columns="columns" ref="grid" :action="action">
+    <DataGrid :columns="columns" ref="grid" :action="action" exportTitle="导入中心">
         <template slot="easySearch">
             <Form ref="formInline" :model="easySearch" inline>
                 <FormItem prop="keys">

pages/materiel/classification/index.vue

@@ -84,6 +84,7 @@
     </Modal>
   </div>
 </template>
+
 <script>
 import MasterData from "./masterData.vue";
 
@@ -126,17 +127,14 @@ export default {
   },
   methods: {
     clickItem(val) {
-      console.log(val);
       this.nodeInfo.codeRuleId = val;
       this.model8 = val;
-
       this.cityList.forEach((e) => {
         if (val == e.id) {
           this.downName = e.name;
           this.nodeInfo.codeRuleType = e.type;
         }
       });
-      this.model8 = val;
       this.loadTree(this.nodeInfo.codeRuleId, this.nodeInfo.codeRuleType);
     },
     listSlecet() {
@@ -214,7 +212,10 @@ export default {
           onOk: () => {
             Api.delete(this.nodeInfo.id).then((r) => {
               if (r.success) {
-                this.loadTree(this.nodeInfo.codeRuleId);
+                this.loadTree(
+                  this.nodeInfo.codeRuleId,
+                  this.nodeInfo.codeRuleType
+                );
                 this.$Message.success("删除成功");
               }
             });
@@ -281,13 +282,17 @@ export default {
       //   this.$refs.dataTable.dataColumns = tableData;
       // }
     },
-    loadTree(id) {
+    loadTree(id, codeRuleType) {
       let data = {
         conditions: [
-          { fieldName: "codeRuleId", fieldValue: id, conditionalType: "Equal" },
+          {
+            fieldName: "codeRuleId",
+            fieldValue: id,
+            conditionalType: "Equal",
+          },
           {
             fieldName: "codeRuleType",
-            fieldValue: this.nodeInfo.codeRuleType,
+            fieldValue: codeRuleType,
             conditionalType: "Equal",
           },
         ],
@@ -322,6 +327,7 @@ export default {
       ids.push(b.id);
       if (b.children) {
         addId(b.children);
+
         function addId(data) {
           data.map((u) => {
             ids.push(u.id);
@@ -345,6 +351,7 @@ export default {
       let expand = this.expand;
       let result = [];
       search(this.keys, items);
+
       function search(keys, data) {
         data.map((u) => {
           if (keys.length < u.title) {
@@ -365,7 +372,8 @@ export default {
   },
 };
 </script>
-<style lang="less" >
+
+<style lang="less">
 .classification {
   font-family: Microsoft YaHei;
 
@@ -381,6 +389,7 @@ export default {
       background: #eee;
       padding-left: 10px;
     }
+
     .p-list {
       h3 {
         height: 50px;
@@ -393,22 +402,26 @@ export default {
         opacity: 1;
         padding-left: 10px;
       }
+
       .search {
         height: 50px;
         padding: 5px 10px;
       }
+
       .fg {
         flex: none;
         height: 100%;
         overflow: auto;
         padding-left: 10px;
       }
+
       .tree {
         height: calc(100vh - 215px);
         overflow: auto;
       }
     }
   }
+
   .show_menu {
     width: 30px;
     height: 30px;
@@ -416,6 +429,7 @@ export default {
     top: 100px;
     left: 0;
     z-index: 9;
+
     .menu_play {
       width: 30px;
       height: 30px;
@@ -428,11 +442,13 @@ export default {
       background: #ffffff;
       box-shadow: #ccc 2px 2px 4px 1px;
     }
+
     .menu_play:hover {
       background-color: #2d8cf0;
       color: white;
     }
   }
+
   .ivu-layout-content {
     // margin-left: 5px;
     background: rgba(255, 255, 255, 1);
@@ -443,4 +459,4 @@ export default {
     overflow-y: hidden;
   }
 }
-</style>
\ No newline at end of file
+</style>

pages/materiel/classification/masterData.vue

 <template>
-  <div class="master-data">
+<div class="master-data">
     <!-- <Table border :columns="columns" :data="dataColumns" :height="tableHeight"></Table> -->
-    <DataGrid
-      :columns="columns"
-      ref="grid"
-      :conditions="easySearch"
-      :action="action"
-      :high="false"
-      :height="tableHeight"
-    >
-      <template slot="easySearch">
-        <Form ref="formInline" :model="easySearch" inline>
-          <FormItem prop="keys">
-            <Input placeholder="请输入编码/名称" v-width="200" v-model="easySearch.keys.value" clearable />
-          </FormItem>
-          <FormItem>
-            <Button type="primary" @click="search">查询</Button>
-          </FormItem>
-        </Form>
-      </template>
+    <DataGrid :columns="columns" ref="grid" :conditions="easySearch" :action="action" :high="false" :height="tableHeight">
+        <template slot="easySearch">
+            <Form ref="formInline" :model="easySearch" inline>
+                <FormItem prop="keys">
+                    <Input placeholder="请输入编码/名称" v-width="200" v-model="easySearch.keys.value" clearable />
+                </FormItem>
+                <FormItem>
+                    <Button type="primary" @click="search">查询</Button>
+                </FormItem>
+            </Form>
+        </template>
     </DataGrid>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from "./api";
 export default {
-  name: "masterData",
-  props: ["root"],
-  data() {
-    return {
-      action: Api.index,
-      tableHeight: "",
-      dataColumns: [],
-      easySearch: {
-        keys: { op: "code,name", value: null },
-        id: { op: "In", value: "" }
-      },
-      columns: [
-        // {
-        //   key: "index",
-        //   title: "#",
-        //   align: "left",
-        //   width: 60
-        // },
-        {
-          key: "code",
-          title: "编码",
-          align: "left"
-        },
-        {
-          key: "name",
-          title: "名称",
-          align: "left"
-        },
-        {
-          key: "status",
-          title: "状态",
-          align: "left",
-          code: "materail.category.status"
-        },
-
-        {
-          key: "description",
-          title: "描述",
-          align: "left"
-        },
-        {
-          title: "操作",
-          key: "action",
-          width: 260,
-          align: "left",
-          render: (h, params) => {
-            return h("div", { class: "action" }, [
-              h(
-                "op",
+    name: "masterData",
+    props: ["root"],
+    data() {
+        return {
+            action: Api.index,
+            tableHeight: "",
+            dataColumns: [],
+            easySearch: {
+                keys: {
+                    op: "code,name",
+                    value: null
+                },
+                id: {
+                    op: "In",
+                    value: ""
+                }
+            },
+            columns: [
+                // {
+                //   key: "index",
+                //   title: "#",
+                //   align: "left",
+                //   width: 60
+                // },
                 {
-                  attrs: { oprate: "edit" },
-                  on: { click: () => this.edit(params.row) }
+                    key: "code",
+                    title: "编码",
+                    align: "left"
                 },
-                "编辑"
-              ),
-              h(
-                "op",
                 {
-                  attrs: { oprate: "delete" },
-                  on: { click: () => this.remove(params.row.id) }
+                    key: "name",
+                    title: "名称",
+                    align: "left"
                 },
-                "删除"
-              )
-            ]);
-          }
-        }
-      ]
-    };
-  },
-  async fetch({ store, params }) {
-    await store.dispatch("loadDictionary"); // 加载数据字典
-  },
-  created() {
-    this.tableHeight = window.innerHeight - 220;
-  },
-  mounted() {
-    window.onresize = () => {
-      ///浏览器窗口大小变化
-      return (() => {
-        window.screenHeight = window.innerHeight;
+                {
+                    key: "status",
+                    title: "状态",
+                    align: "left",
+                    code: "materail.category.status"
+                },
+
+                {
+                    key: "description",
+                    title: "描述",
+                    align: "left"
+                },
+                {
+                    title: "操作",
+                    key: "action",
+                    width: 260,
+                    align: "left",
+                    render: (h, params) => {
+                        return h("div", {
+                            class: "action"
+                        }, [
+                            h(
+                                "op", {
+                                    attrs: {
+                                        oprate: "edit"
+                                    },
+                                    on: {
+                                        click: () => this.edit(params.row)
+                                    }
+                                },
+                                "编辑"
+                            ),
+                            h(
+                                "op", {
+                                    attrs: {
+                                        oprate: "delete"
+                                    },
+                                    on: {
+                                        click: () => this.remove(params.row.id)
+                                    }
+                                },
+                                "删除"
+                            )
+                        ]);
+                    }
+                }
+            ]
+        };
+    },
+    async fetch({
+        store,
+        params
+    }) {
+        await store.dispatch("loadDictionary"); // 加载数据字典
+    },
+    created() {
         this.tableHeight = window.innerHeight - 220;
-      })();
-    };
-  },
-  methods: {
-    search() {
-      // alert(JSON.stringify(this.easySearch));
-      console.log(this.easySearch);
-      this.$refs.grid.reload(this.easySearch);
     },
-    edit(row) {
-      this.$emit("on-edit", row);
+    mounted() {
+        window.onresize = () => {
+            ///浏览器窗口大小变化
+            return (() => {
+                window.screenHeight = window.innerHeight;
+                this.tableHeight = window.innerHeight - 220;
+            })();
+        };
     },
-    remove(id) {
-      Api.delete(id).then(r => {
-        if (r.success) {
-          this.$refs.grid.reload(this.easySearch);
-          this.$Message.success("删除成功");
+    methods: {
+        search() {
+            // alert(JSON.stringify(this.easySearch));
+            console.log(this.easySearch);
+            this.$refs.grid.reload(this.easySearch);
+        },
+        edit(row) {
+            this.$emit("on-edit", row);
+        },
+        remove(id) {
+            Api.delete(id).then(r => {
+                if (r.success) {
+                    this.$refs.grid.reload(this.easySearch);
+                    this.$Message.success("删除成功");
+                }
+            });
         }
-      });
-    }
-  },
-  watch: {
-    root: {
-      handler(newName, oldName) {
-        if (newName.id) {
-          this.easySearch.id.value = newName.ids;
-          this.$refs.grid.reload(this.easySearch);
-        } else {
-          this.easySearch.id.value = "-1";
+    },
+    watch: {
+        root: {
+            handler(newName, oldName) {
+                if (newName.id) {
+                    this.easySearch.id.value = newName.ids;
+                    this.$refs.grid.reload(this.easySearch);
+                } else {
+                    this.easySearch.id.value = "-1";
+                }
+            },
+            immediate: true,
+            deep: true
         }
-      },
-      immediate: true,
-      deep: true
     }
-  }
 };
 </script>
+
 <style lang="less" scoped>
 .spare-parts {
-  width: 100%;
-  height: 100%;
+    width: 100%;
+    height: 100%;
 }
-</style>
\ No newline at end of file
+</style>

pages/materiel/masterData/index.vue

@@ -54,6 +54,7 @@
     </Layout>
   </div>
 </template>
+
 <script>
 import MasterData from "./masterData.vue";
 
@@ -74,6 +75,7 @@ export default {
       nodeInfo: {
         categoryId: 0,
         rootCategoryId: 0,
+        rootCategoryName: "",
         ids: [],
         addChange: true,
         codeRuleId: 0,
@@ -86,7 +88,9 @@ export default {
       detail: null,
       showMenu: true,
       dataList: [],
-      codeRuleId: "",
+
+      rootCategoryId: null,
+      categoryId: null,
     };
   },
   async fetch({ store, params }) {
@@ -98,16 +102,14 @@ export default {
   },
   methods: {
     clickItem(val) {
-      this.codeRuleId = val;
       this.nodeInfo.codeRuleId = val;
       this.model8 = val;
       this.cityList.forEach((e) => {
         if (val == e.id) {
           this.downName = e.name;
-          this.nodeInfo.codeRuleType = e.type;
         }
       });
-      this.loadTree(this.codeRuleId, this.nodeInfo.codeRuleType);
+      this.loadTree(this.nodeInfo.codeRuleId, this.nodeInfo.codeRuleType);
     },
     listSlecet() {
       let data = {
@@ -164,14 +166,17 @@ export default {
       );
     },
     handleSelect(root, data) {
-      let pid = null; //定义最顶级id
-      let upId = data.upId;
+      let pid = -1; //定义最顶级id
+      var pname = "";
+      var upId = data.upId;
       let roots = root;
+
       function addId(roots, upId) {
         roots.map((u) => {
           if (u.node.id == upId) {
             if (u.node.upId == 0) {
               pid = u.node.id;
+              pname = u.node.name;
             } else {
               upId = u.node.upId;
               addId(roots, upId);
@@ -179,18 +184,26 @@ export default {
           }
         });
       }
+
       addId(roots, upId);
       this.nodeInfo.categoryId = data.id;
-      if (pid == null) {
+      this.nodeInfo.rootCategoryName = data.name;
+      if (pid == -1) {
         this.nodeInfo.rootCategoryId = data.id;
+        this.nodeInfo.rootCategoryName = data.name;
       } else {
         this.nodeInfo.rootCategoryId = pid;
+        this.nodeInfo.rootCategoryName = pname;
       }
     },
     loadTree(id, codeRuleType) {
       let data = {
         conditions: [
-          { fieldName: "codeRuleId", fieldValue: id, conditionalType: "Equal" },
+          {
+            fieldName: "codeRuleId",
+            fieldValue: id,
+            conditionalType: "Equal",
+          },
           {
             fieldName: "codeRuleType",
             fieldValue: codeRuleType,
@@ -231,6 +244,7 @@ export default {
       ids.push(b.value);
       if (b.children) {
         addId(b.children);
+
         function addId(data) {
           data.map((u) => {
             ids.push(u.value);
@@ -252,6 +266,7 @@ export default {
       let expand = this.expand;
       let result = [];
       search(this.keys, items);
+
       function search(keys, data) {
         data.map((u) => {
           if (keys.length < u.title) {
@@ -272,7 +287,8 @@ export default {
   },
 };
 </script>
-<style lang="less" >
+
+<style lang="less">
 .classification {
   font-family: Microsoft YaHei;
 
@@ -288,6 +304,7 @@ export default {
       background: #eee;
       padding-left: 10px;
     }
+
     .p-list {
       h3 {
         height: 50px;
@@ -300,22 +317,26 @@ export default {
         opacity: 1;
         padding-left: 10px;
       }
+
       .search {
         height: 50px;
         padding: 5px 10px;
       }
+
       .fg {
         flex: none;
         height: 100%;
         overflow: auto;
         padding-left: 10px;
       }
+
       .tree {
         height: calc(100vh - 215px);
         overflow: auto;
       }
     }
   }
+
   .show_menu {
     width: 30px;
     height: 30px;
@@ -323,6 +344,7 @@ export default {
     top: 100px;
     left: 0;
     z-index: 9;
+
     .menu_play {
       width: 30px;
       height: 30px;
@@ -335,11 +357,13 @@ export default {
       background: #ffffff;
       box-shadow: #ccc 2px 2px 4px 1px;
     }
+
     .menu_play:hover {
       background-color: #2d8cf0;
       color: white;
     }
   }
+
   .ivu-layout-content {
     // margin-left: 5px;
     background: rgba(255, 255, 255, 1);
@@ -350,4 +374,4 @@ export default {
     overflow-y: hidden;
   }
 }
-</style>
\ No newline at end of file
+</style>

pages/resource/resource/api.js

@@ -44,5 +44,9 @@ export default {
     getmaterialdefinitionproperty(params){
         return Api.get(`${material}/custompropertydefinition/getmaterialdefinitionproperty`,params);
     },
+     //批量导入
+     import(params) {
+        return Api.post(`${resourceUrl}/resourceimportservice/import`, params);
+    },
    
 }
\ No newline at end of file

plugins/iview.js

@@ -61,6 +61,7 @@ import DTSearch from '@/components/page/dtSearch.vue'
 import InputTime from '@/components/page/inputTime.vue'
 import OutputTime from '@/components/page/outputTime.vue'
 import ViewerImg from '@/components/page/viewer.vue'
+import ImportExcel from '@/components/page/import/process.vue'
 
 // import FormMaking from 'form-making'
 // import 'form-making/dist/FormMaking.css'
@@ -127,6 +128,7 @@ Vue.component("OutputTime", OutputTime)
 Vue.component("ViewerImg", ViewerImg)
 Vue.component("StoreTree", StoreTree)
 Vue.component("StoreSelect", StoreSelect)
+Vue.component("ImportExcel",ImportExcel)
 
 
 

plugins/route.js

@@ -27,7 +27,7 @@ export default ({
         next({
           name: 'login',
           query: {
-            redirect: to.fullPath
+            redirect: "/account/login?tenant="+util.cookies.get('tenantCode')
           }
         });
       }

static/config.js

@@ -27,7 +27,7 @@ window.apsUrl = `http://${systemApi.aps}:10111/api/services/app`;//aps排产(61)
 window.technologyUrl =`http://${address}:10000/technology/`;//新工艺规程接口
 window.iconImg = `/imgicon/`;
 window.mncImg = `/images/mnc/`;//mnc图片
-window.material = `http://${address}:10000/material`; //物料管理
+window.material = `http://${address}:10000/material`; //物料管理 10032
 window.Platform = `http://${address}:10000/platform`; //计划管理10131
 
 /* window.systemUrl = `http://${address}:10020/api/services/app`; //System-api 系统管理（基础数据）

store/admin/account.js

@@ -40,7 +40,7 @@ export const actions = {
           if (res.result) {
 
             util.cookies.set('uuid', res.result.userId);
-            util.cookies.set('tenantCode', res.result.tenantCode );
+            util.cookies.set('tenantCode', res.result.tenantCode||res.result.tanantCode); 
             util.cookies.set('token', res.result.accessToken);
             sessionStorage.setItem('token', res.result.accessToken)