fix bug

src/api/msg/index.js

@@ -31,5 +31,16 @@ export default {
       params,
       'post'
     )
+  },
+  /**
+   * 全部已读
+   * @returns {Promise<unknown>}
+   */
+  readAll() {
+    return fetch(
+      '/blade-project-manage-v2/announcementsend/v2/allRead',
+      null,
+      'post'
+    )
   }
 }

src/api/role/index.js

@@ -66,7 +66,7 @@ export default {
    * @returns {Promise | Promise<unknown>}
    */
   managerList(params) {
-    return fetch('blade-project-manage-v2/roledept/v2/list', params)
+    return fetch('/blade-project-manage-v2/roledept/v2/list', params)
   },
   /**
    * 邀请二维码

src/config/website.js

@@ -2,7 +2,7 @@
  * 全局配置文件
  */
 export default {
-  title: '梧桐树云服务',
+  title: '梧桐树云数据服务',
   tenant: '000000',
   clientId: 'project_web', // 客户端id
   clientSecret: 'project_web_key', // 客户端密钥

src/layout/foolter.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="mb-20 pointer">
-      <span @click="goNext('https://www.wutongshucloud.com')">关于梧桐</span>
+      <span @click="showCom = true">关于梧桐</span>
       <el-divider direction="vertical" />
       <span @click="goNext('https://www.wutongshucloud.com/user/privacyclause')"
         >隐私条款</span
@@ -27,6 +27,22 @@
         >
       </div>
     </el-dialog>
+    <el-dialog
+      v-model="showCom"
+      width="1200px"
+      title="梧凤桐凰规划研究院（云南）有限公司"
+    >
+      <div style="width: 1200px; height: 60vh; overflow-x: scroll">
+        <img
+          src="https://wutong-1302848345.cos.ap-chengdu.myqcloud.com/wtzx/648f4487453b492392baa8f0306fed2b.jpg"
+          style="width: 960px"
+        />
+        <img
+          src="https://wutong-1302848345.cos.ap-chengdu.myqcloud.com/wtzx/74c117375ca941c482976a493c3669ff.jpg"
+          style="width: 960px"
+        />
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -34,7 +50,8 @@
 export default {
   data() {
     return {
-      show: false
+      show: false,
+      showCom: false
     }
   },
   methods: {

src/layout/top.vue

@@ -172,7 +172,7 @@ export default {
       }
     })
     this.$bus.on('read', () => {
-      this.msgCount = this.msgCount - 1
+      this.readCount()
     })
     this.initWebSocket()
   },

src/page/login.vue

@@ -4,7 +4,7 @@
       <div class="flex flex-center flex-child-average">
         <div class="flex left">
           <img
-            src="https://wutong-1302848345.cos.ap-chengdu.myqcloud.com/wtzx/3938373d1b0c44c899f94cba263ff4a8.jpg"
+            src="https://wutong-1302848345.cos.ap-chengdu.myqcloud.com/wtzx/ec3e8c5dd656476582ca7a4724fdafd6.png"
             style="
               height: 560px;
               object-fit: contain;
@@ -41,7 +41,7 @@
               class="flex flex-center flex-col"
               style="height: 500px; margin-top: -20px"
             >
-              <span class="font-24 black bold">欢迎来到梧桐树云服务👏</span>
+              <span class="font-24 black bold">欢迎来到梧桐树云数据服务👏</span>
               <div
                 class="flex flex-col flex-center"
                 style="height: 360px; width: 360px; margin-top: -20px"
@@ -58,11 +58,11 @@
               <span
                 class="mt-10 bold main-color font-16"
                 style="margin-top: -20px"
-                >打开微信扫描二维码登录梧桐树云服务</span
+                >打开微信扫描二维码登录梧桐树云数据服务</span
               >
             </div>
             <div v-else class="flex flex-col flex-center" style="height: 500px">
-              <span class="font-24 black bold">欢迎来到梧桐树云服务👏</span>
+              <span class="font-24 black bold">欢迎来到梧桐树云数据服务👏</span>
               <div
                 class="flex flex-col flex-center mt-5"
                 style="width: 450px; height: 400px"

src/views/contract/component/info.vue

@@ -23,14 +23,7 @@
             <el-input v-if="form.fileFolder" v-model="form.fileFolder.title" />
           </el-form-item>
           <el-form-item label="合同类别" class="flex-child-average">
-            <div class="full-width">
-              <avue-input-tree
-                v-model="form.type"
-                class="full-width"
-                placeholder="请选择合同类型"
-                :dic="typeDic"
-              ></avue-input-tree>
-            </div>
+            <el-input v-model="form.type" />
           </el-form-item>
         </div>
         <div class="full-width flex flex-center flex-justify-between">
@@ -51,6 +44,14 @@
             <el-input v-model="form.partyB" />
           </el-form-item>
         </div>
+        <div class="full-width flex flex-center flex-justify-between">
+          <el-form-item label="业务联系人" class="flex-child-average">
+            <el-input v-model="form.contacts" />
+          </el-form-item>
+          <el-form-item label="联系人电话" class="flex-child-average">
+            <el-input v-model="form.phone" type="phone" />
+          </el-form-item>
+        </div>
         <div class="full-width flex flex-center flex-justify-between">
           <el-form-item label="签订日期" class="flex-child-average">
             <el-date-picker

src/views/contract/index.vue

@@ -3,11 +3,7 @@
     <el-form v-model="params" class="full-width" label-width="120px">
       <div class="flex">
         <div class="flex flex-center mt-15 mr-10">
-          <el-form-item
-            label="关键字"
-            class="full-width"
-            style="margin-left: -50px"
-          >
+          <el-form-item label="关键字" class="full-width">
             <el-input
               v-model="params.name"
               placeholder="输入合同关键字"
@@ -15,6 +11,14 @@
               clearable
             />
           </el-form-item>
+          <el-form-item label="业务联系人" class="full-width">
+            <el-input
+              v-model="params.contacts"
+              placeholder="输入业务联系人"
+              prefix-icon="Search"
+              clearable
+            />
+          </el-form-item>
           <el-form-item class="full-width" label="合同类别">
             <el-select v-model="params.type" clearable>
               <el-option
@@ -36,12 +40,12 @@
             </el-select>
           </el-form-item>
         </div>
-        <div class="flex flex-center ml-20">
-          <base-button type="0" title="重置" icon="Refresh" @click="clearUp" />
-          <base-button class="ml-20" @click="onLoad" />
-        </div>
       </div>
     </el-form>
+    <div class="flex flex-justify-end ml-20">
+      <base-button type="0" title="重置" icon="Refresh" @click="clearUp" />
+      <base-button class="ml-20" @click="onLoad" />
+    </div>
     <avue-crud
       :option="option"
       :data="data"
@@ -117,13 +121,9 @@ export default {
             prop: 'notPaymentAmount'
           },
           {
-            label: '合同类别',
-            prop: 'type',
-            dicUrl: '/api/blade-system/dict-biz/dictionary?code=contract-type',
-            props: {
-              label: 'dictValue',
-              value: 'dictKey'
-            }
+            label: '业务联系人',
+            prop: 'contacts',
+            width: 160
           },
           {
             label: '签订乙方',

src/views/msg/index.vue

@@ -1,4 +1,9 @@
 <template>
+  <tips-custom>
+    <template #default>
+      <el-button type="primary" text @click="readAll">全部标记为已读</el-button>
+    </template>
+  </tips-custom>
   <el-card shadow="hover">
     <div>
       <el-empty description="暂无数据" v-if="data.length === 0"></el-empty>
@@ -48,15 +53,17 @@
 <route>
 {
 name: '通知中心',
-meta: { 'back':true}
+meta: { 'back':true, 'show':false}
 }
 </route>
 <script>
 import msg2 from '@/views/msg/component/msg2.vue'
+import tipsCustom from '@/components/tips-custom/index.vue'
 
 export default {
   components: {
-    msg2
+    msg2,
+    tipsCustom
   },
   data() {
     return {
@@ -84,6 +91,16 @@ export default {
       this.page.current = val
       this.list()
     },
+    readAll() {
+      this.$api.msg.readAll().then(res => {
+        if (res.code === 200) {
+          this.$message.success(res.msg)
+          this.list()
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+    },
     change(row) {
       const tmp = this.data.find(ele => ele.id === row)
       if (tmp && tmp.readFlag === 1) {

src/views/store/index.vue

@@ -60,7 +60,7 @@
 
 <route>
 {
-name: '入库项目',
+name: '项目入库管理',
 meta: { 'showMsg' : "填写了”项目实际入库时间“的项目将不在预审管理中显示"}
 }
 </route>

src/views/user/index.vue

@@ -20,7 +20,7 @@
           class="icon"
           src="https://wutong-1302848345.cos.ap-chengdu.myqcloud.com/wtzx/23fcdf89312f4c969eeb636d1adf9adc.jpg"
         />
-        <div class="font-18 bold">梧桐树云服务</div>
+        <div class="font-18 bold">梧桐树云数据服务</div>
       </div>
     </div>
     <div class="mt-20 grey-6">微信扫一扫 随时掌握项目动态</div>