重新打包

src/components/wfd/components/DetailPanel/EndEventDetail.vue

@@ -48,8 +48,8 @@
       <div class="panelRow">
         <div>模板关联字段：</div>
         <el-row style="width: 90%">
-          <el-col :span="7">公司名称</el-col>
-          <el-col :span="17">
+          <el-col :span="8">公司名称</el-col>
+          <el-col :span="16">
             <el-select
               v-model="contract.organName"
               size="small"
@@ -76,8 +76,8 @@
             </el-select>
           </el-col>
 
-          <el-col :span="7">费用类型</el-col>
-          <el-col :span="17">
+          <el-col :span="8">费用类型</el-col>
+          <el-col :span="16">
             <el-select
               v-model="contract.feeType"
               size="small"
@@ -104,8 +104,8 @@
             </el-select>
           </el-col>
 
-          <el-col :span="7">报销金额</el-col>
-          <el-col :span="17">
+          <el-col :span="8">报销金额</el-col>
+          <el-col :span="16">
             <el-select
               v-model="contract.totalMoney"
               size="small"
@@ -132,8 +132,8 @@
             </el-select>
           </el-col>
 
-          <el-col :span="7">是否有借款</el-col>
-          <el-col :span="17">
+          <el-col :span="8">是否有借款</el-col>
+          <el-col :span="16">
             <el-select
               v-model="contract.hasLoan"
               size="small"
@@ -160,8 +160,8 @@
             </el-select>
           </el-col>
 
-          <el-col :span="7">情况说明</el-col>
-          <el-col :span="17">
+          <el-col :span="8">情况说明</el-col>
+          <el-col :span="16">
             <el-select
               v-model="contract.memo"
               size="small"
@@ -251,7 +251,7 @@ export default {
     'model.contract'(newValue) {
       // 反显数据
       let contract = this.model.contract
-      contract = contract ? JSON.parse(contract) : null
+      contract = contract || null
       console.log(contract)
       if (contract) {
         this.contract = contract
@@ -273,7 +273,7 @@ export default {
         this.formatTemplateData(values)
         // 反显数据
         let contract = this.model.contract
-        contract = contract ? JSON.parse(contract) : null
+        contract = contract || null
         if (contract) {
           this.contract = contract
           this.$forceUpdate()
@@ -315,7 +315,7 @@ export default {
       this.fieldList = optionList
     },
     onChangeSelectContract() {
-      this.onChange('contract', JSON.stringify(this.contract))
+      this.onChange('contract', this.contract)
     }
   }
 }

src/utils/request.js

@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { MessageBox, Message } from 'element-ui'
+import { Message } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 
@@ -50,31 +50,39 @@ service.interceptors.response.use(
       if (location.href.indexOf('login') !== -1) {
         location.reload() // 为了重新实例化vue-router对象 避免bug
       } else {
-        MessageBox.confirm(
-          '登录状态已过期，您可以继续留在该页面，或者重新登录',
-          '系统提示',
-          {
-            confirmButtonText: '重新登录',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
+        Message.error('登录状态已过期，请重新登录')
+        setTimeout(() => {
           location.reload() // 为了重新实例化vue-router对象 避免bug
-        })
+        }, 1500)
+        // MessageBox.confirm(
+        //   '登录状态已过期，您可以继续留在该页面，或者重新登录',
+        //   '系统提示',
+        //   {
+        //     confirmButtonText: '重新登录',
+        //     cancelButtonText: '取消',
+        //     type: 'warning'
+        //   }
+        // ).then(() => {
+        //   location.reload() // 为了重新实例化vue-router对象 避免bug
+        // })
       }
     } else if (code === 6401) {
       store.dispatch('user/resetToken')
-      MessageBox.confirm(
-        '登录状态已过期，您可以继续留在该页面，或者重新登录',
-        '系统提示',
-        {
-          confirmButtonText: '重新登录',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
+      Message.error('登录状态已过期，请重新登录')
+      setTimeout(() => {
         location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
+      }, 1500)
+      // MessageBox.confirm(
+      //   '登录状态已过期，您可以继续留在该页面，或者重新登录',
+      //   '系统提示',
+      //   {
+      //     confirmButtonText: '重新登录',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   }
+      // ).then(() => {
+      //   location.reload() // 为了重新实例化vue-router对象 避免bug
+      // })
       return false
     } else if (code === 400 || code === 403 || code !== 200) {
       Message({