通知公告集成

client/src/components/Editor/src/Editor.vue

@@ -131,11 +131,9 @@ const editorConfig = computed((): IEditorConfig => {
             console.log('onSuccess', file, res)
           },
           onFailed(file: File, res: any) {
-            alert(res.message)
             console.log('onFailed', file, res)
           },
           onError(file: File, err: any, res: any) {
-            alert(err.message)
             console.error('onError', file, err, res)
           },
           // 自定义插入图片

client/src/views/OaSystem/home/indexOne.vue

@@ -5,9 +5,12 @@
         <div>
           <div class="header">
             <ul>
-              <li class="active">新闻中心<i class="corner">4</i></li>
-              <li>通知公告</li>
-              <li>学习中心</li>
+              <li :class="{ active: sevenType === 0 }" @click="switchSevenType(0)">
+                新闻中心
+                <i class="corner">4</i>
+              </li>
+              <li :class="{ active: sevenType === 1 }" @click="switchSevenType(1)">通知公告</li>
+              <li :class="{ active: sevenType === 2 }" @click="switchSevenType(2)">学习中心</li>
             </ul>
             <span class="subTitle" @click="moreHandle">
               <span>更多</span>
@@ -115,6 +118,10 @@ import CardItemSeven from './components/CardItemSeven.vue'
 
 defineOptions({ name: 'IndexOne' })
 
+const sevenType = ref<number>(0)
+const switchSevenType = (type: number): void => {
+  sevenType.value = type
+}
 const funcHandClick = (item): void => {
   if (item['title'] === '添加功能') {
   }

client/src/views/OaSystem/home/indexThree.vue

@@ -75,8 +75,8 @@ import CardItemSeven3 from './components/CardItemSeven3.vue'
 
 defineOptions({ name: 'Home' })
 
-const sevenType: number = ref<number>(1)
-const switchSevenType: Function<void> = (type: number): void => {
+const sevenType = ref<number>(1)
+const switchSevenType = (type: number): void => {
   sevenType.value = type
 }
 const router = useRouter()

client/src/views/OaSystem/home/indexTwo.vue

@@ -5,16 +5,19 @@
         <div>
           <div class="header">
             <ul>
-              <li class="active">新闻中心<i class="corner">4</i></li>
-              <li>通知公告</li>
-              <li>学习中心</li>
+              <li :class="{ active: sevenType === 0 }" @click="switchSevenType(0)">
+                新闻中心<i class="corner">4</i>
+              </li>
+              <li :class="{ active: sevenType === 1 }" @click="switchSevenType(1)">通知公告</li>
+              <li :class="{ active: sevenType === 2 }" @click="switchSevenType(2)">学习中心</li>
             </ul>
             <span class="subTitle" @click="moreHandle">
               <span>更多</span>
               <i class="arrowRight"><ArrowRightBold /> </i>
             </span>
           </div>
-          <div class="content"> <CardItemOne /></div>
+          <div class="content" v-if="sevenType === 0"> <CardItemOne /></div>
+          <div class="content" v-else> <CardItemSeven3 :type="sevenType" /></div>
         </div>
         <div>
           <div class="header">
@@ -112,11 +115,26 @@ import CardItemFour from './components/CardItemFour2.vue'
 import CardItemFive from './components/CardItemFive2.vue'
 import CardItemSix from './components/CardItemSix.vue'
 import CardItemSeven from './components/CardItemSeven.vue'
+import CardItemSeven3 from './components/CardItemSeven3.vue'
 
 defineOptions({ name: 'Home' })
+const sevenType = ref<number>(0)
+const switchSevenType = (type: number): void => {
+  sevenType.value = type
+}
 const router = useRouter()
 const moreHandle = () => {
-  router.push({ path: '/newsLook' })
+  if (sevenType.value === 0) {
+    router.push({ path: '/newsLook' })
+  } else if (sevenType.value === 1) {
+    router.push({
+      name: 'notice'
+    })
+  } else if (sevenType.value === 2) {
+    router.push({
+      name: 'learnCenter'
+    })
+  }
 }
 const operateClick = () => {
   router.push({

client/src/views/OaSystem/projectCenter/projectDetail/components/xmht/index.vue

@@ -218,9 +218,9 @@
           </table>
         </div>
         <!-- 合同里程碑 -->
-        <ContractMilestone :contractId="contractDetail.id" />
+        <ContractMilestone :contractId="contractDetail?.['id']" />
         <!-- 回款 -->
-        <ContractReturnedMoney :contractId="contractDetail.id" />
+        <ContractReturnedMoney :contractId="contractDetail?.['id']" />
       </template>
       <template v-else>
         <div class="titleBox">
@@ -310,7 +310,7 @@
             </tr>
           </table>
         </div>
-        <ContractSharing :contractId="contractDetail.id" />
+        <ContractSharing :contractId="contractDetail?.['id']" />
         <div class="tableBox">
           <h4><i class="icon"></i>财务信息</h4>
           <table>
@@ -390,10 +390,10 @@ const secondTypeList = shallowReactive<TypeSelectInterface[]>([
     value: 7
   }
 ])
-// 合同id ??是否存在
-const _toContractId = useRoute().query.contractId
 const editor = ref<Boolean>(false)
-const contractDetail = ref()
+const contractDetail = ref({
+  contractNumber: ''
+})
 
 const handleEdit = () => {
   console.log('handleEdit: ')