no message

src/i18n/zh-CN.js

@@ -14,6 +14,7 @@ t.query = '查询'
 t.export = '导出'
 t.handle = '操作'
 t.confirm = '确定'
+t.import = '导入'
 t.cancel = '取消'
 t.logout = '退出'
 

src/views/modules/user/partymembers-add-or-update.vue

@@ -10,47 +10,37 @@
       <el-form-item label="身份证号" prop="identityNo">
           <el-input v-model="dataForm.identityNo" placeholder="身份证号"></el-input>
       </el-form-item>
-      <el-form-item label="街道党工委">
+      <el-form-item label="街道党工委" prop="streetId">
-          <el-select v-model="dataForm.streetId" placeholder="请选择">
+          <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
             <el-option
               v-for="item in streetOptions"
-              :key="item.streetId"
+              :key="item.id"
-              :label="item.streetName"
+              :label="item.name"
-              :value="item.streetId">
+              :value="item.id">
             </el-option>
           </el-select>
       </el-form-item>
-      <el-form-item label="社区党委">
+      <el-form-item label="社区党委" prop="communityId">
-        <el-select v-model="dataForm.communityId" placeholder="请选择">
+        <el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
           <el-option
             v-for="item in communityOptions"
-            :key="item.communityId"
+            :key="item.id"
-            :label="item.communityName"
+            :label="item.name"
-            :value="item.communityId">
+            :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="网格党支部">
+      <el-form-item label="网格党支部" prop="gridId">
-        <el-select v-model="dataForm.gridId" placeholder="请选择">
+        <el-select v-model="dataForm.gridId" placeholder="请选择" @change="evaluation">
           <el-option
             v-for="item in gridOptions"
-            :key="item.gridId"
+            :key="item.id"
-            :label="item.gridName"
+            :label="item.name"
-            :value="item.gridId">
+            :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="职务">
+      <el-form-item label="干部下沉" prop="cadreFlag">
-        <el-select v-model="postId" placeholder="请选择">
-          <el-option
-            v-for="item in postOptions"
-            :key="item.postId"
-            :label="item.post"
-            :value="item.postId">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="干部下沉">
         <el-select v-model="dataForm.cadreFlag" placeholder="请选择">
           <el-option
             v-for="item in cadreOptions"
@@ -60,14 +50,9 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="用户角色">
+      <el-form-item label="用户角色" prop="tagIds">
-        <el-checkbox-group v-model="checkList">
+        <el-checkbox-group v-model="dataForm.tagIds">
-          <el-checkbox
+          <el-checkbox v-for="item in tagOptions" :key="item.id" :label="item.id">{{item.tagName}}</el-checkbox>
-            v-for="item in tagOptions"
-            :key="item.tagId"
-            :label="item.tagValue"
-            :value="item.tadId">
-          </el-checkbox>
         </el-checkbox-group>
       </el-form-item>
     </el-form>
@@ -89,17 +74,25 @@ export default {
         realName: '',
         mobile: '',
         identityNo: '',
-        post: '',
         cadreFlag: '',
+        streetId: '',
         streetName: '',
+        communityId: '',
         communityName: '',
-        gridName: ''
+        gridId: '',
+        gridName: '',
+        tagIds: []
       },
       streetOptions: [],
       communityOptions: [],
       gridOptions: [],
-      postOptions: [],
+      cadreOptions: [{
-      cadreOptions: [],
+        cadreFlag: '1',
+        cadreTitle: '是'
+      }, {
+        cadreFlag: '0',
+        cadreTitle: '否'
+      }],
       tagOptions: []
     }
   },
@@ -114,12 +107,29 @@ export default {
         ],
         identityNo: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        streetId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        communityId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        gridId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        cadreFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        tagIds: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
   },
   methods: {
     init () {
+      this.getStreetList()
+      this.getTagOptions()
       this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
@@ -128,6 +138,50 @@ export default {
         }
       })
     },
+    getTagOptions () {
+      this.$http.get(`/app-user/usertag/list`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.tagOptions = res.data
+        console.log(this.tagOptions)
+      }).catch(() => {})
+    },
+    getStreetList () {
+      this.$http.get(`/sys/dept/sublist/0`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.streetOptions = res.data
+      }).catch(() => {})
+    },
+    getCommunityList () {
+      let choosenItem = this.streetOptions.filter(item => item.id === this.dataForm.streetId)[0]
+      this.dataForm.streetName = choosenItem.name
+      this.dataForm.communityId = ''
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.communityOptions = res.data
+      }).catch(() => {})
+    },
+    getGridList () {
+      let choosenItem = this.communityOptions.filter(item => item.id === this.dataForm.communityId)[0]
+      this.dataForm.communityName = choosenItem.name
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.gridOptions = res.data
+      }).catch(() => {})
+    },
+    evaluation () {
+      let choosenItem = this.gridOptions.filter(item => item.id === this.dataForm.gridId)[0]
+      this.dataForm.gridName = choosenItem.name
+    },
     // 获取信息
     getInfo () {
       this.$http.get(`/app-user/partymembers/${this.dataForm.id}`).then(({ data: res }) => {
@@ -138,6 +192,18 @@ export default {
           ...this.dataForm,
           ...res.data
         }
+        this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.communityOptions = res.data
+        }).catch(() => {})
+        this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.gridOptions = res.data
+        }).catch(() => {})
       }).catch(() => {})
     },
     // 表单提交

src/views/modules/user/partymembers.vue

@@ -36,9 +36,9 @@
           <el-select v-model="dataForm.registFlag" placeholder="请选择">
             <el-option
               v-for="item in registOptions"
-              :key="item.registFlag"
+              :key="item.dictValue"
-              :label="item.registTitle"
+              :label="item.dictName"
-              :value="item.registFlag">
+              :value="item.dictValue">
             </el-option>
           </el-select>
         </el-form-item>
@@ -56,20 +56,22 @@
           <el-select v-model="dataForm.postId" placeholder="请选择">
             <el-option
               v-for="item in postOptions"
-              :key="item.postId"
+              :key="item.dictValue"
-              :label="item.post"
+              :label="item.dictName"
-              :value="item.postId">
+              :value="item.dictValue">
             </el-option>
           </el-select>
         </el-form-item>
         <br>
         <el-form-item label="注册时间">
           <el-date-picker
-            v-model="dataForm.timeRange"
+            v-model="timeRange"
             type="daterange"
-            range-separator="至"
             start-placeholder="开始日期"
-            end-placeholder="结束日期">
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+            :default-time="['00:00:00', '23:59:59']"
+            @change="selectedTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
@@ -96,7 +98,7 @@
         <el-table-column prop="identityNo" label="身份证号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="post" label="职务" header-align="center" align="center"></el-table-column>
         <el-table-column prop="cadreFlag" label="干部下沉" :formatter="formatCadre" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="tag" label="角色" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="tagName" label="角色" header-align="center" align="center"></el-table-column>
         <el-table-column prop="registFlag" label="注册状态" :formatter="formatRegist" header-align="center" align="center"></el-table-column>
         <el-table-column prop="registTime" label="注册时间" header-align="center" align="center"></el-table-column>
         <el-table-column prop="streetName" label="街道党工委" header-align="center" align="center"></el-table-column>
@@ -147,13 +149,15 @@ export default {
         gridId: '',
         registFlag: '',
         postId: '',
-        timeRange: ''
+        startTime: '',
+        endTime: ''
       },
       streetOptions: [],
       communityOptions: [],
       gridOptions: [],
       registOptions: [],
-      postOptions: []
+      postOptions: [],
+      timeRange: []
     }
   },
   components: {
@@ -161,8 +165,14 @@ export default {
   },
   created: function () {
     this.getStreetList()
+    this.getRegistOptions()
+    this.getPostOptions()
   },
   methods: {
+    selectedTime () {
+      this.dataForm.startTime = this.timeRange[0]
+      this.dataForm.endTime = this.timeRange[1]
+    },
     getStreetList () {
       this.$http.get(`/sys/dept/sublist/0`).then(({ data: res }) => {
         if (res.code !== 0) {
@@ -190,11 +200,28 @@ export default {
         this.gridOptions = res.data
       }).catch(() => {})
     },
+    getRegistOptions () {
+      this.$http.get(`/sys/dict/sublist/1168769645576179713`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.registOptions = res.data
+      }).catch(() => {})
+    },
+    getPostOptions () {
+      this.$http.get(`/sys/dict/sublist/1168770417290366977`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.postOptions = res.data
+      }).catch(() => {})
+    },
     formatCadre: function (row, column) {
-      return row.cadreFlag === 1 ? '是' : row.cadreFlag === 0 ? '否' : '未知'
+      return row.cadreFlag === '1' ? '是' : row.cadreFlag === '0' ? '否' : '未知'
     },
     formatRegist: function (row, column) {
-      return row.registFlag === 1 ? '是' : row.registFlag === 0 ? '否' : '未知'
+      console.log(row.registFlag)
+      return row.registFlag === '1' ? '是' : row.registFlag === '0' ? '否' : '未知'
     },
     importData () {
     },