Browse Source

优化问题

master
xzt 1 month ago
parent
commit
fe37f2a18d
  1. 70
      jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/buildInfo.vue
  2. 70
      jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/buildSetting.vue
  3. 39
      jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/progress.vue
  4. 145
      jwtech-admin-page/src/views/building/projectInfo/costChangeWarning/costInfo.vue
  5. 101
      jwtech-admin-page/src/views/building/projectInfo/costChangeWarning/costSetting.vue
  6. 80
      jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fundInfo.vue
  7. 86
      jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fundSetting.vue
  8. 41
      jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/info.vue
  9. 33
      jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/setting.vue
  10. 5
      jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiConstProRule.java

70
jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/buildInfo.vue

@ -28,15 +28,17 @@
<el-table-column label="序号" type="index" width="50" align="center" fixed/>
<el-table-column label="所属项目" align="center" prop="projectName" min-width="120"/>
<el-table-column label="项目编码" align="center" prop="proCode" min-width="120"/>
<el-table-column label="项目编号" align="center" prop="proNo" min-width="120"/>
<el-table-column label="预警类型" align="center" prop="warnType" :formatter="typeFormat" min-width="120"/>
<el-table-column label="条件" align="center" prop="warnCondition" min-width="120"/>
<!-- <el-table-column label="项目编码" align="center" prop="proCode" min-width="120"/>
<el-table-column label="项目编号" align="center" prop="proNo" min-width="120"/> -->
<el-table-column label="预警类型" align="center" prop="warnType" :formatter="warningTypeFormat" min-width="100"/>
<el-table-column label="预警级别" align="center" prop="warnLevel" :formatter="warningLevelFormat" width="80"/>
<el-table-column label="预警条件" align="center" prop="warnCondition" :formatter="warningConditionFormat" width="80"/>
<!-- <el-table-column label="条件" align="center" prop="warnCondition" min-width="120"/> -->
<el-table-column label="判断符号" align="center" prop="judgeSymbol" min-width="120"/>
<el-table-column label="阈值" align="center" prop="threshold" min-width="120"/>
<el-table-column label="惩罚措施" align="center" prop="measures" min-width="120"/>
<el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="120"/>
<el-table-column label="时间节点" align="center" prop="dateNode" min-width="120"/>
<el-table-column label="时间节点" align="center" prop="dateNode" width="120"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope">
<el-button
@ -78,8 +80,25 @@
/>
</el-select>
</el-form-item>
<el-form-item label="条件" prop="warnCondition">
<el-input v-model="form.warnCondition" placeholder="请输入条件" />
<el-form-item label="预警条件" prop="warnCondition">
<el-select v-model="form.warnCondition" placeholder="请选择预警条件" style="width: 100%">
<el-option
v-for="dict in warningConditionOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="预警级别" prop="warnLevel">
<el-select v-model="form.warnLevel" placeholder="请选择预警级别" style="width: 100%">
<el-option
v-for="dict in warningLevelOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="判断符号" prop="judgeSymbol">
<el-input v-model="form.judgeSymbol" placeholder="请输入判断符号" />
@ -219,15 +238,38 @@ export default {
trigger: "change",
}
],
ruleMsg: [
// ruleMsg: [
// {
// required: true,
// message: "",
// trigger: "blur",
// }
// ],
warnLevel: [
{
required: true,
message: "请输入预警描述",
message: "请输入预警级别",
trigger: "blur",
}
],
},
warningTypeOptions: []
warningTypeOptions: [],
warningConditionOptions: [{
dictLabel: '建设进度已审核',
dictValue: '0'
},
{
dictLabel: '建设进度已审核',
dictValue: '1'
}],
warningLevelOptions: [{
dictLabel: '提醒',
dictValue: '0'
},
{
dictLabel: '预警',
dictValue: '1'
}],
};
},
created() {
@ -250,9 +292,15 @@ export default {
this.warningTypeOptions = response.data;
})
},
typeFormat(row, column) {
warningTypeFormat(row, column) {
return this.selectDictLabel(this.warningTypeOptions, row.warnType);
},
warningConditionFormat(row, column) {
return this.selectDictLabel(this.warningConditionOptions, row.warnCondition);
},
warningLevelFormat(row, column) {
return this.selectDictLabel(this.warningLevelOptions, row.warnLevel);
},
//
cancel() {
this.open = false;

70
jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/buildSetting.vue

@ -70,15 +70,17 @@
<el-table-column label="序号" type="index" width="50" align="center" fixed/>
<el-table-column label="所属项目" align="center" prop="projectName" min-width="120"/>
<el-table-column label="项目编码" align="center" prop="proCode" min-width="120"/>
<el-table-column label="项目编号" align="center" prop="proNo" min-width="120"/>
<el-table-column label="预警类型" align="center" prop="warnType" :formatter="typeFormat" min-width="120"/>
<el-table-column label="条件" align="center" prop="warnCondition" min-width="120"/>
<!-- <el-table-column label="项目编码" align="center" prop="proCode" min-width="120"/>
<el-table-column label="项目编号" align="center" prop="proNo" min-width="120"/> -->
<el-table-column label="预警类型" align="center" prop="warnType" :formatter="warningTypeFormat" min-width="100"/>
<el-table-column label="预警级别" align="center" prop="warnLevel" :formatter="warningLevelFormat" width="80"/>
<el-table-column label="预警条件" align="center" prop="warnCondition" :formatter="warningConditionFormat" width="80"/>
<!-- <el-table-column label="条件" align="center" prop="warnCondition" min-width="120"/> -->
<el-table-column label="判断符号" align="center" prop="judgeSymbol" min-width="120"/>
<el-table-column label="阈值" align="center" prop="threshold" min-width="120"/>
<el-table-column label="惩罚措施" align="center" prop="measures" min-width="120"/>
<el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="120"/>
<el-table-column label="时间节点" align="center" prop="dateNode" min-width="120"/>
<el-table-column label="时间节点" align="center" prop="dateNode" width="120"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope">
<el-button
@ -120,8 +122,25 @@
/>
</el-select>
</el-form-item>
<el-form-item label="条件" prop="warnCondition">
<el-input v-model="form.warnCondition" placeholder="请输入条件" />
<el-form-item label="预警条件" prop="warnCondition">
<el-select v-model="form.warnCondition" placeholder="请选择预警条件" style="width: 100%">
<el-option
v-for="dict in warningConditionOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="预警级别" prop="warnLevel">
<el-select v-model="form.warnLevel" placeholder="请选择预警级别" style="width: 100%">
<el-option
v-for="dict in warningLevelOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="判断符号" prop="judgeSymbol">
<el-input v-model="form.judgeSymbol" placeholder="请输入判断符号" />
@ -261,15 +280,38 @@ export default {
trigger: "change",
}
],
ruleMsg: [
// ruleMsg: [
// {
// required: true,
// message: "",
// trigger: "blur",
// }
// ],
warnLevel: [
{
required: true,
message: "请输入预警描述",
message: "请输入预警级别",
trigger: "blur",
}
],
},
warningTypeOptions: []
warningTypeOptions: [],
warningConditionOptions: [{
dictLabel: '建设进度已审核',
dictValue: '0'
},
{
dictLabel: '建设进度已审核',
dictValue: '1'
}],
warningLevelOptions: [{
dictLabel: '提醒',
dictValue: '0'
},
{
dictLabel: '预警',
dictValue: '1'
}],
};
},
created() {
@ -292,9 +334,15 @@ export default {
this.warningTypeOptions = response.data;
})
},
typeFormat(row, column) {
warningTypeFormat(row, column) {
return this.selectDictLabel(this.warningTypeOptions, row.warnType);
},
warningConditionFormat(row, column) {
return this.selectDictLabel(this.warningConditionOptions, row.warnCondition);
},
warningLevelFormat(row, column) {
return this.selectDictLabel(this.warningLevelOptions, row.warnLevel);
},
//
cancel() {
this.open = false;

39
jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/progress.vue

@ -75,7 +75,7 @@
{{ projectInfo.projectName }}
</template>
</el-table-column>
<el-table-column label="项目编码" align="center" prop="proCode" min-width="120">
<!-- <el-table-column label="项目编码" align="center" prop="proCode" min-width="120">
<template slot-scope="scope">
{{ projectInfo.proCode }}
</template>
@ -84,7 +84,7 @@
<template slot-scope="scope">
{{ projectInfo.proNo }}
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="进度要求" align="center" prop="scheduleReq" min-width="120"/>
<el-table-column label="执行情况" align="center" prop="execEnv" min-width="120"/>
<el-table-column label="填写日期" align="center" prop="reportDate" min-width="120">
@ -123,12 +123,21 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope">
<el-button
v-if="scope.row.status==0"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['build:buildProgressWarning:edit']"
>修改</el-button>
>审核</el-button>
<el-button
v-if="scope.row.status==1"
size="mini"
type="text"
icon="el-icon-view"
@click="handleView(scope.row)"
v-hasPermi="['build:buildProgressWarning:edit']"
>查看</el-button>
<el-button
size="mini"
type="text"
@ -185,7 +194,7 @@
<el-form-item label="审核意见" prop="applyOpinion">
<el-input type="textarea" :rows="5" v-model="form.applyOpinion" placeholder="请输入审核意见" />
</el-form-item>
<el-form-item label="审核状态" prop="status">
<el-form-item v-if="form.id" label="审核状态" prop="status">
<el-select
v-model="form.status"
placeholder="请选择审核状态"
@ -226,7 +235,7 @@
</el-upload>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<div v-if="operateProcess!='view'" slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
@ -373,6 +382,7 @@ export default {
},
//
acceptDocumentFileList: [],
operateProcess: 'add'
};
},
created() {
@ -484,12 +494,14 @@ export default {
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加建设进度预警";
this.operateProcess = 'add'
this.reset()
this.open = true
this.title = "添加建设进度预警"
},
/** 修改按钮操作 */
handleUpdate(row) {
this.operateProcess = 'update'
this.reset();
const id = row.id || this.ids
getBuildProgressWarning(id).then(response => {
@ -498,6 +510,16 @@ export default {
this.title = "修改建设进度预警";
});
},
handleView(row) {
this.operateProcess = 'view'
this.reset()
const id = row.id || this.ids
getBuildProgressWarning(id).then(response => {
this.form = response.data
this.open = true
this.title = "修改建设进度预警"
})
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
@ -514,6 +536,7 @@ export default {
}
});
} else {
this.form.status = '0'
this.form.projectName = this.projectInfo.projectName
this.form.proCode = this.projectInfo.proCode
this.form.proNo = this.projectInfo.proNo

145
jwtech-admin-page/src/views/building/projectInfo/costChangeWarning/costInfo.vue

@ -32,27 +32,27 @@
{{ projectInfo.projectName }}
</template>
</el-table-column>
<el-table-column label="项目编码" align="center" prop="proCode" min-width="120">
<template slot-scope="scope">
{{ projectInfo.proCode }}
</template>
</el-table-column>
<el-table-column label="项目编号" align="center" prop="proNo" min-width="120">
<template slot-scope="scope">
{{ projectInfo.proNo }}
</template>
</el-table-column>
<!-- <el-table-column label="项目编码" align="center" prop="proCode" min-width="120">
<template slot-scope="scope">
{{ projectInfo.proCode }}
</template>
</el-table-column>
<el-table-column label="项目编号" align="center" prop="proNo" min-width="120">
<template slot-scope="scope">
{{ projectInfo.proNo }}
</template>
</el-table-column> -->
<el-table-column label="预警类型" align="center" prop="warnType" :formatter="warningTypeFormat" min-width="120"/>
<el-table-column label="条件" align="center" prop="warnCondition" min-width="120"/>
<el-table-column label="预警条件" align="center" prop="warnCondition" :formatter="warningConditionFormat" width="80"/>
<el-table-column label="金额" align="center" prop="amount" min-width="120"/>
<el-table-column label="预警级别" align="center" prop="warnLevel" min-width="120"/>
<el-table-column label="时间节点" align="center" prop="dateNode" min-width="120"/>
<el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="120"/>
<el-table-column label="状态" align="center" prop="status" min-width="120">
<el-table-column label="预警级别" align="center" prop="warnLevel" :formatter="warningLevelFormat" width="100"/>
<el-table-column label="时间节点" align="center" prop="dateNode" width="120"/>
<el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="170"/>
<!-- <el-table-column label="状态" align="center" prop="status" min-width="120">
<template slot-scope="scope">
<span>{{ scope.row.status=='1' ? '预警' : '正常' }}</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope">
<el-button
@ -94,14 +94,28 @@
/>
</el-select>
</el-form-item>
<el-form-item label="条件" prop="warnCondition">
<el-input v-model="form.warnCondition" placeholder="请输入条件" />
<el-form-item label="预警条件" prop="warnCondition">
<el-select v-model="form.warnCondition" placeholder="请选择预警条件" style="width: 100%">
<el-option
v-for="dict in warningConditionOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入金额" />
</el-form-item>
<el-form-item label="预警级别" prop="warnLevel">
<el-input v-model="form.warnLevel" placeholder="请输入预警级别" />
<el-select v-model="form.warnLevel" placeholder="请选择预警条件" style="width: 100%">
<el-option
v-for="dict in warningLevelOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="时间节点" prop="dateNode">
<el-date-picker
@ -127,6 +141,9 @@
<script>
import { listCostChangeWarning, getCostChangeWarning, delCostChangeWarning, addCostChangeWarning, updateCostChangeWarning, exportCostChangeWarning } from "@/api/build/costChangeWarning";
import {
getInfo
} from "@/api/build/projectInfo";
export default {
name: "CostChangeWarning",
props: {
@ -225,15 +242,57 @@ export default {
]
},
formData: {},
warningTypeOptions: []
warningTypeOptions: [{
dictLabel: '项目建议书',
dictValue: '0'
},
{
dictLabel: '可行性研究报告',
dictValue: '1'
},
{
dictLabel: '中标写过',
dictValue: '2'
}],
warningConditionOptions: [{
dictLabel: '大于',
dictValue: '0'
},
{
dictLabel: '小于',
dictValue: '1'
},
{
dictLabel: '等于',
dictValue: '2'
},
{
dictLabel: '不等于',
dictValue: '3'
}],
warningLevelOptions: [{
dictLabel: '提醒',
dictValue: '0'
},
{
dictLabel: '预警',
dictValue: '1'
}],
};
},
created() {
this.queryParams.data.proNo = this.$route.query.proNo
this.getDictList()
this.getList()
this.getProjectInfo()
},
methods: {
//
getProjectInfo() {
getInfo(this.$route.query.baseDataId).then((response) => {
this.formData = response.data
});
},
/** 查询造价变幅预警管理列表 */
getList() {
this.loading = true;
@ -245,13 +304,19 @@ export default {
},
//
getDictList() {
this.getDicts("warning_type").then((response) => {
this.warningTypeOptions = response.data;
})
// this.getDicts("warning_type").then((response) => {
// this.warningTypeOptions = response.data;
// })
},
warningTypeFormat(row, column) {
return this.selectDictLabel(this.warningTypeOptions, row.warnType);
},
warningConditionFormat(row, column) {
return this.selectDictLabel(this.warningConditionOptions, row.warnCondition);
},
warningLevelFormat(row, column) {
return this.selectDictLabel(this.warningLevelOptions, row.warnLevel);
},
//
cancel() {
this.open = false;
@ -285,23 +350,23 @@ export default {
pageNum: 1,
pageSize: 10,
data:{
id: null,
projectName: null,
proCode: null,
proNo: null,
warnType: null,
warnCondition: null,
amount: null,
warnLevel: null,
dateNode: null,
ruleMsg: null,
createUid: null,
createTime: null,
updateUid: null,
updateTime: null,
remark: null,
status: "1"
},
id: null,
projectName: null,
proCode: null,
proNo: null,
warnType: null,
warnCondition: null,
amount: null,
warnLevel: null,
dateNode: null,
ruleMsg: null,
createUid: null,
createTime: null,
updateUid: null,
updateTime: null,
remark: null,
status: "1"
},
//
params: {
//

101
jwtech-admin-page/src/views/building/projectInfo/costChangeWarning/costSetting.vue

@ -74,27 +74,27 @@
{{ projectInfo.projectName }}
</template>
</el-table-column>
<el-table-column label="项目编码" align="center" prop="proCode" min-width="120">
<template slot-scope="scope">
{{ projectInfo.proCode }}
</template>
</el-table-column>
<el-table-column label="项目编号" align="center" prop="proNo" min-width="120">
<template slot-scope="scope">
{{ projectInfo.proNo }}
</template>
</el-table-column>
<!-- <el-table-column label="项目编码" align="center" prop="proCode" min-width="120">
<template slot-scope="scope">
{{ projectInfo.proCode }}
</template>
</el-table-column>
<el-table-column label="项目编号" align="center" prop="proNo" min-width="120">
<template slot-scope="scope">
{{ projectInfo.proNo }}
</template>
</el-table-column> -->
<el-table-column label="预警类型" align="center" prop="warnType" :formatter="warningTypeFormat" min-width="120"/>
<el-table-column label="条件" align="center" prop="warnCondition" min-width="120"/>
<el-table-column label="预警条件" align="center" prop="warnCondition" :formatter="warningConditionFormat" width="80"/>
<el-table-column label="金额" align="center" prop="amount" min-width="120"/>
<el-table-column label="预警级别" align="center" prop="warnLevel" min-width="120"/>
<el-table-column label="时间节点" align="center" prop="dateNode" min-width="120"/>
<el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="120"/>
<el-table-column label="状态" align="center" prop="status" min-width="120">
<el-table-column label="预警级别" align="center" prop="warnLevel" :formatter="warningLevelFormat" width="100"/>
<el-table-column label="时间节点" align="center" prop="dateNode" width="120"/>
<el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="170"/>
<!-- <el-table-column label="状态" align="center" prop="status" min-width="120">
<template slot-scope="scope">
<span>{{ scope.row.status=='1' ? '预警' : '正常' }}</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope">
<el-button
@ -136,14 +136,28 @@
/>
</el-select>
</el-form-item>
<el-form-item label="条件" prop="warnCondition">
<el-input v-model="form.warnCondition" placeholder="请输入条件" />
<el-form-item label="预警条件" prop="warnCondition">
<el-select v-model="form.warnCondition" placeholder="请选择预警条件" style="width: 100%">
<el-option
v-for="dict in warningConditionOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入金额" />
</el-form-item>
<el-form-item label="预警级别" prop="warnLevel">
<el-input v-model="form.warnLevel" placeholder="请输入预警级别" />
<el-select v-model="form.warnLevel" placeholder="请选择预警条件" style="width: 100%">
<el-option
v-for="dict in warningLevelOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="时间节点" prop="dateNode">
<el-date-picker
@ -270,7 +284,42 @@ export default {
]
},
formData: {},
warningTypeOptions: []
warningTypeOptions: [{
dictLabel: '项目建议书',
dictValue: '0'
},
{
dictLabel: '可行性研究报告',
dictValue: '1'
},
{
dictLabel: '中标写过',
dictValue: '2'
}],
warningConditionOptions: [{
dictLabel: '大于',
dictValue: '0'
},
{
dictLabel: '小于',
dictValue: '1'
},
{
dictLabel: '等于',
dictValue: '2'
},
{
dictLabel: '不等于',
dictValue: '3'
}],
warningLevelOptions: [{
dictLabel: '提醒',
dictValue: '0'
},
{
dictLabel: '预警',
dictValue: '1'
}],
};
},
created() {
@ -297,13 +346,19 @@ export default {
},
//
getDictList() {
this.getDicts("warning_type").then((response) => {
this.warningTypeOptions = response.data;
})
// this.getDicts("warning_type").then((response) => {
// this.warningTypeOptions = response.data;
// })
},
warningTypeFormat(row, column) {
return this.selectDictLabel(this.warningTypeOptions, row.warnType);
},
warningConditionFormat(row, column) {
return this.selectDictLabel(this.warningConditionOptions, row.warnCondition);
},
warningLevelFormat(row, column) {
return this.selectDictLabel(this.warningLevelOptions, row.warnLevel);
},
//
cancel() {
this.open = false;

80
jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fundInfo.vue

@ -32,7 +32,7 @@
{{ formData.projectName }}
</template>
</el-table-column>
<el-table-column label="项目编码" align="center" prop="proCode" min-width="120">
<!-- <el-table-column label="项目编码" align="center" prop="proCode" min-width="120">
<template slot-scope="scope">
{{ formData.proCode }}
</template>
@ -41,29 +41,37 @@
<template slot-scope="scope">
{{ formData.proNo }}
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="支付时间范围" align="center" prop="payDateRange" min-width="120"/>
<el-table-column label="支付金额" align="center" prop="payAmount" min-width="120"/>
<el-table-column label="支付金额" align="center" prop="payAmount" width="100"/>
<el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="120"/>
<el-table-column label="说明情况" align="center" prop="describe" min-width="120"/>
<el-table-column label="原因" align="center" prop="reason" min-width="120"/>
<el-table-column label="状态" align="center" prop="status" min-width="120"/>
<el-table-column label="处置状态" align="center" prop="reason" min-width="120">
<template slot-scope="scope">
<span>
{{ scope.row.handle == '1' ? '已处置' : '未处置' }}
</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope">
<el-button
v-if="scope.row.handle==0"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['build:fundPayWarning:edit']"
>修改</el-button>
>处置</el-button>
<el-button
v-if="scope.row.handle==1"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['build:fundPayWarning:remove']"
>删除</el-button>
icon="el-icon-edit"
@click="handleView(scope.row)"
v-hasPermi="['build:fundPayWarning:edit']"
>查看</el-button>
</template>
</el-table-column>
</el-table>
@ -80,8 +88,7 @@
<el-dialog :title="title" :visible.sync="open" width="650px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="支付时间范围" prop="payDateRange">
<!-- <el-input v-model="form.payDateRange" placeholder="请输入支付时间范围" /> -->
<el-date-picker
<el-date-picker
v-model="timeRange"
type="daterange"
range-separator="至"
@ -89,32 +96,23 @@
end-placeholder="结束日期"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
style="width: 100%;">
style="width: 100%;"
:disabled="true">
</el-date-picker>
</el-form-item>
<el-form-item label="支付金额" prop="payAmount">
<el-input v-model="form.payAmount" placeholder="请输入支付金额" />
<el-input v-model="form.payAmount" :disabled="true" placeholder="请输入支付金额" />
</el-form-item>
<el-form-item label="预警描述" prop="ruleMsg">
<el-input v-model="form.ruleMsg" placeholder="请输入预警描述" />
<el-input v-model="form.ruleMsg" :disabled="true" type="textarea" :rows="5" placeholder="请输入预警描述" />
</el-form-item>
<el-form-item label="说明情况" prop="describe">
<el-input v-model="form.describe" placeholder="请输入说明情况" />
<el-input v-model="form.describe" type="textarea" :rows="5" placeholder="请输入说明情况" />
</el-form-item>
<el-form-item label="原因" prop="reason">
<el-input v-model="form.reason" placeholder="请输入原因" />
<el-input v-model="form.reason" type="textarea" :rows="5" placeholder="请输入原因" />
</el-form-item>
<el-form-item label="预警状态" prop="status">
<el-select v-model="form.status" placeholder="请选择预警状态" style="width: 100%">
<el-option
v-for="dict in warningStatusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="处置状态" prop="handle">
<!-- <el-form-item label="处置状态" prop="handle">
<el-select v-model="form.handle" placeholder="请选择处置状态" style="width: 100%">
<el-option
v-for="dict in handleStatusOptions"
@ -123,9 +121,9 @@
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
</el-form-item> -->
</el-form>
<div slot="footer" class="dialog-footer">
<div v-if="operateProcess != 'view'" slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
@ -252,7 +250,8 @@ export default {
formData: {},
handleStatusOptions: [],
warningStatusOptions: [],
timeRange: []
timeRange: [],
operateProcess: 'add'
};
},
watch: {
@ -262,7 +261,6 @@ export default {
} else {
this.form.payDateRange = null
}
console.log(newVal)
}
},
created() {
@ -321,6 +319,7 @@ export default {
updateTime: null,
remark: null
};
this.timeRange = []
this.resetForm("form");
},
//
@ -376,16 +375,30 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加资金支付预警管理";
this.title = "添加资金支付";
this.operateProcess = 'add'
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
this.operateProcess = 'update'
getFundPayWarning(id).then(response => {
this.form = response.data;
this.timeRange = this.form.payDateRange ? this.form.payDateRange.split(',') : []
this.open = true;
this.title = "修改资金支付详情";
});
},
handleView(row) {
this.reset();
const id = row.id || this.ids
this.operateProcess = 'view'
getFundPayWarning(id).then(response => {
this.form = response.data;
this.timeRange = this.form.payDateRange ? this.form.payDateRange.split(',') : []
this.open = true;
this.title = "修改资金支付预警管理";
this.title = "查看资金支付详情";
});
},
/** 提交按钮 */
@ -393,6 +406,7 @@ export default {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
this.form.handle = '1'
updateFundPayWarning(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("修改成功");

86
jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fundSetting.vue

@ -74,7 +74,7 @@
{{ formData.projectName }}
</template>
</el-table-column>
<el-table-column label="项目编码" align="center" prop="proCode" min-width="120">
<!-- <el-table-column label="项目编码" align="center" prop="proCode" min-width="120">
<template slot-scope="scope">
{{ formData.proCode }}
</template>
@ -83,13 +83,10 @@
<template slot-scope="scope">
{{ formData.proNo }}
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="支付时间范围" align="center" prop="payDateRange" min-width="120"/>
<el-table-column label="支付金额" align="center" prop="payAmount" min-width="120"/>
<el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="120"/>
<el-table-column label="说明情况" align="center" prop="describe" min-width="120"/>
<el-table-column label="原因" align="center" prop="reason" min-width="120"/>
<el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" min-width="120"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope">
<el-button
@ -122,7 +119,6 @@
<el-dialog :title="title" :visible.sync="open" width="650px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="支付时间范围" prop="payDateRange">
<!-- <el-input v-model="form.payDateRange" placeholder="请输入支付时间范围" /> -->
<el-date-picker
v-model="timeRange"
type="daterange"
@ -138,9 +134,9 @@
<el-input v-model="form.payAmount" placeholder="请输入支付金额" />
</el-form-item>
<el-form-item label="预警描述" prop="ruleMsg">
<el-input v-model="form.ruleMsg" placeholder="请输入预警描述" />
<el-input v-model="form.ruleMsg" type="textarea" :rows="5" placeholder="请输入预警描述" />
</el-form-item>
<el-form-item label="说明情况" prop="describe">
<!-- <el-form-item label="说明情况" prop="describe">
<el-input v-model="form.describe" placeholder="请输入说明情况" />
</el-form-item>
<el-form-item label="原因" prop="reason">
@ -165,7 +161,7 @@
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
</el-form-item> -->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
@ -241,55 +237,55 @@ export default {
form: {},
//
rules: {
// payDateRange: [
// {
// required: true,
// message: "",
// trigger: "change",
// }
// ],
payAmount: [
payDateRange: [
{
required: true,
message: "请输入支付金额",
trigger: "blur",
}
],
ruleMsg: [
{
required: true,
message: "请输入预警描述",
trigger: "blur",
message: "请选择支付时间范围",
trigger: "change",
}
],
describe: [
payAmount: [
{
required: true,
message: "请输入说明情况",
message: "请输入支付金额",
trigger: "blur",
}
],
reason: [
ruleMsg: [
{
required: true,
message: "请输入说明情况",
message: "请输入预警描述",
trigger: "blur",
}
],
status: [
{
required: true,
message: "请选择预警状态",
trigger: "change",
}
],
handle: [
{
required: true,
message: "请选择处置状态",
trigger: "change",
}
],
// describe: [
// {
// required: true,
// message: "",
// trigger: "blur",
// }
// ],
// reason: [
// {
// required: true,
// message: "",
// trigger: "blur",
// }
// ],
// status: [
// {
// required: true,
// message: "",
// trigger: "change",
// }
// ],
// handle: [
// {
// required: true,
// message: "",
// trigger: "change",
// }
// ],
},
formData: {},
handleStatusOptions: [],
@ -367,6 +363,7 @@ export default {
updateTime: null,
remark: null
};
this.timeRange = []
this.resetForm("form");
},
//
@ -430,6 +427,7 @@ export default {
const id = row.id || this.ids
getFundPayWarning(id).then(response => {
this.form = response.data;
this.timeRange = this.form.payDateRange ? this.form.payDateRange.split(',') : []
this.open = true;
this.title = "修改资金支付预警管理";
});

41
jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/info.vue

@ -28,29 +28,11 @@
<el-table-column label="序号" type="index" width="50" align="center" fixed/>
<el-table-column label="所属项目" align="center" prop="projectName" min-width="120"/>
<el-table-column label="项目编码" align="center" prop="proCode" min-width="120"/>
<el-table-column label="项目编号" align="center" prop="proNo" min-width="120"/>
<!-- <el-table-column label="项目编码" align="center" prop="proCode" min-width="120"/>
<el-table-column label="项目编号" align="center" prop="proNo" min-width="120"/> -->
<el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="120"/>
<el-table-column label="时间节点" align="center" prop="dateNode" min-width="120"/>
<el-table-column label="预警事项" align="center" prop="warnMatters" min-width="120"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['build:investCompleteWarning:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['build:investCompleteWarning:remove']"
>删除</el-button>
</template>
</el-table-column>
<el-table-column label="预警事项" align="center" prop="warnMatters" :formatter="warningThingFormat" min-width="120"/>
</el-table>
<pagination
@ -171,7 +153,19 @@ export default {
trigger: "blur",
}
],
}
},
warningThingOptions: [{
dictLabel: '已审核',
dictValue: '1'
},
{
dictLabel: '未审核',
dictValue: '0'
},
{
dictLabel: '退回',
dictValue: '-1'
}]
};
},
created() {
@ -187,6 +181,9 @@ export default {
this.loading = false;
});
},
warningThingFormat(row, column) {
return this.selectDictLabel(this.warningThingOptions, row.warnMatters);
},
//
cancel() {
this.open = false;

33
jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/setting.vue

@ -70,11 +70,11 @@
<el-table-column label="序号" type="index" width="50" align="center" fixed/>
<el-table-column label="所属项目" align="center" prop="projectName" min-width="120"/>
<el-table-column label="项目编码" align="center" prop="proCode" min-width="120"/>
<el-table-column label="项目编号" align="center" prop="proNo" min-width="120"/>
<!-- <el-table-column label="项目编码" align="center" prop="proCode" min-width="120"/>
<el-table-column label="项目编号" align="center" prop="proNo" min-width="120"/> -->
<el-table-column label="预警描述" align="center" prop="ruleMsg" min-width="120"/>
<el-table-column label="时间节点" align="center" prop="dateNode" min-width="120"/>
<el-table-column label="预警事项" align="center" prop="warnMatters" min-width="120"/>
<el-table-column label="预警事项" align="center" prop="warnMatters" :formatter="warningThingFormat" min-width="120"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope">
<el-button
@ -117,7 +117,15 @@
</el-date-picker>
</el-form-item>
<el-form-item label="预警事项" prop="warnMatters">
<el-input v-model="form.warnMatters" type="textarea" :rows="5" placeholder="请输入预警事项" />
<el-select v-model="form.warnMatters" placeholder="请选择预警事项" style="width: 100%">
<el-option
v-for="dict in warningThingOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="预警描述" prop="ruleMsg">
<el-input v-model="form.ruleMsg" type="textarea" :rows="5" placeholder="请输入预警描述" />
@ -213,7 +221,19 @@ export default {
trigger: "blur",
}
],
}
},
warningThingOptions: [{
dictLabel: '已审核',
dictValue: '1'
},
{
dictLabel: '未审核',
dictValue: '0'
},
{
dictLabel: '退回',
dictValue: '-1'
}]
};
},
created() {
@ -229,6 +249,9 @@ export default {
this.loading = false;
});
},
warningThingFormat(row, column) {
return this.selectDictLabel(this.warningThingOptions, row.warnMatters);
},
//
cancel() {
this.open = false;

5
jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiConstProRule.java

@ -45,6 +45,11 @@ public class BsSgcJsjdBuiConstProRule extends BaseEntity
@ApiModelProperty("预警类型")
private String warnType;
/** 预警类型 */
@Excel(name = "预警级别")
@ApiModelProperty("预警级别")
private String warnLevel;
/** 条件 */
@Excel(name = "条件")
@ApiModelProperty("条件")

Loading…
Cancel
Save