pro

i18n/locale/zh-CN.js

@@ -428,12 +428,18 @@ export default {
   DipartLocation: {
     name: "部门",
     organizationType: "组织类型",
-    status: '是否生产班组',
+    // status: '是否生产班组',
+    status: '属性',
     departcode: '部门编号',
     department: '部门名称',
     cityName: '省市县',
     creationTime: '创建时间',
     upMent: '上级部门',
+    code:'部门编号',
+    location:'省市县',
+    parent_Id:'上级部门',
+    property:'属性',
+    parentTitle:'上级部门'
   },
   instance: {
     id: '主键',

pages/import/process.vue

@@ -17,6 +17,7 @@
                         <Upload action :before-upload="beforeUpload" ref="uploadfile" :format="formatList">
                             <Button icon="ios-cloud-upload-outline" @click="resetParms">重新上传</Button>
                         </Upload>
+                        <Cascader :data="citys" v-show="false"></Cascader>
                     </div>
                 </FormItem>
             </Form>
@@ -81,6 +82,7 @@
 <script>
 import Api from "./api";
 import BaseColums from "./baseColums";
+import citys from "@/libs/citys";
 import XLSX from "xlsx";
 import {
     Switch
@@ -121,6 +123,10 @@ export default {
             treeData: [], //物料管理左侧类别树
             codeRuleData: [], //物料编码等信息
             routingHeaderData: [], //工艺规程列表信息
+            //部门管理
+            treeList: [],
+            citys: citys(),
+            cityDatas: [], //省市县在一起
         };
     },
     props: {
@@ -144,6 +150,7 @@ export default {
         this.getcodeRuleData();
         //获取工艺规程信息
         this.getRoutingHeaderData();
+        this.formatCity();
         window.onresize = () => {
             ///浏览器窗口大小变化
             return (() => {
@@ -602,6 +609,41 @@ export default {
                 });
             }
         },
+        //获取省市县信息
+        formatCity() {
+            let list = this.$u.clone(this.treeList);
+            let cityData = this.$u.clone(this.citys);
+            let temp = this.$u.treeToList1(cityData);
+            this.cityDatas = [];
+            temp.forEach(ele => {
+                let objTem = {
+                    label: ele.__label.replace(/\s*/g, ""),
+                    value: ele.__value
+                }
+                this.cityDatas.push(objTem)
+            })
+        },
+        //根据value获取当前cityname
+        getCityName(val) {
+            let cities = this.$u.clone(this.cityDatas)
+            let label = "";
+            cities.forEach(ele => {
+                if (val == ele.value) {
+                    label = ele.label
+                }
+            })
+            return label
+        },
+        getCityValue(val) {
+            let cities = this.$u.clone(this.cityDatas)
+            let value = "";
+            cities.forEach(ele => {
+                if (val == ele.label) {
+                    value = ele.value
+                }
+            })
+            return value
+        },
         //批量插入制造资源
         importResource() {
             let tempData = this.$u.clone(this.dataIm);