物料产品优化。

api/order.js

@@ -126,7 +126,7 @@ export default {
     },
     //获取产品树：
     getallselecttree() {
-        return Api.get(`${designUrl}/productlevel/getallselecttreeNew`);
+        return Api.get(`${technologyUrl}productlevel/getallselecttreenew`);
     },
     //获取待办事宜
     getpagedwaited(params) {

components/page/productTree.vue

@@ -19,7 +19,7 @@
     </div>
     <div class="fg">
       <div class="tree">
-        <Tree :data="data" ref="tree" @on-select-change="change"></Tree>
+        <Tree :data="data" :render="renderContent" ref="tree" @on-select-change="change"></Tree>
       </div>
     </div>
   </div>
@@ -40,7 +40,7 @@ export default {
   },
   methods: {
     loadTree() {
-      this.$api.get(`${designUrl}/productlevel/getproducttreenew`).then(r => {
+      this.$api.get(`${technologyUrl}productlevel/getproducttreenew`).then(r => {
         setTree(r.result);
         function setTree(data) {
           data.map(u => {
@@ -61,6 +61,25 @@ export default {
     toggle() {
       this.expand = !this.expand;
     },
+    renderContent(h,{root,node,data}){
+      let type="md-folder";
+      if(data.isProduct!=0){
+        type="ios-image"
+      }
+      return  h('span', [
+                        h('Icon', {
+                            props: {
+                                type: type
+                            },
+                            style: {
+                                marginRight: '8px'
+                            }
+                        }),
+                        h('span',{style:{
+                          color:data.isProduct==0?"#000":"rgba(38, 128, 235, 1)"
+                        }}, data.title)
+                    ])
+    },
     change(v, b) {
       let ids = [];
       ids.push(b.value);

pages/mesPlan/add.vue

@@ -88,7 +88,7 @@
       </Row>
       <Row>
         <Col span="24">
-          <FormItem label="任务节点要求" style="width:100%">
+          <FormItem label="任务要求" style="width:100%">
             <Input v-model="orderSearchForm.taskRequire" placeholder />
           </FormItem>
         </Col>
@@ -255,14 +255,20 @@ export default {
       });
     },
     renderContent(h, { root, node, data }) {
-      //渲染树的样式
+      let type = "md-folder";
+      let title=data.title;
+      if (data.isProduct != 0) {
+        let version=this.$store.getters.dictionaryByCode("material.main.version",data.version)
+        type = "ios-image";
+       if(version){
+         title=data.title+"("+data.mmcode+"/"+version.name+")"
+       }else{
+         title=data.title+"("+data.mmcode+")"
+       }
+      }
       return h(
         "span",
         {
-          style: {
-            color: data.isProduct != "1" ? "#249E91" : "#333", //根据选中状态设置样式
-            cursor: "pointer"
-          },
           on: {
             click: () => {
               let arrTree = [];
@@ -271,7 +277,25 @@ export default {
             }
           }
         },
-        data.title
+        [
+          h("Icon", {
+            props: {
+              type: type
+            },
+            style: {
+              marginRight: "8px"
+            }
+          }),
+          h(
+            "span",
+            {
+              style: {
+                color: data.isProduct == 0 ? "#000" : "rgba(38, 128, 235, 1)"
+              }
+            },
+            title
+          )
+        ]
       );
     },
     //时间相关start

pages/mesPlan/index.vue

@@ -37,7 +37,7 @@
         <template slot="easySearch">
           <Form ref="formInline" :model="easySearch" inline>
             <FormItem prop="keys">
-              <Input placeholder="请输入订单编号/产品名称" v-model="easySearch.keys.value" />
+              <Input placeholder="请输入订单编号/产品名称" v-model="easySearch.keys.value" v-width="300"/>
             </FormItem>
             <FormItem>
               <Button type="primary" @click="search">查询</Button>

pages/technology/productMix/product/bom.vue

 <template>
   <div class="bom">
-    <div class="btn">
-      <Button type="primary" @click="addBom" class="mb10">新增Bom</Button>
-    </div>
     <div class="new-detail">
       <Row>
         <Filed :span="8" :name="l('levelId')+'：'">{{entity.levelTitle}}</Filed>
@@ -13,7 +10,7 @@
         <Filed :span="8" :name="l('productUrl')+'：'">
           <a href="#" @click="seeImg(entity.productUrl)">查看图片</a>
         </Filed>
-        <Filed :span="24" :name="l('productUrlList')+'：'">
+        <Filed :span="16" :name="l('productUrlList')+'：'">
           <files
             ref="refFile"
             :parms="parms"
@@ -23,6 +20,9 @@
             @clickItem="clickData"
           />
         </Filed>
+        <Filed :span="8">
+           <Button type="primary" @click="addBom" class="mb10">新增Bom</Button>
+        </Filed>
       </Row>
     </div>
     <TreeGrid :columns="columns" :items="treeData"></TreeGrid>

store/index.js

@@ -25,6 +25,17 @@ export const getters = {
     }
     return result;
   },
+  dictionaryByCode: (state) => (key,code) => {
+    let result = null;
+    let items = state.dictionary.get(key);
+    if (items) {
+      // console.info("items",items)
+      return items.filter(u=>{
+        return u.code==code
+      })[0];
+    }
+    return result;
+  },
   getUser: (state) => key => {
     // debugger 
     if (state.userMap && state.userMap.get) {