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/djbz.vue | 278 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 185 insertions(+), 93 deletions(-)
diff --git a/src/views/sbgl/djbz.vue b/src/views/sbgl/djbz.vue
index 603b3ee..1112151 100644
--- a/src/views/sbgl/djbz.vue
+++ b/src/views/sbgl/djbz.vue
@@ -2,17 +2,17 @@
<div>
<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 icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <el-button v-waves icon="el-icon-download" @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">
<el-form-item label="鏍囧噯缂栫爜" style=" display: flex;">
@@ -32,18 +32,27 @@
</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
+ 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"
+ />
</div>
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
:data="tableData"
:height="tableHeight+'px'"
border
+ class="tableFixed"
:row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
@@ -64,11 +73,13 @@
<el-table-column
prop="code"
label="鏍囧噯缂栫爜"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="name"
label="鏍囧噯鍚嶇О"
+ show-tooltip-when-overflow
sortable="custom"
/>
@@ -87,14 +98,15 @@
prop="iscontr"
label="鐐规绠℃帶"
sortable="custom"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.iscontr==='Y'">
- <svg-icon icon-class="circleYes" style="margin-right: 2px" />
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
鏄�
</div>
<div v-if="row.iscontr==='N'">
- <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+ <i class="el-icon-info" style="margin-right: 2px" />
鍚�
</div>
</template>
@@ -102,10 +114,16 @@
<el-table-column
prop="is_checkeqp"
label="鍏宠仈璁惧"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
- <i v-if="row.is_checkeqp==='Y'" class="el-icon-share" @click="checkeqpClick(row)" />
+ <i
+ v-if="row.is_checkeqp==='Y'"
+ :style="{color:$store.state.settings.theme}"
+ class="el-icon-share"
+ @click="checkeqpClick(row)"
+ />
<i
v-if="row.is_checkeqp==='N'"
class="el-icon-share"
@@ -118,12 +136,14 @@
prop="lm_user"
label="鍒涘缓浜哄憳"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
width="160"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
label="鎿嶄綔"
@@ -133,10 +153,14 @@
<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>
@@ -149,13 +173,14 @@
: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="getDeviceCheckStandArdSearch"
/>
</div>
<el-dialog
+ v-el-drag-dialog
:title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
width="800px"
@@ -165,7 +190,7 @@
>
<!-- @close="handleClose"-->
<div>
- <i class="el-icon-s-operation" style="color:#42b983;margin: -20px 10px 20px 0" />璁惧鐐规鏍囧噯淇℃伅锛�
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin: -20px 10px 20px 0" />璁惧鐐规鏍囧噯淇℃伅锛�
</div>
<div style="margin: 0 30px;">
<el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
@@ -196,10 +221,10 @@
</el-form>
</div>
<div>
- <i class="el-icon-s-operation" style="color:#42b983;margin: -20px 10px 20px 0" />璁惧鍏宠仈鐐规椤逛俊鎭細
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin: -20px 10px 20px 0" />璁惧鍏宠仈鐐规椤逛俊鎭細
</div>
<div style="margin-bottom:10px">
- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addRow">鏂板</el-button>
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="addRow">鏂板</el-button>
</div>
<div class="elTableDiv">
<el-table
@@ -221,6 +246,7 @@
<el-table-column
prop="checkitem_code"
label="鐐规閮ㄤ綅缂栫爜"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.isVisible===0">{{ row.checkitem_code }}</div>
@@ -242,6 +268,7 @@
<el-table-column
prop="checkitem_name"
label="鐐规閮ㄤ綅鍚嶇О"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.isVisible===0">{{ row.checkitem_name }}</div>
@@ -264,6 +291,7 @@
<el-table-column
prop="checkitem_descr"
label="鐐规瑕佹眰"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.isVisible===0">{{ row.checkitem_descr }}</div>
@@ -273,6 +301,7 @@
<el-table-column
prop="isscan"
label="閫夋嫨鎵爜"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.isVisible===0">{{ row.isscan === 'Y' ? '鏄�' : '鍚�' }}</div>
@@ -293,6 +322,7 @@
<el-table-column
prop="cycle"
label="鐐规鍛ㄦ湡"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.isVisible===0">{{ row.cycle === 'D' ? '鏃�' : '' }}</div>
@@ -317,11 +347,11 @@
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button v-if="row.isVisible===0" type="text" @click="editRow(row)">缂栬緫</el-button>
- <el-button v-if="row.isVisible===0" type="text" @click="delRow(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="editRow(row)">缂栬緫</el-button>
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="delRow(row)">鍒犻櫎</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="saveRow(row)">纭</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="cancelRow(row)">鍙栨秷</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="saveRow(row)">纭</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="cancelRow(row)">鍙栨秷</el-button>
</div>
</template>
</el-table-column>
@@ -329,14 +359,21 @@
</div>
<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="dialogVisibleEqp"
width="800px"
@@ -349,39 +386,52 @@
<!-- @opened="handleOpenedRoles"-->
<div>
- <i class="el-icon-s-comment" style="color:#42b983;" /> 鏍囧噯鍚嶇О锛歿{ dialogFormEqp.name }}
+ <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" /> 鏍囧噯鍚嶇О锛歿{ dialogFormEqp.name }}
</div>
<el-divider />
<div>
<div style="margin-bottom:20px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 璁惧鎵�灞炶溅闂撮泦鍚堬細
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 璁惧鎵�灞炶溅闂撮泦鍚堬細
</div>
<div class="myCheckboxGroup">
<div
v-for="item in dialogFormEqp.eqpArr"
:key="item.code"
- :style="{border:item.isSelected1?'1px solid #42b983':'1px solid #eee'}"
+ :style="{border:item.isSelected1?'1px solid '+$store.state.settings.theme:'1px solid #eee'}"
class="myCheckbox"
@click="myCheckboxClick(item)"
>
- <input
- class="myCheckboxInput"
- type="checkbox"
- :value="item.code"
- :name="item.name"
- :style="{color:item.isSelected2?'#42b983':'#fff'}"
- @click="myCheckboxInputClick(item)"
- >{{ item.name }}
+ <!-- <input-->
+ <!-- class="myCheckboxInput"-->
+ <!-- type="checkbox"-->
+ <!-- :value="item.code"-->
+ <!-- :name="item.name"-->
+ <!-- :style="{color:item.isSelected2?'#42b983':'#fff'}"-->
+ <!-- @click="myCheckboxInputClick(item)"-->
+ <!-- >{{ item.name }}-->
<!-- 鐖跺瓙鐐瑰嚮浜嬩欢涓嶅奖鍝�-->
<!-- onClick="event.cancelBubble = true"-->
+
+ <el-checkbox
+ :key="item.code"
+ v-model="item.isSelected2"
+ class="myCheckboxInput"
+ :value="item.code"
+ :name="item.name"
+ :checked="item.isSelected2"
+ :label="item.name"
+ @change="myCheckboxInputClick(item)"
+ />
+ <div class="myCheckboxInputLabel">{{ item.name }}</div>
+
</div>
</div>
</div>
<el-divider />
<div>
<div style="margin-bottom:20px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 璁惧淇℃伅锛�
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 璁惧淇℃伅锛�
</div>
<el-tree
ref="epqTree"
@@ -398,8 +448,14 @@
</div>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="eqpDialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="eqpDialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button v-waves @click="eqpDialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button
+ v-waves
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="eqpDialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
@@ -429,32 +485,17 @@
ViewDeviceCheckStanedSearch
} from '@/api/sbgl'
import $ from 'jquery'
+import { validateCode } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
name: 'Zzjg',
components: {
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()
- }
- }
- }
- const validateTypeCode = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇烽�夋嫨涓婄骇'))
- } else {
- callback()
- }
- }
return {
mainHeight: 0,
tableHeight: 0,
@@ -487,7 +528,7 @@
dialogFormRules: {
code: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
name: [
{ required: true, message: '璇疯緭鍏ユ爣鍑嗗悕绉�', trigger: ['blur', 'change'] }
@@ -517,7 +558,7 @@
},
title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
- code: '4',
+ code: '22',
shows: false
}
@@ -670,8 +711,13 @@
},
// 瀵硅瘽妗嗙‘璁�
dialogVisibleConfirm() {
+ if (this.tableDataDialog.length === 0) {
+ return this.$message.info('璁惧鍏宠仈鐐规椤逛俊鎭笉鑳戒负绌猴紒')
+ }
+
this.$refs.dialogForm.validate(valid => {
if (valid) {
+ this.$store.state.app.buttonIsDisabled = true
// this.tableDataDialog.forEach((item, index) => { // 鍘绘帀姝ｅ湪缂栬緫涓旀槸绌篶heckitem_code
// if (item.isVisible === 1 && item.checkitem_code === '') {
// this.tableDataDialog.splice(index, 1)
@@ -699,9 +745,10 @@
AddUpdateDeviceCheckStandArd(data, this.operation === 'add' ? 'Add' : 'Update').then(res => {
if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.getDeviceCheckStandArdSearch()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
}
@@ -820,50 +867,66 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 200
+ this.tableHeight = this.mainHeight - 195
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
return 'custom-row'
},
// 鍏宠仈璁惧
- async checkeqpClick(row) {
+ checkeqpClick(row) {
+ const loading = this.$loading({
+ lock: true,
+ text: '姝ｅ湪鍔犺浇鏁版嵁锛岃绋嶇瓑...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
this.dialogFormEqp.name = row.name
this.dialogFormEqp.code = row.code
- const { data: res } = await DeviceCheckStanedAssociationEqp({ checkstand_code: row.code })
- this.dialogFormEqp.eqpAll = res.filter(item => item.children.length > 0)
+ DeviceCheckStanedAssociationEqp({ checkstand_code: row.code }).then(res => {
+ if (res.code === '200') {
+ setTimeout(() => {
+ loading.close()
+ this.dialogFormEqp.eqpAll = res.data.filter(item => item.children.length > 0)
- if (this.dialogFormEqp.eqpAll.length > 0) {
- this.dialogFormEqp.eqpAll.forEach((item, index) => {
- this.dialogFormEqp.eqpArr.push({
- code: item.code,
- name: item.name,
- type: item.type,
- isSelected1: index === 0,
- isSelected2: item.flag === 'Y'
- })
- if (item.flag === 'Y') {
- this.$nextTick(() => {
- $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ if (this.dialogFormEqp.eqpAll.length > 0) {
+ this.dialogFormEqp.eqpAll.forEach((item, index) => {
+ this.dialogFormEqp.eqpArr.push({
+ code: item.code,
+ name: item.name,
+ type: item.type,
+ isSelected1: index === 0,
+ isSelected2: item.flag === 'Y'
+ })
+ if (item.flag === 'Y') {
+ this.$nextTick(() => {
+ $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ if (item.children && item.children.length > 0) {
+ item.children.forEach(it => {
+ if (it.flag === 'Y') {
+ this.dialogFormEqp.eqpCodeSelectedArr.push(it.code)
+ }
+ })
+ }
+ })
+ this.dialogFormEqp.eqpAll[0].name = '鍏ㄩ儴'
+ this.dialogFormEqp.eqpTree = [this.dialogFormEqp.eqpAll[0]]
+ }
+
+ this.dialogVisibleEqp = true
+
+ this.$nextTick(() => { // 鏍戝舰鍥炴樉
+ this.$refs.epqTree.setCheckedKeys(this.dialogFormEqp.eqpCodeSelectedArr)
})
- }
- if (item.children && item.children.length > 0) {
- item.children.forEach(it => {
- if (it.flag === 'Y') {
- this.dialogFormEqp.eqpCodeSelectedArr.push(it.code)
- }
- })
- }
- })
- this.dialogFormEqp.eqpAll[0].name = '鍏ㄩ儴'
- this.dialogFormEqp.eqpTree = [this.dialogFormEqp.eqpAll[0]]
- }
-
- this.dialogVisibleEqp = true
-
- this.$nextTick(() => { // 鏍戝舰鍥炴樉
- this.$refs.epqTree.setCheckedKeys(this.dialogFormEqp.eqpCodeSelectedArr)
+ }, 1000)
+ } else {
+ loading.close()
+ }
})
},
// 鍏宠仈璁惧瀵硅瘽妗嗗叧闂�
@@ -892,7 +955,7 @@
// 灏忕洅瀛愮偣鍑�
myCheckboxInputClick(val) {
console.log(val)
- val.isSelected2 = !val.isSelected2
+ val.isSelected2 = !!val.isSelected2
if (val.isSelected2) { // 浠庢病閫変腑鍒伴�変腑
console.log('浠庢病閫変腑鍒伴�変腑')
this.dialogFormEqp.eqpAll.forEach((item, index) => {
@@ -1023,6 +1086,7 @@
eqpDialogVisibleConfirm() {
// console.log(this.dialogFormEqp.eqpCodeSelectedArr, 888)
// this.dialogVisibleEqp = false
+ this.$store.state.app.buttonIsDisabled = true
const data = []
this.dialogFormEqp.eqpAll.forEach((item, index) => {
if (item.children && item.children.length > 0) {
@@ -1039,9 +1103,10 @@
SaveDeviceCheckStanedAssociationEqp(data, this.dialogFormEqp.code).then(res => {
if (res.code === '200') {
+ this.dialogVisibleEqp = false
this.$message.success('鍏宠仈鎴愬姛锛�')
this.getDeviceCheckStandArdSearch()
- this.dialogVisibleEqp = false
+ this.$store.state.app.buttonIsDisabled = false
}
})
}
@@ -1067,10 +1132,20 @@
margin: 10px 30px 0 0;
border-radius: 5px;
cursor: default;
+ position: relative;
.myCheckboxInput {
margin: 1px 5px 0 0;
cursor: pointer;
+ }
+
+ .myCheckboxInputLabel {
+ position: absolute;
+ left: 29px;
+ padding: 5px;
+ top: 6px;
+ color: transparent;
+
}
}
@@ -1214,8 +1289,25 @@
align-items: center;
justify-content: center;
}
+
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
+ height: 100% !important;
+ }
+
+ ::v-deep .el-table__fixed {
+ height: 100% !important;
+ }
+}
</style>
<style>
+.osloading {
+ font-size: 26px !important;
+}
+
+.el-loading-text {
+ font-size: 26px !important;
+}
.el-table .custom-row {
background: #f8f8fa;
--
Gitblit v1.9.3