From 9544188c2b2abc6369178614e91cf57443da1d9a Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期二, 14 三月 2023 18:06:48 +0800
Subject: [PATCH] 修改已驳回信息 案件录入-案件状态修改

---
 src/views/cause/Entry.vue  |  151 ++++++++++++++---------------
 src/views/cause/Group.vue  |   26 ++++
 src/views/common/Audit.vue |   62 +++++++++++-
 src/main.js                |    4 
 src/api/Audit.js           |   10 ++
 5 files changed, 165 insertions(+), 88 deletions(-)

diff --git a/src/api/Audit.js b/src/api/Audit.js
new file mode 100644
index 0000000..a028937
--- /dev/null
+++ b/src/api/Audit.js
@@ -0,0 +1,10 @@
+import request from '@/plugins/request'
+
+export function reasonForRejection(params) {
+    return request({
+        url: 'report/reject',
+        method: 'post',
+        data: params
+    })
+}
+
diff --git a/src/main.js b/src/main.js
index b34b688..96f49e6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -10,7 +10,7 @@
 import './assets/fonts/iconfont.css'
 // 瀵煎叆鍏ㄥ眬filter
 import * as filters from './plugins/filters'
-
+import ElementUI from 'element-ui';
 import axios from 'axios'
 
 Vue.prototype.$http = axios
@@ -19,7 +19,7 @@
     Vue.filter(key, filters[key])
 })
 
-
+Vue.use(ElementUI);
 Vue.config.productionTip = false
 
 new Vue({
diff --git a/src/views/cause/Entry.vue b/src/views/cause/Entry.vue
index 8808784..a576229 100644
--- a/src/views/cause/Entry.vue
+++ b/src/views/cause/Entry.vue
@@ -41,11 +41,11 @@
           </el-table-column>
           <el-table-column prop="status" label="妗堜欢鐘舵��" width="110" header-align="center" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.status == 0">鍙楃悊涓�</span>
-              <span v-if="scope.row.status == 1">涓嶄簣绔嬫</span>
-              <span v-if="scope.row.status == 2">浠ョ珛妗�</span>
-              <span v-if="scope.row.status == 3">宸茬粨妗�</span>
-              <span v-if="scope.row.status == 4">宸茬珛妗�</span>
+              <span v-if="scope.row.status == 0">绔嬫</span>
+              <span v-if="scope.row.status == 1">鍒濇煡</span>
+              <span v-if="scope.row.status == 2">鍙楃悊</span>
+              <span v-if="scope.row.status == 3">绉婚�佽捣璇�</span>
+              <span v-if="scope.row.status == 4">缁撴</span>
             </template>
           </el-table-column>
           <el-table-column prop="userName" label="璐熻矗浜�" width="130" header-align="center" align="center">
@@ -70,7 +70,7 @@
     <!--娣诲姞妗堜欢寮圭獥-->
     <el-dialog title="娣诲姞妗堜欢" :visible.sync="addAduitDialogVisible" :before-close="addAduitClose">
       <el-row :gutter="15">
-        <el-form ref="causeForm" :model="causeForm" :rules="addCauseRules" size="medium" label-width="100px">
+        <el-form ref="causeForm" :model="causeForm" :rules="addCauseRules" size="medium" label-width="140px">
           <el-col :span="12">
             <el-form-item label="妗堜欢缂栧彿 " prop="number">
               <el-input v-model="causeForm.number" clearable :style="{ width: '100%' }" placeholder="杈撳叆妗堜欢缂栧彿">
@@ -89,10 +89,10 @@
                 placeholder="杈撳叆棰勪及鎬婚噾棰�"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="14">
+          <el-col :span="24">
             <el-form-item label="鏈�鏃╁彂妗堟椂闂�" prop="firstTime">
               <el-date-picker v-model="causeForm.firstTime" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" clearable
-                :style="{ width: '100%' }" value-format="yyyy-MM-dd HH:mm:ss">
+                :style="{ width: '40%' }" value-format="yyyy-MM-dd HH:mm:ss">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -813,9 +813,7 @@
       reportCauseId: null,
       reportTotal: 0,
       reportList: [],
-      addAduitDialogVisible: false,
       infoAduitDialogVisible: false,
-      causeOptions: [],
       groupAnVisible: false,
       addCauseRules: {
         number: [{
@@ -971,49 +969,46 @@
         },
         {
           value: '0',
-          label: '鍙楃悊涓�'
+          label: '绔嬫'
         },
         {
           value: '1',
-          label: '涓嶄簣绔嬫'
+          label: '鍒濇煡'
         },
         {
           value: '2',
-          label: '宸茬珛妗�'
+          label: '鍙楃悊'
         },
         {
           value: '3',
-          label: '宸茬粨妗�'
+          label: '绉婚�佽捣璇�'
         },
         {
           value: '4',
-          label: '宸叉挙妗�'
+          label: '缁撴'
         }
       ],
       causeOptions: [
+
         {
-          value: null,
-          label: '鍏ㄩ儴'
+          value: 0,
+          label: '绔嬫'
         },
         {
-          value: '0',
-          label: '鏈鏍�'
+          value: 1,
+          label: '鍒濇煡'
         },
         {
-          value: '1',
-          label: '涓嶄簣绔嬫'
+          value: 2,
+          label: '鍙楃悊'
         },
         {
-          value: '2',
-          label: '鍙楃悊涓�'
+          value: 3,
+          label: '绉婚�佽捣璇�'
         },
         {
-          value: '3',
-          label: '宸茬粨妗�'
-        },
-        {
-          value: '4',
-          label: '宸叉挙妗�'
+          value: 4,
+          label: '缁撴'
         }
       ],
       total: null,
@@ -1347,25 +1342,25 @@
     //妗堜欢褰曞叆鐩稿叧
 
     updateCauseDialogVisible(row) {
-      this.updateAduitDialogVisible = true,
-        this.updataCauseForm = Object.assign({}, row);
-      if (this.updataCauseForm.status == 0) {
-        this.updataCauseForm.status = '鏈鏍�';
-      };
-      if (this.updataCauseForm.status == 1) {
-        this.updataCauseForm.status = '涓嶄簣绔嬫';
-      };
-      if (this.updataCauseForm.status == 2) {
-        this.updataCauseForm.status = '鍙楃悊涓�';
-      };
-      if (this.updataCauseForm.status == 3) {
-        this.updataCauseForm.status = '宸茬粨妗�';
-      };
-      if (this.updataCauseForm.status == 4) {
-        this.updataCauseForm.status = '宸叉挙妗�';
-      };
-    }
-    ,
+      this.updateAduitDialogVisible = true;
+      this.updataCauseForm = Object.assign({}, row);
+
+      // if (this.updataCauseForm.status == 0) {
+      //   this.updataCauseForm.status = '鏈鏍�';
+      // };
+      // if (this.updataCauseForm.status == 1) {
+      //   this.updataCauseForm.status = '涓嶄簣绔嬫';
+      // };
+      // if (this.updataCauseForm.status == 2) {
+      //   this.updataCauseForm.status = '鍙楃悊涓�';
+      // };
+      // if (this.updataCauseForm.status == 3) {
+      //   this.updataCauseForm.status = '宸茬粨妗�';
+      // };
+      // if (this.updataCauseForm.status == 4) {
+      //   this.updataCauseForm.status = '宸叉挙妗�';
+      // };
+    },
     addAduitClose() {
       this.addAduitDialogVisible = false
     },
@@ -1419,21 +1414,21 @@
           data.userId = this.user[key].userId;
         }
       }
-      if (data.status == '鏈鏍�') {
-        data.status = 0;
-      }
-      if (data.status == '涓嶄簣绔嬫') {
-        data.status = 1;
-      }
-      if (data.status == '鍙楃悊涓�') {
-        data.status = 2;
-      }
-      if (data.status == '宸茬粨妗�') {
-        data.status = 3;
-      }
-      if (data.status == '宸叉挙妗�') {
-        data.status = 4;
-      }
+      // if (data.status == '鏈鏍�') {
+      //   data.status = 0;
+      // }
+      // if (data.status == '涓嶄簣绔嬫') {
+      //   data.status = 1;
+      // }
+      // if (data.status == '鍙楃悊涓�') {
+      //   data.status = 2;
+      // }
+      // if (data.status == '宸茬粨妗�') {
+      //   data.status = 3;
+      // }
+      // if (data.status == '宸叉挙妗�') {
+      //   data.status = 4;
+      // }
       this.$http.put('/api/cause/updateCause?id=' + data.id,
         data
       ).then(res => {
@@ -1442,21 +1437,21 @@
             type: "success",
             message: "淇敼鎴愬姛"
           });
-          if (this.updataCauseForm.status == 0) {
-            this.updataCauseForm.status = '鏈鏍�';
-          };
-          if (this.updataCauseForm.status == 1) {
-            this.updataCauseForm.status = '涓嶄簣绔嬫';
-          };
-          if (this.updataCauseForm.status == 2) {
-            this.updataCauseForm.status = '鍙楃悊涓�';
-          };
-          if (this.updataCauseForm.status == 3) {
-            this.updataCauseForm.status = '宸茬粨妗�';
-          };
-          if (this.updataCauseForm.status == 4) {
-            this.updataCauseForm.status = '宸叉挙妗�';
-          };
+          // if (this.updataCauseForm.status == 0) {
+          //   this.updataCauseForm.status = '鏈鏍�';
+          // };
+          // if (this.updataCauseForm.status == 1) {
+          //   this.updataCauseForm.status = '涓嶄簣绔嬫';
+          // };
+          // if (this.updataCauseForm.status == 2) {
+          //   this.updataCauseForm.status = '鍙楃悊涓�';
+          // };
+          // if (this.updataCauseForm.status == 3) {
+          //   this.updataCauseForm.status = '宸茬粨妗�';
+          // };
+          // if (this.updataCauseForm.status == 4) {
+          //   this.updataCauseForm.status = '宸叉挙妗�';
+          // };
           this.updateAduitDialogVisible = false;
           // location.reload();
           this.getList();
diff --git a/src/views/cause/Group.vue b/src/views/cause/Group.vue
index c2b58ab..8251778 100644
--- a/src/views/cause/Group.vue
+++ b/src/views/cause/Group.vue
@@ -182,6 +182,7 @@
                 }
               }
               this.messageList = res
+
               this.sendBtn=false
             })
             getAllNotice(data.id).then(res => this.groupAnList = res)
@@ -234,12 +235,33 @@
           }
         },
         seedMessage() {
-          seed(this.field103, this.groupId).then(res => {
+          seed(this.field103, this.groupId).then(async res => {
                 this.$message({
                   message: '鍥炲鎴愬姛',
                   type: 'success'
                 });
-                getAllMessage(this.groupId).then(res => this.messageList = res)
+                await getAllMessage(this.groupId).then(res => {
+                  res.map(item=>{
+                    if (item.pic === '' || item.pic === null){
+
+                    }else {
+                      item.pic='/minio/img/'+item.pic
+                    }
+
+                  })
+                  this.messageList = res
+                  // console.log(res)
+                })
+
+                // for (let item of this.messageList) {
+                //   if (item.pic === '' || item.pic === null) {
+                //   } else {
+                //     getImgUrl(item.pic).then(res => {
+                //       item.pic = res
+                //     })
+                //   }
+                // }
+
                 this.field103 = '';
               }
           )
diff --git a/src/views/common/Audit.vue b/src/views/common/Audit.vue
index 871ebd2..8708333 100644
--- a/src/views/common/Audit.vue
+++ b/src/views/common/Audit.vue
@@ -51,7 +51,15 @@
         <el-table-column width="180" prop="idcard" label="璇佷欢鍙风爜"></el-table-column>
         <el-table-column width="100" prop="isCommission" label="鏄惁瀹℃牳">
           <template slot-scope="scope">
-            <span v-if="scope.row.isCommission == 1">鏄�</span>
+            <el-popover
+                v-if="scope.row.status == 2"
+                placement="bottom"
+                title="椹冲洖鍘熷洜"
+                width="200"
+                trigger="click"
+                :content="scope.row.remarks">
+              <el-button type="text"  slot="reference">宸查┏鍥�</el-button>
+            </el-popover>
             <span v-else>鍚�</span>
           </template>
         </el-table-column>
@@ -158,6 +166,7 @@
       </el-row>
       <span slot="footer" class="dialog-footer">
         <el-button @click="addAduitDialogVisible = false">鍙� 娑�</el-button>
+
         <el-button type="primary" @click="addAduit">纭� 瀹�</el-button>
       </span>
     </el-dialog>
@@ -235,8 +244,25 @@
       </el-row>
       <span slot="footer" class="dialog-footer">
         <el-button @click="checkVisible = false">鍙� 娑�</el-button>
+        <el-button type="danger" @click="innerLayerVisible =true">椹� 鍥�</el-button>
         <el-button type="primary" @click="checkAdd">纭� 瀹�</el-button>
       </span>
+
+      <el-dialog
+          width="30%"
+          title="椹冲洖鍘熷洜"
+          :visible.sync="innerLayerVisible"
+          append-to-body>
+        <div class="reason-for-rejection">
+          <label class="reason-for-rejection-lable">椹冲洖鍘熷洜锛�</label>
+          <el-input v-model="reasonForRejectionInput" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
+
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="innerLayerVisible = false">鍙� 娑�</el-button>
+          <el-button type="primary" @click="rejectionConfirmation">纭畾</el-button>
+        </div>
+      </el-dialog>
     </el-dialog>
 
 
@@ -317,11 +343,15 @@
 
 <script>
 import { getAuditList, getImgUrl, getReportById, report, checkPass } from '@/api/common'
+import {reasonForRejection} from "@/api/Audit";
 
 export default {
   name: "Audit",
   data() {
     return {
+
+      reasonForRejectionInput:'',
+      innerLayerVisible:false,
       current: null,
       size: null,
       queryInfo: {
@@ -408,11 +438,6 @@
           message: '璇疯緭鍏ヨ楠楁椂闂�',
           trigger: 'blur'
         }],
-        cheatTime: [{
-          required: true,
-          message: '璇疯緭鍏ヨ楠楁椂闂�',
-          trigger: 'blur'
-        }],
         amountInvolved: [{
           required: true,
           message: '璇疯緭鍏ユ秹妗堥噾棰�',
@@ -447,6 +472,9 @@
   },
 
   methods: {
+    openInnerLayerVisible(){
+
+    },
     //妗堜欢浜哄憳瀵煎叆鎴愬姛鍚�
     reporterRespond(res) {
       if (res.code == 200) {
@@ -472,10 +500,24 @@
         return false
       }
     },
+    rejectionConfirmation(){
+      let data={
+        id:this.auditInfo.id,
+        reason:this.reasonForRejectionInput
+      }
+      reasonForRejection(data).then(res=>{
+        console.log(res)
+        this.getList()
+        this.checkVisible=false
+        this.innerLayerVisible =false
+      })
+    },
     //瀹℃牳纭畾
     checkAdd() {
       let form = null;
+
       form = this.auditInfo;
+      console.log(form)
       this.$refs.infoAduitForm.validate((valid)=>{
         if(valid){
           checkPass(form).then(res => {
@@ -494,6 +536,7 @@
     check(val) {
       getReportById(val).then(res => {
         this.auditInfo = res
+        this.reasonForRejectionInput= this.auditInfo.remarks||''
         if (res.pic === '' || res.pic === null) {
           this.picShow = './logo.jpg';
         } else {
@@ -647,4 +690,11 @@
 .el-form-item {
   margin-top: 20px;
 }
+.reason-for-rejection{
+  display: flex;
+  align-items: center;
+  .reason-for-rejection-lable{
+    width: 120px;
+  }
+}
 </style>

--
Gitblit v1.8.0