From 251d2411f235e23209d57173857e05b637729ce8 Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: 星期日, 02 四月 2023 01:01:56 +0800
Subject: [PATCH] refactor ts

---
 src/views/system/notice/index.vue |  461 ++++++++++++++++++++++++++-------------------------------
 1 files changed, 213 insertions(+), 248 deletions(-)

diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 7e04255..ab68a1a 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -1,283 +1,248 @@
-<template>
-   <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-         <el-form-item label="鍏憡鏍囬" prop="noticeTitle">
-            <el-input
-               v-model="queryParams.noticeTitle"
-               placeholder="璇疯緭鍏ュ叕鍛婃爣棰�"
-               clearable
-               style="width: 200px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="鎿嶄綔浜哄憳" prop="createByName">
-            <el-input
-               v-model="queryParams.createByName"
-               placeholder="璇疯緭鍏ユ搷浣滀汉鍛�"
-               clearable
-               style="width: 200px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="绫诲瀷" prop="noticeType">
-            <el-select v-model="queryParams.noticeType" placeholder="鍏憡绫诲瀷" clearable style="width: 200px">
-               <el-option
-                  v-for="dict in sys_notice_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-               />
-            </el-select>
-         </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
-            <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
-         </el-form-item>
-      </el-form>
-
-      <el-row :gutter="10" class="mb8">
-         <el-col :span="1.5">
-            <el-button
-               type="primary"
-               plain
-               icon="Plus"
-               @click="handleAdd"
-               v-hasPermi="['system:notice:add']"
-            >鏂板</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="success"
-               plain
-               icon="Edit"
-               :disabled="single"
-               @click="handleUpdate"
-               v-hasPermi="['system:notice:edit']"
-            >淇敼</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="danger"
-               plain
-               icon="Delete"
-               :disabled="multiple"
-               @click="handleDelete"
-               v-hasPermi="['system:notice:remove']"
-            >鍒犻櫎</el-button>
-         </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-
-      <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
-         <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="搴忓彿" align="center" prop="noticeId" width="100" v-if="false" />
-         <el-table-column
-            label="鍏憡鏍囬"
-            align="center"
-            prop="noticeTitle"
-            :show-overflow-tooltip="true"
-         />
-         <el-table-column label="鍏憡绫诲瀷" align="center" prop="noticeType" width="100">
-            <template #default="scope">
-               <dict-tag :options="sys_notice_type" :value="scope.row.noticeType" />
-            </template>
-         </el-table-column>
-         <el-table-column label="鐘舵��" align="center" prop="status" width="100">
-            <template #default="scope">
-               <dict-tag :options="sys_notice_status" :value="scope.row.status" />
-            </template>
-         </el-table-column>
-         <el-table-column label="鍒涘缓鑰�" align="center" prop="createByName" width="100" />
-         <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="100">
-            <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-            </template>
-         </el-table-column>
-         <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
-            <template #default="scope">
-               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:notice:edit']">淇敼</el-button>
-               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:notice:remove']" >鍒犻櫎</el-button>
-            </template>
-         </el-table-column>
-      </el-table>
-
-      <pagination
-         v-show="total > 0"
-         :total="total"
-         v-model:page="queryParams.pageNum"
-         v-model:limit="queryParams.pageSize"
-         @pagination="getList"
-      />
-
-      <!-- 娣诲姞鎴栦慨鏀瑰叕鍛婂璇濇 -->
-      <el-dialog :title="title" v-model="open" width="780px" append-to-body>
-         <el-form ref="noticeRef" :model="form" :rules="rules" label-width="80px">
-            <el-row>
-               <el-col :span="12">
-                  <el-form-item label="鍏憡鏍囬" prop="noticeTitle">
-                     <el-input v-model="form.noticeTitle" placeholder="璇疯緭鍏ュ叕鍛婃爣棰�" />
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12">
-                  <el-form-item label="鍏憡绫诲瀷" prop="noticeType">
-                     <el-select v-model="form.noticeType" placeholder="璇烽�夋嫨">
-                        <el-option
-                           v-for="dict in sys_notice_type"
-                           :key="dict.value"
-                           :label="dict.label"
-                           :value="dict.value"
-                        ></el-option>
-                     </el-select>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="24">
-                  <el-form-item label="鐘舵��">
-                     <el-radio-group v-model="form.status">
-                        <el-radio
-                           v-for="dict in sys_notice_status"
-                           :key="dict.value"
-                           :label="dict.value"
-                        >{{ dict.label }}</el-radio>
-                     </el-radio-group>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="24">
-                  <el-form-item label="鍐呭">
-                    <editor v-model="form.noticeContent" :min-height="192"/>
-                  </el-form-item>
-               </el-col>
-            </el-row>
-         </el-form>
-         <template #footer>
-            <div class="dialog-footer">
-               <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
-               <el-button @click="cancel">鍙� 娑�</el-button>
-            </div>
-         </template>
-      </el-dialog>
-   </div>
-</template>
-
-<script setup name="Notice">
+<script setup name="Notice" lang="ts">
 import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api/system/notice";
+import { ComponentInternalInstance } from "vue";
+import { NoticeForm, NoticeQuery, NoticeVO } from "@/api/system/notice/types";
+import { ElForm } from 'element-plus';
 
-const { proxy } = getCurrentInstance();
-const { sys_notice_status, sys_notice_type } = proxy.useDict("sys_notice_status", "sys_notice_type");
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { sys_notice_status, sys_notice_type } = toRefs<any>(proxy?.useDict("sys_notice_status", "sys_notice_type"));
 
-const noticeList = ref([]);
-const open = ref(false);
+const noticeList = ref<NoticeVO[]>([]);
 const loading = ref(true);
 const showSearch = ref(true);
-const ids = ref([]);
+const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const title = ref("");
 
-const data = reactive({
-  form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    noticeTitle: undefined,
-    createByName: undefined,
-    status: undefined
-  },
-  rules: {
-    noticeTitle: [{ required: true, message: "鍏憡鏍囬涓嶈兘涓虹┖", trigger: "blur" }],
-    noticeType: [{ required: true, message: "鍏憡绫诲瀷涓嶈兘涓虹┖", trigger: "change" }]
-  },
+const queryFormRef = ref(ElForm);
+const noticeFormRef = ref(ElForm);
+
+
+const dialog = reactive<DialogOption>({
+	visible: false,
+	title: ''
+});
+
+const initFormData: NoticeForm = {
+	noticeId: undefined,
+	noticeTitle: '',
+	noticeType: '',
+	noticeContent: '',
+	status: "0",
+	remark: '',
+	createByName: ''
+}
+const data = reactive<PageData<NoticeForm, NoticeQuery>>({
+	form: { ...initFormData },
+	queryParams: {
+		pageNum: 1,
+		pageSize: 10,
+		noticeTitle: '',
+		createByName: '',
+		status: '',
+		noticeType: ''
+	},
+	rules: {
+		noticeTitle: [{ required: true, message: "鍏憡鏍囬涓嶈兘涓虹┖", trigger: "blur" }],
+		noticeType: [{ required: true, message: "鍏憡绫诲瀷涓嶈兘涓虹┖", trigger: "change" }]
+	},
 });
 
 const { queryParams, form, rules } = toRefs(data);
 
 /** 鏌ヨ鍏憡鍒楄〃 */
-function getList() {
-  loading.value = true;
-  listNotice(queryParams.value).then(response => {
-    noticeList.value = response.rows;
-    total.value = response.total;
-    loading.value = false;
-  });
+const getList = async () => {
+	loading.value = true;
+	const res = await listNotice(queryParams.value);
+	noticeList.value = res.rows;
+	total.value = res.total;
+	loading.value = false;
 }
 /** 鍙栨秷鎸夐挳 */
-function cancel() {
-  open.value = false;
-  reset();
+const cancel = () => {
+	reset();
+	dialog.visible = false;
 }
 /** 琛ㄥ崟閲嶇疆 */
-function reset() {
-  form.value = {
-    noticeId: undefined,
-    noticeTitle: undefined,
-    noticeType: undefined,
-    noticeContent: undefined,
-    status: "0"
-  };
-  proxy.resetForm("noticeRef");
+const reset = () => {
+	form.value = { ...initFormData };
+	noticeFormRef.value.resetFields();
 }
 /** 鎼滅储鎸夐挳鎿嶄綔 */
-function handleQuery() {
-  queryParams.value.pageNum = 1;
-  getList();
+const handleQuery = () => {
+	queryParams.value.pageNum = 1;
+	getList();
 }
 /** 閲嶇疆鎸夐挳鎿嶄綔 */
-function resetQuery() {
-  proxy.resetForm("queryRef");
-  handleQuery();
+const resetQuery = () => {
+	queryFormRef.value.resetFields();
+	handleQuery();
 }
 /** 澶氶�夋閫変腑鏁版嵁 */
-function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.noticeId);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
+const handleSelectionChange = (selection: NoticeVO[]) => {
+	ids.value = selection.map(item => item.noticeId);
+	single.value = selection.length != 1;
+	multiple.value = !selection.length;
 }
 /** 鏂板鎸夐挳鎿嶄綔 */
-function handleAdd() {
-  reset();
-  open.value = true;
-  title.value = "娣诲姞鍏憡";
+const handleAdd = () => {
+	dialog.visible = true;
+	dialog.title = "娣诲姞鍏憡";
+	nextTick(() => {
+		reset();
+	})
 }
 /**淇敼鎸夐挳鎿嶄綔 */
-function handleUpdate(row) {
-  reset();
-  const noticeId = row.noticeId || ids.value;
-  getNotice(noticeId).then(response => {
-    form.value = response.data;
-    open.value = true;
-    title.value = "淇敼鍏憡";
-  });
+const handleUpdate = (row?: NoticeVO) => {
+	dialog.visible = true;
+	dialog.title = "淇敼鍏憡";
+	nextTick(async () => {
+		const noticeId = row?.noticeId || ids.value[0];
+		reset();
+		const { data } = await getNotice(noticeId);
+		form.value = data;
+	})
 }
 /** 鎻愪氦鎸夐挳 */
-function submitForm() {
-  proxy.$refs["noticeRef"].validate(valid => {
-    if (valid) {
-      if (form.value.noticeId != undefined) {
-        updateNotice(form.value).then(response => {
-          proxy.$modal.msgSuccess("淇敼鎴愬姛");
-          open.value = false;
-          getList();
-        });
-      } else {
-        addNotice(form.value).then(response => {
-          proxy.$modal.msgSuccess("鏂板鎴愬姛");
-          open.value = false;
-          getList();
-        });
-      }
-    }
-  });
+const submitForm = () => {
+	noticeFormRef.value.validate(async (valid: boolean) => {
+		if (valid) {
+			form.value.noticeId ? await updateNotice(form.value) : await addNotice(form.value);
+			proxy?.$modal.msgSuccess("淇敼鎴愬姛");
+			dialog.visible = false;
+			getList();
+		}
+	});
 }
 /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-function handleDelete(row) {
-  const noticeIds = row.noticeId || ids.value
-  proxy.$modal.confirm('鏄惁纭鍒犻櫎鍏憡缂栧彿涓�"' + noticeIds + '"鐨勬暟鎹」锛�').then(function() {
-    return delNotice(noticeIds);
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-  }).catch(() => {});
+const handleDelete = async (row?: NoticeVO) => {
+	const noticeIds = row?.noticeId || ids.value
+	await proxy?.$modal.confirm('鏄惁纭鍒犻櫎鍏憡缂栧彿涓�"' + noticeIds + '"鐨勬暟鎹」锛�');
+	await delNotice(noticeIds);
+	getList();
+	proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
 }
 
-getList();
+onMounted(() => {
+	getList();
+})
 </script>
+<template>
+	<div class="p-2">
+		<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+			<div class="search" v-show="showSearch">
+				<el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+					<el-form-item label="鍏憡鏍囬" prop="noticeTitle">
+						<el-input v-model="queryParams.noticeTitle" placeholder="璇疯緭鍏ュ叕鍛婃爣棰�" clearable style="width: 200px" @keyup.enter="handleQuery" />
+					</el-form-item>
+					<el-form-item label="鎿嶄綔浜哄憳" prop="createByName">
+						<el-input v-model="queryParams.createByName" placeholder="璇疯緭鍏ユ搷浣滀汉鍛�" clearable style="width: 200px" @keyup.enter="handleQuery" />
+					</el-form-item>
+					<el-form-item label="绫诲瀷" prop="noticeType">
+						<el-select v-model="queryParams.noticeType" placeholder="鍏憡绫诲瀷" clearable style="width: 200px">
+							<el-option v-for="dict in sys_notice_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+						</el-select>
+					</el-form-item>
+					<el-form-item>
+						<el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+						<el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+		</transition>
+
+		<el-card shadow="never">
+			<template #header>
+				<el-row :gutter="10" class="mb8">
+					<el-col :span="1.5">
+						<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:notice:add']">鏂板</el-button>
+					</el-col>
+					<el-col :span="1.5">
+						<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:notice:edit']"
+							>淇敼</el-button
+						>
+					</el-col>
+					<el-col :span="1.5">
+						<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:notice:remove']">
+							鍒犻櫎
+						</el-button>
+					</el-col>
+					<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+				</el-row>
+			</template>
+
+			<el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
+				<el-table-column type="selection" width="55" align="center" />
+				<el-table-column label="搴忓彿" align="center" prop="noticeId" width="100" v-if="false" />
+				<el-table-column label="鍏憡鏍囬" align="center" prop="noticeTitle" :show-overflow-tooltip="true" />
+				<el-table-column label="鍏憡绫诲瀷" align="center" prop="noticeType" width="100">
+					<template #default="scope">
+						<dict-tag :options="sys_notice_type" :value="scope.row.noticeType" />
+					</template>
+				</el-table-column>
+				<el-table-column label="鐘舵��" align="center" prop="status" width="100">
+					<template #default="scope">
+						<dict-tag :options="sys_notice_status" :value="scope.row.status" />
+					</template>
+				</el-table-column>
+				<el-table-column label="鍒涘缓鑰�" align="center" prop="createByName" width="100" />
+				<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="100">
+					<template #default="scope">
+						<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+					<template #default="scope">
+						<el-tooltip content="淇敼" placement="top">
+							<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:notice:edit']"></el-button>
+						</el-tooltip>
+						<el-tooltip content="鍒犻櫎" placement="top">
+							<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:notice:remove']"></el-button>
+						</el-tooltip>
+					</template>
+				</el-table-column>
+			</el-table>
+
+			<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+		</el-card>
+		<!-- 娣诲姞鎴栦慨鏀瑰叕鍛婂璇濇 -->
+		<el-dialog :title="dialog.title" v-model="dialog.visible" width="780px" append-to-body>
+			<el-form ref="noticeFormRef" :model="form" :rules="rules" label-width="80px">
+				<el-row>
+					<el-col :span="12">
+						<el-form-item label="鍏憡鏍囬" prop="noticeTitle">
+							<el-input v-model="form.noticeTitle" placeholder="璇疯緭鍏ュ叕鍛婃爣棰�" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="鍏憡绫诲瀷" prop="noticeType">
+							<el-select v-model="form.noticeType" placeholder="璇烽�夋嫨">
+								<el-option v-for="dict in sys_notice_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="鐘舵��">
+							<el-radio-group v-model="form.status">
+								<el-radio v-for="dict in sys_notice_status" :key="dict.value" :label="dict.value">{{ dict.label
+								}}</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="鍐呭">
+							<editor v-model="form.noticeContent" :min-height="192" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<template #footer>
+				<div class="dialog-footer">
+					<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+					<el-button @click="cancel">鍙� 娑�</el-button>
+				</div>
+			</template>
+		</el-dialog>
+	</div>
+</template>

--
Gitblit v1.9.3