Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppWalkask/AppWalkask.vue

@@ -13,7 +13,7 @@
             <div class="left">
               <img src="./components/images/icon2.png" alt="" />
 
-              <ai-area-picker v-model="areaId" ref="areaIds" :areaId="areaId" @select="areaSelect" style="color: #fff"> </ai-area-picker>
+              <AiAreaPicker v-model="areaId" ref="areaIds" :areaId="areaId" @select="areaSelect" style="color: #fff"> </AiAreaPicker>
 
               <!-- <div class="btns" style="display: inline-block" @click="show = true">
                 <u-icon name="arrow-down"></u-icon>
@@ -58,7 +58,7 @@
           </div>
 
           <div v-else>
-            <ai-empty description="您还未添加过入户调查走访" class="emptyWrap"> </ai-empty>
+            <AiEmpty description="您还未添加过入户调查走访" class="emptyWrap"> </AiEmpty>
 
             <div class="addBtn">点击<span class="toAdd" @click="toAdd">新增按钮</span>试试试吧~</div>
           </div>
@@ -69,7 +69,7 @@
             <div class="left">
               <img src="./components/images/icon2.png" alt="" />
 
-              <ai-area-picker v-model="areaId" ref="areaIds" :areaId="areaId" @select="areaSelect" style="color: #fff"> </ai-area-picker>
+              <AiAreaPicker v-model="areaId" ref="areaIds" :areaId="areaId" @select="areaSelect" style="color: #fff"> </AiAreaPicker>
 
               <!-- <div class="btns" style="display: inline-block" @click="show = true">
                 <u-icon name="arrow-down"></u-icon>
@@ -114,7 +114,7 @@
           </div>
 
           <div v-else>
-            <ai-empty description="您还未添加过入户调查走访" class="emptyWrap"> </ai-empty>
+            <AiEmpty description="您还未添加过入户调查走访" class="emptyWrap"> </AiEmpty>
 
             <div class="addBtn">点击<span class="toAdd" @click="toAdd">新增按钮</span>试试试吧~</div>
           </div>
@@ -132,15 +132,16 @@
 
 <script>
 import { mapState } from 'vuex'
-import AiEmpty from '../../components/AiEmpty.vue'
 import add from './add.vue'
 import detail from './detail.vue'
-import AiAreaPicker from '../../components/AiAreaPicker.vue'
 
 export default {
   name: 'AppWalkask',
   appName: '走访慰问',
-  components: { AiEmpty, add, detail, AiAreaPicker },
+  components: {
+    add,
+    detail,
+  },
   props: {},
   data() {
     return {

src/apps/AppWalkask/add.vue

@@ -6,7 +6,7 @@
       <div class="header-description">
         <u-form :model="forms" ref="uForm" label-width="auto">
           <u-form-item label="区域选择" prop="areaId" style="position: relative">
-            <ai-area-picker v-model="forms.areaId" ref="areaIds" :areaId="areaIdProps" @select="areaSelect" style="color: #333"> </ai-area-picker>
+            <AiAreaPicker v-model="forms.areaId" ref="areaIds" :areaId="areaIdProps" @select="areaSelect" style="color: #333"> </AiAreaPicker>
           </u-form-item>
 
           <u-form-item label="走访对象" prop="application" required style="position: relative">
@@ -38,7 +38,7 @@
           </u-form-item>
 
           <u-form-item label="图片(最多9张)" prop="images" class="avatars" required label-position="top">
-            <ai-uploader :def.sync="forms.images" multiple @list="change" placeholder="上传图片" :limit="9"></ai-uploader>
+            <AiUploader :def.sync="forms.images" multiple @list="change" placeholder="上传图片" :limit="9"></AiUploader>
           </u-form-item>
         </u-form>
       </div>
@@ -55,13 +55,11 @@
 <script>
 import { mapState } from 'vuex'
 import { mapActions } from 'vuex'
-import AiUploader from '../../components/AiUploader.vue'
-import AiBack from '../../components/AiBack.vue'
-import AiAreaPicker from '../../components/AiAreaPicker'
 
 export default {
   name: 'add',
-  components: { AiUploader, AiBack, walkObject, AiAreaPicker },
+  components: {
+  },
   props: {},
   data() {
     return {
@@ -99,27 +97,34 @@ export default {
   },
   mounted() {},
   methods: {
-    ...mapActions(['selectEnterpriseContact']),
+    // ...mapActions(['selectEnterpriseContact']),
-
     handerSelecUser() {
-      console.log(this.clickedUserSelect)
+      this.$http.post('/app/appapplicationinfo/queryApplicationListByType?type=0').then((res) => {
-      if (this.clickedUserSelect) return this.$u.toast('正在打开人员选择器')
+        if (res.code == 0) {
-
+          // this.data = res.data.records
-      this.clickedUserSelect = true
+        }
-      this.selectEnterpriseContact({
-        fromDepartmentId: 0,
-        type: ['user'],
-        optionId: this.forms.application?.map((e) => e.id),
-      })
-        .then((res) => {
-          // this.change(res?.userList || [])
-          this.clickedUserSelect = false
-        })
-        .catch(() => {
-          this.clickedUserSelect = false
       })
     },
 
+    // handerSelecUser() {
+    //   console.log(this.clickedUserSelect)
+    //   if (this.clickedUserSelect) return this.$u.toast('正在打开人员选择器')
+
+    //   this.clickedUserSelect = true
+    //   this.selectEnterpriseContact({
+    //     fromDepartmentId: 0,
+    //     type: ['user'],
+    //     optionId: this.forms.application?.map((e) => e.id),
+    //   })
+    //     .then((res) => {
+    //       this.change(res?.userList || [])
+    //       this.clickedUserSelect = false
+    //     })
+    //     .catch(() => {
+    //       this.clickedUserSelect = false
+    //     })
+    // },
+
     submit() {
       console.log(1)
       if (this.flag) return
@@ -192,11 +197,11 @@ export default {
       this.forms.realityValue = e[0].value
     },
 
-    toWalkObject() {
+    // toWalkObject() {
-      this.addList = false
+    //   this.addList = false
-      this.comp = 'walkObject'
+    //   this.comp = 'walkObject'
-      this.params = 111
+    //   this.params = 111
-    },
+    // },
 
     change(e) {
       console.log(e)

src/apps/AppWalkask/detail.vue

@@ -42,23 +42,34 @@
 </template>
 
 <script>
-import AiBack from '../../components/AiBack.vue'
 
 export default {
   name: 'detail',
-  components: { AiBack },
+  components: {
+  },
   props: {},
   data() {
     return {
+      data: {},
       backgroundNavbar: {
         backgroundColor: '#3975C6',
       },
     }
   },
   computed: {},
-  created() {},
+  created() {
+    this.getDetail()
+  },
   mounted() {},
-  methods: {},
+  methods: {
+    getDetail() {
+      this.$instance.post(`apppolicypromotion/queryDetailByIdWeChat?id=${this.id}`).then((res) => {
+        if (res?.data) {
+          this.data = res.data
+        }
+      })
+    },
+  },
 }
 </script>