Merge branch 'master' of http://git.cc-lotus.info/community/ruyi-ui

src/api/community/dangyuan.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询党员报道列表
+// 查询党员报到列表
 export function listDangyuan(query) {
   return request({
     url: '/community/dangyuan/list',
@@ -9,7 +9,7 @@ export function listDangyuan(query) {
   })
 }
 
-// 查询党员报道详细
+// 查询党员报到详细
 export function getDangyuan(dangyuanId) {
   return request({
     url: '/community/dangyuan/' + dangyuanId,
@@ -17,7 +17,7 @@ export function getDangyuan(dangyuanId) {
   })
 }
 
-// 新增党员报道
+// 新增党员报到
 export function addDangyuan(data) {
   return request({
     url: '/community/dangyuan',
@@ -26,7 +26,7 @@ export function addDangyuan(data) {
   })
 }
 
-// 修改党员报道
+// 修改党员报到
 export function updateDangyuan(data) {
   return request({
     url: '/community/dangyuan',
@@ -35,7 +35,7 @@ export function updateDangyuan(data) {
   })
 }
 
-// 删除党员报道
+// 删除党员报到
 export function delDangyuan(dangyuanId) {
   return request({
     url: '/community/dangyuan/' + dangyuanId,

src/views/community/dangyuan/index.vue

@@ -25,7 +25,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="报道位置" prop="reportLocation">
+      <el-form-item label="报到位置" prop="reportLocation">
         <el-input
           v-model="queryParams.reportLocation"
           placeholder="请输入工作单位"
@@ -43,8 +43,8 @@
       <el-table-column label="姓名" align="center" prop="name" />
       <el-table-column label="性别" align="center" prop="sex" />
       <el-table-column label="工作单位" align="center" prop="workUnit" />
-      <el-table-column label="报道位置" align="center" prop="reportLocation" />
-      <el-table-column label="报道类别" align="center" prop="reportType" />
+      <el-table-column label="报到位置" align="center" prop="reportLocation" />
+      <el-table-column label="报到类别" align="center" prop="reportType" />
       <el-table-column label="居住地" align="center" prop="residence" />
       <el-table-column label="联系方式" align="center" prop="phone" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -66,7 +66,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -75,7 +75,7 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改党员报道对话框 -->
+    <!-- 添加或修改党员报到对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="姓名" prop="name">
@@ -87,11 +87,11 @@
         <el-form-item label="工作单位" prop="workUnit">
           <el-input disabled v-model="form.workUnit" placeholder="请输入工作单位" />
         </el-form-item>
-        <el-form-item label="报道位置" prop="reportLocation">
-          <el-input disabled v-model="form.reportLocation" placeholder="请输入报道位置" />
+        <el-form-item label="报到位置" prop="reportLocation">
+          <el-input disabled v-model="form.reportLocation" placeholder="请输入报到位置" />
         </el-form-item>
-        <el-form-item label="报道类别" prop="reportType">
-          <el-input disabled v-model="form.reportType" placeholder="请输入报道位置" />
+        <el-form-item label="报到类别" prop="reportType">
+          <el-input disabled v-model="form.reportType" placeholder="请输入报到位置" />
         </el-form-item>
         <el-form-item label="居住地" prop="residence">
           <el-input disabled v-model="form.residence" placeholder="请输入居住地" />
@@ -138,7 +138,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 党员报道表格数据
+      // 党员报到表格数据
       dangyuanList: [],
       // 弹出层标题
       title: "",
@@ -169,7 +169,7 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询党员报道列表 */
+    /** 查询党员报到列表 */
     getList() {
       this.loading = true;
       listDangyuan(this.queryParams).then(response => {
@@ -226,13 +226,13 @@ export default {
         const data = this.dict.type.baodao_type.find(j => j.value == response.data.reportType);
         this.form = { ...response.data, reportType: data.label, sex: response.data.sex == 1 ? '男' : '女' };
         this.open = true;
-        this.title = "党员报道详情";
+        this.title = "党员报到详情";
       });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
       const dangyuanIds = row.dangyuanId || this.ids;
-      this.$modal.confirm('是否确认删除党员报道名称为"' + row.name + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除党员报到名称为"' + row.name + '"的数据项？').then(function() {
         return delDangyuan(dangyuanIds);
       }).then(() => {
         this.getList();