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

pages/aps/dispatch/dispatch.less

@@ -48,10 +48,10 @@
         }
         .dispatch_card02{
             margin: 10px 0;
-            padding-left: 0!important;
-            padding-right: 0!important;
+            // padding-left: 0!important;
+            // padding-right: 0!important;
             .man_body{
-                max-width: 187px;
+                max-width: 185px;
                 label{
                     border-radius: 24px;
                     width: 100%;

pages/aps/dispatch/index.vue

@@ -96,7 +96,7 @@
             </div>
             <div class="man" v-if="button2 == '人员'">
               <!-- {{peploeId}} @on-change="setpepoleid" @on-change="setpepoleids"-->
-              <Row>
+              <Row :gutter="15">
                 <Col span="8" class="dispatch_card02" v-for="(item,index) in listMan" :key="index">
                   <CheckboxGroup class="man_body">
                     <Checkbox v-model="item.checked" border  class>
@@ -283,10 +283,10 @@ export default {
   },
   created() {
     this.getUserInfoFn()
-    this.byheight = window.innerHeight - 150 + 'px'
+    this.byheight = window.innerHeight - 208 + 'px'
   },
   mounted() {
-    this.byheight = window.innerHeight - 150 + 'px'
+    this.byheight = window.innerHeight - 208 + 'px'
   },
   async fetch({ store, params }) {
     await store.dispatch('loadDictionary') // 加载数据字典

pages/basicData/calendar/class/index.vue

@@ -172,13 +172,13 @@ export default {
     }
   },
   created(){
-    this.tableHeight = window.innerHeight - 170
+    this.tableHeight = window.innerHeight - 220
   },
   mounted() {
     window.onresize = () => {///浏览器窗口大小变化
         return (() => {
           window.screenHeight = window.innerHeight
-          this.tableHeight = window.screenHeight - 150
+          this.tableHeight = window.screenHeight - 220
         })()
       }
   },

pages/basicData/calendar/holiday/index.vue

@@ -171,14 +171,14 @@ export default {
     }
   },
   created(){
-    this.tableHeight = window.innerHeight - 170
+    this.tableHeight = window.innerHeight - 220
   },
   mounted() {
     // console.log(this)
     window.onresize = () => {///浏览器窗口大小变化
         return (() => {
           window.screenHeight = window.innerHeight
-          this.tableHeight = window.screenHeight - 150
+          this.tableHeight = window.screenHeight - 220
         })()
       }
   },

pages/basicData/calendar/overtime/index.vue

@@ -196,14 +196,14 @@ export default {
   },
   created() {
     this.getWeekTypeListFn()
-    this.tableHeight = window.innerHeight - 170
+    this.tableHeight = window.innerHeight - 220
   },
   mounted() {
     window.onresize = () => {
       ///浏览器窗口大小变化
       return (() => {
         window.screenHeight = window.innerHeight
-        this.tableHeight = window.screenHeight - 150
+        this.tableHeight = window.screenHeight - 220
       })()
     }
   },

pages/basicData/calendar/work/index.vue

@@ -184,13 +184,13 @@ export default {
     }
   },
   created(){
-    this.tableHeight = window.innerHeight - 170
+    this.tableHeight = window.innerHeight - 220
   },
   mounted() {
     window.onresize = () => {///浏览器窗口大小变化
         return (() => {
           window.screenHeight = window.innerHeight
-          this.tableHeight = window.screenHeight - 150
+          this.tableHeight = window.screenHeight - 220
         })()
       }
   },

pages/basicData/dic/components/edit.vue

@@ -84,8 +84,8 @@ export default {
     }
   },
   watch: {
-    "v.id"() {
-      this.entity = this.$clone(this.v)
+    v(v) {
+      this.entity = this.v
       console.info(this.entity)
     }
   }

pages/basicData/userManagent/userInfo.vue

@@ -7,7 +7,7 @@
           <Avatar :src="avatorPath" size="150" />
         </p>
         <p style="text-align:center;padding:10px;">
-          <Button ghost @click="openModalAvatar">修改头像</Button>
+          <Button  @click="openModalAvatar">修改头像</Button>
         </p>
       </div>
     </Card>
@@ -231,7 +231,7 @@ export default {
     upAvatar() {
       if (this.imageModel.avatar_Url != '') {
         this.$http.sysUser.changeavatar(this.imageModel).then((res) => {
-          if (res.data.result) {
+          if (res.success) {
             this.$Message.success('修改成功!')
             this.modalAvatar = false
             this.$store.commit(

pages/crm/statistical/card.less

@@ -51,11 +51,10 @@
         width: 100%;
         overflow: hidden;
         .main_card{
-            width: 32%;
+            width: calc(33% - 6px);
             cursor: pointer;
             float: left;
-            // display: inline-block;
-            margin: 10px 5px;
+            margin: 10px 4px;
             .leftIcon {
                 width: 40px;
                 height: 40px;

pages/processManage/Process/index.vue

@@ -21,7 +21,8 @@
           <Input
             search
             enter-button
-            class="w240 mr10 fl"
+            class=" mr10 fl"
+            style="width:240px"
             v-model="searchIterms"
             placeholder="请输入编号、名称"
             @on-search="easySearch"

pages/processManage/setProcess/index.vue

@@ -29,7 +29,8 @@
             <Input
               search
               enter-button
-              class="w240 mr10 fl"
+              class=" mr10 fl"
+              style="width:240px"
               v-model="searchIterms"
               placeholder="请输入订单编号"
               @on-search="easySearch"

pages/produce/ordermaterial.vue

@@ -259,7 +259,7 @@ export default {
   },
   created() {
   this.laoedPage()
-    this.tbHeight = window.innerHeight - 210
+    this.tbHeight = window.innerHeight - 280
   },
   async fetch({ store, params }) {
     await store.dispatch('loadDictionary') // 加载数据字典
@@ -428,7 +428,7 @@ this.laoedPage()
     window.onresize = () => {
       ///浏览器窗口大小变化
       return (() => {
-        this.tbHeight = window.innerHeight - 210
+        this.tbHeight = window.innerHeight - 280
       })()
     }
   }

pages/produce/orderscheduling.vue

@@ -261,7 +261,7 @@ export default {
   },
   created() {
     this.laoed()
-    this.tbHeight = window.innerHeight - 210
+    this.tbHeight = window.innerHeight - 280
   },
   async fetch({ store, params }) {
     await store.dispatch('loadDictionary') // 加载数据字典
@@ -438,7 +438,7 @@ export default {
       ///浏览器窗口大小变化
       return (() => {
         // window.screenHeight = window.innerHeight
-        this.tbHeight = window.innerHeight - 210
+        this.tbHeight = window.innerHeight - 280
       })()
     }
   }

pages/produce/scheduling.vue

@@ -20,7 +20,7 @@ export default {
     }
   },
   created() {
-    this.tabHeight = window.innerHeight - 150
+    this.tabHeight = window.innerHeight - 260
   },
   async fetch({ store, params }) {
     await store.dispatch('loadDictionary') // 加载数据字典
@@ -30,7 +30,7 @@ export default {
     window.onresize = () => {
       ///浏览器窗口大小变化
       return (() => {
-        this.tabHeight = window.innerHeight - 150
+        this.tabHeight = window.innerHeight - 260
       })()
     }
   },

pages/produce/taskList.vue

@@ -296,7 +296,7 @@ content="查看";
     },
     created(){
       this.laode();
-      this.tbHeight = window.innerHeight - 160
+      this.tbHeight = window.innerHeight - 190
     },
     async fetch({ store, params }) {
       await store.dispatch('loadDictionary') // 加载数据字典
@@ -406,7 +406,7 @@ content="查看";
         ///浏览器窗口大小变化
         return (() => {
           window.screenHeight = window.innerHeight
-          this.tbHeight = window.screenHeight - 160
+          this.tbHeight = window.screenHeight - 190
         })()
       }
     },    

pages/qc/dataTrace/index.vue

@@ -10,9 +10,9 @@
       </div>
       <Button type="primary" class="title_btn" @click='searchModel'>高级查询</Button>
     </div>
-    <div class="tableBox mb10">
-       <!-- :height="tbHeight" -->
+    <div class="tableBox mb10"  :style="{height:tbHeight}">
       <div class="table">
+        <div v-if="listTask.length==0" class="wu_data">暂无数据</div>
         <Card class="card" v-for="(item,index) in listTask"
           :key="index">
           <h3 slot="title">
@@ -227,6 +227,7 @@ export default {
         data1: [],
         noData: false,
         selectdata: [],
+        tbHeight:"550px",
         itemData:{},//追溯传的数据
         actValue:1,//追溯传的选中meniu
         orderSearchForm: { //高级搜索字段内容
@@ -264,7 +265,7 @@ export default {
     },
     created(){
       this.laode();
-      // this.tbHeight = window.innerHeight - 500
+      this.tbHeight = window.innerHeight - 208 + 'px'
     },
     async fetch({ store, params }) {
       await store.dispatch('loadDictionary') // 加载数据字典
@@ -405,16 +406,14 @@ export default {
         return arry
       },
     },
-    // mounted() {
-    //   window.onresize = () => {
-    //     ///浏览器窗口大小变化
-    //     return (() => {
-    //       window.screenHeight = window.innerHeight
-    //       this.tbHeight = window.screenHeight - 500
-    //       console.log(this.tbHeight)
-    //     })()
-    //   }
-    // },    
+    mounted() {
+      window.onresize = () => {
+        ///浏览器窗口大小变化
+        return (() => {
+          this.tbHeight = window.innerHeight - 208 + 'px'
+        })()
+      }
+    },    
 }
 </script>
 <style scoped>
@@ -434,7 +433,7 @@ ul,li{
   }
 .tableBox{
   /* height: 582px; 笔记本高度*/
-  height: 778px;
+  /* height: 778px; */
   border: #ddd solid 1px;
   overflow-y: scroll;
   overflow-x: hidden;
@@ -454,6 +453,10 @@ ul,li{
   width: 388px;
   margin: 10px 0 10px 20px;
 }
+.wu_data{
+  margin: 200px auto;
+  font-size: 18px;
+}
 /* .card_body01{
   margin: 0 0 10px 0;
 } */

pages/qc/taskList/index.vue

@@ -278,7 +278,7 @@ export default {
     },
     created(){
       this.laode();
-      this.tbHeight = window.innerHeight - 160
+      this.tbHeight = window.innerHeight - 200
     },
     async fetch({ store, params }) {
       await store.dispatch('loadDictionary') // 加载数据字典
@@ -389,7 +389,7 @@ export default {
         ///浏览器窗口大小变化
         return (() => {
           window.screenHeight = window.innerHeight
-          this.tbHeight = window.screenHeight - 160
+          this.tbHeight = window.screenHeight - 200
         })()
       }
     },