Merge remote-tracking branch 'origin/sqy_dev'

# Conflicts:
#	src/views/stationnotification/notificationmanager/config.d.ts

@@ -21,10 +21,10 @@ enum NotifyManagerApi {
   NOTICE_GET_DEPT_URL = '/organization/me/organizations',
 }
 
-// /**
-//  * 获取详情
-//  * @param
-//  */
+/**
+ * 获取详情
+ * @param
+ */
 export const noticeByIdGetInfo = (id: string) => {
   return defHttp.get({
     url: `${NotifyManagerApi.NOTICE_GET_DETAIL_URL}/${id}`,
@@ -128,3 +128,13 @@ export const notifyOrganizationGetApi = () => {
     url: NotifyManagerApi.NOTICE_GET_DEPT_URL,
   });
 };
+
+export const getNotifyDetailPage = (id: string) => {
+  console.log(id, '-----------------');
+  return (params) => {
+    return defHttp.get({
+      url: `${NotifyManagerApi.NOTICE_GET_PAGE_URL}/${id}`,
+      params,
+    });
+  };
+};

@@ -172,14 +172,7 @@
         if (!wrapEl) return;
         let preMarker = null;
         const map = new BMap.Map(wrapEl);
-        let myIcon = new BMap.Icon(
-          'http://api.map.baidu.com/img/markers.png',
-          new BMap.Size(40, 25),
-          {
-            offset: new BMap.Size(0, 0), // 指定定位位置
-            imageOffset: new BMap.Size(20, -260), // 设置图片偏移
-          }
-        );
+        let myIcon = new BMap.Icon('/src/assets/images/wz.png', new BMap.Size(20, 30));
         const point = new BMap.Point(Number(longitude), Number(latitude));
         let marker = new BMap.Marker(point, { icon: myIcon });
         if (marker) {

@@ -56,14 +56,8 @@
         const BMap = (window as any).BMap;
         if (!wrapEl) return;
         const map = new BMap.Map(wrapEl);
-        let myIcon = new BMap.Icon(
-          'http://api.map.baidu.com/img/markers.png',
-          new BMap.Size(40, 25),
-          {
-            offset: new BMap.Size(0, 0), // 指定定位位置
-            imageOffset: new BMap.Size(20, -260), // 设置图片偏移
-          }
-        );
+        let myIcon = new BMap.Icon('/src/assets/images/wz.png', new BMap.Size(20, 30));
+
         const point = new BMap.Point(Number(longitude), Number(latitude));
         var content = `我在 ${address}`;
         var label = new BMap.Label(content, {

 <template>
   <div>
-    <PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
+    <PageWrapper dense contentFullHeight contentClass="flex">
       <OrganizationIdTree class="w-1/6 xl:w-1/5" @select="handleSelect" />
       <BasicTable @register="registerTable" class="w-5/6 xl:w-4/5">
         <template #toolbar>

@@ -117,7 +117,23 @@ export const formSchema: FormSchema[] = [
       });
     },
   },
-
+  {
+    field: 'organizationId',
+    label: '所属组织',
+    colProps: { span: 12 },
+    component: 'ApiTreeSelect',
+    componentProps: {
+      api: async () => {
+        const data = await getOrganizationList();
+        copyTransFun(data as any as any[]);
+        return data;
+      },
+      onChange: (v) => {
+        isDeptId.value = v;
+      },
+    },
+    ifShow: ({ values }) => isOrg(Reflect.get(values, 'receiverType')),
+  },
   {
     field: 'receiverType',
     required: true,
@@ -171,30 +187,6 @@ export const formSchema: FormSchema[] = [
     // },
   },
   {
-    field: 'organizationId',
-    label: '所属组织',
-    colProps: { span: 12 },
-    component: 'ApiTreeSelect',
-    componentProps: {
-      api: async () => {
-        const data = await getOrganizationList();
-        copyTransFun(data as any as any[]);
-        // const filterData = data.map((m) => {
-        //   return {
-        //     label: m.label,
-        //     value: m.value,
-        //   };
-        // });
-        // return filterData;
-        return data;
-      },
-      onChange: (v) => {
-        isDeptId.value = v;
-      },
-    },
-    ifShow: ({ values }) => isOrg(Reflect.get(values, 'receiverType')),
-  },
-  {
     field: '',
     component: 'Input',
     label: '',

@@ -7,7 +7,7 @@
     >
       <template #toolbar>
         <a-button type="primary" @click="handleAdd"> 新增 </a-button>
-        <a-button type="error" @click="handleToolbarDel"> 删除 </a-button>
+        <a-button color="error" @click="handleToolbarDel"> 删除 </a-button>
       </template>
       <template #action="{ record }">
         <TableAction
@@ -41,13 +41,8 @@
         />
       </template>
     </BasicTable>
-    <NotifyManagerDrawer
-      v-if="isJudgeStatus"
-      :getChildrenData="echoEditData"
-      @register="registerDrawer"
-      @success="handleSuccess"
-    />
-    <tableViewChild v-if="!isJudgeStatus" @register="registerDrawer" />
+    <NotifyManagerDrawer @register="registerAdd" @success="handleSuccess" />
+    <tableViewChild @register="registerDrawer" />
   </div>
 </template>
 <script lang="ts">
@@ -64,9 +59,9 @@
     name: 'Index',
     components: { BasicTable, NotifyManagerDrawer, TableAction, tableViewChild },
     setup() {
-      let isJudgeStatus = ref(true);
       let selectedRowKeys: string[] = reactive([]);
-      let echoEditData = reactive({});
+
+      const [registerAdd, { openDrawer: openDrawerAdd }] = useDrawer();
       const [registerDrawer, { openDrawer }] = useDrawer();
       const { createMessage } = useMessage();
       const [registerTable, { reload, getSelectRowKeys }] = useTable({
@@ -93,10 +88,9 @@
       });
 
       function handleAdd() {
-        openDrawer(true, {
+        openDrawerAdd(true, {
           isUpdate: false,
         });
-        isJudgeStatus.value = true;
       }
 
       const useSelectionChange = () => {
@@ -113,14 +107,12 @@
           record,
           isUpdate: true,
         });
-        isJudgeStatus.value = false;
       };
       function handleEdit(record: Recordable) {
-        openDrawer(true, {
+        openDrawerAdd(true, {
           record,
           isUpdate: true,
         });
-        isJudgeStatus.value = true;
       }
       async function handleDelete(record: Recordable) {
         let ids = [record.id];
@@ -132,10 +124,9 @@
         reload();
       }
       return {
-        isJudgeStatus,
         handleView,
+        registerAdd,
         useSelectionChange,
-        echoEditData,
         registerTable,
         registerDrawer,
         handleAdd,

@@ -60,11 +60,12 @@
         isUpdate.value = !!data?.isUpdate;
         //编辑
         if (unref(isUpdate)) {
+          console.log(data.record);
           getId.value = data.record.id;
           await setFieldsValue({
             ...data.record,
+            receiverType: data.record.receiverType === '全部' ? '0' : '1',
           });
-        } else {
         }
       });
       const getTitle = computed(() => (!unref(isUpdate) ? '新增通知' : '编辑通知'));

@@ -4,35 +4,29 @@
       v-bind="$attrs"
       @register="registerDrawer"
       :showFooter="false"
-      :title="getTitle"
-      width="800px"
+      :title="descInfo?.title"
+      destroyOnClose
+      width="70%"
     >
-      <PageWrapper title="站内通知详情">
-        <Description @register="register1" class="mt-4" />
-      </PageWrapper>
+      <div v-html="descInfo?.content"></div>
+      <Description @register="registerDesc" class="mt-4" />
+
+      <BasicTable @register="registerTable" />
     </BasicDrawer>
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed, unref } from 'vue';
+  import { defineComponent, ref } from 'vue';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { Description, DescItem, useDescription } from '/@/components/Description/index';
-  import { PageWrapper } from '/@/components/Page';
-  import { noticeByIdGetInfo } from '/@/api/stationnotification/stationnotifyApi';
-
+  import {
+    getNotifyDetailPage,
+    noticeByIdGetInfo,
+  } from '/@/api/stationnotification/stationnotifyApi';
+  import { useTable, BasicTable } from '/@/components/Table';
+  import { detailColumns } from './config.d';
   const schema: DescItem[] = [
     {
-      field: 'title',
-      label: '标题',
-    },
-    {
-      field: 'content',
-      label: '内容',
-      render: (_, data) => {
-        return !data.content ? '' : data.content.slice(3, data.content.length - 4);
-      },
-    },
-    {
       field: 'senderName',
       label: '发送者',
     },
@@ -42,7 +36,7 @@
     },
     {
       field: 'type',
-      label: '类型',
+      label: '类型:',
       render: (_, data) => {
         return data.type === 'NOTICE'
           ? '公告'
@@ -53,48 +47,41 @@
           : '';
       },
     },
-    {
-      field: 'status',
-      label: '状态',
-    },
-    {
-      field: 'updateTime',
-      label: '更新时间',
-    },
-    {
-      field: 'receiverType',
-      label: '接收类型',
-    },
-    {
-      field: 'createTime',
-      label: '创建时间',
-    },
   ];
   export default defineComponent({
     name: 'ConfigDrawer',
-    components: { BasicDrawer, Description, PageWrapper },
+    components: { BasicDrawer, Description, BasicTable },
     emits: ['success', 'register'],
     setup() {
-      let descInfo = ref(null);
-      const isUpdate = ref(true);
-
-      const [registerDrawer, { setDrawerProps }] = useDrawerInner(async (data) => {
-        setDrawerProps({ confirmLoading: false });
-        isUpdate.value = !!data?.isUpdate;
-        let getDescInfo = await noticeByIdGetInfo(data.record.id);
-        descInfo.value = getDescInfo;
+      let descInfo = ref();
+      const noticeId = ref('');
+      const [registerDrawer] = useDrawerInner(async (data) => {
+        if (data.isUpdate) {
+          let getDescInfo = await noticeByIdGetInfo(data.record.id);
+          noticeId.value = data.record.id;
+          descInfo.value = getDescInfo;
+          console.log(noticeId);
+        }
       });
-      const getTitle = computed(() => (!unref(isUpdate) ? '查看通知' : '查看通知'));
-      const [register1] = useDescription({
-        title: '详情',
-        bordered: false,
+
+      const [registerDesc] = useDescription({
+        bordered: true,
         data: descInfo,
         schema: schema,
       });
+      const [registerTable] = useTable({
+        api: getNotifyDetailPage(noticeId.value),
+        columns: detailColumns,
+        showTableSetting: false,
+        bordered: true,
+        showIndexColumn: false,
+      });
       return {
-        register1,
-        getTitle,
+        descInfo,
+        registerDesc,
+        registerTable,
         registerDrawer,
+        noticeId,
       };
     },
   });

@@ -10,10 +10,14 @@
         <TableAction
           :actions="[
             {
+              label: '编辑',
+              tooltip: '编辑',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
             },
             {
+              label: '删除',
+              tooltip: '删除',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               popConfirm: {
@@ -76,11 +80,11 @@
         showIndexColumn: false,
         canResize: false,
         actionColumn: {
-          width: 80,
+          width: 120,
           title: t('routes.common.system.pageSystemTitleOperation'), //操作
           dataIndex: 'action',
           slots: { customRender: 'action' },
-          fixed: undefined,
+          fixed: 'right',
         },
       });
 

@@ -94,6 +94,7 @@
       Tag,
       TableAction,
     },
+    emits: ['register'],
     setup() {
       const { createMessage } = useMessage();
       const [tenantAdminFormDrawer, { openDrawer: openTenantAdminFormDrawer }] = useDrawer();

@@ -24,7 +24,7 @@
       BasicDrawer,
       BasicForm,
     },
-    emits: ['success'],
+    emits: ['success', 'register'],
     setup(_, { emit }) {
       const isUpdate = ref(true);
       const tenantId = ref('');