评估结果查看

src/views/assessChecks/assistedViewing.vue

@@ -25,17 +25,42 @@
         ></el-input>
       </el-form-item>
       <el-form-item label="后评估批次状态:" prop="batchState" class="fromItem">
-      <el-select
-          v-model="ruleForm.batchState"
+        <el-select v-model="ruleForm.batchState" placeholder="请选择" clearable>
+          <el-option label="执行中" value="3"></el-option>
+          <el-option label="已完成" value="5"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="项目编码:" prop="projectId" class="fromItem">
+        <el-input
+          v-model="ruleForm.projectId"
+          placeholder="请输入"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="项目名称:" prop="projectName" class="fromItem">
+        <el-input
+          v-model="ruleForm.projectName"
+          placeholder="请输入"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="项目年度:" prop="projectYear" class="fromItem">
+        <el-select
+          v-model="ruleForm.projectYear"
           placeholder="请选择"
           clearable
         >
-          <el-option label="执行中" value="3"></el-option>
-          <el-option label="已完成" value="5"></el-option>
+          <el-option
+            v-for="(item, index) in yearsList"
+            :key="index"
+            :label="item + '年'"
+            :value="item"
+          />
         </el-select>
       </el-form-item>
+
       <el-form-item label="项目审核状态:" prop="reviewStatus" class="fromItem">
-      <el-select
+        <el-select
           v-model="ruleForm.reviewStatus"
           placeholder="请选择"
           clearable
@@ -45,19 +70,21 @@
           <el-option label="已整改" value="2"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="评估项目名称:" prop="projectName" class="fromItem">
-        <el-input
-          v-model="ruleForm.projectName"
-          placeholder="请输入"
-          clearable
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="项目编码:" prop="projectId" class="fromItem">
-        <el-input
-          v-model="ruleForm.projectId"
-          placeholder="请输入"
-          clearable
-        ></el-input>
+      <el-form-item
+        label="实际评估日期:"
+        prop="actualReviewTime"
+        class="fromItem"
+      >
+        <el-date-picker
+          @change="timeChange"
+          v-model="ruleForm.dates"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
       </el-form-item>
 
       <el-form-item class="button">
@@ -77,7 +104,7 @@
         @selection-change="handleSelectionChange"
         ref="multipleTable"
         :data="tableData"
-         tooltip-effect="dark myTooltips"
+        tooltip-effect="dark myTooltips"
         style="width: 100%"
         header-cell-class-name="custom-th-background"
         class="eltable"
@@ -94,38 +121,43 @@
         >
         <el-table-column prop="batchName" label="后评估批次名称">
         </el-table-column>
+        <el-table-column prop="expertName" label="评审专家"> </el-table-column>
         <el-table-column
           prop="batchStateText"
           label="后评估批次状态"
           width="auto"
         >
         </el-table-column>
+        <el-table-column prop="projectId" label="项目编码"> </el-table-column>
+
         <el-table-column
           prop="projectName"
-          label="评估项目名称"
+          label="项目名称"
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column prop="reviewStatusText" label="项目审核状态">
-      </el-table-column>
+        <el-table-column prop="projectYear" label="项目年度">
+          <template slot-scope="scope">
+            {{ scope.row.projectYear }}年
+          </template>
+        </el-table-column>
         <el-table-column prop="projectCategory" label="建设形式">
         </el-table-column>
-        <!-- <el-table-column prop="projectStatus" label="项目建设阶段">
-        </el-table-column> -->
-        <!-- <el-table-column prop="createTime" label="历史审核状态">
-		</el-table-column> -->
 
-        <el-table-column prop="expertName" label="评审专家名单">
+        <el-table-column prop="reviewStatusText" label="项目审核状态">
+        </el-table-column>
+
+        <el-table-column prop="planReviewDate" label="计划评估日期">
+        </el-table-column>
+        <el-table-column prop="actualReviewTime" label="实际评估日期">
         </el-table-column>
-        <!-- <el-table-column prop="字段待确认" label="后评估状态"> </el-table-column> -->
-        <el-table-column prop="planReviewDate" label="评估日期"> </el-table-column>
       </el-table>
     </div>
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
       :current-page="currentPage"
-      :page-sizes="[10, 15, 20, 50,100]"
+      :page-sizes="[10, 15, 20, 50, 100]"
       :page-size="1000"
       layout="total, sizes, prev, pager, next, jumper"
       :total="total"
@@ -196,7 +228,7 @@
                   <el-table
                     @selection-change="handleSelectionChange"
                     :data="qdtableData"
-                     tooltip-effect="dark myTooltips"
+                    tooltip-effect="dark myTooltips"
                     style="width: 100%"
                     header-cell-class-name="custom-th-background"
                     class="eltable"
@@ -237,7 +269,7 @@
             <p class="title"><span></span>项目基本信息</p>
             <el-table
               :data="xxtableData"
-               tooltip-effect="dark myTooltips"
+              tooltip-effect="dark myTooltips"
               style="width: 100%"
               header-cell-class-name="custom-th-background"
               class="eltable"
@@ -265,23 +297,23 @@
               <el-table-column label="评估问题" prop="evalQues">
               </el-table-column>
               <el-table-column label="问题截图" width="auto">
-          <template slot-scope="scope">
-            <el-image
-              class="imgList"
-              v-for="(img, index) in scope.row.images"
-              :key="index"
-              :src="img"
-              :preview-src-list="scope.row.images"
-              @click="handleImageClick(scope.row.images)"
-            ></el-image>
-          </template>
-        </el-table-column>
+                <template slot-scope="scope">
+                  <el-image
+                    class="imgList"
+                    v-for="(img, index) in scope.row.images"
+                    :key="index"
+                    :src="img"
+                    :preview-src-list="scope.row.images"
+                    @click="handleImageClick(scope.row.images)"
+                  ></el-image>
+                </template>
+              </el-table-column>
             </el-table>
           </el-tab-pane>
           <el-tab-pane label="评审流程" name="third">
             <el-table
               :data="lctableData"
-               tooltip-effect="dark myTooltips"
+              tooltip-effect="dark myTooltips"
               style="width: 100%"
               header-cell-class-name="custom-th-background"
               class="eltable"
@@ -313,9 +345,9 @@ import {
   clqdselect,
   selLcb,
   presignedUrl,
-  downloadObject
+  downloadObject,
 } from "@/api/index";
-import { generateYearOptions ,projectCategoryText} from "@/utils/cache";
+import { generateYearOptions, projectCategoryText } from "@/utils/cache";
 export default {
   data() {
     return {
@@ -368,21 +400,25 @@ export default {
 
       if (res.code == "200") {
         this.tableData = res.data.records;
-        this.tableData.forEach(item=>{
+        this.tableData.forEach((item) => {
           if (item.batchState == "3") {
             this.$set(item, "batchStateText", "执行中");
           } else if (item.batchState == "5") {
             this.$set(item, "batchStateText", "已完成");
-          } 
+          }
           if (item.reviewStatus == "0") {
             this.$set(item, "reviewStatusText", "无问题");
           } else if (item.reviewStatus == "1") {
             this.$set(item, "reviewStatusText", "需整改");
-          }  else if (item.reviewStatus == "2") {
+          } else if (item.reviewStatus == "2") {
             this.$set(item, "reviewStatusText", "已整改");
           }
-		    this.$set(item, "projectCategory",projectCategoryText(item.projectCategory));
-        })
+          this.$set(
+            item,
+            "projectCategory",
+            projectCategoryText(item.projectCategory)
+          );
+        });
         this.total = res.data.total * 1;
       }
     },
@@ -405,7 +441,9 @@ export default {
       };
       Promise.all([fzcxXqselect(params), clqdselect(params)]).then((res) => {
         this.listData = res[0].data.records[0];
-        this.listData.projectCategory=projectCategoryText(this.listData.projectCategory)
+        this.listData.projectCategory = projectCategoryText(
+          this.listData.projectCategory
+        );
         this.qdtableData = JSON.parse(JSON.stringify(this.tableDataNew));
         if (res[1].data.records.length > 0) {
           this.qdtableData = this.qdtableData
@@ -420,7 +458,7 @@ export default {
                 accumulator.push(currentObj);
               }
               return accumulator;
-            }, []);   
+            }, []);
         }
       });
     },

src/views/assessChecks/auxiliaryInspection.vue

@@ -29,6 +29,31 @@
           <el-option label="已完成" value="5"></el-option>
         </el-select>
       </el-form-item>
+
+      <el-form-item label="项目编码:" prop="projectId" class="fromItem">
+        <el-input v-model="ruleForm.projectId" placeholder="请输入" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="项目名称:" prop="projectName" class="fromItem">
+        <el-input
+          v-model="ruleForm.projectName"
+          placeholder="请输入"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="项目年度:" prop="projectYear" class="fromItem">
+        <el-select
+          v-model="ruleForm.projectYear"
+          placeholder="请选择"
+          clearable
+        >
+          <el-option
+            v-for="(item, index) in yearsList"
+            :key="index"
+            :label="item + '年'"
+            :value="item"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="检查评估状态:" prop="postEvalState" class="fromItem">
         <el-select v-model="ruleForm.postEvalState" placeholder="请选择" clearable>
           <el-option label="待提交" value="2"></el-option>
@@ -37,17 +62,19 @@
           <el-option label="待评估" value="1"></el-option>
         </el-select>
       </el-form-item>
-
-      <el-form-item label="评估项目名称:" prop="projectName" class="fromItem">
-        <el-input
-          v-model="ruleForm.projectName"
-          placeholder="请输入"
-          clearable
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="项目编码:" prop="projectId" class="fromItem">
-        <el-input v-model="ruleForm.projectId" placeholder="请输入" clearable></el-input>
+      <el-form-item label="实际评估日期:" prop="actualReviewTime" class="fromItem">
+        <el-date-picker
+          @change="timeChange"
+          v-model="ruleForm.dates"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
       </el-form-item>
+     
 
       <el-form-item class="button">
         <el-button @click="submitForm()">
@@ -103,6 +130,11 @@
 
       <el-table-column prop="projectName" label="项目名称" show-overflow-tooltip>
       </el-table-column>
+      <el-table-column prop="projectYear" label="项目年度">
+          <template slot-scope="scope">
+            {{scope.row.projectYear}}年
+          </template>
+        </el-table-column>
       <el-table-column prop="projectCategory" label="建设形式">
       </el-table-column>
       <el-table-column prop="postEvalState" label="检查评估状态">
@@ -110,6 +142,7 @@
       <el-table-column prop="reviewStatusText" label="项目审核状态">
       </el-table-column>
       <el-table-column prop="planReviewDate" label="计划评估日期"> </el-table-column>
+      <el-table-column prop="actualReviewDate" label="实际评估日期"> </el-table-column>
     </el-table>
   </div>
     <el-pagination
@@ -144,6 +177,7 @@ export default {
         postEvalState: "",
         projectName: "",
         projectId: "",
+        dates:[],
       },
       ruleFormdialog: {
         batchYear: "",

src/views/assessChecks/checkComplianceFZ.vue

@@ -65,6 +65,7 @@ import {
   tjpostEvalQuesInfo,
   presignedUrl,
 } from "@/api/index";
+import { getCurrentDate } from "@/utils/format";
 export default {
   data() {
     return {
@@ -186,12 +187,15 @@ export default {
     handleImageClick() {},
     //保存
     async save(type) {
-      console.log(this.clqparams, "this.clqparams");
+      
       let params = {
         projectId: this.clqparams.projectId,
         batchId: this.clqparams.batchId,
         list: this.tableData,
+        actualReviewTime: getCurrentDate(),
       };
+      console.log(params, "this.clqparams");
+      return
 
       if (type == "add") {
         console.log(params, "this.zjtableDatathis.zjtableData");

src/views/assessChecks/confirmRelease.vue

@@ -40,6 +40,18 @@
           <el-option label="已完成" value="5"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="创建时间:" prop="batchName" class="fromItem">
+        <el-date-picker
+          @change="timeChange"
+          v-model="ruleForm.dates"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
       <el-form-item class="button">
         <el-button @click="submitForm()">
           <img class="buttonIcon" src="../../assets/cx.png" />查询</el-button
@@ -60,7 +72,6 @@
     </el-form>
     <div class="setscroll">
       <el-table
-      
         @selection-change="handleSelectionChange"
         ref="multipleTable"
         :data="tableData"
@@ -79,25 +90,28 @@
         </el-table-column>
         <el-table-column prop="batchName" label="后评估批次名称">
         </el-table-column>
-   
-      
+
         <el-table-column prop="expertName" label="评审专家" width="auto">
         </el-table-column>
 
-        <el-table-column prop="projectName" label="待评估项目" width="auto" show-overflow-tooltip>
+        <el-table-column
+          prop="projectName"
+          label="待评估项目"
+          width="auto"
+          show-overflow-tooltip
+        >
         </el-table-column>
         <el-table-column
           prop="planReviewDate"
           label="计划评估日期"
           width="auto"
         >
-      </el-table-column>
+        </el-table-column>
         <el-table-column
           prop="postEvalStateText"
           label="后评估批次状态"
           width="auto"
         >
-   
         </el-table-column>
         <el-table-column prop="creator" label="创建人" width="auto">
         </el-table-column>
@@ -170,14 +184,14 @@
           <el-table
             @selection-change="handleSelectionChange"
             :data="addtableData"
-             tooltip-effect="dark myTooltips"
+            tooltip-effect="dark myTooltips"
             style="width: 100%"
             header-cell-class-name="custom-th-background"
             class="eltable"
             :row-class-name="tableRowClassName"
             border
           >
-          <el-table-column type="selection"> </el-table-column>
+            <el-table-column type="selection"> </el-table-column>
             <el-table-column label="序号" width="55" type="index">
             </el-table-column>
             <el-table-column prop="department" label="部门" width="150">
@@ -185,7 +199,7 @@
 
             <el-table-column label="项目编码" width="150" prop="projectId">
             </el-table-column>
-           
+
             <el-table-column
               prop="projectName"
               label="项目名称"
@@ -199,16 +213,12 @@
               width="100"
             >
             </el-table-column>
-            <el-table-column
-              prop="projectYear"
-              label="项目年度"
-              width="100"
-            >
+            <el-table-column prop="projectYear" label="项目年度" width="100">
               <template slot-scope="scope">
                 {{ scope.row.projectYear }}年
               </template>
             </el-table-column>
-  
+
             <el-table-column label="总投资计划（万元）" width="200">
               <el-table-column
                 prop="costAmountTotal"
@@ -233,7 +243,6 @@
               show-overflow-tooltip
             >
             </el-table-column>
-           
           </el-table>
         </div>
         <el-pagination
@@ -306,14 +315,14 @@
                 addcurrentPage * pageSizeAdd
               )
             "
-             tooltip-effect="dark myTooltips"
+            tooltip-effect="dark myTooltips"
             style="width: 100%"
             header-cell-class-name="custom-th-background"
             class="eltable"
             :row-class-name="tableRowClassName"
             border
           >
-          <el-table-column type="selection"> </el-table-column>
+            <el-table-column type="selection"> </el-table-column>
             <el-table-column label="序号" width="55" type="index">
             </el-table-column>
             <el-table-column prop="department" label="部门" width="150">
@@ -321,7 +330,7 @@
 
             <el-table-column label="项目编码" width="150" prop="projectId">
             </el-table-column>
-           
+
             <el-table-column
               prop="projectName"
               label="项目名称"
@@ -335,16 +344,12 @@
               width="100"
             >
             </el-table-column>
-            <el-table-column
-              prop="projectYear"
-              label="项目年度"
-              width="100"
-            >
+            <el-table-column prop="projectYear" label="项目年度" width="100">
               <template slot-scope="scope">
                 {{ scope.row.projectYear }}年
               </template>
             </el-table-column>
-  
+
             <el-table-column label="总投资计划（万元）" width="200">
               <el-table-column
                 prop="costAmountTotal"
@@ -409,11 +414,7 @@
     >
       <div class="adzjdialog">
         <el-form :model="ruleFormZJ" label-width="100px" class="demo-ruleForm">
-          <el-form-item
-            label="项目年度:"
-            prop="projectYear"
-            class="fromItem"
-          >
+          <el-form-item label="项目年度:" prop="projectYear" class="fromItem">
             <el-select
               v-model="ruleFormZJ.projectYear"
               placeholder="请选择"
@@ -441,7 +442,7 @@
               clearable
             ></el-input>
           </el-form-item>
-          <el-form-item label="项目内容:" prop="projectInfo" class="fromItem" >
+          <el-form-item label="项目内容:" prop="projectInfo" class="fromItem">
             <el-input
               v-model="ruleFormZJ.projectInfo"
               placeholder="请输入"
@@ -497,7 +498,7 @@
             @selection-change="handleSelectionChangeZJ"
             ref="multipleTableZJ"
             :data="zjtableData"
-             tooltip-effect="dark myTooltips"
+            tooltip-effect="dark myTooltips"
             style="width: 100%"
             header-cell-class-name="custom-th-background"
             class="eltable"
@@ -512,7 +513,7 @@
 
             <el-table-column label="项目编码" width="150" prop="projectId">
             </el-table-column>
-           
+
             <el-table-column
               prop="projectName"
               label="项目名称"
@@ -526,16 +527,12 @@
               width="100"
             >
             </el-table-column>
-            <el-table-column
-              prop="projectYear"
-              label="项目年度"
-              width="100"
-            >
+            <el-table-column prop="projectYear" label="项目年度" width="100">
               <template slot-scope="scope">
                 {{ scope.row.projectYear }}年
               </template>
             </el-table-column>
-  
+
             <el-table-column label="总投资计划（万元）" width="200">
               <el-table-column
                 prop="costAmountTotal"
@@ -560,7 +557,6 @@
               show-overflow-tooltip
             >
             </el-table-column>
-           
           </el-table>
         </div>
 
@@ -604,6 +600,7 @@ export default {
         batchYear: "",
         batchName: "",
         postEvalState: "",
+        dates: [],
       },
       ruleFormdialog: {
         batchYear: "",
@@ -630,16 +627,6 @@ export default {
         prjsOfExpert: "",
         description: "",
       },
-      // rules: {
-      //   prjsOfExpert: [
-      //     {
-      //       required: true,
-      //       message: "请选择每位专家可评估项目数",
-      //       trigger: "change",
-      //     },
-      //   ]
-
-      // },
       tableData: [],
       tableDataQD: [], //清单列表
       checkedList: [],
@@ -688,12 +675,17 @@ export default {
     },
   },
   mounted() {
-    console.log("author");
     // this.submitForm();
   },
   methods: {
+    timeChange(time) {
+      if (time) {
+        //给后端的参数
+        this.ruleForm.createStartTime = time[0];
+        this.ruleForm.createEndTime = time[1];
+      }
+    },
     async submitForm() {
-      console.log("来了几次");
       let params = {
         current: this.currentPage,
         pageSize: this.pageSize,
@@ -729,8 +721,6 @@ export default {
         this.$message("请选择");
         return;
       }
-      console.log("222", this.checkedList);
-
       this.ruleFormdialogBJ = this.checkedList[0];
 
       let params = {
@@ -794,9 +784,7 @@ export default {
         }
       }
     },
-    closeXQ() {
-      console.log("关闭详情");
-    },
+    closeXQ() {},
     //表格颜色
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 == 1) {
@@ -1255,13 +1243,12 @@ export default {
 ::v-deep.el-table::before {
   display: none !important;
 }
-
 </style>
 
 <style>
- .myTooltips{
-  width: 80%  !important;
-  background: gainsboro  !important ;
+.myTooltips {
+  width: 80% !important;
+  background: gainsboro !important ;
   color: #333 !important;
   text-align: center;
   position: absolute;