Browse Source

完善仓库管理

master
yunuo970428 2 months ago
parent
commit
fb947355d4
  1. 83
      yxt-as-ui/src/views/warehouse/warehouse/index.vue
  2. 234
      yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue
  3. 102
      yxt-as-ui/src/views/warehouse/warehouse/warehouseInfo.vue

83
yxt-as-ui/src/views/warehouse/warehouse/index.vue

@ -11,8 +11,7 @@
<el-form :inline="true" class="tab-header"> <el-form :inline="true" class="tab-header">
<el-form-item label="仓库类型"> <el-form-item label="仓库类型">
<el-select v-model="queryParams.params.warehouseTypeValue" placeholder="请选择仓库类型"> <el-select v-model="queryParams.params.warehouseTypeValue" placeholder="请选择仓库类型">
<el-option v-for="item in warehouseTypeList" :key="item.dictValue" :label="item.dictValue" <el-option v-for="item in warehouseTypeList" :key="item.dictValue" :label="item.dictValue" :value="item.dictValue"/>
:value="item.dictValue" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="仓库名称"> <el-form-item label="仓库名称">
@ -24,7 +23,6 @@
<el-form-item label="仓库地址"> <el-form-item label="仓库地址">
<el-input v-model="queryParams.params.address" placeholder="" clearable/> <el-input v-model="queryParams.params.address" placeholder="" clearable/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="btn" style="text-align: center;"> <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-search" @click="dosearch">查询</el-button>
@ -39,28 +37,23 @@
<!-- End 项目列表头部 --> <!-- End 项目列表头部 -->
<!-- Start 项目列表 --> <!-- Start 项目列表 -->
<div class=""> <div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="selectionLineChangeHandle">
@selection-change="selectionLineChangeHandle">
<el-table-column fixed width="50" type="selection" align="center"/> <el-table-column fixed width="50" type="selection" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" align="center" width="100"> <el-table-column label="操作" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">详情</el-button> <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">详情</el-button>
<!-- <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button> -->
<!-- <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否可用" align="center" width="140"> <el-table-column label="是否可用" align="center" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch v-model="scope.row.usageStatus" active-text="" inactive-text="" active-value="1" <el-switch v-model="scope.row.usageStatus" active-text="" inactive-text="" active-value="1" inactive-value="0" @change="enableChange(scope.row.sid,scope.row.usageStatus)"/>
inactive-value="0" @change="enableChange(scope.row.sid,scope.row.usageStatus)" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="warehouseTypeValue" label="仓库类型" align="center"/> <el-table-column prop="warehouseTypeValue" label="仓库类型" align="center"/>
<el-table-column prop="warehouseName" label="仓库名称" align="center"/> <el-table-column prop="warehouseName" label="仓库名称" align="center"/>
<el-table-column prop="warehouseCode" label="仓库编码" align="center"/> <el-table-column prop="warehouseCode" label="仓库编码" align="center"/>
<el-table-column prop="manager" label="仓库主管" align="center"/> <el-table-column prop="manager" label="仓库主管" align="center"/>
<!-- <el-table-column prop="telephone" label="联系电话" align="center" /> -->
<el-table-column prop="squareMeter" label="占地面积" align="center"/> <el-table-column prop="squareMeter" label="占地面积" align="center"/>
<el-table-column prop="address" label="仓库地址" align="center"/> <el-table-column prop="address" label="仓库地址" align="center"/>
<el-table-column prop="sortNo" label="排序" align="center"/> <el-table-column prop="sortNo" label="排序" align="center"/>
@ -72,8 +65,7 @@
<div class="pages"> <div class="pages">
<div class="tit"/> <div class="tit"/>
<!-- 翻页 --> <!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div> </div>
</div> </div>
</div> </div>
@ -88,17 +80,14 @@
import req from '@/api/warehouse/warehouse.js' import req from '@/api/warehouse/warehouse.js'
import ButtonBar from '@/components/ButtonBar' import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './warehouseAdd.vue' import divAdd from './warehouseAdd.vue'
import divInfo from './warehouseInfo.vue' import divInfo from './warehouseInfo.vue'
import { import { getTypeValueList } from '@/api/Common/dictcommons.js'
typeValues,
} from '@/api/Common/dictcommons.js'
export default { export default {
components: { components: {
ButtonBar, ButtonBar,
Pagination, Pagination,
pageye,
divAdd, divAdd,
divInfo divInfo
}, },
@ -110,7 +99,8 @@
searchxianshitit: '显示查询条件', searchxianshitit: '显示查询条件',
tableLoading: false, tableLoading: false,
dataList: [], dataList: [],
btnList: [{ btnList: [
{
type: 'primary', type: 'primary',
size: 'small', size: 'small',
icon: 'plus', icon: 'plus',
@ -144,15 +134,18 @@
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
warehouseTypeValue: "", warehouseTypeValue: '',
name: '', name: '',
code: "", code: '',
address: "" address: '',
orgPath: '',
menuUrl: '',
userSid: ''
} }
}, },
sids: [], sids: [],
selectionList: [], selectionList: [],
warehouseTypeList: [], warehouseTypeList: []
} }
}, },
mounted() { mounted() {
@ -160,32 +153,20 @@
}, },
created() { created() {
this.loadList() this.loadList()
getTypeValueList({ type: 'warehouse', groupNum: 'shfw' }).then(resp => {
var params = { if (resp.success) {
type: "warehouse",
psid: '0'
}
typeValues(params).then(resp => {
console.log('>>>>>>>>>typeValues', resp)
this.warehouseTypeList = resp.data this.warehouseTypeList = resp.data
}).catch(() => {}) }
})
}, },
methods: { methods: {
selectionLineChangeHandle(val) { selectionLineChangeHandle(val) {
console.log("val", val);
this.selectionList = val this.selectionList = val
const aa = [] const aa = []
val.forEach(element => { val.forEach(element => {
aa.push(element.sid) aa.push(element.sid)
}) })
this.sids = aa this.sids = aa
}, },
// //
clicksearchShow() { clicksearchShow() {
@ -251,10 +232,13 @@
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
warehouseTypeValue: "", warehouseTypeValue: '',
name: '', name: '',
code: "", code: '',
address: "" address: '',
orgPath: '',
menuUrl: '',
userSid: ''
} }
} }
this.loadList() this.loadList()
@ -263,17 +247,15 @@
this.viewState = 2 this.viewState = 2
this.$refs['divadd'].showAdd() this.$refs['divadd'].showAdd()
}, },
toEdit() { toEdit() {
if (this.selectionList.length != 1) { if (this.selectionList.length !== 1) {
this.$message({ this.$message({
type: 'warning', type: 'warning',
message: "请选择一条数据。", message: '请选择一条数据。',
showClose: true showClose: true
}) })
return return
} }
this.viewState = 3 this.viewState = 3
this.$refs['divadd'].showEdit(this.selectionList[0]) this.$refs['divadd'].showEdit(this.selectionList[0])
}, },
@ -285,9 +267,7 @@
this.viewState = 4 this.viewState = 4
this.$refs['divinfo'].showEdit(row) this.$refs['divinfo'].showEdit(row)
}, },
doDel() { doDel() {
if (this.sids.length > 0) { if (this.sids.length > 0) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?' const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', { this.$confirm(tip, '提示', {
@ -316,7 +296,8 @@
}).catch(e => { }).catch(e => {
loading.close() loading.close()
}) })
}).catch(() => {}) }).catch(() => {
})
} else { } else {
this.$message({ this.$message({
showClose: true, showClose: true,
@ -324,15 +305,11 @@
}) })
} }
}, },
resetState() { resetState() {
this.viewState = 1 this.viewState = 1
this.loadList() this.loadList()
}, },
enableChange(sid, state) { enableChange(sid, state) {
console.log('sid', sid)
console.log('state', state)
req.updateIsEnable(sid, state).then((resp) => { req.updateIsEnable(sid, state).then((resp) => {
if (resp.success) { if (resp.success) {
this.$message({ this.$message({
@ -345,7 +322,7 @@
}).catch(e => { }).catch(e => {
console.log(e) console.log(e)
}) })
}, }
} }
} }
</script> </script>

234
yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue

@ -1,114 +1,76 @@
<template> <template>
<div> <div>
<div class="tab-header webtop"> <div class="tab-header webtop">
<!-- 标题 -->
<div>仓库信息</div> <div>仓库信息</div>
<!-- start 添加修改按钮 -->
<div> <div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button> <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button> <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div> </div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div> </div>
<div class="listconadd"> <div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02"> <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="first_row"> <el-row class="first_row">
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">仓库编码</div> <div class="span-sty">仓库编码</div>
<el-form-item prop="warehouseCode"> <el-form-item prop="warehouseCode">
<span class="addinputw addinputInfo">{{ formobj.warehouseCode }}</span> <span class="addinputw addinputInfo">{{ formobj.warehouseCode }}</span>
<!-- <el-input v-model="formobj.warehouseCode" placeholder="仓库编码" class="addinputw addinputInfo" clearable
oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" /> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<div class="span-sty"><span class="must">*</span> 仓库类型</div> <div class="span-sty"><span class="must">*</span> 仓库类型</div>
<el-form-item prop="warehouseTypeValue"> <el-form-item prop="warehouseTypeValue">
<el-select v-model="formobj.warehouseTypeValue" placeholder="请选择仓库类型" class="addinputw addinputInfo" <el-select v-model="formobj.warehouseTypeValue" placeholder="请选择仓库类型" class="addinputw addinputInfo" @change="selectWarehouseTypeChange">
@change="selectWarehouseTypeChange"> <el-option v-for="item in warehouseTypeList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
<el-option v-for="item in warehouseTypeList" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty"><span class="must">*</span> 仓库名称</div> <div class="span-sty"><span class="must">*</span> 仓库名称</div>
<el-form-item prop="warehouseName"> <el-form-item prop="warehouseName">
<el-input v-model="formobj.warehouseName" placeholder="按配件所属车辆品牌命名" class="addinputw addinputInfo" <el-input v-model="formobj.warehouseName" placeholder="按配件所属车辆品牌命名" class="addinputw addinputInfo" clearable/>
clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">仓库面积</div> <div class="span-sty">仓库面积</div>
<el-form-item> <el-form-item>
<el-input v-model="formobj.squareMeter" placeholder="仓库面积" class="addinputw addinputInfo" clearable <el-input v-model="formobj.squareMeter" placeholder="仓库面积" class="addinputw addinputInfo" clearable oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"/>
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty"><span class="must">*</span> 仓库管理员</div> <div class="span-sty"><span class="must">*</span> 仓库管理员</div>
<el-form-item> <el-form-item>
<el-form-item prop="manager"> <el-form-item prop="manager">
<el-select v-model="formobj.manager" placeholder="请选择仓库管理员" class="addinputw addinputInfo" <el-select v-model="formobj.manager" placeholder="请选择仓库管理员" class="addinputw addinputInfo" @change="selectManager">
@change="selectManager">
<el-option v-for="item in managerList" :key="item.sid" :label="item.name" :value="item.sid"/> <el-option v-for="item in managerList" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-input v-model="formobj.manager" placeholder="仓库管理员" class="addinputw addinputInfo" clearable /> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">仓库地址</div> <div class="span-sty">仓库地址</div>
<el-form-item> <el-form-item>
<el-input v-model="formobj.address" placeholder="仓库地址" class="addinputw addinputInfo" clearable/> <el-input v-model="formobj.address" placeholder="仓库地址" class="addinputw addinputInfo" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">经度</div> <div class="span-sty">经度</div>
<el-form-item> <el-form-item>
<el-input v-model="formobj.longitude" placeholder="经度" class="addinputw addinputInfo" clearable <el-input v-model="formobj.longitude" placeholder="经度" class="addinputw addinputInfo" clearable oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"/>
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<div class="span-sty">纬度</div> <div class="span-sty">纬度</div>
<el-form-item> <el-form-item>
<el-input v-model="formobj.latitude" placeholder="纬度" class="addinputw addinputInfo" clearable <el-input v-model="formobj.latitude" placeholder="纬度" class="addinputw addinputInfo" clearable oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"/>
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row> <!-- <el-row>
<el-col :span="8"> <el-col :span="8">
@ -134,54 +96,43 @@
</el-col> </el-col>
</el-row> --> </el-row> -->
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty"><span class="must">*</span> 排序</div> <div class="span-sty"><span class="must">*</span> 排序</div>
<el-form-item prop="sortNo"> <el-form-item prop="sortNo">
<el-input v-model="formobj.sortNo" placeholder="排序" class="addinputw addinputInfo" clearable <el-input v-model="formobj.sortNo" placeholder="排序" class="addinputw addinputInfo" clearable oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"/>
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<div class="span-sty"><span class="must">*</span> 使用状态</div> <div class="span-sty"><span class="must">*</span> 使用状态</div>
<el-form-item prop="usageStatus"> <el-form-item prop="usageStatus">
<el-radio-group v-model="formobj.usageStatus" size="small" @change="changeTheme" <el-radio-group v-model="formobj.usageStatus" size="small" class="addinputw addinputInfo">
class="addinputw addinputInfo">
<el-radio :label="'1'">正常</el-radio> <el-radio :label="'1'">正常</el-radio>
<el-radio :label="'0'">停用</el-radio> <el-radio :label="'0'">停用</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item> <el-form-item>
<el-input v-model="formobj.remarks" placeholder="备注" class="addinputw addinputInfo" clearable/> <el-input v-model="formobj.remarks" placeholder="备注" class="addinputw addinputInfo" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import req from '@/api/warehouse/warehouse.js' import req from '@/api/warehouse/warehouse.js'
import { import {
typeValues, getTypeValueList,
getOrgSidByPath getOrgSidByPath
} from '@/api/Common/dictcommons.js' } from '@/api/Common/dictcommons.js'
export default { export default {
components: {}, components: {},
data() { data() {
@ -193,193 +144,119 @@
warehouseCode: '由系统自动生成', warehouseCode: '由系统自动生成',
warehouseTypeKey: '', warehouseTypeKey: '',
warehouseTypeValue: '', warehouseTypeValue: '',
contacts: "", contacts: '',
mob: "", mob: '',
telephone: "", telephone: '',
manager: '', manager: '',
managerSid: '', managerSid: '',
longitude: '', longitude: '',
latitude: '', latitude: '',
usageStatus: "1", usageStatus: '1',
address: '', address: '',
squareMeter: '', squareMeter: '',
sortNo: '', sortNo: '',
remarks: '', remarks: '',
warehouseType: "0", warehouseType: '0',
useOrgSid: window.sessionStorage.getItem('departmentSid'), useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'), orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'), createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid')
}, },
warehouseTypeList: [], warehouseTypeList: [],
managerList: [], managerList: [],
rules: { rules: {
warehouseName: [{ warehouseName: [{ required: true, message: '仓库名称不能为空', trigger: 'blur' }],
required: true, sortNo: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
message: '仓库名称不能为空', usageStatus: [{ required: true, message: '请选择使用状态', trigger: 'change' }],
trigger: 'blur' manager: [{ required: true, message: '请选择仓库管理员', trigger: 'change' }],
}], warehouseTypeValue: [{ required: true, message: '请选择仓库类型', trigger: 'change' }]
sortNo: [{
required: true,
message: '排序不能为空',
trigger: 'blur'
}],
usageStatus: [{
required: true,
message: '请选择使用状态',
trigger: 'change'
}],
manager: [{
required: true,
message: '请选择仓库管理员',
trigger: 'change'
}],
warehouseTypeValue: [{
required: true,
message: '请选择仓库类型',
trigger: 'change'
}],
} }
} }
},
created() {
}, },
methods: { methods: {
changeTheme(val) {
},
selectManager(val) { selectManager(val) {
const choose = this.managerList.filter((item) => item.sid == val) const choose = this.managerList.filter((item) => item.sid === val)
console.log('>>>>>>>>>selectWarehouseTypeChange', choose) console.log('>>>>>>>>>selectWarehouseTypeChange', choose)
this.formobj.manager = choose[0].name this.formobj.manager = choose[0].name
this.formobj.managerSid = choose[0].sid this.formobj.managerSid = choose[0].sid
}, },
getDictValue() { getDictValue() {
getTypeValueList({ type: 'warehouse', groupNum: 'shfw' }).then(resp => {
var params = { if (resp.success) {
type: "warehouse",
psid: '0'
}
typeValues(params).then(resp => {
console.log('>>>>>>>>>typeValues', resp)
this.warehouseTypeList = resp.data this.warehouseTypeList = resp.data
}).catch(() => {}) }
})
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) { if (res.success) {
this.formobj.createOrgSid = res.data this.formobj.createOrgSid = res.data
} }
}) })
req.selMangerByRole({ useOrgSid: window.sessionStorage.getItem('departmentSid') }).then(resp => {
req.selMangerByRole({
useOrgSid: window.sessionStorage.getItem('departmentSid')
})
.then(resp => {
if (resp.success) { if (resp.success) {
this.managerList = resp.data this.managerList = resp.data
} }
}) })
.catch(e => {})
}, },
selectWarehouseTypeChange(val) { selectWarehouseTypeChange(val) {
const choose = this.warehouseTypeList.filter((item) => item.dictKey === val)
const choose = this.warehouseTypeList.filter((item) => item.dictKey == val)
console.log('>>>>>>>>>selectWarehouseTypeChange', choose) console.log('>>>>>>>>>selectWarehouseTypeChange', choose)
this.formobj.warehouseTypeKey = choose[0].dictKey this.formobj.warehouseTypeKey = choose[0].dictKey
this.formobj.warehouseTypeValue = choose[0].dictValue this.formobj.warehouseTypeValue = choose[0].dictValue
}, },
saveOrUpdate() { saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj) console.log('>>>>>>>>>saveOrUpdate', this.formobj)
this.$refs['form_obj'].validate((valid) => { this.$refs['form_obj'].validate((valid) => {
if (valid) { if (valid) {
req.saveWarehouse(this.formobj).then(resp => {
req.saveWarehouse(this.formobj)
.then(resp => {
if (resp.success) { if (resp.success) {
this.$message({ this.$message({ showClose: true, type: 'success', message: '保存成功', duration: 1000 })
showClose: true, if (this.formobj.sid === '') {
type: 'success',
message: resp.msg
})
this.$confirm('是否继续添加仓库信息?', '温馨提示', { this.$confirm('是否继续添加仓库信息?', '温馨提示', {
confirmButtonText: '是', confirmButtonText: '是',
cancelButtonText: '否', cancelButtonText: '否',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
// //
var warehouseTypeKey = this.formobj.warehouseTypeKey var warehouseTypeKey = this.formobj.warehouseTypeKey
var warehouseTypeValue = this.formobj.warehouseTypeValue var warehouseTypeValue = this.formobj.warehouseTypeValue
this.formobj = { this.formobj = {
sid: '', sid: '',
warehouseName: '', warehouseName: '',
warehouseCode: '由系统自动生成', warehouseCode: '由系统自动生成',
warehouseTypeKey: warehouseTypeKey, warehouseTypeKey: warehouseTypeKey,
warehouseTypeValue: warehouseTypeValue, warehouseTypeValue: warehouseTypeValue,
contacts: "", contacts: '',
mob: "", mob: '',
telephone: "", telephone: '',
manager: '', manager: '',
longitude: '', longitude: '',
latitude: '', latitude: '',
usageStatus: "1", usageStatus: '1',
address: '', address: '',
squareMeter: '', squareMeter: '',
sortNo: '', sortNo: '',
remarks: '', remarks: '',
warehouseType: "0", warehouseType: '0',
useOrgSid: window.sessionStorage.getItem('departmentSid'), useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'), orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'), createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid')
} }
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
}) })
}).catch(() => { }).catch(() => {
// //
this.handleReturn('true')
this.formobj = { })
sid: '', } else {
warehouseName: '', this.handleReturn('true')
warehouseCode: '由系统自动生成',
warehouseTypeKey: '',
warehouseTypeValue: '',
contacts: "",
mob: "",
telephone: "",
manager: '',
longitude: '',
latitude: '',
usageStatus: "1",
address: '',
squareMeter: '',
sortNo: '',
remarks: '',
warehouseType: "0",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
} }
this.$emit('doback')
});
} else { } else {
// resp.code // resp.code
} }
}).catch(() => {
}) })
.catch(() => {})
} }
}) })
}, },
@ -391,22 +268,22 @@
warehouseCode: '由系统自动生成', warehouseCode: '由系统自动生成',
warehouseTypeKey: '', warehouseTypeKey: '',
warehouseTypeValue: '', warehouseTypeValue: '',
contacts: "", contacts: '',
mob: "", mob: '',
telephone: "", telephone: '',
manager: '', manager: '',
longitude: '', longitude: '',
latitude: '', latitude: '',
usageStatus: "1", usageStatus: '1',
address: '', address: '',
squareMeter: '', squareMeter: '',
sortNo: '', sortNo: '',
remarks: '', remarks: '',
warehouseType: "0", warehouseType: '0',
useOrgSid: window.sessionStorage.getItem('departmentSid'), useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'), orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'), createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid')
} }
this.$emit('doback') this.$emit('doback')
}, },
@ -415,25 +292,20 @@
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
}) })
}, },
showEdit(row) { showEdit(row) {
this.getDictValue() this.getDictValue()
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
}) })
req.initWarehouse(row.sid).then(resp => {
req.initWarehouse(row.sid)
.then(resp => {
if (resp.success) { if (resp.success) {
this.formobj = resp.data this.formobj = resp.data
} }
}) }).catch(e => {
.catch(e => {
this.formobj = row this.formobj = row
}) })
}, }
} }
} }
</script> </script>

102
yxt-as-ui/src/views/warehouse/warehouse/warehouseInfo.vue

@ -1,94 +1,69 @@
<template> <template>
<div> <div>
<div class="tab-header webtop"> <div class="tab-header webtop">
<!-- 标题 -->
<div>仓库信息</div> <div>仓库信息</div>
<!-- start 添加修改按钮 -->
<div> <div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button> <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div> </div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div> </div>
<div class="listconadd"> <div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02"> <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row class="first_row"> <el-row class="first_row">
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">仓库编码</div> <div class="span-sty">仓库编码</div>
<el-form-item> <el-form-item>
<span class="addinputInfo">{{ formobj.warehouseCode }}</span> <span class="addinputInfo">{{ formobj.warehouseCode }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<div class="span-sty">仓库类型</div> <div class="span-sty">仓库类型</div>
<el-form-item> <el-form-item>
<span class="addinputInfo">{{ formobj.warehouseTypeValue }}</span> <span class="addinputInfo">{{ formobj.warehouseTypeValue }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">仓库名称</div> <div class="span-sty">仓库名称</div>
<el-form-item> <el-form-item>
<span class="addinputInfo">{{ formobj.warehouseName }}</span> <span class="addinputInfo">{{ formobj.warehouseName }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">仓库面积</div> <div class="span-sty">仓库面积</div>
<el-form-item> <el-form-item>
<span class="addinputInfo">{{ formobj.squareMeter }}</span> <span class="addinputInfo">{{ formobj.squareMeter }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">仓库管理员</div> <div class="span-sty">仓库管理员</div>
<el-form-item> <el-form-item>
<span class="addinputInfo">{{ formobj.manager }}</span> <span class="addinputInfo">{{ formobj.manager }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">仓库地址</div> <div class="span-sty">仓库地址</div>
<el-form-item> <el-form-item>
<span class="addinputInfo">{{ formobj.address }}</span> <span class="addinputInfo">{{ formobj.address }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">经度</div> <div class="span-sty">经度</div>
<el-form-item> <el-form-item>
<span class="addinputInfo">{{ formobj.longitude }}</span> <span class="addinputInfo">{{ formobj.longitude }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<div class="span-sty">纬度</div> <div class="span-sty">纬度</div>
<el-form-item> <el-form-item>
<span class="addinputInfo">{{ formobj.latitude }}</span> <span class="addinputInfo">{{ formobj.latitude }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row > <!-- <el-row >
<el-col :span="8"> <el-col :span="8">
@ -115,47 +90,38 @@
</el-row> --> </el-row> -->
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">排序</div> <div class="span-sty">排序</div>
<el-form-item> <el-form-item>
<span class="addinputInfo">{{ formobj.sortNo }}</span> <span class="addinputInfo">{{ formobj.sortNo }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<div class="span-sty">使用状态</div> <div class="span-sty">使用状态</div>
<el-form-item> <el-form-item>
<el-radio-group v-model="formobj.usageStatus" size="small" :disabled='true' <el-radio-group v-model="formobj.usageStatus" size="small" :disabled='true' class="addinputw addinputInfo">
class="addinputw addinputInfo">
<el-radio :label="'1'">正常</el-radio> <el-radio :label="'1'">正常</el-radio>
<el-radio :label="'0'">停用</el-radio> <el-radio :label="'0'">停用</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item> <el-form-item>
<span class="addinputInfo">{{ formobj.remarks }}</span> <span class="addinputInfo">{{ formobj.remarks }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import req from '@/api/warehouse/warehouse.js' import req from '@/api/warehouse/warehouse.js'
export default { export default {
components: {}, components: {},
data() { data() {
@ -165,77 +131,51 @@
sid: '', sid: '',
warehouseName: '', warehouseName: '',
warehouseCode: '', warehouseCode: '',
contacts: "", contacts: '',
mob: "", mob: '',
telephone: "", telephone: '',
manager: '', manager: '',
longitude: '', longitude: '',
latitude: '', latitude: '',
usageStatus: "", usageStatus: '',
address: '', address: '',
squareMeter: '', squareMeter: '',
sortNo: '', sortNo: '',
remarks: '', remarks: '',
warehouseType: "0" warehouseType: '0'
},
} }
},
created() {},
methods: {
changeTheme(val) {
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
req.saveWarehouse(this.formobj)
.then(resp => {
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
this.handleReturn('true')
} else {
// resp.code
} }
})
.catch(() => {})
}, },
handleReturn(isreload) { methods: {
if (isreload === 'true') this.$emit('reloadlist') handleReturn() {
this.formobj = { this.formobj = {
sid: '', sid: '',
warehouseName: '', warehouseName: '',
warehouseCode: '', warehouseCode: '',
contacts: "", contacts: '',
mob: "", mob: '',
telephone: "", telephone: '',
manager: '', manager: '',
longitude: '', longitude: '',
latitude: '', latitude: '',
usageStatus: "", usageStatus: '',
address: '', address: '',
squareMeter: '', squareMeter: '',
sortNo: '', sortNo: '',
remarks: '', remarks: '',
warehouseType: "0" warehouseType: '0'
} }
this.$emit('doback') this.$emit('doback')
}, },
showAdd() {},
showEdit(row) { showEdit(row) {
req.initWarehouse(row.sid) req.initWarehouse(row.sid).then(resp => {
.then(resp => {
if (resp.success) { if (resp.success) {
this.formobj = resp.data this.formobj = resp.data
} }
}) }).catch(e => {
.catch(e => {
this.formobj = row this.formobj = row
}) })
}, }
} }
} }
</script> </script>
@ -256,12 +196,4 @@
.first_row { .first_row {
border-top: 1px solid #E0E3EB; border-top: 1px solid #E0E3EB;
} }
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style> </style>

Loading…
Cancel
Save