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 | 137 +++++++++++++++++----------------------------
1 files changed, 53 insertions(+), 84 deletions(-)
diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index 3eba3da..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">
@@ -30,8 +30,8 @@
</el-form-item>
</div>
<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>
+ <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
@@ -241,7 +241,7 @@
/>
</el-tag>
<!-- </el-tooltip>-->
-
+ <!-- {{ tag.editDisabled }}-->
<!-- left:tag.stepname===selectedName?'191px':'141px',-->
<i
v-if="index!==0&&tag.editDisabled&&operation!=='edit'"
@@ -278,6 +278,7 @@
<el-button
v-if="operation!=='edit'"
+ v-waves
type="success"
:disabled="addDisabled"
class="tagSuccess"
@@ -291,10 +292,11 @@
</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'" 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"
@@ -311,13 +313,14 @@
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 },
+ directives: { elDragDialog, waves },
data() {
return {
isIpad: false,
@@ -418,8 +421,6 @@
},
// 杈撳叆妗嗙‘璁や簨浠�
handleInputConfirm(tag) {
- console.log(tag, 111)
- console.log(this.autocompleteValue, 2)
// 1.閫夋嫨鍐呭涓嶈兘涓虹┖
if (this.autocompleteValue.trim().length < 1) {
return this.$message.info('閫夋嫨鍐呭涓嶈兘涓虹┖锛�')
@@ -448,16 +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
})
- console.log(this.routeSelectedArr, 7)
+
this.routeArr.splice(index, 1)
}
})
@@ -465,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)
@@ -504,7 +500,6 @@
}
)
}
- // }
this.addDisabled = true
this.selectedName = tag.stepname
@@ -516,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) {
@@ -549,6 +540,7 @@
})
const routeSelectedArr = this.routeSelectedArr.find(item => item.stepname === tag.stepname)
+
if (routeSelectedArr !== undefined) {
this.routeArr.push(
{
@@ -561,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()
})
@@ -613,8 +590,6 @@
this.dynamicTags.forEach((item, index) => {
item.editDisabled = seq === index + 1
})
-
- console.log(this.dynamicTags, 1)
},
// 鑾峰彇宸ヨ壓璺嚎鍒楄〃娓呭崟
@@ -714,26 +689,20 @@
this.dialogForm.name = res[0].name
this.dialogForm.enable = res[0].enable
this.dialogForm.description = res[0].description
- // this.dialogForm.Data = row.description
- res[0].Data.forEach(item => {
+ res[0].Data.forEach((item, index) => {
this.dynamicTags.push(
- { seq: item.seq, stepname: item.stepname, stepcode: item.stepcode, editDisabled: true, effect: 'light' }
+ { 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
})
-
- console.log(item, 2)
- console.log(this.routeArr)
-
this.routeArr = this.routeArr.filter(i => i.stepcode !== item.stepcode)
})
this.addDisabled = false
-
- // { editDisabled: true, stepcode: '', seq: 1, stepname: ' ', effect: 'light' }
+ this.clickSelected = this.dynamicTags.length
})
},
// 瀵硅瘽妗嗗叧闂簨浠�
--
Gitblit v1.9.3