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

packages/publicity/AppVillageIntroduction/AppVillageIntroduction.vue

@@ -1,73 +1,71 @@
 <template>
   <div class="doc-circulation ailist-wrapper">
     <keep-alive :include="['List']">
-      <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+      <component ref="component" :is="component" @change="onChange" :params="params" v-bind="$props"/>
     </keep-alive>
   </div>
 </template>
 
 <script>
-  import List from './components/List'
-  import Add from './components/Add'
-  import Detail from './components/Detail'
+import List from './components/List'
+import Add from './components/Add'
+import Detail from './components/Detail'
 
-  export default {
-    name: 'AppVillageIntroduction',
-    label: '本村简介',
+export default {
+  name: 'AppVillageIntroduction',
+  label: '本村简介',
+  props: {
+    instance: Function,
+    dict: Object,
+    menuName: {default: "本村简介"}
+  },
+  data() {
+    return {
+      component: 'List',
+      params: {},
+      include: []
+    }
+  },
+  components: {
+    Add,
+    List,
+    Detail
+  },
 
-    props: {
-      instance: Function,
-      dict: Object
-    },
+  mounted() {
+  },
 
-    data () {
-      return {
-        component: 'List',
-        params: {},
-        include: []
+  methods: {
+    onChange(data) {
+      if (data.type === 'Add') {
+        this.component = 'Add'
+        this.params = data.params
       }
-    },
 
-    components: {
-      Add,
-      List,
-      Detail
-    },
+      if (data.type === 'Detail') {
+        this.component = 'Detail'
+        this.params = data.params
+      }
 
-    mounted () {
-    },
+      if (data.type === 'list') {
+        this.component = 'List'
+        this.params = data.params
 
-    methods: {
-      onChange (data) {
-        if (data.type === 'Add') {
-          this.component = 'Add'
-          this.params = data.params
-        }
-
-        if (data.type === 'Detail') {
-          this.component = 'Detail'
-          this.params = data.params
-        }
-
-        if (data.type === 'list') {
-          this.component = 'List'
-          this.params = data.params
-
-          this.$nextTick(() => {
-            if (data.isRefresh) {
-              this.$refs.component.getList()
-            }
-          })
-        }
+        this.$nextTick(() => {
+          if (data.isRefresh) {
+            this.$refs.component.getList()
+          }
+        })
       }
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .doc-circulation {
-    height: 100%;
-    background: #F3F6F9;
-    overflow: auto;
-  }
+.doc-circulation {
+  height: 100%;
+  background: #F3F6F9;
+  overflow: auto;
+}
 </style>

packages/publicity/AppVillageIntroduction/components/Add.vue

@@ -1,7 +1,7 @@
 <template>
   <ai-detail>
     <template slot="title">
-      <ai-title :title="params.id ? '编辑本村简介' : '添加本村简介'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      <ai-title :title="pageTitle" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
       </ai-title>
     </template>
     <template slot="content">
@@ -19,12 +19,12 @@
             </el-form-item>
             <el-form-item label="缩略图" prop="thumbUrl">
               <ai-uploader
-                :instance="instance"
-                isShowTip
-                v-model="form.thumbUrl"
-                :limit="1"
-                :cropOps="cropOps"
-                is-crop>
+                  :instance="instance"
+                  isShowTip
+                  v-model="form.thumbUrl"
+                  :limit="1"
+                  :cropOps="cropOps"
+                  is-crop>
                 <template slot="tips">
                   <p>最多上传1张图片,单个文件最大10MB，支持jpg、jpeg、png格式</p>
                   <p>图片比例：1.6：1</p>
@@ -43,89 +43,91 @@
 </template>
 
 <script>
-  import { mapState } from 'vuex'
-  export default {
-    name: 'Add',
+import {mapState} from 'vuex'
 
-    props: {
-      instance: Function,
-      dict: Object,
-      params: Object
-    },
+export default {
+  name: 'Add',
 
-    data () {
-      return {
-        info: {},
-        form: {
-          title: '',
-          content: '',
-          areaId: '',
-          createUnitName: '',
-          createUserName: '',
-          status: '',
-          thumbUrl: []
-        },
-        cropOps: {
-          width: "336px",
-          height: "210px"
-        },
-        id: ''
-      }
-    },
+  props: {
+    instance: Function,
+    dict: Object,
+    params: Object,
+    menuName: String
+  },
 
-    computed: {
-      ...mapState(['user'])
-    },
-
-    created () {
-      this.form.areaId = this.user.info.areaId
-      this.disabledLevel = this.user.info.areaList.length
-      if (this.params && this.params.id) {
-        this.id = this.params.id
-        this.getInfo(this.params.id)
-      }
-    },
-
-    methods: {
-      getInfo (id) {
-        this.instance.post(`/app/appcountrysidetourism/queryDetailById?id=${id}`).then(res => {
-          if (res.code === 0) {
-            this.form = res.data
-            this.form.thumbUrl = res.data.thumbUrl ? JSON.parse(res.data.thumbUrl) : []
-          }
-        })
+  data() {
+    return {
+      info: {},
+      form: {
+        title: '',
+        content: '',
+        areaId: '',
+        createUnitName: '',
+        createUserName: '',
+        status: '',
+        thumbUrl: []
       },
-
-      confirm () {
-        this.$refs.form.validate((valid) => {
-          if (valid) {
-            this.instance.post(`/app/appcountrysidetourism/addOrUpdate`, {
-              ...this.form,
-              type: 0,
-              createUserName: this.user.info.name,
-              thumbUrl: this.form.thumbUrl.length ? JSON.stringify([{
-                url: this.form.thumbUrl[0].url
-              }]) : ''
-            }).then(res => {
-              if (res.code == 0) {
-                this.$message.success('提交成功')
-                setTimeout(() => {
-                  this.cancel(true)
-                }, 600)
-              }
-            })
-          }
-        })
+      cropOps: {
+        width: "336px",
+        height: "210px"
       },
+      id: ''
+    }
+  },
 
-      cancel (isRefresh) {
-        this.$emit('change', {
-          type: 'list',
-          isRefresh: !!isRefresh
-        })
-      }
+  computed: {
+    ...mapState(['user']),
+    pageTitle: v => `${!!v.params.id ? '编辑' : '添加'}${v.menuName}`
+  },
+  created() {
+    this.form.areaId = this.user.info.areaId
+    this.disabledLevel = this.user.info.areaList.length
+    if (this.params && this.params.id) {
+      this.id = this.params.id
+      this.getInfo(this.params.id)
+    }
+  },
+
+  methods: {
+    getInfo(id) {
+      this.instance.post(`/app/appcountrysidetourism/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.form = res.data
+          this.form.thumbUrl = res.data.thumbUrl ? JSON.parse(res.data.thumbUrl) : []
+        }
+      })
+    },
+
+    confirm() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.instance.post(`/app/appcountrysidetourism/addOrUpdate`, {
+            ...this.form,
+            type: 0,
+            createUserName: this.user.info.name,
+            thumbUrl: this.form.thumbUrl.length ? JSON.stringify([{
+              url: this.form.thumbUrl[0].url
+            }]) : ''
+          }).then(res => {
+            if (res.code == 0) {
+              this.$message.success('提交成功')
+              setTimeout(() => {
+                this.cancel(true)
+              }, 600)
+            }
+          })
+        }
+      })
+    },
+
+    cancel(isRefresh) {
+      this.$emit('change', {
+        type: 'list',
+        isRefresh: !!isRefresh
+      })
     }
   }
+}
 </script>
 
 <style scoped lang="scss">

packages/publicity/AppVillageIntroduction/components/List.vue

@@ -1,7 +1,7 @@
 <template>
   <ai-list class="notice">
     <template slot="title">
-      <ai-title title="本村简介" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance" @change="search.current = 1, getList()"></ai-title>
+      <ai-title :title="menuName" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance" @change="search.current = 1, getList()"></ai-title>
     </template>
     <template slot="content">
       <ai-search-bar class="search-bar">
@@ -57,9 +57,9 @@
 
     props: {
       instance: Function,
-      dict: Object
+      dict: Object,
+      menuName:String
     },
-
     data() {
       return {
         search: {

packages/publicity/AppVillageRegulations/AppVillageRegulations.vue

@@ -1,73 +1,74 @@
 <template>
   <div class="doc-circulation ailist-wrapper">
     <keep-alive :include="['List']">
-      <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+      <component ref="component" :is="component" @change="onChange" :params="params" v-bind="$props"/>
     </keep-alive>
   </div>
 </template>
 
 <script>
-  import List from './components/List'
-  import Add from './components/Add'
-  import Detail from './components/Detail'
+import List from './components/List'
+import Add from './components/Add'
+import Detail from './components/Detail'
 
-  export default {
-    name: 'AppVillageRegulations',
-    label: '村规民约',
+export default {
+  name: 'AppVillageRegulations',
+  label: '村规民约',
 
-    props: {
-      instance: Function,
-      dict: Object
-    },
+  props: {
+    instance: Function,
+    dict: Object,
+    menuName: {default: "村规民约"}
+  },
 
-    data () {
-      return {
-        component: 'List',
-        params: {},
-        include: []
+  data() {
+    return {
+      component: 'List',
+      params: {},
+      include: []
+    }
+  },
+
+  components: {
+    Add,
+    List,
+    Detail
+  },
+
+  mounted() {
+  },
+
+  methods: {
+    onChange(data) {
+      if (data.type === 'Add') {
+        this.component = 'Add'
+        this.params = data.params
       }
-    },
 
-    components: {
-      Add,
-      List,
-      Detail
-    },
+      if (data.type === 'Detail') {
+        this.component = 'Detail'
+        this.params = data.params
+      }
 
-    mounted () {
-    },
+      if (data.type === 'list') {
+        this.component = 'List'
+        this.params = data.params
 
-    methods: {
-      onChange (data) {
-        if (data.type === 'Add') {
-          this.component = 'Add'
-          this.params = data.params
-        }
-
-        if (data.type === 'Detail') {
-          this.component = 'Detail'
-          this.params = data.params
-        }
-
-        if (data.type === 'list') {
-          this.component = 'List'
-          this.params = data.params
-
-          this.$nextTick(() => {
-            if (data.isRefresh) {
-              this.$refs.component.getList()
-            }
-          })
-        }
+        this.$nextTick(() => {
+          if (data.isRefresh) {
+            this.$refs.component.getList()
+          }
+        })
       }
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .doc-circulation {
-    height: 100%;
-    background: #F3F6F9;
-    overflow: auto;
-  }
+.doc-circulation {
+  height: 100%;
+  background: #F3F6F9;
+  overflow: auto;
+}
 </style>

packages/publicity/AppVillageRegulations/components/Add.vue

@@ -1,7 +1,7 @@
 <template>
   <ai-detail>
     <template slot="title">
-      <ai-title :title="params.id ? '编辑村规民约' : '添加村规民约'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      <ai-title :title="pageTitle" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
       </ai-title>
     </template>
     <template slot="content">
@@ -50,7 +50,8 @@
     props: {
       instance: Function,
       dict: Object,
-      params: Object
+      params: Object,
+      menuName: String
     },
 
     data () {
@@ -74,7 +75,8 @@
     },
 
     computed: {
-      ...mapState(['user'])
+      ...mapState(['user']),
+      pageTitle: v => `${!!v.params.id ? '编辑' : '添加'}${v.menuName}`
     },
 
     created () {

packages/publicity/AppVillageRegulations/components/List.vue

@@ -1,7 +1,7 @@
 <template>
   <ai-list class="notice">
     <template slot="title">
-      <ai-title title="村规民约" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance" @change="search.current = 1, getList()"></ai-title>
+      <ai-title :title="menuName" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance" @change="search.current = 1, getList()"></ai-title>
     </template>
     <template slot="content">
       <ai-search-bar class="search-bar">
@@ -10,25 +10,25 @@
         </template>
         <template #right>
           <el-input
-            v-model="search.title"
-            class="search-input"
-            size="small"
-            v-throttle="() => {search.current=1,getList()}"
-            placeholder="请输入标题"
-            clearable
-            @clear="search.current = 1, search.title = '', getList()"
-            suffix-icon="iconfont iconSearch">
+              v-model="search.title"
+              class="search-input"
+              size="small"
+              v-throttle="() => {search.current=1,getList()}"
+              placeholder="请输入标题"
+              clearable
+              @clear="search.current = 1, search.title = '', getList()"
+              suffix-icon="iconfont iconSearch">
           </el-input>
         </template>
       </ai-search-bar>
       <ai-table
-        :tableData="tableData"
-        :col-configs="colConfigs"
-        :total="total"
-        style="margin-top: 6px;"
-        :current.sync="search.current"
-        :size.sync="search.size"
-        @getList="getList">
+          :tableData="tableData"
+          :col-configs="colConfigs"
+          :total="total"
+          style="margin-top: 6px;"
+          :current.sync="search.current"
+          :size.sync="search.size"
+          @getList="getList">
         <el-table-column slot="tags" label="标签">
           <template slot-scope="{ row }">
             <div class="table-tags">
@@ -51,101 +51,103 @@
 </template>
 
 <script>
-  import { mapState } from 'vuex'
-  export default {
-    name: 'List',
+import {mapState} from 'vuex'
 
-    props: {
-      instance: Function,
-      dict: Object
+export default {
+  name: 'List',
+
+  props: {
+    instance: Function,
+    dict: Object,
+    menuName: String
+  },
+
+  data() {
+    return {
+      search: {
+        current: 1,
+        size: 10,
+        title: '',
+        areaId: ''
+      },
+      currIndex: -1,
+      areaList: [],
+      total: 10,
+      colConfigs: [
+        {prop: 'title', label: '标题', align: 'left', width: '200px'},
+        {prop: 'areaName', label: '地区', align: 'center'},
+        {prop: 'status', label: '发布状态', align: 'center', formart: v => v === '1' ? '已发布' : '未发布'},
+        {prop: 'createUserName', label: '发布人', align: 'center'},
+        {prop: 'createDate', label: '发布时间', align: 'center'},
+        {slot: 'options', label: '操作', align: 'center'}
+      ],
+      areaName: '',
+      unitName: '',
+      tableData: []
+    }
+  },
+
+  computed: {
+    ...mapState(['user'])
+  },
+
+  mounted() {
+    this.search.areaId = this.user.info.areaId
+    this.getList()
+  },
+
+  methods: {
+    getList() {
+      this.instance.post(`/app/appcountrysidetourism/list`, null, {
+        params: {
+          type: 4,
+          ...this.search
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.tableData = res.data.records
+          this.total = res.data.total
+        }
+      })
     },
 
-    data() {
-      return {
-        search: {
-          current: 1,
-          size: 10,
-          title: '',
-          areaId: ''
-        },
-        currIndex: -1,
-        areaList: [],
-        total: 10,
-        colConfigs: [
-          { prop: 'title',  label: '标题', align: 'left', width: '200px' },
-          { prop: 'areaName', label: '地区', align: 'center' },
-          { prop: 'status', label: '发布状态', align: 'center', formart: v => v === '1' ? '已发布' : '未发布' },
-          { prop: 'createUserName', label: '发布人', align: 'center' },
-          { prop: 'createDate', label: '发布时间', align: 'center' },
-          { slot: 'options', label: '操作', align: 'center' }
-        ],
-        areaName: '',
-        unitName: '',
-        tableData: []
-      }
-    },
-
-    computed: {
-      ...mapState(['user'])
-    },
-
-    mounted() {
-      this.search.areaId = this.user.info.areaId
-      this.getList()
-    },
-
-    methods: {
-      getList() {
-        this.instance.post(`/app/appcountrysidetourism/list`, null, {
-          params: {
-            type: 4,
-            ...this.search
+    changeStatus(item) {
+      let title = item.status == '1' ? '是否要取消发布?' : '是否要发布?';
+      this.$confirm(title, {type: 'warning'}).then(() => {
+        item.status = item.status == '1' ? '0' : '1'
+        this.instance.post('/app/appcountrysidetourism/addOrUpdate', item).then(res => {
+          if (res && res.code == 0) {
+            title == '是否要发布?' ? this.$message.success('发布成功') : this.$message.success('取消发布成功')
+            this.getList()
           }
-        }).then(res => {
+        })
+      })
+    },
+
+    remove(id) {
+      this.$confirm('确定删除该数据？').then(() => {
+        this.instance.post(`/app/appcountrysidetourism/delete?ids=${id}`).then(res => {
           if (res.code == 0) {
-            this.tableData = res.data.records
-            this.total = res.data.total
+            this.$message.success('删除成功！')
+            this.getList()
           }
         })
-      },
+      })
+    },
 
-      changeStatus (item) {
-        let title = item.status == '1' ? '是否要取消发布?' : '是否要发布?';
-        this.$confirm(title, {type: 'warning'}).then(() => {
-          item.status = item.status == '1' ? '0' : '1'
-          this.instance.post('/app/appcountrysidetourism/addOrUpdate', item).then(res => {
-            if (res && res.code == 0) {
-              title == '是否要发布?' ? this.$message.success('发布成功') : this.$message.success('取消发布成功')
-              this.getList()
-            }
-          })
-        })
-      },
-
-      remove(id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appcountrysidetourism/delete?ids=${id}`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('删除成功！')
-              this.getList()
-            }
-          })
-        })
-      },
-
-      toAdd(id) {
-        this.$emit('change', {
-          type: 'Add',
-          params: {
-            id: id || ''
-          }
-        })
-      }
+    toAdd(id) {
+      this.$emit('change', {
+        type: 'Add',
+        params: {
+          id: id || ''
+        }
+      })
     }
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .notice {
-  }
+.notice {
+}
 </style>