pengyh hai 1 ano
pai
achega
b68a5e20fe

+ 42 - 0
src/api/announcement.js

@@ -0,0 +1,42 @@
+import request, { postBlob, getBlob, handleImport } from '@/utils/request'
+
+// 获取师傅列表
+export function noticeListPageV2(data) {
+  return request({
+    url: `/notice/listNotice?moduleId=${data.moduleId}`,
+    method: 'post',
+    data
+  })
+}
+
+export function noticePageExport(data, name) {
+  return postBlob({
+    url: '/notice/listNotice/export',
+    data,
+    name
+  })
+}
+
+export function noticeAdd(data) {
+  return postBlob({
+    url: '/notice/add',
+	method: 'post',
+    data
+  })
+}
+
+export function noticeDel(data) {
+  return postBlob({
+    url: '/notice/mark/del',
+	method: 'post',
+    data
+  })
+}
+
+export function getNoticeDetail(data) {
+  return postBlob({
+    url: '/notice/detailNotice',
+	method: 'post',
+    data
+  })
+}

+ 34 - 0
src/api/systemMessage.js

@@ -0,0 +1,34 @@
+import request, { postBlob, getBlob, handleImport } from '@/utils/request'
+
+// 获取师傅列表
+export function noticeListPageV2(data) {
+  return request({
+    url: `/notice/list?moduleId=${data.moduleId}`,
+    method: 'post',
+    data
+  })
+}
+
+export function noticePageExport(data, name) {
+  return postBlob({
+    url: '/notice/list/export',
+    data,
+    name
+  })
+}
+
+export function getNoticeDetail(data) {
+  return postBlob({
+    url: '/notice/detail',
+	method: 'post',
+    data
+  })
+}
+
+export function readNotice(data) {
+  return postBlob({
+    url: '/notice/mark/read',
+	method: 'post',
+    data
+  })
+}

+ 338 - 0
src/views/setting/notification/announcement/index.vue

@@ -0,0 +1,338 @@
+<template>
+	<template-page ref="pageRef" :get-list="getList" :table-attributes="tableAttributes" :table-events="tableEvents"
+		:operationColumnWidth="200" :options-evens-group="optionsEvensGroup" :moreParameters="moreParameters"
+		:column-parsing="columnParsing" :operation="operation" :exportList="exportList">
+		<div slot="moreSearch">
+			<el-radio-group v-model="status" size="mini" @change="changeType">
+				<el-radio-button label="">全部</el-radio-button>
+				<el-radio-button label="NO">未发布</el-radio-button>
+				<el-radio-button label="YES">已发布</el-radio-button>
+			</el-radio-group>
+			<br><br>
+		</div>
+		<el-dialog title="" width="800px" custom-class="diy-dialog" append-to-body :modal="true"
+			:visible.sync="formDialog" :show-close="true" :close-on-click-modal="false" :modal-append-to-body="false"
+			:before-close="formCancel">
+			<zj-form-container ref="formRef" :form-data="formData" :styleSwitch="false">
+				<zj-form-module :title="formDialogTitles[formDialogType]" label-width="100px" :showPackUp="false"
+					:form-data="formData" :form-items="formItems">
+				</zj-form-module>
+			</zj-form-container>
+			<div slot="footer" class="dialog-footer">
+				<el-button size="mini" type="primary" @click="save()">保存</el-button>
+				<el-button v-if="formData.status == 'NO'" size="mini" type="primary" @click="save(1)">发布</el-button>
+				<el-button size="mini" @click="formCancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</template-page>
+</template>
+
+<script>
+	import TemplatePage from '@/components/template/template-page-1.vue'
+	import import_mixin from '@/components/template/import_mixin.js'
+	import { required, mobileRequired, mobile } from '@/components/template/rules_verify.js'
+	import { noticeListPageV2, noticePageExport, getNoticeDetail, noticeAdd, noticeDel } from "@/api/announcement";
+	export default {
+		components: { TemplatePage },
+		mixins: [import_mixin],
+		data() {
+			return {
+				// 事件组合
+				optionsEvensGroup: [
+				  [
+				    [
+				      {
+				        name: '新建',
+				        isRole: true,
+				        click: ()=>{
+							this.formDialog = true
+							this.formDialogType = 0
+						}
+				      }
+				    ],
+				  ],
+				],
+				// 表格属性
+				tableAttributes: {
+					// 启用勾选列
+					selectColumn: false
+				},
+				// 表格事件
+				tableEvents: {
+					'selection-change': this.selectionChange
+				},
+				// 勾选选中行
+				recordSelected: [],
+				/** 表单变量 */
+				formDialogType: 0,
+				formDialogTitles: ["新增", "详情"],
+				formDialog: false,
+				formData: {
+					type: '工程师',
+					examineRemark: ''
+				},
+				status: ''
+			}
+		},
+		computed: {
+			// 更多参数
+			moreParameters() {
+				return []
+			},
+			formItems() {
+				return [{
+					md: 12,
+					isShow: true,
+					name: 'el-select',
+					options: [{
+						label: '待审核',
+						value: 'WAIT'
+					}, {
+						label: '驳回',
+						value: 'FAIL'
+					}, {
+						label: '通过',
+						value: 'OK'
+					}],
+					attributes: {
+						placeholder: '请输入',
+						disabled: true
+					},
+					formItemAttributes: {
+						label: '审核状态',
+						prop: 'examineStatus',
+						rules: []
+					},
+				}, {
+					md: 12,
+					isShow: true,
+					name: 'el-input',
+					attributes: {
+						disabled: true
+					},
+					formItemAttributes: {
+						label: '用户类型',
+						prop: 'type',
+						rules: []
+					}
+				}, {
+					md: 12,
+					isShow: true,
+					name: 'el-input',
+					attributes: {
+						placeholder: '请输入',
+						disabled: true
+					},
+					formItemAttributes: {
+						label: '用户名称',
+						prop: 'nickName',
+						rules: []
+					}
+				}, {
+					md: 12,
+					isShow: true,
+					name: 'el-input',
+					attributes: {
+						placeholder: '请输入',
+						disabled: true
+					},
+					formItemAttributes: {
+						label: '联系电话',
+						prop: 'mobile',
+						rules: []
+					}
+				}, {
+					md: 12,
+					isShow: true,
+					name: 'el-input',
+					attributes: {
+						placeholder: '请输入',
+						disabled: true
+					},
+					formItemAttributes: {
+						label: '身份证号码',
+						prop: 'idCard',
+						rules: []
+					}
+				}, {
+					md: 12,
+					isShow: true,
+					name: 'el-image',
+					attributes: {
+						src: this.formData.idCardImg
+					},
+					formItemAttributes: {
+						label: '身份证',
+						prop: 'idCardImg',
+						rules: []
+					},
+				}, {
+					md: 12,
+					isShow: true,
+					name: 'el-input',
+					attributes: {
+						placeholder: '请输入',
+						disabled: true
+					},
+					formItemAttributes: {
+						label: '所属商户',
+						prop: 'companyName',
+						rules: []
+					}
+				}, {
+					md: 12,
+					isShow: true,
+					name: 'el-input',
+					attributes: {
+						placeholder: '请输入',
+						disabled: true
+					},
+					formItemAttributes: {
+						label: '入驻网点',
+						prop: 'websitName',
+						rules: []
+					}
+				}, {
+					md: 24,
+					isShow: true,
+					name: 'el-input',
+					attributes: {
+						placeholder: '请输入',
+						type: "textarea",
+						disabled: this.formData.examineStatus == 'WAIT' ? false : true
+					},
+					formItemAttributes: {
+						label: '备注',
+						prop: 'examineRemark',
+						rules: []
+					}
+				}]
+			}
+		},
+		methods: {
+			// 切换状态
+			changeType(val) {
+				this.$refs.pageRef.refreshList()
+			},
+			// 列表请求函数
+			getList(p) {
+				try {
+					var pam = JSON.parse(JSON.stringify(p))
+					if (this.status) {
+						pam.params.push({
+							"param": "nr.status",
+							"compare": "=",
+							"value": this.status
+						})
+					}
+					return noticeListPageV2(pam)
+				} catch (error) {
+					console.log(error)
+				}
+			},
+			// 列表导出函数
+			exportList: noticePageExport,
+			// 表格列解析渲染数据更改
+			columnParsing(item, defaultData) {
+				return defaultData
+			},
+			// 监听勾选变化
+			selectionChange(data) {
+				this.recordSelected = data
+			},
+			// 表格操作列
+			operation(h, { row, index, column }) {
+				return ( <div class='operation-btns'>
+					<el-button type="text" onClick = { () => {
+						getNoticeDetail({
+							id: row.id
+						}).then(res => {
+							Object.assign(this.formData, res.data)
+							this.formDialogType = 1
+							this.openForm()
+						})
+					}}>详情</el-button>
+					<el-button type="text" onClick = { () => {
+						this.$confirm('请确定是否删除这条公告, 是否继续?', '提示', {
+							confirmButtonText: '确定',
+							cancelButtonText: '取消',
+							type: 'warning'
+						}).then(() => {
+							noticeDel({
+								noticeIds: row.id
+							}).then(res => {
+								if (res.code == 200) {
+									this.$message({
+										type: 'success',
+										message: '删除成功!'
+									})
+									this.$refs.pageRef.refreshList()
+								} else {
+									this.$message.error(res.msg);
+								}
+							})
+						});
+					}}>删除</el-button>
+				</div>)
+			},
+			addData() {
+				this.formDialogType = 0
+				this.openForm()
+			},
+			openForm() {
+				this.formDialog = true;
+			},
+			formCancel() {
+				this.$refs.formRef.$refs.inlineForm.clearValidate()
+				this.$data.formData = this.$options.data().formData
+				this.formDialog = false
+			},
+			audit(examineStatusEnum) {
+				memberAudit({
+					examineStatusEnum,
+					examineRemark: this.formData.examineRemark,
+					id: this.formData.id
+				}).then(res => {
+					this.$message({
+						type: 'success',
+						message: '审核成功!'
+					})
+					this.formCancel()
+					this.$refs.pageRef.refreshList()
+				})
+			},
+			memberInner(type) {
+				memberInner({
+					type,
+					userIds: this.formData.userId
+				}).then(res => {
+					this.$message({
+						type: 'success',
+						message: '设置成功!'
+					})
+					this.$refs.pageRef.refreshList()
+				})
+			},
+			formConfirm() {
+				this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
+					if (valid) {
+						([memberAudit][this.formDialogType])(this.formData).then(res => {
+							this.$message({
+								type: 'success',
+								message: `${this.formDialogTitles[this.formDialogType]}成功!`
+							})
+							this.formCancel()
+							this.$refs.pageRef.refreshList()
+						})
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tab {
+		padding: 20px 20px 0 20px;
+	}
+</style>

+ 301 - 0
src/views/setting/notification/systemMessage/index.vue

@@ -0,0 +1,301 @@
+<template>
+	<template-page ref="pageRef" :get-list="getList" :table-attributes="tableAttributes" :table-events="tableEvents" :operationColumnWidth="200"
+	  :options-evens-group="optionsEvensGroup" :moreParameters="moreParameters" :column-parsing="columnParsing"
+	  :operation="operation" :exportList="exportList">
+	  <div slot="moreSearch">
+	    <el-radio-group v-model="examineStatus" size="mini" @change="changeType">
+	    	<el-radio-button label="">全部</el-radio-button>
+	    	<el-radio-button label="WAIT">待审核</el-radio-button>
+	    	<el-radio-button label="OK">审核通过</el-radio-button>
+	    	<el-radio-button label="FAIL">驳回</el-radio-button>
+	    </el-radio-group>
+	    <br><br>
+	  </div>
+	  <el-dialog title="" width="800px" custom-class="diy-dialog" append-to-body :modal="true" :visible.sync="formDialog"
+	    :show-close="true" :close-on-click-modal="false" :modal-append-to-body="false" :before-close="formCancel">
+	    <zj-form-container ref="formRef" :form-data="formData" :styleSwitch="false">
+	      <zj-form-module :title="formDialogTitles[formDialogType]" label-width="100px" :showPackUp="false"
+	        :form-data="formData" :form-items="formItems">
+	      </zj-form-module>
+	    </zj-form-container>
+	    <div slot="footer" class="dialog-footer">
+			<el-button v-if="formData.examineStatus == 'WAIT'" size="mini" type="primary" @click="audit('OK')">审核通过</el-button>
+			<el-button v-if="formData.examineStatus == 'WAIT'" size="mini" type="danger" @click="audit('FAIL')">审核驳回</el-button>
+			<el-button size="mini" @click="formCancel">取 消</el-button>
+	    </div>
+	  </el-dialog>
+	</template-page>
+</template>
+
+<script>
+import TemplatePage from '@/components/template/template-page-1.vue'
+import import_mixin from '@/components/template/import_mixin.js'
+import { required, mobileRequired, mobile } from '@/components/template/rules_verify.js'
+import { noticeListPageV2,noticePageExport, getNoticeDetail, readNotice } from "@/api/systemMessage";
+export default {
+  components: { TemplatePage },
+  mixins: [import_mixin],
+  data() {
+    return {
+      // 事件组合
+      optionsEvensGroup: [],
+      // 表格属性
+      tableAttributes: {
+        // 启用勾选列
+        selectColumn: false
+      },
+      // 表格事件
+      tableEvents: {
+        'selection-change': this.selectionChange
+      },
+      // 勾选选中行
+      recordSelected: [],
+      /** 表单变量 */
+      formDialogType: 0,
+      formDialogTitles: ["审核", "详情"],
+      formDialog: false,
+      formData: {
+		type: '工程师',
+		examineRemark: ''
+      },
+	  examineStatus: ''
+    }
+  },
+  computed: {
+    // 更多参数
+    moreParameters() {
+      return []
+    },
+    formItems() {
+      return [{
+        md: 12,
+        isShow: true,
+        name: 'el-select',
+		options: [{label: '待审核', value: 'WAIT'},{label: '驳回', value: 'FAIL'},{label: '通过', value: 'OK'}],
+        attributes: { placeholder: '请输入', disabled: true },
+        formItemAttributes: {
+          label: '审核状态',
+          prop: 'examineStatus',
+          rules: []
+        },
+      }, {
+        md: 12,
+        isShow: true,
+        name: 'el-input',
+        attributes: { disabled: true },
+        formItemAttributes: {
+          label: '用户类型',
+          prop: 'type',
+          rules: []
+        }
+      }, {
+        md: 12,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入', disabled: true },
+        formItemAttributes: {
+          label: '用户名称',
+          prop: 'nickName',
+          rules: []
+        }
+      }, {
+        md: 12,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入', disabled: true },
+        formItemAttributes: {
+          label: '联系电话',
+          prop: 'mobile',
+          rules: []
+        }
+      }, {
+        md: 12,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入', disabled: true },
+        formItemAttributes: {
+          label: '身份证号码',
+          prop: 'idCard',
+          rules: []
+        }
+      }, {
+        md: 12,
+        isShow: true,
+        name: 'el-image',
+        attributes: { src: this.formData.idCardImg },
+        formItemAttributes: {
+          label: '身份证',
+          prop: 'idCardImg',
+          rules: []
+        },
+      }, {
+        md: 12,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入', disabled: true },
+        formItemAttributes: {
+          label: '所属商户',
+          prop: 'companyName',
+          rules: []
+        }
+      }, {
+        md: 12,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入', disabled: true },
+        formItemAttributes: {
+          label: '入驻网点',
+          prop: 'websitName',
+          rules: []
+        }
+      }, {
+        md: 24,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入',type: "textarea", disabled: this.formData.examineStatus == 'WAIT' ? false:true },
+        formItemAttributes: {
+          label: '备注',
+          prop: 'examineRemark',
+          rules: []
+        }
+      }]
+    }
+  },
+  methods: {
+	// 切换状态
+	changeType(val) {
+	  this.$refs.pageRef.refreshList()
+	},
+    // 列表请求函数
+	getList(p) {
+	  try {
+	    var pam = JSON.parse(JSON.stringify(p))
+	    if (this.examineStatus) {
+	      pam.params.push({ "param": "b.examine_status", "compare": "=", "value": this.examineStatus })
+	    }
+	    return noticeListPageV2(pam)
+	  } catch (error) {
+	    console.log(error)
+	  }
+	},
+    // 列表导出函数
+    exportList: noticePageExport,
+    // 表格列解析渲染数据更改
+    columnParsing(item, defaultData) {
+      return defaultData
+    },
+    // 监听勾选变化
+    selectionChange(data) {
+      this.recordSelected = data
+    },
+    // 表格操作列
+    operation(h, { row, index, column }) {
+      return (
+        <div class='operation-btns'>
+          {row.examineStatus == 'WAIT' ? <el-button type="text" onClick={() => {
+            getMemberDetail({ id: row.id }).then(res => {
+              Object.assign(this.formData, res.data)
+              this.formDialogType = 0
+              this.openForm()
+            })
+          }}>审核</el-button> : null}
+          <el-button type="text" onClick={() => {
+            getMemberDetail({ id: row.id }).then(res => {
+              Object.assign(this.formData, res.data)
+              this.formDialogType = 1
+              this.openForm()
+            })
+          }}>详情</el-button>
+		  <el-button type="text" onClick={() => {
+			this.$confirm('请确认是否设为分销员, 是否继续?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				memberInner({
+					type: 'SERVICE',
+					userIds: row.userId
+				}).then(res => {
+					if (res.code == 200) {
+						this.$message({ type: 'success', message: '设为分销员成功!' })
+						this.$refs.pageRef.refreshList()
+					} else {
+						this.$message.error(res.msg);
+					}
+				})
+			});
+		  }}>设为分销员</el-button>
+		  <el-button type="text" onClick={() => {
+			this.$confirm('请确认是否设为客户, 是否继续?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				memberInner({
+					type: 'GENERAL',
+					userIds: row.userId
+				}).then(res => {
+					if (res.code == 200) {
+						this.$message({ type: 'success', message: '设为客户成功!' })
+						this.$refs.pageRef.refreshList()
+					} else {
+						this.$message.error(res.msg);
+					}
+				})
+			});
+		  }}>设为客户</el-button>
+        </div>
+      )
+    },
+    addData() {
+      this.formDialogType = 0
+      this.openForm()
+    },
+    openForm() {
+      this.formDialog = true;
+    },
+    formCancel() {
+      this.$refs.formRef.$refs.inlineForm.clearValidate()
+      this.$data.formData = this.$options.data().formData
+      this.formDialog = false
+    },
+	audit(examineStatusEnum){
+		memberAudit({ 
+			examineStatusEnum,
+			examineRemark: this.formData.examineRemark,
+			id: this.formData.id
+		}).then(res => {
+			this.$message({ type: 'success', message: '审核成功!' })
+			this.formCancel()
+			this.$refs.pageRef.refreshList()
+		})
+	},
+	memberInner(type){
+		memberInner({
+			type,
+			userIds: this.formData.userId
+		}).then(res => {
+			this.$message({ type: 'success', message: '设置成功!' })
+			this.$refs.pageRef.refreshList()
+		})
+	},
+    formConfirm() {
+      this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
+        if (valid) {
+          ([memberAudit][this.formDialogType])(this.formData).then(res => {
+            this.$message({ type: 'success', message: `${this.formDialogTitles[this.formDialogType]}成功!` })
+            this.formCancel()
+            this.$refs.pageRef.refreshList()
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+	.tab{
+		padding: 20px 20px 0 20px;
+	}
+</style>