java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

1.二维数组

fix_bug_pro20231227
0.0 2 years ago
parent
ef71e6c261
commit
205ced7fa2
6 changed files with 255 additions and 102 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. 9
      src/api/basicdata/basicdataGoodsAllocation.js
  2. 18
      src/api/basicdata/basicdataGoodsShelf.js
  3. 28
      src/api/basicdata/basicdataTray.js
  4. 30
      src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
  5. 142
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
  6. 130
      src/views/basicdata/warehouse/tray/basicdataTray.vue

9
src/api/basicdata/basicdataGoodsAllocation.js
Unescape View File

@ -49,6 +49,15 @@ export const enable = (ids) => {
}
})
}
export const downAllocation = (ids) => {
return request({
url: '/api/logpm-warehouse/warehouseGoodsAllocation/downAllocation',
method: 'post',
params: {
ids,
}
})
}
export const shelf = (ids) => {
return request({
url: '/api/logpm-warehouse/warehouseGoodsAllocation/downAllocation',

18
src/api/basicdata/basicdataGoodsShelf.js
Unescape View File

@ -87,15 +87,15 @@ export const getShowTemplate = (row) => {
})
}
export const getPrintTemplate = (ids) => {
return request({
url: '/api/logpm-basicdata/goodsShelf/getPrintTemplate',
method: 'get',
params:{
ids
}
})
}
// export const getPrintTemplate = (ids) => {
// return request({
// url: '/api/logpm-basicdata/goodsShelf/getPrintTemplate',
// method: 'get',
// params:{
// ids
// }
// })
// }
export const getQRCodeImg = (qrCode) => {
return request({

28
src/api/basicdata/basicdataTray.js
Unescape View File

@ -102,13 +102,32 @@ export const getDetail = (id) => {
export const remove = (ids) => {
return request({
url: '/api/logpm-basicdata/Tray/remove',
url: '/api/logpm-basicdata/tray/remove',
method: 'post',
params: {
ids,
}
})
}
export const disable = (ids) => {
return request({
url: '/api/logpm-basicdata/tray/disable',
method: 'post',
params: {
ids,
}
})
}
export const addable = (ids) => {
return request({
url: '/api/logpm-basicdata/tray/addable',
method: 'post',
params: {
ids,
}
})
}
export const add = (row) => {
return request({
@ -132,4 +151,11 @@ export const vacant = (row) => {
data: row
})
}
export const vacants = (row) => {
return request({
url: '/api/logpm-basicdata/tray/vacants',
method: 'post',
data: row
})
}

30
src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
Unescape View File

@ -31,6 +31,11 @@
plain
@click="handleEnable">启 用
</el-button>
<el-button type="danger"
icon="el-icon-delete"
plain
@click="downAllocation">一 键 下 架
</el-button>
<!-- <el-button type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
@ -78,7 +83,7 @@
</template>
<script>
import {getList, getDetail, add, update, remove,getPrintTemplate,shelf,disable,enable} from "@/api/basicdata/basicdataGoodsAllocation";
import {getList, getDetail, add, update, remove,getPrintTemplate,shelf,disable,enable,downAllocation} from "@/api/basicdata/basicdataGoodsAllocation";
import option from "@/option/basicdata/basicdataGoodsAllocation";
import {mapGetters} from "vuex";
import {exportBlob} from "@/api/common";
@ -88,6 +93,7 @@
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
import {getLodop} from "@/utils/LodopFuncs";
import { addlayer } from '@/api/basicdata/basicdataGoodsShelf';
export default {
data() {
@ -332,6 +338,28 @@
this.$refs.crud.toggleSelection();
});
},
downAllocation() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择库位下架?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
downAllocation(this.ids).then((response) => {
this.onLoad(this.page);
this.$message({
type: "success",
message: response.data.msg
});
})
})
},
//批量打印数据处理代码
printTemplate() {
let that=this;

142
src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
Unescape View File

@ -219,7 +219,7 @@
<template #footer>
<span class="dialog-footer">
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmitAdd">增 加</el-button>
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmitred">减 少</el-button>
<!-- <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmitred">减 少</el-button>-->
<el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
</span>
</template>
@ -259,20 +259,25 @@
<el-dialog
title="二维码"
:visible.sync="dialogVisible"
width="30%"
width="600px"
v-model="dialogVisible">
<div >
<div v-for="(item,index) in qrCodeObj">
<el-row>
<el-col :span="24" >
<el-image width="10" height="10" w-full :key="index" :src="item " alt="Preview Image"/>
</el-col>
</el-row>
</div>
<!-- <div v-for="(item,index) in qrCodeObj" class="pdf-dom">-->
<!-- <el-divider></el-divider>-->
<!-- <el-row>-->
<!-- <el-col :span="24" >-->
<!-- <el-image width="10" height="10" w-full :key="index" :src="item " alt="Preview Image"/>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </div>-->
<!--startprint1-->
<div v-html="html"></div>
<!--endprint1-->
</div>
<span slot="footer" class="dialog-footer">
<!-- <el-button type="primary" @click="ddd">导 出</el-button>-->
<el-button type="primary" @click="printTemplate">打 印</el-button>
<el-button type="primary" @click="printTemplate">打 印</el-button>
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</span>
@ -293,13 +298,13 @@
@size-change="allsizeChange"
@on-load="allonLoad">
<!-- <template #menu-left>-->
<!-- <el-button type="warning"-->
<!-- plain-->
<!-- icon="el-icon-camera"-->
<!-- @click="handleqr">查看二维码-->
<!-- </el-button>-->
<!-- </template>-->
<template #menu-left>
<el-button type="warning"
plain
icon="el-icon-camera"
@click="handleqr">查看二维码
</el-button>
</template>
<template #menu="{size,row,index}">
<el-button type="primary" text icon="el-icon-view" v-if="row.enableStatus ==1" @click="losses(row,2)">禁 用</el-button>
<!-- <el-button type="primary" text icon="el-icon-view" v-if="row.allocationStatus !=='1'" @click="Offshelf(row)">一 键 下 架</el-button>-->
@ -314,8 +319,8 @@
</template>
<script>
import { getList, getDetail, add, update, remove,getQRCodeImg,getShowTemplate,getPrintTemplate,addAllocation,disable,enable,addlayer } from "@/api/basicdata/basicdataGoodsShelf";
import {getList as allgetList,update as allupdate} from "@/api/basicdata/basicdataGoodsAllocation";
import { getList, getDetail, add, update, remove,getQRCodeImg,getShowTemplate,addAllocation,disable,enable,addlayer } from "@/api/basicdata/basicdataGoodsShelf";
import {getList as allgetList,update as allupdate,getPrintTemplate} from "@/api/basicdata/basicdataGoodsAllocation";
import option from "@/option/basicdata/basicdataGoodsShelf";
import { mapGetters } from "vuex";
import { getGoodsAreaNodeList } from '@/api/basicdata/basicdataGoodsArea';
@ -483,6 +488,7 @@ export default {
selectionList: [],
//货位 选择行
allselectionList: [],
html: null, // 页面包条码内容
alloption: {
height:'auto',
calcHeight: 30,
@ -492,7 +498,7 @@ export default {
border: true,
index: true,
viewBtn: true,
selection: false,
selection: true,
editBtn:false,
delBtn:false,
addBtn:false,
@ -763,6 +769,30 @@ export default {
this.templateData = data;
})
},
handleqr(){
if (this.allselectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
let checkcode=[]
this.allselectionList.map(item=>{
checkcode.push(item.id)
// checkcode.push(item.orderPackageCode)
})
let qr=checkcode.join(',');
console.log(qr);
getPrintTemplate(qr).then(res => {
// this.orderPackageCode = res.data
console.log(res.data);
this.html=''
this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
});
this.dialogVisible = true;
},
// 格式化数据，递归将空的children置为undefined
formatCascaderData(data){
console.log("------------>",data);
@ -1076,45 +1106,45 @@ export default {
});
},
//结合模板生成二维码
viewQrCode(){
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
let idInfo =this.ids.split(",");
this.dialogVisible = true;
this.qrCodeObj = [];
console.log(">>>>>>>>>>>",this.selectionList);
this.selectionList.forEach((item,index)=>{
idInfo.forEach(async id=>{
if (id===item.id){
let params = {};
if (item.qrCode){
getShowTemplate(Object.assign(params,item)).then(res=>{
console.log("@@@@@@@@@@@@@",res.data);
let url = window.URL.createObjectURL(res.data);
// 获取返回参数中的需要的值data
console.log("@@@@@@@@@@@@@",url);
this.qrCodeObj.push(url);
})
}else {
console.log("参数异常:"+item.qrCode);
this.$message({
type: "error",
message: "参数异常!"+item.qrCode
});
}
}
})
})
},
// viewQrCode(){
// if (this.selectionList.length === 0) {
// this.$message.warning("请选择至少一条数据");
// return;
// }
// let idInfo =this.ids.split(",");
// this.dialogVisible = true;
// this.qrCodeObj = [];
// console.log(">>>>>>>>>>>",this.selectionList);
// this.selectionList.forEach((item,index)=>{
// idInfo.forEach(async id=>{
// if (id===item.id){
// let params = {};
// if (item.qrCode){
// getShowTemplate(Object.assign(params,item)).then(res=>{
// console.log("@@@@@@@@@@@@@",res.data);
// let url = window.URL.createObjectURL(res.data);
// // 获取返回参数中的需要的值data
// console.log("@@@@@@@@@@@@@",url);
//
// this.qrCodeObj.push(url);
// })
// }else {
// console.log("参数异常:"+item.qrCode);
// this.$message({
// type: "error",
// message: "参数异常!"+item.qrCode
// });
// }
// }
// })
//
// })
// },
printTemplate(){
let LODOP = getLodop();
console.log("this.ids>>>>>",this.ids);
console.log("this.ids>>>>>",this.selectionList);
if (this.selectionList.length === 0){
console.log("this.ids>>>>>",this.allselectionList);
if (this.allselectionList.length === 0){
this.$message.warning("请选择至少一条数据");
return;
}

130
src/views/basicdata/warehouse/tray/basicdataTray.vue
Unescape View File

@ -36,12 +36,32 @@
icon="el-icon-camera"
@click="handleqr">查看二维码
</el-button>
<el-button type="warning"
plain
icon="el-icon-camera"
@click="lossess">报 损
</el-button>
<el-button type="warning"
plain
icon="el-icon-camera"
@click="disable">禁 用
</el-button>
<el-button type="warning"
plain
icon="el-icon-camera"
@click="addable">启 用
</el-button>
<el-button type="warning"
plain
icon="el-icon-camera"
@click="vacants">一 键 空 置
</el-button>
</template>
<template #menu="{size,row,index}">
<el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3'" @click="losses(row)">报 损</el-button>
<el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==1 && row.trayStatus !=='1' " @click="vacant(row)">一 键 空 置</el-button>
<el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==1" @click="disable(row)">禁 用</el-button>
<el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==2" @click="addable(row)">启 用</el-button>
<!-- <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3'" @click="losses(row)">报 损</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==1 && row.trayStatus !=='1' " @click="vacant(row)">一 键 空 置</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==1" @click="disable(row)">禁 用</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==2" @click="addable(row)">启 用</el-button>-->
<el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3'" @click="Details(row)">在 托 详 情</el-button>
<el-button type="primary" text icon="el-icon-view" @click="historys(row)">历 史 记 录</el-button>
</template>
@ -93,7 +113,7 @@
</template>
<script>
import {getList, getDetail, add, update, remove,vacant,getPrintTemplate} from "@/api/basicdata/basicdataTray";
import {getList, getDetail, add, update, remove,vacant,getPrintTemplate,disable,addable,vacants} from "@/api/basicdata/basicdataTray";
import option from "@/option/basicdata/basicdataTray";
import {mapGetters} from "vuex";
import {exportBlob} from "@/api/common";
@ -232,6 +252,19 @@
this.damagedform = row
this.damagedBox = true
},
lossess(){
if (this.selectionList.length === 0) {
this.$message.warning("请选择一条数据");
return;
}
if (this.selectionList.length > 1) {
this.$message.warning("只能选一条数据");
return;
}
console.log("this.selectionList>>>>>>",this.selectionList);
this.damagedform.id = this.selectionList[0].id
this.damagedBox = true
},
vacant(row){
this.$confirm('确认空置？')
.then(_ => {
@ -250,44 +283,71 @@
.catch(_ => {
});
},
disable(row){
this.$confirm('确认禁用？')
.then(_ => {
row.disableType =2
update(row).then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
}, error => {
loading();
console.log(error);
});
vacants(){
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择数据空置?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
console.log("this.selectionList>>>>>>>>>>>>>>>>>>",this.selectionList);
const newList = this.selectionList.map(item => item.palletCode);
return vacants(newList);
})
.catch(_ => {
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
addable(row){
this.$confirm('确认启用？')
.then(_ => {
row.disableType =1
update(row).then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
}, error => {
loading();
console.log(error);
disable(){
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择数据禁用?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return disable(this.ids);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
addable(){
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择数据启用?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return addable(this.ids);
})
.catch(_ => {
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
//批量打印数据处理代码
//批量打印数据处理代码
printTemplate() {
let that=this;
this.selectionList.map(item=>{

Write Preview
Loading…
Cancel
Save