Commit b2fff42e by 史敦盼

督查整改督查通报调试

1 parent 3ce2232d
...@@ -724,10 +724,31 @@ export function editFeedback(params) { ...@@ -724,10 +724,31 @@ export function editFeedback(params) {
return post(EADC_ARRCHITECTURE + '/prj-need-file/upd', params) return post(EADC_ARRCHITECTURE + '/prj-need-file/upd', params)
} }
// 架构督查-督查通报管理 // 架构督查-督查通报管理更新
export function updReportManage(params) { export function updReportManage(params) {
return post(EADC_ARRCHITECTURE + '/reportManage/upd', params) return post(EADC_ARRCHITECTURE + '/reportManage/upd', params)
} }
// 架构督查-督查通报管理删除
export function delReportManage(params) { export function delReportManage(params) {
return post(EADC_ARRCHITECTURE + '/reportManage/del', params) return post(EADC_ARRCHITECTURE + '/reportManage/del', params)
} }
// 架构督查-督查问题整改-更新
export function updRectifyReform(params) {
return post(EADC_ARRCHITECTURE + '/rectifyReform/fb', params)
}
// 概设评审基础管理 --新增事项
export function addMatterInfo(params) {
return post(EADC_ARRCHITECTURE + '/int-info/ad', params)
}
// 概设评审基础管理 --修改事项
export function updMatterInfo(params) {
return post(EADC_ARRCHITECTURE + '/int-info/upd', params)
}
// 概设评审基础管理 --新增组织机构
export function addOrgInfo(params) {
return post(EADC_ARRCHITECTURE + '/org-info/ad', params)
}
// 概设评审基础管理 --修改组织机构
export function updOrgInfo(params) {
return post(EADC_ARRCHITECTURE + '/org-info/upd', params)
}
...@@ -30,5 +30,7 @@ export const querySupervisionNotifyManagement = ...@@ -30,5 +30,7 @@ export const querySupervisionNotifyManagement =
export const querySupervisionProblem = export const querySupervisionProblem =
EADC_ARRCHITECTURE + '/rectifyReform/selectRectifyReform' EADC_ARRCHITECTURE + '/rectifyReform/selectRectifyReform'
// 概设评审基础管理 // 概设评审基础管理-集成管理
export const queryConceptualBaseManagement = EADC_ARRCHITECTURE + '/int-info/' export const queryConceptualBaseManagement = EADC_ARRCHITECTURE + '/int-info/'
// 概设评审基础管理-组织机构管理
export const queryConceptualBaseOrg = EADC_ARRCHITECTURE + '/org-info/'
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Autor: pan * @Autor: pan
* @Date: 2024-03-12 14:55:59 * @Date: 2024-03-12 14:55:59
* @LastEditors: pan * @LastEditors: pan
* @LastEditTime: 2024-03-26 15:54:50 * @LastEditTime: 2024-03-27 09:47:20
--> -->
<!-- /** <!-- /**
* 搜索栏公共组件 * 搜索栏公共组件
...@@ -158,6 +158,9 @@ export default { ...@@ -158,6 +158,9 @@ export default {
flex-shrink: 0; flex-shrink: 0;
color: #000; color: #000;
} }
/deep/ .el-form-item__content {
text-align: left;
}
// el-input宽度 // el-input宽度
/deep/ .form-item { /deep/ .form-item {
.el-input, .el-input,
......
...@@ -78,3 +78,17 @@ export const completionStatus = [ ...@@ -78,3 +78,17 @@ export const completionStatus = [
{ label: '未完成', value: 0 }, { label: '未完成', value: 0 },
{ label: '已完成', value: 1 }, { label: '已完成', value: 1 },
] ]
export const subjectType = [
{ label: '总部', value: 1 },
{ label: '省公司', value: 2 },
]
export const collectState = [
{ label: '已停用', value: 0 },
{ label: '已发布', value: 1 },
{ label: '暂存', value: 2 },
]
export const whether = [
{ label: '否', value: 0 },
{ label: '是', value: 1 },
]
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Autor: pan * @Autor: pan
* @Date: 2024-03-26 10:53:48 * @Date: 2024-03-26 10:53:48
* @LastEditors: pan * @LastEditors: pan
* @LastEditTime: 2024-03-26 16:56:57 * @LastEditTime: 2024-03-27 10:09:56
--> -->
<template> <template>
<div class="searchTable"> <div class="searchTable">
...@@ -173,13 +173,13 @@ export default { ...@@ -173,13 +173,13 @@ export default {
// this.fnEdit(row) // this.fnEdit(row)
break break
case '提交': case '提交':
this.fnSubmit(row, '提交') this.fnSubmit(row, '提交', 1)
break break
case '审批': case '审批':
// this.fnApproval(row) this.fnSubmit(row, '审批', 2)
break break
case '发布': case '发布':
this.fnSubmit(row, '发布') this.fnSubmit(row, '发布', 3)
break break
case '删除': case '删除':
this.fnDel(row) this.fnDel(row)
...@@ -193,7 +193,7 @@ export default { ...@@ -193,7 +193,7 @@ export default {
this.rowData = row this.rowData = row
this.approvalVisible = true this.approvalVisible = true
}, },
fnSubmit(row, text) { fnSubmit(row, text, state) {
this.$confirm(`是否确认${text}?`, '提示', { this.$confirm(`是否确认${text}?`, '提示', {
confirmButtonText: '确认', confirmButtonText: '确认',
cancelButtonText: '取消', cancelButtonText: '取消',
...@@ -202,7 +202,7 @@ export default { ...@@ -202,7 +202,7 @@ export default {
.then(() => { .then(() => {
const params = { const params = {
...row, ...row,
state: text === '提交' ? 1 : 3, state,
} }
updReportManage(params).then((res) => { updReportManage(params).then((res) => {
if (res.code === 200) { if (res.code === 200) {
......
<template>
<el-dialog
title="关闭问题"
:visible.sync="showDialog"
:close-on-click-modal="false"
width="400px"
@close="handleClose()"
>
<div>
<Form
ref="closeProblemForm"
:form-options="formOptions"
label-width="140px"
></Form>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose()" size="mini">取 消</el-button>
<el-button type="primary" @click="handleSubmit" size="mini"
>确 定</el-button
>
</span></el-dialog
>
</template>
<script>
import Form from '@/components/Form.vue'
import { updRectifyReform } from '@/api'
import { whether } from '@/utils/dictionary'
export default {
props: {
visible: {
type: Boolean,
default: false,
},
rowData: {
type: Object,
default: () => {},
},
},
data() {
return {}
},
components: {
Form,
},
computed: {
formOptions() {
return [
{
label: '是否为典型问题:', // label文字
prop: 'typical', // 字段名
element: 'el-radio', // 指定elementui组件
placeholder: '请输入内容', // elementui组件属性
options: whether,
initValue: 0,
span: 24,
rules: [{ required: true, trigger: 'blur', message: '不能为空' }],
},
]
},
showDialog: {
get() {
return this.visible
},
set(value) {
this.$emit('update:visible', value)
},
},
},
methods: {
handleSubmit() {
this.$refs['closeProblemForm'].onValidate(() => {
const loading = this.$loading({
lock: true,
text: '保存中',
spinner: 'el-icon-loading',
})
const formInfo = this.$refs['closeProblemForm'].getData()
const params = {
...formInfo,
state: 3,
}
updRectifyReform(params).then((res) => {
if (res.code === 200) {
loading.close()
this.$message.success('关闭成功')
this.showDialog = false
this.handleClose()
this.$emit('querySearch')
}
})
})
},
handleClose() {
this.showDialog = false
this.formOptions[0].initValue = 0
this.$refs['closeProblemForm'].addInitValue()
this.$refs['closeProblemForm'].onReset()
},
},
}
</script>
<style scoped lang="scss">
@import '@/styles/elementui.scss';
</style>
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Autor: pan * @Autor: pan
* @Date: 2024-03-26 10:53:48 * @Date: 2024-03-26 10:53:48
* @LastEditors: pan * @LastEditors: pan
* @LastEditTime: 2024-03-26 17:27:33 * @LastEditTime: 2024-03-27 09:57:57
--> -->
<template> <template>
<div class="searchTable"> <div class="searchTable">
...@@ -25,20 +25,7 @@ ...@@ -25,20 +25,7 @@
</table-config> </table-config>
</template> </template>
</list-page> </list-page>
<CloseProblem @querySearch="querySearch" :visible.sync="visible" />
<!-- 新增弹窗 -->
<!-- <Edit
@querySearch="querySearch"
:visible.sync="visible"
:row-data="rowData"
:title="dialogTitle"
></Edit> -->
<!-- <ApprovalDialog
:row-data="rowData"
@querySearch="querySearch"
title="审批"
:visible.sync="approvalVisible"
/> -->
</div> </div>
</template> </template>
...@@ -46,17 +33,18 @@ ...@@ -46,17 +33,18 @@
import ListPage from '@/components/ListPage.vue' import ListPage from '@/components/ListPage.vue'
import SearchForm from '@/components/SearchForm.vue' import SearchForm from '@/components/SearchForm.vue'
import TableConfig from '@/components/TableConfig.vue' import TableConfig from '@/components/TableConfig.vue'
// import Edit from './Edit.vue' import CloseProblem from './CloseProblem.vue'
import { updReportManage, delReportManage } from '@/api/index.js'
import { updRectifyReform } from '@/api/index.js'
import { querySupervisionProblem } from '@/api/interface' import { querySupervisionProblem } from '@/api/interface'
import { approvalStatusOptions } from '@/utils/dictionary' import { whether } from '@/utils/dictionary'
export default { export default {
name: 'supervisionProblemEdit', name: 'supervisionProblemEdit',
components: { components: {
ListPage, ListPage,
SearchForm, SearchForm,
TableConfig, TableConfig,
// Edit, CloseProblem,
}, },
data() { data() {
return { return {
...@@ -67,9 +55,6 @@ export default { ...@@ -67,9 +55,6 @@ export default {
queryParam: {}, queryParam: {},
}, },
visible: false, visible: false,
rowData: {},
dialogTitle: '',
approvalVisible: false,
} }
}, },
computed: { computed: {
...@@ -101,40 +86,45 @@ export default { ...@@ -101,40 +86,45 @@ export default {
{ label: '指标评分', prop: 'score' }, { label: '指标评分', prop: 'score' },
{ label: '整改日期', prop: 'createTime', width: '120px' }, { label: '整改日期', prop: 'createTime', width: '120px' },
{ label: '整改情况', prop: 'state' }, { label: '整改情况', prop: 'state' },
{ label: '是否典型问题', prop: 'typical' }, {
label: '是否典型问题',
prop: 'typical',
options: whether,
collectionType: true,
},
{ label: '问题等级', prop: 'level' }, { label: '问题等级', prop: 'level' },
{ {
label: '操作', label: '操作',
type: 'operation', type: 'operation',
width: '380px', width: '420px',
actionButtons: [ actionButtons: [
{ {
title: '编辑', title: '查看',
type: 'primary', type: 'primary',
size: 'mini', size: 'mini',
plain: true, plain: true,
icon: 'el-icon-edit', icon: 'el-icon-view',
}, },
{ {
title: '查看', title: '提交',
type: 'primary',
size: 'mini', size: 'mini',
icon: 'el-icon-edit',
type: 'primary',
plain: true, plain: true,
icon: 'el-icon-view',
}, },
{ {
title: '发布', title: '整改未通过',
size: 'mini', size: 'mini',
icon: 'el-icon-s-check',
type: 'primary',
plain: true, plain: true,
type: 'primary',
icon: 'el-icon-edit',
}, },
{ {
title: '删除', title: '关闭问题',
type: 'danger',
size: 'mini', size: 'mini',
plain: true, plain: true,
icon: 'el-icon-delete', type: 'primary',
icon: 'el-icon-edit',
}, },
], ],
callback: (row, title) => { callback: (row, title) => {
...@@ -157,11 +147,6 @@ export default { ...@@ -157,11 +147,6 @@ export default {
} }
this.$refs.searchTable.queryData() this.$refs.searchTable.queryData()
}, },
fnAdd() {
this.rowData = {}
this.dialogTitle = '新增批次计划'
this.visible = true
},
/** /**
* @description: 操作按钮 * @description: 操作按钮
* @param {Object} row 当前操作行数据 * @param {Object} row 当前操作行数据
...@@ -170,34 +155,23 @@ export default { ...@@ -170,34 +155,23 @@ export default {
*/ */
fnOperation(row, title) { fnOperation(row, title) {
switch (title) { switch (title) {
case '编辑':
this.fnEdit(row)
break
case '查看': case '查看':
// this.fnEdit(row) // this.fnEdit(row)
break break
case '提交': case '提交':
this.fnSubmit(row, '提交') this.fnSubmit(row, '提交', 1)
break break
case '审批': case '整改未通过':
// this.fnApproval(row) this.fnSubmit(row, '整改未通过', 2)
break break
case '发布': case '关闭问题':
this.fnSubmit(row, '发布') this.fnCloseProblem()
break break
case '删除':
this.fnDel(row)
break
default: default:
break break
} }
}, },
fnApproval(row) { fnSubmit(row, text, state) {
this.rowData = row
this.approvalVisible = true
},
fnSubmit(row, text) {
this.$confirm(`是否确认${text}?`, '提示', { this.$confirm(`是否确认${text}?`, '提示', {
confirmButtonText: '确认', confirmButtonText: '确认',
cancelButtonText: '取消', cancelButtonText: '取消',
...@@ -206,9 +180,9 @@ export default { ...@@ -206,9 +180,9 @@ export default {
.then(() => { .then(() => {
const params = { const params = {
...row, ...row,
state: text === '提交' ? 1 : 3, state,
} }
updReportManage(params).then((res) => { updRectifyReform(params).then((res) => {
if (res.code === 200) { if (res.code === 200) {
this.$message.success(`${text}成功`) this.$message.success(`${text}成功`)
this.$refs.searchTable.queryData() this.$refs.searchTable.queryData()
...@@ -219,30 +193,7 @@ export default { ...@@ -219,30 +193,7 @@ export default {
}) })
.catch(() => {}) .catch(() => {})
}, },
fnDel(row) { fnCloseProblem() {
this.$confirm('是否确认删除?', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
const params = {
...row,
}
delReportManage(params).then((res) => {
if (res.code === 200) {
this.$message.success('删除成功')
this.$refs.searchTable.queryData()
} else {
this.$message.error('删除失败')
}
})
})
.catch(() => {})
},
fnEdit(row) {
this.dialogTitle = '编辑通报'
this.rowData = row
this.visible = true this.visible = true
}, },
}, },
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!