From 4b0c164b8f15549a36ed2b0ac298f5d1517a74f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Thu, 30 Dec 2021 17:12:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=9C=E4=B8=9A=E6=89=A7=E6=B3=95=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/permission.js                             |  1 +
 src/views/lawEnforcement/case/caseList.vue    |  6 ++-
 .../lawEnforcement/complaint/complaintAdd.vue |  3 +-
 .../complaint/complaintList.vue               | 43 ++++---------------
 .../complaint/indexComplaint.vue              | 29 ++++++++-----
 src/views/lawEnforcement/user/index.vue       |  4 +-
 6 files changed, 36 insertions(+), 50 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index c4fcff23..532653b9 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -59,6 +59,7 @@ const whiteList = [
   '/lawEnforcement/indexComplaint',
   '/lawEnforcement/schemeDetail',
   '/lawEnforcement/waitingProcessing',
+  '/lawEnforcement/complaintAdd',
 ]
 
 router.beforeEach((to, from, next) => {
diff --git a/src/views/lawEnforcement/case/caseList.vue b/src/views/lawEnforcement/case/caseList.vue
index 205e4e7c..bb8aed2e 100644
--- a/src/views/lawEnforcement/case/caseList.vue
+++ b/src/views/lawEnforcement/case/caseList.vue
@@ -5,9 +5,10 @@
       <div style="display: flex;padding: 0 3% 0.2rem;">
         <form action="#" style="flex: 0.75;">
           <van-search
-            v-model="queryParams.caseNum"
-            placeholder="请输入案件编号"
+            v-model="queryParams.caseOrPartyName"
+            placeholder="案件名称或当事人姓名"
             :search="handleQuery"
+            v-on:input="handleQuery"
           >
           </van-search>
         </form>
@@ -173,6 +174,7 @@ export default {
         type: null,
         caseStatus: null,
         caseProgress: null,
+        caseOrPartyName: '',
       },
       //新闻集合
       newList:[],
diff --git a/src/views/lawEnforcement/complaint/complaintAdd.vue b/src/views/lawEnforcement/complaint/complaintAdd.vue
index 6de35d0b..878dbc36 100644
--- a/src/views/lawEnforcement/complaint/complaintAdd.vue
+++ b/src/views/lawEnforcement/complaint/complaintAdd.vue
@@ -31,7 +31,7 @@
               />
             </van-popup>
             <van-field :rules="[{ required: true }]" required v-model="form.title" label="标题" placeholder="标题" input-align="right"/>
-            <van-field :rules="[{ required: true }]" required v-model="form.name" label="姓名" placeholder="姓名" input-align="right"/>
+            <van-field v-model="form.name" label="姓名" placeholder="姓名" input-align="right"/>
             <van-field :rules="[{ required: true }]" required v-model="form.phone" label="联系电话" placeholder="联系电话" input-align="right"/>
             <van-field :rules="[{ required: true }]" required v-model="form.content" label="投诉内容" placeholder="投诉内容" input-align="right"/>
           </div>
@@ -142,6 +142,7 @@
     box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
     overflow: hidden;
     background-color: #FFF;
+    margin-top: 10PX;
   }
   .collapse{
     width: 96%;
diff --git a/src/views/lawEnforcement/complaint/complaintList.vue b/src/views/lawEnforcement/complaint/complaintList.vue
index e6e8aa3a..e1e13f6c 100644
--- a/src/views/lawEnforcement/complaint/complaintList.vue
+++ b/src/views/lawEnforcement/complaint/complaintList.vue
@@ -6,12 +6,7 @@
       placeholder
       left-arrow
       @click-left="goUserIndex()"
-      @click-right="goAdd()"
-    >
-      <template #right>
-        <van-icon name="add" size="18"/>
-      </template>
-    </van-nav-bar>
+    />
     <van-tabs v-model="active" animated sticky>
       <van-tab title="全部">
         <van-list
@@ -22,9 +17,6 @@
         >
           <div class="tabsBox" v-for="(item,index) in schemeList" :key="index">
             <van-cell :title="item.name" :label="item.reply ? '已回复 · ' + item.replyTime:'待回复 '" center>
-              <template #icon>
-                <van-icon name="../../../static/images/lawEnforcement/12.jpg" size="36" color="#539FFD" style="margin-right: 10px;border-radius: 50%;overflow: hidden;" />
-              </template>
               <template #default>
                 <p style="color: #1D6FE9;"><van-icon name="phone" style="top: 2px" />{{item.phone}}</p>
               </template>
@@ -41,11 +33,9 @@
               <van-col :span="5">内容：</van-col>
               <van-col :span="19">{{item.content}}</van-col>
             </van-row>
-
             <van-row v-if="item.reply">
               <van-col :span="24" style="border-top: 1px solid #eee"></van-col>
             </van-row>
-
             <van-row v-if="item.reply">
               <van-col :span="5">回复：</van-col>
               <van-col :span="19">{{item.reply}}</van-col>
@@ -68,11 +58,8 @@
           finished-text="没有更多了"
           @load="getNewList"
         >
-          <div class="tabsBox" v-for="(item,index) in schemeList" v-if="!item.replyTime" :key="index">
+          <div class="tabsBox" v-for="(item,index) in schemeList" v-if="!item.reply" :key="index">
             <van-cell :title="item.name" :label="item.reply ? '已回复 · ' + item.replyTime:'待回复 '" center>
-              <template #icon>
-                <van-icon name="../../../static/images/lawEnforcement/12.jpg" size="36" color="#539FFD" style="margin-right: 10px;border-radius: 50%;overflow: hidden;" />
-              </template>
               <template #default>
                 <p style="color: #1D6FE9;"><van-icon name="phone" style="top: 2px" />{{item.phone}}</p>
               </template>
@@ -94,14 +81,6 @@
               <van-col :span="24" style="border-top: 1px solid #eee"></van-col>
             </van-row>
 
-            <van-row v-if="item.reply">
-              <van-col :span="5">回复：</van-col>
-              <van-col :span="19">{{item.reply}}</van-col>
-            </van-row>
-            <van-row v-if="item.reply">
-              <van-col :span="5">回复人：</van-col>
-              <van-col :span="19">{{item.replyName}}</van-col>
-            </van-row>
             <van-row v-if="!item.reply">
               <van-col :span="12"></van-col>
               <van-col :span="12" align="right"><van-button icon="edit" type="danger" class="answerBtn" :to="{name:'reply',query:{id:item.id}}">回复</van-button></van-col>
@@ -116,11 +95,8 @@
           finished-text="没有更多了"
           @load="getNewList"
         >
-          <div class="tabsBox" v-for="(item,index) in schemeList" v-if="item.replyTime" :key="index">
+          <div class="tabsBox" v-for="(item,index) in schemeList" v-if="item.reply" :key="index">
             <van-cell :title="item.name" :label="item.reply ? '已回复 · ' + item.replyTime:'待回复 '" center >
-              <template #icon>
-                <van-icon name="../../../static/images/lawEnforcement/12.jpg" size="36" color="#539FFD" style="margin-right: 10px;border-radius: 50%;overflow: hidden;" />
-              </template>
               <template #default>
                 <p style="color: #1D6FE9;"><van-icon name="phone" style="top: 2px" />{{item.phone}}</p>
               </template>
@@ -150,10 +126,6 @@
               <van-col :span="5">回复人：</van-col>
               <van-col :span="19">{{item.replyName}}</van-col>
             </van-row>
-            <van-row v-if="!item.reply">
-              <van-col :span="12"></van-col>
-              <van-col :span="12" align="right"><van-button icon="edit" type="danger" class="answerBtn" :to="{name:'reply',query:{id:item.id}}">回复</van-button></van-col>
-            </van-row>
           </div>
         </van-list>
       </van-tab>
@@ -161,7 +133,7 @@
   </div>
 </template>
 <script>
-import { getTopDeptId , schemeDetail,listCommunicate } from "@/api/lawEnforcement/index";
+import { listCommunicate } from "@/api/lawEnforcement/index";
 export default {
   name: "index",
   data() {
@@ -193,9 +165,6 @@ export default {
     });
   },
   methods: {
-    goAdd(){
-      window.location = '/lawEnforcement/complaintAdd';
-    },
     goUserIndex(){
       window.location = '/lawEnforcement/user';
     },
@@ -225,6 +194,10 @@ export default {
   font-family: SourceHanSansCNBold;
   src: url("../../../assets/fonts/SourceHanSansCN-Bold.otf");
 }
+/deep/ .van-col--5{
+  font-weight: bold;
+  color: #1D6FE9;
+}
 /deep/ .van-tabs__line{
   background-color: #1D6FE9;
 }
diff --git a/src/views/lawEnforcement/complaint/indexComplaint.vue b/src/views/lawEnforcement/complaint/indexComplaint.vue
index 5380fe59..270363d1 100644
--- a/src/views/lawEnforcement/complaint/indexComplaint.vue
+++ b/src/views/lawEnforcement/complaint/indexComplaint.vue
@@ -6,7 +6,12 @@
       placeholder
       left-arrow
       @click-left="onClickIndex"
-    />
+      @click-right="goAdd()"
+    >
+      <template #right>
+        <van-icon name="add" size="18"/>
+      </template>
+    </van-nav-bar>
     <van-list
       v-model="loading"
       :finished="finished"
@@ -14,15 +19,7 @@
       @load="getNewList"
     >
       <div class="tabsBox" v-for="(item,index) in schemeList" :key="index" :id="item.id">
-        <van-cell :title="item.name" :label="'待回复 · ' + item.replyTime" center>
-          <template #icon>
-            <van-icon name="../../../static/images/lawEnforcement/12.jpg" size="36" color="#539FFD" style="margin-right: 10px;border-radius: 50%;overflow: hidden;" />
-          </template>
-          <template #default>
-            <p style="color: #1D6FE9;"><van-icon name="phone" />{{item.phone}}</p>
-          </template>
-        </van-cell>
-        <van-row>
+        <van-row style="margin-top: 0;">
           <van-col :span="5">类型：</van-col>
           <van-col :span="19">{{item.communicateType}}</van-col>
         </van-row>
@@ -86,6 +83,9 @@ export default {
     this.pageId = this.$route.query.id?this.$route.query.id:0;
   },
   methods: {
+    goAdd(){
+      window.location = '/lawEnforcement/complaintAdd';
+    },
     getNewList(){
       this.loading = true;
       console.log(this.$route.query.id)
@@ -139,12 +139,20 @@ export default {
 body{
   overflow: scroll;
 }
+.van-cell::after{
+  right: 0;
+  left: 0;
+}
 .app-container{
   padding: 5% 2%;
 }
 /deep/ .van-tabs__line{
   background-color: #1D6FE9;
 }
+/deep/ .van-col--5{
+  font-weight: bold;
+  color: #1D6FE9;
+}
 /deep/ .van-tab--active{
   color: #1D6FE9;
 }
@@ -161,6 +169,7 @@ body{
 }
 /deep/.van-cell{
   padding: 0;
+  padding-bottom:  10PX;
 }
 /deep/.van-row{
   margin-top: 15PX;
diff --git a/src/views/lawEnforcement/user/index.vue b/src/views/lawEnforcement/user/index.vue
index f229ea1f..4a08afd6 100644
--- a/src/views/lawEnforcement/user/index.vue
+++ b/src/views/lawEnforcement/user/index.vue
@@ -45,8 +45,8 @@
       </van-cell>
 
     </van-cell-group>
-    <van-cell-group class="listBox">
-      <van-cell is-link :to="{name:loginType ? 'programme':''}" v-if="tabShow" >
+    <van-cell-group class="listBox" v-if="tabShow">
+      <van-cell is-link :to="{name:loginType ? 'programme':''}" >
         <template #title>
           <van-icon name="../../../static/images/lawEnforcement/icon/icon_fagl.png" size="20"></van-icon>
           <span class="custom-title">方案管理</span>