物料优化

components/page/userSelect.vue

@@ -2,7 +2,7 @@
   <div>
     <div v-if="theme=='list'" class="flex fd userSelect">
       <div class="fg1 users">
-        <dl v-for="(g,i) in group">
+        <dl v-for="(g,i) in group" :key="i">
           <dt :class="{checked:g.opened}" class="flex fc-b">
             <div class="ib fg">
               <Checkbox v-model="g.checked" @on-change="checkAll(g,i)">
@@ -18,6 +18,7 @@
           <dd
             v-show="g.opened"
             v-for="(li,j) in g.children"
+            :key="j"
             @click="checkItem(i,j,li)"
             :class="{checked:li.checked}"
           >{{li.userName}}</dd>

pages/handle/examine13/detail.vue

@@ -4,9 +4,11 @@
       <Filed :span="8" name="编码：">{{!entity.code?'未分配':entity.code}}</Filed>
       <Filed :span="8" name="名称：">{{entity.name}}</Filed>
       <Filed :span="8" name="状态：">
-        <State code="materail.category.status" :value="parseInt(entity.status)" />
+        <State code="materail.main.status" :value="parseInt(entity.status)" />
+      </Filed>
+      <Filed :span="8" name="版本：">
+        <State code="material.main.version" :value="parseInt(entity.version)" />
       </Filed>
-      <Filed :span="8" name="版本：">{{entity.version}}</Filed>
       <Filed :span="8" name="描述：">{{entity.description}}</Filed>
     </Row>
     <Divider orientation="left">扩展属性</Divider>
@@ -15,13 +17,13 @@
         <State v-if="li.dataType==3" :code="li.note" :value="entity[li.field]" />
         <div v-else-if="li.dataType==8">{{entity[li.field]}}</div>
         <div v-else-if="li.dataType==5" v-html="entity[li.field]"></div>
-          <DTSpan v-else-if="li.dataType==4" :value="entity[li.field]" />
+        <DTSpan v-else-if="li.dataType==4" :value="entity[li.field]" />
         <span v-else>{{entity[li.field]}}</span>
-         <State
-              v-if="li.unitName&&(li.dataType==1||li.dataType==2)"
-              :code="li.note"
-              :value="entity[li.field]"
-            />
+        <State
+          v-if="li.unitName&&(li.dataType==1||li.dataType==2)"
+          :code="li.note"
+          :value="entity[li.field]"
+        />
       </Filed>
     </Row>
   </div>

pages/materiel/masterData/details.vue

@@ -20,9 +20,11 @@
               <Filed :span="8" name="编码：">{{!entity.code?'未分配':entity.code}}</Filed>
               <Filed :span="8" name="名称：">{{entity.name}}</Filed>
               <Filed :span="8" name="状态：">
-                <State code="materail.category.status" :value="parseInt(entity.status)" />
+                <State code="material.main.status" :value="parseInt(entity.status)" />
+              </Filed>
+              <Filed :span="8" name="版本：">
+                  <State code="material.main.version" :value="parseInt(entity.version)" />
               </Filed>
-              <Filed :span="8" name="版本：">{{entity.version}}</Filed>
               <Filed :span="8" name="描述：">{{entity.description}}</Filed>
             </Row>
             <Divider orientation="left">扩展属性</Divider>

pages/materiel/masterData/masterData.vue

@@ -136,11 +136,11 @@ export default {
           align: "left",
           code: "material.main.version"
         },
-        {
-          key: "description",
-          title: "描述",
-          align: "left"
-        },
+        // {
+        //   key: "description",
+        //   title: "描述",
+        //   align: "left"
+        // },
         {
           key: "creationTime",
           title: "创建时间",
@@ -226,6 +226,8 @@ export default {
       return data;
     },
     onSelect(a, b) {
+      // console.log(a);
+      // console.log(b);
       //批量选择
       this.rootCategoryId = a[0].rootCategoryId;
       this.selectRows = a;
@@ -265,7 +267,7 @@ export default {
           });
           this.cols = this.$u.clone(this.columns);
           let extra = items.map(u => {
-            // console.log(u);
+            console.log(u);
             var col = {
               key: u.field,
               title: u.title
@@ -379,9 +381,10 @@ export default {
   }
 };
 </script>
-<style lang="less" scoped>
-.spare-parts {
-  width: 100%;
-  height: 100%;
+<style lang="less" >
+.master-data {
+  .ivu-footer-toolbar-right {
+    margin-right: 72% !important;
+  }
 }
 </style>
\ No newline at end of file

pages/materiel/masterData/submit.vue

@@ -6,9 +6,11 @@
           <Filed :span="8" name="编码：">{{!entity.code?'未分配':entity.code}}</Filed>
           <Filed :span="8" name="名称：">{{entity.name}}</Filed>
           <Filed :span="8" name="状态：">
-            <State code="materail.category.status" :value="parseInt(entity.status)" />
+            <State code="material.main.status" :value="parseInt(entity.status)" />
+          </Filed>
+          <Filed :span="8" name="版本：">
+            <State code="material.main.version" :value="parseInt(entity.version)" />
           </Filed>
-          <Filed :span="8" name="版本：">{{entity.version}}</Filed>
           <Filed :span="8" name="描述：">{{entity.description}}</Filed>
         </Row>
         <Divider orientation="left">扩展属性</Divider>
@@ -28,14 +30,26 @@
           </Filed>
         </Row>
       </div>
-      <Table
+      <DataGrid
+        v-if="osrOneList2"
+        :columns="cols"
+        ref="grid"
+        :conditions="easySearch"
+        :action="action"
+        :initsearch="sets"
+        :tool="false"
+        :page="false"
+        :height="300"
+        :format="formatFun"
+      />
+      <!-- <Table
         :loading="loading"
         border
         :columns="cols"
         :data="dataList"
         class="tableCommon"
         v-if="osrOneList2"
-      ></Table>
+      ></Table>-->
       <Process ref="userProcess" schemaIdVal="b6303ddc-8b5e-40a3-a51b-294657d1d913" />
       <div slot="footer">
         <Button @click="modalInfo">取消</Button>
@@ -68,12 +82,13 @@ export default {
   components: {
     Process
   },
-  props: ["eid", "rootCategoryId", "rowsTable"],
+  props: ["eid", "rootCategoryId", "nodeInfo", "rowsTable"],
   async fetch({ store, params }) {
     await store.dispatch("loadDictionary"); // 加载数据字典
   },
   data() {
     return {
+      action: Api.index,
       rowId: "",
       entity: {},
       metCodesStrTxt: "",
@@ -83,6 +98,17 @@ export default {
       divHeight: "300px",
       osrOneList1: false, //一条数据显示
       osrOneList2: false,
+      sets: v => {
+        v.categoryId = this.nodeInfo.categoryId;
+        v.rootCategoryId = this.nodeInfo.rootCategoryId;
+      },
+      easySearch: {
+        keys: { op: "code,name", value: null },
+        categoryId: {
+          op: "In",
+          value: this.nodeInfo.ids
+        }
+      },
       info: true,
       ruleValidate: {},
       orderSearchForm: {
@@ -138,13 +164,22 @@ export default {
         {
           key: "version",
           title: "版本",
-          align: "left"
-        },
-        {
-          key: "description",
-          title: "描述",
-          align: "left"
+          align: "left",
+          render: (h, params) => {
+            return h("state", {
+              props: {
+                code: "material.main.version",
+                type: "text",
+                value: params.row.status + ""
+              }
+            });
+          }
         }
+        // {
+        //   key: "description",
+        //   title: "描述",
+        //   align: "left"
+        // }
       ]
     };
   },
@@ -159,7 +194,6 @@ export default {
       this.osrOneList1 = false;
       this.osrOneList2 = true;
       this.getTable();
-      this.dataList = this.rowsTable;
     }
   },
   mounted() {
@@ -172,6 +206,11 @@ export default {
     };
   },
   methods: {
+    //格式化原始数据
+    formatFun(data) {
+      data = this.rowsTable;
+      return data;
+    },
     getDetails(v) {
       Api.get({ id: v }).then(r => {
         if (r.result) {
@@ -239,6 +278,19 @@ export default {
             if (u.dataType == 3) {
               col.code = u.note;
             }
+            if (u.dataType == 4) {
+              col.type = "date";
+            }
+            if (u.unitName && (u.dataType == 1 || u.dataType == 2)) {
+              var units = this.$store.getters.dictionaryByKey(
+                "material.main.unitName"
+              );
+              let item = units.filter(p => {
+                return p.code == u.unitName;
+              });
+              // console.log(units, item);
+              col.title += "(" + item[0].name + ")";
+            }
             return col;
           });
           this.cols = this.cols.concat(extra);
@@ -302,6 +354,13 @@ export default {
     modalInfo() {
       this.$emit("on-close");
     }
+  },
+  watch: {
+    rootCategoryId(v) {
+      if (v) {
+        this.easySearch.categoryId.value = "-1";
+      }
+    }
   }
 };
 </script>

pages/technology/productMix/index.vue

@@ -41,6 +41,7 @@ export default {
       this.showMenu = true;
     },
     productSearch(id, item, ids) {
+      console.log(item)
       this.parent.parentName = item.title;
       this.parent.id = id;
       this.parent.ids = ids;

pages/technology/productMix/product/bom.vue

+<template>
+  <div class="bom">
+    <Layout>
+      <Sider width="300">
+        <div class="p-list">ddd</div>
+      </Sider>
+
+      <Content>ff</Content>
+    </Layout>
+  </div>
+</template>
+<style lang="less">
+.bom {
+  .ivu-layout-sider {
+    background: rgba(255, 255, 255, 1);
+    margin-right: 10px;
+    box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
+    height: 90vh;
+    padding: 10px;
+    overflow: auto;
+  }
+  .ivu-layout-content {
+    // margin-left: 5px;
+    background: rgba(255, 255, 255, 1);
+    box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
+    padding: 10px;
+    height: 90vh;
+    overflow: auto;
+  }
+}
+</style>
\ No newline at end of file

pages/technology/productMix/product/index.vue

@@ -31,7 +31,7 @@
             <Col :span="12">名称：{{row.name}}</Col>
             <Col :span="12" class="btn-click">物料编号：{{row.mmcode}}</Col>
           </Row>
-          <Row class="row-down">
+          <Row class="row-down" :gutter="20">
             <Col span="7">
               <div class="img-i">
                 <img :src="downUrl +row.productUrl" />
@@ -42,6 +42,9 @@
               <div>图号：{{row.drawingNo}}</div>
               <div>主制单位：{{row.madeCompanyTitle}}</div>
               <p class="a-icon">
+                <a @click="bom(row.id)">
+                  <Icon type="ios-brush" />BOM
+                </a>&nbsp;
                 <a @click="edit(row.id)">
                   <Icon type="md-create" />编辑
                 </a>&nbsp;
@@ -57,7 +60,7 @@
         </div>
       </template>
     </DataGrid>
-    <Modal v-model="modal" :title="title" width="1200" footer-hide>
+    <Modal v-model="modal" :title="title" width="1200" footer-hide :fullscreen="fullscreen">
       <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" :parents="parent" />
     </Modal>
   </div>
@@ -85,6 +88,7 @@ export default {
   data() {
     return {
       action: Api.index,
+      fullscreen: false,
       easySearch: {
         keys: { op: "mmcode,name,productCode", value: null }
       },
@@ -121,28 +125,43 @@ export default {
       this.$refs.grid.reload(this.easySearch);
     },
     add() {
-      this.curId = 0;
-      this.title = "新增";
-      this.detail = () => import("./add");
-      this.modal = true;
+      if (this.parent.id) {
+        this.curId = 0;
+        this.title = "新增";
+        this.detail = () => import("./add");
+        this.modal = true;
+        this.fullscreen = false;
+      } else {
+        this.$Message.error("请先选择产品分类");
+      }
     },
     copy(id) {
       this.curId = id;
       this.title = "克隆";
       this.detail = () => import("./add");
       this.modal = true;
+      this.fullscreen = false;
     },
     view(id) {
       this.curId = id;
       this.title = "详情";
       this.detail = () => import("./detail");
       this.modal = true;
+      this.fullscreen = false;
     },
     edit(id) {
       this.curId = id;
       this.title = "编辑";
       this.detail = () => import("./edit");
       this.modal = true;
+      this.fullscreen = false;
+    },
+    bom(id) {
+      this.curId = id;
+      this.title = "BOM";
+      this.detail = () => import("./bom");
+      this.modal = true;
+      this.fullscreen = true;
     },
     remove(row) {
       this.$Modal.confirm({