-安全阀申请单审批流修改

master/src/main/java/com/ruoyi/project/apply/controller/TApplyOfflinevalveController.java

@@ -12,7 +12,8 @@ import com.ruoyi.project.apply.domain.TApplyOfflinevalve;
 import com.ruoyi.project.apply.service.ITApplyOfflinevalveService;
 import com.ruoyi.project.approve.damain.DevTask;
 import com.ruoyi.project.plant.domain.TStaffmgr;
-import com.ruoyi.project.plant.service.ITStaffmgrService;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.RuntimeService;
@@ -45,7 +46,7 @@ public class TApplyOfflinevalveController extends BaseController {
     private RuntimeService runtimeService;
 
     @Autowired
-    private ITStaffmgrService tStaffmgrService;
+    private ISysUserService userService;
 
     @Autowired
     private TaskService taskService;
@@ -96,6 +97,7 @@ public class TApplyOfflinevalveController extends BaseController {
         tApplyOfflinevalve.setApplicationTime(new Date());
         tApplyOfflinevalve.setCreatedate(new Date());
         tApplyOfflinevalve.setCreaterCode(userId.toString());
+        tApplyOfflinevalve.setRemarks("");
         tApplyOfflinevalveService.insertTApplyOfflinevalve(tApplyOfflinevalve);
 
         // 开始申请流程
@@ -144,23 +146,24 @@ public class TApplyOfflinevalveController extends BaseController {
         //利用任务对象，获取流程实例id
         String processInstancesId = task.getProcessInstanceId();
         TApplyOfflinevalve tApplyOfflinevalve = tApplyOfflinevalveService.selectTApplyOfflinevalveById(form.getId());
+        String taskName = task.getName();
+        String remarks = StringUtils.isEmpty(tApplyOfflinevalve.getRemarks()) ? "" : tApplyOfflinevalve.getRemarks();
+        if (taskName.contains("临时措施确认人")) {
+            taskName = "临时措施确认人";
+        } else if (taskName.contains("信息确认人")) {
+            taskName = "信息确认人";
+        }
         if ("1".equals(devTask.getCondition())) {
             devTask.setComment("通过" + symbol + form.getRemarks());
-            String taskName = task.getName();
-            if (taskName.contains("临时措施确认人")) {
-                taskName = "临时措施确认人";
-            } else if (taskName.contains("信息确认人")) {
-                taskName = "信息确认人";
-            }
-            form.setRemarks(tApplyOfflinevalve.getRemarks() + taskName + ":" + getNickName() + "通过" + symbol + form.getRemarks() + ";");
+            form.setRemarks(remarks + taskName + "-" + getNickName() + "：通过" + symbol + form.getRemarks() + "；");
         } else if ("0".equals(devTask.getCondition())) {
-            //TODO 拒绝流程
             devTask.setComment("拒绝" + symbol + form.getRemarks());
+            form.setRemarks(remarks + taskName + "-" + getNickName() + "：拒绝" + symbol + form.getRemarks() + "；");
             form.setStatus(1L);
-            form.setApproveStatus("2");
+            form.setApproveStatus("3");
         } else if ("2".equals(devTask.getCondition())) {
-            //TODO 驳回流程
             devTask.setComment("驳回" + symbol + form.getRemarks());
+            form.setRemarks(remarks + taskName + "-" + getNickName() + "：驳回" + symbol + form.getRemarks() + "；");
         }
         Map<String, Object> param = new HashMap<>();
         switch (task.getName()) {
@@ -173,8 +176,8 @@ public class TApplyOfflinevalveController extends BaseController {
                     TStaffmgr tStaffmgr = new TStaffmgr();
                     tStaffmgr.setActualposts("24,26");
                     StringBuilder approvers = new StringBuilder();
-                    for (Map<String, Object> user : tStaffmgrService.selectUserInfoByStaffmgr(tStaffmgr)) {
-                        approvers.append(user.get("userId").toString()).append(",");
+                    for (SysUser user : userService.selectUserPost(tStaffmgr)) {
+                        approvers.append(user.getUserId().toString()).append(",");
                     }
                     if (StringUtils.isNotEmpty(approvers.toString())) {
                         approvers = new StringBuilder(approvers.substring(0, approvers.length() - 1));
@@ -202,6 +205,8 @@ public class TApplyOfflinevalveController extends BaseController {
                 if (StringUtils.isNotEmpty(tApplyOfflinevalve.getLockConfirmer1())) {
                     form.setLockConfirmer2(getUserId().toString());
                     form.setLockConfirmer2Name(getNickName());
+                }else{
+                    form.setLockConfirm("NA");
                 }
                 if ("信息确认人2".equals(task.getName())) {
                     form.setStatus(1L);

master/src/main/java/com/ruoyi/project/plant/controller/TStaffmgrController.java

@@ -93,13 +93,6 @@ public class TStaffmgrController extends BaseController
     @Autowired
     private ITStPlanService tStPlanService;
 
-    @GetMapping("/listPostStaff")
-    public AjaxResult listPostStaff(TStaffmgr tStaffmgr)
-    {
-        List<Map<String, Object>> list = tStaffmgrService.selectUserInfoByStaffmgr(tStaffmgr);
-        return AjaxResult.success(list);
-    }
-
     /**
      * 获取当前用户id
      * @return 当前用户id

master/src/main/java/com/ruoyi/project/plant/service/ITStaffmgrService.java

@@ -5,7 +5,6 @@ import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.system.domain.SysUser;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 人员管理Service接口
@@ -107,6 +106,4 @@ public interface ITStaffmgrService
     List<TStaffmgr> selectTStaffmgrByPost(SysUser sysUser);
 
     List<TStaffmgr> selectTMentorStaffmgrByPost(SysUser sysUser);
-
-    List<Map<String,Object>> selectUserInfoByStaffmgr(TStaffmgr tStaffmgr);
 }

master/src/main/java/com/ruoyi/project/plant/service/impl/TStaffmgrServiceImpl.java

@@ -8,7 +8,6 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 人员管理Service业务层处理
@@ -166,9 +165,4 @@ public class TStaffmgrServiceImpl implements ITStaffmgrService
         return tStaffmgrMapper.selectTMentorStaffmgrByPost(sysUser);
     }
 
-    @Override
-    public List<Map<String,Object>> selectUserInfoByStaffmgr(TStaffmgr tStaffmgr) {
-        return tStaffmgrMapper.selectUserInfoByStaffmgr(tStaffmgr);
-    }
-
 }

master/src/main/java/com/ruoyi/project/system/controller/SysUserController.java

@@ -14,6 +14,7 @@ import com.ruoyi.framework.security.service.TokenService;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.system.domain.SysRole;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysPostService;
@@ -62,6 +63,13 @@ public class SysUserController extends BaseController
         return getDataTable(list);
     }
 
+    @GetMapping("/listUserPost")
+    public List<SysUser> listUserPost(TStaffmgr tStaffmgr)
+    {
+        List<SysUser> list = userService.selectUserPost(tStaffmgr);
+        return list;
+    }
+
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @GetMapping("/export")

master/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.system.mapper;
 
+import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.system.domain.SysUser;
 import org.apache.ibatis.annotations.Param;
 
@@ -36,6 +37,9 @@ public interface SysUserMapper
      */
     public List<SysUser> selectUserByDept(Long deptId);
     public List<SysUser> selectAllUser();
+
+    public List<SysUser> selectUserPost(TStaffmgr tStaffmgr);
+
     public List<SysUser> selectUserListByRoleAndDept(SysUser sysUser);
 
     /**

master/src/main/java/com/ruoyi/project/system/service/ISysUserService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.system.service;
 
+import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.domain.SysUserRole;
 
@@ -40,6 +41,8 @@ public interface ISysUserService
     public List<SysUser> selectUserByDept(Long deptId);
     public List<SysUser> selectAllUser();
 
+    public List<SysUser> selectUserPost(TStaffmgr tStaffmgr);
+
     /**
      * 通过用户名查询用户
      *

master/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.exception.CustomException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.system.domain.*;
 import com.ruoyi.project.system.mapper.*;
 import com.ruoyi.project.system.service.ISysConfigService;
@@ -95,6 +96,11 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectAllUser();
     }
 
+    @Override
+    public List<SysUser> selectUserPost(TStaffmgr tStaffmgr) {
+        return userMapper.selectUserPost(tStaffmgr);
+    }
+
     /**
      * 通过用户名查询用户
      *

master/src/main/resources/mybatis/system/SysUserMapper.xml

@@ -50,6 +50,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="status"       column="role_status"    />
 	</resultMap>
 
+	<select id="selectUserPost" parameterType="tStaffmgr" resultMap="SysUserResult">
+		select b.USER_ID ,b.NICK_NAME  from T_STAFFMGR a
+		left join SYS_USER b on a.STAFFID=b.STAFFID
+		left join sys_dept d on a.dept_id = d.dept_id
+		<where>
+			<if test="actualposts != null  and actualposts != ''">
+				and a.actualpost in
+				<foreach collection="actualposts.split(',')" item="item" index="index"
+						 open="(" close=")" separator=",">
+					#{item}
+				</foreach>
+			</if>
+			<if test="deptId != null  and deptId != ''"> and a.dept_id=#{deptId}</if>
+			and a.DEL_FLAG=0
+			and b.USER_ID is not null
+		</where>
+		${params.dataScope}
+	</select>
+
 	<select id="selectAllUser" resultType="SysUser">
 		select * from sys_user u where u.del_flag = '0'
 	</select>

master/src/main/resources/processes/apply/offlinevalve.bpmn

@@ -56,7 +56,6 @@
     <sequenceFlow id="flow18" name="拒绝" sourceRef="confirmertask1" targetRef="endevent2">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
     </sequenceFlow>
-    <association id="association1" sourceRef="textannotation1" targetRef="infoconfirmertask2"></association>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_offlinevalve">
     <bpmndi:BPMNPlane bpmnElement="offlinevalve" id="BPMNPlane_offlinevalve">

ui/src/api/plant/staffmgr.js

@@ -177,11 +177,3 @@ export function exportStaffmgr(query) {
     params: query
   })
 }
-
-export function listPostStaff(query) {
-  return request({
-    url: '/plant/staffmgr/listPostStaff',
-    method: 'get',
-    params: query
-  })
-}

ui/src/api/system/user.js

@@ -10,6 +10,14 @@ export function listUser(query) {
   })
 }
 
+export function listUserPost(query) {
+  return request({
+    url: '/system/user/listUserPost',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询用户详细
 export function getUser(userId) {
   return request({

ui/src/views/apply/offlinevalve/index.vue

@@ -115,17 +115,15 @@
       <el-table-column label="离线原因" align="center" prop="offlineReason" :show-overflow-tooltip="true" width="185"/>
       <el-table-column label="安全阀锁开是否拆解" align="center" prop="disassembly" :show-overflow-tooltip="true"
                        width="185"/>
-      <el-table-column label="临时措施执行人" align="center" prop="executorName" :show-overflow-tooltip="true" width="130"/>
-      <el-table-column label="临时措施执行时间" align="center" prop="executionTime" width="140">
+      <el-table-column label="临时措施执行人(执行时间)" align="center" prop="executorName" :show-overflow-tooltip="true" width="270">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.executionTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          <span>{{scope.row.executorName}} {{ parseTime(scope.row.executionTime, '{y}-{m}-{d} {h}:{i}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="临时措施确认人" align="center" prop="confirmerName" :show-overflow-tooltip="true"
-                       width="130"/>
-      <el-table-column label="临时措施确认时间" align="center" prop="temporaryTime" width="140">
+      <el-table-column label="临时措施确认人(确认时间)" align="center" prop="confirmerName" :show-overflow-tooltip="true"
+                       width="270">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.temporaryTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          <span>{{scope.row.confirmerName}} {{ parseTime(scope.row.temporaryTime, '{y}-{m}-{d} {h}:{i}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="申请人" align="center" prop="applicantName" :show-overflow-tooltip="true" width="90"/>
@@ -134,10 +132,9 @@
           <span>{{ parseTime(scope.row.applicationTime, '{y}-{m}-{d} {h}:{i}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="批准人" align="center" prop="approverName" :show-overflow-tooltip="true" width="90"/>
-      <el-table-column label="批准时间" align="center" prop="approveTime" width="100">
+      <el-table-column label="批准人(时间)" align="center" prop="approverName" :show-overflow-tooltip="true" width="190">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.approveTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          <span>{{scope.row.approverName}} {{ parseTime(scope.row.approveTime, '{y}-{m}-{d} {h}:{i}') }}</span>
         </template>
       </el-table-column>
       />
@@ -355,7 +352,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {allSafetyvavle} from "@/api/reliability/safetyvavle";
-import {listPostUser} from "@/api/system/user";
+import {listPostUser, listUserPost} from "@/api/system/user";
 import OfflinevalveDetail from "@/views/approve/approveDetail/offlinevalve-detail";
 
 export default {
@@ -489,6 +486,18 @@ export default {
     }
   },
   created() {
+    listUserPost({
+      actualposts:"20,36,10,11,28,30,32,38,15,12,34",
+      deptId:103
+    }).then(response => {
+      this.executorList = response;
+    });
+    listUserPost({
+      actualposts:"24,26,18,14,16",
+      deptId:103
+    }).then(response => {
+      this.confirmerList = response;
+    });
     //设置表格高度对应屏幕高度
     this.$nextTick(() => {
       this.clientHeight = document.body.clientHeight - 250
@@ -507,12 +516,6 @@ export default {
     this.getDicts("apply_approve_status").then(response => {
       this.approveStatusList = response.data;
     });
-    listPostUser({
-      // postCode: 'gyzj'
-    }).then(response => {
-      this.executorList = response;
-      this.confirmerList = response;
-    });
   },
   methods: {
     openApproveDetail(row) {
@@ -659,6 +662,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      console.log(this.confirmerList)
       this.reset();
       this.open = true;
       this.title = "添加安全阀离线切出申请表";

ui/src/views/approve/approveDetail/offlinevalve-detail.vue

@@ -62,7 +62,7 @@
             </el-radio-group>
           </el-form-item>
         </div>
-        <div v-if="taskName=='信息确认人'">
+        <div v-if="taskName=='信息确认人'||taskName=='信息确认人2'">
           <el-row>
             <el-col span="12">
               <el-form-item label="离线安全阀是否已经复位" prop="resetConfirm">
@@ -90,38 +90,74 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col span="12">
-              <el-form-item label="离线安全复位后，是否已经重新上锁" prop="lockConfirm">
-                <el-radio-group v-model="form.lockConfirm">
-                  <el-radio label="是">是</el-radio>
-                  <el-radio label="否">否</el-radio>
-                  <el-radio label="NA">NA</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
+            <div v-if="dataForm.disassembly!='NA'">
+              <el-col span="12">
+                <el-form-item label="离线安全复位后，是否已经重新上锁" prop="lockConfirm">
+                  <el-radio-group v-model="form.lockConfirm">
+                    <el-radio label="是">是</el-radio>
+                    <el-radio label="否">否</el-radio>
+                    <el-radio label="NA">NA</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </div>
           </el-row>
-          <el-form-item label="上锁确认人" prop="lockConfirmer1">
-            <el-select v-model="form.lockConfirmer1" placeholder="请选择上锁确认人" clearable size="small" filterable style="width: 100%">
-            <el-option
-              v-for="item in confirmerList"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
-            ></el-option>
+          <div v-if="dataForm.disassembly!='NA'">
+            <el-form-item label="上锁确认人" prop="lockConfirmer1">
+              <el-select v-model="form.lockConfirmer1" placeholder="请选择上锁确认人" clearable size="small" filterable
+                         style="width: 100%">
+                <el-option
+                  v-for="item in infoConfirmerList"
+                  :key="item.userId"
+                  :label="item.nickName"
+                  :value="item.userId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+        </div>
+        <el-form-item label="审批意见" prop="remarks" v-if="taskName!='申请人提交申请'">
+          <el-input type="textarea" v-model="form.remarks"/>
+        </el-form-item>
+
+        <div v-if="taskName=='申请人提交申请'">
+          <el-form-item label="安全阀位号" prop="devNo">
+            <el-select v-model="form.devNo" placeholder="请选择或输入安全阀位号" clearable size="small" filterable
+                       allow-create style="width: 100%">
+              <el-option
+                v-for="item in safetyvavleList"
+                :key="item.tagno"
+                :label="item.tagno"
+                :value="item.tagno"
+              ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="单元" prop="unit">
+            <el-select v-model="form.unit" placeholder="请选择单元" clearable size="small" filterable
+                       style="width: 100%">
+              <el-option
+                v-for="dict in unitOptions"
+                :key="dict.dictLabel"
+                :label="dict.dictLabel"
+                :value="dict.dictLabel"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="离线原因" prop="offlineReason">
+            <el-input type="textarea" v-model="form.offlineReason" placeholder="请输入离线原因"/>
+          </el-form-item>
         </div>
-        <el-form-item label="审批意见" prop="remarks">
-          <el-input type="textarea"  v-model="form.remarks" />
-        </el-form-item>
       </div>
     </el-form>
     <span slot="footer" class="dialog-footer">
-      <el-button v-if="!this.taskForm.taskId == ''" type="warning"
+      <el-button v-if="!this.taskForm.taskId == ''&&(this.taskName=='临时措施确认人1'||this.taskName=='批准人')"
+                 type="warning"
                  @click="dataFormSubmit(2)" :disabled="submitDisabled">{{ $t('驳回') }}</el-button>
       <el-button v-if="!this.taskForm.taskId == ''" type="primary"
-                 @click="dataFormSubmit(1)" :disabled="submitDisabled">{{ $t('通过') }}</el-button>
-      <el-button v-if="!this.taskForm.taskId == ''" type="danger"
+                 @click="dataFormSubmit(1)"
+                 :disabled="submitDisabled">{{ $t(taskName != '申请人提交申请' ? '通过' : '提交') }}</el-button>
+      <el-button v-if="!this.taskForm.taskId == ''&&(this.taskName=='临时措施确认人1'||this.taskName=='批准人')"
+                 type="danger"
                  @click="dataFormSubmit(0)" :disabled="submitDisabled">{{ $t('拒绝') }}</el-button>
       <el-button @click="visible = false">{{ $t('返回') }}</el-button>
     </span>
@@ -145,12 +181,17 @@
 <script>
 import {getOfflinevalve, handle} from "@/api/apply/offlinevalve";
 import {getHistorylist} from "@/api/ehs/approvedanger";
+import {listUserPost} from "@/api/system/user";
+import {allSafetyvavle} from "@/api/reliability/safetyvavle";
 
 export default {
   name: "offlinevalve-detail",
   data() {
     return {
-      confirmerList:[],
+      infoConfirmerList: [],
+      // 安全阀清单
+      safetyvavleList: [],
+      unitOptions: [],
       //流转列表
       historyList: [],
       historyLoading: true,
@@ -165,8 +206,8 @@ export default {
         files: '',
         govDate: '',
         govFileList: [],
-        businessKey:'',
-        offlinevalve:{}
+        businessKey: '',
+        offlinevalve: {}
       },
       devList: [],
       dataForm: {
@@ -218,7 +259,17 @@ export default {
         revokeConfirm: [{required: true, message: "请选择是/否", trigger: "blur"}],
         leakConfirm: [{required: true, message: "请选择是/否", trigger: "blur"}],
         resetConfirm: [{required: true, message: "请选择是/否", trigger: "blur"}],
-        disassembly: [{required: true, message: "请选择是/否/NA", trigger: "blur"}]
+        disassembly: [{required: true, message: "请选择是/否/NA", trigger: "blur"}],
+        lockConfirmer1: [{required: true, message: "请选择是/否/NA", trigger: "blur"}],
+        devNo: [
+          {required: true, message: "请选择或输入安全阀位号", trigger: "blur"}
+        ],
+        unit: [
+          {required: true, message: "请选择单元", trigger: "blur"}
+        ],
+        offlineReason: [
+          {required: true, message: "请输入离线原因", trigger: "blur"}
+        ],
       },
       flag: false
     }
@@ -233,6 +284,7 @@ export default {
       this.taskName = taskName;
       this.taskForm.taskId = taskId;
       this.taskForm.businessKey = id;
+      this.historyList = [];
       console.log(this.taskForm.taskId)
       this.dataForm.id = id || 0;
       this.form.id = id || 0;
@@ -240,6 +292,11 @@ export default {
       getOfflinevalve(id).then(res => {
         this.dataForm = res.data;
         this.devList.push(this.dataForm);
+        if (taskName=='申请人提交申请'){
+          this.form.devNo=res.data.devNo;
+          this.form.offlineReason=res.data.offlineReason;
+          this.form.unit=res.data.unit;
+        }
       });
       this.getDicts("apply_status").then(response => {
         this.statusList = response.data;
@@ -251,16 +308,30 @@ export default {
         this.historyList = response.rows;
         this.historyLoading = false
       });
+      listUserPost({
+        actualposts: "12",
+        deptId: 103
+      }).then(response => {
+        this.infoConfirmerList = response;
+      });
+      allSafetyvavle().then(res => {
+        this.safetyvavleList = res.data
+      });
+      this.getDicts("UNIT").then(response => {
+        this.unitOptions = response.data;
+      });
     },
+
     dataFormSubmit(val) {
       this.$refs["form"].validate(valid => {
-        if (valid) {
+        if (valid || val != 1) {
           this.submitDisabled = true;
           this.taskForm.offlinevalve = this.form;
           this.taskForm.condition = val;
           handle(this.taskForm).then(res => {
             this.msgSuccess("审核成功");
-            this.visible=false;
+            this.visible = false;
+            this.$emit('refreshDataList')
           })
         }
       })