Merge branch 'master' of git.mes123.com:zhouyx/mes-ui

pages/aps/aps/add.vue

@@ -112,16 +112,7 @@
                 </Col>
               </Row>
               <FormItem label="班组结构">
-                <Select v-model="entity.shopId" placeholder="请选择" style="width:150px" prop="shopId">
-                  <Option
-                    v-for="(item,index) in list"
-                    :key="index"
-                    :value="item.value"
-                    :label="item.label"
-                    style="display:none"
-                  ></Option>
-                  <Tree key="mytree" :data="data1" ref="mytree" :render="renderContent"></Tree>
-                </Select>
+                <DepartmentSelect v-model="entity.shopId" @on-change="changeSelect" style="width:150px"></DepartmentSelect>
               </FormItem>
               <div class="check-box">
                 <CheckboxGroup v-model="entity.multipleEquipIds">
@@ -188,7 +179,6 @@ export default {
   mounted() {
     this.getCal(); //获取连班策略
     this.apsGet(); //获取参数级别和转序等的关系
-    this.initTree(); //获取当前登录人所在车间下的所有部门:班组结构
     this.multiple(0); //获取任务工单相关设备
   },
   methods: {
@@ -218,44 +208,8 @@ export default {
         }
       });
     },
-    initTree() {
-      var sumData = [];
-      Api.userdepartmentsofworkshop()
-        .then(r => {
-          if (r.result) {
-            this.data1 = r.result;
-          } else {
-            this.$Message.error("加载部门失败!");
-          }
-        })
-        .catch(err => {});
-    },
-    renderContent(h, { root, node, data }) {
-      //渲染树的样式
-      return h(
-        "span",
-        {
-          style: {
-            cursor: "pointer"
-          },
-          on: {
-            click: () => {
-              this.handleSelect(data); //手动选择树节点
-            }
-          }
-        },
-        data.title
-      );
-    },
-    handleSelect(data) {
-      let obj = {
-        label: data.title,
-        value: data.value
-      };
-      this.list = [];
-      this.list.push(obj);
-      this.entity.shopId = this.list[0].value;
-      this.multiple(this.entity.shopId);
+    changeSelect(data) {
+      this.multiple(data);
     },
     multiple(id) {
       // part_task_pk 任务ID 可以为0
@@ -283,7 +237,6 @@ export default {
       this.visible = false;
     },
     handleOk() {},
-
     l(key) {
       let vkey = "mes_op_task_plan_simulate" + "." + key;
       return this.$t(vkey) || key;

pages/aps/aps/api.js

@@ -72,10 +72,10 @@ export default {
   getequiplist(params) {
     return Api.get(`${apsUrl}/mes_equip_info/getequiplist`, params);
   },
-  //获取当前登录人所在车间下的所有部门
-  userdepartmentsofworkshop(params) {
-    return Api.get(`${systemUrl}/user/userdepartmentsofworkshop`, params);
-  },
+  // //获取当前登录人所在车间下的所有部门
+  // userdepartmentsofworkshop(params) {
+  //   return Api.get(`${systemUrl}/user/userdepartmentsofworkshop`, params);
+  // },
   //获取班组  /mes_equip_info/getequiptypelist
   getUserDepart(params) {
     return Api.get(`${systemUrl}/user/userdepartmentsofworkshop`, params);