From cb178908ccbe7fc8da07099d958844070c64d402 Mon Sep 17 00:00:00 2001
From: wanglei <1336977847@qq.com>
Date: Wed, 9 Feb 2022 15:11:33 +0800
Subject: [PATCH] aa

---
 src/saas/AppConflictMediation/AppConflictMediation.vue | 2 +-
 src/saas/AppConflictMediation/Content.vue              | 4 ++--
 src/saas/AppConflictMediation/List.vue                 | 7 +++++++
 src/saas/AppConflictMediation/add.vue                  | 8 +++-----
 src/saas/AppConflictMediation/detail.vue               | 2 +-
 src/saas/AppSpecialPeople/detail.vue                   | 4 ++--
 src/store/index.js                                     | 2 +-
 7 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/saas/AppConflictMediation/AppConflictMediation.vue b/src/saas/AppConflictMediation/AppConflictMediation.vue
index 2c903eb3..1c226e2e 100644
--- a/src/saas/AppConflictMediation/AppConflictMediation.vue
+++ b/src/saas/AppConflictMediation/AppConflictMediation.vue
@@ -47,7 +47,7 @@ export default {
       this.isAdmin = false
       this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
         if (res.code == 0) {
-          if (res.data.checkType != '0') {
+          if (res.data.appGirdInfo.checkType != '0') {
             this.isAdmin = true
           }
         }
diff --git a/src/saas/AppConflictMediation/Content.vue b/src/saas/AppConflictMediation/Content.vue
index c64abad0..ff78031b 100644
--- a/src/saas/AppConflictMediation/Content.vue
+++ b/src/saas/AppConflictMediation/Content.vue
@@ -29,9 +29,9 @@
       <span>转交事件</span>
     </div>
 
-    <div class="btn" v-if="this.status == 2" @click="confirm">
+    <!-- <div class="btn" v-if="this.status == 2" @click="confirm">
       <span>拒绝受理</span>
-    </div>
+    </div> -->
 
     <div class="btn" v-if="this.status == 3" @click="confirm">
       <span>我已办结</span>
diff --git a/src/saas/AppConflictMediation/List.vue b/src/saas/AppConflictMediation/List.vue
index 64879a19..3401dcb9 100644
--- a/src/saas/AppConflictMediation/List.vue
+++ b/src/saas/AppConflictMediation/List.vue
@@ -115,6 +115,7 @@ export default {
   created() {
     this.$dict.load('clapEventStatus', 'clapEventStatusAll', 'clapEventStatusHistory').then(() => {
       this.getList()
+      this.getStaticList()
       this.listTypeAll = this.$dict.getDict('clapEventStatusAll')
       this.listTypeHistory = this.$dict.getDict('clapEventStatusHistory')
       this.listType = this.listTypeAll
@@ -140,6 +141,12 @@ export default {
           }
         })
     },
+    getStaticList() {
+      this.$http.post('/app/appclapeventgroup/list').then((res) => {
+        console.log(111);
+        console.log(res);
+      })
+    },
     // 切换类型
     changeType(e) {
       this.status = e[0].label
diff --git a/src/saas/AppConflictMediation/add.vue b/src/saas/AppConflictMediation/add.vue
index 23a792e9..9a27f4ea 100644
--- a/src/saas/AppConflictMediation/add.vue
+++ b/src/saas/AppConflictMediation/add.vue
@@ -22,7 +22,7 @@
             <span>(最多9张)</span>
           </div>
           <div class="form-item__right">
-            <AiUploader v-model="form.files" :limit="9"></AiUploader>
+            <AiUploader v-model="form.files" :limit="9"  action="/admin/file/add2"></AiUploader>
           </div>
         </div>
       </div>
@@ -109,7 +109,7 @@
               <span>(最多9张)</span>
             </div>
             <div class="form-item__right">
-              <AiUploader v-model="form.resultFiles" :limit="9"></AiUploader>
+              <AiUploader v-model="form.resultFiles" :limit="9" action="/admin/file/add2"></AiUploader>
             </div>
           </div>
         </div>
@@ -142,7 +142,7 @@
           flag: false,
           result: '',
           resultFiles: [],
-          opts: 0,
+          opts: 2,
           name: ''
         },
         dictList: [],
@@ -169,7 +169,6 @@
       },
 
       confirmSelect(e) {
-        console.log(e)
         this.form.girdId = e[0].value
         this.girdList.map((item) => {
           if(item.id == this.form.girdId) {
@@ -180,7 +179,6 @@
 
       getDict () {
         this.$http.post(`/app/appclapeventgroup/list`).then(res => {
-          console.log(res);
           if (res.code == 0) {
             this.dictList = res.data.records.map(v => {
               return {
diff --git a/src/saas/AppConflictMediation/detail.vue b/src/saas/AppConflictMediation/detail.vue
index 9ab88055..c2f777b7 100644
--- a/src/saas/AppConflictMediation/detail.vue
+++ b/src/saas/AppConflictMediation/detail.vue
@@ -164,7 +164,7 @@ export default {
     },
 
     doThings() {
-      this.$http.post(`/app/appclapeventinfo/acceptance?id=${this.id}`).then((res) => {
+      this.$http.post(`/app/appclapeventinfo/finishByGirdMember?id=${this.id}`).then((res) => {
         if (res.code == 0) {
           this.getDetail()
         }
diff --git a/src/saas/AppSpecialPeople/detail.vue b/src/saas/AppSpecialPeople/detail.vue
index 55480351..25163960 100644
--- a/src/saas/AppSpecialPeople/detail.vue
+++ b/src/saas/AppSpecialPeople/detail.vue
@@ -8,7 +8,7 @@
       <div class="select-content">
         <div class="search-input" v-if="tabIndex">
           <img src="./img/search-icon.png" alt="">
-          <u-input type="text" placeholder="请输入姓名" placeholder-style="color:#999;font-size:13px;" height="18" v-model="name" @confirm="getUserList" :clearable="false" maxlength="6" />
+          <u-input type="text" placeholder="请输入姓名" placeholder-style="color:#999;font-size:13px;" height="18" v-model="name" @confirm="getUserList" :clearable="true" maxlength="6" />
         </div>
       </div>
     </div>
@@ -171,7 +171,7 @@ export default {
       if(!idNumber) {
         idNumber = ''
       }else {
-        idNumber = idNumber.substring(0, 5) + '******' + idNumber.substring(12, 15)
+        idNumber = idNumber.substring(0, 6) + '********' + idNumber.substring(14, 18)
       }
       return idNumber
     },
diff --git a/src/store/index.js b/src/store/index.js
index de51babc..3b035949 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -240,7 +240,7 @@ const store = new Vuex.Store({
         return Promise.resolve()
       } else {
         agentSignURL = url
-        if (sessionStorage.getItem("prj").indexOf("saas") > -1) {
+        if (sessionStorage.getItem("prj")?.indexOf("saas") > -1) {
           params = {...params, corpId: "ww596787bb70f08288"}
         }
         if (qs.parse(location.search)?.corpId) {