Merge branch 'master' of ssh://www.yixzm.cn:22022/Dim5-ideal/bj-maritime-dcds-web

src/views/notificationInfoManage/contactsmanage/components/detail.vue

@@ -163,7 +163,6 @@ import Cookies from 'js-cookie';
 const route = useRoute();
 const router = useRouter();
 const user = JSON.parse(Cookies.get('user')!);
-console.log(user);
 
 const systemStore = useSystemStore();
 

src/views/notificationInfoManage/mattersmanage/components/detail.vue

@@ -15,15 +15,9 @@
 				<el-row :gutter="24">
 					<el-col :span="8">
 							<el-form-item label="发布单位" prop="publishingUnit">
-                <el-tree-select
+                  <el-input
                     v-model="formData.publishingUnit"
-                    :data="treeData"
-                    :render-after-expand="true"
                     :disabled="true"
-                    node-key="strId"
-                    filterable
-                    placeholder="请输入发布单位"
-                    style="width: 100%"
                   />
               </el-form-item>
 					</el-col>
@@ -52,6 +46,7 @@
                 <el-select
                   v-model="formData.releaseStatus"
                   :disabled="true"
+                  placeholder=""
                   style="width: 100%"
                 >
                   <template v-for="(val, index) in bj_nl_released_status" :key="index">
@@ -179,14 +174,14 @@
 import { ref, onMounted, onBeforeUnmount } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { addMyPublishApi, fetchReleaseDetail } from '@/api/notificationInfoManage/myPublish';
-import { FormInstance, FormRules } from 'element-plus';
+import { dayjs, FormInstance, FormRules } from 'element-plus';
 import { TreeOptions } from '@/types/global';
 import useDeptStore from '@/store/modules/dept';
-import { outTypeList } from '@/libs/commonMeth';
+import { outTypeList, asyncOutTypeList } from '@/libs/commonMeth';
 import { categoryOnm, bj_notification_type, bj_lssuing_unit } from '@/plugins/dictData';
 import useSystemStore from '@/store/main';
 import { fetchNotificationMattersDetail } from '@/api/notificationInfoManage/mattersmanage';
-
+import Cookies from 'js-cookie';
 
 // --- 路由与Store ---
 const route = useRoute();
@@ -194,16 +189,18 @@ const router = useRouter();
 
 const systemStore = useSystemStore();
 
-const bj_nl_released_status = outTypeList('bj_nl_released_status'); //通报事项清单发布状态
+const user = JSON.parse(Cookies.get('user')!);
+
+const bj_nl_released_status = asyncOutTypeList('bj_nl_released_status'); //通报事项清单发布状态
 
 const pageTitle = ref(''); // 页面标题
 const isEdit = ref(false); // 是否为编辑模式
 const ruleFormRef = ref<FormInstance>();
 
 const formData = ref({
-  publishingUnit: '',
-  addDate: '',
-  addName: '',
+  publishingUnit: user.dept.deptName,
+  addDate: dayjs().format('YYYY-MM-DD'),
+  addName: user.createBy,
   releaseStatus: '',
   notificationType: '',
   conm: '',