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

pages/technology/productMix/product/add.vue

@@ -9,23 +9,21 @@
       <Form ref="form" :model="entity" :rules="rules" :label-width="120">
         <Row>
           <Col :span="12">
-            <FormItem label="上级所属" prop="levelId">
+            <FormItem label="产品分类" prop="levelId">
               <productSelect1 v-model="entity.levelId" @on-change="proChange" />
             </FormItem>
           </Col>
           <!-- <Col :span="12">
             <FormItem label="层级类型" prop="levelTitle">
-              <Input v-model="entity.levelTitle" disabled></Input>
+              <Input v-model="entity.levelTitle" ></Input>
             </FormItem>
           </Col>-->
           <Col :span="12">
-            <FormItem :label="l('productCode')" prop="productCode">
-              <Input v-model="entity.productCode"></Input>
-            </FormItem>
-          </Col>
-          <Col :span="12">
-            <FormItem :label="l('mmcode')" prop="mmcode">
-              <Input v-model="entity.mmcode"></Input>
+            <FormItem label="物料" prop="materialId">
+              <!-- <Input v-model="entity.mmcode"></Input> -->
+              <Select v-model="entity.materialId" filterable clearable @on-change="change">
+                <Option v-for="item in dataList" :value="item.id" :key="item.id">{{ item.code }}</Option>
+              </Select>
             </FormItem>
           </Col>
           <Col :span="12">
@@ -35,10 +33,21 @@
           </Col>
           <Col :span="12">
             <FormItem :label="l('name')" prop="name">
-              <Input v-model="entity.name"></Input>
+              <Input v-model="entity.name" disabled></Input>
+            </FormItem>
+          </Col>
+          <Col :span="12">
+            <FormItem label="物料类型" prop="type">
+              <!-- <Input v-model="entity.type"></Input> -->
+              <Dictionary
+                code="material.main.type"
+                v-model="entity.type"
+                type="select"
+                :value="entity.type"
+                :key="entity.type"
+              ></Dictionary>
             </FormItem>
           </Col>
-
           <Col :span="12">
             <FormItem :label="l('madeCompany')" prop="madeCompany">
               <Select v-model="entity.madeCompany" placeholder="请选择">
@@ -75,10 +84,11 @@ export default {
     return {
       disabled: false,
       entity: {
-        mmcode: "",
+        mmcode: "", //物料编号
         drawingNo: "",
         name: "",
-        productCode: "",
+        type: "", //物料类型
+        productCode: "", //产品编号
         // status: null,
         remark: "",
         madeCompany: "",
@@ -87,16 +97,16 @@ export default {
         productUrl: "",
         productUrlList: "",
         levelId: null,
-
         levelTitle: ""
       },
+      dataList: [],
       downUrl: fileUrlDown,
       componaylist: [],
       componaylist: [],
       data2: [],
       selectdata1: [],
       rules: {
-        name: [{ required: true, message: "必填", trigger: "blur" }],
+        code: [{ required: true, message: "必填", trigger: "change" }],
         levelId: [
           { required: true, message: "必填", trigger: "change", type: "string" }
         ]
@@ -123,18 +133,40 @@ export default {
       }
     }
   },
+  async fetch({ store, params }) {
+    await store.dispatch("loadDictionary"); // 加载数据字典
+  },
   created() {
+    this.getTree();
+    this.parms.eid = this.$u.guid();
+    this.entity.levelId = this.parents.id;
+    this.getMaterialList();
+  },
+  methods: {
+    getTree() {
       var url = `${designUrl}/productlevel/getdepartmentstree`;
       service.get(`${url}`).then(response => {
         this.data2 = response.result;
       });
-    this.parms.eid = this.$u.guid();
-    this.entity.levelId = this.parents.id;
-    // this.$refs.refFile.intFiles();
     },
-  methods: {
+    getMaterialList() {
+      let data = {
+        conditions: []
+      };
+      Api.materiallist(data).then(r => {
+        this.dataList = r.result.filter(item => item.status === 3);
+      });
+    },
+    change(val) {
+      this.dataList.forEach(e => {
+        if (e.id == val) {
+          this.entity.name = e.name;
+          this.entity.mmcode = e.code;
+        }
+      });
+    },
     clickData(data, liUrl) {
-      debugger
+      debugger;
       this.img = liUrl;
       this.entity.productUrl = liUrl;
     },

pages/technology/productMix/product/api.js

@@ -18,5 +18,8 @@ export default {
     },
     deletes(params) {
     return Api.post(`${technologyUrl}productinfo/batchdelete`,params);
-    }
+    },
+    materiallist(params){
+        return Api.post(`${systemUrl}/material/materiallist`,params);//物料
+    },
     }
\ No newline at end of file

pages/technology/productMix/product/edit.vue

@@ -9,22 +9,29 @@
       <Form ref="form" :model="entity" :rules="rules" :label-width="120">
         <Row>
           <Col :span="12">
-            <FormItem label="上级所属" prop="levelId">
+            <FormItem label="产品分类" prop="levelId">
               <!-- <Input v-model="entity.parentName" disabled></Input> -->
               <productSelect1 v-model="entity.levelId" @on-change="proChange" ref="edit" />
             </FormItem>
           </Col>
-
           <Col :span="12">
+            <FormItem label="物料" prop="materialId">
+              <!-- <Input v-model="entity.mmcode"></Input> -->
+              <Select v-model="entity.materialId" filterable clearable @on-change="change">
+                <Option v-for="item in dataList" :value="item.id" :key="item.id">{{ item.code }}</Option>
+              </Select>
+            </FormItem>
+          </Col>
+          <!-- <Col :span="12">
             <FormItem :label="l('productCode')" prop="productCode">
               <Input v-model="entity.productCode"></Input>
             </FormItem>
-          </Col>
-          <Col :span="12">
+          </Col>-->
+          <!-- <Col :span="12">
             <FormItem :label="l('mmcode')" prop="mmcode">
               <Input v-model="entity.mmcode"></Input>
             </FormItem>
-          </Col>
+          </Col>-->
           <Col :span="12">
             <FormItem :label="l('drawingNo')" prop="drawingNo">
               <Input v-model="entity.drawingNo"></Input>
@@ -35,7 +42,18 @@
               <Input v-model="entity.name"></Input>
             </FormItem>
           </Col>
-
+          <Col :span="12">
+            <FormItem label="物料类型" prop="type">
+              <!-- <Input v-model="entity.type"></Input> -->
+              <Dictionary
+                code="material.main.type"
+                v-model="entity.type"
+                type="select"
+                :value="entity.type"
+                :key="entity.type"
+              ></Dictionary>
+            </FormItem>
+          </Col>
           <Col :span="12">
             <FormItem :label="l('madeCompany')" prop="madeCompany">
               <Select v-model="entity.madeCompany" placeholder="请选择">
@@ -150,7 +168,7 @@ export default {
         }
         this.entity = r.result;
         this.img = this.entity.productUrl;
-        this.entity.productUrlList=this.parms.eid;
+        this.entity.productUrlList = this.parms.eid;
         this.componayId = r.result.madeCompany;
         this.$refs.edit.dep = r.result.levelId;
         this.$refs.edit.label = r.result.levelTitle;

pages/technology/productMix/productTree/index.vue

@@ -121,9 +121,9 @@ export default {
         "span",
         {
           on: {
-            // click: () => {
-            //   this.handleSelect(data); //手动选择树节点
-            // },
+            click: () => {
+              this.handleSelect(data); //手动选择树节点
+            },
             //右键点击事件
             contextmenu: e => {
               e.preventDefault();
@@ -137,9 +137,9 @@ export default {
         data.title
       );
     },
-    // handleSelect(data) {
-    //   this.$emit("clickItem", data);
-    // },
+    handleSelect(data) {
+      this.$emit("clickItem", data);
+    },
     loadTree() {
       Api.getleveltree().then(r => {
         setTree(r.result);