Merge remote-tracking branch 'origin/liujun-2024-04-07-相关方新需求' into pet

# Conflicts:
#	src/views/xgf/flow/components/sendUtil.vue
pull/11/head
liujun 2024-04-08 15:33:20 +08:00
commit 13ac36c60f
3 changed files with 20 additions and 10 deletions

View File

@ -263,6 +263,26 @@
<td style="width: 180px">{{ item.SPECIAL_TYPE_NAME }}</td> <td style="width: 180px">{{ item.SPECIAL_TYPE_NAME }}</td>
<th style="width: 150px">操作项目</th> <th style="width: 150px">操作项目</th>
<td>{{ item.OPERATION_TYPE_NAME }}</td> <td>{{ item.OPERATION_TYPE_NAME }}</td>
<th style="width: 100px">证书照片</th>
<td>
<span>
<div class="img-flex">
<viewer>
<img
:src="config.fileUrl + item.FILEPATH"
width="40"
height="40"
style="object-fit: cover;">
<img
v-if="item.FILEPATH_BACK"
:src="config.fileUrl + item.FILEPATH_BACK"
width="40"
height="40"
style="object-fit: cover;">
</viewer>
</div>
</span>
</td>
</tr> </tr>
<tr> <tr>
<th>特种作业证书编号</th> <th>特种作业证书编号</th>

View File

@ -419,11 +419,6 @@ export default {
).then((data) => { ).then((data) => {
const treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes') const treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
this.treeData = this.removeEmptyChildren(treeData) this.treeData = this.removeEmptyChildren(treeData)
this.treeData.push({
id: '0',
name: '无',
nodes: []
})
}).catch((e) => { }).catch((e) => {
}) })
}, },

View File

@ -539,11 +539,6 @@ export default {
).then((data) => { ).then((data) => {
const treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes') const treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
this.treeData = this.removeEmptyChildren(treeData) this.treeData = this.removeEmptyChildren(treeData)
this.treeData.push({
id: '0',
name: '无',
nodes: []
})
console.log(this.treeData) console.log(this.treeData)
}).catch((e) => { }).catch((e) => {
}) })