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

components/page/dataGrid.vue

@@ -3,18 +3,26 @@
     <div class="table-tools" v-if="tool">
       <div class="table-search" v-if="easy">
         <slot name="easySearch">
-          <Input
-            search
-            enter-button
-            :placeholder="placeholder"
-            @on-search="easySearch"
-            v-model="keys"
-          />
+          <Form inline>
+            <FormItem>
+              <Input
+                search
+                enter-button
+                :placeholder="placeholder"
+                @on-search="easySearch"
+                v-width="300"
+                v-model="keys"
+              />
+            </FormItem>
+            <FormItem>
+              <Button v-if="high" @click="modalSearch=true" type="text">
+                <Icon type="md-search" />高级
+              </Button>
+            </FormItem>
+          </Form>
         </slot>
-        <Button v-if="high" @click="modalSearch=true" type="text">
-          <Icon type="md-search" />高级
-        </Button>
       </div>
+
       <div class="searchBack">
         <slot name="searchBack"></slot>
       </div>
@@ -269,14 +277,23 @@ export default {
     } else {
       this.easySearch();
     }
+    console.warn("this.$refs.main.clientX",this.$refs.main.offsetTop,this.$refs.main.offsetHeight)
     if (this.height === 0) {
       this.$nextTick(() => {
-        this.tableHeight = this.$refs.main.offsetHeight;
+        this.tableHeight = this.$refs.main.offsetHeight;        
+        if (this.tableHeight < 300) {
+          this.tableHeight = window.screen.availHeight -this.$refs.main.offsetTop-200;
+        }
+        console.warn("this.$refs.main.VVV",this.tableHeight)
         window.onresize = () => {
           ///浏览器窗口大小变化
           return (() => {
-            console.warn("fasfas",this.$refs.main)
-            // this.tableHeight = this.$refs.main.offsetHeight;
+            console.warn(123)
+            this.tableHeight = this.$refs.main.offsetHeight;
+            if (this.tableHeight < 300) {
+               this.tableHeight = window.screen.availHeight -this.$refs.main.offsetTop-150;
+            }
+            console.warn("this.$refs.main.tableHeight",this.tableHeight)
           })();
         };
       });
@@ -291,7 +308,7 @@ export default {
   },
   methods: {
     //数据加载
-    load() {     
+    load() {
       if (this.action) {
         //条件初始化处理。
         if (this.initsearch) {
@@ -427,7 +444,7 @@ export default {
           let v = conditions[u].value;
           let op = conditions[u].op;
           if (!this.$u.isNull(v)) {
-            if (op == "Range"&&Array.isArray(v)) {
+            if (op == "Range" && Array.isArray(v)) {
               let times = [];
               v.map(u => {
                 if (!this.$u.isNull(u)) {
@@ -435,7 +452,7 @@ export default {
                 }
               });
               v = times.join(",");
-            } else if (op.indexOf("In") > -1&&Array.isArray(v)) {
+            } else if (op.indexOf("In") > -1 && Array.isArray(v)) {
               v = v.join(",");
             }
             if (!this.$u.isNull(v)) {
@@ -543,13 +560,13 @@ export default {
     height() {
       this.tableHeight = this.height;
     },
-    "columns.length"(){
+    "columns.length"() {
       this.columns.forEach(u => {
-      if (!u.hide) {
-        u.hide = false;
-      }
-    });
-    this.columnsCur = this.$u.clone(this.columns);
+        if (!u.hide) {
+          u.hide = false;
+        }
+      });
+      this.columnsCur = this.$u.clone(this.columns);
     }
   }
 };

layouts/basic-layout/product.vue

@@ -359,6 +359,7 @@ export default {
 .product-layout {
   .i-layout-content {
     padding: 5px 10px;
+    height: calc(100vh - 100px);
   }
   .i-tabs {
     width: 100% !important;

pages/aps/aps/components/check.vue

@@ -32,14 +32,14 @@ export default {
       default:()=>{
           return {
               res:true,
-              datas:{},
+              datas:'{}',
           }
       }
   },
   computed:{
       list(){
            var data={};
-           if(this.data.datas){
+           if(this.data.datas!=''){
            var item=JSON.parse(this.data.datas);
               for(var key in item)
               {

pages/aps/aps/index.vue

@@ -129,7 +129,7 @@ export default {
       },
       result: {
         res: true,
-        datas: {}
+        datas: '{}'
       },
       resultModal: false,
       entity: {

pages/aps/plan/index.vue

 <template>
-  <div class="myBug">
+  <div class="h100">
     <DataGrid
       :columns="columns"
       ref="grid"
@@ -15,6 +15,7 @@
               enter-button
               placeholder="请输入关键字订单编号/项目名称"
               v-model="easySearch.keys.value"
+              v-width="300"
               @on-search="search"
             />
           </FormItem>

pages/materiel/codeRule/index.vue

 <template>
-    <div>
+    <div class="h100">
         <DataGrid :columns="columns" ref="grid" :action="action"><template slot="easySearch"><Form ref="formInline" :model="easySearch"  inline><FormItem prop="keys"><Input  placeholder="请输入关键字编码/名称"  v-model="easySearch.keys.value" /> </FormItem>
 <FormItem><Button type="primary" @click="search">查询</Button></FormItem>
 </Form></template>

pages/order/monitoring/index.vue

 <template>
-  <div class="monitoring">
+  <div class="monitoring h100">
     <DataGrid :columns="columns" ref="grid" :action="action">
       <template slot="easySearch">
         <Form ref="formInline" :model="easySearch" inline style="margin-top:5px;">

pages/qc/check/index.vue

@@ -4,8 +4,8 @@
 }
 </style>
 <template>
-    <div class="content manyTabs">
-        <Tabs value="Powder" @on-click='changeTab'>
+    <div class="content manyTabs h100">
+        <Tabs value="Powder" @on-click='changeTab' class="h100">
           <TabPane label="待复验" name="Powder">
             <waitReview ref="waitReview" style="margin-top: 45px;" />
           </TabPane>

pages/resource/order/index.vue

 <template>
-  <div>
+  <div class="h100">
     <DataGrid :columns="columns" ref="grid" :action="action" @on-expand="show">
       <template slot="easySearch">
         <Form ref="formInline" :model="easySearch" inline>

pages/resourceManagement/productionResources/index.vue

 <template>
-  <div class="resources-p">
+  <div class="resources-p h100">
     <DataGrid
       :columns="columns"
       ref="grid"