注册审核修改

src/views/notice/NoticeDetail.vue

@@ -2,7 +2,7 @@
   <div>
     <a-card :bordered="false">
       <template slot="extra">
-       <a-button type="primary" @click="close">返回</a-button>
+        <a-button type="primary" @click="close">返回</a-button>
       </template>
       <div>
         <div>
@@ -73,7 +73,7 @@ export default {
       queryParam: { noticeId: this.$route.query.id, isRead: 1 },
       readCount: 0,
       unreadCount: 0,
-      noticeRange : 1,
+      noticeRange: 1,
       // 表头
       columns1: [
         {
@@ -132,7 +132,7 @@ export default {
   methods: {
     // 返回 按钮
     close () {
-      this.$router.push({ path: '/notice/list', query: {noticeRange: this.noticeRange} })
+      this.$router.push({ path: '/notice/list', query: { noticeRange: this.noticeRange } })
     },
     getDetail (id) {
       noticeGet({ id: id }).then(res => {
@@ -151,7 +151,7 @@ export default {
       }
       if (key === '2') {
         this.queryParam.isRead = 0
-        this.$nextTick(()=>{
+        this.$nextTick(() => {
           this.$refs.table2.refresh(true)
         })
       }
@@ -168,4 +168,7 @@ export default {
 .article-title {
   text-align: center;
 }
+.article-body {
+  margin-top: 15px;
+}
 </style>

src/views/notice/NoticeList.vue

@@ -22,7 +22,7 @@
 
         <s-table
           ref="table1"
-          :columns="columns"
+          :columns="columns1"
           :data="loadData"
           :rowKey="(record) => record.id"
         >
@@ -68,7 +68,7 @@
         </div>
         <s-table
           ref="table2"
-          :columns="columns"
+          :columns="columns2"
           :data="loadData"
           :rowKey="(record) => record.id"
         >
@@ -97,17 +97,17 @@
     },
     data () {
       return {
-        noticeRange : 2,
+        noticeRange: 2,
         // 查询参数
         queryParam: { },
         // 表头
-        columns: [
+        columns1: [
           {
             title: '公告标题',
             dataIndex: 'title'
           },
           {
-            title: '发布单位/人',
+            title: '发布单位',
             dataIndex: 'createOrgName'
           },
           {
@@ -118,7 +118,11 @@
             scopedSlots: { customRender: 'publishTime' }
           },
           {
-            title: '菜单类型',
+            title: '发布范围',
+            dataIndex: 'rangeName'
+          },
+          {
+            title: '公告类型',
             dataIndex: 'type',
             scopedSlots: { customRender: 'type' }
           },
@@ -128,9 +132,32 @@
             scopedSlots: { customRender: 'status' }
           }
         ],
+        // 表头
+        columns2: [
+          {
+            title: '公告标题',
+            dataIndex: 'title'
+          },
+          {
+            title: '发布单位',
+            dataIndex: 'createOrgName'
+          },
+          {
+            title: '发布时间',
+            width: 200,
+            dataIndex: 'publishTime',
+            key: 'publishTime',
+            scopedSlots: { customRender: 'publishTime' }
+          },
+          {
+            title: '公告类型',
+            dataIndex: 'type',
+            scopedSlots: { customRender: 'type' }
+          }
+        ],
         // 加载数据方法 必须为 Promise 对象
         loadData: parameter => {
-          return noticePage(Object.assign(parameter, this.queryParam, {noticeRange : this.noticeRange})).then((res) => {
+          return noticePage(Object.assign(parameter, this.queryParam, { noticeRange: this.noticeRange })).then((res) => {
             console.log(res)
             return res
           })
@@ -157,7 +184,7 @@
     },
     created () {
       if (this.hasPerm('notice:edit') || this.hasPerm('notice:del') || this.hasPerm('notice:list')) {
-        this.columns.push({
+        this.columns1.push({
           title: '操作',
           width: 200,
           dataIndex: 'action',
@@ -176,13 +203,13 @@
       tabsCallback (key) {
         if (key === '1') {
           this.noticeRange = '1'
-          this.$nextTick(()=>{
+          this.$nextTick(() => {
             this.$refs.table1.refresh(true)
           })
         }
         if (key === '2') {
           this.noticeRange = '2'
-          this.$nextTick(()=>{
+          this.$nextTick(() => {
             this.$refs.table2.refresh(true)
           })
         }

src/views/person/PersonForm.vue

@@ -289,47 +289,43 @@ export default {
       fileList: [],
       fileList2: [],
       fileList3: [],
-      isRegister: 0
+      isRegisterVerify: 0
     }
   },
   mounted () {
     this.dictionaryDropDown()
+  },
+  created () {
+
   },
   methods: {
-    // 注册信息编辑 新增人员初始化方法
+    // 注册审核信息编辑 新增人员初始化方法
     registerEdit (record) {
       this.modalTitle = '审核人员'
       this.confirmLoading = true
       this.visible = true
-      this.isRegister = 1
+
+      this.isRegisterVerify = 1
 
       this.registerDisabled = true
-      setTimeout(() => {
-        // 基本信息加入表单
-        this.form.setFieldsValue({
-          name: record.name,
-          userName: record.userName,
-          phone: record.phone,
-          orgId: record.orgId,
-          orgName: record.orgName,
-          id: record.personId, // 审核注册信息 需要把personId带入
-          userId: record.userId
-        })
-      }, 100)
 
-      this.confirmLoading = false
+      this.personGet(record.personId)
     },
     // 编辑初始化方法
     edit (record) {
       this.modalTitle = '编辑人员'
       this.confirmLoading = true
       this.visible = true
-      this.isRegister = 0
+      this.isRegisterVerify = 0
 
       this.registerDisabled = true
+      if (this.type == 2) this.registerDisabled = false
 
+      this.personGet(record.id)
+    },
+    personGet (personId) {
       // 基本信息加入表单
-      personGet({ id: record.id }).then(res => {
+      personGet({ id: personId }).then(res => {
         if (res.code === 200) {
           const data = res.data
           // 默认选中的多选框
@@ -377,8 +373,9 @@ export default {
         } else {
           this.$message.error('查询失败：' + res.msg)
         }
+
+        this.confirmLoading = false
       })
-      this.confirmLoading = false
     },
     /**
      * 获取字典数据
@@ -418,12 +415,12 @@ export default {
           if (this.fileList3.length > 0) values.avatar = this.fileList3[0].url
 
           // 如果是注册审核的，弹出提示框
-          if (_this.isRegister === 1) {
+          if (_this.isRegisterVerify === 1) {
             this.$confirm({
               title: '提示',
               content: '确认通过审核吗?',
               onOk () {
-                values.isRegister = 1 // 审核通过
+                values.isRegisterVerify = 1 // 审核通过
                 _this.addOrUpdate(values)
               },
               onCancel () {}