From 68e417e94ab4c97e13d24522d748fc032f4865af Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 07 十一月 2022 16:38:29 +0800
Subject: [PATCH] 1.工艺路线新增复制功能2.节拍工价编辑问题处理
---
src/views/zzmx/gylx.vue | 191 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 151 insertions(+), 40 deletions(-)
diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index 5c9d1aa..7df18bb 100644
--- a/src/views/zzmx/gylx.vue
+++ b/src/views/zzmx/gylx.vue
@@ -29,15 +29,20 @@
<el-input v-model="form.createuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
- <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'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>
</div>
</el-form>
+ <div
+ class="bodyTopFormExpand"
+ />
</div>
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="tableHeight"
border
@@ -120,7 +125,10 @@
/>
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" @click="del(row)" />
+ <i 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 class="el-icon-document-copy" style="cursor: pointer;color:#42b983" @click="copy('copy',row)" />
</el-tooltip>
</div>
</template>
@@ -140,7 +148,7 @@
</div>
<el-dialog
- :title="operation==='add'?'鏂板':'棰勮'"
+ :title="operation==='add'?'鏂板':(operation==='edit'?'棰勮':'澶嶅埗')"
:visible.sync="dialogVisible"
width="1000px"
:close-on-click-modal="false"
@@ -151,7 +159,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" />
@@ -247,9 +255,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"
@@ -275,7 +285,13 @@
<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'"
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="dialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
@@ -285,25 +301,14 @@
<script>
import Pagination from '@/components/Pagination'
import { AddUpdateRoute, DeleteRoute, RouteSearch, StepSelect, ViewRoute } from '@/api/zzmx'
+import { validateCode } from '@/utils/global'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
name: 'GYLX',
components: {
Pagination
},
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 {
isIpad: false,
mainHeight: 0,
@@ -334,7 +339,7 @@
Data: []
},
dynamicTags: [// 宸ヨ壓璁剧疆鏁扮粍
- { editDisabled: true, stepcode: 'Step01', seq: 1, stepname: ' ', effect: 'light' }
+ { editDisabled: true, stepcode: '', seq: 1, stepname: ' ', effect: 'light' }
// { editDisabled: true, stepcode: 'Step02', seq: 2, stepname: '濂�', effect: 'light' },
// { editDisabled: true, stepcode: 'Step03', seq: 3, stepname: '澶�', effect: 'light' }
],
@@ -342,13 +347,14 @@
selectedName: '', // 閫変腑鐨勫悕绉�
autocompleteValue: '', // 鍙悳绱㈣緭鍏ユ涓殑鍊�
routeArr: [], // 宸ヨ壓璁剧疆涓嬫媺鎵�鏈夊��
+ routeSelectedArr: [], // 宸ヨ壓璁剧疆涓嬫媺宸查�夌殑鍊�
addDisabled: true, // 娣诲姞鎸夐挳鏄惁鍙偣鍑�
- editDisabled: true, // 淇敼鎸夐挳鏄惁鍙偣鍑�
+ // editDisabled: true, // 淇敼鎸夐挳鏄惁鍙偣鍑�
mouseFocusPosition: 0, // 榧犳爣鑱氱劍鐨勪綅缃�
operation: '',
dialogFormRules: {
code: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
name: [
{ required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
@@ -393,10 +399,11 @@
this.routeArr = res
},
// 澶勭悊涓嬫媺閫夋嫨
- handleSelect(item) {
+ handleSelect(item, tag) {
this.autocompleteValue = item.value
this.$nextTick(_ => {
this.$refs['saveTagInput' + this.mouseFocusPosition][0].focus()
+ this.handleInputConfirm(tag)
})
},
// 杈撳叆妗嗙‘璁や簨浠�
@@ -431,6 +438,19 @@
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)
+ }
+ })
// 灏嗗�兼浛鎹㈠埌鍘焧ag浣嶇疆涓�
this.dynamicTags.forEach((item, index) => {
@@ -453,9 +473,29 @@
item.stepname = item.stepname.trim()
if (item.seq !== tag.seq) {
item.editDisabled = false
+ // item.stepcode = this.routeArr.find(it=>it.stepcode=tag.stepcode).stepcode
// return this.$message.info('璇峰厛濉啓鎴栭�夋嫨宸ヨ壓锛�')
}
})
+
+ // 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)
+
+ this.routeArr.push(
+ {
+ stepcode: routeSelectedArr.stepcode,
+ stepname: routeSelectedArr.stepname,
+ value: routeSelectedArr.value
+ }
+ )
+ }
+ // }
+
this.addDisabled = true
this.selectedName = tag.stepname
this.autocompleteValue = tag.stepname
@@ -497,11 +537,27 @@
this.dynamicTags.splice(index, 1)
}
})
+
+ const routeSelectedArr = this.routeSelectedArr.find(item => item.stepname === tag.stepname)
+ if (routeSelectedArr !== undefined) {
+ this.routeArr.push(
+ {
+ stepcode: routeSelectedArr.stepcode,
+ stepname: routeSelectedArr.stepname,
+ value: routeSelectedArr.value
+ }
+ )
+ }
+ 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 = 'Step' + ((index + 1).toString().length === 2 ? (index + 1) : '0' + (index + 1))
+ item.stepcode = ''
})
if (this.clickSelected === '') {
this.selectedName = ''
@@ -523,7 +579,8 @@
seq: seq,
stepname: '',
effect: 'light',
- stepcode: ('Step' + (seq.toString().length === 2 ? seq : '0' + seq))
+ // stepcode: ('Step' + (seq.toString().length === 2 ? seq : '0' + seq))
+ stepcode: ''
}
)
} else {
@@ -532,7 +589,8 @@
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 = 'Step' + ((index + 1).toString().length === 2 ? (index + 1) : '0' + (index + 1))
+ item.stepcode = ''
})
}
@@ -577,10 +635,10 @@
},
// 閲嶇疆
reset() {
- this.form.OrgCode = ''
- this.form.OrgName = ''
- this.form.OrgType = ''
- this.form.UserName = ''
+ this.form.routecode = ''
+ this.form.routename = ''
+ this.form.description = ''
+ this.form.createuser = ''
this.getRouteSearch()
},
@@ -621,11 +679,51 @@
DeleteRoute({ routecode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getRouteSearch()
}
})
}).catch(() => {
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
+ // this.dialogForm.Data = row.description
+ res[0].Data.forEach(item => {
+ this.dynamicTags.push(
+ { seq: item.seq, stepname: item.stepname, stepcode: item.stepcode, editDisabled: true, effect: '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' }
})
},
// 瀵硅瘽妗嗗叧闂簨浠�
@@ -635,10 +733,12 @@
this.dialogForm.enable = 'Y'
this.dialogForm.description = ''
this.dialogForm.Data = []
+
this.dynamicTags = [
- { editDisabled: true, stepcode: 'Step01', seq: 1, stepname: ' ', effect: 'light' }
+ { editDisabled: true, stepcode: '', seq: 1, stepname: ' ', effect: 'light' }
]
this.addDisabled = true
+ this.routeSelectedArr = []
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -650,20 +750,20 @@
if (this.dynamicTags[0].stepname.trim() === '') {
return this.$message.info('宸ヨ壓璁剧疆绗竴椤逛笉鑳戒负绌猴紒')
}
- console.log(this.dynamicTags, 3)
const Data = []
this.dynamicTags.forEach(item => {
- Data.push({ seq: item.seq, stepcode: item.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 => {
- if (item.stepname === this.routeArr.find(it => it.stepname === item.stepname).stepname) {
- item.stepcode = this.routeArr.find(it => it.stepname === item.stepname).stepcode
+ if (item.stepname === this.routeSelectedArr.find(it => it.stepname === item.stepname).stepname) {
+ 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,
@@ -671,14 +771,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' ? '娣诲姞澶辫触锛�' : '澶嶅埗澶辫触锛�')
}
})
}
@@ -688,11 +789,12 @@
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
}
this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -911,6 +1013,15 @@
margin-bottom: 0;
}
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
+
</style>
<style>
--
Gitblit v1.9.3