From 436569820a3084dcf90f8156a4f812bc220fbb98 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 31 八月 2022 11:17:23 +0800
Subject: [PATCH] 1.修改bug2.完成保养标准页面的开发
---
src/views/sbgl/djbw.vue | 1
src/views/sbgl/bybz.vue | 31 ++++++++++-----
src/views/scgl/scdd.vue | 6 ++-
src/views/zzmx/gylx.vue | 17 ++++++--
src/views/scgl/sckbg.vue | 5 +-
src/api/sbgl.js | 2
src/views/sbgl/djbz.vue | 6 ++
src/views/kb/zhkb.vue | 32 ----------------
src/views/wlgl/kwdy.vue | 7 ++-
src/views/sbgl/bybw.vue | 1
10 files changed, 53 insertions(+), 55 deletions(-)
diff --git a/src/api/sbgl.js b/src/api/sbgl.js
index 8f5e37e..6b2e147 100644
--- a/src/api/sbgl.js
+++ b/src/api/sbgl.js
@@ -258,6 +258,6 @@
return request({
url: 'DeviceManager/SaveDeviceRepairStanedAssociationEqp?repairstand_code=' + repairstand_code,
method: 'post',
- params: data
+ data
})
}
diff --git a/src/views/kb/zhkb.vue b/src/views/kb/zhkb.vue
index 974fb53..d24b679 100644
--- a/src/views/kb/zhkb.vue
+++ b/src/views/kb/zhkb.vue
@@ -676,7 +676,6 @@
linename: res1.data[0].linename,
lineworkcont: res1.data[0].lineworkcont,
children: res1.data[0].children ? res.data[0].children[count] : []
- // children: res1.data[0].children[count]
}
flag1 = false
}
@@ -706,7 +705,6 @@
}
}
}, 1000 * 3)
- // }, res1.data[0].children && res1.data[0].children.length > 0 ? 1000 * 3 : 1000 * 3)
} else if (index === 1) {
let count = 0
if (flag2) {
@@ -741,31 +739,7 @@
children: res2.data[0].children ? res2.data[0].children[count] : []
}
}
- // }, res2.data[0].children && res2.data[0].children.length > 0 ? 1000 * 3 : 1000 * 10)
}, 1000 * 3)
-
- // setInterval(() => {
- // if (count > 0) {
- // this.lineContent02 = {
- // linename: res2.data[0].linename,
- // lineworkcont: res2.data[0].lineworkcont,
- // children: res2.data[0].children ? res2.data[0].children[count] : []
- // }
- // }
- // if (res2.data[0].children.length === count++) {
- // count = 0
- // LineSearchTopLeftData([item]).then(res => {
- // res2 = res
- // this.lineContent02 = {
- // linename: res2.data[0].linename,
- // lineworkcont: res2.data[0].lineworkcont,
- // children: res2.data[0].children ? res2.data[0].children[count] : []
- // }
- // })
- //
- // // this.handleEveryLine(item, index)
- // }
- // }, res2.data[0].children && res2.data[0].children.length > 0 ? 1000 * 3 : 1000 * 10)
} else if (index === 2) {
let count = 0
if (flag3) {
@@ -797,17 +771,12 @@
if (res3.data[0].children.length === count++) {
count = 0
- // LineSearchTopLeftData([item]).then(res => {
- // res3 = res
this.lineContent03 = {
linename: res3.data[0].linename,
lineworkcont: res3.data[0].lineworkcont,
children: res3.data[0].children ? res3.data[0].children[count] : []
}
- // })
- // this.handleEveryLine(item, index)
}
- // }, res3.data[0].children && res3.data[0].children.length > 0 ? 1000 * 3 : 1000 * 10)
}, 1000 * 3)
} else if (index === 3) {
let count = 0
@@ -846,7 +815,6 @@
children: res4.data[0].children ? res4.data[0].children[count] : []
}
}
- // }, res4.data[0].children && res4.data[0].children.length > 0 ? 1000 * 3 : 1000 * 10)
}, 1000 * 3)
}
},
diff --git a/src/views/sbgl/bybw.vue b/src/views/sbgl/bybw.vue
index d4c0582..a927119 100644
--- a/src/views/sbgl/bybw.vue
+++ b/src/views/sbgl/bybw.vue
@@ -62,6 +62,7 @@
<el-table-column
prop="RowNum"
width="50"
+ fixed
label="搴忓彿"
/>
<el-table-column
diff --git a/src/views/sbgl/bybz.vue b/src/views/sbgl/bybz.vue
index 974b262..46357ab 100644
--- a/src/views/sbgl/bybz.vue
+++ b/src/views/sbgl/bybz.vue
@@ -51,6 +51,7 @@
<el-table-column
prop="RowNum"
width="50"
+ fixed
label="搴忓彿"
/>
<el-table-column
@@ -76,19 +77,26 @@
</template>
</el-table-column>
<el-table-column
- prop="iscontr"
+ prop="main_cycle"
label="淇濆吇鍛ㄦ湡"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.main_cycle==='Y'">骞�</div>
+ <div v-if="row.main_cycle==='S'">瀛�</div>
+ <div v-if="row.main_cycle==='M'">鏈�</div>
+ <div v-if="row.main_cycle==='W'">鍛�</div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="is_checkeqp"
+ prop="is_repaireqp"
label="鍏宠仈璁惧"
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_repaireqp==='Y'" class="el-icon-share" @click="checkeqpClick(row)" />
<i
- v-if="row.is_checkeqp==='N'"
+ v-if="row.is_repaireqp==='N'"
class="el-icon-share"
style="color: rgb(180 ,181, 185)"
@click="checkeqpClick(row)"
@@ -390,7 +398,7 @@
DeviceCheckStanedAssociationEqp, DeviceRepairItemSelect,
DeviceRepairStandArdSearch, DeviceRepairStanedAssociationEqp,
SaveDeviceCheckStanedAssociationEqp, SaveDeviceRepairStanedAssociationEqp,
- ViewDeviceCheckStanedSearch
+ ViewDeviceCheckStanedSearch, ViewDeviceRepairStanedSearch
} from '@/api/sbgl'
import $ from 'jquery'
@@ -566,7 +574,7 @@
// 淇敼鎸夐挳
edit(operation, row) {
this.operation = operation
- this.getViewDeviceCheckStanedSearch(row.code)
+ this.getViewDeviceRepairStanedSearch(row.code)
this.dialogVisible = true
this.$nextTick(() => {
@@ -580,8 +588,8 @@
// })
},
// 淇敼鍓嶈姹傛帴鍙�
- async getViewDeviceCheckStanedSearch(checkstand_code) {
- const { data: res } = await ViewDeviceCheckStanedSearch({ checkstand_code })
+ async getViewDeviceRepairStanedSearch(repairstand_code) {
+ const { data: res } = await ViewDeviceRepairStanedSearch({ repairstand_code })
this.tableDataDialog = res.Data
this.dialogForm.code = res.code
@@ -781,7 +789,7 @@
this.dialogFormEqp.name = row.name
this.dialogFormEqp.code = row.code
- const { data: res } = await DeviceRepairStanedAssociationEqp({ checkstand_code: row.code })
+ const { data: res } = await DeviceRepairStanedAssociationEqp({ repairstand_code: row.code })
this.dialogFormEqp.eqpAll = res
if (this.dialogFormEqp.eqpAll.length > 0) {
@@ -835,6 +843,9 @@
this.dialogFormEqp.eqpTree = [this.dialogFormEqp.eqpAll[index]]
}
})
+ this.$nextTick(() => { // 鏍戝舰鍥炴樉
+ this.$refs.epqTree.setCheckedKeys(this.dialogFormEqp.eqpCodeSelectedArr)
+ })
},
// 灏忕洅瀛愮偣鍑�
myCheckboxInputClick(val) {
diff --git a/src/views/sbgl/djbw.vue b/src/views/sbgl/djbw.vue
index 6e03434..d705093 100644
--- a/src/views/sbgl/djbw.vue
+++ b/src/views/sbgl/djbw.vue
@@ -71,6 +71,7 @@
<el-table-column
prop="RowNum"
width="50"
+ fixed
label="搴忓彿"
/>
<el-table-column
diff --git a/src/views/sbgl/djbz.vue b/src/views/sbgl/djbz.vue
index e07d5f2..4c08677 100644
--- a/src/views/sbgl/djbz.vue
+++ b/src/views/sbgl/djbz.vue
@@ -58,6 +58,7 @@
<el-table-column
prop="RowNum"
width="50"
+ fixed
label="搴忓彿"
/>
<el-table-column
@@ -881,6 +882,9 @@
this.dialogFormEqp.eqpTree = [this.dialogFormEqp.eqpAll[index]]
}
})
+ this.$nextTick(() => { // 鏍戝舰鍥炴樉
+ this.$refs.epqTree.setCheckedKeys(this.dialogFormEqp.eqpCodeSelectedArr)
+ })
},
// 灏忕洅瀛愮偣鍑�
myCheckboxInputClick(val) {
@@ -960,7 +964,7 @@
})
this.dialogFormEqp.eqpCodeSelectedArr = [...new Set(this.dialogFormEqp.eqpCodeSelectedArr)]
}
-
+ console.log(this.dialogFormEqp.eqpCodeSelectedArr, 666)
// 2.绗簩绉嶆儏鍐靛綋鏍戝舰 鍗婂彾 涓洪浂 鍏ㄥ彾 涓洪浂
if (halfCheckedKeys.length === 0 && checkedKeys.length === 0) {
console.log('// 2.绗簩绉嶆儏鍐靛綋鏍戝舰 鍗婂彾 涓洪浂 鍏ㄥ彾 涓洪浂')
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 3ddcfb9..5f5f9d7 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -389,7 +389,7 @@
<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 type="primary" :disabled="sendButtonIsDisabled" @click="dialogVisibleConfirm">涓� 杈�</el-button>
</div>
</span>
</el-dialog>
@@ -669,6 +669,8 @@
this.dialogForm.markqty = ''
this.dialogForm.ordernum = ''
this.dialogForm.relse_qty = ''
+
+ this.sendButtonIsDisabled = false
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -698,7 +700,7 @@
'ordernum': this.dialogForm.ordernum,
'relse_qty': this.dialogForm.relse_qty
}
- console.log(data)
+ this.sendButtonIsDisabled = true
MarkSaveErpOrder(data).then(res => {
if (res.code === '200') {
this.$message.success('涓嬭揪鎴愬姛锛�')
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 236d360..0736e29 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -829,8 +829,8 @@
<el-form-item
v-if="dialogTitle==='澶栧崗鏀舵枡'"
label="涓嶈壇鍘熷洜锛�"
- prop="badcode"
>
+ <!-- prop="badcode"-->
<el-select
v-model="dialogForm.badcode"
style="width: 200px;"
@@ -1325,7 +1325,8 @@
operation: getCookie('navTabId')
},
badTableDataDialog: [], // 涓嶈壇瀵硅瘽妗唗able琛ㄦ牸
- OperationArr: [] // 浜哄憳鏁扮粍
+ OperationArr: [], // 浜哄憳鏁扮粍
+ sendButtonIsDisabled: false// 涓嬭揪鎸夐挳鏄惁鍙偣鍑�
}
},
// computed: {
diff --git a/src/views/wlgl/kwdy.vue b/src/views/wlgl/kwdy.vue
index 24d83c1..58d881b 100644
--- a/src/views/wlgl/kwdy.vue
+++ b/src/views/wlgl/kwdy.vue
@@ -25,9 +25,6 @@
<el-form-item label="搴撲綅鎻忚堪" style=" display: flex;">
<el-input v-model="form.description" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
- <el-input v-model="form.createuser" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
<el-form-item label="鎵�灞炰粨搴�" style=" display: flex;">
<el-select
v-model="form.stockcode"
@@ -44,6 +41,10 @@
/>
</el-select>
</el-form-item>
+ <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
+ <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">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index 5c9d1aa..70ffcee 100644
--- a/src/views/zzmx/gylx.vue
+++ b/src/views/zzmx/gylx.vue
@@ -432,6 +432,15 @@
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)
+
// 灏嗗�兼浛鎹㈠埌鍘焧ag浣嶇疆涓�
this.dynamicTags.forEach((item, index) => {
if ((index + 1) === tag.seq) {
@@ -577,10 +586,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()
},
--
Gitblit v1.9.3