wilson
/
ccl-lnj-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

库位改动

master
文宽 史 2 years ago
parent
0ef43261da
commit
af20cbc23c
2 changed files with 784 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      src/api/warehouse/warehouse.js
  2. 771
      src/views/modules/warehouse/location.vue

13
src/api/warehouse/warehouse.js
View File

@ -0,0 +1,13 @@
import { createAPI } from "@/utils/httpRequest.js";
//新增
export const saveWarehouse= data => createAPI(`/warehouse/info/append`,'post',data)
//查询
export const findWarehouse= data => createAPI(`/warehouse/info/findMessage`,'post',data)
//修改
export const updateWarehouse= data => createAPI(`/warehouse/info/amend`,'post',data)
//删除
export const deleteWarehouse= data => createAPI(`/warehouse/info/delete`,'post',data)

771
src/views/modules/warehouse/location.vue
View File

@ -0,0 +1,771 @@
<template>
<div class="mod-config">
<!-- &lt;!&ndash; 收藏 &ndash;&gt;-->
<!-- <div>-->
<!-- <span @click="favoriteFunction()">-->
<!-- <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>-->
<!-- </span>-->
<!-- </div>-->
<!-- 条件查询 -->
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
<!-- <el-form-item :label="'BU'">-->
<!-- <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 130px">-->
<!-- <el-option-->
<!-- v-for = "i in userBuList"-->
<!-- :key = "i.buNo"-->
<!-- :label = "i.buDesc"-->
<!-- :value = "i.buDesc">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item :label="'仓库编码:'">
<el-input v-model="searchData.warehouseId" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'工厂编号:'">
<el-input v-model="searchData.site" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'保管员:'">
<el-input v-model="searchData.keeper" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="是否为有效仓库:">
<el-select v-model="searchData.validStock" placeholder="请选择">
<el-option label="是" value="Y"></el-option>
<el-option label="否" value="N"></el-option>
<el-option label="" value=""></el-option>
</el-select>
</el-form-item>
<el-form-item :label="' '">
<el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button>
<el-button v-if="!authSave" type="primary" @click="addModal()">新增</el-button>
<download-excel
:fields="fields()"
:data="exportData"
type="xls"
:name="exportName"
:header="exportHeader"
:footer="exportFooter"
:fetch="createExportData"
:before-generate="startDownload"
:before-finish="finishDownload"
worksheet="导出信息"
class="el-button el-button--primary el-button--medium">
{{ "导出" }}
</download-excel>
</el-form-item>
</el-form>
<!-- 展示列表 -->
<el-table
:height="height"
:data="dataList"
border
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
<el-table-column
fixed="right"
header-align="center"
align="center"
width="160"
label="操作">
<template slot-scope="scope">
<a type="text" size="small" @click="updateModal(scope.row)">修改</a>
<a type="text" size="small" @click="deleteModal(scope.row)">删除</a>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="pageIndex"
:page-sizes="[20, 50, 100, 200, 500]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
<!-- 新增和修改 -->
<el-dialog title="检验方法" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="工厂编码:" prop="site" :rules="rules.site">
<el-input v-model="modalData.site" style="width: 221px"></el-input>
</el-form-item>
<el-form-item label="仓库编码:" prop="warehouseId" :rules="rules.warehouseId">
<el-input v-model="modalData.warehouseId" style="width: 221px"></el-input>
</el-form-item>
<el-form-item label="仓库名称:" prop="warehouseName" :rules="rules.warehouseName">
<el-input v-model="modalData.warehouseName" style="width: 221px"></el-input>
</el-form-item>
<el-form-item label="是否在使用:">
<el-select v-model="modalData.active" placeholder="请选择" style="width: 221px">
<el-option label="是" value="Y"></el-option>
<el-option label="否" value="N"></el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item :label="'仓库类型'">
<el-input v-model="modalData.warehouseType" style="width: 221px"></el-input>
</el-form-item>
<el-form-item :label="'DB'">
<el-input v-model="modalData.warehouseTypeDB" style="width: 221px"></el-input>
</el-form-item>
<el-form-item :label="'管理员'">
<el-input v-model="modalData.keeper" style="width: 221px"></el-input>
</el-form-item>
<el-form-item :label="'公司编码'">
<el-input v-model="modalData.companyId" style="width: 221px"></el-input>
</el-form-item>
<el-form-item :label="'是否为有效仓库'">
<el-select v-model="modalData.validStock" placeholder="请选择" style="width: 221px">
<el-option label="是" value="Y"></el-option>
<el-option label="否" value="N"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'是否采用库位管理'">
<el-select v-model="modalData.useLocation" placeholder="请选择" style="width: 221px">
<el-option label="是" value="Y"></el-option>
<el-option :label="i.desc" :value="i.no" v-for="(i) in arr"></el-option>
<el-option label="否" value="N"></el-option>
</el-select>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="saveData()">保存</el-button>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
</div>
</template>
<script>
import {
findWarehouse, // 检验方法查询
saveWarehouse, // 检验方法新增
updateWarehouse, // 检验方法修改
deleteWarehouse, // 检验方法删除
// inspectionTypeSearch, // 搜索所有检验类型
// // getSiteAndBuByUserName
} from "@/api/warehouse/warehouse.js"
// import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
// import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
export default {
data () {
return {
// 是否收藏
favorite: false,
// 导出 start
exportData: [],
exportName: "检验方法" + this.dayjs().format('YYYYMMDDHHmmss'),
exportHeader: ["检验方法"],
exportFooter: [],
exportList: [],
// 导出 end
searchData: {
id:'',
site: '',
userName: this.$store.state.user.name,
warehouseId: '',
warehouseName: '',
keeper: '',
validStock: '',
page: 1,
limit: 10,
},
pageIndex: 1,
pageSize: 20,
totalPage: 0,
height: 200,
dataList: [],
dataListLoading: false,
modalFlag: false,
modalDisableFlag: false,
modalData: {
site: '',
warehouseId: '',
warehouseName: '',
active: '',
warehouseType: '',
creator: this.$store.state.user.name,
// updateBy: this.$store.state.user.name,
warehouseTypeDB: '',
keeper: '',
companyId: '',
validStock: '',
useLocation: ''
},
// 标头展示
columnList: [
{
userId: this.$store.state.user.name,
functionId: 100001004,
serialNumber: '100001004TableSite',
tableId: "100001004Table",
tableName: "工厂编码",
columnWidth: 100,
columnProp: 'site',
headerAlign: 'center',
align: "center",
columnLabel: '工厂编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 100001004,
serialNumber: '100001004TableLocationId',
tableId: "100001004Table",
tableName: "库位编码",
columnWidth: 100,
columnProp: 'locationId',
headerAlign: 'center',
align: "center",
columnLabel: '库位编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 100001004,
serialNumber: '100001004TableWarehouseId',
tableId: "100001004Table",
tableName: "仓库编码",
columnWidth: 150,
columnProp: 'warehouseId',
headerAlign: 'center',
align: "left",
columnLabel: '仓库编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 100001004,
serialNumber: '100001004TableLocationName',
tableId: "100001004Table",
tableName: "库位名称",
columnWidth: 100,
columnProp: 'LocationName',
headerAlign: 'center',
align: "center",
columnLabel: '库位名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 100001004,
serialNumber: '100001004TableInspectionKeeper',
tableId: "100001004Table",
tableName: "保管员",
columnWidth: 150,
columnProp: 'keeper',
headerAlign: 'center',
align: "center",
columnLabel: '保管员',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 100001004,
serialNumber: '100001004TableActive',
tableId: "100001004Table",
tableName: "是否在使用",
columnWidth: 150,
columnProp: 'Active',
headerAlign: 'center',
align: "left",
columnLabel: '是否在使用',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 100001004,
serialNumber: '100001004TableLocationDescription',
tableId: "100001004Table",
tableName: "库位描述",
columnWidth: 100,
columnProp: 'locationDescription',
headerAlign: 'center',
align: "center",
columnLabel: '库位描述',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 100001004,
serialNumber: '100001004TableRemarks',
tableId: "100001004Table",
tableName: "备注",
columnWidth: 100,
columnProp: 'remarks',
headerAlign: 'center',
align: "center",
columnLabel: '备注',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 100001004,
serialNumber: '100001004TableCreateTime',
tableId: "100001004Table",
tableName: "创建时间",
columnWidth: 100,
columnProp: 'createTime',
headerAlign: 'center',
align: "center",
columnLabel: '创建时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 100001004,
serialNumber: '100001004TableCreator',
tableId: "100001004Table",
tableName: "创建人",
columnWidth: 80,
columnProp: 'creator',
headerAlign: 'center',
align: "center",
columnLabel: '创建人',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
],
rules: {
locationId:[
{
required: true,
message: ' ',
trigger: ['blur','change']
}
],
site:[
{
required: true,
message: ' ',
trigger: ['blur','change']
}
],
locationName:[
{
required: true,
message: ' ',
trigger: ['blur','change']
}
],
warehouseId:[
{
required: true,
message: ' ',
trigger: ['blur','change']
}
]
},
options: [],
userBuList: [],
authSearch: false,
authSave: false,
authUpdate: false,
authDelete: false,
menuId: this.$route.meta.menuId,
}
},
mounted () {
this.$nextTick(() => {
this.height = window.innerHeight - 180
})
},
created () {
this.getDataList()
},
methods: {
// 获取用户的bu
getSiteAndBuByUserName () {
let tempData = {
username: this.$store.state.user.name,
}
getSiteAndBuByUserName(tempData).then(({data}) => {
if (data.code === 0) {
this.userBuList = data.rows
}
})
},
// 查询获取数据列表
getDataList () {
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
findWarehouse(this.searchData).then(({data}) => {
if (data.code === 0) {
this.dataList = data.page.list
this.pageIndex = data.page.currPage
this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
}
})
},
// 每页数
sizeChangeHandle (val) {
this.pageSize = val
this.pageIndex = 1
this.getDataList()
},
// 当前页
currentChangeHandle (val) {
this.pageIndex = val
this.getDataList()
},
// 新增按钮
addModal () {
this.modalData = {
flag: '1',
site: '',
creator: this.$store.state.user.name,
warehouseId: '',
warehouseName: '',
active: 'Y',
warehouseType: '',
warehouseTypeDB: '',
keeper: '',
companyId: '',
validStock: 'Y',
useLocation: 'Y'
}
this.modalDisableFlag = false
this.modalFlag = true
},
// 修改按钮
updateModal (row) {
this.modalData = {
flag: '2',
id:row.id,
site: row.site,
creator: this.$store.state.user.name,
warehouseId: row.warehouseId,
warehouseName: row.warehouseName,
active: row.active,
warehouseType: row.warehouseType,
warehouseTypeDB: row.warehouseTypeDB,
keeper: row.keeper,
companyId: row.companyId,
validStock: row.validStock,
useLocation: row.useLocation
}
this.modalDisableFlag = true
this.modalFlag = true
},
// 删除方法
deleteModal (row) {
this.$confirm(`是否删除这个检验方法?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteWarehouse(row).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
}).catch(() => {
})
},
// 新增/修改方法
saveData() {
if (this.modalData.site === '' || this.modalData.site == null) {
this.$message.warning('请输入工厂编码！')
return
}
if (this.modalData.warehouseId === '' || this.modalData.warehouseId == null) {
this.$message.warning('请输入仓库编码！')
return
}
if (this.modalData.warehouseName === '' || this.modalData.warehouseName == null) {
this.$message.warning('请输入仓库名称！')
return
}
if (this.modalData.flag === '1') { // 新增
saveWarehouse(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.modalFlag = false
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
} else { // 修改
updateWarehouse(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.modalFlag = false
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
}
},
// 查询检验类型
inspectionTypeSearch() {
let tempData = {
site: this.$store.state.user.site
}
inspectionTypeSearch(tempData).then(({data}) => {
if (data.code === 0) {
this.options = data.rows
}
})
},
// 校验用户是否收藏
favoriteIsOk() {
let userFavorite = {
userId: this.$store.state.user.id,
languageCode: this.$i18n.locale
}
userFavoriteList(userFavorite).then(({data}) => {
for (let i = 0; i < data.list.length; i++) {
if (this.$route.meta.menuId === data.list[i].menuId) {
this.favorite = true
}
}
})
},
// 收藏 OR 取消收藏
favoriteFunction() {
let userFavorite = {
userId: this.$store.state.user.id,
functionId: this.$route.meta.menuId,
}
if (this.favorite) {
removeUserFavorite(userFavorite).then(({data}) => {
this.$message.success(data.msg)
this.favorite = false
})
} else {
// 收藏
saveUserFavorite(userFavorite).then(({data}) => {
this.$message.success(data.msg)
this.favorite = true
})
}
},
//导出excel
async createExportData() {
this.searchData.limit = -1
this.searchData.page = 1
await findWarehouse(this.searchData).then(({data}) => {
this.exportList = data.rows
})
return this.exportList
},
startDownload() {
},
finishDownload() {
},
fields() {
let json = "{"
this.columnList.forEach((item, index) => {
if (index == this.columnList.length - 1) {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
} else {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
}
})
json += "}"
let s = eval("(" + json + ")")
return s
},
// 动态列开始 获取 用户保存的 格式列
async getTableUserColumn(tableId, columnId) {
let queryTableUser = {
userId: this.$store.state.user.name,
functionId: this.$route.meta.menuId,
tableId: tableId,
status: true,
languageCode: this.$i18n.locale
}
await getTableUserListLanguage(queryTableUser).then(({data}) => {
if (data.rows.length > 0) {
//this.columnList1 = []
switch (columnId) {
case 1:
this.columnList = data.rows
break;
// case 2:
// this.columnDetailList = data.rows
// break;
// case 3:
// this.columnList2 = data.rows
// break;
// case 4:
// this.columnList3 = data.rows
// break;
}
} else {
this.getColumnList(tableId, columnId)
}
})
},
// 获取 tableDefault 列
async getColumnList(tableId, columnId) {
let queryTable = {
functionId: this.$route.meta.menuId,
tableId: tableId,
languageCode: this.$i18n.locale
}
await getTableDefaultListLanguage(queryTable).then(({data}) => {
if (!data.rows.length == 0) {
switch (columnId) {
case 1:
this.columnList = data.rows
break;
// case 2:
// this.columnDetailList = data.rows
// break;
// case 3:
// this.columnList2 = data.rows
// break;
// case 4:
// this.columnList3 = data.rows
// break;
}
} else {
// this.showDefault = true.
}
})
},
//获取按钮的权限数据
getButtonAuthData() {
let searchFlag = this.isAuth(this.menuId + ":search")
let saveFlag = this.isAuth(this.menuId + ":save")
let updateFlag = this.isAuth(this.menuId + ":update")
let deleteFlag = this.isAuth(this.menuId + ":delete")
//处理页面的权限数据
this.authSearch = !searchFlag
this.authSave = !saveFlag
this.authUpdate = !updateFlag
this.authDelete = !deleteFlag
},
}
}
</script>
Write Preview
Loading…
Cancel
Save