Merge branch 'master' into sofia

package.json

@@ -85,7 +85,7 @@
     "vue": "^2.6.12",
     "vue-i18n": "^8.22.2",
     "vue-loader": "^15.9.5",
-    "vue-meta-info": "^0.1.7",
+    "vue-meta": "^2.4.0",
     "vue-router": "^3.4.9",
     "vue-template-compiler": "^2.6.12",
     "vuex": "^3.6.0"

src/app.vue

@@ -3,3 +3,13 @@
     <router-view></router-view>
   </div>
 </template>
+
+<script>
+export default {
+  metaInfo() {
+    return {
+      title: this.$t('title')
+    }
+  }
+}
+</script>

src/assets/languages/en.json

 {
+  "title": "紫荆教育MBA学习系统",
   "action": {
     "courseAction": {
       "all": "All",

src/assets/languages/zh-CN.json

 {
+  "title": "紫荆教育MBA学习系统",
   "action": {
     "courseAction": {
       "all": "全部",

src/index.html

@@ -5,7 +5,7 @@
     <meta name="renderer" content="webkit" />
     <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
     <meta content="origin" name="referrer" />
-    <title>紫荆教育MBA学习系统</title>
+    <title></title>
     <meta
       name="viewport"
       id="viewport"

src/main.js

@@ -9,6 +9,9 @@ import Element from 'element-ui'
 import Modules from '@/modules'
 import createBefore from './components/beforeEnter'
 import _ from 'lodash'
+import VueMeta from 'vue-meta'
+
+Vue.use(VueMeta)
 
 Vue.prototype.$_ = _
 

src/modules/offices/src/reportPaper/edit.vue

@@ -50,7 +50,7 @@
             <el-form-item label="支付方式" style="margin: 0" v-if="detail.pay !== -1">
               {{ payText }}
             </el-form-item>
-            <el-form-item label="支付状态" style="margin: 0" v-if="detail.pay !== -1">
+            <el-form-item label="支付状态" style="margin: 0" v-if="detail.pay !== -1 && ruleForm.payment !== '3'">
               {{ payStatusText }}
             </el-form-item>
             <el-form-item label="审批状态" style="margin: 0">

src/modules/offices/src/reportPaper/list.vue

@@ -35,6 +35,15 @@ export default {
                 this.$router.push({ name: 'pareportView', params: { id: row.id }, query: { id: row.affair_id } })
               }
             },
+            {
+              label: '支付',
+              isShow(row) {
+                return row.pay === 0
+              },
+              onClick: row => {
+                this.$router.push({ name: 'pareportEdit', params: { id: row.id }, query: { id: row.affair_id } })
+              }
+            },
             {
               label: '编辑',
               isShow(row) {