完善登录返回参数

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()
     },
@@ -42,11 +44,11 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-           window.sessionStorage.clear()
-           this.$router.push({
-             path: '/login'
-           })
-           location.reload()
+          window.sessionStorage.clear()
+          this.$router.push({
+            path: '/login'
+          })
+          location.reload()
           // this.$store.commit('user/SET_UESRINFO', '')
 
         })

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,113 +125,114 @@
 </template>
 
 <script>
-import req from '@/api/baseinfo/supplier/supplier.js'
+  import req from '@/api/baseinfo/supplier/supplier.js'
 
-export default {
-  name: 'SupplierInfo',
-  data() {
-    return {
-      viewTitle: '',
-      viewState: 1,
-      tableKey: 0,
-      index: 0,
-      formobj: {
-        sid: '',
-        supplierCode: '',
-        supplierName: '',
-        supplierPY: '',
-        supplierTypeSid: '',
-        supplierTypeName: '',
-        provinceSid: '',
-        province: '',
-        citySid: '',
-        city: '',
-        countySid: '',
-        county: '',
-        address: '',
-        contactMobile: '',
-        contactTelePhone: '',
-        contactName: '',
-        fax: '',
-        zipCode: '',
-        email: '',
-        website: '',
-        billingCompanyName: '',
-        registNum: '',
-        legalName: '',
-        purchaser: '',
-        sortNo: '',
-        billingTypeKey: '',
-        billingTypeValue: '',
-        useOrgSid: '',
-        createOrgName: '',
-        createOrgSid: '',
-        taxRate: '',
-        remarks: '',
-        pmsSupplierBankList: []
+  export default {
+    name: 'SupplierInfo',
+    data() {
+      return {
+        viewTitle: '',
+        viewState: 1,
+        tableKey: 0,
+        index: 0,
+        formobj: {
+          sid: '',
+          supplierCode: '',
+          supplierName: '',
+          supplierPY: '',
+          supplierTypeSid: '',
+          supplierTypeName: '',
+          provinceSid: '',
+          province: '',
+          citySid: '',
+          city: '',
+          countySid: '',
+          county: '',
+          address: '',
+          contactMobile: '',
+          contactTelePhone: '',
+          contactName: '',
+          fax: '',
+          zipCode: '',
+          email: '',
+          website: '',
+          billingCompanyName: '',
+          registNum: '',
+          legalName: '',
+          purchaser: '',
+          sortNo: '',
+          billingTypeKey: '',
+          billingTypeValue: '',
+          useOrgSid: '',
+          createOrgName: '',
+          createOrgSid: '',
+          taxRate: '',
+          remarks: '',
+          baseSupplierBankList: []
+        },
+        rules: {}
+      }
+    },
+    methods: {
+      showInfo(row) {
+        this.viewTitle = '供应商详情'
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+        req.fetchDetailsBySid(row.sid).then((res) => {
+          if (res.success) {
+            this.formobj = res.data
+          }
+        })
       },
-      rules: {}
-    }
-  },
-  methods: {
-    showInfo(row) {
-      this.viewTitle = '供应商详情'
-      this.$nextTick(() => {
-        this.$refs['form_obj'].clearValidate()
-      })
-      req.fetchDetailsBySid(row.sid).then((res) => {
-        if (res.success) {
-          this.formobj = res.data
+      handleReturn() {
+        this.formobj = {
+          sid: '',
+          supplierCode: '',
+          supplierName: '',
+          supplierPY: '',
+          supplierTypeSid: '',
+          supplierTypeName: '',
+          provinceSid: '',
+          province: '',
+          citySid: '',
+          city: '',
+          countySid: '',
+          county: '',
+          address: '',
+          contactMobile: '',
+          contactTelePhone: '',
+          contactName: '',
+          fax: '',
+          zipCode: '',
+          email: '',
+          website: '',
+          billingCompanyName: '',
+          registNum: '',
+          legalName: '',
+          purchaser: '',
+          sortNo: '',
+          billingTypeKey: '',
+          billingTypeValue: '',
+          useOrgSid: '',
+          createOrgName: '',
+          createOrgSid: '',
+          taxRate: '',
+          remarks: '',
+          baseSupplierBankList: []
         }
-      })
-    },
-    handleReturn() {
-      this.formobj = {
-        sid: '',
-        supplierCode: '',
-        supplierName: '',
-        supplierPY: '',
-        supplierTypeSid: '',
-        supplierTypeName: '',
-        provinceSid: '',
-        province: '',
-        citySid: '',
-        city: '',
-        countySid: '',
-        county: '',
-        address: '',
-        contactMobile: '',
-        contactTelePhone: '',
-        contactName: '',
-        fax: '',
-        zipCode: '',
-        email: '',
-        website: '',
-        billingCompanyName: '',
-        registNum: '',
-        legalName: '',
-        purchaser: '',
-        sortNo: '',
-        billingTypeKey: '',
-        billingTypeValue: '',
-        useOrgSid: '',
-        createOrgName: '',
-        createOrgSid: '',
-        taxRate: '',
-        remarks: '',
-        pmsSupplierBankList: []
+        this.$emit('doback')
       }
-      this.$emit('doback')
     }
   }
-}
 </script>
 
 <style>
-.span-sty {
-  width: 130px !important;
-}
-.addinputInfo {
-  margin-left: 120px !important;
-}
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
 </style>

src/views/inStorage/deliveryNotice/receiptAdd.vue

@@ -586,44 +586,44 @@
         //   return
         // }
 
-      for (var i = 0; i < this.formobj.list.length; i++) {
+        for (var i = 0; i < this.formobj.list.length; i++) {
 
-        if (Number(this.formobj.list[i].actualInCount) == 0) {
-          this.$message({
-            showClose: true,
-            type: 'error',
-            message: '商品实收数量不能为空'
-          })
+          if (Number(this.formobj.list[i].actualInCount) == 0) {
+            this.$message({
+              showClose: true,
+              type: 'error',
+              message: '商品实收数量不能为空'
+            })
+
+            return
+          }
 
-          return
         }
 
-      }
+        for (var i = 0; i < this.formobj.pcList.length; i++) {
 
-      for (var i = 0; i < this.formobj.pcList.length; i++) {
+          if (this.formobj.pcList[i].manufactureDate == '') {
+            this.$message({
+              showClose: true,
+              type: 'error',
+              message: '生产日期不能为空'
+            })
 
-        if (this.formobj.pcList[i].expirationDate == '') {
-          this.$message({
-            showClose: true,
-            type: 'error',
-            message: '生产日期不能为空'
-          })
+            return
+          }
 
-          return
-        }
+          if (Number(this.formobj.pcList[i].batchCount) == 0) {
+            this.$message({
+              showClose: true,
+              type: 'error',
+              message: '批次数量不能为0'
+            })
 
-        if (Number(this.formobj.pcList[i].batchCount) == 0) {
-          this.$message({
-            showClose: true,
-            type: 'error',
-            message: '批次数量不能为0'
-          })
+            return
+          }
 
-          return
         }
 
-      }
-
 
         this.$refs['form_obj'].validate((valid) => {
           if (valid) {

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>
@@ -227,39 +228,39 @@
 
 
           <div class="title"
-          style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
-          <div>商品-批次</div>
-        </div>
-        <el-table v-loading="listLoading" :data="formobj.pcList" border style="width: 100%;"
-          :row-style="{height: '40px'}">
-          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-          <el-table-column fixed label="操作" wid align="center" width="120">
-            <template slot-scope="scope">
-              <el-button type="primary" size="mini" @click="doGoodsBatch(scope.row)">删除</el-button>
-            </template>
-          </el-table-column>
-          <el-table-column label="商品列表序号" prop="xh" align="center" width="120" />
-          <el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
-          <el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
-          <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
-          <el-table-column label="单位" prop="unit" align="center" width="120" />
-          <el-table-column label="仓库" prop="warehouseName" align="center" width="150" />
-          <el-table-column label="库位" prop="warehouseRackName" align="center" width="150" />
-          <el-table-column label="批次号" prop="batchNumber" align="center" width="300" />
-          <el-table-column label="生产日期" align="center" width="180">
-            <template slot-scope="scope">
-              <el-date-picker v-model="scope.row.manufactureDate" type="date" style="width:100%"
-                value-format="yyyy-MM-dd" placeholder="选择日期" @change="manufactureDateChange(scope.row,$event)" />
-            </template>
-          </el-table-column>
-          <el-table-column label="有效期" prop="expirationDate" align="center" width="180" />
-          <el-table-column label="数量" align="center" width="120">
-            <template slot-scope="scope">
-              <el-input ref="focusAssumptionInput" v-model="scope.row.batchCount" clearable placeholder=""
-                oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
-            </template>
-          </el-table-column>
-        </el-table>
+            style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
+            <div>商品-批次</div>
+          </div>
+          <el-table v-loading="listLoading" :data="formobj.pcList" border style="width: 100%;"
+            :row-style="{height: '40px'}">
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column fixed label="操作" wid align="center" width="120">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="doGoodsBatch(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="商品列表序号" prop="xh" align="center" width="120" />
+            <el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
+            <el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
+            <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
+            <el-table-column label="单位" prop="unit" align="center" width="120" />
+            <el-table-column label="仓库" prop="warehouseName" align="center" width="150" />
+            <el-table-column label="库位" prop="warehouseRackName" align="center" width="150" />
+            <el-table-column label="批次号" prop="batchNumber" align="center" width="300" />
+            <el-table-column label="生产日期" align="center" width="180">
+              <template slot-scope="scope">
+                <el-date-picker v-model="scope.row.manufactureDate" type="date" style="width:100%"
+                  value-format="yyyy-MM-dd" placeholder="选择日期" @change="manufactureDateChange(scope.row,$event)" />
+              </template>
+            </el-table-column>
+            <el-table-column label="有效期" prop="expirationDate" align="center" width="180" />
+            <el-table-column label="数量" align="center" width="120">
+              <template slot-scope="scope">
+                <el-input ref="focusAssumptionInput" v-model="scope.row.batchCount" clearable placeholder=""
+                  oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+              </template>
+            </el-table-column>
+          </el-table>
 
         </el-form>
 
@@ -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

@@ -510,20 +510,22 @@
             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('userName', response.data.userName)
-          window.sessionStorage.setItem('orgName', response.data.orgName)
-          window.sessionStorage.setItem('mobile', response.data.mobile)
-          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('orgSidPath', response.data.orgSidPath)
-          window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', response.data
-            .pNameAndDepartmentNameAndPostName)
+            window.sessionStorage.setItem('token', response.data.token)
+            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('mobile', response.data.mobile)
+            window.sessionStorage.setItem('orgName', response.data.orgName)
+            window.sessionStorage.setItem('orgSid', response.data.orgSid)
+            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)
           }
 
         }).catch(() => {
@@ -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)
           }