From 1c0d53fe69f4fe442810d2ccc0cd44ca54931393 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 03 一月 2023 14:45:29 +0800
Subject: [PATCH] 1.优化系统搜索栏布局
---
src/views/jcsz/zzjg.vue | 9
src/views/zzmx/chda.vue | 8
src/views/sbgl/djjl.vue | 8
src/views/scgl/scdd.vue | 76 ++-
src/views/jcsz/wldw.vue | 9
src/views/scgl/gd.vue | 10
src/views/zlgl/gxjyjl.vue | 8
src/views/zzmx/wlqd.vue | 8
src/styles/global.css | 3
src/views/bbgl/adbb.vue | 16
src/views/bbgl/blmx.vue | 13
src/views/sbgl/djbz.vue | 9
src/views/bbgl/wwgx.vue | 11
src/views/zlgl/gxjyxm.vue | 4
src/views/sbgl/bybw.vue | 6
src/views/sbgl/bybz.vue | 9
src/views/scgl/cngh.vue | 6
src/views/scgl/gdplgb.vue | 10
src/views/zzmx/jpgj.vue | 6
src/views/zlgl/qxdy.vue | 6
src/views/xtsz/bmgz.vue | 6
src/views/wlgl/kwdy.vue | 8
src/views/sbgl/djbw.vue | 11
src/views/zzmx/gylx.vue | 4
src/views/bbgl/bzgz.vue | 14
src/views/sbgl/sbqd.vue | 11
src/views/sbgl/byjl.vue | 11
src/views/template.vue | 10
src/views/bbgl/wxmx.vue | 13
src/views/xtsz/cjgg.vue | 8
src/views/sbgl/wxjl.vue | 9
src/views/scgl/zdpc.vue | 24
src/views/jcsz/yhqd.vue | 11
src/views/jcsz/jsqd.vue | 9
src/views/wlgl/ckdy.vue | 6
src/views/zzmx/gxdy.vue | 8
src/layout/components/Settings/index.vue | 5
src/views/zlgl/gxjybz.vue | 6
src/views/zzmx/wllx.vue | 936 ++++++++++++++++++++--------------------
src/views/bbgl/rygz.vue | 11
40 files changed, 719 insertions(+), 637 deletions(-)
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index 0fd4757..6f82418 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -103,6 +103,11 @@
]
}
},
+ mounted() {
+ if (this.$store.state.settings.menuIsHorizontal) {
+ this.sidebar.opened = true
+ }
+ },
computed: {
...mapGetters([
'sidebar'
diff --git a/src/styles/global.css b/src/styles/global.css
index 340c54b..25fa2c7 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -71,7 +71,8 @@
.elForm {
display: flex;
/*justify-content: flex-start;*/
- justify-content: space-between;
+ /*justify-content: space-between;*/
+ /*justify-content: space-around;*/
width: 100%;
flex-wrap: wrap;
}
diff --git a/src/views/bbgl/adbb.vue b/src/views/bbgl/adbb.vue
index ab6915f..61b0736 100644
--- a/src/views/bbgl/adbb.vue
+++ b/src/views/bbgl/adbb.vue
@@ -11,10 +11,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="鐢熶骇杞﹂棿" style=" display: flex;">
+ <el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
<el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in wkshopSelectArr"
@@ -50,7 +50,7 @@
end-placeholder="缁撴潫鏃ユ湡"
/>
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="璁惧缂栫爜" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="璁惧缂栫爜" style=" display: flex;">
<el-input v-model="form.eqpcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="璁惧鍚嶇О" style=" display: flex;">
@@ -73,7 +73,10 @@
/>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
@@ -178,7 +181,10 @@
/>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/bbgl/blmx.vue b/src/views/bbgl/blmx.vue
index eb8e3b0..cfe9542 100644
--- a/src/views/bbgl/blmx.vue
+++ b/src/views/bbgl/blmx.vue
@@ -11,10 +11,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label="宸ュ崟缂栧彿" label-width="70px" style=" display: flex;">
+ <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
@@ -26,7 +26,7 @@
<el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
<el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" label-width="70px" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style=" display: flex;">
<el-input v-model="form.stepname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="缂洪櫡浠ｇ爜" style=" display: flex;">
@@ -38,7 +38,7 @@
<el-form-item v-show="isExpandForm" label="鎶ュ伐浜哄憳" style=" display: flex;">
<el-input v-model="form.reportname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="鎶ュ伐鏃堕棿" style="display: flex;align-items: center">
+ <el-form-item v-show="isExpandForm" label="鎶ュ伐鏃堕棿" style="display: flex;align-items: center">
<el-date-picker
v-model="form.reportdate"
type="daterange"
@@ -55,7 +55,10 @@
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/bbgl/bzgz.vue b/src/views/bbgl/bzgz.vue
index 45818af..dddeb45 100644
--- a/src/views/bbgl/bzgz.vue
+++ b/src/views/bbgl/bzgz.vue
@@ -11,10 +11,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;" label-width="70px">
+ <el-form-item label="宸ュ崟缂栧彿" style="display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
@@ -26,7 +26,7 @@
<el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
<el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" label-width="70px" style="display: flex;">
+ <el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style="display: flex;">
<el-input v-model="form.stepname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="鐢熶骇鐝粍" style=" display: flex;">
@@ -59,7 +59,10 @@
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
@@ -200,7 +203,8 @@
label="鎶ュ伐浜哄憳"
width="110"
sortable="custom"
- /> <el-table-column
+ />
+ <el-table-column
prop="report_date"
label="鎶ュ伐鏃堕棿"
width="160"
diff --git a/src/views/bbgl/rygz.vue b/src/views/bbgl/rygz.vue
index 974da2e..05a95f3 100644
--- a/src/views/bbgl/rygz.vue
+++ b/src/views/bbgl/rygz.vue
@@ -11,10 +11,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex; "
>
<div class="elForm">
- <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;" label-width="70px">
+ <el-form-item label="宸ュ崟缂栧彿" style="display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
@@ -26,7 +26,7 @@
<el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
<el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="宸ュ簭鍚嶇О" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style=" display: flex;">
<el-input v-model="form.stepname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="鐢熶骇鐝粍" style=" display: flex;">
@@ -59,7 +59,10 @@
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/bbgl/wwgx.vue b/src/views/bbgl/wwgx.vue
index 02851c7..71c2255 100644
--- a/src/views/bbgl/wwgx.vue
+++ b/src/views/bbgl/wwgx.vue
@@ -11,10 +11,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label="宸ュ崟缂栧彿" label-width="70px" style=" display: flex;">
+ <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
@@ -26,7 +26,7 @@
<el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
<el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" label-width="70px" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style=" display: flex;">
<el-input v-model="form.stepname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="渚涙柟鍚嶇О" style=" display: flex;">
@@ -64,7 +64,10 @@
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/bbgl/wxmx.vue b/src/views/bbgl/wxmx.vue
index ae1391d..cd2673a 100644
--- a/src/views/bbgl/wxmx.vue
+++ b/src/views/bbgl/wxmx.vue
@@ -11,10 +11,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;" label-width="70">
+ <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
@@ -26,7 +26,7 @@
<el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
<el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" label-width="70" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style=" display: flex;">
<el-input v-model="form.stepname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="鎿嶄綔绫诲瀷" style=" display: flex;">
@@ -46,7 +46,7 @@
<el-form-item v-show="isExpandForm" label="鎶ュ伐浜哄憳" style=" display: flex;">
<el-input v-model="form.repairname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70" label="鎶ュ伐鏃堕棿" style="display: flex;align-items: center">
+ <el-form-item v-show="isExpandForm" label="鎶ュ伐鏃堕棿" style="display: flex;align-items: center">
<el-date-picker
v-model="form.repairdate"
type="daterange"
@@ -63,7 +63,10 @@
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index df8a1d5..e0109f4 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -19,10 +19,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="瑙掕壊缂栫爜" style=" display: flex;">
+ <el-form-item label="瑙掕壊缂栫爜" style=" display: flex;">
<el-input v-model="form.RoleCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="瑙掕壊鍚嶇О" style=" display: flex;">
@@ -49,7 +49,10 @@
<el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index 8743044..5892f65 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -20,10 +20,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="鍗曚綅缂栫爜" style=" display: flex;">
+ <el-form-item label="鍗曚綅缂栫爜" style=" display: flex;">
<el-input v-model="form.CuntUnitCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鍗曚綅鍚嶇О" style=" display: flex;">
@@ -49,7 +49,10 @@
<el-input v-model="form.CreateUser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 7ce4b99..840f709 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -17,10 +17,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="鐢ㄦ埛缂栫爜" style=" display: flex;">
+ <el-form-item label="鐢ㄦ埛缂栫爜" style=" display: flex;">
<el-input v-model="form.UserCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鐢ㄦ埛鍚嶇О" style=" display: flex;">
@@ -54,7 +54,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="鍦ㄨ亴鐘舵��" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="鍦ㄨ亴鐘舵��" style=" display: flex;">
<el-select
v-model="form.Enable"
:popper-append-to-body="false"
@@ -71,7 +71,10 @@
</el-select>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index 1bae116..27d35a8 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -11,10 +11,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="缁勭粐缂栫爜" style=" display: flex;">
+ <el-form-item label="缁勭粐缂栫爜" style=" display: flex;">
<el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="缁勭粐鍚嶇О" style=" display: flex;">
@@ -40,7 +40,10 @@
<el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/sbgl/bybw.vue b/src/views/sbgl/bybw.vue
index 791e7c1..32c5cf5 100644
--- a/src/views/sbgl/bybw.vue
+++ b/src/views/sbgl/bybw.vue
@@ -12,10 +12,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="閮ㄤ綅缂栫爜" style=" display: flex;">
+ <el-form-item label="閮ㄤ綅缂栫爜" style=" display: flex;">
<el-input v-model="form.maiitemcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="閮ㄤ綅鍚嶇О" style=" display: flex;">
@@ -36,7 +36,7 @@
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/sbgl/bybz.vue b/src/views/sbgl/bybz.vue
index 966458e..332571f 100644
--- a/src/views/sbgl/bybz.vue
+++ b/src/views/sbgl/bybz.vue
@@ -12,10 +12,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label="鏍囧噯缂栫爜" label-width="70px" style=" display: flex;">
+ <el-form-item label="鏍囧噯缂栫爜" style=" display: flex;">
<el-input v-model="form.repairstandcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鏍囧噯鍚嶇О" style=" display: flex;">
@@ -25,7 +25,10 @@
<el-input v-model="form.repairstanddescr" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/sbgl/byjl.vue b/src/views/sbgl/byjl.vue
index f109864..1cec470 100644
--- a/src/views/sbgl/byjl.vue
+++ b/src/views/sbgl/byjl.vue
@@ -13,10 +13,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm" style="justify-content: flex-start">
- <el-form-item label="鐢熶骇杞﹂棿" label-width="70px" style=" display: flex;">
+ <el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
<el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in wkshopSelectArr"
@@ -35,7 +35,7 @@
<el-form-item label="鏍囧噯鍚嶇О" style=" display: flex;">
<el-input v-model="form.stanedname" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item v-show="isExpandForm"label="淇濆吇浜哄憳" label-width="70px" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="淇濆吇浜哄憳" style=" display: flex;">
<el-input v-model="form.repairuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="淇濆吇鏃堕棿" style=" display: flex;font-size:14px;align-items: center">
@@ -62,7 +62,7 @@
</el-select>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
@@ -116,6 +116,7 @@
<el-table-column
prop="org_name"
label="鐢熶骇杞﹂棿"
+ min-width="120"
show-tooltip-when-overflow
sortable="custom"
/>
@@ -124,9 +125,11 @@
label="璁惧缂栧彿"
show-tooltip-when-overflow
sortable="custom"
+ min-width="120"
/>
<el-table-column
prop="eqp_name"
+ min-width="120"
label="璁惧鍚嶇О"
show-tooltip-when-overflow
sortable="custom"
diff --git a/src/views/sbgl/djbw.vue b/src/views/sbgl/djbw.vue
index ea3c6d8..69ef106 100644
--- a/src/views/sbgl/djbw.vue
+++ b/src/views/sbgl/djbw.vue
@@ -12,10 +12,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="閮ㄤ綅缂栫爜" style=" display: flex;">
+ <el-form-item label="閮ㄤ綅缂栫爜" style=" display: flex;">
<el-input v-model="form.checkitemcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="閮ㄤ綅鍚嶇О" style=" display: flex;">
@@ -34,7 +34,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="鐐规鍛ㄦ湡" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="鐐规鍛ㄦ湡" style=" display: flex;">
<el-select v-model="form.cycle" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in cycleArr"
@@ -45,7 +45,10 @@
</el-select>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/sbgl/djbz.vue b/src/views/sbgl/djbz.vue
index 0bf8b9e..f873217 100644
--- a/src/views/sbgl/djbz.vue
+++ b/src/views/sbgl/djbz.vue
@@ -12,10 +12,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="鏍囧噯缂栫爜" style=" display: flex;">
+ <el-form-item label="鏍囧噯缂栫爜" style=" display: flex;">
<el-input v-model="form.checkstandcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鏍囧噯鍚嶇О" style=" display: flex;">
@@ -32,7 +32,10 @@
</el-select>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/sbgl/djjl.vue b/src/views/sbgl/djjl.vue
index 9cd03ff..6ce2795 100644
--- a/src/views/sbgl/djjl.vue
+++ b/src/views/sbgl/djjl.vue
@@ -13,10 +13,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm" style="justify-content: flex-start">
- <el-form-item label-width="70px" label="鐢熶骇杞﹂棿" style=" display: flex;">
+ <el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
<el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in wkshopSelectArr"
@@ -35,7 +35,7 @@
<el-form-item label="鏍囧噯鍚嶇О" style=" display: flex;">
<el-input v-model="form.stanedname" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="鐐规浜哄憳" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="鐐规浜哄憳" style=" display: flex;">
<el-input v-model="form.checkuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="鐐规鏃堕棿" style=" display: flex;font-size:14px;align-items: center">
@@ -62,7 +62,7 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 3d4e527..813088b 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -20,10 +20,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm" style="justify-content: flex-start">
- <el-form-item label-width="70px" label="璁惧缂栫爜" style=" display: flex;">
+ <el-form-item label="璁惧缂栫爜" style=" display: flex;">
<el-input v-model="form.DeviceCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="璁惧鍚嶇О" style=" display: flex;">
@@ -62,7 +62,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" filterable label="璁惧绫诲瀷" style="display: flex;">
+ <el-form-item v-show="isExpandForm" filterable label="璁惧绫诲瀷" style="display: flex;">
<el-select
v-model="form.DeviceType"
:popper-append-to-body="false"
@@ -98,7 +98,10 @@
</el-select>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/sbgl/wxjl.vue b/src/views/sbgl/wxjl.vue
index d3fcc82..69a0880 100644
--- a/src/views/sbgl/wxjl.vue
+++ b/src/views/sbgl/wxjl.vue
@@ -11,10 +11,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label="鐢熶骇杞﹂棿" label-width="70px" style=" display: flex;">
+ <el-form-item label="鐢熶骇杞﹂棿"style=" display: flex;">
<el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in wkshopSelectArr"
@@ -33,7 +33,7 @@
<el-form-item label="鎶ヤ慨浜哄憳" style=" display: flex;">
<el-input v-model="form.reportuser" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="缁翠慨浜哄憳" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="缁翠慨浜哄憳" style=" display: flex;">
<el-input v-model="form.repairuser" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="楠岃瘉浜哄憳" style=" display: flex;">
@@ -67,7 +67,6 @@
</el-form-item>
<el-form-item
v-show="isExpandForm"
- label-width="70px"
label="楠岃瘉鏃堕棿"
style=" display: flex;align-items: center"
>
@@ -84,7 +83,7 @@
/>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/scgl/cngh.vue b/src/views/scgl/cngh.vue
index 89a9478..bae47e3 100644
--- a/src/views/scgl/cngh.vue
+++ b/src/views/scgl/cngh.vue
@@ -11,10 +11,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="鐢熶骇杞﹂棿" style=" display: flex;">
+ <el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
<el-select
v-model="form.workshop"
style="width: 200px"
@@ -56,7 +56,7 @@
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index ffc74e0..aea5140 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -17,10 +17,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="璁㈠崟鐘舵��" style=" display: flex;">
+ <el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
<el-select
v-model="form.mesorderstus"
:popper-append-to-body="false"
@@ -59,7 +59,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="浜у搧缂栫爜" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
@@ -71,7 +71,7 @@
<el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="鍒涘缓鏃堕棿" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="鍒涘缓鏃堕棿" style=" display: flex;">
<!-- <el-date-picker-->
<!-- v-model="form.createdate"-->
<!-- type="daterange"-->
@@ -93,7 +93,7 @@
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/scgl/gdplgb.vue b/src/views/scgl/gdplgb.vue
index 092c495..7b41170 100644
--- a/src/views/scgl/gdplgb.vue
+++ b/src/views/scgl/gdplgb.vue
@@ -12,10 +12,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label="宸ュ崟鐘舵��" label-width="70px" style=" display: flex;">
+ <el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">
<el-input v-model="form.mesorderstus" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
@@ -34,7 +34,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="浜у搧缂栫爜" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
@@ -46,11 +46,11 @@
<el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="鍒涘缓鏃堕棿" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="鍒涘缓鏃堕棿" style=" display: flex;">
<el-input v-model="form.createdate" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 6867dcb..09318f3 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -21,10 +21,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="璁㈠崟鐘舵��" style=" display: flex;">
+ <el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
<el-select
v-model="form.erporderstus"
filterable
@@ -49,13 +49,18 @@
<el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="浜у搧瑙勬牸" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="浜у搧瑙勬牸" style=" display: flex;">
<el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label="棰勮寮�宸ユ椂闂�" label-width="100px" style="display: flex;font-size: 14px;align-items: center">
+ <el-form-item
+ v-show="isExpandForm"
+ label="棰勮寮�宸ユ椂闂�"
+ label-width="100px"
+ style="display: flex;font-size: 14px;align-items: center"
+ >
<el-date-picker
v-model="form.paystartdate"
type="daterange"
@@ -71,7 +76,12 @@
<!-- :picker-options="expireTimeOption"-->
</el-form-item>
- <el-form-item v-show="isExpandForm" label="棰勮瀹屽伐鏃堕棿" label-width="100px" style=" display: flex;font-size: 14px;align-items: center">
+ <el-form-item
+ v-show="isExpandForm"
+ label="棰勮瀹屽伐鏃堕棿"
+ label-width="100px"
+ style=" display: flex;font-size: 14px;align-items: center"
+ >
<el-date-picker
v-model="form.payenddate"
type="daterange"
@@ -96,7 +106,10 @@
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
@@ -241,7 +254,7 @@
width="130"
>
<template slot-scope="{row}">
- <div v-if="row.planstartdate">{{ row.planstartdate.substring(0,11) }}</div>
+ <div v-if="row.planstartdate">{{ row.planstartdate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -253,7 +266,7 @@
width="130"
>
<template slot-scope="{row}">
- <div v-if="row.planenddate">{{ row.planenddate.substring(0,11) }}</div>
+ <div v-if="row.planenddate">{{ row.planenddate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -265,7 +278,7 @@
width="130"
>
<template slot-scope="{row}">
- <div v-if="row.saleOrderDeliveryDate">{{ row.saleOrderDeliveryDate.substring(0,11) }}</div>
+ <div v-if="row.saleOrderDeliveryDate">{{ row.saleOrderDeliveryDate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -289,7 +302,7 @@
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.createdate">{{ row.createdate.substring(0,11) }}</div>
+ <div v-if="row.createdate">{{ row.createdate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -302,7 +315,12 @@
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="涓嬭揪" placement="top">
<!-- <el-button type="text" @click="edit('edit',row)">涓嬭揪</el-button>-->
- <i class="el-icon-bottom" :style="{color:$store.state.settings.theme}" style="cursor: pointer;margin-left: 5px" @click="edit('edit',row)" />
+ <i
+ class="el-icon-bottom"
+ :style="{color:$store.state.settings.theme}"
+ style="cursor: pointer;margin-left: 5px"
+ @click="edit('edit',row)"
+ />
</el-tooltip>
</div>
</template>
@@ -792,29 +810,34 @@
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
-::v-deep .el-range-input{
+::v-deep .el-range-input {
//font-size: 14px !important;
}
-::v-deep .el-range__icon{
+
+::v-deep .el-range__icon {
line-height: 28px !important;
}
-::v-deep .el-range-separator{
+
+::v-deep .el-range-separator {
line-height: 28px !important;
}
-::v-deep .el-range-input{
+
+::v-deep .el-range-input {
font-size: 14px;
}
-::v-deep .el-range-separator{
+
+::v-deep .el-range-separator {
display: flex;
justify-content: center;
align-items: center;
}
-.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
color: $main_color;
cursor: pointer;
}
-.el-icon-edit-outline{
+
+.el-icon-edit-outline {
margin-right: 15px;
}
@@ -875,8 +898,8 @@
background-color: #f8f8fa;
}
-::v-deep .el-table__body .el-table__row.hover-row td{
- background-color: #eaecef ;
+::v-deep .el-table__body .el-table__row.hover-row td {
+ background-color: #eaecef;
}
::v-deep .el-form--inline .el-form-item__label {
@@ -892,6 +915,7 @@
.body ::v-deep .el-form-item {
margin-bottom: 0;
}
+
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
@@ -902,11 +926,12 @@
}
}
-.tableFixed{
- ::v-deep .el-table__fixed-right{
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
height: 100% !important;
}
- ::v-deep .el-table__fixed{
+
+ ::v-deep .el-table__fixed {
height: 100% !important;
}
}
@@ -931,11 +956,12 @@
.el-table .custom-row {
background: #f8f8fa;
}
-.osloading{
+
+.osloading {
font-size: 26px !important;
}
-.el-loading-text{
+.el-loading-text {
font-size: 26px !important;
}
</style>
diff --git a/src/views/scgl/zdpc.vue b/src/views/scgl/zdpc.vue
index 8a42ce4..9d99497 100644
--- a/src/views/scgl/zdpc.vue
+++ b/src/views/scgl/zdpc.vue
@@ -8,10 +8,10 @@
:model="formTop"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="杞﹂棿缂栫爜" style=" display: flex;">
+ <el-form-item label="杞﹂棿缂栫爜" style=" display: flex;">
<el-input v-model="formTop.workshop" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鐢熶骇宸ュ崟鍙�" style=" display: flex;">
@@ -24,7 +24,7 @@
<el-input v-model="formTop.partname" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
@@ -188,10 +188,11 @@
ref="form"
:model="formBottom"
inline
- style="display: flex;justify-content: space-between"
+ label-width="100px"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="鎺掔▼鏃ユ湡" style=" display: flex;">
+ <el-form-item label="鎺掔▼鏃ユ湡" style=" display: flex;">
<el-date-picker
v-model="formBottom.scheDate"
type="daterange"
@@ -212,13 +213,13 @@
<el-option value="Y" label="鏃堕棿浼樺厛" />
</el-select>
</el-form-item>
- <el-form-item label="鏃堕棿鍒诲害锛堝垎閽燂級" style=" display: flex;">
+ <el-form-item label="鏃堕棿鍒诲害(鍒嗛挓)" label-width="110" style=" display: flex;">
<el-select v-model.number="formBottom.scale" style="width: 120px;">
<el-option v-for="item in scaleList" :key="item" :value="item" :label="item" />
</el-select>
</el-form-item>
- <el-form-item label="鎹㈠瀷鏃堕棿锛堝垎閽燂級" style=" display: flex;">
+ <el-form-item label="鎹㈠瀷鏃堕棿(鍒嗛挓)" label-width="110" style=" display: flex;">
<el-input
id="scale"
v-model="formBottom.times"
@@ -234,7 +235,7 @@
</span>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button
type="primary"
icon="el-icon-document-remove"
@@ -1043,13 +1044,14 @@
// 鏃堕棿/璁惧浼樺厛鎺掔▼
click_schedule() {
const timestamp = new Date().toLocaleDateString()
- if (new Date(this.formBottom.scheDate[0]) < new Date(timestamp)) {
- this.$message.error('鎺掔▼鏃堕棿涓嶅彲浠ュ皬浜庡綋鍓嶆椂闂�!')
+
+ if (new Date(this.formBottom.scheDate[1]) < new Date(timestamp)) {
+ this.$message.error('鎺掔▼鏃ユ湡涓嶅彲浠ュ皬浜庡綋鍓嶆椂闂�!')
return false
}
this.nitialize()// 鎵嬪姩杩囨护鎵�鏈夎澶囧凡鎺掔▼
- console.log(this.facility_data, 67890)
+ // console.log(this.facility_data, 67890)
if (this.bm_data != '' && this.formBottom.types == 'N') { // 璁惧浼樺厛
this.fun_time()
this.change_num(this.bm_data)
diff --git a/src/views/template.vue b/src/views/template.vue
index f03e9f5..78efe5d 100644
--- a/src/views/template.vue
+++ b/src/views/template.vue
@@ -12,10 +12,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
- <div class="elForm" style="justify-content: flex-start">
- <el-form-item label-width="70px" label="姣嶄欢缂栫爜" style=" display: flex;">
+ <div class="elForm">
+ <el-form-item label="姣嶄欢缂栫爜" style=" display: flex;">
<el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="姣嶄欢鍚嶇О" style=" display: flex;">
@@ -34,7 +34,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="鐗堟湰缂栧彿" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="鐗堟湰缂栧彿" style=" display: flex;">
<el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
@@ -49,7 +49,7 @@
/>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/wlgl/ckdy.vue b/src/views/wlgl/ckdy.vue
index 03a09db..4444e74 100644
--- a/src/views/wlgl/ckdy.vue
+++ b/src/views/wlgl/ckdy.vue
@@ -21,10 +21,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="浠撳簱缂栫爜" style=" display: flex;">
+ <el-form-item label="浠撳簱缂栫爜" style=" display: flex;">
<el-input v-model="form.warehousecode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浠撳簱鍚嶇О" style=" display: flex;">
@@ -37,7 +37,7 @@
<el-input v-model="form.createuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/wlgl/kwdy.vue b/src/views/wlgl/kwdy.vue
index 99f807a..9a4da32 100644
--- a/src/views/wlgl/kwdy.vue
+++ b/src/views/wlgl/kwdy.vue
@@ -13,10 +13,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label="搴撲綅缂栫爜" label-width="70px" style=" display: flex;">
+ <el-form-item label="搴撲綅缂栫爜" style=" display: flex;">
<el-input v-model="form.storagecode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="搴撲綅鍚嶇О" style=" display: flex;">
@@ -41,12 +41,12 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="鍒涘缓浜哄憳" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="form.createuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/xtsz/bmgz.vue b/src/views/xtsz/bmgz.vue
index 3a38eec..67021e0 100644
--- a/src/views/xtsz/bmgz.vue
+++ b/src/views/xtsz/bmgz.vue
@@ -7,10 +7,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
- <div class="elForm" style="justify-content: flex-start">
- <el-form-item label="缂栫爜鍚嶇О" label-width="70px" style=" display: flex;">
+ <div class="elForm">
+ <el-form-item label="缂栫爜鍚嶇О" style=" display: flex;">
<el-input v-model="form.rightname" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鍥哄畾瀛楃" style=" display: flex;">
diff --git a/src/views/xtsz/cjgg.vue b/src/views/xtsz/cjgg.vue
index 2069087..f65e501 100644
--- a/src/views/xtsz/cjgg.vue
+++ b/src/views/xtsz/cjgg.vue
@@ -12,10 +12,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label="鎵ц杞﹂棿" label-width="70px" style=" display: flex;">
+ <el-form-item label="鎵ц杞﹂棿" style=" display: flex;">
<el-select v-model="form.wkspcode" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in wkspSelectArr"
@@ -41,7 +41,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="鍏憡绛夌骇" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="鍏憡绛夌骇" style=" display: flex;">
<el-select v-model="form.level" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in levelSelectArr"
@@ -52,7 +52,7 @@
</el-select>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/zlgl/gxjybz.vue b/src/views/zlgl/gxjybz.vue
index 9ae1533..0c42b93 100644
--- a/src/views/zlgl/gxjybz.vue
+++ b/src/views/zlgl/gxjybz.vue
@@ -12,10 +12,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="鏍囧噯浠ｇ爜" style=" display: flex;">
+ <el-form-item label="鏍囧噯浠ｇ爜" style=" display: flex;">
<el-input v-model="form.stanedcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鏍囧噯鍚嶇О" style=" display: flex;">
@@ -25,7 +25,7 @@
<el-input v-model="form.staneddescr" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/zlgl/gxjyjl.vue b/src/views/zlgl/gxjyjl.vue
index eb62663..4fb20ac 100644
--- a/src/views/zlgl/gxjyjl.vue
+++ b/src/views/zlgl/gxjyjl.vue
@@ -13,10 +13,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="宸ュ崟缂栧彿" style=" display: flex;">
+ <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
@@ -28,7 +28,7 @@
<el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
<el-input v-model="form.partapec" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="宸ュ簭鍚嶇О" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style=" display: flex;">
<el-input v-model="form.stepname" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="鏍囧噯鍚嶇О" style=" display: flex;">
@@ -55,7 +55,7 @@
</el-select>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/zlgl/gxjyxm.vue b/src/views/zlgl/gxjyxm.vue
index d1e96f0..b71f233 100644
--- a/src/views/zlgl/gxjyxm.vue
+++ b/src/views/zlgl/gxjyxm.vue
@@ -12,7 +12,7 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex"
>
<div class="elForm">
<el-form-item label-width="70px" label="椤圭洰缂栫爜" style=" display: flex;">
@@ -25,7 +25,7 @@
<el-input v-model="form.itemdescr" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/zlgl/qxdy.vue b/src/views/zlgl/qxdy.vue
index 764afcb..17af1d0 100644
--- a/src/views/zlgl/qxdy.vue
+++ b/src/views/zlgl/qxdy.vue
@@ -12,10 +12,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label="缂洪櫡浠ｇ爜" label-width="70px" style=" display: flex;">
+ <el-form-item label="缂洪櫡浠ｇ爜" style=" display: flex;">
<el-input v-model="form.defectcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="缂洪櫡鍚嶇О" style=" display: flex;">
@@ -26,7 +26,7 @@
<el-input v-model="form.defectdescr" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index a75b867..8621d3f 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -32,10 +32,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="鐗╂枡缂栫爜" style=" display: flex;">
+ <el-form-item label="鐗╂枡缂栫爜" style=" display: flex;">
<el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鐗╂枡鍚嶇О" style=" display: flex;">
@@ -78,7 +78,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="鎵�灞炰粨搴�" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="鎵�灞炰粨搴�" style=" display: flex;">
<el-select
v-model="form.storehousecode"
filterable
@@ -96,7 +96,7 @@
</el-select>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index c214e6d..e039567 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -13,10 +13,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="宸ュ簭缂栫爜" style=" display: flex;">
+ <el-form-item label="宸ュ簭缂栫爜" style=" display: flex;">
<el-input v-model="form.stepcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="宸ュ簭鍚嶇О" style=" display: flex;">
@@ -54,11 +54,11 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="鍒涘缓浜哄憳" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="form.createuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index 2082528..eb94e00 100644
--- a/src/views/zzmx/gylx.vue
+++ b/src/views/zzmx/gylx.vue
@@ -13,7 +13,7 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
<el-form-item label="宸ヨ壓璺嚎缂栫爜" style=" display: flex;">
@@ -29,7 +29,7 @@
<el-input v-model="form.createuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index d2ba5d2..b2ae70b 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -13,10 +13,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
<el-select
v-model="form.partcode"
filterable
@@ -88,7 +88,7 @@
</el-select>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
diff --git a/src/views/zzmx/wllx.vue b/src/views/zzmx/wllx.vue
index c8d4032..b8c1fb6 100644
--- a/src/views/zzmx/wllx.vue
+++ b/src/views/zzmx/wllx.vue
@@ -1,502 +1,502 @@
-<template>
- <div>
- <div class="body" :style="{height:mainHeight+'px'}">
- <div style="padding: 10px 5px 0 0">
- <el-form
- ref="form"
- :model="form"
- label-width="80px"
- inline
- style="display: flex;justify-content: space-between"
- >
- <div class="elForm">
- <el-form-item label="绫诲瀷缂栫爜" style=" display: flex;">
- <el-input v-model="form.materialtypecode" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
- <el-form-item label="绫诲瀷鍚嶇О" style=" display: flex;">
- <el-input v-model="form.materialtypename" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
- <el-form-item label="瀛樿揣绫诲瀷" style=" display: flex;">
- <el-select v-model="form.stocktypecode" filterable :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in stocktypeArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
- </div>
- <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
- <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
- <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
- </div>
- </el-form>
- </div>
- <el-divider />
- <div style="margin-left: 10px;display: flex">
- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
- </div>
- <el-divider />
- <div class="elTableDiv">
- <el-table
- ref="tableDataRef"
- class="tableFixed"
- :data="tableData"
- border
- stripe
- :height="tableHeight"
- :style="{width: 100+'%',height:tableHeight+'px',}"
- highlight-current-row
- :header-cell-style="this.$headerCellStyle"
- :cell-style="this.$cellStyle"
- @sort-change="sortChange"
- >
- <!-- <el-table-column-->
- <!-- type="selection"-->
- <!-- width="50"-->
- <!-- />-->
- <el-table-column
- prop="RowNum"
- width="50"
- label="搴忓彿"
- />
- <el-table-column
- prop="code"
- label="鐗╂枡绫诲瀷缂栫爜"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="name"
- show-tooltip-when-overflow
- label="鐗╂枡绫诲瀷鍚嶇О"
- sortable="custom"
- />
- <el-table-column
- prop="stockname"
- label="瀛樿揣绫诲瀷"
- sortable="custom"
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="lm_user"
- show-tooltip-when-overflow
- label="鍒涘缓浜哄憳"
- sortable="custom"
- />
- <el-table-column
- prop="lm_date"
- label="鍒涘缓鏃堕棿"
- sortable="custom"
- show-tooltip-when-overflow
- />
- <el-table-column
- label="鎿嶄綔"
- >
- <template slot-scope="{row}">
- <div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
- </div>
- </template>
- </el-table-column>
- </el-table>
- </div>
- <!--鍒嗛〉-->
- <pagination
- :total="total"
- :page.sync="form.page"
- :limit.sync="form.rows"
- align="right"
- layout="prev, pager, next,sizes"
- popper-class="select_bottom"
- @pagination="getMaterialTypeSearch"
- />
- </div>
+<!--<template>-->
+<!-- <div>-->
+<!-- <div class="body" :style="{height:mainHeight+'px'}">-->
+<!-- <div style="padding: 10px 5px 0 0">-->
+<!-- <el-form-->
+<!-- ref="form"-->
+<!-- :model="form"-->
+<!-- label-width="80px"-->
+<!-- inline-->
+<!-- style="display: flex;"-->
+<!-- >-->
+<!-- <div class="elForm">-->
+<!-- <el-form-item label="绫诲瀷缂栫爜" style=" display: flex;">-->
+<!-- <el-input v-model="form.materialtypecode" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="绫诲瀷鍚嶇О" style=" display: flex;">-->
+<!-- <el-input v-model="form.materialtypename" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="瀛樿揣绫诲瀷" style=" display: flex;">-->
+<!-- <el-select v-model="form.stocktypecode" filterable :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">-->
+<!-- <el-option-->
+<!-- v-for="item in stocktypeArr"-->
+<!-- :key="item.code"-->
+<!-- :label="item.name"-->
+<!-- :value="item.code"-->
+<!-- />-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- </div>-->
+<!-- <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">-->
+<!-- <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>-->
+<!-- <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>-->
+<!-- </div>-->
+<!-- </el-form>-->
+<!-- </div>-->
+<!-- <el-divider />-->
+<!-- <div style="margin-left: 10px;display: flex">-->
+<!-- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
+<!-- <!– <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>–>-->
+<!-- </div>-->
+<!-- <el-divider />-->
+<!-- <div class="elTableDiv">-->
+<!-- <el-table-->
+<!-- ref="tableDataRef"-->
+<!-- class="tableFixed"-->
+<!-- :data="tableData"-->
+<!-- border-->
+<!-- stripe-->
+<!-- :height="tableHeight"-->
+<!-- :style="{width: 100+'%',height:tableHeight+'px',}"-->
+<!-- highlight-current-row-->
+<!-- :header-cell-style="this.$headerCellStyle"-->
+<!-- :cell-style="this.$cellStyle"-->
+<!-- @sort-change="sortChange"-->
+<!-- >-->
+<!-- <!– <el-table-column–>-->
+<!-- <!– type="selection"–>-->
+<!-- <!– width="50"–>-->
+<!-- <!– />–>-->
+<!-- <el-table-column-->
+<!-- prop="RowNum"-->
+<!-- width="50"-->
+<!-- label="搴忓彿"-->
+<!-- />-->
+<!-- <el-table-column-->
+<!-- prop="code"-->
+<!-- label="鐗╂枡绫诲瀷缂栫爜"-->
+<!-- show-tooltip-when-overflow-->
+<!-- sortable="custom"-->
+<!-- />-->
+<!-- <el-table-column-->
+<!-- prop="name"-->
+<!-- show-tooltip-when-overflow-->
+<!-- label="鐗╂枡绫诲瀷鍚嶇О"-->
+<!-- sortable="custom"-->
+<!-- />-->
+<!-- <el-table-column-->
+<!-- prop="stockname"-->
+<!-- label="瀛樿揣绫诲瀷"-->
+<!-- sortable="custom"-->
+<!-- show-tooltip-when-overflow-->
+<!-- />-->
+<!-- <el-table-column-->
+<!-- prop="lm_user"-->
+<!-- show-tooltip-when-overflow-->
+<!-- label="鍒涘缓浜哄憳"-->
+<!-- sortable="custom"-->
+<!-- />-->
+<!-- <el-table-column-->
+<!-- prop="lm_date"-->
+<!-- label="鍒涘缓鏃堕棿"-->
+<!-- sortable="custom"-->
+<!-- show-tooltip-when-overflow-->
+<!-- />-->
+<!-- <el-table-column-->
+<!-- label="鎿嶄綔"-->
+<!-- >-->
+<!-- <template slot-scope="{row}">-->
+<!-- <div class="operationClass">-->
+<!-- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>-->
+<!-- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>-->
+<!-- </div>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- </el-table>-->
+<!-- </div>-->
+<!-- <!–鍒嗛〉–>-->
+<!-- <pagination-->
+<!-- :total="total"-->
+<!-- :page.sync="form.page"-->
+<!-- :limit.sync="form.rows"-->
+<!-- align="right"-->
+<!-- layout="prev, pager, next,sizes"-->
+<!-- popper-class="select_bottom"-->
+<!-- @pagination="getMaterialTypeSearch"-->
+<!-- />-->
+<!-- </div>-->
- <el-dialog
- :title="operation==='add'?'鏂板':'缂栬緫'"
- :visible.sync="dialogVisible"
- width="800px"
- top="15vh"
- :close-on-click-modal="false"
- @closed="handleClose"
- @close="handleClose"
- >
- <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
- <el-form-item label="绫诲瀷缂栫爜" prop="materialtypecode">
- <el-input v-model="dialogForm.materialtypecode" :disabled="operation!=='add'" style="width: 200px" />
- </el-form-item>
- <el-form-item label="绫诲瀷鍚嶇О" prop="materialtypename">
- <el-input v-model="dialogForm.materialtypename" style="width: 200px" />
- </el-form-item>
- <el-form-item label="瀛樿揣绫诲瀷" prop="stocktypecode">
- <el-select v-model="dialogForm.stocktypecode" filterable :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in stocktypeArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
- </el-form>
- <span slot="footer" class="dialog-footer">
- <div class="footerButton">
- <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
- </div>
- </span>
- </el-dialog>
- </div>
-</template>
+<!-- <el-dialog-->
+<!-- :title="operation==='add'?'鏂板':'缂栬緫'"-->
+<!-- :visible.sync="dialogVisible"-->
+<!-- width="800px"-->
+<!-- top="15vh"-->
+<!-- :close-on-click-modal="false"-->
+<!-- @closed="handleClose"-->
+<!-- @close="handleClose"-->
+<!-- >-->
+<!-- <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">-->
+<!-- <el-form-item label="绫诲瀷缂栫爜" prop="materialtypecode">-->
+<!-- <el-input v-model="dialogForm.materialtypecode" :disabled="operation!=='add'" style="width: 200px" />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="绫诲瀷鍚嶇О" prop="materialtypename">-->
+<!-- <el-input v-model="dialogForm.materialtypename" style="width: 200px" />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="瀛樿揣绫诲瀷" prop="stocktypecode">-->
+<!-- <el-select v-model="dialogForm.stocktypecode" filterable :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">-->
+<!-- <el-option-->
+<!-- v-for="item in stocktypeArr"-->
+<!-- :key="item.code"-->
+<!-- :label="item.name"-->
+<!-- :value="item.code"-->
+<!-- />-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- </el-form>-->
+<!-- <span slot="footer" class="dialog-footer">-->
+<!-- <div class="footerButton">-->
+<!-- <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>-->
+<!-- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
+<!-- </div>-->
+<!-- </span>-->
+<!-- </el-dialog>-->
+<!-- </div>-->
+<!--</template>-->
-<script>
-import Pagination from '@/components/Pagination'
-import { AddUpdateMaterialType, DeleteMaterialType, MaterialTypeSearch, StockTypeSelect } from '@/api/zzmx'
+<!--<script>-->
+<!--import Pagination from '@/components/Pagination'-->
+<!--import { AddUpdateMaterialType, DeleteMaterialType, MaterialTypeSearch, StockTypeSelect } from '@/api/zzmx'-->
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
-export default {
- name: 'WLLX',
- components: {
- Pagination
- },
- data() {
- const validateName = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇疯緭鍏ョ紪鐮�'))
- } else {
- if (SER_HZ.test(value)) {
- return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
- } else {
- callback()
- }
- }
- }
- return {
- mainHeight: 0,
- tableHeight: 0,
- form: {
- materialtypecode: '', // 鐗╂枡绫诲瀷缂栫爜
- materialtypename: '', // 鐗╂枡绫诲瀷鍚嶇О
- stocktypecode: '', // 瀛樿揣绫诲瀷缂栫爜
- prop: 'lm_date', // 鎺掑簭瀛楁
- order: 'desc', // 鎺掑簭瀛楁
- page: 1, // 绗嚑椤�
- rows: 10 // 姣忛〉澶氬皯鏉�
- },
- total: 10,
- stocktypeArr: [], // 瀛樿揣绫诲瀷鏁扮粍
- tableData: [],
- dialogVisible: false,
- dialogForm: {
- 'id': '',
- 'materialtypecode': '',
- 'materialtypename': '',
- 'stocktypecode': '',
- 'OperType': ''
- },
- operation: '',
- dialogFormRules: {
- materialtypecode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
- ],
- materialtypename: [
- { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
- ],
- stocktypecode: [
- { required: true, message: '璇烽�夋嫨瀛樿揣绫诲瀷', trigger: ['blur', 'change'] }
- ]
- }
+<!--const SER_HZ = /^[\u4e00-\u9fa5]+$/-->
+<!--export default {-->
+<!-- name: 'WLLX',-->
+<!-- components: {-->
+<!-- Pagination-->
+<!-- },-->
+<!-- data() {-->
+<!-- const validateName = (rule, value, callback) => {-->
+<!-- if (!value) {-->
+<!-- return callback(new Error('璇疯緭鍏ョ紪鐮�'))-->
+<!-- } else {-->
+<!-- if (SER_HZ.test(value)) {-->
+<!-- return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))-->
+<!-- } else {-->
+<!-- callback()-->
+<!-- }-->
+<!-- }-->
+<!-- }-->
+<!-- return {-->
+<!-- mainHeight: 0,-->
+<!-- tableHeight: 0,-->
+<!-- form: {-->
+<!-- materialtypecode: '', // 鐗╂枡绫诲瀷缂栫爜-->
+<!-- materialtypename: '', // 鐗╂枡绫诲瀷鍚嶇О-->
+<!-- stocktypecode: '', // 瀛樿揣绫诲瀷缂栫爜-->
+<!-- prop: 'lm_date', // 鎺掑簭瀛楁-->
+<!-- order: 'desc', // 鎺掑簭瀛楁-->
+<!-- page: 1, // 绗嚑椤�-->
+<!-- rows: 10 // 姣忛〉澶氬皯鏉�-->
+<!-- },-->
+<!-- total: 10,-->
+<!-- stocktypeArr: [], // 瀛樿揣绫诲瀷鏁扮粍-->
+<!-- tableData: [],-->
+<!-- dialogVisible: false,-->
+<!-- dialogForm: {-->
+<!-- 'id': '',-->
+<!-- 'materialtypecode': '',-->
+<!-- 'materialtypename': '',-->
+<!-- 'stocktypecode': '',-->
+<!-- 'OperType': ''-->
+<!-- },-->
+<!-- operation: '',-->
+<!-- dialogFormRules: {-->
+<!-- materialtypecode: [-->
+<!-- { required: true, validator: validateName, trigger: ['blur', 'change'] }-->
+<!-- ],-->
+<!-- materialtypename: [-->
+<!-- { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }-->
+<!-- ],-->
+<!-- stocktypecode: [-->
+<!-- { required: true, message: '璇烽�夋嫨瀛樿揣绫诲瀷', trigger: ['blur', 'change'] }-->
+<!-- ]-->
+<!-- }-->
- }
- },
- created() {
- this.getMaterialTypeSearch()
- this.getStockTypeSelect()
- },
- mounted() {
- window.addEventListener('resize', this.getHeight)
- this.getHeight()
- },
- methods: {
- async getMaterialTypeSearch() {
- const res = await MaterialTypeSearch(this.form)
- this.tableData = res.data
- this.total = res.count
- },
- async getStockTypeSelect() {
- const { data: res } = await StockTypeSelect()
- this.stocktypeArr = res
- },
- // 鎺掑簭鏀瑰彉鏃�
- sortChange({ column, prop, order }) {
- if (order === 'descending') {
- order = 'desc'
- } else if (order === 'ascending') {
- order = 'asc'
- } else {
- order = 'desc'
- }
- this.form.order = order
- this.form.prop = prop
- this.getMaterialTypeSearch()
- },
- // 鏌ヨ
- search() {
- this.getMaterialTypeSearch()
- },
- upload() {
+<!-- }-->
+<!-- },-->
+<!-- created() {-->
+<!-- this.getMaterialTypeSearch()-->
+<!-- this.getStockTypeSelect()-->
+<!-- },-->
+<!-- mounted() {-->
+<!-- window.addEventListener('resize', this.getHeight)-->
+<!-- this.getHeight()-->
+<!-- },-->
+<!-- methods: {-->
+<!-- async getMaterialTypeSearch() {-->
+<!-- const res = await MaterialTypeSearch(this.form)-->
+<!-- this.tableData = res.data-->
+<!-- this.total = res.count-->
+<!-- },-->
+<!-- async getStockTypeSelect() {-->
+<!-- const { data: res } = await StockTypeSelect()-->
+<!-- this.stocktypeArr = res-->
+<!-- },-->
+<!-- // 鎺掑簭鏀瑰彉鏃�-->
+<!-- sortChange({ column, prop, order }) {-->
+<!-- if (order === 'descending') {-->
+<!-- order = 'desc'-->
+<!-- } else if (order === 'ascending') {-->
+<!-- order = 'asc'-->
+<!-- } else {-->
+<!-- order = 'desc'-->
+<!-- }-->
+<!-- this.form.order = order-->
+<!-- this.form.prop = prop-->
+<!-- this.getMaterialTypeSearch()-->
+<!-- },-->
+<!-- // 鏌ヨ-->
+<!-- search() {-->
+<!-- this.getMaterialTypeSearch()-->
+<!-- },-->
+<!-- upload() {-->
- },
- // 閲嶇疆
- reset() {
- this.form.materialtypecode = ''
- this.form.materialtypename = ''
- this.form.stocktypecode = ''
- this.getMaterialTypeSearch()
- },
- // 鏂板鎸夐挳
- add(operation) {
- this.operation = operation
- this.dialogVisible = true
- },
- // 淇敼鎸夐挳
- edit(operation, row) {
- this.operation = operation
- this.dialogVisible = true
+<!-- },-->
+<!-- // 閲嶇疆-->
+<!-- reset() {-->
+<!-- this.form.materialtypecode = ''-->
+<!-- this.form.materialtypename = ''-->
+<!-- this.form.stocktypecode = ''-->
+<!-- this.getMaterialTypeSearch()-->
+<!-- },-->
+<!-- // 鏂板鎸夐挳-->
+<!-- add(operation) {-->
+<!-- this.operation = operation-->
+<!-- this.dialogVisible = true-->
+<!-- },-->
+<!-- // 淇敼鎸夐挳-->
+<!-- edit(operation, row) {-->
+<!-- this.operation = operation-->
+<!-- this.dialogVisible = true-->
- this.$nextTick(() => {
- this.dialogForm.id = row.id
- this.dialogForm.materialtypecode = row.code
- this.dialogForm.materialtypename = row.name
- this.dialogForm.stocktypecode = row.stockcode
- })
- },
- // 鍒犻櫎鎸夐挳
- async del(row) {
- this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- DeleteMaterialType({ materialtypecode: row.code }).then(res => {
- if (res.code === '200') {
- this.$message.success('鍒犻櫎鎴愬姛!')
- this.getMaterialTypeSearch()
- }
- })
- }).catch(() => {
- this.$message.info('宸插彇娑堝垹闄�')
- })
- },
- // 瀵硅瘽妗嗗叧闂簨浠�
- handleClose() {
- this.dialogForm.id = ''
- this.dialogForm.materialtypecode = ''
- this.dialogForm.materialtypename = ''
- this.dialogForm.stocktypecode = ''
- this.$refs.dialogForm.clearValidate()
- },
- // 瀵硅瘽妗嗗彇娑�
- dialogVisibleCancel() {
- this.dialogVisible = false
- },
- // 瀵硅瘽妗嗙‘璁�
- dialogVisibleConfirm() {
- this.$refs.dialogForm.validate(valid => {
- if (valid) {
- const data = {
- 'id': this.dialogForm.id,
- 'materialtypecode': this.dialogForm.materialtypecode,
- 'materialtypename': this.dialogForm.materialtypename,
- 'stocktypecode': this.dialogForm.stocktypecode,
- 'OperType': this.operation === 'add' ? 'Add' : 'Update'
- }
- AddUpdateMaterialType(data).then(res => {
- if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- this.dialogVisible = false
- this.getMaterialTypeSearch()
- } else {
- this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
- }
- })
- }
- })
- },
- // 鑾峰彇椤甸潰楂樺害
- getHeight() {
- this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
- this.$refs.tableDataRef.doLayout()
- })
- }
- }
-}
-</script>
+<!-- this.$nextTick(() => {-->
+<!-- this.dialogForm.id = row.id-->
+<!-- this.dialogForm.materialtypecode = row.code-->
+<!-- this.dialogForm.materialtypename = row.name-->
+<!-- this.dialogForm.stocktypecode = row.stockcode-->
+<!-- })-->
+<!-- },-->
+<!-- // 鍒犻櫎鎸夐挳-->
+<!-- async del(row) {-->
+<!-- this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {-->
+<!-- confirmButtonText: '纭畾',-->
+<!-- cancelButtonText: '鍙栨秷',-->
+<!-- type: 'warning'-->
+<!-- }).then(() => {-->
+<!-- DeleteMaterialType({ materialtypecode: row.code }).then(res => {-->
+<!-- if (res.code === '200') {-->
+<!-- this.$message.success('鍒犻櫎鎴愬姛!')-->
+<!-- this.getMaterialTypeSearch()-->
+<!-- }-->
+<!-- })-->
+<!-- }).catch(() => {-->
+<!-- this.$message.info('宸插彇娑堝垹闄�')-->
+<!-- })-->
+<!-- },-->
+<!-- // 瀵硅瘽妗嗗叧闂簨浠�-->
+<!-- handleClose() {-->
+<!-- this.dialogForm.id = ''-->
+<!-- this.dialogForm.materialtypecode = ''-->
+<!-- this.dialogForm.materialtypename = ''-->
+<!-- this.dialogForm.stocktypecode = ''-->
+<!-- this.$refs.dialogForm.clearValidate()-->
+<!-- },-->
+<!-- // 瀵硅瘽妗嗗彇娑�-->
+<!-- dialogVisibleCancel() {-->
+<!-- this.dialogVisible = false-->
+<!-- },-->
+<!-- // 瀵硅瘽妗嗙‘璁�-->
+<!-- dialogVisibleConfirm() {-->
+<!-- this.$refs.dialogForm.validate(valid => {-->
+<!-- if (valid) {-->
+<!-- const data = {-->
+<!-- 'id': this.dialogForm.id,-->
+<!-- 'materialtypecode': this.dialogForm.materialtypecode,-->
+<!-- 'materialtypename': this.dialogForm.materialtypename,-->
+<!-- 'stocktypecode': this.dialogForm.stocktypecode,-->
+<!-- 'OperType': this.operation === 'add' ? 'Add' : 'Update'-->
+<!-- }-->
+<!-- AddUpdateMaterialType(data).then(res => {-->
+<!-- if (res.code === '200') {-->
+<!-- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')-->
+<!-- this.dialogVisible = false-->
+<!-- this.getMaterialTypeSearch()-->
+<!-- } else {-->
+<!-- this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')-->
+<!-- }-->
+<!-- })-->
+<!-- }-->
+<!-- })-->
+<!-- },-->
+<!-- // 鑾峰彇椤甸潰楂樺害-->
+<!-- getHeight() {-->
+<!-- this.$nextTick(() => {-->
+<!-- this.mainHeight = window.innerHeight - 250-->
+<!-- this.tableHeight = this.mainHeight - 100-->
+<!-- this.$refs.tableDataRef.doLayout()-->
+<!-- })-->
+<!-- }-->
+<!-- }-->
+<!--}-->
+<!--</script>-->
-<style lang="scss" scoped>
-$main_color: #42b983;
-::v-deep .el-button--primary {
- background-color: $main_color !important;
- height: 30px;
- display: flex;
- align-items: center;
- //border: 1px solid $main_color;
- border: none;
- padding: 0 20px;
-}
-::v-deep .el-button--primary:hover {
- border: none;
-}
+<!--<style lang="scss" scoped>-->
+<!--$main_color: #42b983;-->
+<!--::v-deep .el-button--primary {-->
+<!-- background-color: $main_color !important;-->
+<!-- height: 30px;-->
+<!-- display: flex;-->
+<!-- align-items: center;-->
+<!-- //border: 1px solid $main_color;-->
+<!-- border: none;-->
+<!-- padding: 0 20px;-->
+<!--}-->
+<!--::v-deep .el-button--primary:hover {-->
+<!-- border: none;-->
+<!--}-->
-::v-deep .el-button--info {
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
+<!--::v-deep .el-button--info {-->
+<!-- height: 30px;-->
+<!-- display: flex;-->
+<!-- align-items: center;-->
+<!-- padding: 0 20px;-->
+<!--}-->
-::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
- background-color: $main_color !important;
-}
+<!--::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {-->
+<!-- background-color: $main_color !important;-->
+<!--}-->
-::v-deep .el-dialog__footer {
- display: flex;
- justify-content: flex-end;
-}
+<!--::v-deep .el-dialog__footer {-->
+<!-- display: flex;-->
+<!-- justify-content: flex-end;-->
+<!--}-->
-.footerButton {
- display: flex;
- justify-content: end;
-}
+<!--.footerButton {-->
+<!-- display: flex;-->
+<!-- justify-content: end;-->
+<!--}-->
-::v-deep .el-button--default {
- background-color: #ffffff !important;
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
+<!--::v-deep .el-button--default {-->
+<!-- background-color: #ffffff !important;-->
+<!-- height: 30px;-->
+<!-- display: flex;-->
+<!-- align-items: center;-->
+<!-- padding: 0 20px;-->
+<!--}-->
-::v-deep .el-button--default:hover {
- color: #606266;
-}
+<!--::v-deep .el-button--default:hover {-->
+<!-- color: #606266;-->
+<!--}-->
-::v-deep .el-dialog__body {
- padding: 20px 100px !important;
-}
+<!--::v-deep .el-dialog__body {-->
+<!-- padding: 20px 100px !important;-->
+<!--}-->
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- background-color: $main_color;
- border-color: $main_color;
-}
+<!--::v-deep .el-radio__input.is-checked .el-radio__inner {-->
+<!-- background-color: $main_color;-->
+<!-- border-color: $main_color;-->
+<!--}-->
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color !important;
-}
+<!--::v-deep .el-radio__input.is-checked + .el-radio__label {-->
+<!-- color: $main_color !important;-->
+<!--}-->
-::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
- border-color: $main_color;
- background-color: $main_color;
-}
+<!--::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {-->
+<!-- border-color: $main_color;-->
+<!-- background-color: $main_color;-->
+<!--}-->
-::v-deep .el-input__inner {
- height: 30px;
- line-height: 30px;
-}
+<!--::v-deep .el-input__inner {-->
+<!-- height: 30px;-->
+<!-- line-height: 30px;-->
+<!--}-->
-::v-deep .el-table .caret-wrapper {
- transform: scale(0.8);
-}
+<!--::v-deep .el-table .caret-wrapper {-->
+<!-- transform: scale(0.8);-->
+<!--}-->
-::v-deep .cell {
- display: flex !important;
- align-items: center !important;
- justify-content: space-between !important;
-}
+<!--::v-deep .cell {-->
+<!-- display: flex !important;-->
+<!-- align-items: center !important;-->
+<!-- justify-content: space-between !important;-->
+<!--}-->
-::v-deep .el-button--text {
- color: $main_color;
- font-size: 14px;
- cursor: pointer;
-}
+<!--::v-deep .el-button--text {-->
+<!-- color: $main_color;-->
+<!-- font-size: 14px;-->
+<!-- cursor: pointer;-->
+<!--}-->
-.operationClass {
- height: 23px;
- display: flex;
- justify-content: space-between;
- align-items: center;
-}
+<!--.operationClass {-->
+<!-- height: 23px;-->
+<!-- display: flex;-->
+<!-- justify-content: space-between;-->
+<!-- align-items: center;-->
+<!--}-->
-.el-icon-share {
- color: $main_color;
- cursor: pointer;
-}
+<!--.el-icon-share {-->
+<!-- color: $main_color;-->
+<!-- cursor: pointer;-->
+<!--}-->
-.el-checkbox.is-bordered.is-checked {
- border-color: $main_color;
-}
+<!--.el-checkbox.is-bordered.is-checked {-->
+<!-- border-color: $main_color;-->
+<!--}-->
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- border-color: $main_color;
- background: $main_color;
-}
+<!--::v-deep .el-radio__input.is-checked .el-radio__inner {-->
+<!-- border-color: $main_color;-->
+<!-- background: $main_color;-->
+<!--}-->
-::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
- border-color: $main_color;
- background: $main_color;
-}
+<!--::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {-->
+<!-- border-color: $main_color;-->
+<!-- background: $main_color;-->
+<!--}-->
-::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
- color: $main_color !important;
-}
+<!--::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {-->
+<!-- color: $main_color !important;-->
+<!--}-->
-::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
- margin: 10px 30px 0px 0;
-}
+<!--::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {-->
+<!-- margin: 10px 30px 0px 0;-->
+<!--}-->
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color;
-}
+<!--::v-deep .el-radio__input.is-checked + .el-radio__label {-->
+<!-- color: $main_color;-->
+<!--}-->
-::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
- margin: 10px 30px 0px 0;
-}
+<!--::v-deep .el-radio.is-bordered + .el-radio.is-bordered {-->
+<!-- margin: 10px 30px 0px 0;-->
+<!--}-->
-.body ::v-deep .el-divider {
- border: 1px solid #eee;
- width: 99%;
- margin: 10px auto;
-}
+<!--.body ::v-deep .el-divider {-->
+<!-- border: 1px solid #eee;-->
+<!-- width: 99%;-->
+<!-- margin: 10px auto;-->
+<!--}-->
-.body ::v-deep .el-form-item {
- margin-bottom: 0;
-}
+<!--.body ::v-deep .el-form-item {-->
+<!-- margin-bottom: 0;-->
+<!--}-->
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
-}
-::v-deep .el-textarea__inner:focus{
- border-color: $main_color;
-}
-::v-deep .el-select .el-input__inner:focus{
- border-color: $main_color;
-}
+<!--::v-deep .el-input__inner:focus {-->
+<!-- border-color: $main_color;-->
+<!--}-->
+<!--::v-deep .el-textarea__inner:focus{-->
+<!-- border-color: $main_color;-->
+<!--}-->
+<!--::v-deep .el-select .el-input__inner:focus{-->
+<!-- border-color: $main_color;-->
+<!--}-->
-::v-deep .el-select-dropdown__item.selected{
- color: $main_color;
-}
-.tableFixed{
- ::v-deep .el-table__fixed-right{
- height: 100% !important;
- }
- ::v-deep .el-table__fixed{
- height: 100% !important;
- }
-}
-</style>
+<!--::v-deep .el-select-dropdown__item.selected{-->
+<!-- color: $main_color;-->
+<!--}-->
+<!--.tableFixed{-->
+<!-- ::v-deep .el-table__fixed-right{-->
+<!-- height: 100% !important;-->
+<!-- }-->
+<!-- ::v-deep .el-table__fixed{-->
+<!-- height: 100% !important;-->
+<!-- }-->
+<!--}-->
+<!--</style>-->
diff --git a/src/views/zzmx/wlqd.vue b/src/views/zzmx/wlqd.vue
index e954931..3426ea8 100644
--- a/src/views/zzmx/wlqd.vue
+++ b/src/views/zzmx/wlqd.vue
@@ -12,10 +12,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label="姣嶄欢缂栫爜" label-width="70px" style=" display: flex;">
+ <el-form-item label="姣嶄欢缂栫爜" style=" display: flex;">
<el-input v-model="form.parentpartcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="姣嶄欢鍚嶇О" style=" display: flex;">
@@ -34,7 +34,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="鐗堟湰缂栧彿" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="鐗堟湰缂栧彿" style=" display: flex;">
<el-input v-model="form.version" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
@@ -64,7 +64,7 @@
</el-select>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
--
Gitblit v1.9.3