前端

src/components/balanceAlert.vue

@@ -26,7 +26,7 @@ export default {
   activated(){
 
   },
-  mounted(){debugger
+  mounted(){
  console.log('11111111111111111111111111111111111')
     console.log(this.deptBudgetList1)
     this.openPort()

src/layout/index/top/index.vue

@@ -176,7 +176,10 @@
     changePasswordByPwd,
     getcomp
   } from '@/model/indexRx'
+  import { fastLogin, logout, login,complogin, getRoule, getCurrentUserInfo, companyInfo, isLandBased, getAccountLoginHistoryCount, updateShowInfo }
+  from '@/model/indexRx'
   import Cookies from 'js-cookie'
+  import { setToken, getCompanyId, clearStorage } from '@/utils/auth'
   import {
     mapActions,
     mapGetters,
@@ -186,6 +189,10 @@
     fullscreenToggel,
     listenfullscreen
   } from '@/utils/util'
+  import {
+  getTenantInfoByUser,
+} from '@/model/signIn/index'
+  import notification from '../../../notification'
   import topMenu from './top-menu'
   import topSearch from './top-search'
   import topTheme from './top-theme'
@@ -373,7 +380,7 @@
     },
     methods: {
       ...mapActions('common', ['setLocalVessels']),
-      ...mapActions('user', ['complogin', 'fastLogin']),
+      ...mapActions('user', ['getUserInfo','toSetShow']),
       payCode() {
         console.log("input", this.barCode)
         this.btnStatus = {
@@ -410,13 +417,119 @@
         
       },
       compNameChange(){
-        this.complogin({username:this.UserInfo.loginInfo.userMobilePhone,
+      //   this.complogin({username:this.UserInfo.loginInfo.userMobilePhone,
+      // password: localStorage.getItem('ws-pf_pass'),
+      // companyName: this.compName})
+      var userInfo={
+        username:this.UserInfo.loginInfo.userMobilePhone,
       password: localStorage.getItem('ws-pf_pass'),
-      companyName: this.compName})
-      console.log(localStorage.getItem('status'))
-      if(localStorage.getItem('status')==1){
-        this.compName=localStorage.getItem('ws-pf_compName')
+      companyName: this.compName
       }
+      // var status=0
+      const redirect = this.$route.query.redirect
+    const { username, password, domainName, companyName } = userInfo
+      complogin({
+        username: username.trim(),
+        password: password,
+        domainName: domainName,
+        companyName: companyName
+      }).toPromise().then((res)=>{
+        if(res.data.code=='AUTH_001'){
+          Message({showClose: true,
+            message: '公司不可切换',
+            type: 'error'
+          });
+          this.compName=localStorage.getItem('ws-pf_compName')
+          localStorage.setItem('status', 1)
+        }else{
+          const { compId,
+            tenantId,
+            vesselId,
+            vesselBankFlag,
+            clientFag,
+            userId
+          } = res.data.data
+          // {TYPE='' MESSAGE} [第一次,失效].indexOf(type){type,msg,到期时间}
+          // EventBus.$emit('success', '登录成功')
+          localStorage.setItem('ws-pf_compId', compId)
+          localStorage.setItem('status', 2)
+          localStorage.setItem('ws-pf_userId', userId)
+          localStorage.setItem('ws-pf_tenantId', tenantId)
+          localStorage.setItem('ws-pf_vesselId', vesselId) // 仅适用于一条船
+          localStorage.setItem('ws-pf_vesselBankFlag', vesselBankFlag) // 当前登录人是船端还是岸端的人员
+          localStorage.setItem('ws-pf_clientFag', clientFag)
+          notification.setSessionId(userId) // 设置通知唯一标识
+          notification.start() // 开始监听通知
+          // 查询当前租户服务类型
+          isLandBased().toPromise().then(response => {
+            localStorage.setItem('ws-pf_serviceTypeFlag', response)
+          })
+        companyInfo({ compId: compId }).toPromise().then((res1)=>{
+            localStorage.setItem('ws-pf_organMonetaryKey', res1.organizationMonetaryKey)
+            localStorage.setItem('ws-pf_compName', res1.compName)
+            localStorage.setItem('ws-pf_compDomainName', res1.compDomainName)
+            localStorage.setItem('ws-pf_organMonetaryValue', res1.organizationMonetaryValue)
+           this.getUserInfo({ vesselBankFlag, compName:res1.compName })
+          })
+          
+          
+          this.toSetShow( userId)
+          setToken('Admin-Token')
+          localStorage.setItem('ws_login_type', 2)
+            Cookies.set('ws_login_companyShortName', companyName, {
+              expires: 365,
+            })
+            Cookies.set('ws_login_account', username, {
+              expires: 365,
+            })
+            console.log(username, password, domainName, companyName)
+            var rememberMe = Cookies.get('ws_login_rememberMe') === '1'
+            if (rememberMe) {
+              Cookies.set('ws_login_pwd', password, {
+                expires: 365,
+              })
+              Cookies.set('ws_login_rememberMe', 1, {
+                expires: 365
+              })
+            } else {
+              Cookies.remove('ws_login_companyShortName')
+              Cookies.remove('ws_login_account')
+              Cookies.remove('ws_login_pwd')
+              Cookies.set('ws_login_rememberMe', 0, {
+                expires: 365
+              })
+            }
+            console.log(redirect)
+            
+            if (redirect) {
+              this.$router.replace(redirect)
+            } else {
+              this.$router.replace('/')
+            }
+              let newList = {
+                companyName: companyName,
+                username: username,
+                password: password,
+              }
+              getTenantInfoByUser(newList).toPromise().then((res2)=>{
+                console.log(res2)
+                localStorage.setItem(
+                'ws_login_getTenantInfoByUser',
+                JSON.stringify({
+                  ...res2,
+                  loginInfo: res.data.data
+                }))
+                this.$router.go(0)
+              })
+           
+            localStorage.setItem(
+              'ws_login_accountId',
+              JSON.stringify(res.data.data.accountId)
+            )
+            
+        }
+      })
+      console.log(localStorage.getItem('status'))
           // } else {
           //   this.$message.error("您输入的用户名或密码错误!")
           //   return false

src/store/modules/user.js

@@ -134,104 +134,10 @@ const actions = {
     return data
   },
   
-  async complogin({ commit, dispatch }, userInfo) {
-    var status=0
-    const { username, password, domainName, companyName } = userInfo
-      complogin({
-        username: username.trim(),
-        password: password,
-        domainName: domainName,
-        companyName: companyName
-      }).toPromise().then((res)=>{
-        console.log(res)
-        if(res.data.code=='AUTH_001'){
-          Message({showClose: true,
-            message: '公司不可切换',
-            type: 'error'
-          });
-          localStorage.setItem('status', 1)
-        }else{
-          const { compId,
-            tenantId,
-            vesselId,
-            vesselBankFlag,
-            clientFag,
-            userId
-          } = res.data.data
-          // {TYPE='' MESSAGE} [第一次,失效].indexOf(type){type,msg,到期时间}
-          // EventBus.$emit('success', '登录成功')
-          localStorage.setItem('ws-pf_compId', compId)
-          localStorage.setItem('status', 2)
-          localStorage.setItem('ws-pf_userId', userId)
-          localStorage.setItem('ws-pf_tenantId', tenantId)
-          localStorage.setItem('ws-pf_vesselId', vesselId) // 仅适用于一条船
-          localStorage.setItem('ws-pf_vesselBankFlag', vesselBankFlag) // 当前登录人是船端还是岸端的人员
-          localStorage.setItem('ws-pf_clientFag', clientFag)
-          notification.setSessionId(userId) // 设置通知唯一标识
-          notification.start() // 开始监听通知
-          // 查询当前租户服务类型
-          isLandBased().toPromise().then(response => {
-            localStorage.setItem('ws-pf_serviceTypeFlag', response)
-          })
-        companyInfo({ compId: compId }).toPromise().then((res1)=>{
-            localStorage.setItem('ws-pf_organMonetaryKey', res1.organizationMonetaryKey)
-            localStorage.setItem('ws-pf_compName', res1.compName)
-            localStorage.setItem('ws-pf_compDomainName', res1.compDomainName)
-            localStorage.setItem('ws-pf_organMonetaryValue', res1.organizationMonetaryValue)
-            dispatch('getUserInfo', { vesselBankFlag, compName:res1.compName })
-          })
-          
-          
-          dispatch('toSetShow', userId)
-          setToken('Admin-Token')
-          localStorage.setItem('ws_login_type', 2)
-            Cookies.set('ws_login_companyShortName', companyName, {
-              expires: 365,
-            })
-            Cookies.set('ws_login_account', username, {
-              expires: 365,
-            })
-            console.log(username, password, domainName, companyName)
-            var rememberMe = Cookies.get('ws_login_rememberMe') === '1'
-            if (rememberMe) {
-              Cookies.set('ws_login_pwd', password, {
-                expires: 365,
-              })
-              Cookies.set('ws_login_rememberMe', 1, {
-                expires: 365
-              })
-            } else {
-              Cookies.remove('ws_login_companyShortName')
-              Cookies.remove('ws_login_account')
-              Cookies.remove('ws_login_pwd')
-              Cookies.set('ws_login_rememberMe', 0, {
-                expires: 365
-              })
-            }
-              let newList = {
-                companyName: companyName,
-                username: username,
-                password: password,
-              }
-              getTenantInfoByUser(newList).toPromise().then((res2)=>{
-                console.log(res2)
-                localStorage.setItem(
-                'ws_login_getTenantInfoByUser',
-                JSON.stringify({
-                  ...res2,
-                  loginInfo: res.data.data
-                }))
-              })
-           
-            localStorage.setItem(
-              'ws_login_accountId',
-              JSON.stringify(res.data.data.accountId)
-            )
-        }
-        status=2
-      })
+  // async complogin({ commit, dispatch }, userInfo) {
+    
       
-  },
+  // },
   async fastLogin({ dispatch }, userInfo) {
     const { mobilePhone, veriCode } = userInfo
     const data = await fastLogin({

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -9,7 +9,7 @@
         </ws-button>
       </template>
       <template slot="right">
-        <span style="width: 70px; display: inline-block; color: #8890b1">状态：</span>
+        <span style="width: 98px; display: inline-block; color: #8890b1">状态：</span>
         <ws-select v-model="searchTypeText" placeholder class="typeselect" @change="selecttaskType" :value="searchType">
           <ws-option v-for="item in taskTypeList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
@@ -503,7 +503,7 @@
   }
 
   .findValue {
-    width: 0%;
+    // width: 0%;
     margin-left: 25%;
   }
 

src/views/warehouse/warehouseManagementGross.vue

@@ -480,6 +480,7 @@
                     :value="item.carNo"
                   />
                 </el-select>
+              {{deptBudgetList.loadNetWeight}}
               </ws-form-item>
               <!--船名  -->
               <ws-form-item
@@ -610,7 +611,6 @@
                   size="small"
                 />
               </ws-form-item>
-
               <!-- onkeyup="value=value.replace(/[^\A-\Z0-9\u4E00-\u9FA5\.]/g,'')" -->
             </ws-info-table>
           </div>
@@ -1068,6 +1068,9 @@ export default {
           this.deptBudgetList.freight = Math.round(
             this.tranCarInfoList[i].tranPrice
           )
+          if(this.deptBudgetList.inOutType=='移库入库'){
+            this.deptBudgetList.loadNetWeight=this.tranCarInfoList[i].loadNetWeight
+          }
         }
       }
     },
@@ -2266,6 +2269,7 @@ export default {
         console.log(this.deptBudgetList1[i])
         if (this.deptBudgetList1[i].inOutTaskNo == e) {
           var data = this.deptBudgetList1[i]
+          
           if (this.deptBudgetList1[i].contractNo) {
             this.deptBudgetList.contractNo = this.deptBudgetList1[i].contractNo
           } else {
@@ -2277,6 +2281,7 @@ export default {
         if (
           this.outContractNo[i].contractNo == this.deptBudgetList.contractNo
         ) {
+          console.log(this.outContractNo[i])
           this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
           this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
           this.deptBudgetList.grade = this.outContractNo[i].grade