Merge branch 'master' of http://175.178.86.109:3000/Niko/shuili_manager

1 month ago · 2e5e3ca549
7 changed files with 104 additions and 3 deletions
--- 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: {
--- 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
--- 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;
--- 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
--- 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;


 }
--- 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;

--- a/sql/2025-03-10
+++ b/sql/2025-03-10
@ -0,0 +1,3 @@
+ALTER TABLE `bs_sgc_jsjd_bui_purpose_funds`
+ADD COLUMN `type`  varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '资金用途（水利基础建设资金、三防经费、移民经费）' ;
+