村民议事

2022-01-04 18:02:08 +08:00
parent 56e73bf7ad
commit 945a087f1b
3 changed files with 168 additions and 151 deletions
--- a/packages/3.0.0/AppVillagerDiscussion/components/Add.vue
+++ b/packages/3.0.0/AppVillagerDiscussion/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="params.id ? '编辑村民议事' : '添加村民议事'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
      </ai-title>
    </template>
    <template slot="content">
@@ -9,62 +9,63 @@
        <template #content>
          <el-form class="ai-form" :model="form" label-width="120px" ref="form">
            <el-form-item label="主题" style="width: 100%;" prop="title" :rules="[{required: true, message: '请输入主题', trigger: 'blur'}]">
-              <el-input type="textarea" :rows="5" v-model="form.title" clearable placeholder="请输入主题..." maxlength="30" show-word-limit></el-input>
+              <el-input type="textarea" :rows="5" v-model="form.title" clearable placeholder="请输入主题..." :maxlength="500" show-word-limit></el-input>
            </el-form-item>
-            <el-form-item prop="areaId" style="width: 100%;" label="发布地区" :rules="[{required: true, message: '请选择地区', trigger: 'change'}]">
-              <ai-area-select clearable always-show :instance="instance" v-model="form.areaId" :disabled-level="disabledLevel"></ai-area-select>
+            <el-form-item prop="areaId" style="width: 100%;" label="发布地区" :rules="[{required: true, pattern: /([^0]\d{2}|0[^0]\d|0\d[^0])$/, message: '请选择到村', trigger: 'change'}]">
+              <ai-area-select @fullname="form.areaName" clearable always-show :instance="instance" v-model="form.areaId" :disabled-level="disabledLevel"></ai-area-select>
            </el-form-item>
-            <el-form-item label="议事截止时间" prop="date" :rules="[{required: true, message: '请选择议事截止时间', trigger: 'change'}]">
+            <el-form-item label="议事截止时间" prop="discussDeadline" :rules="[{required: true, message: '请选择议事截止时间', trigger: 'change'}]">
              <el-date-picker
-                v-model="form.date"
+                v-model="form.discussDeadline"
                type="datetime"
                style="width: 100%;"
                size="small"
+                value-format="yyyy-MM-dd hh:mm:ss"
                placeholder="选择议事截止时间">
              </el-date-picker>
            </el-form-item>
-            <el-form-item label="公示截止时间" prop="time" :rules="[{required: true, message: '请选择公示截止时间', trigger: 'change'}]">
+            <el-form-item label="公示截止时间" prop="publicityDeadline" :rules="[{required: true, message: '请选择公示截止时间', trigger: 'change'}]">
              <el-date-picker
-                v-model="form.time"
+                v-model="form.publicityDeadline"
                size="small"
                style="width: 100%;"
                type="datetime"
+                value-format="yyyy-MM-dd hh:mm:ss"
                placeholder="选择公示截止时间">
              </el-date-picker>
            </el-form-item>
            <el-form-item label="议事类型" prop="type" :rules="[{required: true, message: '请选择议事类型', trigger: 'change'}]">
              <el-radio-group v-model="form.type">
-                <el-radio label="0">意见征集</el-radio>
-                <el-radio label="1">投票表决</el-radio>
+                <el-radio :label="item.dictValue" v-for="(item, index) in dict.getDict('discussType')" :key="index">{{ item.dictName }}</el-radio>
              </el-radio-group>
            </el-form-item>
-            <el-form-item class="vite-form__item" style="width: 100%;" label="投票选项" prop="type" :rules="[{required: true, message: '请添加投票选项', trigger: 'change'}]">
-              <el-form-item label-width="80px" :label="'选项' + index" v-for="(item, index) in form.voteList" :key="index + item.name">
+            <el-form-item v-if="form.type === '1'" class="vite-form__item" style="width: 100%;" label="投票选项" prop="voteItems" :rules="[{required: true, message: '请添加投票选项', trigger: 'change'}]">
+              <el-form-item label-width="80px" :label="'选项' + (index + 1)" v-for="(item, index) in form.voteItems" :key="'选项' + (index + 1)">
                <div class="form-flex">
-                  <el-input v-model="item.name" size="small" clearable placeholder="请输入选项"></el-input>
+                  <el-input v-model="item.content" size="small" clearable placeholder="请输入选项"></el-input>
                  <el-button type="danger" size="small" @click="removeVote(index)">删除</el-button>
                </div>
              </el-form-item>
              <el-button type="primary" size="small" @click="addVote">添加选项</el-button>
            </el-form-item>
-            <el-form-item label="是否匿名投票" prop="anonymity" :rules="[{required: true, message: '请选择是否匿名投票', trigger: 'change'}]">
+            <el-form-item v-if="form.type === '1'" label="是否匿名投票" prop="anonymous" :rules="[{required: true, message: '请选择是否匿名投票', trigger: 'change'}]">
              <el-switch
-                v-model="form.anonymity"
+                v-model="form.anonymous"
                active-value="1"
                inactive-value="0">
-            </el-switch>
+              </el-switch>
            </el-form-item>
-            <el-form-item label="投票方式" prop="type" :rules="[{required: true, message: '请选择投票方式', trigger: 'change'}]">
-              <el-radio-group v-model="form.type">
+            <el-form-item v-if="form.type === '1'" label="投票方式" prop="voteType" :rules="[{required: true, message: '请选择投票方式', trigger: 'change'}]">
+              <el-radio-group v-model="form.voteType">
                <el-radio label="0">单选</el-radio>
                <el-radio label="1">多选</el-radio>
              </el-radio-group>
            </el-form-item>
-            <el-form-item label="图片" style="width: 100%;" prop="thumbUrl">
+            <el-form-item label="图片" style="width: 100%;" prop="images">
              <ai-uploader
                :instance="instance"
                isShowTip
-                v-model="form.thumbUrl"
+                v-model="form.images"
                :limit="9">
              </ai-uploader>
            </el-form-item>
@@ -95,18 +96,18 @@
        info: {},
        form: {
          title: '',
-          content: '',
          areaId: '',
-          date: '',
-          type: '',
-          voteList: [],
-          time: '',
+          areaName: '',
+          anonymous: '0',
+          discussDeadline: '',
+          publicityDeadline: '',
+          type: '0',
+          voteType: '0',
+          voteItems: [],
          anonymity: '1',
-          createUnitName: '',
-          createUserName: '',
-          status: '',
-          thumbUrl: []
+          images: []
        },
+        keys: ['A', 'B', 'C', 'D', 'E', 'F', 'G'],
        id: ''
      }
    },
@@ -117,6 +118,7 @@

    created () {
      this.form.areaId = this.user.info.areaId
+      this.form.areaName = this.user.info.areaName
      this.disabledLevel = this.user.info.areaList.length
      if (this.params && this.params.id) {
        this.id = this.params.id
@@ -126,34 +128,49 @@

    methods: {
      getInfo (id) {
-        this.instance.post(`/app/appcountrysidetourism/queryDetailById?id=${id}`).then(res => {
+        this.instance.post(`/app/appvillagediscuss/queryDetailById?id=${id}`).then(res => {
          if (res.code === 0) {
            this.form = res.data
-            this.form.thumbUrl = res.data.thumbUrl ? JSON.parse(res.data.thumbUrl) : []
+            this.form.images = res.data.images ? JSON.parse(res.data.images) : []
          }
        })
      },

      addVote () {
-        this.form.voteList.push({
-          name: ''
+        if (this.form.voteItems > 7) {
+          return this.$message.error('选项不能大于7个')
+        }
+
+        this.form.voteItems.push({
+          content: ''
        })
      },

      removeVote (index) {
-        this.form.voteList.splice(index, 1)
+        this.form.voteItems.splice(index, 1)
      },

      confirm () {
        this.$refs.form.validate((valid) => {
          if (valid) {
-            this.instance.post(`/app/appcountrysidetourism/addOrUpdate`, {
+            if (this.form.type === '1' && this.form.voteItems.length < 2) {
+              return this.$message.error('投票选项不能少于2')
+            }
+
+            if (this.form.type === '1') {
+              this.form.voteItems = this.form.voteItems.map((v, index) => {
+                return {
+                  content: v.content,
+                  item: this.keys[index]
+                }
+              })
+            }
+
+            this.instance.post(`/app/appvillagediscuss/addOrUpdate`, {
              ...this.form,
-              type: 0,
+              createUserId: this.user.info.id,
              createUserName: this.user.info.name,
-              thumbUrl: this.form.thumbUrl.length ? JSON.stringify([{
-                url: this.form.thumbUrl[0].url
-              }]) : ''
+              images: this.form.images.length ? JSON.stringify(this.form.images) : '',
            }).then(res => {
              if (res.code == 0) {
                this.$message.success('提交成功')