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

pages/materiel/classification/add.vue

@@ -55,6 +55,8 @@
               ></state>
               <Dictionary
                 v-else
+                @on-change="setRow(row,index)"
+                v-model="row.dataType"
                 code="materail.category.dataType"
                 type="select"
                 :value="row.dataType"
@@ -100,7 +102,8 @@ export default {
       arr: [],
       entity: {
         upId: 0,
-        code: 0
+        code: 0,
+        status:0,
       },
       disabled: false,
       columns: [

pages/materiel/classification/edit.vue

@@ -51,6 +51,8 @@
               ></state>
               <Dictionary
                 v-else
+                @on-change="setRow(row,index)"
+                v-model="row.dataType"
                 code="materail.category.dataType"
                 type="select"
                 :value="row.dataType"

pages/materiel/classification/index.vue

@@ -4,7 +4,7 @@
       <Sider width="300" v-if="showMenu">
         <div class="p-list">
           <h3>
-            零部件库
+            <Dictionary code="material.code.type" v-model="type" style="width:130px;float:left;"></Dictionary>
             <div class="fr mr10 mt10">
               <ButtonGroup class="fr" size="small">
                 <Button icon="md-add" title="新增顶级" @click="addNew"></Button>
@@ -53,7 +53,7 @@
         </a>
       </div>
       <Content :class="!showMenu?'con_bord':''">
-        <MasterData ref="dataTable" @on-edit="editRow" :root="root"  @on-ok="ok"/>
+        <MasterData ref="dataTable" @on-edit="editRow" :root="root" @on-ok="ok" />
       </Content>
     </Layout>
     <Modal v-model="modal" :title="title" width="1000" footer-hide :mask-closable="false">
@@ -192,10 +192,9 @@ export default {
         },
         data.title +
           "(" +
-          (
-            data.totalMaterialCount == undefined
-              ? "0"
-              : data.totalMaterialCount) +
+          (data.totalMaterialCount == undefined
+            ? "0"
+            : data.totalMaterialCount) +
           ")"
       );
     },

pages/materiel/classification/sonAdd.vue

@@ -50,7 +50,8 @@ export default {
     return {
       entity: {
         upId: this.nodeInfo.id,
-        code: 0
+        code: 0,
+        status: 0
       },
       upName: this.nodeInfo.title,
       disabled: false,

pages/materiel/masterData/add.vue

@@ -52,6 +52,7 @@ export default {
       arr: [],
       entity: {
         code: 0,
+        status: 0,
         categoryId: this.nodeInfo.categoryId, //左侧树点击的id
         customProperties: {},
         rootCategoryId: this.nodeInfo.rootCategoryId //左侧树点击的数据的最顶层id

pages/materiel/masterData/api.js

 import Api from '@/plugins/request'
 export default {
     index:`${systemUrl}/material/paged`,
-     lists:`${systemUrl}/category/list`,
+     lists:`${systemUrl}/actionlog/list`,
     paged(params){
         return Api.post(`${systemUrl}/material/paged`,params);
     },
@@ -21,6 +21,6 @@ export default {
     return Api.delete(`${systemUrl}/material/delete`,{params:{id:id}});
     },
     categoryList(params){
-        return Api.post(`${systemUrl}/category/list`,params);
+        return Api.post(`${systemUrl}/actionlog/list`,params);
     },
     }
\ No newline at end of file

pages/materiel/masterData/details.vue

@@ -52,8 +52,8 @@
           </div>
         </div>
         <div v-show="showTable">
-          <!-- <DataGrid :columns="columns" ref="grid" :action="action" :high="false" :height="750"></DataGrid> -->
-          <Table border :columns="columns" :data="data1" :height="800"></Table>
+          <DataGrid :columns="columns" ref="grid" :action="action" :tool="false" :height="750"></DataGrid>
+          <!-- <Table border :columns="columns" :data="data1" :height="800"></Table> -->
         </div>
       </Content>
     </Layout>
@@ -124,25 +124,26 @@ export default {
       } else {
         this.showFrom = false;
         this.showTable = true;
-        this.easySearch = {
-          conditions: [
-            {
-              fieldName: "table",
-              fieldValue: "material",
-              conditionalType: "Equal"
-            },
-            {
-              fieldName: "tId",
-              fieldValue: this.rowId,
-              conditionalType: "Equal"
-            }
-          ]
-        };
-        Api.categoryList(this.easySearch).then(r => {
-          if (r.result) {
-            this.data1 = r.result;
-          }
-        });
+        this.$refs.grid.reload(this.easySearch);
+        // this.easySearch = {
+        //   conditions: [
+        //     {
+        //       fieldName: "table",
+        //       fieldValue: "material",
+        //       conditionalType: "Equal"
+        //     },
+        //     {
+        //       fieldName: "tId",
+        //       fieldValue: this.rowId,
+        //       conditionalType: "Equal"
+        //     }
+        //   ]
+        // };
+        // Api.categoryList(this.easySearch).then(r => {
+        //   if (r.result) {
+        //     this.data1 = r.result;
+        //   }
+        // });
       }
     },
     l(key) {

pages/materiel/masterData/index.vue

@@ -4,9 +4,9 @@
       <Sider width="300" v-if="showMenu">
         <div class="p-list">
           <h3>
-            零部件库
+            <Dictionary code="material.code.type" v-model="type" style="width:130px;float:left;"></Dictionary>
             <div class="fr mr10 mt10">
-              <ButtonGroup class="fr" size="small">
+              <ButtonGroup class="fr ddi" size="small">
                 <!-- <Button icon="md-add" title="新增顶级" @click="addNew"></Button> -->
                 <Button
                   :icon="expand ? 'md-arrow-dropright' : 'md-arrow-dropdown'"
@@ -50,6 +50,7 @@ export default {
   name: "masterData",
   data() {
     return {
+      type: "",
       keys: "",
       expand: false,
       list: [],
@@ -208,7 +209,7 @@ export default {
     background: rgba(255, 255, 255, 1);
     margin-right: 10px;
     box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
-    height: 87vh;
+    height: 88vh;
 
     h4 {
       height: 30px;
@@ -227,6 +228,9 @@ export default {
         background: rgba(245, 246, 250, 1);
         opacity: 1;
         padding-left: 10px;
+        .ddi {
+          margin-top: 3px;
+        }
       }
       .search {
         height: 50px;
@@ -274,7 +278,7 @@ export default {
     box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
     overflow: auto;
     padding: 10px;
-    height: 87vh;
+    height: 88vh;
     overflow-y: hidden;
   }
 }

pages/materiel/masterData/masterData.vue

@@ -203,7 +203,7 @@ export default {
       // });
     },
     details(id) {
-      alert(id)
+    
       this.$router.push({
         path: "/materiel/masterData/details",
         query: {