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/zzmx/gylx.vue | 231 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 134 insertions(+), 97 deletions(-)
diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index 85855fc..f733d87 100644
--- a/src/views/zzmx/gylx.vue
+++ b/src/views/zzmx/gylx.vue
@@ -3,8 +3,8 @@
<div class="body" :style="{height:mainHeight+'px'}">
<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>-->
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <!-- <el-button v-waves type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<div class="bodyTopFormGroup">
@@ -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,11 +29,14 @@
<el-input v-model="form.createuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
- <div class="bodySearchReset">
- <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">
@@ -63,10 +66,12 @@
<el-table-column
prop="code"
label="缂栫爜"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="name"
+ show-tooltip-when-overflow
label="鍚嶇О"
sortable="custom"
/>
@@ -74,6 +79,7 @@
prop="description"
label="宸ヨ壓璺嚎鎻忚堪"
sortable="custom"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.description">{{ row.description }}</div>
@@ -82,28 +88,31 @@
</el-table-column>
<el-table-column
prop="enable"
+ show-tooltip-when-overflow
label="浣跨敤鐘舵��"
sortable="custom"
>
<template slot-scope="{row}">
<div v-if="row.enable==='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.enable==='N'">
- <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+ <i class="el-icon-info" style="margin-right: 2px" />
鍚�
</div>
</template>
</el-table-column>
<el-table-column
prop="lm_user"
+ show-tooltip-when-overflow
label="鍒涘缓浜哄憳"
sortable="custom"
/>
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
+ show-tooltip-when-overflow
sortable="custom"
width="160"
/>
@@ -117,12 +126,16 @@
<el-tooltip class="item" effect="dark" content="棰勮" placement="top">
<i
class="el-icon-view"
- style="margin-right:15px;cursor: pointer;color:#42b983 "
+ :style="{color:$store.state.settings.theme}"
+ style="margin-right:15px;cursor: pointer;"
@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" style="margin-right:15px;" @click="del(row)" />
+ </el-tooltip>
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="澶嶅埗" placement="top">
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-document-copy" style="cursor: pointer;color:#42b983" @click="copy('copy',row)" />
</el-tooltip>
</div>
</template>
@@ -142,7 +155,8 @@
</div>
<el-dialog
- :title="operation==='add'?'鏂板':'棰勮'"
+ v-el-drag-dialog
+ :title="operation==='add'?'鏂板':(operation==='edit'?'棰勮':'澶嶅埗')"
:visible.sync="dialogVisible"
width="1000px"
:close-on-click-modal="false"
@@ -153,7 +167,7 @@
<el-form ref="dialogForm" style="height: 500px" :rules="dialogFormRules" :model="dialogForm" label-width="110px">
<div style="display: flex">
<el-form-item label="宸ヨ壓璺嚎缂栫爜" prop="code" style="margin-right: 20px">
- <el-input v-model="dialogForm.code" :disabled="operation!=='add'" style="width: 220px" />
+ <el-input v-model="dialogForm.code" :disabled="operation==='edit'" style="width: 220px" />
</el-form-item>
<el-form-item label="宸ヨ壓鍚嶇О" prop="name">
<el-input v-model="dialogForm.name" :disabled="operation==='edit'" style="width: 220px" />
@@ -227,7 +241,7 @@
/>
</el-tag>
<!-- </el-tooltip>-->
-
+ <!-- {{ tag.editDisabled }}-->
<!-- left:tag.stepname===selectedName?'191px':'141px',-->
<i
v-if="index!==0&&tag.editDisabled&&operation!=='edit'"
@@ -249,9 +263,11 @@
:debounce="300"
:popper-append-to-body="false"
popper-class="autocompleteClass"
- @select="handleSelect"
+ @select="val=>handleSelect(val,tag)"
@keyup.enter.native="handleInputConfirm(tag)"
/>
+ <!-- @keyup.enter.native="handleInputConfirm(tag)"-->
+
<!-- @blur="handleBlur2"-->
<div
v-if="index!==dynamicTags.length-1"
@@ -262,6 +278,7 @@
<el-button
v-if="operation!=='edit'"
+ v-waves
type="success"
:disabled="addDisabled"
class="tagSuccess"
@@ -275,9 +292,16 @@
</el-form>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button v-if="operation==='edit'" @click="dialogVisibleCancel">杩� 鍥�</el-button>
- <el-button v-if="operation!=='edit'" @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <el-button v-if="operation!=='edit'" type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button v-if="operation==='edit'" v-waves @click="dialogVisibleCancel">杩� 鍥�</el-button>
+ <el-button v-if="operation!=='edit'" v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button
+ v-if="operation!=='edit'"
+ v-waves
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="dialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
@@ -288,12 +312,15 @@
import Pagination from '@/components/Pagination'
import { AddUpdateRoute, DeleteRoute, RouteSearch, StepSelect, ViewRoute } from '@/api/zzmx'
import { validateCode } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
export default {
name: 'GYLX',
components: {
Pagination
},
+ directives: { elDragDialog, waves },
data() {
return {
isIpad: false,
@@ -335,7 +362,7 @@
routeArr: [], // 宸ヨ壓璁剧疆涓嬫媺鎵�鏈夊��
routeSelectedArr: [], // 宸ヨ壓璁剧疆涓嬫媺宸查�夌殑鍊�
addDisabled: true, // 娣诲姞鎸夐挳鏄惁鍙偣鍑�
- editDisabled: true, // 淇敼鎸夐挳鏄惁鍙偣鍑�
+ // editDisabled: true, // 淇敼鎸夐挳鏄惁鍙偣鍑�
mouseFocusPosition: 0, // 榧犳爣鑱氱劍鐨勪綅缃�
operation: '',
dialogFormRules: {
@@ -385,16 +412,15 @@
this.routeArr = res
},
// 澶勭悊涓嬫媺閫夋嫨
- handleSelect(item) {
+ handleSelect(item, tag) {
this.autocompleteValue = item.value
this.$nextTick(_ => {
this.$refs['saveTagInput' + this.mouseFocusPosition][0].focus()
+ this.handleInputConfirm(tag)
})
},
// 杈撳叆妗嗙‘璁や簨浠�
handleInputConfirm(tag) {
- console.log(tag, 111)
- console.log(this.autocompleteValue, 2)
// 1.閫夋嫨鍐呭涓嶈兘涓虹┖
if (this.autocompleteValue.trim().length < 1) {
return this.$message.info('閫夋嫨鍐呭涓嶈兘涓虹┖锛�')
@@ -423,15 +449,15 @@
if (flag2) {
return this.$message.info('姝ゅ伐搴忓凡閫夛紝璇烽�夋嫨鍏跺畠宸ュ簭锛�')
}
- console.log(this.routeArr, 9)
+
this.routeArr.forEach((item, index) => {
if (this.autocompleteValue.trim() === item.stepname) {
- console.log(tag.stepname === item.stepname, 353535)
this.routeSelectedArr.push({
stepcode: item.stepcode,
stepname: item.stepname,
value: item.value
})
+
this.routeArr.splice(index, 1)
}
})
@@ -439,34 +465,30 @@
// 灏嗗�兼浛鎹㈠埌鍘焧ag浣嶇疆涓�
this.dynamicTags.forEach((item, index) => {
if ((index + 1) === tag.seq) {
- console.log(tag)
item.stepname = this.autocompleteValue
+ item.effect = 'dark'
}
item.editDisabled = true
})
- console.log(this.dynamicTags, 234)
+ this.clickSelected = this.dynamicTags.findIndex(i => i.effect === 'dark') + 1
+
this.addDisabled = false
this.editDisabled = true
this.selectedName = ''
},
// tag鐐瑰嚮淇敼鎸夐挳
tagEdit(tag) {
- console.log(tag, 2)
this.autocompleteValue = ''
this.dynamicTags.forEach(item => {
item.stepname = item.stepname.trim()
+ item.editDisabled = false
if (item.seq !== tag.seq) {
- item.editDisabled = false
- // item.stepcode = this.routeArr.find(it=>it.stepcode=tag.stepcode).stepcode
- // return this.$message.info('璇峰厛濉啓鎴栭�夋嫨宸ヨ壓锛�')
+ item.effect = 'light'
+ } else {
+ item.effect = 'dark'
}
})
- // if (tag.stepname === '') {
- // this.dynamicTags[0].stepcode=
- // }
-
- // if (tag.stepname.toString().length > 0 && tag.editDisabled) {
if (tag.stepname !== '') {
const routeSelectedArr = this.routeSelectedArr.find(item => item.stepname === tag.stepname)
@@ -478,7 +500,6 @@
}
)
}
- // }
this.addDisabled = true
this.selectedName = tag.stepname
@@ -490,31 +511,27 @@
},
// tag鐐瑰嚮浜嬩欢
elTagClick(tag) {
- console.log(tag, 1)
- this.clickSelected = tag.seq
- if (tag.effect === 'dark') {
- tag.effect = 'light'
- this.clickSelected = ''
- } else {
- this.dynamicTags.forEach(item => {
- item.effect = 'light'
- })
- if (tag.effect === 'light') {
- tag.effect = 'dark'
- } else if (tag.effect === 'dark') {
- tag.effect = 'light'
+ if (this.dynamicTags.every(i => i.editDisabled)) {
+ this.clickSelected = tag.seq
+ if (tag.effect === 'dark') {
+
+ } else {
+ this.dynamicTags.forEach(item => {
+ item.effect = 'light'
+ })
+ if (tag.effect === 'light') {
+ tag.effect = 'dark'
+ } else if (tag.effect === 'dark') {
+ tag.effect = 'light'
+ }
}
}
- console.log(this.$el)
- // console.log(this.$el.style.color = 'red')
},
// 澶勭悊tag鍏抽棴浜嬩欢
handleTagClose(tag) {
- console.log(tag)
-
// 褰撻�変腑鐨勬楠よ鍒犻櫎鏃�
- if (tag.seq === this.clickSelected) {
- this.clickSelected = ''
+ if (tag.effect === 'dark') {
+ this.clickSelected = this.dynamicTags.length - 1
}
this.dynamicTags.forEach((item, index) => {
if (item.seq === tag.seq) {
@@ -523,6 +540,7 @@
})
const routeSelectedArr = this.routeSelectedArr.find(item => item.stepname === tag.stepname)
+
if (routeSelectedArr !== undefined) {
this.routeArr.push(
{
@@ -535,49 +553,34 @@
this.routeArr = this.routeArr.filter((currentValue, currentIndex, selfArr) => {
return selfArr.findIndex(item => item.stepcode === currentValue.stepcode) === currentIndex
})
- console.log(this.dynamicTags, 1)
+
// 閲嶆柊鎺掑簭
this.dynamicTags.forEach((item, index) => {
item.editDisabled = true
item.seq = index + 1
- // item.stepcode = 'Step' + ((index + 1).toString().length === 2 ? (index + 1) : '0' + (index + 1))
item.stepcode = ''
+ item.effect = index === this.dynamicTags.length - 1 ? 'dark' : 'light'
})
- if (this.clickSelected === '') {
- this.selectedName = ''
- }
this.addDisabled = false
},
// tag娣诲姞鎸夐挳
showInput() {
+ const seq = this.dynamicTags.findIndex(i => i.effect === 'dark') + 2
+
+ // 鍏堝皢姣忎釜鐨則ag鏍囩棰滆壊鏀逛负娴呰壊
+ this.dynamicTags.forEach(i => {
+ i.effect = 'light'
+ })
+
this.autocompleteValue = ''
this.addDisabled = true
this.editDisabled = false
- let seq = 0
- // 1.绗竴绉嶆儏鍐� 褰撴湭閫変腑鎯呭喌涓嬫垨鑰呴�変腑鏈�鍚庝竴涓殑鎯呭喌涓�
- if (this.clickSelected === '' || this.clickSelected === this.dynamicTags.length) {
- seq = this.dynamicTags.length + 1
- this.dynamicTags.push(
- {
- editDisabled: true,
- seq: seq,
- stepname: '',
- effect: 'light',
- // stepcode: ('Step' + (seq.toString().length === 2 ? seq : '0' + seq))
- stepcode: ''
- }
- )
- } else {
- // 2.绗簩绉嶆儏鍐� 褰撻�変腑鏌愪釜tag 灏嗗湪tag鍚庨潰娣诲姞
- seq = this.clickSelected + 1
- this.dynamicTags.splice(this.clickSelected, 0, { editDisabled: true, seq: seq, stepname: '', effect: 'light' })
- this.dynamicTags.forEach((item, index) => {
- item.seq = index + 1
- // item.stepcode = 'Step' + ((index + 1).toString().length === 2 ? (index + 1) : '0' + (index + 1))
- item.stepcode = ''
- })
- }
+ this.dynamicTags.splice(this.clickSelected, 0, { editDisabled: true, seq: seq, stepname: '', effect: 'dark' })
+ this.dynamicTags.forEach((item, index) => {
+ item.seq = index + 1
+ item.stepcode = ''
+ })
this.$nextTick(_ => {
this.$refs['saveTagInput' + seq][0].focus()
})
@@ -587,8 +590,6 @@
this.dynamicTags.forEach((item, index) => {
item.editDisabled = seq === index + 1
})
-
- console.log(this.dynamicTags, 1)
},
// 鑾峰彇宸ヨ壓璺嚎鍒楄〃娓呭崟
@@ -673,6 +674,37 @@
this.$message.info('宸插彇娑堝垹闄�')
})
},
+ // 澶嶅埗鎸夐挳
+ async copy(operation, row) {
+ this.operation = operation
+ this.dialogVisible = true
+
+ await this.getStepSelectArr()
+ const { data: res } = await ViewRoute({ routecode: row.code })
+ // 寰呮敼
+ this.dynamicTags = []
+ this.routeSelectedArr = []
+ this.$nextTick(() => {
+ this.dialogForm.code = res[0].code
+ this.dialogForm.name = res[0].name
+ this.dialogForm.enable = res[0].enable
+ this.dialogForm.description = res[0].description
+ res[0].Data.forEach((item, index) => {
+ this.dynamicTags.push(
+ { seq: item.seq, stepname: item.stepname, stepcode: item.stepcode, editDisabled: true, effect: index === res[0].Data.length - 1 ? 'dark' : 'light' }
+ )
+ this.routeSelectedArr.push({
+ stepcode: item.stepcode,
+ stepname: item.stepname,
+ value: item.stepname
+ })
+ this.routeArr = this.routeArr.filter(i => i.stepcode !== item.stepcode)
+ })
+
+ this.addDisabled = false
+ this.clickSelected = this.dynamicTags.length
+ })
+ },
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
this.dialogForm.code = ''
@@ -697,11 +729,13 @@
if (this.dynamicTags[0].stepname.trim() === '') {
return this.$message.info('宸ヨ壓璁剧疆绗竴椤逛笉鑳戒负绌猴紒')
}
- console.log(this.routeSelectedArr, 3666666)
- console.log(this.dynamicTags, 3)
const Data = []
this.dynamicTags.forEach(item => {
- Data.push({ seq: item.seq, stepcode: this.routeSelectedArr.find(it => it.stepname === item.stepname).stepcode, stepname: item.stepname })
+ Data.push({
+ seq: item.seq,
+ stepcode: this.routeSelectedArr.find(it => it.stepname === item.stepname).stepcode,
+ stepname: item.stepname
+ })
})
Data.forEach(item => {
@@ -709,9 +743,10 @@
item.stepcode = this.routeSelectedArr.find(it => it.stepname === item.stepname).stepcode
}
})
- console.log(Data, 32)
+
this.$refs.dialogForm.validate(valid => {
if (valid) {
+ this.$store.state.app.buttonIsDisabled = true
const data = {
code: this.dialogForm.code,
name: this.dialogForm.name,
@@ -719,14 +754,15 @@
description: this.dialogForm.description,
Data: Data
}
- console.log(data, 2)
- AddUpdateRoute(this.dialogForm.id, this.operation === 'add' ? 'Add' : 'Update', data).then(res => {
+
+ AddUpdateRoute(this.dialogForm.id, this.operation === 'edit' ? 'Update' : 'Add', data).then(res => {
if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '澶嶅埗鎴愬姛锛�')
this.getRouteSearch()
+ this.$store.state.app.buttonIsDisabled = false
} else {
- this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '澶嶅埗澶辫触锛�')
}
})
}
@@ -736,7 +772,7 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 200
+ this.tableHeight = this.mainHeight - 195
if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 40
}
@@ -960,11 +996,12 @@
margin-bottom: 0;
}
-.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;
}
}
--
Gitblit v1.9.3