Merge remote-tracking branch 'origin/master'

src/api/backstage/job.js

@@ -51,10 +51,13 @@ export function distributeRectificationJob(id) {
 }
 
 //打回初次调查任务（复查任务不需要打回）
-export function rollbackJob(id) {
+export function rollbackJob(data) {
+
+
   return request({
-    url: '/backstage/job/rollbackJob/'+id,
+    url: '/backstage/job/rollbackJob',
     method: 'put',
+    data: data
   })
 }
 

src/api/backstage/reason.js

 import request from '@/utils/request'
 
+
+// 查询原因库列表
+export function getListReason() {
+  return request({
+    url: '/backstage/reason/getListReason',
+    method: 'get',
+  })
+}
+
 // 查询原因库列表
 export function listReason(query) {
   return request({
@@ -50,4 +59,4 @@ export function exportReason(query) {
     method: 'get',
     params: query
   })
-}
+}
\ No newline at end of file

src/views/backstage/job/index.vue

@@ -187,23 +187,23 @@
             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="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-->
+<!--            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
             v-if="scope.row.jobType == '1' && scope.row.jobStatus == '3' && scope.row.isDistribute == '1'"