修改

jwtech-admin-page/src/views/project/proposal/index.vue

@@ -204,7 +204,7 @@
           <span>{{ scope.row.projectContent || "-" }}</span>
         </template>
       </el-table-column> -->
-      <el-table-column
+      <!-- <el-table-column
         label="批复部门"
         align="center"
         prop="approvalDepartment"
@@ -215,7 +215,7 @@
         align="center"
         prop="approvalNo"
         min-width="120"
-      />
+      /> -->
       <el-table-column
         label="批复意见"
         align="center"
@@ -777,6 +777,22 @@ export default {
             validator: this.compareTime,
           },
         ],
+        approvalDepartment: [
+          {
+            required: true,
+            message: "请输入批复部门",
+            trigger: "blur",
+          },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        approvalNo: [
+          {
+            required: true,
+            message: "请输入批复文号",
+            trigger: "blur",
+          },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
         isBelongPlanning: [
           {
             required: true,
@@ -898,6 +914,8 @@ export default {
         } else {
           callback(new Error("上报时间不能晚于审批时间"));
         }
+      } else {
+        callback();
       }
     },
     formatAdcd(row) {

jwtech-admin-page/src/views/project/report/index.vue

@@ -185,6 +185,18 @@
         prop="projectInvestmentEstimate"
         min-width="120"
       />
+      <!-- <el-table-column
+        label="批复部门"
+        align="center"
+        prop="approvalDepartment"
+        min-width="120"
+      />
+      <el-table-column
+        label="批复文号"
+        align="center"
+        prop="approvalNo"
+        min-width="120"
+      /> -->
       <!-- <el-table-column
         label="批复意见"
         align="center"
@@ -301,34 +313,48 @@
       :close-on-click-modal="false"
     >
       <el-row :gutter="15">
-        <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="150px">
-          <!-- <el-col :span="12">
+          <el-col :span="12">
-            <el-form-item label="是否属于规划内" prop="isBelongPlanning">
+            <el-form-item label="是否有建议书审批" prop="isApproval">
               <el-select
-                v-model="form.isBelongPlanning"
+                v-model="form.isApproval"
-                placeholder="是否属于规划内"
+                placeholder="请选择是否有建议书审批"
                 clearable
                 size="small"
                 style="width: 100%"
               >
                 <el-option
-                  v-for="dict in IS"
+                  v-for="dict in isApprovalOptions"
-                  :key="dict"
+                  :key="dict.dictValue"
-                  :label="dict"
+                  :label="dict.dictLabel"
-                  :value="dict"
+                  :value="dict.dictValue"
-                />
+                ></el-option>
               </el-select>
             </el-form-item>
-          </el-col> -->
+          </el-col>
           <el-col :span="12">
-            <el-form-item label="项目名称" prop="projectName">
+            <!-- 无建议书审批 -->
+            <el-form-item
+              label="项目名称"
+              prop="projectName"
+              v-if="form.isApproval == '0'"
+            >
+              <el-input
+                v-model="form.projectName"
+                placeholder="请输入项目名称"
+                size="small"
+              ></el-input>
+            </el-form-item>
+            <!-- 有建议书审批 -->
+            <el-form-item label="项目名称" prop="projectName" v-else>
               <el-select
                 v-model="form.projectName"
-                placeholder="项目名称"
+                placeholder="请选择项目名称"
                 filterable
                 clearable
                 size="small"
                 style="width: 100%"
+                :disabled="!form.isApproval"
               >
                 <el-option
                   v-for="dict in projectNameOptions"
@@ -340,23 +366,49 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!--          <el-col :span="12">
+          <!-- 无建议书审批时 -->
-                      <el-form-item label="项目类型" prop="projectType">
+          <el-col :span="12" v-if="form.isApproval == '0'">
-                        <el-select
+            <el-form-item label="项目类型" prop="projectType">
-                          v-model="form.projectType"
+              <el-select
-                          placeholder="项目类型"
+                v-model="form.projectType"
-                          clearable
+                placeholder="请选择项目类型"
-                          size="small"
+                style="width: 100%"
-                        >
+                clearable
-                          <el-option
+              >
-                            v-for="dict in projectTypeOptions"
+                <el-option
-                            :key="dict.dictValue"
+                  v-for="dict in projectTypeOptions"
-                            :label="dict.dictLabel"
+                  :key="dict.dictValue"
-                            :value="dict.dictValue"
+                  :label="dict.dictLabel"
-                          />
+                  :value="dict.dictValue"
-                        </el-select>
+                ></el-option>
-                      </el-form-item>
+              </el-select>
-                    </el-col>-->
+            </el-form-item>
+          </el-col>
+          <!-- 无建议书审批时，选择行政区划 -->
+          <el-col :span="12" v-if="form.isApproval == '0'">
+            <el-form-item label="行政区划" prop="adcd">
+              <el-cascader
+                :options="areasOptions"
+                v-model="form.adcd"
+                :props="areasOptionProps"
+                placeholder="请选择行政区划"
+                clearable
+                size="small"
+                style="width: 100%"
+                @change="handleChange"
+              >
+              </el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="form.isApproval == '0'">
+            <el-form-item label="项目编码" prop="projectCode">
+              <el-input
+                v-model="form.projectCode"
+                placeholder="请输入项目编码"
+                :readonly="isEdit"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="编制单位" prop="compilingUnit">
               <el-input
@@ -376,25 +428,6 @@
             </el-form-item>
           </el-col>
 
-          <!--          <el-col :span="12">
-            <el-form-item label="项目编码" prop="projectCode">
-              <el-select
-                v-model="form.projectCode"
-                placeholder="项目编码"
-                clearable
-                size="small"
-              >
-                <el-option
-                  v-for="dict in proCodeList"
-                  :key="dict"
-                  :label="dict"
-                  :value="dict"
-
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>-->
-
           <el-col :span="12">
             <el-form-item label="上报时间" prop="reportTime">
               <el-date-picker
@@ -425,6 +458,22 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="批复部门" prop="approvalDepartment">
+              <el-input
+                v-model="form.approvalDepartment"
+                placeholder="请输入批复部门"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="批复文号" prop="approvalNo">
+              <el-input
+                v-model="form.approvalNo"
+                placeholder="请输入批复文号"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="批复意见" prop="approvalOpinion">
               <el-input
@@ -534,8 +583,8 @@
           :contentStyle="{ minWidth: '350px' }"
         >
           <!-- <el-descriptions-item>
-            <template slot="label"> 是否属于规划内 </template>
+            <template slot="label"> 是否有建议书审批 </template>
-            {{ this.reportMsg.isBelongPlanning }}
+            {{ this.reportMsg.isApproval }}
           </el-descriptions-item> -->
           <el-descriptions-item>
             <template slot="label"> 项目名称 </template>
@@ -572,10 +621,19 @@
             <template slot="label"> 审批时间 </template>
             {{ this.reportMsg.approvalTime }}
           </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 批复部门 </template>
+            {{ this.reportMsg.approvalDepartment }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 批复文号 </template>
+            {{ this.reportMsg.approvalNo }}
+          </el-descriptions-item>
           <el-descriptions-item span="2">
             <template slot="label"> 批复意见 </template>
             {{ this.reportMsg.approvalOpinion }}
           </el-descriptions-item>
+
           <el-descriptions-item span="2">
             <template slot="label"> 项目内容 </template>
             {{ this.reportMsg.projectContent }}
@@ -639,6 +697,7 @@ import { getFileStream } from "@/api/system/upload";
 import { getToken } from "@/utils/auth";
 import { getAreasData } from "@/api/areas/index";
 import { regionData, codeToText, TextToCode } from "element-china-area-data";
+import { v4 as uuidv4 } from "uuid";
 
 export default {
   name: "Feasibility",
@@ -711,7 +770,7 @@ export default {
           compilingUnit: null,
           projectContent: null,
           projectInvestmentEstimate: null,
-          isBelongPlanning: null,
+          isApproval: null,
           relationProjectProposal: null,
           feasibilityReportFile: null,
           feasibilityReportAttachment: null,
@@ -740,6 +799,34 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        isApproval: [
+          {
+            required: true,
+            message: "请选择是否有建议书审批",
+            trigger: "blur",
+          },
+        ],
+        projectCode: [
+          {
+            required: true,
+            message: "请输入项目编码",
+            trigger: "blur",
+          },
+        ],
+        projectType: [
+          {
+            required: true,
+            message: "请选择项目类型",
+            trigger: "blur",
+          },
+        ],
+        adcd: [
+          {
+            required: true,
+            message: "请选择行政区划",
+            trigger: "blur",
+          },
+        ],
         reportTime: [
           {
             trigger: "blur",
@@ -752,6 +839,22 @@ export default {
             validator: this.compareTime,
           },
         ],
+        approvalDepartment: [
+          {
+            required: true,
+            message: "请输入批复部门",
+            trigger: "blur",
+          },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        approvalNo: [
+          {
+            required: true,
+            message: "请输入批复文号",
+            trigger: "blur",
+          },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
         compilingUnit: [
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
@@ -768,10 +871,10 @@ export default {
           },
         ],
         approvalOpinion: [
-          { max: 1000, message: "字符长度最大为1000", trigger: "blur" },
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
         projectContent: [
-          { max: 1000, message: "字符长度最大为1000", trigger: "blur" },
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
       },
       projectType: "",
@@ -781,8 +884,9 @@ export default {
       // projectCode: "",
       viewTitle: "",
       reportMsg: {},
-      //是否属于规划内字典
+      //是否又建议书审批字典
-      isBelongPlanningOptions: [],
+      isApprovalOptions: [],
+      isEdit: false,
     };
   },
   created() {
@@ -792,10 +896,20 @@ export default {
       this.projectTypeOptions = response.data;
     });
     this.getDicts("whether").then((response) => {
-      this.isBelongPlanningOptions = response.data;
+      this.isApprovalOptions = response.data;
     });
   },
   methods: {
+    getId(res) {
+      // console.log(res)
+      getProposal(res.id).then((response) => {
+        // console.log(response.data)
+        this.form.projectType = response.data.projectType;
+        this.form.proNo = response.data.proNo;
+        this.form.adcd = response.data.adcd;
+        this.form.projectCode = response.data.projectCode;
+      });
+    },
     compareTime(rule, value, callback) {
       if (this.form.reportTime && this.form.approvalTime) {
         //  dateStr = dateStr.substring(0,19);
@@ -809,6 +923,8 @@ export default {
         } else {
           callback(new Error("上报时间不能晚于审批时间"));
         }
+      } else {
+        callback();
       }
     },
     formatAdcd(row) {
@@ -866,18 +982,18 @@ export default {
         console.log("value", value);
       }
     },
-    getId(res) {
+    // getId(res) {
-      // console.log(res)
+    //   // console.log(res)
-      getProposal(res.id).then((response) => {
+    //   getProposal(res.id).then((response) => {
-        // console.log(response.data);
+    //     // console.log(response.data);
-        this.projectType = response.data.projectType;
+    //     this.projectType = response.data.projectType;
-        this.proNo = response.data.proNo;
+    //     this.proNo = response.data.proNo;
-        // console.log("this.proNo ", this.proNo);
+    //     // console.log("this.proNo ", this.proNo);
-        this.projectCode = response.data.projectCode;
+    //     this.projectCode = response.data.projectCode;
-        this.form.adcd = response.data.adcd;
+    //     this.form.adcd = response.data.adcd;
-        // console.log(55555555, this.form.adcd);
+    //     // console.log(55555555, this.form.adcd);
-      });
+    //   });
-    },
+    // },
     clear() {
       this.fileList = [];
       this.attachmentList = [];
@@ -890,12 +1006,9 @@ export default {
     // projectNameFormat(row) {
     //   return row.projectName.slice(0, row.projectName.indexOf("["));
     // },
-    // 是否属于规划内字典翻译
+    // 是否有建议书审批字典翻译
-    isBelongPlanningFormat(row, column) {
+    isApprovalFormat(row, column) {
-      return this.selectDictLabel(
+      return this.selectDictLabel(this.isApprovalOptions, row.isApproval);
-        this.isBelongPlanningOptions,
-        row.isBelongPlanning
-      );
     },
     /** 查询可行性研究报告列表 */
     getList() {
@@ -920,7 +1033,7 @@ export default {
         compilingUnit: null,
         projectContent: null,
         projectInvestmentEstimate: null,
-        isBelongPlanning: null,
+        isApproval: null,
         relationProjectProposal: null,
         feasibilityReportFile: null,
         feasibilityReportAttachment: null,
@@ -950,7 +1063,7 @@ export default {
           compilingUnit: null,
           projectContent: null,
           projectInvestmentEstimate: null,
-          isBelongPlanning: null,
+          isApproval: null,
           relationProjectProposal: null,
           feasibilityReportFile: null,
           feasibilityReportAttachment: null,
@@ -991,6 +1104,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.isEdit = false;
       this.form = {};
       this.fileList = [];
       this.attachmentList = [];
@@ -1004,7 +1118,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-
+      this.isEdit = true;
       // listProjectinfo(this.queryParams).then((response)=>{
       //   this.projectNameOptions = response.records;
       // })
@@ -1039,23 +1153,15 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      console.log("0000", this.$refs["form"]);
       this.$refs["form"].validate((valid) => {
+        console.log(11111);
         if (valid) {
           // 附件
           this.form.feasibilityReportFile = JSON.stringify(this.fileList);
           this.form.feasibilityReportAttachment = JSON.stringify(
             this.attachmentList
           );
-
-          if (this.proNo) {
-            this.form.proNo = this.proNo;
-          }
-          if (this.projectCode) {
-            this.form.projectCode = this.projectCode;
-          }
-          if (this.projectType) {
-            this.form.projectType = this.projectType;
-          }
           if (
             this.form.projectName &&
             this.form.projectName.indexOf("[") != -1
@@ -1074,6 +1180,10 @@ export default {
               }
             });
           } else {
+            if (this.form.isApproval == "0") {
+              // console.log("uuidv4()", uuidv4());
+              this.form.proNo = uuidv4();
+            }
             addFeasibility(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");

jwtech-admin-page/src/views/project/special/options/basePage.vue

@@ -325,6 +325,8 @@ export default {
         } else {
           callback(new Error("规划基准年时间要小于规划水平年"));
         }
+      } else {
+        callback();
       }
     },
     // 获取某一项的所有父节点的label值 list为树形结构的数据 id为回显节点的标识