product_platform/wms-ui-admin
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

完善数据权限

Browse Source
This commit is contained in:
guoxing
2024-07-17 16:55:17 +08:00
parent 89a78fde00
commit f4a203984f
25 changed files with 1633 additions and 1603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/system/userManage/index.js
View File

@@ -92,7 +92,7 @@ export function userSingle(data) {
// 单条用户的角色列表
export function setRole(data) {
return request({
url: '/wms/apiadmin/sysrole/listAllByUserSid/' + data.sid,
url: '/wms/apiadmin/sysrole/listAllByUserSid/' + data.sid + "/" + data.orgsid,
method: 'post',
data: data,
headers: {

58
src/views/baseInfo/supplier/supplier/supplier.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<!--列表页面-->
<div v-show="viewState == 1">
<button-bar view-title="供应商管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<button-bar view-title="供应商管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<!--Start查询列表部分-->
<div class="main-content">
<div class="searchcon">
@@ -10,16 +10,16 @@
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="供应商">
<el-input v-model="listQuery.params.supplierName" placeholder="" clearable/>
<el-input v-model="listQuery.params.supplierName" placeholder="" clearable />
</el-form-item>
<el-form-item label="分类">
<el-input v-model="listQuery.params.supplierTypeName" placeholder="" clearable/>
<el-input v-model="listQuery.params.supplierTypeName" placeholder="" clearable />
</el-form-item>
<el-form-item label="办公电话">
<el-input v-model="listQuery.params.contactTelePhone" placeholder="" clearable/>
<el-input v-model="listQuery.params.contactTelePhone" placeholder="" clearable />
</el-form-item>
<el-form-item label="联系人">
<el-input v-model="listQuery.params.contactName" placeholder="" clearable/>
<el-input v-model="listQuery.params.contactName" placeholder="" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@@ -31,11 +31,13 @@
<!--End查询列表部分-->
<div class="listtop">
<div class="tit">供应商列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div>
<!--Start 主页面主要部分 -->
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
<el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;"
@selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50" />
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="操作" width="180px" align="center">
@@ -54,9 +56,10 @@
</div>
<!--End 主页面主要部分-->
<div class="pages">
<div class="tit"/>
<div class="tit" />
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div>
<!--End查询列表部分-->
</div>
@@ -69,14 +72,14 @@
</template>
<script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/baseinfo/supplier/supplier.js'
import supplierAdd from './supplierAdd'
import supplierInfo from './supplierInfo'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/baseinfo/supplier/supplier.js'
import supplierAdd from './supplierAdd'
import supplierInfo from './supplierInfo'
export default {
export default {
name: 'Supplier',
components: {
Pagination,
@@ -88,8 +91,7 @@ export default {
data() {
return {
btndisabled: false,
btnList: [
{
btnList: [{
type: 'primary',
size: 'small',
icon: 'plus',
@@ -183,6 +185,9 @@ export default {
// 查询列表信息
getList() {
this.listLoading = true
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.orgPath = window.sessionStorage.getItem('orgSidPath')
this.listQuery.params.menuUrl = this.$route.path
req.listPage(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
@@ -228,7 +233,11 @@ export default {
},
doDel() {
if (this.sids.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
this.$message({
showClose: true,
type: 'error',
message: '请选择至少一条记录进行删除操作'
})
return
}
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
@@ -245,15 +254,18 @@ export default {
})
req.delBySids(this.sids).then(resp => {
if (resp.success) {
this.$message({ type: 'success', message: resp.msg, showClose: true })
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
}
this.getList()
loading.close()
}).catch(e => {
loading.close()
})
}).catch(() => {
})
}).catch(() => {})
},
// 修改、编辑、详情返回列表页面
resetState() {
@@ -264,7 +276,7 @@ export default {
this.$router.go(-1)
}
}
}
}
</script>
<style scoped>
</style>

222
src/views/baseInfo/supplier/supplier/supplierAdd.vue
View File

@@ -14,50 +14,61 @@
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>供应商名称</div>
<el-form-item prop="supplierName"><el-input class="addinputInfo addinputw" v-model="formobj.supplierName" clearable placeholder=""/></el-form-item>
<el-form-item prop="supplierName"><el-input class="addinputInfo addinputw" v-model="formobj.supplierName"
clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>供应商简称</div>
<el-form-item prop="supplierPY"><el-input class="addinputInfo addinputw" v-model="formobj.supplierPY" clearable placeholder=""/></el-form-item>
<el-form-item prop="supplierPY"><el-input class="addinputInfo addinputw" v-model="formobj.supplierPY"
clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>供应商编码</div>
<el-form-item prop="supplierCode"><el-input class="addinputInfo addinputw" v-model="formobj.supplierCode" clearable placeholder=""/></el-form-item>
<el-form-item prop="supplierCode"><el-input class="addinputInfo addinputw" v-model="formobj.supplierCode"
clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>供应商类型</div>
<el-form-item prop="supplierTypeSid">
<el-select class="addinputInfo" v-model="formobj.supplierTypeSid" filterable placeholder="" @change="supplierTypeChange">
<el-option v-for="item in supplierType_list" :key="item.sid" :label="item.supplierTypeName" :value="item.sid"/>
<el-select class="addinputInfo" v-model="formobj.supplierTypeSid" filterable placeholder=""
@change="supplierTypeChange">
<el-option v-for="item in supplierType_list" :key="item.sid" :label="item.supplierTypeName"
:value="item.sid" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>供应商电话</div>
<el-form-item prop="contactTelePhone"><el-input class="addinputInfo addinputw" v-model="formobj.contactTelePhone" clearable placeholder=""/></el-form-item>
<el-form-item prop="contactTelePhone"><el-input class="addinputInfo addinputw"
v-model="formobj.contactTelePhone" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">传真</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.fax" clearable placeholder=""/></el-form-item>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.fax" clearable
placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">详细地址</div>
<el-form-item>
<div class="addinputInfo" style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center">
<el-select v-model="formobj.province" filterable clearable placeholder="请选择省" style="width:160px" @change="provinceChange">
<el-option v-for="item in province_list" :key="item.sid" :label="item.name" :value="item.name"/>
<div class="addinputInfo"
style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center">
<el-select v-model="formobj.province" filterable clearable placeholder="请选择省" style="width:160px"
@change="provinceChange">
<el-option v-for="item in province_list" :key="item.sid" :label="item.name" :value="item.name" />
</el-select>
<el-select v-model="formobj.city" filterable placeholder="请选择市" style="width:160px" @change="cityChange">
<el-option v-for="item in city_list" :key="item.sid" :label="item.name" :value="item.name"/>
<el-select v-model="formobj.city" filterable placeholder="请选择市" style="width:160px"
@change="cityChange">
<el-option v-for="item in city_list" :key="item.sid" :label="item.name" :value="item.name" />
</el-select>
<el-select v-model="formobj.county" filterable placeholder="请选择县" style="width:160px" @change="countyChange">
<el-option v-for="item in county_list" :key="item.sid" :label="item.name" :value="item.name"/>
<el-select v-model="formobj.county" filterable placeholder="请选择县" style="width:160px"
@change="countyChange">
<el-option v-for="item in county_list" :key="item.sid" :label="item.name" :value="item.name" />
</el-select>
<el-input style="width: 30%" v-model="formobj.address" clearable placeholder=""/>
<el-input style="width: 30%" v-model="formobj.address" clearable placeholder="" />
</div>
</el-form-item>
</el-col>
@@ -65,11 +76,13 @@
<el-row>
<el-col :span="8">
<div class="span-sty">联系人</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.contactName" clearable placeholder=""/></el-form-item>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.contactName" clearable
placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">联系电话</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.contactMobile" clearable placeholder=""/></el-form-item>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.contactMobile" clearable
placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
</el-col>
@@ -77,53 +90,65 @@
<el-row>
<el-col :span="8">
<div class="span-sty">邮编</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.zipCode" clearable placeholder=""/></el-form-item>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.zipCode" clearable
placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">电子邮件</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.email" clearable placeholder=""/></el-form-item>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.email" clearable
placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">网址</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.website" clearable placeholder=""/></el-form-item>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.website" clearable
placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>开票公司名称</div>
<el-form-item prop="billingCompanyName"><el-input class="addinputInfo addinputw" v-model="formobj.billingCompanyName" clearable placeholder=""/></el-form-item>
<el-form-item prop="billingCompanyName"><el-input class="addinputInfo addinputw"
v-model="formobj.billingCompanyName" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">税号</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.registNum" clearable placeholder=""/></el-form-item>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.registNum" clearable
placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">法人</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.legalName" clearable placeholder=""/></el-form-item>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.legalName" clearable
placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">采购员</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.purchaser" clearable placeholder=""/></el-form-item>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.purchaser" clearable
placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>开票类型</div>
<el-form-item prop="billingTypeValue">
<el-select class="addinputInfo" v-model="formobj.billingTypeValue" filterable placeholder="" @change="billingTypeChange">
<el-option v-for="item in billingType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
<el-select class="addinputInfo" v-model="formobj.billingTypeValue" filterable placeholder=""
@change="billingTypeChange">
<el-option v-for="item in billingType_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictValue" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>税率</div>
<el-form-item prop="taxRate"><el-input class="addinputInfo addinputw" @keyup.native="formobj.taxRate = getNumber(formobj.taxRate, 2)" v-model="formobj.taxRate" clearable placeholder=""/></el-form-item>
<el-form-item prop="taxRate"><el-input class="addinputInfo addinputw"
@keyup.native="formobj.taxRate = getNumber(formobj.taxRate, 2)" v-model="formobj.taxRate" clearable
placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder=""/></el-form-item>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable
placeholder="" /></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
@@ -131,7 +156,7 @@
<el-button type="primary" size="mini" class="btntopblueline" @click="handleAdd">新增</el-button>
</div>
<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 fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column fixed width="150" label="操作" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleEdit(scope.row, scope.$index)">编辑</el-button>
@@ -139,14 +164,14 @@
</template>
</el-table-column>
<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>
@@ -156,11 +181,16 @@
</template>
<script>
import req from '@/api/baseinfo/supplier/supplier.js'
import openingbank from './relation/openingbank'
import { getProvince, getCity, getCounty, typeValues } from '@/api/Common/dictcommons'
import req from '@/api/baseinfo/supplier/supplier.js'
import openingbank from './relation/openingbank'
import {
getProvince,
getCity,
getCounty,
typeValues
} from '@/api/Common/dictcommons'
export default {
export default {
name: 'SupplierAdd',
components: {
openingbank
@@ -210,23 +240,59 @@ export default {
createOrgSid: '',
taxRate: '',
remarks: '',
baseSupplierBankList: []
baseSupplierBankList: [],
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
},
rules: {
supplierName: [{ required: true, message: '供应商名称不能为空', trigger: 'blur' }],
supplierPY: [{ required: true, message: '供应商简称不能为空', trigger: 'blur' }],
supplierCode: [{ required: true, message: '供应商编码不能为空', trigger: 'blur' }],
supplierTypeSid: [{ required: true, message: '供应商类型不能为空', trigger: 'change' }],
contactTelePhone: [{ required: true, message: '供应商电话不能为空', trigger: 'blur' }],
billingCompanyName: [{ required: true, message: '开票公司名称不能为空', trigger: 'blur' }],
billingTypeValue: [{ required: true, message: '开票类型不能为空', trigger: 'change' }],
taxRate: [{ required: true, message: '税率不能为空', trigger: 'blur' }]
supplierName: [{
required: true,
message: '供应商名称不能为空',
trigger: 'blur'
}],
supplierPY: [{
required: true,
message: '供应商简称不能为空',
trigger: 'blur'
}],
supplierCode: [{
required: true,
message: '供应商编码不能为空',
trigger: 'blur'
}],
supplierTypeSid: [{
required: true,
message: '供应商类型不能为空',
trigger: 'change'
}],
contactTelePhone: [{
required: true,
message: '供应商电话不能为空',
trigger: 'blur'
}],
billingCompanyName: [{
required: true,
message: '开票公司名称不能为空',
trigger: 'blur'
}],
billingTypeValue: [{
required: true,
message: '开票类型不能为空',
trigger: 'change'
}],
taxRate: [{
required: true,
message: '税率不能为空',
trigger: 'blur'
}]
}
}
},
methods: {
init() {
typeValues({ type: 'accountType' }).then((res) => {
typeValues({
type: 'accountType'
}).then((res) => {
if (res.success) {
this.billingType_list = res.data
}
@@ -236,7 +302,9 @@ export default {
this.province_list = res.data
}
})
req.selSupplierType({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
req.selSupplierType({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.supplierType_list = res.data
}
@@ -282,7 +350,9 @@ export default {
}
},
getCity(val) {
getCity({ sid: val }).then((res) => {
getCity({
sid: val
}).then((res) => {
if (res.success) {
this.city_list = res.data
}
@@ -296,7 +366,9 @@ export default {
}
},
getCounty(val) {
getCounty({ sid: val }).then((res) => {
getCounty({
sid: val
}).then((res) => {
if (res.success) {
this.county_list = res.data
}
@@ -388,7 +460,11 @@ export default {
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
this.handleReturn('true')
} else {
this.submitdisabled = false
@@ -434,42 +510,50 @@ export default {
createOrgSid: '',
taxRate: '',
remarks: '',
baseSupplierBankList: []
baseSupplierBankList: [],
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
this.submitdisabled = false
this.$emit('doback')
}
}
}
}
</script>
<style scoped>
.span-sty {
.span-sty {
width: 130px !important;
}
.addinputInfo {
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
/deep/ .el-form-item__error {
}
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.titleOne {
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
/*表格列设置fixed后固定列出现下边框的设置*/
/deep/ .el-table__fixed {
}
/*表格列设置fixed后固定列出现下边框的设置*/
/deep/ .el-table__fixed {
height: 100% !important;
}
/*表格列设置fixed后固定列出现下边框的设置*/
/deep/ .el-table__fixed-right {
}
/*表格列设置fixed后固定列出现下边框的设置*/
/deep/ .el-table__fixed-right {
height: 100% !important;
}
}
</style>

87
src/views/baseInfo/supplier/suppliertype/suppliertype.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<!--列表页面-->
<div v-show="viewState == 1">
<button-bar view-title="供应商类型管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<button-bar view-title="供应商类型管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<!--Start查询列表部分-->
<div class="main-content">
<div class="searchcon">
@@ -10,10 +10,10 @@
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="供应商类型">
<el-input v-model="listQuery.params.supplierTypeName" placeholder="" clearable/>
<el-input v-model="listQuery.params.supplierTypeName" placeholder="" clearable />
</el-form-item>
<el-form-item label="供应商编码">
<el-input v-model="listQuery.params.supplierTypeCode" placeholder="" clearable/>
<el-input v-model="listQuery.params.supplierTypeCode" placeholder="" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@@ -25,11 +25,13 @@
<!--End查询列表部分-->
<div class="listtop">
<div class="tit">供应商类型列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div>
<!--Start 主页面主要部分 -->
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
<el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;"
@selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50" />
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="操作" width="180px" align="center">
@@ -43,9 +45,10 @@
</div>
<!--End 主页面主要部分-->
<div class="pages">
<div class="tit"/>
<div class="tit" />
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div>
<!--End查询列表部分-->
</div>
@@ -55,11 +58,13 @@
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="12">
<div class="span-sty"><span class="icon">*</span>供应商类型</div>
<el-form-item><el-input class="addinputInfo" style="width: 60%" v-model.trim="formobj.supplierTypeName" clearable placeholder="" /></el-form-item>
<el-form-item><el-input class="addinputInfo" style="width: 60%" v-model.trim="formobj.supplierTypeName"
clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty"><span class="icon">*</span>供应商编码</div>
<el-form-item><el-input class="addinputInfo" style="width: 60%" v-model.trim="formobj.supplierTypeCode" clearable placeholder="" /></el-form-item>
<el-form-item><el-input class="addinputInfo" style="width: 60%" v-model.trim="formobj.supplierTypeCode"
clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
</el-form>
@@ -72,11 +77,11 @@
</template>
<script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/baseinfo/suppliertype/suppliertype.js'
export default {
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/baseinfo/suppliertype/suppliertype.js'
export default {
name: 'SupplierType',
components: {
Pagination,
@@ -87,8 +92,7 @@ export default {
return {
btndisabled: false,
dialogVisible: false,
btnList: [
{
btnList: [{
type: 'primary',
size: 'small',
icon: 'plus',
@@ -133,7 +137,8 @@ export default {
sid: '',
supplierTypeName: '',
supplierTypeCode: '',
orgPath: ''
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
}
},
@@ -187,7 +192,9 @@ export default {
// 查询列表信息
getList() {
this.listLoading = true
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.orgPath = window.sessionStorage.getItem('orgSidPath')
this.listQuery.params.menuUrl = this.$route.path
req.listPage(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
@@ -224,7 +231,8 @@ export default {
sid: '',
supplierTypeName: '',
supplierTypeCode: '',
orgPath: ''
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
},
toEdit(row) {
@@ -233,26 +241,39 @@ export default {
sid: row.sid,
supplierTypeName: row.supplierTypeName,
supplierTypeCode: row.supplierTypeCode,
orgPath: ''
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
},
handleConfirm() {
if (this.formobj.supplierTypeName === '' || this.formobj.supplierTypeCode === '') {
this.$message({ showClose: true, type: 'error', message: '供应商类型或编码不能为空' })
this.$message({
showClose: true,
type: 'error',
message: '供应商类型或编码不能为空'
})
return
}
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
this.dialogVisible = false
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
this.getList()
}
})
},
doDel() {
if (this.sids.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
this.$message({
showClose: true,
type: 'error',
message: '请选择至少一条记录进行删除操作'
})
return
}
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
@@ -269,28 +290,32 @@ export default {
})
req.delBySids(this.sids).then(resp => {
if (resp.success) {
this.$message({ type: 'success', message: resp.msg, showClose: true })
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
}
this.getList()
loading.close()
}).catch(e => {
loading.close()
})
}).catch(() => {
})
}).catch(() => {})
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
}
</script>
<style scoped>
.span-sty {
.span-sty {
width: 100px !important;
}
.addinputInfo {
}
.addinputInfo {
margin-left: 90px !important;
}
}
</style>

11
src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue
View File

@@ -69,11 +69,8 @@
locationName: '',
locationSid: '',
remarks: '',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
},
warehouseList: [],
warehouseAreaList: [],
@@ -85,7 +82,7 @@
methods: {
initData() {
var parpams = {
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
orgPath: window.sessionStorage.getItem('orgSid'),
}
req2.getAllWarehouse(parpams).then(resp => {
this.warehouseList = resp.data
@@ -125,9 +122,7 @@
locationName: '',
locationSid: '',
remarks: '',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
this.$emit('doback')

27
src/views/baseInfo/warehouses/goodsShelves/index.vue
View File

@@ -15,18 +15,8 @@
</el-form>
<div class="btn" style="text-align: center;">
<el-button
type="primary"
size="small"
icon="el-icon-search"
@click="dosearch"
>查询</el-button>
<el-button
type="primary"
size="small"
icon="el-icon-refresh"
@click="resetQuery"
>重置</el-button>
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</div>
</div>
</div>
@@ -62,14 +52,8 @@
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<pagination
v-show="dataList.length > 0"
:total="queryParams.total"
:page.sync="queryParams.current"
:limit.sync="queryParams.size"
class="pagination"
@pagination="loadList"
/>
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div>
</div>
</div>
@@ -156,6 +140,9 @@
},
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('orgSidPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false
if (resp.success) {

26
src/views/baseInfo/warehouses/warehouse/index.vue
View File

@@ -15,18 +15,8 @@
</el-form>
<div class="btn" style="text-align: center;">
<el-button
type="primary"
size="small"
icon="el-icon-search"
@click="dosearch"
>查询</el-button>
<el-button
type="primary"
size="small"
icon="el-icon-refresh"
@click="resetQuery"
>重置</el-button>
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</div>
</div>
</div>
@@ -65,14 +55,8 @@
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<pagination
v-show="dataList.length > 0"
:total="queryParams.total"
:page.sync="queryParams.current"
:limit.sync="queryParams.size"
class="pagination"
@pagination="loadList"
/>
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div>
</div>
</div>
@@ -160,7 +144,7 @@
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.orgPath = window.sessionStorage.getItem('orgSidPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false

8
src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue
View File

@@ -105,9 +105,7 @@
sortNo: '',
remarks: '',
warehouseType: "0",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
},
}
@@ -152,9 +150,7 @@
sortNo: '',
remarks: '',
warehouseType: "0",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
this.$emit('doback')

26
src/views/baseInfo/warehouses/warehouseArea/index.vue
View File

@@ -15,18 +15,8 @@
</el-form>
<div class="btn" style="text-align: center;">
<el-button
type="primary"
size="small"
icon="el-icon-search"
@click="dosearch"
>查询</el-button>
<el-button
type="primary"
size="small"
icon="el-icon-refresh"
@click="resetQuery"
>重置</el-button>
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</div>
</div>
</div>
@@ -64,14 +54,8 @@
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<pagination
v-show="dataList.length > 0"
:total="queryParams.total"
:page.sync="queryParams.current"
:limit.sync="queryParams.size"
class="pagination"
@pagination="loadList"
/>
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div>
</div>
</div>
@@ -159,7 +143,7 @@
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.orgPath = window.sessionStorage.getItem('orgSidPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false

11
src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue
View File

@@ -81,11 +81,8 @@
warehouseSid: '',
areaTypeSid: "",
areaTypeName: "",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
},
warehouseList: [],
warehouseTypeList: [],
@@ -97,7 +94,7 @@
methods: {
initData() {
var parpams = {
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
orgPath: window.sessionStorage.getItem('orgSid'),
}
req2.getAllWarehouse(parpams).then(resp => {
this.warehouseList = resp.data
@@ -137,9 +134,7 @@
remarks: '',
areaTypeSid: "",
areaTypeName: "",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
}

26
src/views/baseInfo/warehouses/warehouseAreaType/index.vue
View File

@@ -15,18 +15,8 @@
</el-form>
<div class="btn" style="text-align: center;">
<el-button
type="primary"
size="small"
icon="el-icon-search"
@click="dosearch"
>查询</el-button>
<el-button
type="primary"
size="small"
icon="el-icon-refresh"
@click="resetQuery"
>重置</el-button>
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</div>
</div>
</div>
@@ -61,14 +51,8 @@
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<pagination
v-show="dataList.length > 0"
:total="queryParams.total"
:page.sync="queryParams.current"
:limit.sync="queryParams.size"
class="pagination"
@pagination="loadList"
/>
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div>
</div>
</div>
@@ -156,7 +140,7 @@
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.orgPath = window.sessionStorage.getItem('orgSidPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false

9
src/views/baseInfo/warehouses/warehouseAreaType/warehouseAreaTypeAdd.vue
View File

@@ -44,12 +44,9 @@
sid: '',
warehouseAreaTypeName: '',
remarks: '',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
},
}
},
@@ -78,9 +75,7 @@
sid: '',
warehouseAreaTypeName: '',
remarks: '',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
}

8
src/views/goods/brands/brandsAdd.vue
View File

@@ -121,9 +121,7 @@
remarks: '',
letter: '',
image: "",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
},
@@ -230,9 +228,7 @@
remarks: '',
letter: '',
image: "",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
this.$emit('doback')

2
src/views/goods/brands/index.vue
View File

@@ -183,7 +183,7 @@
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.orgPath = window.sessionStorage.getItem('orgSidPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false

8
src/views/goods/category/categoryAdd.vue
View File

@@ -173,9 +173,7 @@
pname: '',
sortNo: '',
remarks: '',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
},
@@ -303,9 +301,7 @@
pname: '',
sortNo: '',
remarks: '',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
this.$emit('doback')

5
src/views/goods/category/index.vue
View File

@@ -16,8 +16,7 @@
<el-input v-model="queryParams.params.code" placeholder="" clearable />
</el-form-item>
<el-form-item label="是否一物一码">
<el-select v-model="queryParams.params.goodID" placeholder="请选择"
@change="selectIsGoodIDChange">
<el-select v-model="queryParams.params.goodID" placeholder="请选择" @change="selectIsGoodIDChange">
<el-option v-for="item in isGoodIDList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
</el-form-item>
@@ -232,7 +231,7 @@
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.orgPath = window.sessionStorage.getItem('orgSidPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false

10
src/views/goods/factory/factoryAdd.vue
View File

@@ -47,7 +47,7 @@
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item >
<el-form-item>
<el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" clearable />
</el-form-item>
</el-col>
@@ -94,9 +94,7 @@
manufacturerCode: '',
sortNo: '',
remarks: "",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
},
rules: {
@@ -180,9 +178,7 @@
manufacturerCode: '',
sortNo: '',
remarks: "",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
this.$emit('doback')

2
src/views/goods/factory/index.vue
View File

@@ -172,7 +172,7 @@
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.orgPath = window.sessionStorage.getItem('orgSidPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false

12
src/views/goods/goods/goodsAdd.vue
View File

@@ -791,9 +791,7 @@
goodsDescription: ""
},
baseGoodsSkus: [],
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
},
brandList: [],
@@ -814,8 +812,8 @@
methods: {
initData() {
var parpams ={
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
var parpams = {
orgPath: window.sessionStorage.getItem('orgSid'),
}
req2.getAllBrand(parpams).then(resp => {
@@ -882,9 +880,7 @@
goodsDescription: ""
},
baseGoodsSkus: [],
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
this.$emit('doback')

2
src/views/goods/goods/goodsAdd2.vue
View File

@@ -344,7 +344,7 @@
},
initData() {
var parpams = {
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
orgPath: window.sessionStorage.getItem('orgSid'),
}
req2.getAllBrand(parpams).then(resp => {
this.brandList = resp.data

3
src/views/goods/goods/index.vue
View File

@@ -281,6 +281,9 @@
},
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('orgSidPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false
if (resp.success) {

2
src/views/goods/unit/index.vue
View File

@@ -172,7 +172,7 @@
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.orgPath = window.sessionStorage.getItem('orgSidPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false

8
src/views/goods/unit/unitAdd.vue
View File

@@ -62,9 +62,7 @@
sid: '',
unitName: '',
remarks: '',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
},
rules: {
@@ -119,9 +117,7 @@
sid: '',
unitName: '',
remarks: '',
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
orgPath: window.sessionStorage.getItem('defaultDeptSid'),
userSid: window.sessionStorage.getItem('userSid'),
}
this.$emit('doback')

34
src/views/login/login.vue
View File

@@ -15,9 +15,11 @@
<div class="main-right-table">
<div :class="tableIndex == 1 ? 'main-right-table-text1' : 'main-right-table-text3'" @click="tableClick(1)">
<div style="cursor:pointer;" :class="tableIndex == 1 ? 'main-right-table-text1' : 'main-right-table-text3'"
@click="tableClick(1)">
密码登录</div>
<div :class="tableIndex == 2 ? 'main-right-table-text2' : 'main-right-table-text4'" @click="tableClick(2)">
<div style="cursor:pointer;" :class="tableIndex == 2 ? 'main-right-table-text2' : 'main-right-table-text4'"
@click="tableClick(2)">
验证码登录</div>
</div>
@@ -34,7 +36,8 @@
<div style="display: flex;flex-direction: row;align-items: center;width: 100%;">
<el-input class="input" style="flex: 1; margin-right: 10px;" maxlength="6" placeholder="请输入验证码"
v-model="loginForm.verifyCode" />
<span :class="sendCodeType ? 'sendCode1' : 'sendCode2'" @click="sendCode">{{sendCodeText}}</span>
<span :class="sendCodeType ? 'sendCode1' : 'sendCode2'" style="cursor:pointer;"
@click="sendCode">{{sendCodeText}}</span>
</div>
</div>
@@ -49,9 +52,9 @@
<div class="main-right-bom-right">
<span @click="forgetClick">忘记密码</span>
<span @click="forgetClick" style="cursor:pointer;">忘记密码</span>
<div style="margin-left: 8px;margin-right: 8px;width: 1px; height: 18px;background: #999;"></div>
<span @click="registerClick">去注册</span>
<span @click="registerClick" style="cursor:pointer;">去注册</span>
</div>
@@ -81,13 +84,14 @@
style="display: flex;flex-direction: row;align-items: center;width: 100%; margin-top: 5px;margin-left: -10px;">
<el-input class="input" style="flex: 1; margin-right: 10px;" maxlength="6" placeholder="请输入验证码"
v-model="registerInfo.code" />
<span :class="sendCodeType2 ? 'sendCode1' : 'sendCode2'" @click="sendCode2">{{sendCodeText2}}</span>
<span :class="sendCodeType2 ? 'sendCode1' : 'sendCode2'" @click="sendCode2"
style="cursor:pointer;">{{sendCodeText2}}</span>
</div>
<div style="display: flex;flex-direction: row;align-items: center;width: 100%; margin-top: 5px;"
@click="goLogin">
<span>已有账号？</span>
<span style="color: #5084D2;">登录</span>
<span style="color: #5084D2;cursor:pointer;">登录</span>
</div>
@@ -98,9 +102,9 @@
<div style="display: flex;flex-direction: row;align-items: center;width: 100%; margin-top: 10px;">
<el-checkbox style="margin-right: 5px;" v-model="check"></el-checkbox>
<span style="font-size: 12px;">我已阅读并同意</span>
<span style="font-size: 12px;">《宇信通服务协议》</span>
<span style="font-size: 12px;cursor:pointer;">《宇信通服务协议》</span>
<span style="font-size: 12px;">与</span>
<span style="font-size: 12px;">《隐私协议》</span>
<span style="font-size: 12px;cursor:pointer;">《隐私协议》</span>
</div>
</div>
@@ -115,7 +119,7 @@
style="display: flex;flex-direction: column;width: 100%;">
<div style="display: flex;flex-direction: row;align-items: center;
background: #EDF1F7; border-radius: 8px;width: 100%;margin-bottom: 20px;
height: 50px;">
height: 50px;cursor:pointer;">
<img src="../../assets/images/company_icon.png" style="width: 25px; height: 25px;
margin-left: 10px;margin-right: 10px;" />
<span style="flex: 1;margin-right: 10px;">{{item.orgName}}</span>
@@ -216,7 +220,8 @@
check: false,
registerInfo: {
mobile: '',
userSid: ""
userSid: "",
sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa33', // wms 资源sid
},
loginForm: {
userName: '',
@@ -509,7 +514,6 @@
loading.close()
window.sessionStorage.setItem('token', response.data.token)
window.sessionStorage.setItem('staffSid', response.data.staffSid)
window.sessionStorage.setItem('userSid', response.data.sid)
@@ -523,7 +527,8 @@
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('defaultOrgPath', response.data.defaultOrgPath)
window.sessionStorage.setItem('defaultOrgPathName', response.data.defaultOrgPathName)
window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', response.data
.pNameAndDepartmentNameAndPostName)
}
@@ -571,7 +576,8 @@
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('defaultOrgPath', response.data.defaultOrgPath)
window.sessionStorage.setItem('defaultOrgPathName', response.data.defaultOrgPathName)
window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', response.data
.pNameAndDepartmentNameAndPostName)
}

1
src/views/system/userManage/userManageList.vue
View File

@@ -433,6 +433,7 @@
this.roleDialog = true
this.roleForm.sid = row.sid
this.roleForm.userSid = row.sid
this.roleForm.orgsid = window.sessionStorage.getItem('orgSid')
setRole(this.roleForm).then(res => {
this.roleList = res.data
for (let i = 0; i < res.data.length; i++) {