Merge remote-tracking branch 'origin/master'

src/api/backstage/job.js

 import request from '@/utils/request'
 
+//打回初次调查任务（复查任务不需要打回）
+export function rollbackJob(id) {
+  return request({
+    url: '/backstage/job/rollbackJob/'+id,
+    method: 'put',
+  })
+}
+
+//审核初次调查任务（复查任务不需要审核）
+export function auditJob(id) {
+  return request({
+    url: '/backstage/job/auditJob/'+id,
+    method: 'put',
+  })
+}
+
 // 查询整改任务列表
 export function getList(query) {
   return request({

src/views/backstage/job/index.vue

@@ -65,9 +65,13 @@
         </el-select>
       </el-form-item>
       <el-form-item label="复查人员" prop="jobStatus">
-        <el-select v-model="queryParams.jobStatus" placeholder="请选择任务状态" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
+        <el-input
+          v-model="queryParams.checkUserName"
+          placeholder="请输入复查人员"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -121,8 +125,24 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="区域名称" align="center" prop="totalAreaName" />
       <el-table-column label="项目名称" align="center" prop="projectName" />
-      <el-table-column label="初考上报日期" align="center" prop="firstReportDate" />
-      <el-table-column label="调查人员" align="center" prop="investigatorUserName" />
+      <el-table-column label="任务类型" align="center" prop="jobType" >
+        <template scope="scope">
+          <span v-if="scope.row.jobType == '1'">普通任务</span>
+          <span v-if="scope.row.jobType == '2'">复查任务</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="初考上报日期" align="center" prop="firstReportDate" >
+        <template scope="scope">
+          <span v-if="scope.row.jobType == '1'">{{scope.row.firstReportDate}}</span>
+          <span v-if="scope.row.jobType == '2'">{{scope.row.firstReportDate1}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="调查人员" align="center" prop="investigatorUserName" >
+        <template scope="scope">
+          <span v-if="scope.row.jobType == '1'">{{scope.row.investigatorUserName}}</span>
+          <span v-if="scope.row.jobType == '2'">{{scope.row.investigatorUserName1}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="考核主题" align="center" prop="themeName" />
       <el-table-column label="考核状态" align="center" prop="jobStatus" >
         <template scope="scope">
@@ -151,9 +171,24 @@
           <span v-if="scope.row.rectifyStatus != null && scope.row.rectifyStatus == '3'">已审批</span>
         </template>
       </el-table-column>
-      <el-table-column label="是否已复查" align="center" prop="projectId" />
-      <el-table-column label="复查人员" align="center" prop="projectId" />
-      <el-table-column label="复查上报日期" align="center" prop="projectId" />
+      <el-table-column label="是否已复查" align="center" >
+        <template scope="scope">
+          <span v-if="scope.row.checkUserName == null">否</span>
+          <span v-else>是</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="复查人员" align="center" prop="checkUserName" >
+        <template scope="scope">
+          <span v-if="scope.row.jobType == '1'">{{scope.row.checkUserName}}</span>
+          <span v-if="scope.row.jobType == '2'">{{scope.row.checkUserName1}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="复查上报日期" align="center" prop="checkTime" >
+        <template scope="scope">
+          <span v-if="scope.row.jobType == '1'">{{scope.row.checkTime}}</span>
+          <span v-if="scope.row.jobType == '2'">{{scope.row.checkTime1}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="自然村得分" align="center" prop="projectId" />
       <el-table-column label="行政村得分" align="center" prop="projectId" />
       <el-table-column label="总得分" align="center" prop="projectId" />
@@ -161,6 +196,25 @@
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+
+          <el-button
+            v-if="scope.row.jobType == '1' && scope.row.jobStatus == '2'"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleAudit(scope.row)"
+            v-hasPermi="['backstage:job:edit']"
+          >审核通过</el-button>
+
+          <el-button
+            v-if="scope.row.jobType == '1' && scope.row.jobStatus == '2'"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleRollbackJob(scope.row)"
+            v-hasPermi="['backstage:job:edit']"
+          >打回任务</el-button>
+
           <el-button
             size="mini"
             type="text"
@@ -279,7 +333,7 @@
 </template>
 
 <script>
-import { getList,listJob, getJob, delJob, addJob, updateJob, exportJob } from "@/api/backstage/job";
+import { rollbackJob, auditJob, getList,listJob, getJob, delJob, addJob, updateJob, exportJob } from "@/api/backstage/job";
 
 export default {
   name: "Job",
@@ -368,6 +422,7 @@ export default {
         themeName: null,
         jobAssessmentType: null,
         rectifyStatus: null,
+        checkUserName: null,
       },
       // 表单参数
       form: {},
@@ -497,6 +552,37 @@ export default {
         }).then(response => {
           this.download(response.msg);
         })
+    },
+    //审核初次调查任务（复查任务不需要审核）
+    handleAudit(row){
+
+      this.$confirm('是否确认审核通过该调查任务?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(()=> {
+        auditJob(row.id).then(res=>{
+          this.$message.success("审核成功")
+          this.getList();
+        }).catch(()=>{
+          this.$message.error("审核失败")
+        })
+      })
+    },
+    //打回初次调查任务（复查任务不需要打回）
+    handleRollbackJob(row){
+      this.$confirm('是否确认打回该调查任务，打回任务调查员将重新调查?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(()=> {
+        rollbackJob(row.id).then(res=>{
+          this.$message.success("打回成功")
+          this.getList();
+        }).catch(()=>{
+          this.$message.error("打回失败")
+        })
+      })
     }
   }
 };