663 排序不正确】
659 没有重置 659 没有重置 657 重置按钮不好使 565 审核弹窗排版调整一下 506 添加专家组成员页面 搜索掉线liujun0703-新项目开发
parent
cbdce13b4e
commit
6305e03fae
|
@ -27,7 +27,7 @@
|
|||
<template slot-scope="{ row }">
|
||||
<el-button v-if="false" type="text" icon="el-icon-download" size="mini" @click="confirmExport(row.ID)">数据导出</el-button>
|
||||
<el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.ID)">编辑</el-button>
|
||||
<el-button type="text" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID, row.UNIT)">删除</el-button>
|
||||
<el-button v-if="false" type="text" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID, row.UNIT)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
@ -35,7 +35,7 @@
|
|||
<div>
|
||||
<template>
|
||||
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
|
||||
<el-button type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button>
|
||||
<el-button v-if="false" type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button>
|
||||
</template>
|
||||
</div>
|
||||
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
|
||||
|
|
|
@ -227,8 +227,10 @@ export default {
|
|||
this.dialogFormEdit = false
|
||||
this.varList = []
|
||||
this.listQuery.page = 1
|
||||
this.$message.success('保存成功')
|
||||
this.getList()
|
||||
}).catch((e) => {
|
||||
this.$message.error('保存失败')
|
||||
this.listLoading = false
|
||||
})
|
||||
},
|
||||
|
@ -246,11 +248,13 @@ export default {
|
|||
id: id
|
||||
}
|
||||
).then((data) => {
|
||||
if (data.result == 'success') {
|
||||
if (data.result === 'success') {
|
||||
this.listLoading = false
|
||||
this.$message.success('删除成功')
|
||||
this.getList()
|
||||
}
|
||||
}).catch((e) => {
|
||||
this.$message.error(e)
|
||||
this.listLoading = false
|
||||
})
|
||||
}).catch(() => {
|
||||
|
|
|
@ -11,7 +11,14 @@
|
|||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
|
||||
<el-table
|
||||
ref="multipleTable"
|
||||
:data="varList"
|
||||
:header-cell-style="{'font-weight': 'bold','color': '#000'}"
|
||||
tooltip-effect="dark"
|
||||
border
|
||||
fit
|
||||
highlight-current-row>
|
||||
<el-table-column type="selection" width="55" align="center"/>
|
||||
<el-table-column type="index" label="序号" width="50" align="center"/>
|
||||
<el-table-column prop="USER_NAME" label="姓名" width="180"/>
|
||||
|
@ -28,7 +35,13 @@
|
|||
<template slot-scope="{row}">
|
||||
<el-button type="text" icon="el-icon-document" size="mini" @click="showDetails(row)">查看</el-button>
|
||||
<el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.ID)">编辑</el-button>
|
||||
<el-button type="text" style="color: red;" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID,row.USER_NAME)">删除</el-button>
|
||||
<el-button
|
||||
type="text"
|
||||
style="color: red;"
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
@click="handleDelete(row.ID,row.USER_NAME)">删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
@ -372,7 +385,8 @@ export default {
|
|||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
})
|
||||
}).catch(() => { })
|
||||
}).catch(() => {
|
||||
})
|
||||
},
|
||||
makeAll() {
|
||||
const _selectData = this.$refs.multipleTable.selection
|
||||
|
@ -398,7 +412,8 @@ export default {
|
|||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
})
|
||||
}).catch(() => { })
|
||||
}).catch(() => {
|
||||
})
|
||||
},
|
||||
getQuery() {
|
||||
this.$refs.multipleTable.clearSelection()
|
||||
|
@ -407,9 +422,7 @@ export default {
|
|||
getList() {
|
||||
this.listLoading = true
|
||||
requestFN('/major/personnel/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
|
||||
{
|
||||
name: this.KEYWORDS_NAME
|
||||
}
|
||||
{ name: this.KEYWORDS_NAME }
|
||||
).then((data) => {
|
||||
this.listLoading = false
|
||||
this.varList = data.varList
|
||||
|
|
|
@ -344,7 +344,12 @@ export default {
|
|||
{ required: true, message: '负责人不能为空', trigger: 'blur' }
|
||||
],
|
||||
RESPONSIBLE_OFFICE_PHONE: [
|
||||
{ required: true, message: '负责人办公电话不能为空', trigger: 'blur' }
|
||||
{ required: true, message: '负责人办公电话不能为空', trigger: 'blur' },
|
||||
{ min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' },
|
||||
{
|
||||
pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
|
||||
message: '请输入正确的手机号码'
|
||||
}
|
||||
]
|
||||
},
|
||||
// rules: {
|
||||
|
|
|
@ -535,7 +535,9 @@ export default {
|
|||
this.varList = []
|
||||
this.listQuery.page = 1
|
||||
this.getList()
|
||||
this.$message.success('保存成功')
|
||||
}).catch((e) => {
|
||||
this.$message.error(e)
|
||||
this.listISLOADing = false
|
||||
})
|
||||
},
|
||||
|
|
|
@ -38,14 +38,19 @@
|
|||
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
|
||||
</div>
|
||||
|
||||
<el-dialog :visible.sync="dialogFormCheck" title="审核" width="400px" class="dy-dialog">
|
||||
<el-dialog :visible.sync="dialogFormCheck" title="审核" width="400px">
|
||||
<el-form inline label-width="120px">
|
||||
<el-form-item label="审核状态:" >
|
||||
<Treeselect
|
||||
:options="FILESTATUSThree"
|
||||
v-model="AUDIT_STATUS"
|
||||
placeholder="请选择预案类型"
|
||||
no-options-text="暂无数据"
|
||||
no-children-text="暂无数据"
|
||||
style="width: 300px"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogFormCheck = false">取 消</el-button>
|
||||
<el-button type="primary" @click="setCheck">确 定</el-button>
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
<div>
|
||||
<template>
|
||||
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
|
||||
<el-button type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button>
|
||||
<el-button v-if="false" type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button>
|
||||
</template>
|
||||
</div>
|
||||
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<el-dialog v-loading="listLoading" :visible.sync="visible" title="选择人员" width="850px">
|
||||
<el-dialog v-loading="listLoading" :visible.sync="visible" :before-close="closeDialog" title="选择人员" width="850px">
|
||||
<el-container>
|
||||
<el-aside width="240px" style="background-color:#fff">
|
||||
<el-input
|
||||
|
@ -59,7 +59,7 @@
|
|||
</el-main>
|
||||
</el-container>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="visible = false">取 消</el-button>
|
||||
<el-button @click="closeDialog">取 消</el-button>
|
||||
<el-button type="primary" @click="savePeople">确 定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
@ -189,6 +189,12 @@ export default {
|
|||
}).catch((e) => {
|
||||
this.treeLoading = false
|
||||
})
|
||||
},
|
||||
closeDialog() {
|
||||
this.filterText = ''
|
||||
this.KEYWORDS = ''
|
||||
this.treeData = []
|
||||
this.visible = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -38,7 +38,15 @@
|
|||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
<el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" style="height:350px" tooltip-effect="dark" border fit highlight-current-row>
|
||||
<el-table
|
||||
ref="multipleTable"
|
||||
:data="varList"
|
||||
:header-cell-style="{'font-weight': 'bold','color': '#000'}"
|
||||
tooltip-effect="dark"
|
||||
border
|
||||
fit
|
||||
height="350px"
|
||||
highlight-current-row>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column prop="NAME" label="姓名" />
|
||||
<el-table-column prop="USERNAME" width="180" align="center" label="电话号码" />
|
||||
|
|
|
@ -30,6 +30,10 @@
|
|||
<td class="tbg">联系电话</td>
|
||||
<td>{{ form.CONTACT_PHONE }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tbg">其他信息</td>
|
||||
<td colspan="3">{{ form.OTHER_INFO }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tbg">单位名称</td>
|
||||
<td>{{ form.UNIT_NAME }}</td>
|
||||
|
@ -57,14 +61,15 @@
|
|||
<tr>
|
||||
<td class="tbg">所在地址</td>
|
||||
<td>{{ form.LOCATION_ADDRESS }}</td>
|
||||
<td class="tbg">经度</td>
|
||||
<td>{{ form.LONGITUDE }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tbg">纬度</td>
|
||||
<td>{{ form.LATITUDE }}</td>
|
||||
<td class="tbg">接报类型</td>
|
||||
<td>{{ form.REPORT_TYPE }}</td>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tbg">经度</td>
|
||||
<td>{{ form.LONGITUDE }}</td>
|
||||
<td class="tbg">纬度</td>
|
||||
<td>{{ form.LATITUDE }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tbg">事故标题</td>
|
||||
|
|
|
@ -197,7 +197,7 @@
|
|||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-col v-if="rescueForm.RESCUE_SITUATION === '1'" :span="12">
|
||||
<el-form-item label="是否执预案:" prop="EVENT_SITUATION">
|
||||
<el-radio-group v-model="rescueForm.EVENT_SITUATION">
|
||||
<el-radio :label="'1'">是</el-radio>
|
||||
|
|
|
@ -1,11 +1,16 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<div class="filter-container">
|
||||
<el-form inline>
|
||||
<el-form-item label="专家姓名:" prop="EXPERT_GROUP_ID">
|
||||
<el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;" />
|
||||
<el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
|
||||
搜索
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item prop="EXPERT_NAME">
|
||||
<el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">搜索</el-button>
|
||||
<el-button class="filter-item" type="info" icon="el-icon-search" @click="resetting">重置</el-button>
|
||||
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div class="ui-foot">
|
||||
<el-button type="primary" @click="goBack">返回专家组</el-button>
|
||||
</div>
|
||||
|
@ -130,6 +135,10 @@ export default {
|
|||
getQuery() {
|
||||
this.$refs.multipleTable.clearSelection()
|
||||
this.getList()
|
||||
},
|
||||
resetting() {
|
||||
this.KEYWORDS = ''
|
||||
this.getList()
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -290,8 +290,13 @@ export default {
|
|||
this.FFILE = fileList
|
||||
},
|
||||
upload(fun) {
|
||||
const loading = this.$loading({
|
||||
lock: true,
|
||||
text: 'Loading',
|
||||
spinner: 'el-icon-loading',
|
||||
background: 'rgba(0, 0, 0, 0.7)'
|
||||
})
|
||||
const formData = new FormData()
|
||||
|
||||
for (let i = 0; i < this.FFILE.length; i++) {
|
||||
if (this.FFILE[i].raw) {
|
||||
formData.append('FFILE', this.FFILE[i].raw)
|
||||
|
@ -302,7 +307,10 @@ export default {
|
|||
formData
|
||||
).then((data) => {
|
||||
fun(data.fileurl)
|
||||
loading.close()
|
||||
}).catch((e) => {
|
||||
this.$message.error(e)
|
||||
loading.close()
|
||||
})
|
||||
},
|
||||
//* ****************************************
|
||||
|
@ -461,6 +469,7 @@ export default {
|
|||
requestFN(
|
||||
'/yjExpertGroup/save', this.form
|
||||
).then((data) => {
|
||||
this.$message.success('保存成功')
|
||||
this.listISLOADing = false
|
||||
this.dialogFormEdit = false
|
||||
this.varList = []
|
||||
|
@ -511,6 +520,7 @@ export default {
|
|||
}
|
||||
this.getList()
|
||||
}).catch((e) => {
|
||||
this.$message.error(e)
|
||||
this.listISLOADing = false
|
||||
})
|
||||
},
|
||||
|
@ -529,10 +539,12 @@ export default {
|
|||
}
|
||||
).then((data) => {
|
||||
if (data.result === 'success') {
|
||||
this.$message.success('删除成功')
|
||||
this.listISLOADing = false
|
||||
this.getList()
|
||||
}
|
||||
}).catch((e) => {
|
||||
this.$message.error(e)
|
||||
this.listISLOADing = false
|
||||
})
|
||||
}).catch(() => {
|
||||
|
@ -570,6 +582,7 @@ export default {
|
|||
this.listQuery.page = 1
|
||||
this.$refs.multipleTable.clearSelection()
|
||||
this.getList()
|
||||
this.$message.success('删除成功')
|
||||
}).catch((e) => {
|
||||
this.listISLOADing = false
|
||||
})
|
||||
|
|
|
@ -609,7 +609,9 @@ export default {
|
|||
this.varList = []
|
||||
this.listQuery.page = 1
|
||||
this.getList()
|
||||
this.$message.success('保存成功')
|
||||
}).catch((e) => {
|
||||
console.error('保存失败', e)
|
||||
this.listISLOADing = false
|
||||
})
|
||||
},
|
||||
|
|
|
@ -194,6 +194,7 @@ export default {
|
|||
},
|
||||
resetQuery() {
|
||||
this.RESCUE_TEAM_NAME = ''
|
||||
this.NAME = ''
|
||||
this.getQuery()
|
||||
},
|
||||
goList(page, CASE_ID, ticketType) {
|
||||
|
|
|
@ -12,8 +12,8 @@
|
|||
</el-button>
|
||||
</div>
|
||||
<div>
|
||||
<el-button v-show="add" type="primary" icon="el-icon-plus" plain @click="handleAdd">新增</el-button>
|
||||
<el-button v-show="del" type="danger" icon="el-icon-delete" plain @click="batchDel">删除</el-button>
|
||||
<el-button type="primary" icon="el-icon-plus" plain @click="handleAdd">新增</el-button>
|
||||
<el-button type="danger" icon="el-icon-delete" plain @click="batchDel">删除</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
@ -38,8 +38,8 @@
|
|||
<el-table-column prop="ORG_DUTY" label="机构职责" />
|
||||
<el-table-column label="操作" align="center" width="200">
|
||||
<template slot-scope="{row}">
|
||||
<el-button v-show="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.EMERGENCYDRILLORG_ID)">编辑</el-button>
|
||||
<el-button v-show="del" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.EMERGENCYDRILLORG_ID)">删除</el-button>
|
||||
<el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.EMERGENCYDRILLORG_ID)">编辑</el-button>
|
||||
<el-button type="text" style="color: red" icon="el-icon-delete" size="mini" @click="handleDelete(row.EMERGENCYDRILLORG_ID)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
@ -186,6 +186,7 @@ export default {
|
|||
this.listLoading = false
|
||||
this.dialogFormEdit = false
|
||||
this.getList()
|
||||
this.$message.success('保存成功')
|
||||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
})
|
||||
|
|
|
@ -12,8 +12,8 @@
|
|||
</el-button>
|
||||
</div>
|
||||
<div>
|
||||
<el-button v-show="add" type="primary" icon="el-icon-plus" plain @click="handleAdd">新增</el-button>
|
||||
<el-button v-show="del" type="danger" icon="el-icon-delete" plain @click="batchDel">删除</el-button>
|
||||
<el-button type="primary" icon="el-icon-plus" plain @click="handleAdd">新增</el-button>
|
||||
<el-button type="danger" icon="el-icon-delete" plain @click="batchDel">删除</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
@ -41,8 +41,8 @@
|
|||
<el-table-column prop="MEMBER_EMERGENCY_PHONE" label="紧急联系电话" width="110" />
|
||||
<el-table-column label="操作" align="center" width="200">
|
||||
<template slot-scope="{row}">
|
||||
<el-button v-show="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.EMERGENCYDRILLORGMEMBER_ID)">编辑</el-button>
|
||||
<el-button v-show="del" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.EMERGENCYDRILLORGMEMBER_ID)">删除</el-button>
|
||||
<el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.EMERGENCYDRILLORGMEMBER_ID)">编辑</el-button>
|
||||
<el-button type="text" style="color: red" icon="el-icon-delete" size="mini" @click="handleDelete(row.EMERGENCYDRILLORGMEMBER_ID)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
@ -220,6 +220,7 @@ export default {
|
|||
this.listLoading = false
|
||||
this.dialogFormEdit = false
|
||||
this.getList()
|
||||
this.$message.success('保存成功')
|
||||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
})
|
||||
|
|
Loading…
Reference in New Issue