Browse Source

Merge remote-tracking branch 'origin/master'

master
zth 1 month ago
parent
commit
16e0128dd3
  1. 12
      jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/buildInfo.vue
  2. 4
      jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/buildSetting.vue
  3. 30
      jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/progress.vue
  4. 4
      jwtech-admin-page/src/views/building/projectInfo/costChangeWarning/costInfo.vue
  5. 4
      jwtech-admin-page/src/views/building/projectInfo/costChangeWarning/costSetting.vue
  6. 4
      jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fund.vue
  7. 20
      jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fundInfo.vue
  8. 22
      jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fundSetting.vue
  9. 4
      jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/applyConfig.vue
  10. 4
      jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/applyExamine.vue
  11. 4
      jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/setting.vue
  12. 4
      jwtech-admin-page/src/views/building/projectInfo/projectWarning/list.vue
  13. 65
      sql/2025-03-11
  14. 3
      sql/2025-03-13

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

@ -30,16 +30,16 @@
<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="warningTypeFormat" min-width="100"/>
<el-table-column label="预警级别" align="center" prop="warnLevel" :formatter="warningLevelFormat" width="80"/>
<!-- <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="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="measures" min-width="120"/>-->
<el-table-column label="预警描述" align="center" prop="ruleMsg" 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">
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
@ -56,7 +56,7 @@
v-hasPermi="['build:fundPayRuls:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table-column>-->
</el-table>
<pagination

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

@ -53,7 +53,7 @@
v-hasPermi="['build:fundPayRuls:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
@ -61,7 +61,7 @@
@click="handleExport"
v-hasPermi="['build:fundPayRuls:export']"
>导出</el-button>
</el-col>
</el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>

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

@ -54,7 +54,7 @@
v-hasPermi="['build:buildProgressWarning:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
@ -62,7 +62,7 @@
@click="handleExport"
v-hasPermi="['build:buildProgressWarning:export']"
>导出</el-button>
</el-col>
</el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -122,13 +122,21 @@
<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
<!-- <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
v-if="scope.row.status==0"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleExmanie(scope.row)"
v-hasPermi="['build:buildProgressWarning:edit']"
>审核</el-button>
<el-button
v-if="scope.row.status==1"
@ -180,6 +188,7 @@
<el-form-item label="进度要求" prop="scheduleReq">
<el-input type="textarea" :rows="5" v-model="form.scheduleReq" placeholder="请输入进度要求" />
</el-form-item>
<template v-if="operateProcess==='exmaine' || operateProcess==='view'">
<el-form-item label="审核人" prop="applyPerson">
<el-input v-model="form.applyPerson" placeholder="请输入审核人" />
</el-form-item>
@ -209,6 +218,8 @@
/>
</el-select>
</el-form-item>
</template>
<el-form-item label="附件" prop="attachment">
<el-upload
class="upload-demo"
@ -510,6 +521,17 @@ export default {
this.title = "修改建设进度预警";
});
},
/** 审核按钮操作 */
handleExmanie(row) {
this.operateProcess = 'exmaine'
this.reset();
const id = row.id || this.ids
getBuildProgressWarning(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "审核建设进度信息";
});
},
handleView(row) {
this.operateProcess = 'view'
this.reset()
@ -517,7 +539,7 @@ export default {
getBuildProgressWarning(id).then(response => {
this.form = response.data
this.open = true
this.title = "修改建设进度预警"
this.title = "查看建设进度信息"
})
},
/** 提交按钮 */

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

@ -42,9 +42,9 @@
{{ 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="warnType" :formatter="warningTypeFormat" 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="amount" 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"/>

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

@ -53,7 +53,7 @@
v-hasPermi="['build:costChangeWarning:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
@ -61,7 +61,7 @@
@click="handleExport"
v-hasPermi="['build:costChangeWarning:export']"
>导出</el-button>
</el-col>
</el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>

4
jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fund.vue

@ -53,14 +53,14 @@
v-hasPermi="['build:fundPayWarning:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['build:fundPayWarning:export']"
>导出</el-button>
>导出</el-button>-->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>

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

@ -42,10 +42,10 @@
{{ formData.proNo }}
</template>
</el-table-column> -->
<el-table-column label="支付时间范围" align="center" prop="payDateRange" min-width="120"/>
<el-table-column label="支付金额" align="center" prop="payAmount" width="100"/>
<!-- <el-table-column label="支付时间范围" align="center" prop="payDateRange" 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="description" min-width="120"/>
<el-table-column label="原因" align="center" prop="reason" min-width="120"/>
<el-table-column label="处置状态" align="center" prop="reason" min-width="120">
<template slot-scope="scope">
@ -57,7 +57,7 @@
<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"
v-if="scope.row.handle!=1"
size="mini"
type="text"
icon="el-icon-edit"
@ -106,8 +106,8 @@
<el-form-item label="预警描述" prop="ruleMsg">
<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" type="textarea" :rows="5" placeholder="请输入说明情况" />
<el-form-item label="说明情况" prop="description">
<el-input v-model="form.description" type="textarea" :rows="5" placeholder="请输入说明情况" />
</el-form-item>
<el-form-item label="原因" prop="reason">
<el-input v-model="form.reason" type="textarea" :rows="5" placeholder="请输入原因" />
@ -176,7 +176,7 @@ export default {
payDateRange: null,
payAmount: null,
ruleMsg: null,
describe: null,
description: null,
reason: null,
status: '1',
handle: null,
@ -218,7 +218,7 @@ export default {
trigger: "blur",
}
],
describe: [
description: [
{
required: true,
message: "请输入说明情况",
@ -309,7 +309,7 @@ export default {
payDateRange: null,
payAmount: null,
ruleMsg: null,
describe: null,
description: null,
reason: null,
status: '1',
handle: null,
@ -335,7 +335,7 @@ export default {
payDateRange: null,
payAmount: null,
ruleMsg: null,
describe: null,
description: null,
reason: null,
status: "1",
handle: null,

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

@ -1,10 +1,10 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
<el-form-item label="原因" prop="reason">
<el-form-item label="预警描述" prop="ruleMsg">
<el-input
v-model="queryParams.data.reason"
placeholder="请输入原因"
v-model="queryParams.data.ruleMsg"
placeholder="请输入预警描述"
clearable
size="small"
@keyup.enter.native="handleQuery"
@ -53,7 +53,7 @@
v-hasPermi="['build:fundPayWarning:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
@ -61,7 +61,7 @@
@click="handleExport"
v-hasPermi="['build:fundPayWarning:export']"
>导出</el-button>
</el-col>
</el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -136,8 +136,8 @@
<el-form-item label="预警描述" prop="ruleMsg">
<el-input v-model="form.ruleMsg" type="textarea" :rows="5" placeholder="请输入预警描述" />
</el-form-item>
<!-- <el-form-item label="说明情况" prop="describe">
<el-input v-model="form.describe" placeholder="请输入说明情况" />
<!-- <el-form-item label="说明情况" prop="description">
<el-input v-model="form.description" placeholder="请输入说明情况" />
</el-form-item>
<el-form-item label="原因" prop="reason">
<el-input v-model="form.reason" placeholder="请输入原因" />
@ -216,7 +216,7 @@ export default {
payDateRange: null,
payAmount: null,
ruleMsg: null,
describe: null,
description: null,
reason: null,
status: null,
handle: null,
@ -258,7 +258,7 @@ export default {
trigger: "blur",
}
],
// describe: [
// description: [
// {
// required: true,
// message: "",
@ -353,7 +353,7 @@ export default {
payDateRange: null,
payAmount: null,
ruleMsg: null,
describe: null,
description: null,
reason: null,
status: null,
handle: null,
@ -379,7 +379,7 @@ export default {
payDateRange: null,
payAmount: null,
ruleMsg: null,
describe: null,
description: null,
reason: null,
status: "0",
handle: null,

4
jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/applyConfig.vue

@ -54,7 +54,7 @@
v-hasPermi="['build:investCompleteConfig:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
@ -62,7 +62,7 @@
@click="handleExport"
v-hasPermi="['build:investCompleteConfig:export']"
>导出</el-button>
</el-col>
</el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>

4
jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/applyExamine.vue

@ -265,7 +265,7 @@ export default {
createTime: null,
updateUid: null,
updateTime: null,
status: '1'
status: null
},
//
params: {
@ -341,7 +341,7 @@ export default {
},
created() {
this.queryParams.data.proNo = this.$route.query.proNo
this.queryParams.data.status = '1'
this.queryParams.data.status = ''
this.getDictList()
this.getList()
},

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

@ -53,14 +53,14 @@
v-hasPermi="['build:investCompleteWarning:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['build:investCompleteWarning:export']"
>导出</el-button>
>导出</el-button>-->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>

4
jwtech-admin-page/src/views/building/projectInfo/projectWarning/list.vue

@ -61,14 +61,14 @@
v-hasPermi="['build:warningRule:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['build:warningRule:export']"
>导出</el-button>
>导出</el-button>-->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>

65
sql/2025-03-11

@ -92,31 +92,6 @@ ROW_FORMAT=DYNAMIC
;
CREATE TABLE `bs_sgc_jsjd_bui_cost_change_rule` (
`ID` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键' ,
`project_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属项目' ,
`pro_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目编码' ,
`pro_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目编号' ,
`warn_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预警类型' ,
`warn_condition` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '条件' ,
`amount` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '金额' ,
`warn_level` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预警级别' ,
`date_node` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '时间节点' ,
`rule_msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预警描述' ,
`CREATE_UID` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人' ,
`CREATE_TIME` datetime NULL DEFAULT NULL COMMENT '创建时间' ,
`UPDATE_UID` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人' ,
`UPDATE_TIME` datetime NULL DEFAULT NULL COMMENT '更新时间' ,
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' ,
`status` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态(0:没有预警,1:预警' ,
PRIMARY KEY (`ID`)
)
ENGINE=InnoDB
DEFAULT CHARACTER SET=utf8mb4 COLLATE=utf8mb4_general_ci
COMMENT='造价变幅预警管理'
ROW_FORMAT=DYNAMIC
;
CREATE TABLE `bs_sgc_jsjd_bui_pay_amount_rule` (
`ID` varchar(50) NOT NULL COMMENT '主键',
@ -185,25 +160,31 @@ CREATE TABLE `bs_sgc_jsjd_bui_const_pro_rule` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='建设进度预警管理';
CREATE TABLE `bs_sgc_jsjd_bui_cost_change_rule` (
`ID` varchar(50) NOT NULL COMMENT '主键',
`project_name` varchar(255) DEFAULT NULL COMMENT '所属项目',
`pro_code` varchar(255) DEFAULT NULL COMMENT '项目编码',
`pro_no` varchar(255) DEFAULT NULL COMMENT '项目编号',
`warn_type` varchar(20) DEFAULT NULL COMMENT '预警类型',
`warn_condition` varchar(20) DEFAULT NULL COMMENT '条件',
`amount` varchar(20) DEFAULT NULL COMMENT '金额',
`warn_level` varchar(255) DEFAULT NULL COMMENT '预警级别',
`date_node` varchar(20) DEFAULT NULL COMMENT '时间节点',
`rule_msg` varchar(255) DEFAULT NULL COMMENT '预警描述',
`CREATE_UID` varchar(255) DEFAULT NULL COMMENT '创建人',
`CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',
`UPDATE_UID` varchar(255) DEFAULT NULL COMMENT '更新人',
`UPDATE_TIME` datetime DEFAULT NULL COMMENT '更新时间',
`remark` varchar(255) DEFAULT NULL COMMENT '备注',
`status` varchar(1) DEFAULT NULL COMMENT '状态(0:没有预警,1:预警',
`ID` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键' ,
`project_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属项目' ,
`pro_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目编码' ,
`pro_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目编号' ,
`warn_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预警类型' ,
`warn_condition` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '条件' ,
`amount` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '金额' ,
`warn_level` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预警级别' ,
`date_node` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '时间节点' ,
`rule_msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预警描述' ,
`CREATE_UID` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人' ,
`CREATE_TIME` datetime NULL DEFAULT NULL COMMENT '创建时间' ,
`UPDATE_UID` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人' ,
`UPDATE_TIME` datetime NULL DEFAULT NULL COMMENT '更新时间' ,
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' ,
`status` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态(0:没有预警,1:预警' ,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='造价变幅预警管理';
)
ENGINE=InnoDB
DEFAULT CHARACTER SET=utf8mb4 COLLATE=utf8mb4_general_ci
COMMENT='造价变幅预警管理'
ROW_FORMAT=DYNAMIC
;
CREATE TABLE `bs_sgc_jsjd_bui_invest_config` (

3
sql/2025-03-13

@ -0,0 +1,3 @@
ALTER TABLE `bs_sgc_jsjd_bui_cost_change_rule`
ADD COLUMN `current_amount` varchar(20) NULL COMMENT '当前金额' AFTER `status`;
Loading…
Cancel
Save