From b46bc2dba51a3885a68e4c58316b41a31ea16bb2 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 14 二月 2023 13:35:03 +0800
Subject: [PATCH] 1.存货档案修改
---
src/views/sbgl/sbqd.vue | 241 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 173 insertions(+), 68 deletions(-)
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 5788568..26ed24b 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -3,24 +3,26 @@
<div class="body" :style="{height:mainHeight+'px'}">
<div class="bodyTopButtonGroup" style="justify-content: space-between">
- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<div style="display: flex">
- <el-button icon="el-icon-c-scale-to-original" @click="deviceTypeButton">璁惧绫诲瀷</el-button>
- <el-button icon="el-icon-document-copy" @click="deviceGroupButton">璁惧缁�</el-button>
+ <el-button v-waves icon="el-icon-c-scale-to-original" @click="deviceTypeButton">璁惧绫诲瀷</el-button>
+ <el-button v-waves icon="el-icon-document-copy" @click="deviceGroupButton">璁惧缁�</el-button>
+ <el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+
</div>
- <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
+ <!-- <el-button v-waves type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<div class="bodyTopFormGroup">
<el-form
ref="form"
:model="form"
- label-width="80px"
+ label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
- <div class="elForm">
+ <div class="elForm" style="justify-content: flex-start">
<el-form-item label="璁惧缂栫爜" style=" display: flex;">
<el-input v-model="form.DeviceCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
@@ -60,14 +62,13 @@
/>
</el-select>
</el-form-item>
- <el-form-item 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"
style="width: 200px"
filterable
placeholder="璇烽�夋嫨"
-
@change="deviceTypeChange"
>
<!-- @focus="getDeviceTypeSelect"-->
@@ -79,7 +80,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="璁惧缁�" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="璁惧缁�" style=" display: flex;">
<el-select
v-model="form.DeviceGroup"
filterable
@@ -97,21 +98,43 @@
</el-select>
</el-form-item>
</div>
- <div style="display: flex;align-items: start;margin-top: 5px;">
- <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
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
+ <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
</el-form>
+ <div
+ class="bodyTopFormExpand"
+ >
+ <svg-icon
+ v-show="mouseHoverType==='mouseout'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+ @mouseenter="mouseHoverType=$event.type"
+ />
+ <svg-icon
+ v-show="mouseHoverType==='mouseenter'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+ @click="isExpandForm=!isExpandForm"
+ @mouseout="mouseHoverType=$event.type"
+ />
+ </div>
</div>
- <div class="elTableDiv">
+ <div class="elTableDiv" style="margin-top: 0;">
<el-table
+ ref="tableDataRef"
:data="tableData"
border
- :height="tableHeight+'px'"
+ class="tableFixed"
+ :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
highlight-current-row
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:(tableHeight-50)+'px'}"
+ :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChange"
@@ -131,22 +154,26 @@
label="璁惧缂栫爜"
min-width="110"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="name"
label="璁惧鍚嶇О"
min-width="110"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="eqptype_name"
label="璁惧绫诲瀷"
min-width="110"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="eqpgroup_name"
label="璁惧缁�"
+ show-tooltip-when-overflow
min-width="110"
sortable="custom"
/>
@@ -154,16 +181,24 @@
prop="enable"
label="浣跨敤鐘舵��"
sortable="custom"
+ show-tooltip-when-overflow
width="120"
>
<template slot-scope="{row}">
- <div v-if="row.enable==='Y'"><svg-icon icon-class="circleYes" style="margin-right: 2px" />鏄�</div>
- <div v-if="row.enable==='N'"><svg-icon icon-class="circleNo" style="margin-right: 2px" />鍚�</div>
+ <div v-if="row.enable==='Y'">
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ 鏄�
+ </div>
+ <div v-if="row.enable==='N'">
+ <i class="el-icon-info" style="margin-right: 2px" />
+ 鍚�
+ </div>
</template>
</el-table-column>
<el-table-column
prop="input_date"
label="鎶曞叆鏃ユ湡"
+ show-tooltip-when-overflow
sortable="custom"
width="120"
>
@@ -175,6 +210,7 @@
prop="wksp_name"
label="鐢熶骇杞﹂棿"
sortable="custom"
+ show-tooltip-when-overflow
min-width="120"
/>
<!-- <el-table-column-->
@@ -185,6 +221,7 @@
<el-table-column
prop="operation_ration"
label="绋煎姩鐜�"
+ show-tooltip-when-overflow
sortable="custom"
width="100"
>
@@ -198,11 +235,13 @@
label="鍒涘缓浜哄憳"
sortable="custom"
width="120"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="lm_date"
width="160"
label="鍒涘缓鏃堕棿"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
@@ -213,10 +252,10 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
- <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-edit-outline" @click="edit('edit',row)" />
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" @click="del(row)" />
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
</el-tooltip>
</div>
</template>
@@ -236,6 +275,7 @@
</div>
<!--璁惧娓呭崟鏂板缂栬緫-->
<el-dialog
+ v-el-drag-dialog
:close-on-click-modal="false"
:title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
@@ -354,14 +394,21 @@
</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>
+ <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button
+ v-waves
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="dialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
<!--璁惧绫诲瀷-->
<el-dialog
+ v-el-drag-dialog
title="璁惧绫诲瀷"
:visible.sync="DeviceTypeDialogVisible"
width="800px"
@@ -371,8 +418,8 @@
@close="handleCloseDeviceType"
>
<div style="margin-bottom: 20px;display: flex">
- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addDeviceType">鏂板</el-button>
- <!-- <el-button type="primary" icon="el-icon-delete" @click="delSetting">鍒犻櫎</el-button>-->
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="addDeviceType">鏂板</el-button>
+ <!-- <el-button v-waves type="primary" icon="el-icon-delete" @click="delSetting">鍒犻櫎</el-button>-->
</div>
<el-table
ref="DeviceTypeArray"
@@ -393,16 +440,23 @@
/>
<el-table-column
prop="code"
+ show-tooltip-when-overflow
label="绫诲瀷缂栫爜"
sortable="custom"
>
<template slot-scope="{row}">
- <el-input v-if="row.isVisible===1" v-model="row.code" placeholder="璇疯緭鍏�" />
+ <el-input
+ v-if="row.isVisible===1"
+ v-model="row.code"
+ oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')"
+ placeholder="璇疯緭鍏�"
+ />
<div v-else> {{ row.code }}</div>
</template>
</el-table-column>
<el-table-column
prop="name"
+ show-tooltip-when-overflow
label="绫诲瀷鍚嶇О"
sortable="custom"
>
@@ -415,6 +469,7 @@
prop="remark"
label="绫诲瀷鎻忚堪"
sortable="custom"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<el-input v-if="row.isVisible===1" v-model="row.remark" placeholder="璇疯緭鍏�" />
@@ -424,9 +479,9 @@
<el-table-column label="鎿嶄綔">
<template slot-scope="{row}">
<div class="operationClass">
- <el-button v-if="row.isVisible===0" type="text" @click="DeviceTypeDel(row)">鍒犻櫎</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="DeviceTypeSave(row)">淇濆瓨</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="DeviceTypeCancel(row)">鍙栨秷</el-button>
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="DeviceTypeDel(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="DeviceTypeSave(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="DeviceTypeCancel(row)">鍙栨秷</el-button>
</div>
</template>
</el-table-column>
@@ -444,14 +499,15 @@
/>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="DeviceTypeDialogVisibleCancel">杩斿洖</el-button>
- <!-- <el-button type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
+ <el-button v-waves @click="DeviceTypeDialogVisibleCancel">杩斿洖</el-button>
+ <!-- <el-button v-waves type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
</div>
</span>
</el-dialog>
<!--璁惧缁�-->
<el-dialog
+ v-el-drag-dialog
title="璁惧缁�"
:visible.sync="DeviceGroupDialogVisible"
width="800px"
@@ -462,7 +518,7 @@
@close="handleCloseDeviceGroup"
>
<div style="margin-bottom: 20px;display: flex">
- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addDeviceGroup">鏂板</el-button>
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="addDeviceGroup">鏂板</el-button>
</div>
<el-table
ref="DeviceGroupArray"
@@ -485,14 +541,21 @@
prop="code"
label="鍒嗙粍缂栫爜"
sortable="custom"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
- <el-input v-if="row.isVisible===1" v-model="row.code" placeholder="璇疯緭鍏�" />
+ <el-input
+ v-if="row.isVisible===1"
+ v-model="row.code"
+ oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')"
+ placeholder="璇疯緭鍏�"
+ />
<div v-else> {{ row.code }}</div>
</template>
</el-table-column>
<el-table-column
prop="name"
+ show-tooltip-when-overflow
label="鍒嗙粍鍚嶇О"
sortable="custom"
>
@@ -505,6 +568,7 @@
prop="eqptype_name"
label="鎵�灞炶澶囩被鍨�"
sortable="custom"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<el-select
@@ -526,6 +590,7 @@
</el-table-column>
<el-table-column
prop="remark"
+ show-tooltip-when-overflow
label="鍒嗙粍鎻忚堪"
sortable="custom"
>
@@ -537,9 +602,9 @@
<el-table-column label="鎿嶄綔">
<template slot-scope="{row}">
<div class="operationClass">
- <el-button v-if="row.isVisible===0" type="text" @click="DeviceGroupDel(row)">鍒犻櫎</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="DeviceGroupSave(row)">淇濆瓨</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="DeviceGroupCancel(row)">鍙栨秷</el-button>
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="DeviceGroupDel(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="DeviceGroupSave(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="DeviceGroupCancel(row)">鍙栨秷</el-button>
</div>
</template>
</el-table-column>
@@ -557,13 +622,21 @@
/>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="DeviceGroupDialogVisibleCancel">杩斿洖</el-button>
- <!-- <el-button type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
+ <el-button v-waves @click="DeviceGroupDialogVisibleCancel">杩斿洖</el-button>
+ <!-- <el-button v-waves type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
</div>
</span>
</el-dialog>
<!--瀵煎叆-->
+ <import-picker
+ ref="importPickerFunc"
+ class="importPickerClass"
+ :shows.sync="shows"
+ :title="title_value"
+ :colos="colos"
+ :code="code"
+ />
</div>
</template>
@@ -580,27 +653,21 @@
DeviceTypeSelectGroup,
WorkShopSelect, WorkShopSelectLine
} from '@/api/sbgl'
-import { handleDatetime } from '@/utils/global'
+import { handleDatetime, validateCode } from '@/utils/global'
+import ImportPicker from '@/components/ImportPicker'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
name: 'SBQD',
components: {
- Pagination
+ Pagination, ImportPicker
},
+ directives: { elDragDialog, waves },
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 {
+ mouseHoverType: 'mouseout',
+ isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -642,7 +709,7 @@
operation: '',
dialogFormRules: {
devicecode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
devicename: [
{ required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
@@ -683,7 +750,18 @@
prop: 'code',
order: 'desc'
},
- DeviceGroupTotal: 0
+ DeviceGroupTotal: 0,
+
+ title_value: '鏁版嵁瀵煎叆 / 璁惧娓呭崟',
+ code: '9',
+ shows: false
+ }
+ },
+ watch: {
+ shows() {
+ if (!this.shows) {
+ this.getDeviceMangerSearch()
+ }
}
},
created() {
@@ -694,6 +772,14 @@
this.getHeight()
},
methods: {
+ // 璁惧娓呭崟瀵煎叆
+ upload() {
+ this.shows = true
+ this.$refs.importPickerFunc.newDataFunc()
+ },
+ colos() {
+ this.shows = false
+ },
handleRequest() {
// 鑾峰彇璁惧娓呭崟鍒楄〃
this.getDeviceMangerSearch().then(res => {
@@ -746,11 +832,6 @@
search() {
this.getDeviceMangerSearch()
},
- // 瀵煎叆
- upload() {
-
- },
-
// 閲嶇疆
reset() {
this.form.DeviceCode = ''
@@ -840,6 +921,7 @@
dialogVisibleConfirm() {
this.$refs.dialogForm.validate(valid => {
if (valid) {
+ this.$store.state.app.buttonIsDisabled = true
const data = {
id: this.dialogForm.id,
devicecode: this.dialogForm.devicecode,
@@ -856,9 +938,10 @@
}
AddUpdateDeviceManger(data).then(res => {
if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.getDeviceMangerSearch()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
}
@@ -870,7 +953,8 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 240
+ this.tableHeight = this.mainHeight - 245
+ this.$refs.tableDataRef.doLayout()
// if (window.innerHeight < 769) {
// this.tableHeight = this.tableHeight - 50
// }
@@ -918,6 +1002,10 @@
},
// 鏂板鎸夐挳
addDeviceType() {
+ if (this.DeviceTypeArray.find(i => i.isVisible === 1)) {
+ return this.$message.info('璇峰厛淇濆瓨涓婁竴鏉¤褰曪紒')
+ }
+
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
this.DeviceTypeArray.unshift({ code: '', name: '', group: '', remark: '', isVisible: 1, number: number })
@@ -1001,6 +1089,9 @@
},
// 鏂板
addDeviceGroup() {
+ if (this.DeviceGroupArray.find(i => i.isVisible === 1)) {
+ return this.$message.info('璇峰厛淇濆瓨涓婁竴鏉¤褰曪紒')
+ }
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
this.DeviceGroupArray.unshift({
@@ -1108,15 +1199,17 @@
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
-::v-deep .el-button--text{
- font-size: 14px ;
- cursor: pointer ;
+::v-deep .el-button--text {
+ font-size: 14px;
+ cursor: pointer;
}
-.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;
}
@@ -1177,8 +1270,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 {
@@ -1194,14 +1287,26 @@
.body ::v-deep .el-form-item {
margin-bottom: 0;
}
+
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
-::v-deep .el-select__caret{
+
+::v-deep .el-select__caret {
display: flex;
justify-content: center;
align-items: center;
}
+
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
+ height: 100% !important;
+ }
+
+ ::v-deep .el-table__fixed {
+ height: 100% !important;
+ }
+}
</style>
<style>
--
Gitblit v1.9.3