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

src/apps/AppWalkask/AppWalkask.vue

@@ -133,8 +133,8 @@
 <script>
 import { mapState } from 'vuex'
 import AiEmpty from '../../components/AiEmpty.vue'
-import add from './components/add.vue'
-import detail from './components/detail.vue'
+import add from './add.vue'
+import detail from './detail.vue'
 import AiAreaPicker from '../../components/AiAreaPicker.vue'
 
 export default {

src/apps/AppWalkask/add.vue

@@ -9,9 +9,9 @@
             <ai-area-picker v-model="forms.areaId" ref="areaIds" :areaId="areaIdProps" @select="areaSelect" style="color: #333"> </ai-area-picker>
           </u-form-item>
 
-          <u-form-item label="走访对象" prop="applicationId" required style="position: relative">
-            <u-input v-model="forms.applicationId" disabled placeholder="请选择走访对象" @click="toWalkObject" />
-            <!-- @click="showObject = true" -->
+          <u-form-item label="走访对象" prop="application" required style="position: relative">
+            <u-input v-model="forms.application" disabled placeholder="请选择走访对象" @click="handerSelecUser" />
+            <!-- @click="showObject = true" @click="toWalkObject" -->
 
             <u-select v-model="showObject" :list="Objectlist" @confirm="applicaStatus"></u-select>
 
@@ -54,10 +54,10 @@
 
 <script>
 import { mapState } from 'vuex'
-import AiUploader from '../../../components/AiUploader.vue'
-import AiBack from '../../../components/AiBack.vue'
-import walkObject from './walkObject.vue'
-import AiAreaPicker from '../../../components/AiAreaPicker'
+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',
@@ -70,7 +70,7 @@ export default {
       },
       forms: {
         areaId: '',
-        applicationId: '',
+        application: '',
         reality: '',
         realityValue: '',
         title: '',
@@ -89,6 +89,7 @@ export default {
       flag: false,
       addList: true,
       areaIdProps: '',
+      clickedUserSelect: false,
     }
   },
   computed: { ...mapState(['user']) },
@@ -98,13 +99,34 @@ export default {
   },
   mounted() {},
   methods: {
+    ...mapActions(['selectEnterpriseContact']),
+
+    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
 
       this.$refs.uForm.validate((valid) => {
         if (valid) {
-          if (!this.forms.applicationId) {
+          if (!this.forms.application) {
             return this.$u.toast('请选择走访对象')
           }
           if (!this.forms.title) {
@@ -125,7 +147,7 @@ export default {
           this.$instance
             .post(`/appjobresume/addOrUpdate`, {
               areaId: this.forms.areaId,
-              applicationId: '8883942d30aa4b76b33de1660d4870e4',
+              applicationId: '',
               // object: this.forms.object,
               reality: this.forms.reality == Number ? this.forms.reality : this.forms.realitylabel,
               title: this.forms.title,
@@ -191,6 +213,7 @@ export default {
     ::v-deep .u-form {
       .u-form-item {
         margin-bottom: 16px;
+        // padding-bottom: 10px !important;
         .u-form-item__body {
           // .u-form-item--right {
           //   .u-form-item--right__content {

src/apps/AppWalkask/components/walkObject.vue

@@ -1,155 +0,0 @@
-<template>
-  <div class="walkObject">
-    <u-navbar title="选择走访慰问对象" back-icon-color="#fff" title-color="#fff" title-width="300" title-size="36" :border-bottom="false" :background="backgroundNavbar"> </u-navbar>
-
-    <div class="header-top">
-      <u-search v-model="keyword" placeholder="搜索" :show-action="false" bg-color="#F5F5F5" search-icon-color="#CCCCCC" placeholder-color="#999999" @search="handerSearch" @clear="handerClear"></u-search>
-    </div>
-
-    <div class="header-middle">
-      <div class="hint">可选范围</div>
-
-      <div class="empty-div"></div>
-
-      <div class="Checkbox">
-        <u-checkbox-group :wrap="true" @change="checkboxGroupChange">
-          <u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list" shape="circle" :key="index" :name="item.name">
-            <img src="./images/user.png" alt="" style="width: 36px; height: 36px; border-radius: 8px; vertical-align: middle; margin: 0 18px 0 17px" />
-            <span>{{ item.name }}</span>
-
-            <u-icon name="arrow-right" color="#ccc" style="position: absolute; right: 0; top: 20px"></u-icon>
-          </u-checkbox>
-        </u-checkbox-group>
-      </div>
-    </div>
-
-    <div class="fixedBtn">
-      <div class="typeName">
-        <span class="typeName-box" v-for="(item, index) in list" :key="index" v-if="item.checked == true">
-          {{ item.name }}
-        </span>
-      </div>
-
-      <div class="subBtn" @click="submit">确定选择</div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'walkObject',
-  components: {},
-  props: {},
-  data() {
-    return {
-      backgroundNavbar: {
-        backgroundColor: '#3975C6',
-      },
-      keyword: '',
-      list: [
-        {
-          name: '残疾人',
-        },
-        {
-          name: '精神病患者',
-        },
-        {
-          name: '吸毒人员',
-        },
-      ],
-      nameList: [],
-    }
-  },
-  computed: {},
-  created() {},
-  mounted() {},
-  methods: {
-    checkboxGroupChange(e) {
-      console.log(1, e)
-      e.map((item) => {
-        console.log(item)
-      })
-      // list.map((item) => {
-      //   if (item.checked == true) {
-      //     var obj = { name: item.name }
-      //     this.nameList.push(obj)
-      //   }
-      // })
-    },
-
-    checkboxChange(e) {
-      console.log(2, e)
-    },
-
-    submit() {},
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-.walkObject {
-  background: #ffffff;
-  padding-bottom: 118px;
-  .header-top {
-    background: #fff;
-    padding: 20px 32px;
-  }
-
-  .header-middle {
-    .hint {
-      padding: 0 20px 0 32px;
-      height: 112px;
-      line-height: 112px;
-      box-shadow: 0px 1px 0px 0px #e4e5e6;
-      font-size: 30px;
-      font-weight: 500;
-    }
-    .empty-div {
-      height: 16px;
-      background: #f5f5f5;
-    }
-    .Checkbox {
-      padding: 0 20px 0 30px;
-      ::v-deep .u-checkbox-group {
-        .u-checkbox {
-          position: relative;
-          height: 112px;
-        }
-      }
-    }
-  }
-
-  .fixedBtn {
-    display: flex;
-    justify-content: space-between;
-    position: fixed;
-    bottom: 0;
-    width: 100%;
-    box-sizing: border-box;
-    padding: 0 32px;
-    .subBtn {
-      margin: 20px 0 18px 0;
-      padding: 18px 32px;
-      background: #1365dd;
-      border-radius: 4px;
-      font-size: 32px;
-      color: #ffffff;
-    }
-    .typeName {
-      // margin: 48px 0 44px 0;
-      margin: 36px 0 22px 0;
-      .typeName-box {
-        padding: 16px 14px;
-        background: #eaeef1;
-        border-radius: 8px;
-        font-size: 30px;
-        font-weight: 500;
-        margin-left: 10px;
-      }
-      .typeName-box:first-child {
-        margin-left: 0;
-      }
-    }
-  }
-}
-</style>

src/apps/AppWalkask/detail.vue

@@ -30,10 +30,10 @@
       <div class="hint-con">本次议事会通过“7步议事法”即收集意见、确认议题、制定方案、发布公告、组织协商、结果运用、反馈公示的模拟方式，进行协商讨论，并教授议事会成员自如运用议事措施开展后续落地计划的学习性和功能性会议。 组织协商、结果运用、反馈公示的模拟方式，进行协商讨论，并教授议事会成员自如运用议事措施开展后续落地计划的线上学习性和功能性会议。作为基层民主自治的新亮点，已经全面铺开的互联网+“议事大厅”使得三联村成功走出了一条集思广益、民主决策和村民自治的新路子。</div>
 
       <div class="imgs">
-        <img src="../components/images/天使彦5.jpg" alt="" />
-        <img src="../components/images/天使彦5.jpg" alt="" />
-        <img src="../components/images/天使彦5.jpg" alt="" />
-        <img src="../components/images/天使彦5.jpg" alt="" />
+        <img src="./components/images/天使彦5.jpg" alt="" />
+        <img src="./components/images/天使彦5.jpg" alt="" />
+        <img src="./components/images/天使彦5.jpg" alt="" />
+        <img src="./components/images/天使彦5.jpg" alt="" />
       </div>
     </div>
 
@@ -42,7 +42,7 @@
 </template>
 
 <script>
-import AiBack from '../../../components/AiBack.vue'
+import AiBack from '../../components/AiBack.vue'
 
 export default {
   name: 'detail',