'123'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java

@@ -8,7 +8,6 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.MinioUtil;
 import com.ruoyi.common.utils.uuid.UUID;
-import com.ruoyi.customer.domain.Customer;
 import com.ruoyi.quot.domain.QuotFile;
 import com.ruoyi.quot.service.IQuotFileService;
 import com.ruoyi.technicalConfirm.domain.QuotJsqr;
@@ -230,25 +229,25 @@ public class QuotController extends BaseController
             //特缆、低压、中压、其他 协助状态设置
             if(quotJsxzGroup.indexOf("TL")!=-1){
                 quotJsqr.setQuotJsqrTlApprovalStatus("1");
-                quotJsqr.setQuotJsqrTlOperateStatus("0");
+                quotJsqr.setQuotJsqrTlOperateState("0");
                 quotJsqr.setQuotJsqrTlCheckState("0");
                 quotJsqr.setQuotJsqrTlLeaderState("0");
             }
             if(quotJsxzGroup.indexOf("DY")!=-1){
                 quotJsqr.setQuotJsqrDyApprovalStatus("1");
-                quotJsqr.setQuotJsqrDyOperateStatus("0");
+                quotJsqr.setQuotJsqrDyOperateState("0");
                 quotJsqr.setQuotJsqrDyCheckState("0");
                 quotJsqr.setQuotJsqrDyLeaderState("0");
             }
             if(quotJsxzGroup.indexOf("ZY")!=-1){
                 quotJsqr.setQuotJsqrZyApprovalStatus("1");
-                quotJsqr.setQuotJsqrZyOperateStatus("0");
+                quotJsqr.setQuotJsqrZyOperateState("0");
                 quotJsqr.setQuotJsqrZyCheckState("0");
                 quotJsqr.setQuotJsqrZyLeaderState("0");
             }
             if(quotJsxzGroup.indexOf("QT")!=-1){
                 quotJsqr.setQuotJsqrQtApprovalStatus("1");
-                quotJsqr.setQuotJsqrQtOperateStatus("0");
+                quotJsqr.setQuotJsqrQtOperateState("0");
                 quotJsqr.setQuotJsqrQtCheckState("0");
                 quotJsqr.setQuotJsqrQtLeaderState("0");
             }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.technicalConfirm;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.technicalConfirm.domain.QuotJsqr;
 import com.ruoyi.technicalConfirm.service.IQuotJsqrService;
@@ -52,7 +53,7 @@ public class QuotJsqrController extends BaseController
      * 导出报价单-技术确认单列表
      */
     @PreAuthorize("@ss.hasPermi('jsqr:jsqr:export')")
-    @Log(title = "报价单-技术确认单", businessType = BusinessType.EXPORT)
+    @Log(title = "报价单-技术确认单导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, QuotJsqr quotJsqr)
     {
@@ -86,10 +87,93 @@ public class QuotJsqrController extends BaseController
      * 删除报价单-技术确认单
      */
     @PreAuthorize("@ss.hasPermi('jsqr:jsqr:remove')")
-    @Log(title = "报价单-技术确认单", businessType = BusinessType.DELETE)
+    @Log(title = "报价单-技术确认单删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{quotJsqrIds}")
     public AjaxResult remove(@PathVariable String[] quotJsqrIds)
     {
         return toAjax(quotJsqrService.deleteQuotJsqrByQuotJsqrIds(quotJsqrIds));
     }
+
+    /**
+     * 操作人确认事件
+     */
+    @PreAuthorize("@ss.hasPermi('jsqr:jsqr:query')")
+    @Log(title = "报价单-技术确认单协助操作", businessType = BusinessType.UPDATE)
+    @PostMapping("/doOperate")
+    public AjaxResult doOperate(HttpServletResponse response, String quotJsxzGroup,String type,String state, String quotJsqrId)
+    {
+        QuotJsqr quotJsqr = new QuotJsqr();
+        quotJsqr.setQuotJsqrId(quotJsqrId);
+        if("TL".equals(quotJsxzGroup)){
+            if("operater".equals(type)){
+                quotJsqr.setQuotJsqrTlOperateUserName(getLoginUser().getUser().getNickName());
+                quotJsqr.setQuotJsqrTlOperateTime(DateUtils.getTime());
+                quotJsqr.setQuotJsqrTlOperateState(state);
+            }
+            if("checker".equals(type)){
+                quotJsqr.setQuotJsqrTlCheckUserName(getLoginUser().getUser().getNickName());
+                quotJsqr.setQuotJsqrTlCheckTime(DateUtils.getTime());
+                quotJsqr.setQuotJsqrTlCheckState(state);
+            }
+            if("leader".equals(type)){
+                quotJsqr.setQuotJsqrTlLeaderUserName(getLoginUser().getUser().getNickName());
+                quotJsqr.setQuotJsqrTlLeaderTime(DateUtils.getTime());
+                quotJsqr.setQuotJsqrTlLeaderState(state);
+                //TODO 协助状态更新
+            }
+        }else if("DY".equals(quotJsxzGroup)){
+            if("operater".equals(type)){
+                quotJsqr.setQuotJsqrDyOperateUserName(getLoginUser().getUser().getNickName());
+                quotJsqr.setQuotJsqrDyOperateTime(DateUtils.getTime());
+                quotJsqr.setQuotJsqrDyOperateState(state);
+            }
+            if("checker".equals(type)){
+                quotJsqr.setQuotJsqrDyCheckUserName(getLoginUser().getUser().getNickName());
+                quotJsqr.setQuotJsqrDyCheckTime(DateUtils.getTime());
+                quotJsqr.setQuotJsqrDyCheckState(state);
+            }
+            if("leader".equals(type)){
+                quotJsqr.setQuotJsqrDyLeaderUserName(getLoginUser().getUser().getNickName());
+                quotJsqr.setQuotJsqrDyLeaderTime(DateUtils.getTime());
+                quotJsqr.setQuotJsqrDyLeaderState(state);
+                //TODO 协助状态更新
+            }
+        }else if("ZY".equals(quotJsxzGroup)){
+            if("operater".equals(type)){
+                quotJsqr.setQuotJsqrZyOperateUserName(getLoginUser().getUser().getNickName());
+                quotJsqr.setQuotJsqrZyOperateTime(DateUtils.getTime());
+                quotJsqr.setQuotJsqrZyOperateState(state);
+            }
+            if("checker".equals(type)){
+                quotJsqr.setQuotJsqrZyCheckUserName(getLoginUser().getUser().getNickName());
+                quotJsqr.setQuotJsqrZyCheckTime(DateUtils.getTime());
+                quotJsqr.setQuotJsqrZyCheckState(state);
+            }
+            if("leader".equals(type)){
+                quotJsqr.setQuotJsqrZyLeaderUserName(getLoginUser().getUser().getNickName());
+                quotJsqr.setQuotJsqrZyLeaderTime(DateUtils.getTime());
+                quotJsqr.setQuotJsqrZyLeaderState(state);
+                //TODO 协助状态更新
+            }
+        }else if("QT".equals(quotJsxzGroup)){
+            if("operater".equals(type)){
+                quotJsqr.setQuotJsqrQtOperateUserName(getLoginUser().getUser().getNickName());
+                quotJsqr.setQuotJsqrQtOperateTime(DateUtils.getTime());
+                quotJsqr.setQuotJsqrQtOperateState(state);
+            }
+            if("checker".equals(type)){
+                quotJsqr.setQuotJsqrQtCheckUserName(getLoginUser().getUser().getNickName());
+                quotJsqr.setQuotJsqrQtCheckTime(DateUtils.getTime());
+                quotJsqr.setQuotJsqrQtCheckState(state);
+            }
+            if("leader".equals(type)){
+                quotJsqr.setQuotJsqrQtLeaderUserName(getLoginUser().getUser().getNickName());
+                quotJsqr.setQuotJsqrQtLeaderTime(DateUtils.getTime());
+                quotJsqr.setQuotJsqrQtLeaderState(state);
+                //TODO 协助状态更新
+            }
+        }
+        quotJsqrService.updateQuotJsqr(quotJsqr);
+        return success(quotJsqr);
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java

@@ -30,7 +30,7 @@ public class QuotJsqr extends BaseEntity
     private String quotJsqrTlOperateUserName;
 
     /** 特缆操作状态 */
-    private String quotJsqrTlOperateStatus;
+    private String quotJsqrTlOperateState;
 
     /** 特缆操作时间 */
     private String quotJsqrTlOperateTime;
@@ -70,7 +70,7 @@ public class QuotJsqr extends BaseEntity
     private String quotJsqrDyOperateUserName;
 
     /** 低压操作状态 */
-    private String quotJsqrDyOperateStatus;
+    private String quotJsqrDyOperateState;
 
     /** 低压操作时间 */
     private String quotJsqrDyOperateTime;
@@ -110,7 +110,7 @@ public class QuotJsqr extends BaseEntity
     private String quotJsqrZyOperateUserName;
 
     /** 中压操作状态 */
-    private String quotJsqrZyOperateStatus;
+    private String quotJsqrZyOperateState;
 
     /** 中压操作时间 */
     private String quotJsqrZyOperateTime;
@@ -150,7 +150,7 @@ public class QuotJsqr extends BaseEntity
     private String quotJsqrQtOperateUserName;
 
     /** 其他操作状态 */
-    private String quotJsqrQtOperateStatus;
+    private String quotJsqrQtOperateState;
 
     /** 其他操作时间 */
     private String quotJsqrQtOperateTime;
@@ -215,11 +215,11 @@ public class QuotJsqr extends BaseEntity
     {
         return quotJsqrTlOperateUserName;
     }
-    public void setQuotJsqrTlOperateStatus(String quotJsqrTlOperateStatus) { this.quotJsqrTlOperateStatus = quotJsqrTlOperateStatus; }
+    public void setQuotJsqrTlOperateState(String quotJsqrTlOperateState) { this.quotJsqrTlOperateState = quotJsqrTlOperateState; }
 
-    public String getQuotJsqrTlOperateStatus()
+    public String getQuotJsqrTlOperateState()
     {
-        return quotJsqrTlOperateStatus;
+        return quotJsqrTlOperateState;
     }
     public void setQuotJsqrTlOperateTime(String quotJsqrTlOperateTime) { this.quotJsqrTlOperateTime = quotJsqrTlOperateTime; }
 
@@ -299,11 +299,11 @@ public class QuotJsqr extends BaseEntity
     {
         return quotJsqrDyOperateUserName;
     }
-    public void setQuotJsqrDyOperateStatus(String quotJsqrDyOperateStatus) { this.quotJsqrDyOperateStatus = quotJsqrDyOperateStatus; }
+    public void setQuotJsqrDyOperateState(String quotJsqrDyOperateState) { this.quotJsqrDyOperateState = quotJsqrDyOperateState; }
 
-    public String getQuotJsqrDyOperateStatus()
+    public String getQuotJsqrDyOperateState()
     {
-        return quotJsqrDyOperateStatus;
+        return quotJsqrDyOperateState;
     }
     public void setQuotJsqrDyOperateTime(String quotJsqrDyOperateTime) { this.quotJsqrDyOperateTime = quotJsqrDyOperateTime; }
 
@@ -383,11 +383,11 @@ public class QuotJsqr extends BaseEntity
     {
         return quotJsqrZyOperateUserName;
     }
-    public void setQuotJsqrZyOperateStatus(String quotJsqrZyOperateStatus) { this.quotJsqrZyOperateStatus = quotJsqrZyOperateStatus; }
+    public void setQuotJsqrZyOperateState(String quotJsqrZyOperateState) { this.quotJsqrZyOperateState = quotJsqrZyOperateState; }
 
-    public String getQuotJsqrZyOperateStatus()
+    public String getQuotJsqrZyOperateState()
     {
-        return quotJsqrZyOperateStatus;
+        return quotJsqrZyOperateState;
     }
     public void setQuotJsqrZyOperateTime(String quotJsqrZyOperateTime) { this.quotJsqrZyOperateTime = quotJsqrZyOperateTime; }
 
@@ -467,11 +467,11 @@ public class QuotJsqr extends BaseEntity
     {
         return quotJsqrQtOperateUserName;
     }
-    public void setQuotJsqrQtOperateStatus(String quotJsqrQtOperateStatus) { this.quotJsqrQtOperateStatus = quotJsqrQtOperateStatus; }
+    public void setQuotJsqrQtOperateState(String quotJsqrQtOperateState) { this.quotJsqrQtOperateState = quotJsqrQtOperateState; }
 
-    public String getQuotJsqrQtOperateStatus()
+    public String getQuotJsqrQtOperateState()
     {
-        return quotJsqrQtOperateStatus;
+        return quotJsqrQtOperateState;
     }
     public void setQuotJsqrQtOperateTime(String quotJsqrQtOperateTime) { this.quotJsqrQtOperateTime = quotJsqrQtOperateTime; }
 

ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml

@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="quotJsqrCode"    column="quot_jsqr_code"    />
         <result property="quotJsqrTlApprovalStatus"    column="quot_jsqr_tl_approval_status"    />
         <result property="quotJsqrTlOperateUserName"    column="quot_jsqr_tl_operate_user_name"    />
-        <result property="quotJsqrTlOperateStatus"    column="quot_jsqr_tl_operate_status"    />
+        <result property="quotJsqrTlOperateState"    column="quot_jsqr_tl_operate_state"    />
         <result property="quotJsqrTlOperateTime"    column="quot_jsqr_tl_operate_time"    />
         <result property="quotJsqrTlRemark"    column="quot_jsqr_tl_remark"    />
         <result property="quotJsqrTlCheckUserName"    column="quot_jsqr_tl_check_user_name"    />
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="quotJsqrTlLeaderRemark"    column="quot_jsqr_tl_leader_remark"    />
         <result property="quotJsqrDyApprovalStatus"    column="quot_jsqr_dy_approval_status"    />
         <result property="quotJsqrDyOperateUserName"    column="quot_jsqr_dy_operate_user_name"    />
-        <result property="quotJsqrDyOperateStatus"    column="quot_jsqr_dy_operate_status"    />
+        <result property="quotJsqrDyOperateState"    column="quot_jsqr_dy_operate_state"    />
         <result property="quotJsqrDyOperateTime"    column="quot_jsqr_dy_operate_time"    />
         <result property="quotJsqrDyRemark"    column="quot_jsqr_dy_remark"    />
         <result property="quotJsqrDyCheckUserName"    column="quot_jsqr_dy_check_user_name"    />
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="quotJsqrDyLeaderRemark"    column="quot_jsqr_dy_leader_remark"    />
         <result property="quotJsqrZyApprovalStatus"    column="quot_jsqr_zy_approval_status"    />
         <result property="quotJsqrZyOperateUserName"    column="quot_jsqr_zy_operate_user_name"    />
-        <result property="quotJsqrZyOperateStatus"    column="quot_jsqr_zy_operate_status"    />
+        <result property="quotJsqrZyOperateState"    column="quot_jsqr_zy_operate_state"    />
         <result property="quotJsqrZyOperateTime"    column="quot_jsqr_zy_operate_time"    />
         <result property="quotJsqrZyRemark"    column="quot_jsqr_zy_remark"    />
         <result property="quotJsqrZyCheckUserName"    column="quot_jsqr_zy_check_user_name"    />
@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="quotJsqrZyLeaderRemark"    column="quot_jsqr_zy_leader_remark"    />
         <result property="quotJsqrQtApprovalStatus"    column="quot_jsqr_qt_approval_status"    />
         <result property="quotJsqrQtOperateUserName"    column="quot_jsqr_qt_operate_user_name"    />
-        <result property="quotJsqrQtOperateStatus"    column="quot_jsqr_qt_operate_status"    />
+        <result property="quotJsqrQtOperateState"    column="quot_jsqr_qt_operate_state"    />
         <result property="quotJsqrQtOperateTime"    column="quot_jsqr_qt_operate_time"    />
         <result property="quotJsqrQtRemark"    column="quot_jsqr_qt_remark"    />
         <result property="quotJsqrQtCheckUserName"    column="quot_jsqr_qt_check_user_name"    />
@@ -85,16 +85,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectQuotJsqrVo">
         select a.quot_jsqr_id, a.quot_jsqr_code, a.quot_jsqr_tl_approval_status, a.quot_jsqr_tl_operate_user_name,
-               a.quot_jsqr_tl_operate_status, a.quot_jsqr_tl_operate_time, a.quot_jsqr_tl_remark, a.quot_jsqr_tl_check_user_name,
+               a.quot_jsqr_tl_operate_state, a.quot_jsqr_tl_operate_time, a.quot_jsqr_tl_remark, a.quot_jsqr_tl_check_user_name,
                a.quot_jsqr_tl_check_state, a.quot_jsqr_tl_check_time, a.quot_jsqr_tl_check_remark, a.quot_jsqr_tl_leader_user_name,
                a.quot_jsqr_tl_leader_state, a.quot_jsqr_tl_leader_time, a.quot_jsqr_tl_leader_remark, a.quot_jsqr_dy_approval_status,
-               a.quot_jsqr_dy_operate_user_name, a.quot_jsqr_dy_operate_status, a.quot_jsqr_dy_operate_time, a.quot_jsqr_dy_remark,
+               a.quot_jsqr_dy_operate_user_name, a.quot_jsqr_dy_operate_state, a.quot_jsqr_dy_operate_time, a.quot_jsqr_dy_remark,
                a.quot_jsqr_dy_check_user_name, a.quot_jsqr_dy_check_state, a.quot_jsqr_dy_check_time, a.quot_jsqr_dy_check_remark,
                a.quot_jsqr_dy_leader_user_name, a.quot_jsqr_dy_leader_state, a.quot_jsqr_dy_leader_time, a.quot_jsqr_dy_leader_remark,
-               a.quot_jsqr_zy_approval_status, a.quot_jsqr_zy_operate_user_name, a.quot_jsqr_zy_operate_status, a.quot_jsqr_zy_operate_time,
+               a.quot_jsqr_zy_approval_status, a.quot_jsqr_zy_operate_user_name, a.quot_jsqr_zy_operate_state, a.quot_jsqr_zy_operate_time,
                a.quot_jsqr_zy_remark, a.quot_jsqr_zy_check_user_name, a.quot_jsqr_zy_check_state, a.quot_jsqr_zy_check_time,
                a.quot_jsqr_zy_check_remark, a.quot_jsqr_zy_leader_user_name, a.quot_jsqr_zy_leader_state, a.quot_jsqr_zy_leader_time,
-               a.quot_jsqr_zy_leader_remark, a.quot_jsqr_qt_approval_status, a.quot_jsqr_qt_operate_user_name, a.quot_jsqr_qt_operate_status,
+               a.quot_jsqr_zy_leader_remark, a.quot_jsqr_qt_approval_status, a.quot_jsqr_qt_operate_user_name, a.quot_jsqr_qt_operate_state,
                a.quot_jsqr_qt_operate_time, a.quot_jsqr_qt_remark, a.quot_jsqr_qt_check_user_name, a.quot_jsqr_qt_check_state,
                a.quot_jsqr_qt_check_time, a.quot_jsqr_qt_check_remark, a.quot_jsqr_qt_leader_user_name, a.quot_jsqr_qt_leader_state,
                a.quot_jsqr_qt_leader_time, a.quot_jsqr_qt_leader_remark, a.create_by, a.create_time, a.update_by, a.update_time,
@@ -128,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotJsqrCode != null">quot_jsqr_code,</if>
             <if test="quotJsqrTlApprovalStatus != null">quot_jsqr_tl_approval_status,</if>
             <if test="quotJsqrTlOperateUserName != null">quot_jsqr_tl_operate_user_name,</if>
-            <if test="quotJsqrTlOperateStatus != null">quot_jsqr_tl_operate_status,</if>
+            <if test="quotJsqrTlOperateState != null">quot_jsqr_tl_operate_state,</if>
             <if test="quotJsqrTlOperateTime != null">quot_jsqr_tl_operate_time,</if>
             <if test="quotJsqrTlRemark != null">quot_jsqr_tl_remark,</if>
             <if test="quotJsqrTlCheckUserName != null">quot_jsqr_tl_check_user_name,</if>
@@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotJsqrTlLeaderRemark != null">quot_jsqr_tl_leader_remark,</if>
             <if test="quotJsqrDyApprovalStatus != null">quot_jsqr_dy_approval_status,</if>
             <if test="quotJsqrDyOperateUserName != null">quot_jsqr_dy_operate_user_name,</if>
-            <if test="quotJsqrDyOperateStatus != null">quot_jsqr_dy_operate_status,</if>
+            <if test="quotJsqrDyOperateState != null">quot_jsqr_dy_operate_state,</if>
             <if test="quotJsqrDyOperateTime != null">quot_jsqr_dy_operate_time,</if>
             <if test="quotJsqrDyRemark != null">quot_jsqr_dy_remark,</if>
             <if test="quotJsqrDyCheckUserName != null">quot_jsqr_dy_check_user_name,</if>
@@ -154,7 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotJsqrDyLeaderRemark != null">quot_jsqr_dy_leader_remark,</if>
             <if test="quotJsqrZyApprovalStatus != null">quot_jsqr_zy_approval_status,</if>
             <if test="quotJsqrZyOperateUserName != null">quot_jsqr_zy_operate_user_name,</if>
-            <if test="quotJsqrZyOperateStatus != null">quot_jsqr_zy_operate_status,</if>
+            <if test="quotJsqrZyOperateState != null">quot_jsqr_zy_operate_state,</if>
             <if test="quotJsqrZyOperateTime != null">quot_jsqr_zy_operate_time,</if>
             <if test="quotJsqrZyRemark != null">quot_jsqr_zy_remark,</if>
             <if test="quotJsqrZyCheckUserName != null">quot_jsqr_zy_check_user_name,</if>
@@ -167,7 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotJsqrZyLeaderRemark != null">quot_jsqr_zy_leader_remark,</if>
             <if test="quotJsqrQtApprovalStatus != null">quot_jsqr_qt_approval_status,</if>
             <if test="quotJsqrQtOperateUserName != null">quot_jsqr_qt_operate_user_name,</if>
-            <if test="quotJsqrQtOperateStatus != null">quot_jsqr_qt_operate_status,</if>
+            <if test="quotJsqrQtOperateState != null">quot_jsqr_qt_operate_state,</if>
             <if test="quotJsqrQtOperateTime != null">quot_jsqr_qt_operate_time,</if>
             <if test="quotJsqrQtRemark != null">quot_jsqr_qt_remark,</if>
             <if test="quotJsqrQtCheckUserName != null">quot_jsqr_qt_check_user_name,</if>
@@ -188,7 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotJsqrCode != null">#{quotJsqrCode},</if>
             <if test="quotJsqrTlApprovalStatus != null">#{quotJsqrTlApprovalStatus},</if>
             <if test="quotJsqrTlOperateUserName != null">#{quotJsqrTlOperateUserName},</if>
-            <if test="quotJsqrTlOperateStatus != null">#{quotJsqrTlOperateStatus},</if>
+            <if test="quotJsqrTlOperateState != null">#{quotJsqrTlOperateState},</if>
             <if test="quotJsqrTlOperateTime != null">#{quotJsqrTlOperateTime},</if>
             <if test="quotJsqrTlRemark != null">#{quotJsqrTlRemark},</if>
             <if test="quotJsqrTlCheckUserName != null">#{quotJsqrTlCheckUserName},</if>
@@ -201,7 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotJsqrTlLeaderRemark != null">#{quotJsqrTlLeaderRemark},</if>
             <if test="quotJsqrDyApprovalStatus != null">#{quotJsqrDyApprovalStatus},</if>
             <if test="quotJsqrDyOperateUserName != null">#{quotJsqrDyOperateUserName},</if>
-            <if test="quotJsqrDyOperateStatus != null">#{quotJsqrDyOperateStatus},</if>
+            <if test="quotJsqrDyOperateState != null">#{quotJsqrDyOperateState},</if>
             <if test="quotJsqrDyOperateTime != null">#{quotJsqrDyOperateTime},</if>
             <if test="quotJsqrDyRemark != null">#{quotJsqrDyRemark},</if>
             <if test="quotJsqrDyCheckUserName != null">#{quotJsqrDyCheckUserName},</if>
@@ -214,7 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotJsqrDyLeaderRemark != null">#{quotJsqrDyLeaderRemark},</if>
             <if test="quotJsqrZyApprovalStatus != null">#{quotJsqrZyApprovalStatus},</if>
             <if test="quotJsqrZyOperateUserName != null">#{quotJsqrZyOperateUserName},</if>
-            <if test="quotJsqrZyOperateStatus != null">#{quotJsqrZyOperateStatus},</if>
+            <if test="quotJsqrZyOperateState != null">#{quotJsqrZyOperateState},</if>
             <if test="quotJsqrZyOperateTime != null">#{quotJsqrZyOperateTime},</if>
             <if test="quotJsqrZyRemark != null">#{quotJsqrZyRemark},</if>
             <if test="quotJsqrZyCheckUserName != null">#{quotJsqrZyCheckUserName},</if>
@@ -227,7 +227,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotJsqrZyLeaderRemark != null">#{quotJsqrZyLeaderRemark},</if>
             <if test="quotJsqrQtApprovalStatus != null">#{quotJsqrQtApprovalStatus},</if>
             <if test="quotJsqrQtOperateUserName != null">#{quotJsqrQtOperateUserName},</if>
-            <if test="quotJsqrQtOperateStatus != null">#{quotJsqrQtOperateStatus},</if>
+            <if test="quotJsqrQtOperateState != null">#{quotJsqrQtOperateState},</if>
             <if test="quotJsqrQtOperateTime != null">#{quotJsqrQtOperateTime},</if>
             <if test="quotJsqrQtRemark != null">#{quotJsqrQtRemark},</if>
             <if test="quotJsqrQtCheckUserName != null">#{quotJsqrQtCheckUserName},</if>
@@ -251,7 +251,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotJsqrCode != null">quot_jsqr_code = #{quotJsqrCode},</if>
             <if test="quotJsqrTlApprovalStatus != null">quot_jsqr_tl_approval_status = #{quotJsqrTlApprovalStatus},</if>
             <if test="quotJsqrTlOperateUserName != null">quot_jsqr_tl_operate_user_name = #{quotJsqrTlOperateUserName},</if>
-            <if test="quotJsqrTlOperateStatus != null">quot_jsqr_tl_operate_status = #{quotJsqrTlOperateStatus},</if>
+            <if test="quotJsqrTlOperateState != null">quot_jsqr_tl_operate_state = #{quotJsqrTlOperateState},</if>
             <if test="quotJsqrTlOperateTime != null">quot_jsqr_tl_operate_time = #{quotJsqrTlOperateTime},</if>
             <if test="quotJsqrTlRemark != null">quot_jsqr_tl_remark = #{quotJsqrTlRemark},</if>
             <if test="quotJsqrTlCheckUserName != null">quot_jsqr_tl_check_user_name = #{quotJsqrTlCheckUserName},</if>
@@ -264,7 +264,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotJsqrTlLeaderRemark != null">quot_jsqr_tl_leader_remark = #{quotJsqrTlLeaderRemark},</if>
             <if test="quotJsqrDyApprovalStatus != null">quot_jsqr_dy_approval_status = #{quotJsqrDyApprovalStatus},</if>
             <if test="quotJsqrDyOperateUserName != null">quot_jsqr_dy_operate_user_name = #{quotJsqrDyOperateUserName},</if>
-            <if test="quotJsqrDyOperateStatus != null">quot_jsqr_dy_operate_status = #{quotJsqrDyOperateStatus},</if>
+            <if test="quotJsqrDyOperateState != null">quot_jsqr_dy_operate_state = #{quotJsqrDyOperateState},</if>
             <if test="quotJsqrDyOperateTime != null">quot_jsqr_dy_operate_time = #{quotJsqrDyOperateTime},</if>
             <if test="quotJsqrDyRemark != null">quot_jsqr_dy_remark = #{quotJsqrDyRemark},</if>
             <if test="quotJsqrDyCheckUserName != null">quot_jsqr_dy_check_user_name = #{quotJsqrDyCheckUserName},</if>
@@ -277,7 +277,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotJsqrDyLeaderRemark != null">quot_jsqr_dy_leader_remark = #{quotJsqrDyLeaderRemark},</if>
             <if test="quotJsqrZyApprovalStatus != null">quot_jsqr_zy_approval_status = #{quotJsqrZyApprovalStatus},</if>
             <if test="quotJsqrZyOperateUserName != null">quot_jsqr_zy_operate_user_name = #{quotJsqrZyOperateUserName},</if>
-            <if test="quotJsqrZyOperateStatus != null">quot_jsqr_zy_operate_status = #{quotJsqrZyOperateStatus},</if>
+            <if test="quotJsqrZyOperateState != null">quot_jsqr_zy_operate_state = #{quotJsqrZyOperateState},</if>
             <if test="quotJsqrZyOperateTime != null">quot_jsqr_zy_operate_time = #{quotJsqrZyOperateTime},</if>
             <if test="quotJsqrZyRemark != null">quot_jsqr_zy_remark = #{quotJsqrZyRemark},</if>
             <if test="quotJsqrZyCheckUserName != null">quot_jsqr_zy_check_user_name = #{quotJsqrZyCheckUserName},</if>
@@ -290,7 +290,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotJsqrZyLeaderRemark != null">quot_jsqr_zy_leader_remark = #{quotJsqrZyLeaderRemark},</if>
             <if test="quotJsqrQtApprovalStatus != null">quot_jsqr_qt_approval_status = #{quotJsqrQtApprovalStatus},</if>
             <if test="quotJsqrQtOperateUserName != null">quot_jsqr_qt_operate_user_name = #{quotJsqrQtOperateUserName},</if>
-            <if test="quotJsqrQtOperateStatus != null">quot_jsqr_qt_operate_status = #{quotJsqrQtOperateStatus},</if>
+            <if test="quotJsqrQtOperateState != null">quot_jsqr_qt_operate_state = #{quotJsqrQtOperateState},</if>
             <if test="quotJsqrQtOperateTime != null">quot_jsqr_qt_operate_time = #{quotJsqrQtOperateTime},</if>
             <if test="quotJsqrQtRemark != null">quot_jsqr_qt_remark = #{quotJsqrQtRemark},</if>
             <if test="quotJsqrQtCheckUserName != null">quot_jsqr_qt_check_user_name = #{quotJsqrQtCheckUserName},</if>

ruoyi-ui/src/api/technicalConfirm/technicalConfirm.js

@@ -42,3 +42,12 @@ export function delJsqr(quotJsqrId) {
     method: 'delete'
   })
 }
+
+//操作人、审核人、组长 确认事件
+export function doOperate(quotJsxzGroup,type,state,quotJsqrId) {
+  return request({
+    url: '/jsqr/jsqr/doOperate',
+    method: 'post',
+    params: {quotJsxzGroup:quotJsxzGroup,type:type,state:state,quotJsqrId:quotJsqrId}
+  })
+}

ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue

@@ -173,12 +173,12 @@
         <div v-if="showTl">
           <el-divider content-position="center">特缆协助</el-divider>
           <div style="margin-bottom: 10px;text-align:right">
-            <el-button size="mini" type="success" plain>操作人提交</el-button>
+            <el-button size="mini" type="success" plain @click="doOperate('TL','operater','2')" v-if="this.form.quotJsqrTlOperateState == 0 && this.form.quotJsqrTlCheckState == 0 && this.form.quotJsqrTlLeaderState == 0">操作人通过</el-button>
-            <el-button size="mini" type="danger" plain>操作人驳回</el-button>
+            <el-button size="mini" type="danger" plain @click="doOperate('TL','operater','3')" v-if="this.form.quotJsqrTlOperateState == 0 && this.form.quotJsqrTlCheckState == 0 && this.form.quotJsqrTlLeaderState == 0">操作人驳回</el-button>
-            <el-button size="mini" type="success" plain>审核人提交</el-button>
+            <el-button size="mini" type="success" plain @click="doOperate('TL','checker','2')" v-if="this.form.quotJsqrTlOperateState == 2 && this.form.quotJsqrTlCheckState == 0 && this.form.quotJsqrTlLeaderState == 0">审核人通过</el-button>
-            <el-button size="mini" type="danger" plain>审核人驳回</el-button>
+            <el-button size="mini" type="danger" plain @click="doOperate('TL','checker','3')" v-if="this.form.quotJsqrTlOperateState == 2 && this.form.quotJsqrTlCheckState == 0 && this.form.quotJsqrTlLeaderState == 0">审核人驳回</el-button>
-            <el-button size="mini" type="success" plain>组长提交</el-button>
+            <el-button size="mini" type="success" plain @click="doOperate('TL','leader','2')" v-if="this.form.quotJsqrTlOperateState == 2 && this.form.quotJsqrTlCheckState == 2 && this.form.quotJsqrTlLeaderState == 0">组长通过</el-button>
-            <el-button size="mini" type="danger" plain>组长驳回</el-button>
+            <el-button size="mini" type="danger" plain @click="doOperate('TL','leader','3')" v-if="this.form.quotJsqrTlOperateState == 2 && this.form.quotJsqrTlCheckState == 2 && this.form.quotJsqrTlLeaderState == 0">组长驳回</el-button>
           </div>
           <el-row :gutter="8">
             <el-col :span="8">
@@ -219,8 +219,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="特缆操作状态" prop="quotJsqrTlOperateStatus">
+              <el-form-item label="特缆操作状态" prop="quotJsqrTlOperateState">
-                <el-select v-model="form.quotJsqrTlOperateStatus" :disabled="true">
+                <el-select v-model="form.quotJsqrTlOperateState" :disabled="true">
                   <el-option
                     v-for="dict in dict.type.quot_jsxz_group_status"
                     :key="dict.value"
@@ -275,7 +275,14 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="特缆组长确认状态" prop="quotJsqrTlLeaderState">
-                <el-input v-model="form.quotJsqrTlLeaderState" :disabled="true"/>
+                <el-select v-model="form.quotJsqrTlLeaderState" :disabled="true">
+                  <el-option
+                    v-for="dict in dict.type.quot_jsxz_group_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -291,12 +298,12 @@
         <div v-if="showDy">
           <el-divider content-position="center">低压协助</el-divider>
           <div style="margin-bottom: 10px;text-align:right">
-            <el-button size="mini" type="success" plain>操作人提交</el-button>
+            <el-button size="mini" type="success" plain @click="doOperate('DY','operater','2')" v-if="this.form.quotJsqrDyOperateState == 0 && this.form.quotJsqrDyCheckState == 0 && this.form.quotJsqrDyLeaderState == 0">操作人通过</el-button>
-            <el-button size="mini" type="danger" plain>操作人驳回</el-button>
+            <el-button size="mini" type="danger" plain @click="doOperate('DY','operater','3')" v-if="this.form.quotJsqrDyOperateState == 0 && this.form.quotJsqrDyCheckState == 0 && this.form.quotJsqrDyLeaderState == 0">操作人驳回</el-button>
-            <el-button size="mini" type="success" plain>审核人提交</el-button>
+            <el-button size="mini" type="success" plain @click="doOperate('DY','checker','2')" v-if="this.form.quotJsqrDyOperateState == 2 && this.form.quotJsqrDyCheckState == 0 && this.form.quotJsqrDyLeaderState == 0">审核人通过</el-button>
-            <el-button size="mini" type="danger" plain>审核人驳回</el-button>
+            <el-button size="mini" type="danger" plain @click="doOperate('DY','checker','3')" v-if="this.form.quotJsqrDyOperateState == 2 && this.form.quotJsqrDyCheckState == 0 && this.form.quotJsqrDyLeaderState == 0">审核人驳回</el-button>
-            <el-button size="mini" type="success" plain>组长提交</el-button>
+            <el-button size="mini" type="success" plain @click="doOperate('DY','leader','2')" v-if="this.form.quotJsqrDyOperateState == 2 && this.form.quotJsqrDyCheckState == 2 && this.form.quotJsqrDyLeaderState == 0">组长通过</el-button>
-            <el-button size="mini" type="danger" plain>组长驳回</el-button>
+            <el-button size="mini" type="danger" plain @click="doOperate('DY','leader','3')" v-if="this.form.quotJsqrDyOperateState == 2 && this.form.quotJsqrDyCheckState == 2 && this.form.quotJsqrDyLeaderState == 0">组长驳回</el-button>
           </div>
           <el-row :gutter="8">
             <el-col :span="8">
@@ -337,8 +344,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="低压操作状态" prop="quotJsqrDyOperateStatus">
+              <el-form-item label="低压操作状态" prop="quotJsqrDyOperateState">
-                <el-select v-model="form.quotJsqrDyOperateStatus" :disabled="true">
+                <el-select v-model="form.quotJsqrDyOperateState" :disabled="true">
                   <el-option
                     v-for="dict in dict.type.quot_jsxz_group_status"
                     :key="dict.value"
@@ -393,7 +400,14 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="低压组长确认状态" prop="quotJsqrDyLeaderState">
-                <el-input v-model="form.quotJsqrDyLeaderState" :disabled="true"/>
+                <el-select v-model="form.quotJsqrDyLeaderState" :disabled="true">
+                  <el-option
+                    v-for="dict in dict.type.quot_jsxz_group_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -409,12 +423,12 @@
         <div v-if="showZy">
           <el-divider content-position="center">中压协助</el-divider>
           <div style="margin-bottom: 10px;text-align:right">
-            <el-button size="mini" type="success" plain>操作人提交</el-button>
+            <el-button size="mini" type="success" plain @click="doOperate('ZY','operater','2')" v-if="this.form.quotJsqrZyOperateState == 0 && this.form.quotJsqrZyCheckState == 0 && this.form.quotJsqrZyLeaderState == 0">操作人通过</el-button>
-            <el-button size="mini" type="danger" plain>操作人驳回</el-button>
+            <el-button size="mini" type="danger" plain @click="doOperate('ZY','operater','3')" v-if="this.form.quotJsqrZyOperateState == 0 && this.form.quotJsqrZyCheckState == 0 && this.form.quotJsqrZyLeaderState == 0">操作人驳回</el-button>
-            <el-button size="mini" type="success" plain>审核人提交</el-button>
+            <el-button size="mini" type="success" plain @click="doOperate('ZY','checker','2')" v-if="this.form.quotJsqrZyOperateState == 2 && this.form.quotJsqrZyCheckState == 0 && this.form.quotJsqrZyLeaderState == 0">审核人通过</el-button>
-            <el-button size="mini" type="danger" plain>审核人驳回</el-button>
+            <el-button size="mini" type="danger" plain @click="doOperate('ZY','checker','3')" v-if="this.form.quotJsqrZyOperateState == 2 && this.form.quotJsqrZyCheckState == 0 && this.form.quotJsqrZyLeaderState == 0">审核人驳回</el-button>
-            <el-button size="mini" type="success" plain>组长提交</el-button>
+            <el-button size="mini" type="success" plain @click="doOperate('ZY','leader','2')" v-if="this.form.quotJsqrZyOperateState == 2 && this.form.quotJsqrZyCheckState == 2 && this.form.quotJsqrZyLeaderState == 0">组长通过</el-button>
-            <el-button size="mini" type="danger" plain>组长驳回</el-button>
+            <el-button size="mini" type="danger" plain @click="doOperate('ZY','leader','3')" v-if="this.form.quotJsqrZyOperateState == 2 && this.form.quotJsqrZyCheckState == 2 && this.form.quotJsqrZyLeaderState == 0">组长驳回</el-button>
           </div>
           <el-row :gutter="8">
             <el-col :span="8">
@@ -455,8 +469,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="中压操作状态" prop="quotJsqrZyOperateStatus">
+              <el-form-item label="中压操作状态" prop="quotJsqrZyOperateState">
-                <el-select v-model="form.quotJsqrZyOperateStatus" :disabled="true">
+                <el-select v-model="form.quotJsqrZyOperateState" :disabled="true">
                   <el-option
                     v-for="dict in dict.type.quot_jsxz_group_status"
                     :key="dict.value"
@@ -511,7 +525,14 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="中压组长确认状态" prop="quotJsqrZyLeaderState">
-                <el-input v-model="form.quotJsqrZyLeaderState" :disabled="true"/>
+                <el-select v-model="form.quotJsqrZyLeaderState" :disabled="true">
+                  <el-option
+                    v-for="dict in dict.type.quot_jsxz_group_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -527,12 +548,12 @@
         <div v-if="showQt">
           <el-divider content-position="center">其他协助</el-divider>
           <div style="margin-bottom: 10px;text-align:right">
-            <el-button size="mini" type="success" plain v-if="this.form.quotJsqrTlOperateStatus == 0">操作人提交</el-button>
+            <el-button size="mini" type="success" plain @click="doOperate('QT','operater','2')" v-if="this.form.quotJsqrQtOperateState == 0 && this.form.quotJsqrQtCheckState == 0 && this.form.quotJsqrQtLeaderState == 0">操作人通过</el-button>
-            <el-button size="mini" type="danger" plain v-if="this.form.quotJsqrTlOperateStatus == 0">操作人驳回</el-button>
+            <el-button size="mini" type="danger" plain @click="doOperate('QT','operater','3')" v-if="this.form.quotJsqrQtOperateState == 0 && this.form.quotJsqrQtCheckState == 0 && this.form.quotJsqrQtLeaderState == 0">操作人驳回</el-button>
-            <el-button size="mini" type="success" plain v-if="this.form.quotJsqrTlOperateStatus == 1">审核人提交</el-button>
+            <el-button size="mini" type="success" plain @click="doOperate('QT','checker','2')" v-if="this.form.quotJsqrQtOperateState == 2 && this.form.quotJsqrQtCheckState == 0 && this.form.quotJsqrQtLeaderState == 0">审核人通过</el-button>
-            <el-button size="mini" type="danger" plain v-if="this.form.quotJsqrTlOperateStatus == 1">审核人驳回</el-button>
+            <el-button size="mini" type="danger" plain @click="doOperate('QT','checker','3')" v-if="this.form.quotJsqrQtOperateState == 2 && this.form.quotJsqrQtCheckState == 0 && this.form.quotJsqrQtLeaderState == 0">审核人驳回</el-button>
-            <el-button size="mini" type="success" plain v-if="this.form.quotJsqrTlCheckState == 1">组长提交</el-button>
+            <el-button size="mini" type="success" plain @click="doOperate('QT','leader','2')" v-if="this.form.quotJsqrQtOperateState == 2 && this.form.quotJsqrQtCheckState == 2 && this.form.quotJsqrQtLeaderState == 0">组长通过</el-button>
-            <el-button size="mini" type="danger" plain v-if="this.form.quotJsqrTlCheckState == 1">组长驳回</el-button>
+            <el-button size="mini" type="danger" plain @click="doOperate('QT','leader','3')" v-if="this.form.quotJsqrQtOperateState == 2 && this.form.quotJsqrQtCheckState == 2 && this.form.quotJsqrQtLeaderState == 0">组长驳回</el-button>
           </div>
           <el-row :gutter="8">
             <el-col :span="8">
@@ -573,8 +594,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="其他操作状态" prop="quotJsqrQtOperateStatus">
+              <el-form-item label="其他操作状态" prop="quotJsqrQtOperateState">
-                <el-select v-model="form.quotJsqrQtOperateStatus" :disabled="true">
+                <el-select v-model="form.quotJsqrQtOperateState" :disabled="true">
                   <el-option
                     v-for="dict in dict.type.quot_jsxz_group_status"
                     :key="dict.value"
@@ -629,7 +650,14 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="其他组长确认状态" prop="quotJsqrQtLeaderState">
-                <el-input v-model="form.quotJsqrQtLeaderState" :disabled="true"/>
+                <el-select v-model="form.quotJsqrQtLeaderState" :disabled="true">
+                  <el-option
+                    v-for="dict in dict.type.quot_jsxz_group_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -707,7 +735,7 @@
   }
 </style>
 <script>
-import { listJsqr, getJsqr, delJsqr, addJsqr, updateJsqr } from "@/api/technicalConfirm/technicalConfirm";
+import { listJsqr, getJsqr, delJsqr, addJsqr, updateJsqr, doOperate } from "@/api/technicalConfirm/technicalConfirm";
 import { getToken } from "@/utils/auth";
 import { quotFileList,quotFileDelete } from "@/api/quot/quot";
 
@@ -787,71 +815,6 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        quotJsqrId: null,
-        quotJsqrCode: null,
-        quotJsqrTlApprovalStatus: null,
-        quotJsqrTlOperateUserName: null,
-        quotJsqrTlOperateStatus: null,
-        quotJsqrTlOperateTime: null,
-        quotJsqrTlRemark: null,
-        quotJsqrTlCheckUserName: null,
-        quotJsqrTlCheckState: null,
-        quotJsqrTlCheckTime: null,
-        quotJsqrTlCheckRemark: null,
-        quotJsqrTlLeaderUserName: null,
-        quotJsqrTlLeaderState: null,
-        quotJsqrTlLeaderTime: null,
-        quotJsqrTlLeaderRemark: null,
-        quotJsqrDyApprovalStatus: null,
-        quotJsqrDyOperateUserName: null,
-        quotJsqrDyOperateStatus: null,
-        quotJsqrDyOperateTime: null,
-        quotJsqrDyRemark: null,
-        quotJsqrDyCheckUserName: null,
-        quotJsqrDyCheckState: null,
-        quotJsqrDyCheckTime: null,
-        quotJsqrDyCheckRemark: null,
-        quotJsqrDyLeaderUserName: null,
-        quotJsqrDyLeaderState: null,
-        quotJsqrDyLeaderTime: null,
-        quotJsqrDyLeaderRemark: null,
-        quotJsqrZyApprovalStatus: null,
-        quotJsqrZyOperateUserName: null,
-        quotJsqrZyOperateStatus: null,
-        quotJsqrZyOperateTime: null,
-        quotJsqrZyRemark: null,
-        quotJsqrZyCheckUserName: null,
-        quotJsqrZyCheckState: null,
-        quotJsqrZyCheckTime: null,
-        quotJsqrZyCheckRemark: null,
-        quotJsqrZyLeaderUserName: null,
-        quotJsqrZyLeaderState: null,
-        quotJsqrZyLeaderTime: null,
-        quotJsqrZyLeaderRemark: null,
-        quotJsqrQtApprovalStatus: null,
-        quotJsqrQtOperateUserName: null,
-        quotJsqrQtOperateStatus: null,
-        quotJsqrQtOperateTime: null,
-        quotJsqrQtRemark: null,
-        quotJsqrQtCheckUserName: null,
-        quotJsqrQtCheckState: null,
-        quotJsqrQtCheckTime: null,
-        quotJsqrQtCheckRemark: null,
-        quotJsqrQtLeaderUserName: null,
-        quotJsqrQtLeaderState: null,
-        quotJsqrQtLeaderTime: null,
-        quotJsqrQtLeaderRemark: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null
-      };
-      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -872,7 +835,6 @@ export default {
 
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
       const quotJsqrId = row.quotJsqrId || this.ids
       getJsqr(quotJsqrId).then(response => {
         this.form = response.data;
@@ -1001,7 +963,82 @@ export default {
       quotFileDelete(fileId).then(response => {
         this.getQuotJsqrFileList(this.fileType);
       });
-    }
+    },
+
+    //操作人、审核人、组长 确认事件
+    doOperate(quotJsxzGroup,type,state){
+      doOperate(quotJsxzGroup,type,state,this.form.quotJsqrId).then(response => {
+        if(quotJsxzGroup=='TL'){
+          if(type=='operater'){
+            this.form.quotJsqrTlOperateState = response.data.quotJsqrTlOperateState;
+            this.form.quotJsqrTlOperateTime = response.data.quotJsqrTlOperateTime;
+            this.form.quotJsqrTlOperateUserName = response.data.quotJsqrTlOperateUserName;
+          }
+          if(type=='checker'){
+            this.form.quotJsqrTlCheckState = response.data.quotJsqrTlCheckState;
+            this.form.quotJsqrTlCheckTime = response.data.quotJsqrTlCheckTime;
+            quotJsqrTlCheckState
+            this.form.quotJsqrTlCheckUserName = response.data.quotJsqrTlCheckUserName;
+          }
+          if(type=='leader'){
+            this.form.quotJsqrTlLeaderState = response.data.quotJsqrTlLeaderState;
+            this.form.quotJsqrTlLeaderTime = response.data.quotJsqrTlLeaderTime;
+            this.form.quotJsqrTlLeaderUserName = response.data.quotJsqrTlLeaderUserName;
+          }
+        }
+        if(quotJsxzGroup=='DY'){
+          if(type=='operater'){
+            this.form.quotJsqrDyOperateState = response.data.quotJsqrDyOperateState;
+            this.form.quotJsqrDyOperateTime = response.data.quotJsqrDyOperateTime;
+            this.form.quotJsqrDyOperateUserName = response.data.quotJsqrDyOperateUserName;
+          }
+          if(type=='checker'){
+            this.form.quotJsqrDyCheckState = response.data.quotJsqrDyCheckState;
+            this.form.quotJsqrDyCheckTime = response.data.quotJsqrDyCheckTime;
+            this.form.quotJsqrDyCheckUserName = response.data.quotJsqrDyCheckUserName;
+          }
+          if(type=='leader'){
+            this.form.quotJsqrDyLeaderState = response.data.quotJsqrDyLeaderState;
+            this.form.quotJsqrDyLeaderTime = response.data.quotJsqrDyLeaderTime;
+            this.form.quotJsqrDyLeaderUserName = response.data.quotJsqrDyLeaderUserName;
+          }
+        }
+        if(quotJsxzGroup=='ZY'){
+          if(type=='operater'){
+            this.form.quotJsqrZyOperateState = response.data.quotJsqrZyOperateState;
+            this.form.quotJsqrZyOperateTime = response.data.quotJsqrZyOperateTime;
+            this.form.quotJsqrZyOperateUserName = response.data.quotJsqrZyOperateUserName;
+          }
+          if(type=='checker'){
+            this.form.quotJsqrZyCheckState = response.data.quotJsqrZyCheckState;
+            this.form.quotJsqrZyCheckTime = response.data.quotJsqrZyCheckTime;
+            this.form.quotJsqrZyCheckUserName = response.data.quotJsqrZyCheckUserName;
+          }
+          if(type=='leader'){
+            this.form.quotJsqrZyLeaderState = response.data.quotJsqrZyLeaderState;
+            this.form.quotJsqrZyLeaderTime = response.data.quotJsqrZyLeaderTime;
+            this.form.quotJsqrZyLeaderUserName = response.data.quotJsqrZyLeaderUserName;
+          }
+        }
+        if(quotJsxzGroup=='QT'){
+          if(type=='operater'){
+            this.form.quotJsqrQtOperateState = response.data.quotJsqrQtOperateState;
+            this.form.quotJsqrQtOperateTime = response.data.quotJsqrQtOperateTime;
+            this.form.quotJsqrQtOperateUserName = response.data.quotJsqrQtOperateUserName;
+          }
+          if(type=='checker'){
+            this.form.quotJsqrQtCheckState = response.data.quotJsqrQtCheckState;
+            this.form.quotJsqrQtCheckTime = response.data.quotJsqrQtCheckTime;
+            this.form.quotJsqrQtCheckUserName = response.data.quotJsqrQtCheckUserName;
+          }
+          if(type=='leader'){
+            this.form.quotJsqrQtLeaderState = response.data.quotJsqrQtLeaderState;
+            this.form.quotJsqrQtLeaderTime = response.data.quotJsqrQtLeaderTime;
+            this.form.quotJsqrQtLeaderUserName = response.data.quotJsqrQtLeaderUserName;
+          }
+        }
+      });
+    },
   }
 };
 </script>