From 58aec98dbeb4e94283aab472cc00abef3721ec89 Mon Sep 17 00:00:00 2001
From: wuxu <1159559925@qq.com>
Date: Mon, 10 Mar 2025 21:53:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E9=87=91=E6=8B=A8=E4=BB=98=E3=80=81?=
 =?UTF-8?q?=E4=B8=93=E9=A2=98=E7=AE=A1=E7=90=86=E3=80=81=E5=BC=80=E5=B7=A5?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../investment/options/purposeFunds.vue       | 20 +++++++
 .../options/startUpDocument.vue               | 59 +++++++++++++++++++
 .../project/special/options/documentPage.vue  | 19 +++++-
 .../investment/options/purposeFunds.vue       |  1 +
 .../domain/BsSgcJsjdBuiPurposeFunds.java      |  3 +
 .../domain/BsSgcYxjdDynamicCredit.java        |  2 +-
 6 files changed, 101 insertions(+), 3 deletions(-)

diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/purposeFunds.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/purposeFunds.vue
index d88dfe07..d66cd081 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/purposeFunds.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/purposeFunds.vue
@@ -469,6 +469,21 @@
                 placeholder="请输入项目法人经办人"
               />
             </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="资金用途" prop="type">
+
+              <el-select v-model="form.type" placeholder="资金用途" style="width:430px;">
+                <el-option
+                  v-for="dict in fundUseTypeOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+
+
           </el-col>
           <el-col :span="12">
             <el-form-item label="合同支付票据" prop="paymentBill">
@@ -546,6 +561,7 @@ export default {
       contractNumber: "",
       // 规划附件
       projectFileList: [],
+      fundUseTypeOptions: [],
       // 请求头
       headers: {
         jianwei: "jwtech " + getToken(),
@@ -743,6 +759,10 @@ export default {
   created() {
     // this.subcontractsList = this.formData;
     this.getList();
+
+     this.getDicts("fund_use_type").then((response) => {
+      this.fundUseTypeOptions = response.data;
+    });
   },
   // 父组件  利用axios请求得到的值  传送到子组件，要监听，否则初始渲染时为空
   // watch: {
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/preparationConstruction/options/startUpDocument.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/preparationConstruction/options/startUpDocument.vue
index eac6c0e7..2eec7484 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/preparationConstruction/options/startUpDocument.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/preparationConstruction/options/startUpDocument.vue
@@ -120,12 +120,14 @@
         prop="sectionName"
         min-width="120"
       />
+
       <el-table-column
         label="开工文件"
         align="left"
         prop="projectCommencementFiles"
         min-width="120"
       >
+
         <template slot-scope="scope">
           <div
             v-for="(item, index) in JSON.parse(
@@ -143,6 +145,25 @@
           </div>
         </template>
       </el-table-column>
+
+      <el-table-column
+        label="申报时间"
+        align="left"
+        prop="reportingTime"
+        min-width="120"
+      />
+      <el-table-column
+        label="审批时间"
+        align="left"
+        prop="approvalTime"
+        min-width="120"
+      />
+      <el-table-column
+        label="批复意见"
+        align="left"
+        prop="approvalOpinions"
+        min-width="220"
+      />
       <el-table-column
         label="操作"
         align="right"
@@ -211,6 +232,44 @@
               <choose-section :form="form" :proCode="proCode" :proNo="proNo" />
             </el-form-item>
           </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="上报时间" prop="reportingTime">
+              <el-date-picker
+                v-model="form.reportingTime"
+                type="date"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
+                style="width: 100%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="审批时间" prop="approvalTime">
+              <el-date-picker
+                v-model="form.approvalTime"
+                type="date"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
+                style="width: 100%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="批复意见" prop="approvalOpinions">
+              <el-input
+                v-model="form.approvalOpinions"
+                placeholder="请输入批复意见"
+                type="textarea"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+
           <el-col :span="24">
             <el-form-item label="开工文件" prop="projectCommencementFiles">
               <!-- <el-input
diff --git a/jwtech-admin-page/src/views/project/special/options/documentPage.vue b/jwtech-admin-page/src/views/project/special/options/documentPage.vue
index 03e1fd35..22a390b5 100644
--- a/jwtech-admin-page/src/views/project/special/options/documentPage.vue
+++ b/jwtech-admin-page/src/views/project/special/options/documentPage.vue
@@ -74,8 +74,8 @@
               ></el-button>
             </el-input>
           </el-form-item>
-    
-    
+
+
           <el-form-item>
             <!-- <el-button
               type="cyan"
@@ -144,6 +144,7 @@
         prop="documentName"
         min-width="180"
       />
+      <el-table-column label="文档类型" align="center" prop="documentType" :formatter="documentTypeFormat" />
       <el-table-column
         label="项目编号"
         align="left"
@@ -231,6 +232,16 @@
         <el-form-item label="文档名称" prop="documentName">
           <el-input v-model="form.documentName" placeholder="请输入文档名称" />
         </el-form-item>
+        <el-form-item label="文档类型" prop="documentType">
+          <el-select v-model="form.documentType" placeholder="请选择文档类型">
+            <el-option
+              v-for="dict in documentTypeOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item
           label="文档附件"
           prop="acceptDocumentAttachment"
@@ -580,6 +591,10 @@ export default {
         }
       });
     },
+    // 文档类型(0:专著,1:论文...)字典翻译
+    documentTypeFormat(row, column) {
+      return this.selectDictLabel(this.documentTypeOptions, row.documentType);
+    },
     // 取消按钮
     cancel() {
       this.open = false;
diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/investment/options/purposeFunds.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/investment/options/purposeFunds.vue
index bdc9d711..5e2618c7 100644
--- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/investment/options/purposeFunds.vue
+++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/investment/options/purposeFunds.vue
@@ -467,6 +467,7 @@
               />
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
             <el-form-item label="合同支付票据" prop="paymentBill">
               <!-- <el-input
diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiPurposeFunds.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiPurposeFunds.java
index e85ada98..deff98a2 100644
--- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiPurposeFunds.java
+++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiPurposeFunds.java
@@ -137,6 +137,9 @@ public class BsSgcJsjdBuiPurposeFunds extends BaseEntity
 
     private String townshipPaidinAmount;
 
+    @Excel(name = "资金用途")
+    @ApiModelProperty("资金用途")
+    private String type;
 
 
 }
diff --git a/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdDynamicCredit.java b/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdDynamicCredit.java
index 0814b48b..1cc73dc1 100644
--- a/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdDynamicCredit.java
+++ b/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdDynamicCredit.java
@@ -124,7 +124,7 @@ public class BsSgcYxjdDynamicCredit extends BaseEntity
     /** $column.columnComment */
     @Excel(name = "水行政主管部门")
     @ApiModelProperty("水行政主管部门")
-    private String owerDept;
+        private String owerDept;
 
     private String recordId;