Ver código fonte

Merge remote-tracking branch 'origin/master' into master

ysc 2 anos atrás
pai
commit
9754948250

BIN
public/aivfo.png


+ 2 - 2
public/index.html

@@ -4,8 +4,8 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>艾伟孚生物科技OA系统</title>
+    <link rel="icon" href="<%= BASE_URL %>aivfo.png">
+    <title>艾伟孚生物科技OA管理系统</title>
   </head>
   <body>
     <noscript>

+ 1 - 1
src/settings.js

@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: 'Vue Admin Template',
+  title: '艾伟孚生物科技OA管理系统',
 
   /**
    * @type {boolean} true | false

+ 1 - 2
src/views/meeting/weeklyRecords.vue

@@ -1,10 +1,9 @@
 <template>
   <div class="app-container" >
     <div style="display: flex;justify-content: space-between;margin-bottom: 8px">
-      <div style="font-size: 24px">{{ title }}</div>
+      <div style="font-size: 24px">{{ m.meetingName }}</div>
       <el-button size="mini" @click="exportPdf" icon="el-icon-download" style="margin-right: 20px">导出</el-button>
     </div>
-    <h3>{{m.meetingName}}</h3>
     <el-descriptions  title="" :column="2" :size="size" border>
       <el-descriptions-item>
         <template slot="label">

+ 3 - 1
src/views/task/components/taskDetail.vue

@@ -75,8 +75,10 @@ export default {
         return '完成'
       } else if (type === '3') {
         return '终止'
+      } else if (type === '4') {
+        return '评论'
       }
-      return '评论'
+      return '审批'
     }
   }
 }

+ 3 - 1
src/views/task/view.vue

@@ -343,8 +343,10 @@ export default {
         return '完成'
       } else if (type === '3') {
         return '终止'
+      } else if (type === '4') {
+        return '评论'
       }
-      return '评论'
+      return '审批'
     }
   }
 }