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

components/page/equipTypeSelect.vue

+<template>
+  <Select
+    :placeholder="placeholder"
+    v-model="name"
+    @on-change="change"
+    :multiple="multiple"
+    clearable
+    @on-clear="onClear"
+  >
+    <Option v-for="item in dic" :value="item.value" :key="item.value" :label="item.label"></Option>
+  </Select>
+</template>
+<script>
+export default {
+  model: {
+    prop: "value",
+    event: "on-change"
+  },
+  data() {
+    return {
+      // name: [8,9],
+      name: this.value,
+      data: []
+    };
+  },
+  created() {
+    let url = `${systemUrl}/equiptype/getpaged`;
+    this.$api.get(url).then(r => {
+      this.data = r.result.items;
+    });
+  },
+  props: {
+    value: [String, Number, Array],
+    placeholder: {
+      type: String,
+      default: "请选择设备类型"
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    }
+  },
+  methods: {
+    change(v) {
+      // console.log(event)
+      this.name = v;
+      var item;
+      var items = this.data.filter(u => {
+        return u.id == v;
+      });
+      if (items && items.length > 0) {
+        item = items[0];
+      }
+      this.$emit("on-change", v, item);
+     // this.$emit("on-change", event);
+    },
+    getTitle() {
+      var title = "";
+      this.dic.forEach(u => {
+        if (u.value == this.value) {
+          title = u.label;
+        }
+      });
+      return title;
+    },
+    onClear() {
+      this.placeholdeinfo = "请选择设备类型";
+      this.$emit("on-change", null, {});
+    }
+  },
+  computed: {
+    dic() {
+      let result = [];
+      this.data.forEach(u => {
+        result.push({
+          value: u.id,
+          label: u.equip_type_name
+        });
+      });
+      return result;
+    }
+  },
+  watch: {
+    value(v, o) {
+      this.name = v;
+      // console.log(v,o)
+    }
+  }
+};
+</script>
+<style lang="less">
+.w200 {
+  width: 200px;
+}
+</style>
\ No newline at end of file

layouts/basic-layout/product.vue

@@ -74,7 +74,7 @@
     </Header>
     <div class="i-tabs">
       <transition name="fade-quick">
-        <i-tabs  v-show="showHeader" @on-reload="handleReload" />
+        <i-tabs v-show="showHeader" @on-reload="handleReload" />
       </transition>
     </div>
     <Content class="i-layout-content">
@@ -312,7 +312,11 @@ export default {
       });
     },
     goPage(u, li) {
-      this.$router.push(li.path);
+      if (li.target == 1) {
+        window.open(li.path, "_blank");
+      } else {
+        this.$router.push(li.path);
+      }
       this.isActive = li.id;
       this.homeMenu = u.title;
       this.homeMenuItem = li.title;

layouts/default.vue

@@ -97,7 +97,7 @@ export default {
         datas.path = datas.url;
         let name = datas.url.replace(/\//g, "-");
         datas.header = "home";
-        delete datas.target;
+        // delete datas.target;
         if (name.substr(0, 1) == "-") {
           name = name.substr(1);
         }

pages/technology/details/add.vue

@@ -85,7 +85,7 @@
         </Col>
         <Col :span="6">
           <FormItem :label="l('equipType')" prop="equipTypeId">
-            <EquipSelect v-model="entity.equipTypeId" @on-change="equipChange"></EquipSelect>
+            <EquipTypeSelect v-model="entity.equipTypeId" @on-change="equipChange"></EquipTypeSelect>
           </FormItem>
         </Col>
         <Col :span="6">

pages/technology/details/edit.vue

@@ -75,7 +75,7 @@
         -->
         <Col :span="12">
           <FormItem :label="l('taskSeq')" prop="taskSeq">
-            <InputNumber v-model="maxNum"></InputNumber>
+            <InputNumber v-model="entity.taskSeq"></InputNumber>
           </FormItem>
         </Col>
         <Col :span="12">
@@ -85,7 +85,7 @@
         </Col>
         <Col :span="6">
           <FormItem :label="l('equipType')" prop="equipTypeId">
-            <EquipSelect v-model="entity.equipTypeId" @on-change="equipChange"></EquipSelect>
+              <EquipTypeSelect v-model="entity.equipTypeId" @on-change="equipChange"></EquipTypeSelect>
           </FormItem>
         </Col>
         <Col :span="6">
@@ -176,7 +176,9 @@ export default {
   data() {
     return {
       disabled: false,
-      entity: {},
+      entity: {
+        resource:[]
+      },
       rules: {
         name: [{ required: true, message: "必填", trigger: "blur" }]
       }
@@ -201,11 +203,11 @@ export default {
       this.$refs.form.validate(v => {
         if (v) {
           this.disabled = true;
-          if (this.entity.resourceId.length > 1) {
-            this.entity.resourceId = this.entity.resourceId[1];
-          } else {
-            this.entity.resourceId = null;
-          }
+          // if (this.entity.resourceId.length > 1) {
+          //   this.entity.resourceId = this.entity.resourceId[1];
+          // } else {
+          //   this.entity.resourceId = null;
+          // }
           if (this.entity.isOutside != 1) {
             this.entity.outsideTime = 0;
           }

plugins/iview.js

@@ -32,6 +32,7 @@ import WorkShopSelect from '@/components/page/workShopSelect.vue'
 import workShopDefault from '@/components/page/workShopDefault.vue'
 import WorkShop from '@/components/page/workShop.vue'
 import EquipSelect from '@/components/page/equipSelect.vue'
+import EquipTypeSelect from '@/components/page/equipTypeSelect.vue'
 import ResourceSelect from '@/components/page/resourceSelect.vue'
 import StoreTree from '@/components/page/storeTree.vue'
 import StoreSelect from '@/components/page/storeSelect.vue'
@@ -107,6 +108,7 @@ Vue.component("WorkShopSelect", WorkShopSelect)
 Vue.component("workShopDefault", workShopDefault)
 Vue.component("WorkShop", WorkShop)
 Vue.component("EquipSelect", EquipSelect)
+Vue.component("EquipTypeSelect", EquipTypeSelect)
 Vue.component("ResourceSelect", ResourceSelect)
 Vue.component("User", User)
 Vue.component("op", op) //DepartmentSelect

store/admin/menu.js

@@ -20,6 +20,7 @@ function filterMenu (menuList, access, lastList) {
             menu.children && filterMenu(menu.children, access, newMenu.children);
         }
     });
+   
     return lastList;
 }