From 5b30b23ad3bdfcb79b8c3256c7f06443d68317e0 Mon Sep 17 00:00:00 2001
From: wwz <1144797966@qq.com>
Date: Thu, 10 Apr 2025 14:29:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=80=9A=E7=9F=A5=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/notifications/index.ts                |  4 +-
 .../inventory/consumables/config/content.ts   |  1 +
 .../inventory/consumables/config/search.ts    | 15 ++---
 src/views/inventory/consumables/index.vue     | 10 ++++
 .../libraryrecords/config/content.ts          |  7 +--
 src/views/inventory/supplier/config/add.ts    |  4 +-
 .../inventory/supplier/config/content.ts      | 16 ++---
 src/views/inventory/supplier/config/edit.ts   |  4 +-
 src/views/notifications/config/content.ts     |  6 +-
 src/views/notifications/config/search.ts      | 12 ++--
 src/views/notifications/index.vue             | 59 +++++++++++++++----
 11 files changed, 90 insertions(+), 48 deletions(-)

diff --git a/src/api/notifications/index.ts b/src/api/notifications/index.ts
index 823c684..21e0a13 100644
--- a/src/api/notifications/index.ts
+++ b/src/api/notifications/index.ts
@@ -34,7 +34,7 @@ const Api = {
   },
   edit(data: any) {
     return request<any>({
-      url: `${baseURL}/read`,
+      url: `${baseURL}/syncNotice/read`,
       method: "put",
       data,
     });
@@ -42,7 +42,7 @@ const Api = {
 
   delete(id: string | number) {
     return request<any>({
-      url: `${baseURL}/syncNotice/` + id,
+      url: `${baseURL}/syncNotice?id=` + id,
       method: "delete",
     });
   },
diff --git a/src/views/inventory/consumables/config/content.ts b/src/views/inventory/consumables/config/content.ts
index c903506..d67e45e 100644
--- a/src/views/inventory/consumables/config/content.ts
+++ b/src/views/inventory/consumables/config/content.ts
@@ -25,6 +25,7 @@ const contentConfig: IContentConfig = {
   // modifyAction: function (data) {
   //   // return Api.edit(data);
   // },
+  indexActionData: {},
   pk: "id",
   toolbar: [
     "add",
diff --git a/src/views/inventory/consumables/config/search.ts b/src/views/inventory/consumables/config/search.ts
index 358c721..bd66ccf 100644
--- a/src/views/inventory/consumables/config/search.ts
+++ b/src/views/inventory/consumables/config/search.ts
@@ -1,5 +1,5 @@
 import type { ISearchConfig } from "@/components/CURD/types";
-import consGroupApi from '@/api/product/cons-group'
+import consGroupApi from "@/api/product/cons-group";
 import { statusOptions, payTypeOptions } from "./config";
 const searchConfig: ISearchConfig = {
   pageName: "sys:user",
@@ -20,14 +20,14 @@ const searchConfig: ISearchConfig = {
       initialValue: "",
       initFn(formItem) {
         console.log(formItem);
-        consGroupApi.getAllList({}).then(res => {
-          formItem.options = res.map((item: { name: any; id: any; }) => {
+        consGroupApi.getAllList({}).then((res) => {
+          formItem.options = res.map((item: { name: any; id: any }) => {
             return {
               label: item?.name,
-              value: item?.id
-            }
-          })
-        })
+              value: item?.id,
+            };
+          });
+        });
       },
     },
 
@@ -42,6 +42,7 @@ const searchConfig: ISearchConfig = {
           width: "200px",
         },
       },
+      initialValue: "",
     },
     {
       type: "date-picker",
diff --git a/src/views/inventory/consumables/index.vue b/src/views/inventory/consumables/index.vue
index edcde80..8092ad7 100644
--- a/src/views/inventory/consumables/index.vue
+++ b/src/views/inventory/consumables/index.vue
@@ -136,6 +136,16 @@ function toGoods(id: number | string) {
   router.push({ path: "/product/index", query: { id: id } });
 }
 
+// 默认初始数据
+const route = useRoute();
+const { conName } = route.query;
+if (conName) {
+  contentConfig.indexActionData = { conName };
+  if (conName) {
+    searchConfig.formItems[1].initialValue = conName;
+  }
+}
+
 //统计数据
 const gongjiData = reactive({ totalRow: 0 });
 function getTongji(params: IObject | undefined) {
diff --git a/src/views/inventory/libraryrecords/config/content.ts b/src/views/inventory/libraryrecords/config/content.ts
index 2f4043b..8ff83e9 100644
--- a/src/views/inventory/libraryrecords/config/content.ts
+++ b/src/views/inventory/libraryrecords/config/content.ts
@@ -54,15 +54,10 @@ const contentConfig: IContentConfig = {
       align: "center",
       prop: "unitName",
     },
-    {
-      label: "所属商品",
-      align: "center",
-      prop: "unitName",
-    },
     {
       label: "供应商",
       align: "center",
-      prop: "unitName",
+      prop: "vendorName",
     },
     {
       label: "变动原因",
diff --git a/src/views/inventory/supplier/config/add.ts b/src/views/inventory/supplier/config/add.ts
index 0f42129..b1c9ed3 100644
--- a/src/views/inventory/supplier/config/add.ts
+++ b/src/views/inventory/supplier/config/add.ts
@@ -19,7 +19,6 @@ const modalConfig: IModalConfig = {
     console.log("提交之前处理", data);
   },
   formItems: [
-
     {
       label: "名称",
       prop: "name",
@@ -41,7 +40,7 @@ const modalConfig: IModalConfig = {
       prop: "telephone",
       rules: [{ required: false, message: "请输入联系人名字", trigger: "blur" }],
       attrs: {
-        placeholder: "请输入联系人名字",
+        placeholder: "请输入联系人电话",
       },
     },
     {
@@ -69,7 +68,6 @@ const modalConfig: IModalConfig = {
         placeholder: "请输入排序",
       },
     },
-
   ],
 };
 
diff --git a/src/views/inventory/supplier/config/content.ts b/src/views/inventory/supplier/config/content.ts
index a7549b0..81ac465 100644
--- a/src/views/inventory/supplier/config/content.ts
+++ b/src/views/inventory/supplier/config/content.ts
@@ -57,13 +57,13 @@ const contentConfig: IContentConfig = {
       align: "center",
       prop: "createTime",
     },
-    {
-      label: "状态",
-      align: "center",
-      prop: "status",
-      templet: 'custom',
-      slotName: 'switch'
-    },
+    // {
+    //   label: "状态",
+    //   align: "center",
+    //   prop: "status",
+    //   templet: 'custom',
+    //   slotName: 'switch'
+    // },
 
     {
       label: "操作",
@@ -71,7 +71,7 @@ const contentConfig: IContentConfig = {
       fixed: "right",
       width: 280,
       templet: "tool",
-      operat: ["edit", 'delete'],
+      operat: ["edit", "delete"],
     },
   ],
 };
diff --git a/src/views/inventory/supplier/config/edit.ts b/src/views/inventory/supplier/config/edit.ts
index 77ec8fd..1296e12 100644
--- a/src/views/inventory/supplier/config/edit.ts
+++ b/src/views/inventory/supplier/config/edit.ts
@@ -19,7 +19,6 @@ const modalConfig: IModalConfig = {
     console.log("提交之前处理", data);
   },
   formItems: [
-
     {
       label: "名称",
       prop: "name",
@@ -41,7 +40,7 @@ const modalConfig: IModalConfig = {
       prop: "telephone",
       rules: [{ required: false, message: "请输入联系人名字", trigger: "blur" }],
       attrs: {
-        placeholder: "请输入联系人名字",
+        placeholder: "请输入联系人电话",
       },
     },
     {
@@ -69,7 +68,6 @@ const modalConfig: IModalConfig = {
         placeholder: "请输入排序",
       },
     },
-
   ],
 };
 
diff --git a/src/views/notifications/config/content.ts b/src/views/notifications/config/content.ts
index 1018f9b..e9417de 100644
--- a/src/views/notifications/config/content.ts
+++ b/src/views/notifications/config/content.ts
@@ -47,9 +47,7 @@ const contentConfig: IContentConfig = {
     {
       label: "通知类型",
       align: "center",
-      prop: "type",
-      slotName: "type",
-      templet: "custom",
+      prop: "title",
     },
     {
       label: "是否已读",
@@ -63,7 +61,7 @@ const contentConfig: IContentConfig = {
       align: "center",
       prop: "content",
       slotName: "content",
-      templet: "list",
+      templet: "custom",
     },
     {
       label: "创建时间",
diff --git a/src/views/notifications/config/search.ts b/src/views/notifications/config/search.ts
index 951dd38..9fbd8c9 100644
--- a/src/views/notifications/config/search.ts
+++ b/src/views/notifications/config/search.ts
@@ -16,12 +16,16 @@ const searchConfig: ISearchConfig = {
       },
       options: [
         {
-          label: "商品",
-          value: "0",
+          label: "数据同步",
+          value: "数据同步",
         },
         {
-          label: "耗材",
-          value: "1",
+          label: "数据变动",
+          value: "数据变动",
+        },
+        {
+          label: "库存预警",
+          value: "库存预警",
         },
       ],
     },
diff --git a/src/views/notifications/index.vue b/src/views/notifications/index.vue
index c46a9d5..645854c 100644
--- a/src/views/notifications/index.vue
+++ b/src/views/notifications/index.vue
@@ -7,8 +7,24 @@
     <page-content ref="contentRef" :content-config="contentConfig" @add-click="handleAddClick"
       @edit-click="handleEditClick" @export-click="handleExportClick" @search-click="handleSearchClick"
       @toolbar-click="handleToolbarClick" @operat-click="handleOperatClick" @filter-change="handleFilterChange">
-      <template #type="scope">
-        {{ scope.row.type == 1 ? "耗材变动" : "商品变动 " }}
+      <!-- <template #type="scope">
+        <span v-if="scope.row.type == 0">商品新增</span>
+        <span v-if="scope.row.type == 1">商品编辑</span>
+        <span v-if="scope.row.type == 2">耗材新增</span>
+        <span v-if="scope.row.type == 3">耗材编辑</span>
+      </template> -->
+      <template #content="scope">
+        <span>{{ scope.row.title }}</span>
+        <!-- <span v-if="scope.row.type == 1">商品编辑</span>
+        <span v-if="scope.row.type == 2">耗材新增</span>
+        <span v-if="scope.row.type == 3">耗材编辑</span> -->
+        <div v-for="(item, index) in matchedProducts(scope.row.content)" :key="index">
+          <span v-for="i in item.map" :key="i.id" style="color: #6161f7" @click="handleContentClick(scope, i)">
+            {{ i.name }},
+          </span>
+        </div>
+
+        请及时确认
       </template>
       <template #isRead="scope">
         <el-tag :type="scope.row.isRead == 1 ? 'success' : 'info'">
@@ -22,9 +38,11 @@
             justify-content: center;
             align-items: center;
           ">
-          <el-button link type="primary" @click="refAddHaocaiTakinShow(scope.row, '')">
-            设为已读
-          </el-button>
+          <div>
+            <el-button link type="primary" @click="refAddHaocaiTakinShow(scope.row, '')">
+              设为已读
+            </el-button>
+          </div>
           <el-button link type="primary" @click="refAddHaocaiTakinShow(scope.row, 'delete')">
             删除
           </el-button>
@@ -49,6 +67,8 @@ import contentConfig from "./config/content";
 import editModalConfig from "./config/edit";
 import searchConfig from "./config/search";
 import Api from "@/api/notifications";
+import router from "@/router";
+import { log } from "console";
 
 const {
   searchRef,
@@ -75,30 +95,47 @@ async function handleEditClick(row: IObject) {
   editModalRef.value?.handleDisabled(false);
   editModalRef.value?.setModalVisible();
   // 根据id获取数据进行填充
-  console.log(row);
   editModalRef.value?.setFormData({ ...row });
 }
-1;
 // 其他工具栏
 function handleToolbarClick(name: string) {
-  console.log(name);
   if (name === "custom1") {
     ElMessage.success("点击了自定义1按钮");
   }
 }
 
+const matchedProducts = (data: string) => {
+  return JSON.parse(data);
+};
+
 //删除
-function refAddHaocaiTakinShow(item: any, type: string) {
-  console.log(item);
+async function refAddHaocaiTakinShow(item: any, type: string) {
   if (type === "delete") {
     Api.delete(item.id);
   } else {
-    Api.edit(item.id);
+    Api.edit({
+      noticeIdList: [item.id],
+    });
   }
+  contentRef.value?.fetchPageData();
 }
 
 // 其他操作列
 async function handleOperatClick(data: IOperatData) {
   console.log(data);
 }
+// Handle content click
+function handleContentClick(scope: any, item: any) {
+  if (scope.type == "1" || scope.type == "0") {
+    router.push({
+      path: "/product/addgoods",
+      query: { goods_id: item.id },
+    });
+  } else {
+    router.push({
+      path: "/inventory/consumables",
+      query: { conName: item.name },
+    });
+  }
+}
 </script>