no message

src/api/announcement.js

@@ -24,12 +24,19 @@ export function noticeAdd(data) {
     data
   })
 }
+export function noticeUpdate(data) {
+  return request({
+    url: '/notice/update',
+    method: 'post',
+    data
+  })
+}
 
-export function noticeDel(data) {
+export function noticeDel(params) {
   return request({
     url: '/notice/mark/del',
     method: 'post',
-    data
+    params
   })
 }
 

src/views/setting/notification/announcement/index.vue

@@ -31,7 +31,7 @@ import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 import ImageUpload from '@/components/file-upload'
 import { required, mobileRequired, mobile } from '@/components/template/rules_verify.js'
-import { noticeListPageV2, noticePageExport, getNoticeDetail, noticeAdd, noticeDel } from "@/api/announcement";
+import { noticeListPageV2, noticePageExport, getNoticeDetail, noticeAdd, noticeUpdate, noticeDel } from "@/api/announcement";
 import { memberListPageV2 } from "@/api/masterManagement";
 import { getList as getListaa } from "@/api/merchant";
 export default {
@@ -246,6 +246,22 @@ export default {
 						this.openForm()
 					})
 				}}>查看</el-button>
+				{row.status == "NO" ? <el-popconfirm
+					title={`是否确定删除？`}
+					onConfirm={() => {
+						noticeDel({
+							noticeIds: row.noticeId
+						}).then(res => {
+							this.$message({
+								type: 'success',
+								message: '删除成功!'
+							})
+							this.$refs.pageRef.refreshList()
+						})
+					}}
+				>
+					<el-button type="text" slot="reference">删除</el-button>
+				</el-popconfirm> : null}
 			</div>)
 		},
 		addData() {
@@ -254,7 +270,7 @@ export default {
 		},
 		openForm() {
 			if (JSON.parse(localStorage.getItem("greemall_user")).type == 2) {
-				getListaa({ pageNum: 1, pageSize: -1 }).then((res) => {
+				getListaa({ pageNum: 1, pageSize: -1, type: 1 }).then((res) => {
 					this.websitList = res.data.records
 					this.formDialog = true;
 				})
@@ -274,7 +290,7 @@ export default {
 		formConfirm(status) {
 			this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
 				if (valid) {
-					noticeAdd({
+					[noticeAdd, noticeUpdate][this.formDialogType]({
 						...this.formData,
 						files: this.formData.files.map(item => ({
 							...item,
@@ -285,7 +301,7 @@ export default {
 					}).then(res => {
 						this.$message({
 							type: 'success',
-							message: '保存成功!'
+							message: status == "YES" ? '发送成功!' : '保存成功!'
 						})
 						this.formCancel()
 						this.$refs.pageRef.refreshList()

src/views/setting/notification/systemMessage/index.vue

@@ -11,6 +11,8 @@
 			</zj-form-container>
 			<div slot="footer" class="dialog-footer">
 				<el-button size="mini" @click="formCancel">取 消</el-button>
+				<el-button v-if="formDialogType < 2" size="mini" type="primary" @click="formConfirm('NO')">保存</el-button>
+				<el-button v-if="formDialogType < 2" size="mini" type="primary" @click="formConfirm('YES')">发布</el-button>
 			</div>
 		</el-dialog>
 	</template-page>
@@ -21,7 +23,7 @@ import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 import ImageUpload from '@/components/file-upload'
 import { required, mobileRequired, mobile } from '@/components/template/rules_verify.js'
-import { noticeListPageV2, noticePageExport, getNoticeDetail, noticeAdd, noticeDel } from "@/api/announcement";
+import { noticeListPageV2, noticePageExport, getNoticeDetail, noticeAdd, noticeUpdate, noticeDel } from "@/api/announcement";
 import { memberListPageV2 } from "@/api/masterManagement";
 import { getList as getListaa } from "@/api/merchant";
 export default {
@@ -30,7 +32,16 @@ export default {
 	data() {
 		return {
 			// 事件组合
-			optionsEvensGroup: [],
+			optionsEvensGroup: [
+				[
+					[
+						{
+							name: '新建',
+							click: this.addData
+						}
+					],
+				],
+			],
 			// 表格属性
 			tableAttributes: {
 				// 启用勾选列
@@ -83,7 +94,7 @@ export default {
 				formItemAttributes: {
 					label: '类型',
 					prop: 'type',
-					rules: [{ required: true, message: '请选择', trigger: 'blur' }]
+					rules: [...required]
 				},
 			},
 			{
@@ -94,7 +105,7 @@ export default {
 				formItemAttributes: {
 					label: '标题',
 					prop: 'title',
-					rules: [{ required: true, message: '请选择', trigger: 'blur' }]
+					rules: [...required]
 				}
 			},
 			{
@@ -112,7 +123,7 @@ export default {
 				formItemAttributes: {
 					label: '选择商户',
 					prop: 'adminWebsitIds',
-					rules: [{ required: true, message: '请选择', trigger: 'blur' }]
+					rules: [...required]
 				}
 			},
 			{
@@ -130,7 +141,7 @@ export default {
 				formItemAttributes: {
 					label: '选择师傅',
 					prop: 'workerIds',
-					rules: [{ required: true, message: '请选择', trigger: 'blur' }]
+					rules: [...required]
 				}
 			},
 			{
@@ -156,7 +167,7 @@ export default {
 				formItemAttributes: {
 					label: '内容',
 					prop: 'content',
-					rules: [{ required: true, message: '请输入', trigger: 'blur' }]
+					rules: [...required]
 				},
 				render: (h, { props, onInput }) => {
 					var { value } = props
@@ -169,7 +180,7 @@ export default {
 	},
 	methods: {
 		// 列表请求函数
-		getList: noticeListPageV2,
+		getList:noticeListPageV2,
 		// 列表导出函数
 		exportList: noticePageExport,
 		// 表格列解析渲染数据更改
@@ -200,12 +211,13 @@ export default {
 				}}>查看</el-button>
 			</div>)
 		},
+		addData() {
+			this.formDialogType = 0
+			this.openForm()
+		},
 		openForm() {
 			if (JSON.parse(localStorage.getItem("greemall_user")).type == 2) {
-				getListaa({
-					pageNum: 1,
-					pageSize: -1,
-				}).then((res) => {
+				getListaa({ pageNum: 1, pageSize: -1, type: 1 }).then((res) => {
 					this.websitList = res.data.records
 					this.formDialog = true;
 				})