Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/apps/AppHelpDeclaration/details.vue

@@ -53,7 +53,7 @@
       <div class="plan">
         <div class="nav">
           <span>办理进度</span>
-          <span> ({{ $dict.getLabel('clapEventStatus', data.eventStatus) }})</span>
+          <span> ({{ $dict.getLabel('helpDeclarationStatus', data.status) }})</span>
         </div>
 
         <div class="cards" v-for="(item, index) in data.processList" :key="index">

src/apps/AppHelpDeclaration/list.vue

@@ -6,23 +6,23 @@
       </div>
       <div class="select-box">
         <div class="left">
-          <!--  :areaId="user.areaId" @select="areaSelect" select-root -->
-          <AiAreaPicker v-model="areaId" :name.sync="areaName" >
-            <div style="display: flex;">
-              <span v-if="areaName" style="color:#333;fontSize: 14px;" class="areaName">{{ areaName }}</span>
+          <AiAreaPicker v-model="areaId" :areaId="user.areaId" :name.sync="areaName" @select="areaSelect" selectRoot>
+            <div>
+              <span v-if="areaId" style="color:#333;fontSize: 14px;" class="areaName">{{ areaName }}</span>
               <span v-else style="color: #999;fontSize: 14px;" class="areaName">所在地区</span>
-              <u-icon name="arrow-down" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;margin-top:18px"></u-icon>
-              <u-icon name="close-circle" v-if="areaId" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;margin-top:18px"></u-icon>
+              <u-icon name="arrow-down" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;margin-top:18px" @select="areaSelect(e)"></u-icon>
             </div>
           </AiAreaPicker>
+          <u-icon name="close-circle" v-if="areaId" @click="clearArea" color="#999" size="24"></u-icon>
         </div>
         <div class="right">
           <AiSelect dict="helpDeclarationReason" v-model="declareReason">
             <span v-if="!declareReason" style="color: #999;">风险类型</span>
             <span v-else>{{ $dict.getLabel('helpDeclarationReason', declareReason) }}</span>
             <u-icon name="arrow-down" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;"></u-icon>
-            <u-icon name="close-circle" v-if="declareReason" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;"></u-icon>
           </AiSelect>
+          <u-icon name="close-circle" v-if="declareReason" @click="clearReason" color="#999" size="24"></u-icon>
+          <!-- style="margin-left: 4px;width: 14px; display:inline-block;" -->
         </div>
       </div>
     </AiTopFixed>
@@ -52,18 +52,22 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
 export default {
   data() {
     return {
       tabs: ['全部待办','办理历史'],
       tabIndex: 0,
-      list: [],
       current: 1,
       areaId: '',
       areaName: '',
       declareReason: '',
+      list: [],
     }
   },
+  computed: {
+    ...mapState(['user'])
+  },
   onShow() {
     this.$dict.load('helpDeclarationStatus').then(() => {
       uni.$on('update', () => {
@@ -80,12 +84,35 @@ export default {
       this.getList()
     },
 
+    areaSelect(e) {
+      console.log(e);
+      this.areaId =e
+      this.$nextTick(() => {
+        this.getList()
+      })
+    },
+
+    clearArea() {
+      this.areaId = '',
+      this.areaName = '',
+      this.current = 1,
+      this.list = [],
+      this.getList()
+    },
+
+    clearReason() {
+      this.declareReason = '',
+      this.current = 1,
+      this.list = [],
+      this.getList()
+    },
+
     getList() {
       this.$http.post('/app/apphelpdeclarationinfo/listByEw',null,{
         params: {
           current: this.current,
-          areaId: this.areaId,
           searchType: this.tabIndex,
+          areaId: this.areaId,
           declareReason: this.declareReason  // 风险类型
         }
       }).then((res) => {
@@ -116,6 +143,9 @@ export default {
   ::v-deep .AiTopFixed .content {
     padding: 0;
   }
+  ::v-deep .AiSelect .display{
+    justify-content: center;
+  }
 
   .tab-select {
     width: 100%;
@@ -159,6 +189,14 @@ export default {
       flex: 1;
       text-align: center !important;
       font-size: 28px;
+
+      ::v-deep .u-icon .uicon-close-circle{
+        top: -96px !important;
+        left: 80px;
+        margin-left: 30px;
+        width: 14px;
+        display:inline-block;
+      }
     }
   }
 

src/apps/AppHelpDeclaration/result.vue

@@ -9,7 +9,7 @@
       </div>
       <div class="right">
         <div style="display: flex" v-if="status == 1">
-          <AiPagePicker type="party" @select="handlePartySelect" single :isFourParty="true">
+          <AiPagePicker type="sysUser" @select="handlePartySelect" single :isFourParty="true">
             <AiMore v-model="doUsername" placeholder="请选择"/>
           </AiPagePicker>
         </div>
@@ -47,7 +47,6 @@
 export default {
   data() {
     return {
-      // operation: '',
       description: '',
       status: '',
       files: [],

src/components/pages/selectSysUser.vue

@@ -58,9 +58,10 @@ export default {
   },
   methods: {
     getList() {
-      let {current, total, name: con} = this
+      let {current, total, name: con, $route: {query: {action}}} = this
       if (total == 0 || current <= total) {
-        this.$http.post(`/admin/user/userIntegralList`, null, {
+        action = decodeURIComponent(action)
+        this.$http.post(action || `/admin/user/userIntegralList`, null, {
           params: {current, size: 20, con}
         }).then(res => {
           if (res?.data) {