From 39aac306bbfd81fd66b4bec3dbb14e78df59ccdc Mon Sep 17 00:00:00 2001
From: wuxu <1159559925@qq.com>
Date: Thu, 13 Mar 2025 18:03:51 +0800
Subject: [PATCH] =?UTF-8?q?5=E4=B8=AA=E9=A2=84=E8=AD=A6=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=8C=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../buildProgressWarning/buildInfo.vue        | 12 +++++-----
 .../buildProgressWarning/buildSetting.vue     |  4 ++--
 .../buildProgressWarning/progress.vue         |  4 ++--
 .../costChangeWarning/costInfo.vue            |  4 ++--
 .../costChangeWarning/costSetting.vue         |  4 ++--
 .../projectInfo/fundPayWarning/fund.vue       |  4 ++--
 .../projectInfo/fundPayWarning/fundInfo.vue   | 20 ++++++++---------
 .../fundPayWarning/fundSetting.vue            | 22 +++++++++----------
 .../investCompleteWarning/applyConfig.vue     |  4 ++--
 .../investCompleteWarning/applyExamine.vue    |  4 ++--
 .../investCompleteWarning/setting.vue         |  6 ++---
 .../projectInfo/projectWarning/list.vue       |  4 ++--
 sql/2025-03-13                                |  3 +++
 13 files changed, 49 insertions(+), 46 deletions(-)
 create mode 100644 sql/2025-03-13

diff --git a/jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/buildInfo.vue b/jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/buildInfo.vue
index 2a4598e8..5e531f95 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/buildInfo.vue
+++ b/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
diff --git a/jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/buildSetting.vue b/jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/buildSetting.vue
index 9ae65049..605fc7f9 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/buildSetting.vue
+++ b/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>
 
diff --git a/jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/progress.vue b/jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/progress.vue
index 41f36b5b..8f846df3 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/buildProgressWarning/progress.vue
+++ b/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>
 
diff --git a/jwtech-admin-page/src/views/building/projectInfo/costChangeWarning/costInfo.vue b/jwtech-admin-page/src/views/building/projectInfo/costChangeWarning/costInfo.vue
index d5816e71..124d15e7 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/costChangeWarning/costInfo.vue
+++ b/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"/>
diff --git a/jwtech-admin-page/src/views/building/projectInfo/costChangeWarning/costSetting.vue b/jwtech-admin-page/src/views/building/projectInfo/costChangeWarning/costSetting.vue
index af867ddb..8d268dee 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/costChangeWarning/costSetting.vue
+++ b/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>
 
diff --git a/jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fund.vue b/jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fund.vue
index 3c4ec164..286a779d 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fund.vue
+++ b/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>
diff --git a/jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fundInfo.vue b/jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fundInfo.vue
index f410c459..63baf047 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fundInfo.vue
+++ b/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">
@@ -88,7 +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-date-picker 
+          <el-date-picker
             v-model="timeRange"
             type="daterange"
             range-separator="至"
@@ -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,
diff --git a/jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fundSetting.vue b/jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fundSetting.vue
index aa101cc4..828f6508 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/fundPayWarning/fundSetting.vue
+++ b/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,
diff --git a/jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/applyConfig.vue b/jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/applyConfig.vue
index b6622eb3..1dad08f2 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/applyConfig.vue
+++ b/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>
 
diff --git a/jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/applyExamine.vue b/jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/applyExamine.vue
index 4baaf0ac..017a64e8 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/applyExamine.vue
+++ b/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()
   },
diff --git a/jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/setting.vue b/jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/setting.vue
index e764bc78..1a2eccaf 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/investCompleteWarning/setting.vue
+++ b/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>
@@ -117,7 +117,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="预警事项" prop="warnMatters">
-          
+
           <el-select v-model="form.warnMatters" placeholder="请选择预警事项" style="width: 100%">
             <el-option
               v-for="dict in warningThingOptions"
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectWarning/list.vue b/jwtech-admin-page/src/views/building/projectInfo/projectWarning/list.vue
index ed617075..fd963bf3 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectWarning/list.vue
+++ b/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>
diff --git a/sql/2025-03-13 b/sql/2025-03-13
new file mode 100644
index 00000000..78eaa336
--- /dev/null
+++ b/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`;
+