Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pcmgr

# Conflicts:
#	vue.config.js

src/views/check-flow/listenerId.js

@@ -16,6 +16,10 @@ export default function getListenerIdFromBusinessCode (businessCode) {
       return 'saleOutReportListener'
       case 'TRANSPORTATION-SETTLEMENT-REPORT':
         return 'tranSettlementReportListener'
+    case 'PROCUREMENT-PRICE-APPROVE':
+      return 'acquisitionListener'
+      case 'PAYMENT-MANAGEMENT-APPROVE':
+        return 'acquisitionPayListener'
     default:
       return null;
 

vue.config.js

@@ -41,6 +41,7 @@ module.exports = {
       },
       '/pb': {
         target: 'http://192.168.1.103:9100/',
+        // target: 'http://192.168.1.109:9100/',
         // target: 'https://standard-dev.winsea.com/',
         changeOrigin: true, //开启代理：在本地会创建一个虚拟服务端，然后发送请求的数据，并同时接收请求的数据，这样服务端和服务端进行数据的交互就不会有跨域问题
         pathRewrite: {