From d105bd9dd591264a7b1f79f1fdbbf0e764ff073e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 31 八月 2022 15:39:42 +0800
Subject: [PATCH] 1.修改分页bug
---
src/views/jcsz/zzjg.vue | 5 +
src/views/sbgl/djbw.vue | 3
src/views/zzmx/chda.vue | 3
src/views/scgl/scdd.vue | 24 +++---
src/views/jcsz/wldw.vue | 3
src/views/scgl/gd.vue | 11 +-
src/views/zzmx/gylx.vue | 82 ++++++++++++++++----
src/views/zlgl/gxjyjl.vue | 3
src/views/sbgl/sbqd.vue | 13 +++
src/views/sbgl/djbz.vue | 5 +
src/views/template.vue | 3
src/views/zlgl/gxjyxm.vue | 3
src/views/sbgl/bybw.vue | 3
src/views/sbgl/bybz.vue | 5 +
src/views/jcsz/yhqd.vue | 20 ++++
src/views/zzmx/jpgj.vue | 3
src/views/zlgl/qxdy.vue | 3
src/views/jcsz/jsqd.vue | 6 +
src/views/wlgl/ckdy.vue | 5 +
src/views/zzmx/gxdy.vue | 3
src/views/wlgl/kwdy.vue | 5 +
src/views/zlgl/gxjybz.vue | 3
22 files changed, 173 insertions(+), 41 deletions(-)
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index d8aa604..a0aa5d2 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -826,6 +826,9 @@
DeleteRole({ RoleCode: row.role_code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getRoleSearch()
}
})
@@ -919,6 +922,9 @@
RoleTypeDelete({ RoleTypeCode: row.roletype_code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.formSetting.page > 1 && this.RoleTypeCodeArr.length === 1) {
+ this.formSetting.page--
+ }
this.getRoleTypeSearch()
}
})
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index 1cf702c..8d977d4 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -482,6 +482,9 @@
DeleteCurrentUnit({ unitcode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getCurrentUnitSearch()
}
})
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 031ec44..c0707bc 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -123,13 +123,23 @@
label="鎵�灞炵粍缁�"
min-width="110"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.org_name">{{ row.org_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="group_name"
label="鐢熶骇鐝粍"
min-width="110"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.group_name">{{ row.group_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="wagetype"
label="宸ヨ祫绫诲瀷"
@@ -812,6 +822,9 @@
DeleteUser({ Userid: id }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getUserSearch()
}
})
@@ -1224,6 +1237,9 @@
UserGroupDelete({ UserGrupCode: row.group_code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.formWorking.page > 1 && this.workingTableData.length === 1) {
+ this.formWorking.page--
+ }
this.getUserGroupSearch()
}
})
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index f66ca14..cc2d721 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -79,7 +79,7 @@
<el-table-column
prop="description"
label="缁勭粐绫诲瀷"
- width="110"
+ min-width="110"
sortable="custom"
>
<template slot-scope="{row}">
@@ -397,6 +397,9 @@
DeleteOrganization({ orgid: id }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getOrganizationSearch()
}
})
diff --git a/src/views/sbgl/bybw.vue b/src/views/sbgl/bybw.vue
index a927119..f6bb8d1 100644
--- a/src/views/sbgl/bybw.vue
+++ b/src/views/sbgl/bybw.vue
@@ -351,6 +351,9 @@
DeleteDeviceMaiItem({ maiitemcode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getDeviceMaiItemSearch()
}
})
diff --git a/src/views/sbgl/bybz.vue b/src/views/sbgl/bybz.vue
index 46357ab..a2cc60f 100644
--- a/src/views/sbgl/bybz.vue
+++ b/src/views/sbgl/bybz.vue
@@ -616,6 +616,9 @@
DeleteDeviceRepairStaned({ repairstand_code: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getDeviceRepairStandArdSearch()
}
})
@@ -790,7 +793,7 @@
this.dialogFormEqp.code = row.code
const { data: res } = await DeviceRepairStanedAssociationEqp({ repairstand_code: row.code })
- this.dialogFormEqp.eqpAll = res
+ this.dialogFormEqp.eqpAll = res.filter(item => item.children.length > 0)
if (this.dialogFormEqp.eqpAll.length > 0) {
this.dialogFormEqp.eqpAll.forEach((item, index) => {
diff --git a/src/views/sbgl/djbw.vue b/src/views/sbgl/djbw.vue
index d705093..32893ea 100644
--- a/src/views/sbgl/djbw.vue
+++ b/src/views/sbgl/djbw.vue
@@ -389,6 +389,9 @@
DeleteDeviceCheckItem({ checkitemcode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getDeviceCheckItemSearch()
}
})
diff --git a/src/views/sbgl/djbz.vue b/src/views/sbgl/djbz.vue
index 4c08677..603b3ee 100644
--- a/src/views/sbgl/djbz.vue
+++ b/src/views/sbgl/djbz.vue
@@ -643,6 +643,9 @@
DeleteDeviceCheckStaned({ checkstand_code: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getDeviceCheckStandArdSearch()
}
})
@@ -829,7 +832,7 @@
this.dialogFormEqp.code = row.code
const { data: res } = await DeviceCheckStanedAssociationEqp({ checkstand_code: row.code })
- this.dialogFormEqp.eqpAll = res
+ this.dialogFormEqp.eqpAll = res.filter(item => item.children.length > 0)
if (this.dialogFormEqp.eqpAll.length > 0) {
this.dialogFormEqp.eqpAll.forEach((item, index) => {
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 0e390ec..5788568 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -389,6 +389,7 @@
width="50"
label="搴忓彿"
prop="RowNum"
+ fixed
/>
<el-table-column
prop="code"
@@ -477,6 +478,7 @@
<el-table-column
width="50"
label="搴忓彿"
+ fixed
prop="RowNum"
/>
<el-table-column
@@ -570,7 +572,7 @@
import Pagination from '@/components/Pagination'
import {
AddUpdateDeviceGroup, AddUpdateDeviceManger,
- AddUpdateDeviceType, DeleteDeviceManger, DeleteDeviceType,
+ AddUpdateDeviceType, DeleteDeviceGroup, DeleteDeviceManger, DeleteDeviceType,
DeviceGroupSearch,
DeviceMangerSearch,
DeviceTypeSearch,
@@ -794,6 +796,9 @@
DeleteDeviceManger({ devicecode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getDeviceMangerSearch()
}
})
@@ -927,6 +932,9 @@
DeleteDeviceType({ devicetypecode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.formDeviceType.page > 1 && this.DeviceTypeArray.length === 1) {
+ this.formDeviceType.page--
+ }
this.getDeviceTypeSearchDialog()
}
})
@@ -1041,6 +1049,9 @@
DeleteDeviceGroup({ devicegroupcode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.formDeviceGroup.page > 1 && this.DeviceGroupArray.length === 1) {
+ this.formDeviceGroup.page--
+ }
this.getDeviceGroupSearchDialog()
}
})
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 3a0091c..e26bf4f 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -145,7 +145,7 @@
<el-radio
v-model="radioSelected"
:label="row.wo_code"
- style="color: transparent;padding-left: 10px; margin-right: -25px;"
+ style="color: transparent;padding-left: 10px;"
@change.native="getCurrentRow(row.wo_code)"
/>
</template>
@@ -809,7 +809,7 @@
<el-radio
v-model="radioSelectedId"
:label="row.id"
- style="color: transparent;padding-left: 15px; margin-right: -25px;"
+ style="color: transparent;padding-left: 10px;"
@change.native="getCurrentRowSource(row.id)"
/>
</template>
@@ -1628,6 +1628,9 @@
DeleteMesOrder(data).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getMesOrderSearch()
}
})
@@ -2099,11 +2102,11 @@
margin-bottom: 0;
}
-.elTableDiv {
+//.elTableDiv {
::v-deep .el-radio__label {
display: none;
}
-}
+//}
.el-table::before {
height: 0;
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 5f5f9d7..f8b4fdc 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -156,7 +156,7 @@
<el-radio
v-model="radioSelectedId"
:label="row.id"
- style="color: transparent;padding-left: 15px; margin-right: -25px;"
+ style="color: transparent;padding-left: 10px;"
@change.native="getCurrentRow(row.id)"
/>
</template>
@@ -374,17 +374,6 @@
style="width: 200px"
/>
</el-form-item>
-
- <!-- <el-form-item label="浜や粯鏃堕棿" prop="">-->
- <!-- <el-date-picker-->
- <!-- v-model="dialogForm.markqty"-->
- <!-- type="date"-->
- <!-- style="width: 200px"-->
- <!-- placeholder="閫夋嫨鏃ユ湡"-->
- <!-- />-->
- <!-- <el-input v-model="dialogForm.OrgName" style="width: 200px" />-->
- <!-- </el-form-item>-->
-
</el-form>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
@@ -679,9 +668,15 @@
},
// 瀵硅瘽妗嗙‘璁�
dialogVisibleConfirm() {
+ this.dialogForm.markqty = parseFloat(this.dialogForm.markqty)
+ this.dialogForm.erpqty = parseFloat(this.dialogForm.erpqty)
+ this.dialogForm.relse_qty = parseFloat(this.dialogForm.relse_qty)
+ this.dialogForm.ordernum = parseFloat(this.dialogForm.ordernum)
if (this.dialogForm.markqty < 1 || this.dialogForm.markqty > this.dialogForm.erpqty - this.dialogForm.relse_qty) {
return this.$message.info('涓嬪崟鏁伴噺瓒呭嚭鍙笅鍗曟暟鐨勮寖鍥达紒')
}
+
+ console.log(this.dialogForm.ordernum < this.dialogForm.markqty)
if (this.dialogForm.ordernum < 1 || this.dialogForm.ordernum > this.dialogForm.markqty) {
return this.$message.info('涓嬪崟鍗曟暟瓒呭嚭鍙笅鍗曞崟鏁扮殑鑼冨洿锛�')
}
@@ -839,6 +834,11 @@
margin-bottom: 0;
}
+.elTableDiv {
+ ::v-deep .el-radio__label {
+ display: none;
+ }
+}
</style>
<style>
.el-table .custom-row {
diff --git a/src/views/template.vue b/src/views/template.vue
index dfae3e6..c50cab1 100644
--- a/src/views/template.vue
+++ b/src/views/template.vue
@@ -335,6 +335,9 @@
DeleteOrganization({ orgid: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getOrganizationSearch()
}
})
diff --git a/src/views/wlgl/ckdy.vue b/src/views/wlgl/ckdy.vue
index 23e9d8d..5d01ae0 100644
--- a/src/views/wlgl/ckdy.vue
+++ b/src/views/wlgl/ckdy.vue
@@ -106,7 +106,7 @@
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
<i class="el-icon-edit-outline" @click="edit('edit',row)" />
</el-tooltip>
- <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
<i class="el-icon-delete" @click="del(row)" />
</el-tooltip>
</div>
@@ -325,6 +325,9 @@
DeleteWareHouseDef({ warehousecode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getWareHouseDefSearch()
}
})
diff --git a/src/views/wlgl/kwdy.vue b/src/views/wlgl/kwdy.vue
index 58d881b..548dd9c 100644
--- a/src/views/wlgl/kwdy.vue
+++ b/src/views/wlgl/kwdy.vue
@@ -121,7 +121,7 @@
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
<i class="el-icon-edit-outline" @click="edit('edit',row)" />
</el-tooltip>
- <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
<i class="el-icon-delete" @click="del(row)" />
</el-tooltip>
</div>
@@ -338,6 +338,9 @@
DeleteStorageDef({ storagecode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getStorageDefSearch()
}
})
diff --git a/src/views/zlgl/gxjybz.vue b/src/views/zlgl/gxjybz.vue
index 29e8212..ac781af 100644
--- a/src/views/zlgl/gxjybz.vue
+++ b/src/views/zlgl/gxjybz.vue
@@ -431,6 +431,9 @@
DeleteStepCheckStaned({ stanedcode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getStepCheckStanedSearch()
}
})
diff --git a/src/views/zlgl/gxjyjl.vue b/src/views/zlgl/gxjyjl.vue
index 647f9bc..10a3446 100644
--- a/src/views/zlgl/gxjyjl.vue
+++ b/src/views/zlgl/gxjyjl.vue
@@ -488,6 +488,9 @@
DeleteOrganization({ orgid: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getStepCheckTableSearch()
}
})
diff --git a/src/views/zlgl/gxjyxm.vue b/src/views/zlgl/gxjyxm.vue
index 0c49312..a508651 100644
--- a/src/views/zlgl/gxjyxm.vue
+++ b/src/views/zlgl/gxjyxm.vue
@@ -263,6 +263,9 @@
DeleteStepCheckItem({ checkitemcode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getStepCheckItemSearch()
}
})
diff --git a/src/views/zlgl/qxdy.vue b/src/views/zlgl/qxdy.vue
index 8da1d50..c0e5366 100644
--- a/src/views/zlgl/qxdy.vue
+++ b/src/views/zlgl/qxdy.vue
@@ -284,6 +284,9 @@
DeleteDedect({ defectcode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getDedectSearch()
}
})
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index e681478..3dba389 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -907,6 +907,9 @@
DeleteInventoryFile({ materialcode: row.partcode }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getInventoryFileSelect()
}
})
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index 8789ee4..c98245e 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -573,6 +573,9 @@
DeleteStep({ stepcode: row.stepcode }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getStepSearch()
}
})
diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index 70ffcee..44b8b17 100644
--- a/src/views/zzmx/gylx.vue
+++ b/src/views/zzmx/gylx.vue
@@ -334,7 +334,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,6 +342,7 @@
selectedName: '', // 閫変腑鐨勫悕绉�
autocompleteValue: '', // 鍙悳绱㈣緭鍏ユ涓殑鍊�
routeArr: [], // 宸ヨ壓璁剧疆涓嬫媺鎵�鏈夊��
+ routeSelectedArr: [], // 宸ヨ壓璁剧疆涓嬫媺宸查�夌殑鍊�
addDisabled: true, // 娣诲姞鎸夐挳鏄惁鍙偣鍑�
editDisabled: true, // 淇敼鎸夐挳鏄惁鍙偣鍑�
mouseFocusPosition: 0, // 榧犳爣鑱氱劍鐨勪綅缃�
@@ -431,15 +432,18 @@
if (flag2) {
return this.$message.info('姝ゅ伐搴忓凡閫夛紝璇烽�夋嫨鍏跺畠宸ュ簭锛�')
}
-
- // this.routeArr.forEach((item, index) => {
- // console.log(this.autocompleteValue.trim() === item.stepname, 2)
- // if (this.autocompleteValue.trim() === item.stepname) {
- // console.log(tag.stepname === item.stepname, 353535)
- // this.routeArr.splice(index, 1)
- // }
- // })
- // console.log(this.routeArr, 1)
+ 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)
+ }
+ })
// 灏嗗�兼浛鎹㈠埌鍘焧ag浣嶇疆涓�
this.dynamicTags.forEach((item, index) => {
@@ -462,9 +466,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
@@ -506,11 +530,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 = ''
@@ -532,7 +572,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 {
@@ -541,7 +582,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 = ''
})
}
@@ -630,6 +672,9 @@
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()
}
})
@@ -644,10 +689,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()
},
// 瀵硅瘽妗嗗彇娑�
@@ -659,15 +706,16 @@
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: 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)
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index 66aad57..3381926 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -809,6 +809,9 @@
DeleteBeatRate(data).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getBeatRateSearch()
}
})
--
Gitblit v1.9.3