产品

components/page/materiel.vue

@@ -63,7 +63,10 @@
           {{ item.label }}
           <span style="color:#c3c3c3">(</span>
           <span style="color:#c3c3c3" v-if="item.code">{{ item.code }}</span>
-          <span style="color:#c3c3c3" v-if="item.version">/ {{item.version}}</span>
+          <span style="color:#c3c3c3" v-if="item.version">
+            /
+            <State code="material.main.version" :value="parseInt(item.version)" />
+          </span>
           <span style="color:#c3c3c3">)</span>
           <br />
           <span style="color:#c3c3c3" v-if="item.departmentTitle">{{ item.departmentTitle }}</span>
@@ -87,12 +90,11 @@ export default {
     };
   },
   created() {
-    // let url = `${systemUrl}/user/getfordispatch_x`
-    // this.$api.get(url).then((r) => {
-    //   this.data = r.result
-    // })
     this.materiallist();
   },
+  async fetch({ store, params }) {
+    await store.dispatch("loadDictionary"); // 加载数据字典
+  },
   props: {
     value: [String, Number, Array],
     placeholder: {

pages/technology/productMix/product/add.vue

@@ -35,7 +35,14 @@
           </Col>
           <Col :span="12">
             <FormItem :label="l('version')" prop="version">
-              <Input v-model="entity.version"></Input>
+              <!-- <Input v-model="entity.version"></Input> -->
+              <Dictionary
+                code="material.main.version"
+                v-model="entity.version"
+                type="select"
+                :value="entity.version"
+                :key="entity.version"
+              ></Dictionary>
             </FormItem>
           </Col>
 
@@ -96,7 +103,7 @@ export default {
         // remark: "",
         madeCompany: "",
         madeCompanyTitle: "",
-        // extend: "",
+        version: "",
         productUrl: "",
         productUrlList: "",
         levelId: null,
@@ -155,7 +162,7 @@ export default {
       this.entity.name = e.name;
       this.entity.mmcode = e.mmcode;
       this.entity.drawingNo = e.drawingNo;
-      this.entity.version = e.version;
+      this.entity.version = parseInt(e.version);
       this.entity.materialId = e.materialId;
     },
     clickData(data, liUrl) {

pages/technology/productMix/product/bom.vue

@@ -57,7 +57,30 @@ export default {
           align: "left",
           high: true
         },
-
+        {
+          key: "mmcode",
+          title: this.l("mmcode"),
+          align: "center",
+          high: true
+        },
+        {
+          key: "drawingNo",
+          title: this.l("drawingNo"),
+          align: "center",
+          high: true
+        },
+        {
+          key: "count",
+          title: this.l("count"),
+          align: "center",
+          high: true
+        },
+        {
+          key: "postion",
+          title: this.l("postion"),
+          align: "center",
+          high: true
+        },
         {
           key: "creationTime",
           title: this.l("creationTime"),
@@ -92,7 +115,7 @@ export default {
                 "op",
                 {
                   attrs: { oprate: "delete" },
-                  on: { click: () => this.remove(params.row.id) }
+                  on: { click: () => this.remove(params.row) }
                 },
                 "删除"
               )
@@ -102,6 +125,9 @@ export default {
         }
       ]
     };
+  },
+   async fetch({ store, params }) {
+    await store.dispatch("loadDictionary"); // 加载数据字典
   },
   props: {
     eid: Number,
@@ -137,8 +163,8 @@ export default {
       this.detail = () => import("./bomEdit");
       this.modal = true;
     },
-    remove(id) {
-      Api.deleteBom(id).then(r => {
+    remove(row) {
+      Api.deleteBom({ id: row.id, levelId: row.levelId }).then(r => {
         if (r.success) {
           this.init();
           this.$Message.success("删除成功");

pages/technology/productMix/product/bomAdd.vue

@@ -8,9 +8,7 @@
       </Col>
       <Col :span="12">
         <FormItem :label="l('materialId')" prop="materialId">
-          <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>
+          <Materiel v-model="entity.materialId" @on-change="change"></Materiel>
         </FormItem>
       </Col>
       <Col :span="12">
@@ -84,7 +82,6 @@ export default {
   },
   created() {
     this.getTree();
-    this.getMaterialList();
   },
   methods: {
     getTree() {
@@ -93,22 +90,14 @@ export default {
         this.data2 = response.result;
       });
     },
-    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;
-          this.entity.drawingNo = e.drawingNo;
-        }
-      });
+
+    change(e) {
+      // console.log(e);
+      this.entity.name = e.name;
+      this.entity.mmcode = e.mmcode;
+      this.entity.drawingNo = e.drawingNo;
+      this.entity.version = parseInt(e.version);
+      this.entity.materialId = e.materialId;
     },
     handleSubmit() {
       this.$refs.form.validate(v => {

pages/technology/productMix/product/bomEdit.vue

@@ -3,9 +3,7 @@
     <Row>
       <Col :span="12">
         <FormItem :label="l('materialId')" prop="materialId">
-          <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>
+          <Materiel v-model="entity.materialId" @on-change="change"></Materiel>
         </FormItem>
       </Col>
       <Col :span="12">
@@ -76,7 +74,6 @@ export default {
     if (this.eid > 0) {
       this.load(this.eid);
     }
-    this.getMaterialList();
   },
   methods: {
     load(v) {
@@ -84,22 +81,14 @@ export default {
         this.entity = r.result;
       });
     },
-    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;
-          this.entity.drawingNo = e.drawingNo;
-        }
-      });
+
+    change(e) {
+      // console.log(e);
+      this.entity.name = e.name;
+      this.entity.mmcode = e.mmcode;
+      this.entity.drawingNo = e.drawingNo;
+      this.entity.version = parseInt(e.version);
+      this.entity.materialId = e.materialId;
     },
     handleSubmit() {
       this.$refs.form.validate(v => {

pages/technology/productMix/product/edit.vue

@@ -20,16 +20,6 @@
               <Materiel v-model="entity.materialId" @on-change="change"></Materiel>
             </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>
-          </Col>-->
           <Col :span="12">
             <FormItem :label="l('drawingNo')" prop="drawingNo">
               <Input v-model="entity.drawingNo"></Input>
@@ -42,7 +32,14 @@
           </Col>
           <Col :span="12">
             <FormItem :label="l('version')" prop="version">
-              <Input v-model="entity.version"></Input>
+              <!-- <Input v-model="entity.version"></Input> -->
+              <Dictionary
+                code="material.main.version"
+                v-model="entity.version"
+                type="select"
+                :value="entity.version"
+                :key="entity.version"
+              ></Dictionary>
             </FormItem>
           </Col>
           <Col :span="12">
@@ -144,7 +141,7 @@ export default {
       this.entity.name = e.name;
       this.entity.mmcode = e.mmcode;
       this.entity.drawingNo = e.drawingNo;
-      this.entity.version = e.version;
+      this.entity.version = parseInt(e.version);
       this.entity.materialId = e.materialId;
     },
     clickData(data, liUrl) {
@@ -186,6 +183,7 @@ export default {
         this.$refs.edit.label = r.result.levelTitle;
         this.entity.materialId = r.result.materialId;
         this.entity.levelId = r.result.levelId + "";
+        this.entity.version = parseInt(r.result.version);
       });
     },
     handleSubmit() {

pages/technology/productMix/product/index.vue

@@ -52,7 +52,7 @@
                 <a @click="edit(row)">
                   <Icon type="md-create" />编辑
                 </a>&nbsp;
-                <a @click="remove(row.id)">
+                <a @click="remove(row)">
                   <Icon type="ios-trash" />删除
                 </a>&nbsp;
                 <a @click="view(row)">
@@ -205,7 +205,7 @@ export default {
                 "op",
                 {
                   attrs: { oprate: "delete" },
-                  on: { click: () => this.remove(params.row.id) }
+                  on: { click: () => this.remove(params.row) }
                 },
                 "删除"
               ),
@@ -310,8 +310,8 @@ export default {
       this.modal = true;
       this.fullscreen = true;
     },
-    remove(id) {
-      Api.delete(id).then(r => {
+    remove(row) {
+      Api.delete({ id: row.id, levelId: row.levelId }).then(r => {
         if (r.success) {
           this.$refs.grid.load();
           this.$Message.success("删除成功");