客服隐患复查

huaxin-web/src/store/modules/user.js

@@ -18,6 +18,9 @@ const user = {
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_USER_ID: (state, userId) => {
+      state.userId = userId
+    },
     SET_AVATAR: (state, avatar) => {
       state.avatar = avatar
     },
@@ -64,6 +67,7 @@ const user = {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
           commit('SET_NAME', user.userName)
+          commit('SET_USER_ID',user.userId);
           commit('SET_AVATAR', avatar)
           // 默认配置
           commit('SET_SYSTEMSETTING', res.systemSetting)
@@ -74,7 +78,7 @@ const user = {
         })
       })
     },
-    
+
     // 退出系统
     LogOut({ commit, state }) {
       return new Promise((resolve, reject) => {

huaxin-web/src/views/checktask/customerServiceDanger/components/DangerDetail.vue

@@ -149,7 +149,7 @@
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="12">
+                <!--<el-col :span="12">
                   <el-form-item label="整改前视频" prop="beforeVideo">
                   <span v-if="dangerDetailInfo.beforeVideo">
                     <video
@@ -165,7 +165,7 @@
                   </span>
                     <span v-else>-</span>
                   </el-form-item>
-                </el-col>
+                </el-col>-->
 
                 <!--<el-col :span="12">
                   <el-form-item label="整改期限">
@@ -193,7 +193,7 @@
                 </el-col>
 
                 <el-col :span="12">
-                  <el-form-item label="是否为第三方维修">
+                  <el-form-item label="第三方维修">
                     <span v-if="dangerDetailInfo.isThird == '0'">否</span>
                     <span v-else-if="dangerDetailInfo.isThird == '1'">是</span>
                     <span v-else>-</span>
@@ -402,7 +402,7 @@
                 </el-col>
               </el-col>
 
-              <el-col :span="16">
+              <!--<el-col :span="16">
                 <el-col :span="24">
                   <el-form-item label="复查图片" prop="checkImg">
                     <div>
@@ -415,7 +415,7 @@
                     </div>
                   </el-form-item>
                 </el-col>
-              </el-col>
+              </el-col>-->
 
             </el-form>
           </el-row>

huaxin-web/src/views/checktask/customerServiceDanger/components/Review.vue

+<template>
+  <el-dialog :title="title" :visible.sync="approvalOpen" width="800px" append-to-body destroy-on-close :close-on-click-modal="false">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="复查状态" prop="state">
+            <el-radio-group v-model="form.state">
+              <el-radio :label="0">通过</el-radio>
+              <el-radio :label="1">不通过</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="复查意见" prop="suggestion">
+            <el-input type="textarea" v-model="form.suggestion" placeholder="请输入复查意见"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import { updateDanger } from "@/api/checktask/danger";
+  import moment from 'moment';
+    export default {
+      name: "approval",
+      data(){
+          return{
+            title: "复查",
+            approvalOpen: false,
+            ids: [],
+            form: {},
+            rules: {
+              state: [
+                { required: true, message: "请选择复查状态", trigger: "change" }
+              ],
+            }
+          }
+      },
+      methods:{
+        open(ids){
+          this.reset();
+          this.ids = ids;
+          this.approvalOpen = true;
+        },
+        submitForm(){
+          this.$refs["form"].validate(valid => {
+            if (valid) {
+              let formData = {id: this.ids,checkId: this.$store.state.user.userId};
+              if(this.form.suggestion){
+                formData.checkRemark = this.form.suggestion;
+              }
+              if(this.form.state == '0'){
+                //通过 状态改为待审核  部门经理审核
+                formData.status = '3';
+                formData.approvalStatus = '2';
+                //formData.
+              }else{
+                //不通过 状态改为待处理
+                formData.status = '0';
+                formData.checkTime = moment().format("YYYY-MM-DD HH:mm:ss");
+              }
+              updateDanger(formData).then(res =>{
+                this.$message.success("复查成功");
+                this.approvalOpen = false;
+                this.$parent.getList();
+              })
+            }
+          })
+
+        },
+        cancel(){
+          this.approvalOpen = false;
+        },
+        reset(){
+          this.form = {
+            state: null,
+            suggestion: null
+          }
+          this.resetForm("form");
+        }
+      }
+    }
+</script>
+
+<style scoped>
+
+</style>

huaxin-web/src/views/checktask/customerServiceDanger/index.vue

@@ -169,6 +169,13 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['checkTask:danger:remove']"
           >删除</el-button>
+
+          <el-button
+            size="mini"
+            type="text"
+            v-if="scope.row.status == 2 && scope.row.adminId == $store.state.user.userId"
+            @click="handleReview(scope.row)"
+          >复查</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -289,6 +296,9 @@
     <!-- 审核 -->
     <Approval ref="approval"/>
 
+    <!-- 复核 -->
+    <Review ref="review"/>
+
   </div>
 </template>
 
@@ -299,13 +309,15 @@ import GetPos from '@/components/GetPos';
 import DangerDetail from "./components/DangerDetail";
 import Approval from "./components/Approval";
 import { memberInfoList } from "@/api/checktask/dangerGroupMember";
+import Review from "./components/Review";
 export default {
   name: "Danger",
   components: {
     Editor,
     GetPos,
     DangerDetail,
-    Approval
+    Approval,
+    Review
   },
   data() {
     return {
@@ -592,6 +604,11 @@ export default {
       }
       this.$refs.approval.open(approvalIds);
     },
+    //复核
+    handleReview(row){
+      console.log("================",row)
+      this.$refs.review.open(row.id);
+    },
     //获取维修班班长
     getMemberInfoList(){
       memberInfoList({params:{queryType: 1}}).then(res =>{

huaxin-web/src/views/checktask/superviseDanger/components/DangerDetail.vue

@@ -163,7 +163,7 @@
                 </el-col>
 
                 <el-col :span="12">
-                  <el-form-item label="是否为第三方维修">
+                  <el-form-item label="第三方维修">
                     <span v-if="dangerDetailInfo.isThird == '0'">否</span>
                     <span v-else-if="dangerDetailInfo.isThird == '1'">是</span>
                     <span v-else>-</span>