haozq
/
ah_jjzhgd_webservice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
haozq 2024-04-18 11:04:40 +08:00
parent 5706fa2010 1653a5acb8
commit 4b941df804
3 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ah-jjzhgd-web/src/views/basic/area/index.vue
View File

@ -51,7 +51,7 @@
<el-table-column label="区域名称" align="center" prop="areaName" />
<el-table-column label="标段工程" align="center" prop="proName" />
<el-table-column label="备注" align="center" prop="remarks" />
<el-table-column label="杆塔名称" align="center" prop="gtId" />
<el-table-column label="杆塔名称" align="center" prop="gtName" />
<el-table-column label="是否是有限空间" align="center" prop="areaType">
<template slot-scope="{ row }">
{{ row.areaType && getStatus(row.areaType) }}

4
ah-jjzhgd-web/src/views/basic/model/index.vue
View File

@ -38,8 +38,8 @@
</el-table-column>
<el-table-column label="工程名称" align="center" prop="proName" />
<el-table-column label="杆塔名称" align="center" prop="gtName" />
<el-table-column label="上传日期" align="center" prop="createTime" />
<el-table-column label="备注" align="center" prop="remarks" />
<!-- <el-table-column label="上传日期" align="center" prop="createTime" />
<el-table-column label="备注" align="center" prop="remarks" /> -->
<el-table-column label="三维文件数量" align="center" prop="fileNum">
<template slot-scope="{ row }">
<el-button type="text" size="mini" @click="handleView(row)">{{ row.fileNum }}</el-button>

44
ah-jjzhgd-web/src/views/man-car/team/index.vue
View File

@ -101,7 +101,10 @@
<el-input v-model="temp.idNumber" placeholder="班组长身份证" :maxlength="50" />
</el-form-item>
<el-form-item label="班组状态：" prop="status">
<el-input v-model="temp.status" placeholder="班组状态" :maxlength="50" />
<!-- <el-input v-model="temp.status" placeholder="班组状态" :maxlength="50" /> -->
<el-select v-model="temp.status" clearable filterable style="width: 100%" class="filter-item" placeholder="请选择班组状态" >
<el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -149,6 +152,7 @@ export default {
tableKey: 0,
list: [],
teamList: [],
statusList:[{id:'1',name:'施工'},{id:'2',name:'暂停'},{id:'3',name:'完工'}],
total: 0,
listLoading: false,
listQuery: {
@ -218,15 +222,18 @@ export default {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
addTeamItem(this.temp).then((response) => {
this.$message({
showClose: true,
message: response.msg,
type: 'success',
duration: 2000
})
this.getList()
if(response.code==200){
this.$message({
showClose: true,
message: response.msg,
type: 'success',
duration: 2000
})
this.dialogFormVisible = false
this.getList()
}
}).finally(() => {
this.dialogFormVisible = false
})
}
})
@ -243,15 +250,18 @@ export default {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
updateTeamItem(this.temp).then((response) => {
this.$message({
showClose: true,
message: response.msg,
type: 'success',
duration: 2000
})
this.getList()
if(response.code==200){
this.$message({
showClose: true,
message: response.msg,
type: 'success',
duration: 2000
})
this.dialogFormVisible = false
this.getList()
}
}).finally(() => {
this.dialogFormVisible = false
})
}
})