前端

src/layout/components/navigation.vue

@@ -36,7 +36,7 @@
       <el-menu-item index="/home">主页</el-menu-item>
       <el-menu-item index="/bayed">已购服务</el-menu-item>
       <el-menu-item index="/companyInfoIndex">公司信息</el-menu-item>
-      <el-menu-item index="/travelCompanyIndex">往来公司</el-menu-item>
+      <!-- <el-menu-item index="/travelCompanyIndex">往来公司</el-menu-item> -->
       <el-menu-item index="/organizationIndex">组织架构</el-menu-item>
       <!--<el-menu-item :index="routerLink">组织架构</el-menu-item>-->
       <el-menu-item index="/check-flow">审核流设置</el-menu-item>

src/router/index.js

@@ -302,17 +302,17 @@ export const constantRoutes = [
         affix: true
       }
     },
-    {
-      path: 'travelCompanyIndex',
-      component: () => import('../views/travelCompany/travelCompanyIndex'),
-      name: 'travelCompanyIndex',
-      meta: {
-        title: 'travelCompanyIndex',
-        icon: 'travelCompanyIndex',
-        noCache: true,
-        affix: true
-      }
-    }
+    // {
+    //   path: 'travelCompanyIndex',
+    //   component: () => import('../views/travelCompany/travelCompanyIndex'),
+    //   name: 'travelCompanyIndex',
+    //   meta: {
+    //     title: 'travelCompanyIndex',
+    //     icon: 'travelCompanyIndex',
+    //     noCache: true,
+    //     affix: true
+    //   }
+    // }
     ]
   },
 ];

src/views/check-flow/conditions.js

@@ -1,4 +1,4 @@
-import { getMaterielType } from "../../api/check-flow"
+
 const crewDeptOptions = [{
   label: '轮机部',
   value: 'E'
@@ -46,14 +46,6 @@ const crewOptions = [
     value: '20'
   }]
 let maOptions = []
-getMaterielType().then(res => {
-  for (let i of res) {
-    maOptions.push({
-      label: i.parameterValue,
-      value: i.parameterKey
-    })
-  }
-})
 
 export default {
   'FINANCE-PAYMENT': [

src/views/check-flow/listenerId.js

@@ -41,8 +41,19 @@ export default function getListenerIdFromBusinessCode (businessCode) {
       return 'nonContractExpensesListener'
     case 'WAREHOUSING-ORDER-APPROVE':
       return 'warehousingOrderListener'
-    case 'FEE_DETAILS_MANG':
-      return 'exepenseInfoListener'
+      // 费用管理
+    // case 'EXPENSE_DETAILS_MANG':
+    //   return 'exepenseInfoListener'
+    // case 'EXPENSE_DETAILS_MANG':
+    //   return 'exepenseListener'
+    case 'FEIYONGGUANLI-APPROVE':
+      return 'exepenseListener'
+    case 'WAREHOUSING-DEBIT-APPROVE':
+      return 'warehousingDebitListener'
+    case 'QINGJIA-APPROVE':
+      return 'qingjiaListener'
+    case 'BUKA-APPROVE':
+      return 'bukaListener'
     // case 'FEE_DETAILS_DETAILS':
     //   return 'feeDetailsFenListener'
     // case ' FEE_DETAILS_SHOU':

src/views/login/index.vue

@@ -83,7 +83,7 @@
           <div style="display:flex;">
             <div class="verification-phone">
               <!-- <span> -->
-              <el-input :disabled="disablePhone"
+              <el-input maxlength="11" :disabled="disablePhone"
                         class="compTel"
                         v-model="forgetDate.userCellPhone"
                         placeholder="请输入手机号" />

src/views/organizationNew/organizationIndex.vue

@@ -16,7 +16,7 @@
                  name="third">
       <shoreBasedMembers v-if="activeName === 'third'" />
     </el-tab-pane>
-    <el-tab-pane label="船端部门"
+    <!-- <el-tab-pane label="船端部门"
                  name="fourth">
       <shipDept v-if="activeName === 'fourth'" />
     </el-tab-pane>
@@ -27,7 +27,7 @@
     <el-tab-pane label="船端成员"
                  name="sixth">
       <crewMembers v-if="activeName === 'sixth'" />
-    </el-tab-pane>
+    </el-tab-pane> -->
   </el-tabs>
 </template>
 <script>

vue.config.js

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