完善登录返回参数

src/api/Common/dictcommons.js

@@ -49,7 +49,9 @@ export function selectHaveMessage(data) {
     url: '/portal/v1/sysuser/selectHaveMessage ',
     method: 'post',
     data: data,
-    headers: { 'Content-Type': 'application/json' }
+    headers: {
+      'Content-Type': 'application/json'
+    }
   })
 }
 
@@ -59,14 +61,16 @@ export function getButtonPermissions(data) {
     url: '/portal/v1/sysfunction/getButtonPermissions',
     method: 'post',
     data: data,
-    headers: { 'Content-Type': 'application/json' }
+    headers: {
+      'Content-Type': 'application/json'
+    }
   })
 }
 
 // 根据当前登录用户的全路径查询相应部门下的所有人
 export function selAllByOrgSidPath(data) {
   return request({
-    url: '/portal/v1/sysstafforg/selAllByOrgSidPath',
+    url: '/wms/apiadmin/sysstafforg/selAllByOrgSidPath',
     method: 'post',
     params: data
   })
@@ -105,7 +109,9 @@ export function customerListPage(params) {
     url: '/yxtcrm/apiadmin/v1/crmcustomer/customerListPage',
     method: 'post',
     data: params,
-    headers: { 'Content-Type': 'application/json' }
+    headers: {
+      'Content-Type': 'application/json'
+    }
   })
 }
 
@@ -148,7 +154,9 @@ export function chooseproducts(params) {
     url: '/yxtbase/apiadmin/base/basegoodssku/getGoodsListPage',
     method: 'post',
     data: params,
-    headers: { 'Content-Type': 'application/json' }
+    headers: {
+      'Content-Type': 'application/json'
+    }
   })
 }
 

src/api/baseinfo/supplier/supplier.js

@@ -7,7 +7,9 @@ export default {
       url: '/wms/apiadmin/supplierinfo/listPage',
       method: 'post',
       data: data,
-      headers: { 'Content-Type': 'application/json' }
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
   // 保存
@@ -16,7 +18,9 @@ export default {
       url: '/wms/apiadmin/supplierinfo/save',
       method: 'post',
       data: data,
-      headers: { 'Content-Type': 'application/json' }
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
   // 回显
@@ -32,7 +36,9 @@ export default {
       url: '/wms/apiadmin/supplierinfo/delBySids',
       method: 'DELETE',
       data: data,
-      headers: { 'Content-Type': 'application/json' }
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
   // 获取供应商类型
@@ -40,7 +46,10 @@ export default {
     return request({
       url: '/wms/apiadmin/suppliertype/selSupplierType',
       method: 'post',
-      params: data
+      params: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   }
 }

src/layout/components/Navbar.vue

@@ -6,7 +6,7 @@
       <!-- <h3 class="breadcrumb-container">汇融银行供应链贷后监管平台</h3> -->
       <div class="right-menu">
         <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
-        <p>{{Orgname}}，欢迎您：{{pNameAndDepartmentNameAndPostName}} {{name}}</p>
+        <p>欢迎您：{{pNameAndDepartmentNameAndPostName}} - {{defaultRoleName}} - {{name}}</p>
         <!-- <img src="@/assets/images/info.png"> -->
         <!-- <img src="@/assets/images/dy.png" @click="logout"> -->
         <span class="backToHome" @click="logout"><i class="el-icon-back"></i>退出登录</span>
@@ -23,6 +23,7 @@
         Orgname: '',
         departmentName: '',
         name: '',
+        defaultRoleName: '',
         year: '',
         pNameAndDepartmentNameAndPostName: ''
       }
@@ -30,8 +31,9 @@
     mounted() {
       this.Orgname = window.sessionStorage.getItem('orgName')
       this.departmentName = window.sessionStorage.getItem('departmentName')
-      this.name = window.sessionStorage.getItem('userName')
-      this.pNameAndDepartmentNameAndPostName = window.sessionStorage.getItem('defaultOrgPathName')
+      this.name = window.sessionStorage.getItem('name')
+      this.defaultRoleName = window.sessionStorage.getItem('defaultRoleName')
+      this.pNameAndDepartmentNameAndPostName = window.sessionStorage.getItem('pNameAndDepartmentNameAndPostName')
       var nowDate = new Date()
       this.year = nowDate.getFullYear()
     },

src/views/baseInfo/supplier/supplier/supplierInfo.vue

@@ -41,7 +41,8 @@
           <el-row>
             <el-col :span="24">
               <div class="span-sty">详细地址</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.province }}{{ formobj.city }}{{ formobj.county }}{{ formobj.address }}</span></el-form-item>
+              <el-form-item><span
+                  class="addinputInfo">{{ formobj.province }}{{ formobj.city }}{{ formobj.county }}{{ formobj.address }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -105,17 +106,17 @@
             </el-col>
           </el-row>
           <div class="title">开户行列表</div>
-          <el-table :key="tableKey" :data="formobj.pmsSupplierBankList" :index="index" border style="width: 100%">
-            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+          <el-table :key="tableKey" :data="formobj.baseSupplierBankList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
             <el-table-column prop="dueBankValue" label="账户类型" align="center" width="100" />
-            <el-table-column prop="bankName" label="开户银行" align="center" width="120"/>
+            <el-table-column prop="bankName" label="开户银行" align="center" width="120" />
             <el-table-column prop="bankAccount" label="银行账号" align="center" width="100" />
             <el-table-column prop="accountName" label="账号名称" align="center" width="160" />
             <el-table-column prop="bankingOutlets" label="银行网点" align="center" width="100" />
-            <el-table-column prop="bankAddress" label="开户行地址" align="center" min-width="200"/>
-            <el-table-column prop="paymentLines" label="联行号" align="center" width="100"/>
+            <el-table-column prop="bankAddress" label="开户行地址" align="center" min-width="200" />
+            <el-table-column prop="paymentLines" label="联行号" align="center" width="100" />
             <el-table-column prop="swiftCode" label="swifcode(银行代码)" align="center" width="170" />
-            <el-table-column prop="currency" label="币种" align="center" width="100"/>
+            <el-table-column prop="currency" label="币种" align="center" width="100" />
           </el-table>
         </el-form>
       </div>
@@ -124,9 +125,9 @@
 </template>
 
 <script>
-import req from '@/api/baseinfo/supplier/supplier.js'
+  import req from '@/api/baseinfo/supplier/supplier.js'
 
-export default {
+  export default {
     name: 'SupplierInfo',
     data() {
       return {
@@ -167,7 +168,7 @@ export default {
           createOrgSid: '',
           taxRate: '',
           remarks: '',
-        pmsSupplierBankList: []
+          baseSupplierBankList: []
         },
         rules: {}
       }
@@ -218,19 +219,20 @@ export default {
           createOrgSid: '',
           taxRate: '',
           remarks: '',
-        pmsSupplierBankList: []
+          baseSupplierBankList: []
         }
         this.$emit('doback')
       }
     }
-}
+  }
 </script>
 
 <style>
-.span-sty {
+  .span-sty {
     width: 130px !important;
-}
-.addinputInfo {
+  }
+
+  .addinputInfo {
     margin-left: 120px !important;
-}
+  }
 </style>

src/views/inStorage/deliveryNotice/receiptAdd.vue

@@ -602,7 +602,7 @@
 
         for (var i = 0; i < this.formobj.pcList.length; i++) {
 
-        if (this.formobj.pcList[i].expirationDate == '') {
+          if (this.formobj.pcList[i].manufactureDate == '') {
             this.$message({
               showClose: true,
               type: 'error',

src/views/inStorage/receivingGoods/receivingGoodsAdd.vue

@@ -50,7 +50,8 @@
               <div class="span-sty"><span class="must">*</span> 业务类型</div>
               <el-form-item prop="busTypeValue"><el-select v-model="formobj.busTypeValue" filterable clearable
                   placeholder="请选择" class="addinputInfo" @change="busTypeSelect">
-                 <el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  <el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue"
+                    :value="item.dictKey">
                   </el-option>
                 </el-select></el-form-item>
             </el-col>
@@ -301,9 +302,9 @@
           "sourceBillSid": "",
           "sourceBillNo": "",
           "createBySid": window.sessionStorage.getItem('userSid'),
-          "createByName": window.sessionStorage.getItem('name'),
-          "deptName": '',
-          "deptSid": '',
+          "createByName": window.sessionStorage.getItem('userName'),
+          "deptName": window.sessionStorage.getItem('departmentName'),
+          "deptSid": window.sessionStorage.getItem('departmentSid'),
           "createTime": getCurrentDate(),
           "busTypeKey": "",
           "busTypeValue": "",
@@ -689,9 +690,9 @@
           "sourceBillSid": "",
           "sourceBillNo": "",
           "createBySid": window.sessionStorage.getItem('userSid'),
-          "createByName": window.sessionStorage.getItem('name'),
-          "deptName": '',
-          "deptSid": '',
+          "createByName": window.sessionStorage.getItem('userName'),
+          "deptName": window.sessionStorage.getItem('departmentName'),
+          "deptSid": window.sessionStorage.getItem('departmentSid'),
           "createTime": getCurrentDate(),
           "busTypeKey": "",
           "busTypeValue": "",
@@ -726,7 +727,10 @@
           this.$refs['form_obj'].clearValidate()
         })
 
-        getTypeValueList({ type: 'wms_busType', groupNum: 'wms_rk' }).then((res) => {
+        getTypeValueList({
+          type: 'wms_busType',
+          groupNum: 'wms_rk'
+        }).then((res) => {
           if (res.success) {
             this.busTypeList = res.data
           }
@@ -748,7 +752,10 @@
           this.$refs['form_obj'].clearValidate()
         })
 
-        getTypeValueList({ type: 'wms_busType', groupNum: 'wms_rk' }).then((res) => {
+        getTypeValueList({
+          type: 'wms_busType',
+          groupNum: 'wms_rk'
+        }).then((res) => {
           if (res.success) {
             this.busTypeList = res.data
           }

src/views/login/login.vue

@@ -511,17 +511,19 @@
 
 
             window.sessionStorage.setItem('token', response.data.token)
-          window.sessionStorage.setItem('userSid', response.data.sid)
             window.sessionStorage.setItem('staffSid', response.data.staffSid)
+            window.sessionStorage.setItem('userSid', response.data.sid)
+            window.sessionStorage.setItem('name', response.data.name)
             window.sessionStorage.setItem('userName', response.data.userName)
-          window.sessionStorage.setItem('orgName', response.data.orgName)
             window.sessionStorage.setItem('mobile', response.data.mobile)
+            window.sessionStorage.setItem('orgName', response.data.orgName)
             window.sessionStorage.setItem('orgSid', response.data.orgSid)
-          window.sessionStorage.setItem('departmentName', response.data.departmentName)
-          window.sessionStorage.setItem('departmentSid', response.data.departmentSid)
-          window.sessionStorage.setItem('defaultOrgPath', response.data.orgSid)
-          window.sessionStorage.setItem('orgNamePath', response.data.orgNamePath)
+            window.sessionStorage.setItem('defaultDeptName', response.data.defaultDeptName)
+            window.sessionStorage.setItem('defaultDeptSid', response.data.defaultDeptSid)
+            window.sessionStorage.setItem('defaultRoleName', response.data.defaultRoleName)
+            window.sessionStorage.setItem('defaultRoleSid', response.data.defaultRoleSid)
             window.sessionStorage.setItem('orgSidPath', response.data.orgSidPath)
+            window.sessionStorage.setItem('defaultOrgPath', response.data.departmentSid)
             window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', response.data
               .pNameAndDepartmentNameAndPostName)
           }
@@ -557,17 +559,19 @@
             loading.close()
 
             window.sessionStorage.setItem('token', response.data.token)
-            window.sessionStorage.setItem('userSid', response.data.sid)
             window.sessionStorage.setItem('staffSid', response.data.staffSid)
+            window.sessionStorage.setItem('userSid', response.data.sid)
+            window.sessionStorage.setItem('name', response.data.name)
             window.sessionStorage.setItem('userName', response.data.userName)
-            window.sessionStorage.setItem('orgName', response.data.orgName)
             window.sessionStorage.setItem('mobile', response.data.mobile)
+            window.sessionStorage.setItem('orgName', response.data.orgName)
             window.sessionStorage.setItem('orgSid', response.data.orgSid)
-            window.sessionStorage.setItem('departmentName', response.data.departmentName)
-            window.sessionStorage.setItem('departmentSid', response.data.departmentSid)
-            window.sessionStorage.setItem('defaultOrgPath', response.data.orgSid)
-            window.sessionStorage.setItem('orgNamePath', response.data.orgNamePath)
+            window.sessionStorage.setItem('defaultDeptName', response.data.defaultDeptName)
+            window.sessionStorage.setItem('defaultDeptSid', response.data.defaultDeptSid)
+            window.sessionStorage.setItem('defaultRoleName', response.data.defaultRoleName)
+            window.sessionStorage.setItem('defaultRoleSid', response.data.defaultRoleSid)
             window.sessionStorage.setItem('orgSidPath', response.data.orgSidPath)
+            window.sessionStorage.setItem('defaultOrgPath', response.data.departmentSid)
             window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', response.data
               .pNameAndDepartmentNameAndPostName)
           }