优化物料

pages/materiel/masterData/details.vue

@@ -23,7 +23,7 @@
                 <State code="material.main.status" :value="parseInt(entity.status)" />
               </Filed>
               <Filed :span="8" name="版本：">
-                  <State code="material.main.version" :value="parseInt(entity.version)" />
+                <State code="material.main.version" :value="parseInt(entity.version)" />
               </Filed>
               <Filed :span="8" name="描述：">{{entity.description}}</Filed>
             </Row>
@@ -45,7 +45,8 @@
           </div>
         </div>
         <div v-show="showTable">
-          <DataGrid :columns="columns" ref="grid" :action="action" :tool="false" :height="750"></DataGrid>
+          <Table border :columns="columns" :data="data1" :height="820"></Table>
+          <!-- <DataGrid :columns="columns" ref="grid" :action="action" :tool="false" :height="750" :conditions="easySearch"></DataGrid> -->
         </div>
       </Content>
     </Layout>
@@ -83,7 +84,7 @@ export default {
       ],
       columns: [
         {
-          key: "name",
+          key: "title",
           title: "名称",
           align: "left"
         },
@@ -149,7 +150,22 @@ export default {
       } else {
         this.showFrom = false;
         this.showTable = true;
-        this.$refs.grid.reload(this.easySearch);
+        let conditions = [
+          {
+            conditionalType: "Equal",
+            fieldName: "tableTitle",
+            fieldValue: "material"
+          },
+          {
+            conditionalType: "Equal",
+            fieldName: "tId",
+            fieldValue: this.eid
+          }
+        ];
+        Api.categoryList({ conditions: conditions }).then(r => {
+          this.data1 = r.result;
+        });
+        // this.$refs.grid.reload(this.easySearch);
       }
     },
     l(key) {