From f3335e01ea71614db9fa6aedf1d35e1202c3b12f Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 11 八月 2022 15:46:26 +0800
Subject: [PATCH] 修改登陆时传PC参数
---
src/views/wlgl/kwdy.vue | 249 ++++++++++++++++++++++---------------------------
1 files changed, 113 insertions(+), 136 deletions(-)
diff --git a/src/views/wlgl/kwdy.vue b/src/views/wlgl/kwdy.vue
index f2ec60d..e9a6a98 100644
--- a/src/views/wlgl/kwdy.vue
+++ b/src/views/wlgl/kwdy.vue
@@ -1,7 +1,13 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div style="padding: 10px 5px 0 0">
+
+ <div class="bodyTopButtonGroup">
+ <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>
+
+ <div class="bodyTopFormGroup">
<el-form
ref="form"
:model="form"
@@ -23,7 +29,13 @@
<el-input v-model="form.createuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item label="鎵�灞炰粨搴�" style=" display: flex;">
- <el-select v-model="form.stockcode" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="form.stockcode"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <!-- @focus="getWareHouseSelect"-->
<el-option
v-for="item in stockArr"
:key="item.code"
@@ -39,17 +51,13 @@
</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
:data="tableData"
border
- :height="tableHeight"
+ :row-class-name="tableRowClassName"
+ :height="tableHeight+'px'"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
@@ -64,6 +72,7 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="code"
@@ -94,14 +103,21 @@
prop="lm_date"
label="鍒涘缓鏃堕棿"
sortable="custom"
+ width="160"
/>
<el-table-column
label="鎿嶄綔"
+ width="120"
+ fixed="right"
>
<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>
+ <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ </el-tooltip>
+ <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
+ <i class="el-icon-delete" @click="del(row)" />
+ </el-tooltip>
</div>
</template>
</el-table-column>
@@ -114,34 +130,37 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getStorageDefSearch"
/>
</div>
<el-dialog
- :title="operation==='add'?'鏂板':'淇敼'"
+ :title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="50%"
+ width="800px"
+ :close-on-click-modal="false"
top="15vh"
@closed="handleClose"
@close="handleClose"
>
<el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
<el-form-item label="搴撲綅缂栫爜" prop="storagecode">
- <el-input v-model="dialogForm.storagecode" :disabled="operation!=='add'" style="width: 220px" />
+ <el-input v-model="dialogForm.storagecode" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
<el-form-item label="搴撲綅鍚嶇О" prop="storagename">
- <el-input v-model="dialogForm.storagename" style="width: 220px" />
+ <el-input v-model="dialogForm.storagename" style="width: 200px" />
</el-form-item>
<el-form-item label="鎵�灞炲簱浣�" prop="stockcode">
<el-select
v-model="dialogForm.stockcode"
+ filterable
:popper-append-to-body="false"
- style="width: 220px"
+ style="width: 200px"
placeholder="璇烽�夋嫨"
>
+ <!-- @focus="getWareHouseSelect2"-->
<el-option
v-for="item in stockArr"
:key="item.code"
@@ -151,7 +170,7 @@
</el-select>
</el-form-item>
<el-form-item label="搴撲綅鎻忚堪">
- <el-input v-model="dialogForm.description" type="textarea" style="width: 220px" />
+ <el-input v-model="dialogForm.description" type="textarea" style="width: 200px" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -161,16 +180,17 @@
</div>
</span>
</el-dialog>
+
</div>
</template>
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateStorageDef, DeleteStorageDef, StorageDefSearch, WareHouseDefSearch, WareHouseSelect } from '@/api/wlgl'
+import { AddUpdateStorageDef, DeleteStorageDef, StorageDefSearch, WareHouseSelect } from '@/api/wlgl'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'KWDY',
components: {
Pagination
},
@@ -202,6 +222,7 @@
},
total: 10,
stockArr: [], // 鎵�灞炰粨搴撴暟缁�
+ // stockArr2: [], // 鎵�灞炰粨搴撴暟缁勫璇濇
tableData: [],
dialogVisible: false,
dialogForm: {
@@ -228,23 +249,36 @@
}
},
created() {
- this.getStorageDefSearch()
- this.getWareHouseSelect()
+ this.handleRequest()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ handleRequest() {
+ this.getStorageDefSearch().then(res => {
+ if (res.code === '200') {
+ this.getWareHouseSelect()
+ }
+ })
+ },
+
async getStorageDefSearch() {
const res = await StorageDefSearch(this.form)
this.tableData = res.data
this.total = res.count
+ return { code: res.code }
},
async getWareHouseSelect() {
const { data: res } = await WareHouseSelect()
this.stockArr = res
},
+ // 瀵硅瘽妗嗕腑鐨�
+ // async getWareHouseSelect2() {
+ // const { data: res } = await WareHouseSelect()
+ // this.stockArr2 = res
+ // },
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
if (order === 'descending') {
@@ -261,9 +295,6 @@
// 鏌ヨ
search() {
this.getStorageDefSearch()
- },
- upload() {
-
},
// 閲嶇疆
reset() {
@@ -348,39 +379,64 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 200
+ if (window.innerHeight < 769) {
+ this.tableHeight = this.tableHeight - 50
+ }
})
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
}
+
}
}
</script>
+<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
+.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+ color: $main_color;
+ cursor: pointer;
+}
+.el-icon-edit-outline{
+ margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+ height: 34px;
+ display: flex;
+ align-items: center;
+ padding: 0 15px;
+}
+
::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;
+ //background-color: $main_color !important;
}
-::v-deep .el-button--primary:hover {
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
border: none;
}
-::v-deep .el-button--info {
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
}
-::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
- background-color: $main_color !important;
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+ padding: 20px 20px !important;
}
::v-deep .el-dialog__footer {
@@ -388,102 +444,30 @@
justify-content: flex-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:hover {
- color: #606266;
-}
-
-::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__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-input__inner {
- height: 30px;
- line-height: 30px;
-}
-
::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 .el-button--text {
- color: $main_color;
- font-size: 14px;
- cursor: pointer;
-}
-
-.operationClass {
- height: 23px;
display: flex;
- justify-content: space-between;
align-items: center;
+ justify-content: space-between;
}
-.el-icon-share {
- color: $main_color;
- cursor: pointer;
+::v-deep .el-table::before {
+ height: 0;
}
-.el-checkbox.is-bordered.is-checked {
- border-color: $main_color;
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
}
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- border-color: $main_color;
- background: $main_color;
+::v-deep .el-table__body .el-table__row.hover-row td{
+ background-color: #eaecef ;
}
-::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.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.is-bordered + .el-radio.is-bordered {
- margin: 10px 30px 0px 0;
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
}
.body ::v-deep .el-divider {
@@ -495,21 +479,14 @@
.body ::v-deep .el-form-item {
margin-bottom: 0;
}
-
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
}
-::v-deep .el-textarea__inner:focus {
- border-color: $main_color;
-}
+</style>
+<style>
-::v-deep .el-select .el-input__inner:focus {
- border-color: $main_color;
+.el-table .custom-row {
+ background: #f8f8fa;
}
-
-::v-deep .el-select-dropdown__item.selected {
- color: $main_color;
-}
-
</style>
--
Gitblit v1.9.3