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

src/apps/AppWalkask/AppWalkask.vue

@@ -166,6 +166,8 @@ export default {
             size: 6,
             current: this.current,
             areaId: this.areaId,
+            createUserId: this.currentTabs == 1 ? this.user.id : '',
+            title: this.keyword,
           },
         })
         .then((res) => {
@@ -192,7 +194,10 @@ export default {
     },
 
     change(index) {
+      this.areaId = this.user.areaId
+      this.keyword = ''
       this.currentTabs = index
+      this.getList()
     },
 
     goDetail(item, hint) {
@@ -225,11 +230,13 @@ export default {
     handerSearch(e) {
       this.keyword = e
       this.current = 1
+      this.getList()
     },
 
     handerClear() {
       this.keyword = ''
       this.current = 1
+      this.getList()
     },
 
     previewImage(images, img) {

src/apps/AppWalkask/add.vue

@@ -9,19 +9,15 @@
             <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">
-            <u-input v-model="forms.application" disabled placeholder="请选择走访对象" @click="toWalkObject" />
-            <!-- @click="showObject = true" @click="toWalkObject" -->
-
-            <!-- <u-select v-model="showObject" :list="Objectlist" @confirm="applicaStatus"></u-select> -->
+          <u-form-item label="走访对象" prop="create_user_name" required style="position: relative">
+            <u-input v-model="forms.create_user_name" disabled placeholder="请选择走访对象" @click="toWalkObject" />
 
             <u-icon name="arrow-right" color="#CCCCCC" style="position: absolute; top: 25px; right: 30px"></u-icon>
           </u-form-item>
 
           <u-form-item label="现实状态" prop="reality" style="position: relative">
-            <u-input v-model="forms.reality" disabled placeholder="请选择走访对象" @click="showStstus = true" />
+            <u-input v-model="forms.reality" disabled placeholder="请选择走访慰问对象" @click="showStstus = true" />
 
-            <!-- :disabled="!forms.object" -->
             <u-select v-model="showStstus" :list="$dict.getDict('realityStatus')" value-name="dictValue" label-name="dictName" @confirm="realityStstus"></u-select>
 
             <u-icon name="arrow-right" color="#CCCCCC" style="position: absolute; top: 25px; right: 30px"></u-icon>
@@ -48,7 +44,7 @@
       <AiBack></AiBack>
     </div>
 
-    <component v-else :is="comp" :params="params"></component>
+    <component v-else :is="comp" :paramss="params" @back="backlist"></component>
   </div>
 </template>
 
@@ -72,7 +68,8 @@ export default {
       show: false,
       forms: {
         areaId: '',
-        application: '',
+        optionId: '',
+        create_user_name: '',
         reality: '',
         realityValue: '',
         title: '',
@@ -80,7 +77,6 @@ export default {
         images: [],
       },
       showAreaId: false,
-      showObject: false,
       showStstus: false,
       flag: false,
       addList: true,
@@ -95,11 +91,7 @@ export default {
       this.getDetail()
     })
   },
-  mounted() {
-    this.$on('black', (data) => {
-      console.log(data)
-    })
-  },
+  mounted() {},
   methods: {
     getDetail() {
       this.$http.post(`/app/appvisitvondolence/queryDetailById?id=${this.params.id}`).then((res) => {
@@ -107,7 +99,6 @@ export default {
           this.forms = res.data
           this.forms.realityValue = res.data.reality
           this.forms.reality = this.$dict.getLabel('realityStatus', res.data.reality)
-
           if (res.data.images) {
             this.forms.images = JSON.parse(res.data.images || '[]')
           }
@@ -121,9 +112,9 @@ export default {
 
       this.$refs.uForm.validate((valid) => {
         if (valid) {
-          // if (!this.forms.application) {
-          //   return this.$u.toast('请选择走访对象')
-          // }
+          if (!this.forms.create_user_name) {
+            return this.$u.toast('请选择走访慰问对象')
+          }
           if (!this.forms.title) {
             return this.$u.toast('请输入入户走访事项')
           }
@@ -140,8 +131,9 @@ export default {
           this.$http
             .post(`/app/appvisitvondolence/addOrUpdate`, {
               areaId: this.forms.areaId,
-              applicationId: '02fcf19c81154f6ea9560d9a9deee9f4',
-              optionId: '4703806718f842a98a28df554c6aa6b2',
+              applicationId: this.forms.applicationId,
+              name: this.forms.create_user_name,
+              optionId: this.forms.applicationId,
               reality: this.forms.realityValue ? this.forms.realityValue : this.forms.reality,
               title: this.forms.title,
               description: this.forms.description,
@@ -174,6 +166,14 @@ export default {
       }
     },
 
+    backlist(e) {
+      console.log(e.item)
+      this.forms.create_user_name = e.item.create_user_name
+      this.forms.applicationId = e.appId
+      this.forms.optionId = e.item.id
+      this.addList = true
+    },
+
     realityStstus(e) {
       this.forms.reality = e[0].label
       this.forms.realityValue = e[0].value
@@ -182,7 +182,7 @@ export default {
     toWalkObject() {
       this.addList = false
       this.comp = 'walkObject'
-      this.params = 111
+      this.paramss = 111
     },
   },
 }

src/apps/AppWalkask/walkObject.vue

@@ -15,9 +15,15 @@
         <div v-if="DiyList.length > 0">
           <u-collapse event-type="close" arrowaccordion>
             <u-collapse-item v-for="(item, index) in DiyList" :title="item.menuLevel2Name" :key="index" @change="selectUser(item)">
-              <u-checkbox-group @change="checkboxGroupChange">
-                <u-checkbox @change="checkboxChange" v-model="e.checked" v-for="(e, index) in userList" :key="index" :name="e.create_user_name" shape="circle">{{ e.name00 }}</u-checkbox>
-              </u-checkbox-group>
+              <u-radio-group v-model="value">
+                <u-radio v-for="(item, index) in userList" :key="index" :name="item.create_user_name">
+                  {{ item.create_user_name }}
+                </u-radio>
+              </u-radio-group>
+
+              <!-- <u-checkbox-group>
+                <u-checkbox v-model="e.checked" v-for="(e, index) in userList" :key="index" :name="e.create_user_name" shape="circle">{{ e.create_user_name }}</u-checkbox>
+              </u-checkbox-group> -->
             </u-collapse-item>
           </u-collapse>
         </div>
@@ -64,6 +70,8 @@ export default {
       ],
       nameList: [],
       current: 1,
+      appId: '',
+      value: '',
     }
   },
   computed: {},
@@ -81,7 +89,8 @@ export default {
     },
 
     selectUser(item) {
-      console.log(item)
+      console.log(item.id)
+      this.appId = item.id
       this.$http.post(`/app/appapplicationinfo/list?appId=${item.id}&current=${this.current}&size=${99}`, { searchParam: this.keyword }).then((res) => {
         if (res.code == 0) {
           this.userList = res.data.records
@@ -89,19 +98,10 @@ export default {
       })
     },
 
-    checkboxGroupChange(a) {
-      console.log(a)
-    },
-
-    checkboxChange(e) {
-      console.log(e)
-    },
-
     submit() {
       this.userList.map((item) => {
-        if (item.checked == true) {
-          console.log(11, 'back', 'item')
-          this.$emit('back', item)
+        if (item.create_user_name == this.value) {
+          this.$emit('back', { item: item, appId: this.appId })
         }
       })
     },
@@ -134,19 +134,15 @@ export default {
     }
     .Checkbox {
       padding: 0 20px 0 30px;
-      ::v-deep .u-checkbox-group {
-        .u-checkbox {
-          // position: relative;
-          height: 112px;
-        }
-      }
+
       ::v-deep .u-collapse {
         .u-collapse-item {
           .u-collapse-body {
-            display: inline;
-            .u-checkbox-group {
-              display: flex;
-              flex-direction: column;
+            // display: inline;
+            .u-radio-group {
+              .u-radio {
+                line-height: 0;
+              }
             }
           }
         }
@@ -171,7 +167,6 @@ export default {
       color: #ffffff;
     }
     .typeName {
-      // margin: 48px 0 44px 0;
       margin: 36px 0 22px 0;
       .typeName-box {
         padding: 16px 14px;