gjy 3 年 前
コミット
535329142b

+ 7 - 0
src/api/businessSettings/businessSettings.js

@@ -7,6 +7,13 @@ export function getCompanyMsg() {
     params: {}
     params: {}
   });
   });
 }
 }
+export function getCompany() {
+  return request({
+    url: '/commonUser/getComp', // 获取企业详情
+    method: 'get',
+    params: {}
+  });
+}
 export function setCompany(data) {
 export function setCompany(data) {
   return request({
   return request({
     url: '/baseCompany/api/changeInfo', // 修改企业详情
     url: '/baseCompany/api/changeInfo', // 修改企业详情

+ 7 - 0
src/api/login/login.js

@@ -7,6 +7,13 @@ export function retrievePassword(data) {
     data
     data
   });
   });
 }
 }
+export function getCompany() {
+  return request({
+    url: '/commonUser/getComp', // 获取企业详情
+    method: 'get',
+    params: {}
+  });
+}
 export function getCompanyInfo(params) {
 export function getCompanyInfo(params) {
   return request({
   return request({
     url: '/company/query/companyInfoByDomainName', // 通过域名获取公司信息
     url: '/company/query/companyInfoByDomainName', // 通过域名获取公司信息

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

@@ -22,6 +22,10 @@ export default function getListenerIdFromBusinessCode (businessCode) {
         return 'acquisitionPayListener'
         return 'acquisitionPayListener'
         case 'STOCK-PROCUREMENT-RECEIPT-REPORT':
         case 'STOCK-PROCUREMENT-RECEIPT-REPORT':
         return 'goodsPurchaseReceiptReportListener'
         return 'goodsPurchaseReceiptReportListener'
+        case 'BUY-CONTRACT-APPROVE':
+          return 'buyContractListener'
+        case 'SALE-CONTRACT-APPROVE':
+          return 'saleContractListener'
     default:
     default:
       return null;
       return null;
 
 

+ 12 - 3
src/views/login/index.vue

@@ -9,7 +9,7 @@
         <div class="login-header">
         <div class="login-header">
           <div class="header-box">
           <div class="header-box">
             <span class="iconfont icon-yiliangyiyun"></span>
             <span class="iconfont icon-yiliangyiyun"></span>
-  
+
             <p>管理后台</p>
             <p>管理后台</p>
           </div>
           </div>
         </div>
         </div>
@@ -22,8 +22,12 @@
           <span class="company-name">{{ companyName }}</span>
           <span class="company-name">{{ companyName }}</span>
           <el-row>
           <el-row>
             <el-col>
             <el-col>
-              <el-input v-model="formData.domainName"
-                        placeholder="请输入公司简称" />
+              <!-- <el-input v-model="formData.domainName"
+                        placeholder="请输入公司简称" /> -->
+              <el-select v-model="formData.domainName" filterable placeholder="请选择" class="comp-select">
+                <el-option v-for="item in compOptionList" :key="item.compName" :label="item.compName" :value="item.compName">
+                </el-option>
+              </el-select>
             </el-col>
             </el-col>
             <el-col class="icon-user">
             <el-col class="icon-user">
               <span class="svg-container">
               <span class="svg-container">
@@ -124,6 +128,7 @@
 import {
 import {
   retrievePassword,
   retrievePassword,
   getCompanyInfo,
   getCompanyInfo,
+  getCompany,
   loginEnhanced
   loginEnhanced
 } from '../../api/login/login';
 } from '../../api/login/login';
 import { setToken } from '../../utils/auth';
 import { setToken } from '../../utils/auth';
@@ -150,6 +155,7 @@ export default {
       loading: false,
       loading: false,
       loginBox: true,
       loginBox: true,
       messageBox: false,
       messageBox: false,
+      compOptionList:[],
       companyName: sessionStorage.getItem('enterprise-front-companyName'),
       companyName: sessionStorage.getItem('enterprise-front-companyName'),
       formData: {
       formData: {
         domainName: '',
         domainName: '',
@@ -314,6 +320,9 @@ export default {
       const response = await getCompanyInfo({
       const response = await getCompanyInfo({
         domainName: this.formData.domainName
         domainName: this.formData.domainName
       });
       });
+      getCompany().then((res) => {
+          this.compOptionList=res
+        })
       sessionStorage.setItem('enterprise-front-domainName', this.formData.domainName);
       sessionStorage.setItem('enterprise-front-domainName', this.formData.domainName);
       if (response) {
       if (response) {
         if (response.compHeadimg) {
         if (response.compHeadimg) {

+ 1 - 1
vue.config.js

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