Merge branch 'master' of http://git.mes123.com/zhouyx/mes-ui

pages/qc/certificate/endIssued/index.vue

 <template>
   <div class="end-issued">
-    <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :high="false"></DataGrid>
+    <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :high="false"  :height="tdHeight"></DataGrid>
     <Modal v-model="detailModal" title="查看合格证" footer-hide width="1000" :mask-closable="false">
       <Detail @on-close="cancel" @on-ok="addOk" :eid="curId" />
     </Modal>
@@ -21,6 +21,7 @@ export default {
       detailModal: false,
       curId: 0,
       modalInfo: false,
+      tdHeight:'',
       rules: {
         approveUser: [{ required: true, message: '必填', trigger: 'blur' }]
       },
@@ -130,8 +131,9 @@ export default {
       }
     }
   },
-  mounted() {
-    console.log(this)
+  mounted() {},
+  created() {
+    this.tdHeight = window.innerHeight - 260
   },
   methods: {
     addOk() {

pages/qc/certificate/waitOpened/index.vue

 <template>
   <div class="wait-opened">
-    <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :high="false"></DataGrid>
+    <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :high="false" :height="tdHeight" ></DataGrid>
     <Modal v-model="addModal" title="开合格证" fullscreen footer-hide :mask-closable="false">
       <Add @on-close="cancel" @on-ok="addOk" :eid="curId" ref="addFile" />
     </Modal>
@@ -21,6 +21,7 @@ export default {
       checkLists: [],
       addModal: false,
       curId: null,
+      tdHeight:'',
       columns: [
         { key: 'id', title: this.l('id'), hide: true, align: 'left' },
         {
@@ -127,8 +128,9 @@ export default {
   async fetch({ store, params }) {
     await store.dispatch('loadDictionary') // 加载数据字典
   },
-  mounted() {
-    console.log(this)
+  mounted() {},
+  created() {
+    this.tdHeight = window.innerHeight - 260
   },
   methods: {
     addOk() {

pages/resource/material/placode/index.vue

@@ -4,7 +4,7 @@
       <StoreHouseLeft @storeIds="storeIds" :type='1'></StoreHouseLeft>
     </Sider>
     <Content class="content">
-      <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch">
+      <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :height="tdHeight">
         <template slot="searchForm">
           <Search />
         </template>
@@ -82,6 +82,7 @@ export default {
       deletelModal: false,
       setNumModal: false,
       inventoryModal: false,
+      tdHeight: "",
       curId: 0,
       easySearch: {
         keys: { op: 'code,name', value: '', default: true },
@@ -256,7 +257,7 @@ export default {
   },
   mounted() {},
   created() {
-    
+    this.tdHeight = window.innerHeight - 260
   },
   methods: {
     addOk() {

pages/resource/material/scraper/index.vue

@@ -4,7 +4,7 @@
       <StoreHouseLeft @storeIds="storeIds" c></StoreHouseLeft>
     </Sider>
     <Content class="content">
-      <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch">
+      <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :height="tdHeight">
         <template slot="searchForm">
           <Search />
         </template>
@@ -82,6 +82,7 @@ export default {
       deletelModal: false,
       setNumModal: false,
       inventoryModal: false,
+      tdHeight: "",
       curId: 0,
       easySearch: {
         keys: { op: 'code', value: '', default: true },
@@ -259,6 +260,7 @@ export default {
   },
   mounted() {},
   created() {
+    this.tdHeight = window.innerHeight - 260
   },
   methods: {
     addOk() {