Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

config/index.js

@@ -12,8 +12,8 @@ module.exports = {
     proxyTable: {
       "/api": {
         // 请求的目标主机
-        target: 'http://116.255.223.226:8081/nsgk_test/',
-        //target: 'http://localhost:8080/',
+        // target: 'http://116.255.223.226:8081/nsgk_test/',
+        target: 'http://localhost:8080/',
         changeOrigin: true,
         pathRewrite: {
           '^/api': ''

src/views/yinnong/done.vue

@@ -143,6 +143,7 @@
             case 'accepting':
               this.$router.push({name:'approvalForm',query: {id:item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
               break;
+            case 'toReviewTransferProcess':
             case 'yinnong_transfer':
               if(item.formData.transferType == '10'){
                 this.$router.push({name:'approvalApproval10',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})