From b70dba71448b030e070ddf81f8b5279b2394b15c Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 20 Dec 2021 15:48:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=BF=E6=B0=91=E9=80=9A=E8=AE=AF=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Add.vue                        | 42 ++++++--------
 .../components/List.vue                       | 56 ++++++++++++-------
 .../AppVillageActivity/components/Add.vue     |  2 +-
 .../AppVillageActivity/components/Detail.vue  |  2 +-
 4 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue b/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue
index 98ef7391..605f5f42 100644
--- a/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue
+++ b/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue
@@ -7,27 +7,23 @@
     <template slot="content">
       <ai-card title="基本信息">
         <template #content>
-          <el-form ref="form" :model="form" label-width="110px" label-position="right">
+          <el-form ref="form" class="ai-form" :model="form" label-width="110px" label-position="right">
             <el-form-item label="地区" style="width: 100%;" prop="codeName">
               <span style="color: #666;">{{ form.areaName }}</span>
             </el-form-item>
-            <el-form-item label="名称" prop="codeName" :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]">
-              <el-input size="small" placeholder="请输入名称" v-model="form.codeName"></el-input>
+            <el-form-item style="width: 100%" label="名称" prop="name" :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]">
+              <el-input size="small" placeholder="请输入名称" v-model="form.name"></el-input>
             </el-form-item>
-            <el-form-item label="类型" prop="type" :rules="[{ required: true, message: '请选择类型', trigger: 'change' }]">
-              <ai-select
-                v-model="form.type"
-                :selectList="dict.getDict('homeConfigMenuType')"
-                laceholder="请选择类型">
-              </ai-select>
+            <el-form-item style="width: 100%" label="类型" prop="type" :rules="[{ required: true, message: '请输入类型', trigger: 'change' }]">
+              <el-input size="small" placeholder="请输入类型" v-model="form.type"></el-input>
             </el-form-item>
-            <el-form-item label="电话" prop="codeName" :rules="[{ required: true, message: '请输入电话', trigger: 'blur' }]">
-              <el-input size="small" placeholder="请输入电话" maxlength="20" v-model="form.codeName"></el-input>
+            <el-form-item style="width: 100%" label="电话" prop="phone" :rules="[{ required: true, message: '请输入电话', trigger: 'blur' }]">
+              <el-input size="small" placeholder="请输入电话" maxlength="20" v-model="form.phone"></el-input>
             </el-form-item>
-            <el-form-item style="width: 100%;" label="是否公开" prop="type" :rules="[{ required: true, message: '请选择是否公开', trigger: 'change' }]">
-              <el-radio-group v-model="form.type">
-                <el-radio label="0">否</el-radio>
+            <el-form-item style="width: 100%;" label="是否公开" prop="isPublic" :rules="[{ required: true, message: '请选择是否公开', trigger: 'change' }]">
+              <el-radio-group v-model="form.isPublic">
                 <el-radio label="1">是</el-radio>
+                <el-radio label="0">否</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-form>
@@ -56,10 +52,10 @@
         info: {},
         form: {
           areaId: '',
-          codeName: '',
+          name: '',
           areaName: '',
-          code: '',
-          codeUrl: [],
+          phone: '',
+          isPublic: '1',
           type: '',
         },
         id: '',
@@ -68,9 +64,6 @@
     },
 
     created () {
-      this.dict.load('homeConfigMenuType').then(() => {
-
-      })
       this.getAreaList()
 
       if (this.params && this.params.areaId && !this.params.id) {
@@ -86,12 +79,9 @@
 
     methods: {
       getInfo (id) {
-        this.instance.post(`/app/appeveryvillagecode/queryDetailById?id=${id}`).then(res => {
+        this.instance.post(`/app/appconvenientaddressbook/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
             this.form = res.data
-            this.form.codeUrl = [{
-              url: res.data.codeUrl
-            }]
           }
         })
       },
@@ -116,9 +106,9 @@
       confirm () {
         this.$refs.form.validate((valid) => {
           if (valid) {
-            this.instance.post(`/app/appeveryvillagecode/addOrUpdate`, {
+            this.instance.post(`/app/appconvenientaddressbook/addOrUpdate`, {
               ...this.form,
-              codeUrl: this.form.codeUrl[0].url
+              id: this.params.id || ''
             }).then(res => {
               if (res.code == 0) {
                 this.$message.success('提交成功')
diff --git a/packages/3.0.0/AppConvenienceAddressBook/components/List.vue b/packages/3.0.0/AppConvenienceAddressBook/components/List.vue
index 6065def1..e59879c2 100644
--- a/packages/3.0.0/AppConvenienceAddressBook/components/List.vue
+++ b/packages/3.0.0/AppConvenienceAddressBook/components/List.vue
@@ -38,6 +38,19 @@
         <template #left>
           <el-button size="small" type="primary" :disabled="isShowAdd" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
         </template>
+        <template slot="right">
+          <el-input
+            v-model="search.name"
+            class="search-input"
+            size="small"
+            @keyup.enter.native="search.current = 1, getList()"
+            placeholder="请输入名称/电话"
+            clearable
+            @change="getList"
+            @clear="search.current = 1, search.name = '', getList()"
+            suffix-icon="iconfont iconSearch">
+          </el-input>
+        </template>
       </ai-search-bar>
       <ai-table
         :tableData="tableData"
@@ -47,27 +60,19 @@
         :current.sync="search.current"
         :size.sync="search.size"
         @getList="getList">
-        <el-table-column slot="tags" label="标签">
+        <el-table-column slot="isPublic" label="标签">
           <template slot-scope="{ row }">
-            <div class="table-tags">
-              <el-tag type="info" v-for="(item, index) in row.tags" size="small" :key="index">{{ item }}</el-tag>
-            </div>
+            <el-switch
+              v-model="row.isPublic"
+              active-value="1"
+              @change="e => onChange(row.id, e)"
+              inactive-value="0">
+            </el-switch>
           </template>
         </el-table-column>
         <el-table-column slot="options" width="180px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
-              <el-popover
-                  placement="bottom"
-                  width="160"
-                  :visible-arrow="false"
-                  popper-class="wechat-message__container"
-                  trigger="hover">
-                <el-button type="text" slot="reference">二维码</el-button>
-                <div style="font-size: 0;">
-                  <img class="message-info__img" :src="row.codeUrl">
-                </div>
-              </el-popover>
               <el-button type="text" @click="toAdd(row.id)">编辑</el-button>
               <el-button type="text" @click="remove(row.id)">删除</el-button>
             </div>
@@ -93,8 +98,7 @@
         search: {
           current: 1,
           size: 10,
-          status: 0,
-          title: '',
+          name: '',
           areaId: ''
         },
         defaultExpanded: [],
@@ -108,10 +112,11 @@
         areaList: [],
         total: 10,
         colConfigs: [
-          {prop: 'codeName', label: '名称', align: 'left'},
-          {prop: 'type', label: '二维码类型', align: 'left', formart: v => v === '0' ? '群二维码' : '个人二维码'},
-          {prop: 'createUserName', label: '创建人'},
+          {prop: 'name', label: '名称', align: 'left'},
+          {prop: 'type', label: '类型', align: 'center'},
+          {prop: 'phone', label: '联系方式', align: 'center'},
           {prop: 'createTime', label: '创建时间'},
+          {slot: 'isPublic', label: '是否公开'},
           {slot: 'options', label: '操作'}
         ],
         areaName: '',
@@ -149,7 +154,7 @@
 
     methods: {
       getList() {
-        this.instance.post(`/app/appeveryvillagecode/list`, null, {
+        this.instance.post(`/app/appconvenientaddressbook/list`, null, {
           params: {
             ...this.search
           }
@@ -161,6 +166,15 @@
         })
       },
 
+      onChange (id) {
+        this.instance.post(`/app/appconvenientaddressbook/enable?id=${id}`).then(res => {
+          if (res.code == 0) {
+            this.$message.success('修改成功')
+            this.getList()
+          }
+        })
+      },
+
       filterNode(value, data) {
         if (!value) return true
         return data.name.indexOf(value) !== -1
diff --git a/packages/3.0.0/AppVillageActivity/components/Add.vue b/packages/3.0.0/AppVillageActivity/components/Add.vue
index 1e1536ac..2665f271 100644
--- a/packages/3.0.0/AppVillageActivity/components/Add.vue
+++ b/packages/3.0.0/AppVillageActivity/components/Add.vue
@@ -46,7 +46,7 @@
             <el-form-item label="活动介绍" style="width: 100%;" prop="content" :rules="[{required: true, message: '请输入内容', trigger: 'change'}]">
               <ai-editor v-model="form.content" :instance="instance"/>
             </el-form-item>
-            <el-form-item label="缩略图" style="width: 100%;" prop="url">
+            <el-form-item label="缩略图" style="width: 100%;" prop="url" :rules="[{required: true, message: '请上传缩略图', trigger: 'blur'}]">
               <ai-uploader
                 :instance="instance"
                 isShowTip
diff --git a/packages/3.0.0/AppVillageActivity/components/Detail.vue b/packages/3.0.0/AppVillageActivity/components/Detail.vue
index ca4645d2..ec04b791 100644
--- a/packages/3.0.0/AppVillageActivity/components/Detail.vue
+++ b/packages/3.0.0/AppVillageActivity/components/Detail.vue
@@ -82,8 +82,8 @@
         currIndex: 0,
         tableData: [],
         colConfigs: [
-          {prop: 'createTime', label: '报名时间', align: 'center'},
           {prop: 'name', label: '报名人员名称', align: 'center' },
+          {prop: 'createTime', label: '报名时间', align: 'center'},
           {prop: 'phone', label: '联系方式', align: 'center' }
         ],
         tabList: ['基本信息', '报名情况', '活动动态']