guoyuepeng
/
qa-prevention-gwj-vue
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pet' into pet

dev
guoyuepeng 2024-11-19 14:24:33 +08:00
parent 71fded8e8a edcfbd9553
commit 0e657bb5c6
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/views/hidden/list/components/list.vue
View File

@ -360,25 +360,26 @@ export default {
}, },
// 重置 // 重置
goKeyReset() { goKeyReset() {
this.KEYWORDS = '' // this.KEYWORDS = ''
this.STATE = '' // this.STATE = ''
this.SOURCE = '' // this.SOURCE = ''
this.RECTIFICATIONORNAME = '' // this.RECTIFICATIONORNAME = ''
this.HIDDENFIND_NAME = '' // this.HIDDENFIND_NAME = ''
this.CHECKNAME = '' // this.CHECKNAME = ''
this.confirmUserName = '' // this.confirmUserName = ''
this.keyFindUserDept = '' // this.keyFindUserDept = ''
this.keyHiddenPart = '' // this.keyHiddenPart = ''
this.DEPARTMENT_ID = '' // this.DEPARTMENT_ID = ''
this.dates = [] // this.dates = []
this.DISPOSESTATE = '' // this.DISPOSESTATE = ''
this.ISQUALIFIED = '' // this.ISQUALIFIED = ''
this.$refs.deptTree_Select3.clearHandle() // this.$refs.deptTree_Select3.clearHandle()
this.$refs.deptTree_Select.clearHandle() // this.$refs.deptTree_Select.clearHandle()
this.$refs.hlTree_Select.clearHandle() // this.$refs.hlTree_Select.clearHandle()
this.HIDDENLEVEL = '' // this.HIDDENLEVEL = ''
this.$refs.hiddenPart_Select.clearHandle() // this.$refs.hiddenPart_Select.clearHandle()
this.getQuery() this.$refs.multipleTable.clearSelection()
this.getList()
}, },
// 获得部门树 // 获得部门树
getTreeData1() { getTreeData1() {

2
src/views/hotwork/hotwork/components/info.vue
View File

@ -44,7 +44,7 @@
<td colspan="5">{{ pd.JOB_CONTENT }}</td> <td colspan="5">{{ pd.JOB_CONTENT }}</td>
</tr> </tr>
<tr> <tr>
<td class="tbg" rowspan="2">现场负责人</td> <td class="tbg" rowspan="2">现场管辖人</td>
<td>姓名：{{ pd.SITE_LEADER_NAME }}</td> <td>姓名：{{ pd.SITE_LEADER_NAME }}</td>
<td class="tbg" rowspan="2">动火操作人</td> <td class="tbg" rowspan="2">动火操作人</td>
<td rowspan="2">{{ pd.HOT_WORK_OPERATOR_NAME }}</td> <td rowspan="2">{{ pd.HOT_WORK_OPERATOR_NAME }}</td>