Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/gas/courtyardNetworkManagement/index.vue
#	src/views/gas/regulatingBoxMaintenance/index.vue
#	src/views/gas/regulatorBox/index.vue
#	src/views/gas/roadSectionInspection/index.vue
#	src/views/gas/valveWellInspection/index.vue

src/api/gas/patrolTeam.js

@@ -1,5 +1,12 @@
 import request from '@/utils/request'
 
+export function batchReview(data) {
+  return request({
+    url: '/gas/patrolTeam/batchReview',
+    method: 'POST',
+    data: data
+  })
+}
 // 查询巡检车队列表
 export function listPatrolTeam(query) {
   return request({

src/api/gas/roadSectionInspection.js

@@ -1,5 +1,12 @@
 import request from '@/utils/request'
 
+export function batchReview(data) {
+  return request({
+    url: '/gas/roadSectionInspection/batchReview',
+    method: 'POST',
+    data: data
+  })
+}
 // 查询路段巡查列表
 export function listRoadSectionInspection(query) {
   return request({

src/api/gas/valveWellInspection.js

@@ -1,6 +1,13 @@
 import request from '@/utils/request'
 
 // 查询阀井巡查列表
+export function batchReview(data) {
+  return request({
+    url: '/gas/valveWellInspection/batchReview',
+    method: 'POST',
+    data: data
+  })
+}
 export function listValveWellInspection(query) {
   return request({
     url: '/gas/valveWellInspection/list',

src/views/gas/courtyardNetworkManagement/index.vue

@@ -40,6 +40,16 @@
                      :value="item.id"/>
         </el-select>
       </el-form-item>
+      <el-form-item label="审核状态">
+        <el-select v-model="queryParams.processStatus" placeholder="请选择审核状态" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.process_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -84,7 +94,7 @@
         <el-button
           type="danger"
           plain
-          icon="el-icon-delete"
+          icon="el-icon-search"
           size="mini"
           :disabled="multiple"
           @click="openshShow(null,true)"
@@ -137,7 +147,7 @@
       </el-table-column>
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">
-          <span v-if="scope.row.processStatus == null && scope.row.processStatus == '-1'">未审核</span>
+          <span v-if="scope.row.processStatus == null && scope.row.processStatus == '-1'"></span>
           <dict-tag v-else :options="dict.type.process_status" :value="scope.row.processStatus"/>
         </template>
       </el-table-column>
@@ -259,7 +269,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="审核意见" prop="remarks">
+        <el-form-item label="审核意见" prop="processComments">
           <el-input v-model="formSH.processComments" type="textarea" placeholder="请输入审核意见" maxlength="255"/>
         </el-form-item>
       </el-form>
@@ -401,11 +411,7 @@ export default {
         findProblem: [
           {required: true, message: "发现问题不能为空", trigger: "change"}
         ],
-        remarks: [
-          {required: false, message: "备注不能为空", trigger: "blur"}
-        ],
-      },
-      workerListSelect:[]
+      }
     };
   },
   created() {

src/views/gas/patrolTeam/index.vue

@@ -48,6 +48,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="审核状态">
+        <el-select v-model="queryParams.processStatus" placeholder="请选择审核状态" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.process_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -89,6 +99,18 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
+          type="danger"
+          plain
+          icon="el-icon-search"
+          size="mini"
+          :disabled="multiple"
+          @click="openshShow(null,true)"
+          v-hasPermi="['gas:regulatingBoxMaintenance:remove']"
+        >批量审核
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
           type="warning"
           plain
           icon="el-icon-download"
@@ -120,8 +142,16 @@
           <dict-tag :options="dict.type.yes_and_no" :value="scope.row.isNormalInspection"/>
         </template>
       </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="上传人" align="center" prop="createByName" />
       <el-table-column label="上传时间" align="center" prop="createTime" />
+      <el-table-column label="审核状态" align="center" prop="processStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus"
+                    v-if="scope.row.processStatus != null && scope.row.processStatus != '-1' "/>
+          <span v-else></span>
+        </template>
+      </el-table-column>
       <el-table-column label="照片" align="center">
         <template slot-scope="scope">
           <el-image
@@ -143,6 +173,15 @@
           <el-button
             size="mini"
             type="text"
+            icon="el-icon-edit"
+            @click="openshShow(scope.row)"
+            v-show="scope.row.processStatus == null || scope.row.processStatus == '-1' || scope.row.processStatus == ''"
+            v-hasPermi="['gas:courtyardNetworkManagement:edit']"
+          >审核
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['gas:patrolTeam:remove']"
@@ -159,6 +198,28 @@
       @pagination="getList"
     />
 
+    <el-dialog title="审核" :visible.sync="openSH" width="500px" append-to-body>
+      <el-form ref="formSH" :model="formSH" :rules="rulesSH" label-width="100px">
+        <el-form-item label="审核状态" prop="processStatus">
+          <el-select v-model="formSH.processStatus" placeholder="请选择审核状态" :style="{width: '100%'}">
+            <el-option
+              v-for="dict in dict.type.process_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核意见" prop="processComments">
+          <el-input v-model="formSH.processComments" type="textarea" placeholder="请输入审核意见" maxlength="255"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitFormSH">确 定</el-button>
+        <el-button @click="openSH = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+
     <!-- 添加或修改巡检车队对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
@@ -185,6 +246,9 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
         <el-form-item label="照片" prop="photoList">
           <imageUpload v-model="form.photoList" :disabled="disabled"/>
         </el-form-item>
@@ -198,16 +262,24 @@
 </template>
 
 <script>
-import { listPatrolTeam, getPatrolTeam, delPatrolTeam, addPatrolTeam, updatePatrolTeam } from "@/api/gas/patrolTeam";
+import { batchReview,listPatrolTeam, getPatrolTeam, delPatrolTeam, addPatrolTeam, updatePatrolTeam } from "@/api/gas/patrolTeam";
 import {listPostAll} from "@/api/system/post";
 import Cookies from "js-cookie";
 import {getWorker} from "@/api/gas/user";
 
 export default {
   name: "PatrolTeam",
-  dicts: ['team', 'yes_and_no'],
+  dicts: ['team', 'yes_and_no','process_status'],
   data() {
     return {
+      openSH: false,
+      formSH: {},
+      rulesSH: {
+        processStatus: [
+          {required: true, message: "审核状态不能为空", trigger: "blur"}
+        ],
+      },
+
       // 按钮loading
       buttonLoading: false,
       disabled: false,
@@ -317,7 +389,8 @@ export default {
         createBy: undefined,
         createTime: undefined,
         updateBy: undefined,
-        updateTime: undefined
+        updateTime: undefined,
+        remark: undefined
       };
       this.resetForm("form");
     },
@@ -356,6 +429,47 @@ export default {
         this.title = "修改巡检车队";
       });
     },
+
+    openshShow(data, isBatch) {
+      this.formSH = {
+        id: undefined,
+        uids: [],
+        processStatus: undefined,
+        processComments: undefined,
+      }
+      if (isBatch)
+        this.formSH.uids = this.ids
+      else
+        this.formSH.id = data.id
+      this.openSH = true
+    },
+
+    submitFormSH() {
+      this.$refs["formSH"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.formSH.id != null) {
+            updatePatrolTeam(this.formSH).then(response => {
+              this.$modal.msgSuccess("审核成功");
+              this.openSH = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }else if (this.formSH.uids.length > 0) {
+            batchReview(this.formSH).then(response => {
+              this.$modal.msgSuccess("审核成功");
+              this.openSH = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      })
+    },
+
+
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {

src/views/gas/regulatingBoxMaintenance/index.vue

@@ -58,15 +58,15 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="备注" prop="remarks">
-        <el-input
-          v-model="queryParams.remarks"
-          placeholder="请输入备注"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+      <el-form-item label="审核状态">
+        <el-select v-model="queryParams.processStatus" placeholder="请选择审核状态" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.process_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       <el-form-item label="时间范围" prop="createTimes">
         <el-date-picker
           v-model="queryParams.createTimes"
@@ -123,7 +123,7 @@
         <el-button
           type="danger"
           plain
-          icon="el-icon-delete"
+          icon="el-icon-search"
           size="mini"
           :disabled="multiple"
           @click="process(null,true)"
@@ -172,7 +172,7 @@
         <template slot-scope="scope">
           <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus"
                     v-if="scope.row.processStatus != null && scope.row.processStatus != '-1' "/>
-          <span v-else>未审核</span>
+          <span v-else></span>
         </template>
       </el-table-column>
       <el-table-column label="照片" align="center">
@@ -301,7 +301,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input type="textarea" v-model="shFrom.remarks"></el-input>
+          <el-input type="textarea" v-model="shFrom.processComments"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -353,7 +353,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="审核备注" v-show="isDisabled && form.processStatus!=null">
-          <el-input type="textarea" v-model="form.remarks" placeholder=""/>
+          <el-input type="textarea" v-model="form.processComments" placeholder=""/>
         </el-form-item>
 
       </el-form>
@@ -450,9 +450,9 @@ export default {
         number: undefined,
         administrativeOffice: undefined,
         maintenanceItem: undefined,
-        remarks: undefined,
         createTimes: [],
         postNameArias:this.$store.state.user.postName,
+        processComments: undefined,
         ranks:(Cookies.get("postName").indexOf('xx') > -1 ? parseInt(Cookies.get("postId")) : undefined),
       },
       // 表单参数
@@ -461,8 +461,8 @@ export default {
         id: '',
         uids: [],
         processStatus: '',
+        processComments: "",
         postNameArias: null,
-        remarks: ""
       },
       // 表单校验
       rules: {
@@ -480,10 +480,7 @@ export default {
         ],
         maintenanceItem: [
           {required: true, message: "维护项目不能为空", trigger: "change"}
-        ],
-        remarks: [
-          {required: true, message: "备注不能为空", trigger: "blur"}
-        ],
+        ]
       },
       workerListSelect:[]
     };
@@ -558,8 +555,8 @@ export default {
       else
         this.shFrom.id = data.id;
       this.shFrom.processStatus = '';
+      this.shFrom.processComments = '';
       this.shFrom.postNameArias = null;
-      this.shFrom.remarks = '';
       this.dialogVisible = true;
     },
     getPostList() {

src/views/gas/regulatorBox/index.vue

@@ -40,6 +40,16 @@
                      :value="item.id"/>
         </el-select>
       </el-form-item>
+      <el-form-item label="审核状态">
+        <el-select v-model="queryParams.processStatus" placeholder="请选择审核状态" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.process_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="时间范围" prop="createTimes">
         <el-date-picker
           v-model="queryParams.createTimes"
@@ -97,7 +107,7 @@
         <el-button
           type="danger"
           plain
-          icon="el-icon-delete"
+          icon="el-icon-search"
           size="mini"
           :disabled="multiple"
           @click="process(null,true)"
@@ -142,7 +152,7 @@
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus" v-if="scope.row.processStatus != null && scope.row.processStatus != '-1' "/>
-          <span v-else>未审核</span>
+          <span v-else></span>
         </template>
       </el-table-column>
       <el-table-column label="照片" align="center">
@@ -271,7 +281,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input type="textarea" v-model="shFrom.remarks"></el-input>
+          <el-input type="textarea" v-model="shFrom.processComments"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -638,7 +648,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="备注" prop="remarks">
+            <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
             </el-form-item>
           </el-col>
@@ -653,7 +663,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="审核备注" v-show="isDisabled && form.processStatus!=null">
-            <el-input type="textarea" v-model="form.remarks" placeholder=""/>
+            <el-input type="textarea" v-model="form.processComments" placeholder=""/>
           </el-form-item>
         </el-row>
       </el-form>
@@ -750,8 +760,8 @@ export default {
         id: '',
         uids: [],
         processStatus:'',
+        processComments: "",
         postNameArias:null,
-        remarks: ""
       },
       // 弹出层标题
       title: "",
@@ -1003,7 +1013,7 @@ export default {
         // valveWellTesting: false,
         valveWellCondition: undefined,
         photoList: "",
-        remarks: undefined,
+        processComments: undefined,
         delFlag: undefined,
         createBy: undefined,
         createTime: undefined,
@@ -1065,7 +1075,7 @@ export default {
       else
         this.shFrom.id = data.id;
       this.shFrom.processStatus = '';
-      this.shFrom.remarks = '';
+      this.shFrom.processComments = '';
       this.dialogVisible = true;
     },
     /** 提交按钮 */

src/views/gas/roadSectionInspection/index.vue

@@ -38,6 +38,16 @@
                      :value="item.id"/>
         </el-select>
       </el-form-item>
+      <el-form-item label="审核状态">
+        <el-select v-model="queryParams.processStatus" placeholder="请选择审核状态" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.process_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -100,6 +110,18 @@
           v-hasPermi="['gas:roadSectionInspection:export']"
         >导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-search"
+          size="mini"
+          :disabled="multiple"
+          @click="openshShow(null,true)"
+          v-hasPermi="['gas:regulatingBoxMaintenance:remove']"
+        >批量审核
+        </el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -128,7 +150,7 @@
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus" v-if="scope.row.processStatus != null && scope.row.processStatus != '-1' "/>
-          <span v-else>未审核</span>
+          <span v-else></span>
         </template>
       </el-table-column>
       <el-table-column label="照片" align="center">
@@ -279,7 +301,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input type="textarea" v-model="shFrom.remarks"></el-input>
+          <el-input type="textarea" v-model="shFrom.processComments"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -335,7 +357,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="审核备注" v-show="isDisabled && form.processStatus!=null">
-          <el-input type="textarea" v-model="form.remarks" placeholder=""/>
+          <el-input type="textarea" v-model="form.processComments" placeholder=""/>
         </el-form-item>
 
       </el-form>
@@ -415,15 +437,12 @@ export default {
         id: '',
         processStatus:'',
         postNameArias:undefined,
-        remarks: ""
+        processComments: ""
       },
       openSH:false,
       formSH:{},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "主键id不能为空", trigger: "blur" }
-        ],
         sectionName: [
           { required: true, message: "路段名称不能为空", trigger: "blur" }
         ],
@@ -513,18 +532,41 @@ export default {
       if (this.shFrom.processStatus == undefined || this.shFrom.processStatus == ''){
         this.$message.warning("请选择审核状态")
       }
-      updateRoadSectionInspection(this.shFrom).then(response => {
-        this.$modal.msgSuccess("审核成功");
-        this.getList();
-      }).finally(() => {
-        this.dialogVisible = false;
-      });
+      if (this.shFrom.id != null) {
+        updateRoadSectionInspection(this.shFrom).then(response => {
+          this.$modal.msgSuccess("审核成功");
+          this.getList();
+        }).finally(() => {
+          this.dialogVisible = false;
+        });
+      }else if (this.shFrom.uids.length > 0) {
+        batchReview(this.shFrom).then(response => {
+          this.$modal.msgSuccess("审核成功");
+          this.openSH = false;
+          this.getList();
+        }).finally(() => {
+          this.buttonLoading = false;
+        });
+      }
+    },
+    openshShow(data, isBatch) {
+      this.shFrom = {
+        id: undefined,
+        uids: [],
+        processStatus: undefined,
+        processComments: undefined,
+      }
+      if (isBatch)
+        this.shFrom.uids = this.ids
+      else
+        this.shFrom.id = data.id
+      this.dialogVisible = true
     },
     process(data) {
       this.shFrom.id = undefined
       this.shFrom.id = data.id;
       this.shFrom.processStatus = '';
-      this.shFrom.remarks = '';
+      this.shFrom.processComments = '';
       this.dialogVisible = true;
     },
     getPostList(){

src/views/gas/valveWellInspection/index.vue

@@ -42,6 +42,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="审核状态">
+        <el-select v-model="queryParams.processStatus" placeholder="请选择审核状态" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.process_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="上传时间范围" prop="createTimes">
         <el-date-picker
           v-model="queryParams.createTimes"
@@ -115,6 +125,18 @@
         >导出
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-search"
+          size="mini"
+          :disabled="multiple"
+          @click="openshShow(null,true)"
+          v-hasPermi="['gas:regulatingBoxMaintenance:remove']"
+        >批量审核
+        </el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -143,7 +165,7 @@
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus" v-if="scope.row.processStatus != null && scope.row.processStatus != '-1' "/>
-          <span v-else>未审核</span>
+          <span v-else></span>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark"/>
@@ -177,7 +199,7 @@
           <el-button
             size="mini"
             type="text"
-            v-show="scope.row.processStatus == null && scope.row.processStatus != '-1'"
+            v-show="scope.row.processStatus == null || scope.row.processStatus == '-1' || scope.row.processStatus == ''"
             icon="el-icon-edit"
             @click="process(scope.row)"
             v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
@@ -218,7 +240,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input type="textarea" v-model="shFrom.remarks"></el-input>
+          <el-input type="textarea" v-model="shFrom.processComments"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -271,7 +293,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="审核备注" v-show="isDisabled && form.processStatus!=null">
-          <el-input type="textarea" v-model="form.remarks" placeholder=""/>
+          <el-input type="textarea" v-model="form.processComments" placeholder=""/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -288,7 +310,8 @@ import {
   getValveWellInspection,
   delValveWellInspection,
   addValveWellInspection,
-  updateValveWellInspection
+  updateValveWellInspection,
+  batchReview
 } from "@/api/gas/valveWellInspection";
 import {listValveWellPosition} from "@/api/gas/valveWellPosition";
 import Cookies from "js-cookie";
@@ -304,7 +327,7 @@ export default {
       shFrom:{
         id: '',
         processStatus:'',
-        remarks: ""
+        processComments: ""
       },
       pickerOptions: {
         shortcuts: [{
@@ -504,18 +527,41 @@ export default {
       if (this.shFrom.processStatus == undefined || this.shFrom.processStatus == ''){
         this.$message.warning("请选择审核状态")
       }
-      updateValveWellInspection(this.shFrom).then(response => {
-        this.$modal.msgSuccess("审核成功");
-        this.getList();
-      }).finally(() => {
-        this.dialogVisible = false;
-      });
+      if (this.shFrom.id != null) {
+        updateValveWellInspection(this.shFrom).then(response => {
+          this.$modal.msgSuccess("审核成功");
+          this.getList();
+        }).finally(() => {
+          this.dialogVisible = false;
+        });
+      }else if (this.shFrom.uids.length > 0) {
+        batchReview(this.shFrom).then(response => {
+          this.$modal.msgSuccess("审核成功");
+          this.dialogVisible = false;
+          this.getList();
+        }).finally(() => {
+          this.buttonLoading = false;
+        });
+      }
+    },
+    openshShow(data, isBatch) {
+      this.shFrom = {
+        id: undefined,
+        uids: [],
+        processStatus: undefined,
+        processComments: undefined,
+      }
+      if (isBatch)
+        this.shFrom.uids = this.ids
+      else
+        this.shFrom.id = data.id
+      this.dialogVisible = true
     },
     process(data) {
       this.shFrom.id = undefined
       this.shFrom.id = data.id;
       this.shFrom.processStatus = '';
-      this.shFrom.remarks = '';
+      this.shFrom.processComments = '';
       this.dialogVisible = true;
     },
     /** 修改按钮操作 */