gjy 3 anos atrás
pai
commit
3ad094d76f

BIN
public/logo.ico


+ 12 - 0
src/views/check-flow/listenerId.js

@@ -1,7 +1,19 @@
 export default function getListenerIdFromBusinessCode (businessCode) {
   switch (businessCode) {
+	  case 'PROCUREMENT-ORDER-APPROVE':
+	  return 'procurementOrderListener'
 	  case 'INOUTTASK-TASK-APPROVE':
 	  return 'inOutWharehoseTaskListener'
+	  case 'PROCUREMENT-CLOSE-REPORT':
+	    return 'purchaseClosingReportListener'
+    case 'PROCUREMENT-RECEIPT-REPORT':
+	    return 'purchaseReceiptReportListener'
+    case 'SALE-ORDER-APPROVE':
+		  return 'saleOrderListener'
+    case 'SALE-CLOSE-REPORT':
+      return 'saleCloseReportListener'
+    case 'SALE-RECEIPT-REPORT':
+      return 'saleOutReportListener'
     default:
       return null;
 

+ 3 - 3
src/views/organizationNew/organizationIndex.vue

@@ -4,15 +4,15 @@
            @tab-click="handleClick"
            class="common-tabs"
            v-loading='pageLoading'>
-    <el-tab-pane label="岸基部门"
+    <el-tab-pane label="公司部门"
                  name="first">
       <shoreDept v-if="activeName === 'first'" />
     </el-tab-pane>
-    <el-tab-pane label="岸基权限"
+    <el-tab-pane label="公司权限"
                  name="second">
       <shore-auth v-if="activeName === 'second'" />
     </el-tab-pane>
-    <el-tab-pane label="岸基成员"
+    <el-tab-pane label="成员"
                  name="third">
       <shoreBasedMembers v-if="activeName === 'third'" />
     </el-tab-pane>

+ 1 - 1
src/views/organizationNew/shoreMemberAdd.vue

@@ -491,7 +491,7 @@ export default {
       }
     };
     const validcodePhonee = (rule, value, callback) => {
-      const reg = /^1[34578]\d{9}$/;
+      const reg = /^1[345789]\d{9}$/;
 
       if (!reg.test(value)) {
         callback(

+ 1 - 1
vue.config.js

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