fix:消息管理新增过期按钮

fix:班组出勤新增编辑按钮
fix:工位管理是否显示优化

src/api/system/message/index.ts

@@ -8,6 +8,14 @@ export function addMessage(data: any) {
   });
 }
 
+export function overEnd(id: any) {
+  return request({
+    url: "/api/v1/sys/message/overEnd",
+    method: "post",
+    data: {id: id},
+  });
+}
+
 export function updateMessage( data: any) {
   return request({
     url: "/api/v1/sys/message/update",

src/views/base/modeling/station/index.vue

@@ -316,7 +316,15 @@ option.value = Object.assign(option.value, {
           value: 0,
         },
       ],
-      value: "0",
+      html: true,
+      formatter: (val) => {
+        if (val.isShowData === 0) {
+          return '<b class="el-tag el-tag--success el-tag--light">是</b>';
+        } else if (val.isShowData === 1) {
+          return '<b class="el-tag el-tag--danger el-tag--light">否</b>';
+        }
+      },
+      value: 0,
     },
     /*{ label: "启用状态",
         slot:true,

src/views/plan/attendanceStatistics/index.vue

@@ -58,7 +58,7 @@ option.value = Object.assign(option.value, {
   delBtn: true,
   addBtn: true,
   viewBtn: false,
-  editBtn: false,
+  editBtn: true,
   rowKey: "id",
   column: [
     // {

src/views/system/message/index.vue

@@ -27,13 +27,20 @@
       </template>
       <template #menu="{ size, row, index }">
         <el-button
-          v-if="row.state === '0'"
+          v-if="row.state === '0' || (row.type === '5' && row.state !== '2')"
           type="primary"
           link
           size="small"
           @click="handleEdit(row, 0)"
           ><i-ep-edit />编辑
         </el-button>
+        <el-button
+          v-if="row.state === '1' && row.type === '5'"
+          type="danger"
+          size="small"
+          @click="overMessage(row.id)"
+        >过期
+        </el-button>
 
         <el-button
           type="primary"
@@ -125,7 +132,7 @@
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import Editor from "@/views/system/message/editor/index.vue";
-import { addMessage, updateMessage } from "@/api/system/message";
+import {addMessage, updateMessage, overEnd} from "@/api/system/message";
 import { useCommonStoreHook } from "@/store";
 import { getUserList } from "@/api/system/user";
 import { queryDictDataByType } from "@/api/system/dict";
@@ -170,6 +177,23 @@ const handleSubmit = () => {
     }
   });
 };
+const overMessage = (id) => {
+  ElMessageBox.confirm("确定要过期吗？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+    lockScroll: false,
+  }).then(() => {
+    overEnd(id).then((data) => {
+      if (data.code === "200") {
+        ElMessage.success(data.msg);
+        dataList();
+      } else {
+        ElMessage.error(data.msg);
+      }
+    })
+  });
+};
 const handleEdit = (row, index) => {
   message.value = row;
   editorContent.value = row.content;
@@ -241,7 +265,7 @@ const queryUserList = () => {
 // 设置表格列或者其他自定义的option
 option.value = Object.assign(option.value, {
   searchEnter: true,
-  delBtn: false,
+  delBtn: true,
   selection: false,
   addBtn: false,
   editBtn: false,
@@ -300,6 +324,7 @@ option.value = Object.assign(option.value, {
       dicData: [
         { label: "暂存", value: "0" },
         { label: "已发送", value: "1" },
+        {label: "过期", value: "2"},
       ],
       html: true,
       formatter: (val) => {
@@ -307,6 +332,8 @@ option.value = Object.assign(option.value, {
           return '<b class="el-tag el-tag--warning el-tag--light">暂存</b>';
         } else if (val.state === "1") {
           return '<b class="el-tag el-tag--success el-tag--light">已发送</b>';
+        } else if (val.state === "2") {
+          return '<b class="el-tag el-tag--danger el-tag--light">过期</b>';
         }
       },
     },