From abb822ed9f6a41c9397805f4643fcdbfe9d2fd13 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Sun, 23 Jul 2023 12:56:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/filter.js                          |  8 ++
 src/config/getData2.js                        | 13 +++-
 src/pages/modules/clean/cleaning-cutting.vue  |  9 ++-
 src/pages/modules/clean/cleaning-loading.vue  |  7 +-
 src/pages/modules/clean/index.vue             |  3 +-
 src/pages/modules/clean/man-pour.vue          |  2 +-
 .../finished/finished-instore-search.vue      |  2 +-
 .../modules/finished/finished-instore.vue     |  2 +-
 .../finished/select-finished-mater.vue        |  2 +-
 .../modules/lettering/lettering-load.vue      |  4 +-
 .../modules/lettering/lettering-process.vue   |  4 +-
 src/pages/modules/lettering/man-pouring.vue   |  2 +-
 .../lettering/temporary-lettering-load.vue    |  4 +-
 .../semi-finished-check-search.vue            |  2 +-
 .../semifinished/semi-finished-check.vue      |  2 +-
 .../semi-finished-compose-search.vue          |  2 +-
 .../semi-finished-instore-search.vue          |  2 +-
 .../semifinished/semi-finished-instore.vue    | 16 ++--
 .../semi-finished-out-mater-search.vue        |  2 +-
 .../semi-finished-outstore-search.vue         |  2 +-
 .../semifinished/semi-finished-outstore.vue   |  2 +-
 src/pages/modules/workorder/index.vue         |  3 +-
 .../workorder/work-order-assignment.vue       |  6 +-
 .../modules/workorder/work-order-query.vue    | 41 ++++++----
 .../modules/workorder/work-report-query.vue   | 46 +++++++-----
 src/style/layout.styl                         | 74 ++++++++++---------
 26 files changed, 156 insertions(+), 106 deletions(-)

diff --git a/src/config/filter.js b/src/config/filter.js
index 3d0058e..90c609c 100644
--- a/src/config/filter.js
+++ b/src/config/filter.js
@@ -1,7 +1,15 @@
+import {accDiv} from '@config/utils.js'
+
 const filter = {
   numeric (value, bit) {
     if (!value) return ''
     return Number(value).toFixed(bit)
+  },
+  unitskg (value) {
+    if (!value) return ''
+    let res = accDiv(value, 1000)
+    res = Number(res).toFixed(3)
+    return res
   }
 }
 
diff --git a/src/config/getData2.js b/src/config/getData2.js
index 992caad..320d7db 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -307,6 +307,13 @@ export const letterCallVechile = (id) => post('api/pda/callVechile', {
  */
 // 1.1车间列表
 export const dictAll = () => post('api/dict/all', {})
+// export const dictAll = () => {
+//   let res = {
+//     code: 200,
+//     content: [{value: '1', label: '1'}, {value: '2', label: '2'}]
+//   }
+//   return res
+// }
 // 1.1规格列表
 export const washSpecList = () => post('api/pda/wash/specList', {})
 // 1.2查询列表
@@ -336,8 +343,10 @@ export const washWashVechileInfo = (area) => post('api/pda/wash/washVechileInfo'
   product_area: area
 })
 // 1.2确认下料
-export const washWashFinish = (id) => post('api/pda/wash/washFinish', {
-  task_id: id
+export const washWashFinish = (id, wegiht, code) => post('api/pda/wash/washFinish', {
+  task_id: id,
+  wegiht: wegiht,
+  vechile_code: code
 })
 // 1.3强制完成
 export const washWashTaskFinish = (id) => post('api/pda/wash/washTaskFinish', {
diff --git a/src/pages/modules/clean/cleaning-cutting.vue b/src/pages/modules/clean/cleaning-cutting.vue
index c5ec07f..1dffb64 100644
--- a/src/pages/modules/clean/cleaning-cutting.vue
+++ b/src/pages/modules/clean/cleaning-cutting.vue
@@ -54,10 +54,10 @@
                     <tr v-for="e in dataList" :key="e.task_id" :class="{'selected_icon': pkId === e.task_id}" @click="toRadio(e)">
                         <td>{{ e.sep_on }}</td>
                         <td>{{ e.create_time }}</td>
-                        <td>{{e.task_id}}</td>
+                        <td>{{e.task_code}}</td>
                         <td>{{e.material_code}}</td>
                         <td>{{e.material_spec}}</td>
-                        <td>{{e.material_qty | numeric(3)}}</td>
+                        <td>{{e.material_qty | unitskg}}</td>
                         <td>{{ e.material_name }}</td>
                     </tr>
                 </tbody>
@@ -109,6 +109,7 @@ export default {
       let res = await dictAll()
       if (res.code === 200) {
         this.options1 = [...res.content]
+        this.value1 = this.options1[0].value
       }
     },
     // grid
@@ -163,7 +164,7 @@ export default {
     },
     async __washWashFinish () {
       try {
-        let res = await washWashFinish(this.pkId)
+        let res = await washWashFinish(this.pkId, this.weight, this.vechile_code)
         if (res.code === 200) {
           this.toast(res.msg)
           this._washWashTasks()
@@ -263,5 +264,5 @@ export default {
 
 <style lang="stylus" scoped>
 .grid_wraper
-    height calc(100% - 95px)
+    height calc(100% - 1.1rem)
 </style>
diff --git a/src/pages/modules/clean/cleaning-loading.vue b/src/pages/modules/clean/cleaning-loading.vue
index 9484603..f7cef44 100644
--- a/src/pages/modules/clean/cleaning-loading.vue
+++ b/src/pages/modules/clean/cleaning-loading.vue
@@ -43,9 +43,10 @@
                         <th>设备号</th>
                         <th>物料编号</th>
                         <th>物料规格</th>
-                        <th>重量(g)</th>
+                        <th>重量(kg)</th>
                         <th>数量</th>
                         <th>存在任务</th>
+                        <th>更新时间</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -56,9 +57,10 @@
                         <td>{{ e.device_code }}</td>
                         <td>{{e.material_code}}</td>
                         <td>{{e.material_spec}}</td>
-                        <td>{{e.deviceinstor_weight | numeric(3)}}</td>
+                        <td>{{e.deviceinstor_weight | unitskg}}</td>
                         <td>{{ e.deviceinstor_qty | numeric(3)  }}</td>
                         <td>{{ e.task_code }}</td>
+                        <td>{{ e.update_time }}</td>
                     </tr>
                 </tbody>
             </table>
@@ -91,6 +93,7 @@ export default {
       let res = await dictAll()
       if (res.code === 200) {
         this.options1 = [...res.content]
+        this.value1 = this.options1[0].value
       }
     },
     // 规格下拉框
diff --git a/src/pages/modules/clean/index.vue b/src/pages/modules/clean/index.vue
index bbee03a..ac40749 100644
--- a/src/pages/modules/clean/index.vue
+++ b/src/pages/modules/clean/index.vue
@@ -12,7 +12,7 @@
                   </li>
               </ul>
           </div>
-          <div class="main-container" :style="$route.meta.guidePath !== '4' ? 'height: calc(100% - 44px)' : 'height: 100%'">
+          <div class="main-container" :style="$route.meta.guidePath !== '4' ? 'height: calc(100% - 34px)' : 'height: 100%'">
               <keep-alive :include="keepAlive" >
                 <router-view/>
               </keep-alive>
@@ -82,7 +82,6 @@ export default {
     border 1px solid #484cce
 .tabs_wrap
     height 34px
-    margin-bottom 10px
 .tabs
   height 34px
   li
diff --git a/src/pages/modules/clean/man-pour.vue b/src/pages/modules/clean/man-pour.vue
index 647dea7..101424e 100644
--- a/src/pages/modules/clean/man-pour.vue
+++ b/src/pages/modules/clean/man-pour.vue
@@ -88,7 +88,6 @@ export default {
     next()
   },
   activated () {
-    console.log(this.$store.getters.materObj, 666)
     if (this.$store.getters.materObj !== '') {
       this.material_spec = JSON.parse(this.$store.getters.materObj).material_spec
       this.material_code = JSON.parse(this.$store.getters.materObj).material_code
@@ -142,6 +141,7 @@ export default {
       try {
         let res = await washweighing(list)
         if (res.code === 200) {
+          this.toast(res.msg)
           this.deviceinstor_weight = res.content[0].deviceinstor_weight
         }
         this.disabled1 = false
diff --git a/src/pages/modules/finished/finished-instore-search.vue b/src/pages/modules/finished/finished-instore-search.vue
index e3070a7..653d929 100644
--- a/src/pages/modules/finished/finished-instore-search.vue
+++ b/src/pages/modules/finished/finished-instore-search.vue
@@ -182,7 +182,7 @@ export default {
 
 <style lang="stylus" scoped>
 .grid_wraper
-    height calc(100% - 95px)
+    height calc(100% - 1.1rem)
 .filter_input_wraper_1
     width calc(100% - 45px)
 .search-label_1
diff --git a/src/pages/modules/finished/finished-instore.vue b/src/pages/modules/finished/finished-instore.vue
index 8a8658e..a4bb236 100644
--- a/src/pages/modules/finished/finished-instore.vue
+++ b/src/pages/modules/finished/finished-instore.vue
@@ -220,7 +220,7 @@ export default {
 
 <style lang="stylus" scoped>
 .grid_wraper
-    height calc(100% - 95px)
+    height calc(100% - 1.1rem)
 .filter_input_wraper_1
     width calc(100% - 45px)
 .search-label_1
diff --git a/src/pages/modules/finished/select-finished-mater.vue b/src/pages/modules/finished/select-finished-mater.vue
index 9b50197..1b52c4e 100644
--- a/src/pages/modules/finished/select-finished-mater.vue
+++ b/src/pages/modules/finished/select-finished-mater.vue
@@ -153,7 +153,7 @@ export default {
 
 <style lang="stylus" scoped>
 .grid_wraper
-    height calc(100% - 95px)
+    height calc(100% - 1.1rem)
 .filter_input_wraper_1
     width calc(100% - 45px)
 .search-label_1
diff --git a/src/pages/modules/lettering/lettering-load.vue b/src/pages/modules/lettering/lettering-load.vue
index 78558c0..2e60892 100644
--- a/src/pages/modules/lettering/lettering-load.vue
+++ b/src/pages/modules/lettering/lettering-load.vue
@@ -89,7 +89,7 @@ export default {
       }
       try {
         let res = await kzresidue(this.value2)
-        this.toast(res.message)
+        this.toast(res.msg)
         this.value1 = ''
         this.qty = ''
         this.value2 = ''
@@ -107,7 +107,7 @@ export default {
       }
       try {
         let res = await kzunload(this.qty, this.value2)
-        this.toast(res.message)
+        this.toast(res.msg)
         this.value1 = ''
         this.qty = ''
         this.value2 = ''
diff --git a/src/pages/modules/lettering/lettering-process.vue b/src/pages/modules/lettering/lettering-process.vue
index 7c85f98..b519a70 100644
--- a/src/pages/modules/lettering/lettering-process.vue
+++ b/src/pages/modules/lettering/lettering-process.vue
@@ -88,7 +88,7 @@ export default {
       }
       try {
         let res = await pourdeviceinstorQty(this.qty, this.value2)
-        this.toast(res.message)
+        this.toast(res.msg)
         this.value1 = ''
         this.qty = ''
         this.value2 = ''
@@ -106,7 +106,7 @@ export default {
       }
       try {
         let res = await letterCallVechile(this.value2)
-        this.toast(res.message)
+        this.toast(res.msg)
         this.value1 = ''
         this.qty = ''
         this.value2 = ''
diff --git a/src/pages/modules/lettering/man-pouring.vue b/src/pages/modules/lettering/man-pouring.vue
index 173671f..dbb1f3f 100644
--- a/src/pages/modules/lettering/man-pouring.vue
+++ b/src/pages/modules/lettering/man-pouring.vue
@@ -87,7 +87,7 @@ export default {
       }
       try {
         let res = await pourdeviceinstorQty(this.qty, this.value2)
-        this.toast(res.message)
+        this.toast(res.msg)
         this.value1 = ''
         this.qty = ''
         this.value2 = ''
diff --git a/src/pages/modules/lettering/temporary-lettering-load.vue b/src/pages/modules/lettering/temporary-lettering-load.vue
index a5ac122..674a95c 100644
--- a/src/pages/modules/lettering/temporary-lettering-load.vue
+++ b/src/pages/modules/lettering/temporary-lettering-load.vue
@@ -28,7 +28,7 @@ export default {
       this.disabled1 = true
       try {
         let res = await tmpcallVechile('', '')
-        this.toast(res.message)
+        this.toast(res.msg)
         this.disabled1 = false
       } catch (e) {
         this.disabled1 = false
@@ -43,7 +43,7 @@ export default {
       }
       try {
         let res = await tmpsendVechile('')
-        this.toast(res.message)
+        this.toast(res.msg)
         this.disabled2 = false
       } catch (e) {
         this.disabled2 = false
diff --git a/src/pages/modules/semifinished/semi-finished-check-search.vue b/src/pages/modules/semifinished/semi-finished-check-search.vue
index b132c88..da50fbe 100644
--- a/src/pages/modules/semifinished/semi-finished-check-search.vue
+++ b/src/pages/modules/semifinished/semi-finished-check-search.vue
@@ -255,7 +255,7 @@ export default {
 
 <style lang="stylus" scoped>
 .zd_wrapper
-    height calc(100% - 135px)
+    height calc(100% - 1.6rem)
 .filter_input_wraper_1
     width calc(100% - 45px)
 .search-label_1
diff --git a/src/pages/modules/semifinished/semi-finished-check.vue b/src/pages/modules/semifinished/semi-finished-check.vue
index 105435a..b751832 100644
--- a/src/pages/modules/semifinished/semi-finished-check.vue
+++ b/src/pages/modules/semifinished/semi-finished-check.vue
@@ -180,5 +180,5 @@ export default {
 
 <style lang="stylus" scoped>
 .grid_wraper
-    height calc(100% - 95px)
+    height calc(100% - 1.1rem)
 </style>
diff --git a/src/pages/modules/semifinished/semi-finished-compose-search.vue b/src/pages/modules/semifinished/semi-finished-compose-search.vue
index fd9a848..36ed042 100644
--- a/src/pages/modules/semifinished/semi-finished-compose-search.vue
+++ b/src/pages/modules/semifinished/semi-finished-compose-search.vue
@@ -182,5 +182,5 @@ export default {
 .search-label_1
     width 45px
 .grid_wraper
-    height calc(100% - 95px)
+    height calc(100% - 1.1rem)
 </style>
diff --git a/src/pages/modules/semifinished/semi-finished-instore-search.vue b/src/pages/modules/semifinished/semi-finished-instore-search.vue
index 1590639..e6cda72 100644
--- a/src/pages/modules/semifinished/semi-finished-instore-search.vue
+++ b/src/pages/modules/semifinished/semi-finished-instore-search.vue
@@ -180,7 +180,7 @@ export default {
 .search-item_2
   width 66%
 .grid_wraper
-    height calc(100% - 135px)
+    height calc(100% - 1.6rem)
 .filter_input_wraper_1
     width calc(100% - 45px)
 .search-label_1
diff --git a/src/pages/modules/semifinished/semi-finished-instore.vue b/src/pages/modules/semifinished/semi-finished-instore.vue
index a573fda..13b613b 100644
--- a/src/pages/modules/semifinished/semi-finished-instore.vue
+++ b/src/pages/modules/semifinished/semi-finished-instore.vue
@@ -175,7 +175,7 @@ export default {
       this.disabled1 = true
       try {
         let res = await callVehicle()
-        this.toast(res.message)
+        this.toast(res.msg)
         this.disabled1 = false
       } catch (e) {
         this.disabled1 = false
@@ -203,7 +203,7 @@ export default {
           remark: this.remark
         }
         let res = await createIn(from)
-        this.toast(res.message)
+        this.toast(res.msg)
         this.value1 = ''
         this.value2 = ''
         this.value3 = ''
@@ -235,6 +235,7 @@ export default {
 </script>
 
 <style lang="stylus" scoped>
+@import '~@style/mixin.styl'
 .search-item
     width 49%
     &:nth-child(3n+2)
@@ -246,9 +247,12 @@ export default {
     width 100%
     margin-left 0
 .filter_button
-    width 96px
-    height 30px
+    width 1.06rem
+    height .4rem
+    _fj(center)
+    .button
+      display block
 .filter_input_wraper_1
-    width calc(100% - 156px)
-    padding-right 10px
+    width calc(100% - 1.76rem)
+    padding-right .1rem
 </style>
diff --git a/src/pages/modules/semifinished/semi-finished-out-mater-search.vue b/src/pages/modules/semifinished/semi-finished-out-mater-search.vue
index b30d5e1..5c04319 100644
--- a/src/pages/modules/semifinished/semi-finished-out-mater-search.vue
+++ b/src/pages/modules/semifinished/semi-finished-out-mater-search.vue
@@ -137,7 +137,7 @@ export default {
         width 42%
 .filter_radius
     _fj()
-    margin-right 15px
+    margin-right 7px
 .filter_radius_label
     margin-left 5px
     _font(12px, 30px, #fff,,)
diff --git a/src/pages/modules/semifinished/semi-finished-outstore-search.vue b/src/pages/modules/semifinished/semi-finished-outstore-search.vue
index 10a63a5..041f592 100644
--- a/src/pages/modules/semifinished/semi-finished-outstore-search.vue
+++ b/src/pages/modules/semifinished/semi-finished-outstore-search.vue
@@ -173,7 +173,7 @@ export default {
 
 <style lang="stylus" scoped>
 .grid_wraper
-    height calc(100% - 95px)
+    height calc(100% - 1.1rem)
 .filter_input_wraper_1
     width calc(100% - 45px)
 .search-label_1
diff --git a/src/pages/modules/semifinished/semi-finished-outstore.vue b/src/pages/modules/semifinished/semi-finished-outstore.vue
index 7a75e2c..8834f84 100644
--- a/src/pages/modules/semifinished/semi-finished-outstore.vue
+++ b/src/pages/modules/semifinished/semi-finished-outstore.vue
@@ -165,7 +165,7 @@ export default {
       this.$set(from, 'remark', this.remark)
       try {
         let res = await outcreateIn(from)
-        this.toast(res.message)
+        this.toast(res.msg)
         this.value1 = ''
         this.value2 = ''
         this.value3 = ''
diff --git a/src/pages/modules/workorder/index.vue b/src/pages/modules/workorder/index.vue
index 6ed1c36..7c32e07 100644
--- a/src/pages/modules/workorder/index.vue
+++ b/src/pages/modules/workorder/index.vue
@@ -247,7 +247,6 @@ export default {
     border 1px solid #484cce
 .tabs_wrap
     height 34px
-    margin-bottom 10px
 .tabs
   height 34px
   li
@@ -267,7 +266,7 @@ export default {
         border-top-left-radius 12px
         border-top-right-radius 12px
 .main-container
-    _wh(100%, calc(100% - 44px))
+    _wh(100%, calc(100% - 34px))
 .drop-button-wraper
     .dropdown-list
         padding 0 10px
diff --git a/src/pages/modules/workorder/work-order-assignment.vue b/src/pages/modules/workorder/work-order-assignment.vue
index 7089097..257d432 100644
--- a/src/pages/modules/workorder/work-order-assignment.vue
+++ b/src/pages/modules/workorder/work-order-assignment.vue
@@ -180,7 +180,7 @@ export default {
       }
       try {
         let res = await openStart(this.pkId, this.value)
-        this.toast(res.message)
+        this.toast(res.msg)
         this.disabled1 = false
         this.pkId = ''
         this.pkObj = {}
@@ -200,7 +200,7 @@ export default {
       }
       try {
         let res = await saveReport(this.pkId, this.reportQty)
-        this.toast(res.message)
+        this.toast(res.msg)
         this.disabled2 = false
         this.pkId = ''
         this.pkObj = {}
@@ -240,7 +240,7 @@ export default {
       this.disabled3 = true
       try {
         let res = await tofinish(this.pkObj)
-        this.toast(res.message)
+        this.toast(res.msg)
         this.disabled3 = false
         this.pkId = ''
         this.pkObj = {}
diff --git a/src/pages/modules/workorder/work-order-query.vue b/src/pages/modules/workorder/work-order-query.vue
index d662f6e..573499a 100644
--- a/src/pages/modules/workorder/work-order-query.vue
+++ b/src/pages/modules/workorder/work-order-query.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="order-wraper">
-      <div class="wrap-filter-buttons">
-          <div class="wrap-filters">
-              <div class="filter_item">
-                  <div class="filter_label">工单日期</div>
-                  <div class="filter-input-wrap">
+      <div class="search-confirm-wrap">
+          <div class="search-wrap">
+              <div class="search-item_2">
+                  <div class="search-label">工单日期</div>
+                  <div class="filter_input_wraper">
                       <el-date-picker
                         v-model="value1"
                         type="daterange"
@@ -14,9 +14,9 @@
                       </el-date-picker>
                   </div>
               </div>
-              <div class="filter_item">
-                  <div class="filter_label filter_label_z2">设备</div>
-                  <div class="filter-input-wrap filter-input-wrap_z2">
+              <div class="search-item">
+                  <div class="search-label">设备</div>
+                  <div class="filter_input_wraper">
                     <el-select v-model="value" filterable placeholder="请选择">
                       <el-option
                           v-for="item in options"
@@ -27,17 +27,17 @@
                     </el-select>
                   </div>
               </div>
-              <div class="filter_item">
-                  <div class="filter_label filter_label_z3">关键字</div>
-                  <div class="filter-input-wrap filter-input-wrap_z3">
+              <div class="search-item">
+                  <div class="search-label">关键字</div>
+                  <div class="filter_input_wraper">
                   <input type="text" class="filter-input filter-input_1" v-model="keyValue" placeholder="工单号、物料编码">
                   <i v-show="closeIcon1" class="iconfont close_icon" @click="clearData(1)"></i>
                   </div>
               </div>
-          </div>
-          <div class="wrap-buttons">
-              <button class="button button--primary" @click="getDatas">查询</button>
-              <button class="button button--primary" :class="{'button--defalut': pkId === ''}" :disabled="disabled1" @click="showDialog">残次品报工</button>
+              <div class="search-item_2">
+                <button class="button button--primary" @click="getDatas">查询</button>
+                <button class="button button--primary" :class="{'button--defalut': pkId === ''}" :disabled="disabled1" @click="showDialog">残次品报工</button>
+            </div>
           </div>
       </div>
       <div class="grid_wraper">
@@ -259,4 +259,15 @@ export default {
   line-height 20px
   top 5px
   right 10px
+.search-item_2
+  margin-left 0
+  &:nth-child(4)
+    margin-left 2%
+    margin-right 0
+.search-item
+  &:nth-child(2)
+    margin-left 2%
+    margin-right 0
+.grid_wraper
+  height calc(100% - 1.1rem)
 </style>
diff --git a/src/pages/modules/workorder/work-report-query.vue b/src/pages/modules/workorder/work-report-query.vue
index 035453e..6478e2a 100644
--- a/src/pages/modules/workorder/work-report-query.vue
+++ b/src/pages/modules/workorder/work-report-query.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="order-wraper">
-      <div class="wrap-filter-buttons">
-          <div class="wrap-filters">
-              <div class="filter_item">
-                  <div class="filter_label">工单日期</div>
-                  <div class="filter-input-wrap">
+      <div class="search-confirm-wrap">
+          <div class="search-wrap">
+              <div class="search-item_2">
+                  <div class="search-label">工单日期</div>
+                  <div class="filter_input_wraper">
                       <el-date-picker
                           v-model="value1"
                           type="daterange"
@@ -14,9 +14,9 @@
                       </el-date-picker>
                   </div>
               </div>
-              <div class="filter_item">
-                  <div class="filter_label filter_label_z2">设备</div>
-                  <div class="filter-input-wrap filter-input-wrap_z2">
+              <div class="search-item">
+                  <div class="search-label">设备</div>
+                  <div class="filter_input_wraper">
                     <el-select v-model="value" filterable placeholder="请选择">
                       <el-option
                           v-for="item in options"
@@ -27,18 +27,18 @@
                     </el-select>
                   </div>
               </div>
-              <div class="filter_item">
-                  <div class="filter_label filter_label_z3">工单号</div>
-                  <div class="filter-input-wrap filter-input-wrap_z3">
+              <div class="search-item">
+                  <div class="search-label">工单号</div>
+                  <div class="filter_input_wraper">
                   <input type="text" class="filter-input filter-input_1" v-model="workorder">
                   <i v-show="closeIcon1" class="iconfont close_icon" @click="clearData(1)"></i>
                   </div>
               </div>
-          </div>
-          <div class="wrap-buttons">
-              <button class="button button--primary" @click="getDatas">查询</button>
-              <button class="button button--primary" :class="{'button--defalut': pkId === ''}" :disabled="disabled1" @click="showDialog">修改</button>
-              <button class="button button--primary" :class="{'button--defalut': pkId === ''}" :disabled="disabled2" @click="_deleteReport">删除</button>
+              <div class="search-item_2">
+                <button class="button button--primary" @click="getDatas">查询</button>
+                <button class="button button--primary" :class="{'button--defalut': pkId === ''}" :disabled="disabled1" @click="showDialog">修改</button>
+                <button class="button button--primary" :class="{'button--defalut': pkId === ''}" :disabled="disabled2" @click="_deleteReport">删除</button>
+            </div>
           </div>
       </div>
       <div class="grid_wraper">
@@ -241,10 +241,22 @@ export default {
   height 20px
   font-size 15px
   line-height 20px
-  top 5px
+  top 50%
+  transform translateY(-50%)
   right 10px
 .filter_label_z3
   width 43px
 .filter-input-wrap_z3
   width calc(100% - 43px)
+.search-item_2
+  margin-left 0
+  &:nth-child(4)
+    margin-left 2%
+    margin-right 0
+.search-item
+  &:nth-child(2)
+    margin-left 2%
+    margin-right 0
+.grid_wraper
+  height calc(100% - 1.1rem)
 </style>
diff --git a/src/style/layout.styl b/src/style/layout.styl
index 4ea4508..d58f9f4 100644
--- a/src/style/layout.styl
+++ b/src/style/layout.styl
@@ -30,33 +30,33 @@
 // .el-date-range-picker__content
 //   padding .06rem
 .el-input__inner
-  height 30px
-  line-height 30px
+  height .4rem
+  line-height .4rem
 .el-range-editor.el-input__inner
   padding 0 5px
 .el-date-editor .el-range__icon
-  font-size 12px
-  line-height 30px
+  font-size .16rem
+  line-height .4rem
 .el-date-editor .el-range-input
-  font-size 12px
+  font-size .16rem
 .el-date-editor .el-range-separator
-  line-height 30px
-  font-size 12px
+  line-height .4rem
+  font-size .16rem
 // 选择器
 .el-select
   width 100%
   display block
 .el-input
-  line-height 30px
-  font-size 12px
+  line-height .4rem
+  font-size .16rem
 .el-input__icon
-  line-height 30px
+  line-height .4rem
 .el-select-dropdown__item
-  line-height 30px
-  font-size 12px
-  height 30px
+  line-height .4rem
+  font-size .16rem
+  height .4rem
   span
-    font-size 12px
+    font-size .16rem
 
 /**icon*/  
 .iconfont
@@ -107,11 +107,11 @@
   background-color #fff
 .button
   display: inline-block;
-  line-height: 1;
+  line-height: .38rem;
   white-space: nowrap;
   cursor: pointer;
   background: #909399;
-  border: 1px solid #909399;
+  border: .01rem solid #909399;
   color: #ffffff;
   -webkit-appearance: none;
   text-align: center;
@@ -123,15 +123,15 @@
   -moz-user-select: none;
   -webkit-user-select: none;
   -ms-user-select: none;
-  padding: 7px 12px;
-  font-size: 14px;
+  padding: 0 12px;
+  font-size: .16rem;
   border-radius: 4px;
 .button--primary
   background-color #409EFF
   border-color #409EFF
 .button--defalut
   color #fff
-  border 1px solid #c9c9c9
+  border-color #c9c9c9
   background-color #c9c9c9
 
 /**header*/
@@ -176,14 +176,14 @@ header
   justify-content space-between
   align-items center
   width 100%
-  height 30px
-  margin-bottom 15px
+  height .4rem
+  margin .1rem 0
 .wrap-filters
   display flex
   justify-content flex-start
   align-items center
   width 60%
-  height 30px
+  height .4rem
 .wrap-buttons
   width 40%
   height 100%
@@ -211,15 +211,15 @@ header
   justify-content center
   align-items center
 .filter-input
-  _wh(100%, 30px)
-  _font(12px, 30px, #606266,,)
+  _wh(100%, .4rem)
+  _font(.16rem, .4rem, #606266,,)
   padding 0 10px
   border-radius 4px
   background-color #fff
   &:disabled
     background-color #c9c9c9
 .grid_wraper
-  _wh(100%, calc(100% - 55px))
+  _wh(100%, calc(100% - .6rem))
   border-radius 5px
   overflow-y auto
 .filter-table
@@ -259,7 +259,7 @@ header
   height: 100%
   overflow-y: auto
 .zd_wrapper
-  height calc(100% - 95px)
+  height calc(100% - 1.1rem)
   overflow hidden
   .grid_wraper
     table-layout fixed
@@ -406,38 +406,42 @@ input::-webkit-input-placeholder
 .search-confirm-wrap
   margin 0 auto
   border-radius 5px
-  padding-bottom 15px
+  padding-bottom .1rem
 .search-wrap
   width 100%
-  padding 0 10px
+  padding 0
   _fj(flex-start)
   flex-wrap wrap
 .search-item
   _fj()
   width 32%
-  margin-top 10px
+  height .4rem
+  margin-top .1rem
   &:nth-child(3n+2)
     margin-left 2%
     margin-right 2%
   .button+.button
     margin-left 5px
 .search-label
-  _wh(60px, 30px)
-  _font(12px, 30px,#fff,,)
+  _wh(.7rem, .4rem)
+  _font(.16rem, .4rem,#fff,,)
 .filter_input_wraper
-  _wh(calc(100% - 60px), 30px)
-  _font(12px, 30px, #fff,,)
+  position relative
+  _wh(calc(100% - .7rem), .4rem)
+  _font(.16rem, .4rem, #fff,,)
 .search-item_2
   _fj(flex-end)
   width 64%
-  margin-top 10px
+  height .4rem
+  margin-top .1rem
   margin-left 4%
   .button+.button
     margin-left 5px
 .search-item_3
   _fj(flex-end)
   width 100%
-  margin-top 10px
+  height .4rem
+  margin-top .1rem
   margin-left 0
   .button+.button
     margin-left 5px