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

Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

fix_bug_pro20231227
zhangsiyu 2 years ago
parent
2c8a889f3d b0f29a8c55
commit
6ce0c072f9
3 changed files with 360 additions and 324 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. 8
      src/api/basicdata/basicdataGoodsAllocation.js
  2. 49
      src/router/views/index.js
  3. 627
      src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue

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

@ -65,6 +65,14 @@ export const getPrintTemplate = (ids) => {
}
})
}
export const getTemplate = (row) => {
return request({
url: '/api/logpm-basicdata/goodsAllocation/getTemplate',
method: 'post',
responseType: 'blob',
data: row
})
}
export const getQRCode = (qrCode) => {

49
src/router/views/index.js
Unescape View File

@ -847,6 +847,55 @@ export default [
},
],
},
{
path: '/basicdata/warehouse/tray/basicdataTrayhistory',
component: Layout,
redirect: '/warehouse/tray/basicdataTrayhistory',
children: [
{
path: '/basicdata/warehouse/tray/basicdataTrayhistory',
name: '托盘历史记录',
meta: {
i18n: 'dict',
},
props: route => ({
name: route.query.name,
id: route.query.id
}),
component: () => import('@/views/basicdata/warehouse/tray/basicdataTrayhistory.vue'),
},
],
},
{
path: '/basicdata/brand/basicClientDetail',
component: Layout,
redirect: '/basicdata/brand/basicClientDetail',
children: [
{
path: '/basicdata/brand/basicClientDetail',
name: '历史记录',
meta: {
i18n: 'dict',
},
props: route => ({
id: route.query.id
}),
component: () => import('@/views/basicdata/brand/basicClientDetail.vue'),
},
],
},
// {
// path: 'basicdata/goodsShelf/basicdataGoodsShelfView',
// component: Layout,
// redirect: '/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView',
// children: [
// {
// path: '/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView',
// name: '',
// component: () => import(/* webpackChunkName: "views" */ '@/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue'),
// },
// ],
// },
// {
// path: '/distribution/inventory/distributionPrints',
// component: Layout,

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

@ -21,46 +21,48 @@
@on-load="onLoad">
<template #menu-left>
<el-button type="danger"
icon="el-icon-delete"
plain
v-if="permission.BasicdataGoodsAllocation_delete"
@click="handleDelete">删 除
</el-button>
<el-button type="warning"
plain
icon="el-icon-download"
@click="handleExport">导 出
</el-button>
<el-button type="warning"
plain
icon="el-icon-camera"
@click="handleqr">查看二维码
</el-button>
<!-- <el-button type="danger"-->
<!-- icon="el-icon-delete"-->
<!-- plain-->
<!-- v-if="permission.BasicdataGoodsAllocation_delete"-->
<!-- @click="handleDelete">删 除-->
<!-- </el-button>-->
<!-- <el-button type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- @click="handleExport">导 出-->
<!-- </el-button>-->
<!-- <el-button type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- @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" @click="Offshelf(row)">一 键 下 架</el-button>
<el-button type="primary" text icon="el-icon-view" v-if="row.enableStatus ==2" @click="losses(row,1)">启 用</el-button>
</template>
</avue-crud>
<el-dialog
title="二维码"
:visible.sync="dialogVisible"
width="600px"
v-model="dialogVisible">
title="提示"
:visible.sync="dialogVisible"
width="30%"
v-model="dialogVisible">
<div >
<!-- <div v-for="(item,index) in qrCodeObj" class="pdf-dom">-->
<!-- <el-divider></el-divider>-->
<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-->
<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>
<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="handleqr">打 印</el-button>
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</span>
@ -69,324 +71,301 @@
</template>
<script>
import {getList, getDetail, add, update, remove,getPrintTemplate,getQRCode} from "@/api/basicdata/basicdataGoodsAllocation";
import option from "@/option/basicdata/basicdataGoodsAllocation";
import {mapGetters} from "vuex";
import {exportBlob} from "@/api/common";
import {getToken} from '@/utils/auth';
import {downloadXls} from "@/utils/util";
import {dateNow} from "@/utils/date";
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
import {getStockTemplate, showOrderPackgeCode} from "@/api/distribution/distributionStockArticle";
import {getLodop} from "@/utils/LodopFuncs";
import {getList, getDetail, add, update, remove,getTemplate,getQRCode,shelf} from "@/api/basicdata/basicdataGoodsAllocation";
import option from "@/option/basicdata/basicdataGoodsAllocation";
import {mapGetters} from "vuex";
import {exportBlob} from "@/api/common";
import {getToken} from '@/utils/auth';
import {downloadXls} from "@/utils/util";
import {dateNow} from "@/utils/date";
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
export default {
data() {
return {
form: {},
query: {},
search: {},
loading: true,
page: {
pageSize: 10,
currentPage: 1,
total: 0
},
selectionList: [],
option: option,
data: [],
imgUrl:'',
qrCodeObj:[],
dialogVisible:false,
export default {
data() {
};
},
computed: {
...mapGetters(["permission"]),
permissionList() {
return {
form: {},
query: {},
search: {},
loading: true,
page: {
pageSize: 10,
currentPage: 1,
total: 0
},
selectionList: [],
option: option,
data: [],
imgUrl:'',
qrCodeObj:[],
dialogVisible:false,
html: null, // 页面包条码内容
addBtn: this.validData(this.permission.BasicdataGoodsAllocation_add, false),
viewBtn: this.validData(this.permission.BasicdataGoodsAllocation_view, false),
delBtn: this.validData(this.permission.BasicdataGoodsAllocation_delete, false),
editBtn: this.validData(this.permission.BasicdataGoodsAllocation_edit, false)
};
},
computed: {
...mapGetters(["permission"]),
permissionList() {
return {
addBtn: this.validData(this.permission.BasicdataGoodsAllocation_add, false),
viewBtn: this.validData(this.permission.BasicdataGoodsAllocation_view, false),
delBtn: this.validData(this.permission.BasicdataGoodsAllocation_delete, false),
editBtn: this.validData(this.permission.BasicdataGoodsAllocation_edit, false)
};
},
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
}
},
methods: {
rowSave(row, done, loading) {
//该仓库未设置货区、货架概念，货位直接和仓库进行绑定
console.log(this.form);
if (this.form.nodeInfo.length===1){
this.$message({
type:'warning',
message:'请先为该仓库添加货区'
})
}
if (this.form.nodeInfo.length===2){
console.log(">>>>>>",this.form.nodeInfo);
row.warehouseId=this.form.nodeInfo[0];
row.goodsAreaId=this.form.nodeInfo[1];
row.nodeInfo=null;
}
if (this.form.nodeInfo.length===3){
row.warehouseId=this.form.nodeInfo[0];
row.goodsAreaId=this.form.nodeInfo[1];
row.goodsShelfId=this.form.nodeInfo[2];
row.nodeInfo=null;
}else {
done();
this.$message({
type:'warning',
message:'请先完善货架信息!!!'
})
return;
}
add(row).then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
done();
}, error => {
loading();
window.console.log(error);
});
},
methods: {
rowSave(row, done, loading) {
//该仓库未设置货区、货架概念，货位直接和仓库进行绑定
console.log(this.form);
if (this.form.nodeInfo.length===1){
this.$message({
type:'warning',
message:'请先为该仓库添加货区'
})
}
if (this.form.nodeInfo.length===2){
console.log(">>>>>>",this.form.nodeInfo);
row.warehouseId=this.form.nodeInfo[0];
row.goodsAreaId=this.form.nodeInfo[1];
row.nodeInfo=null;
}
if (this.form.nodeInfo.length===3){
row.warehouseId=this.form.nodeInfo[0];
row.goodsAreaId=this.form.nodeInfo[1];
row.goodsShelfId=this.form.nodeInfo[2];
row.nodeInfo=null;
}else {
done();
this.$message({
type:'warning',
message:'请先完善货架信息!!!'
})
return;
}
add(row).then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
losses(row,mub){
this.$confirm('确认操作？')
.then(_ => {
row.enableStatus =mub
update(row).then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
}, error => {
loading();
console.log(error);
});
done();
}, error => {
loading();
window.console.log(error);
})
.catch(_ => {
});
},
rowUpdate(row, index, done, loading) {
update(row).then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
},
Offshelf(row){
this.$confirm('确认下架？')
.then(_ => {
shelf(row.id).then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
}, error => {
loading();
console.log(error);
});
done();
}, error => {
loading();
console.log(error);
});
},
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(row.id);
})
.then(res => {
if (res.success){
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
}else {
this.$message({
type: "error",
message: "操作成功!"
})
}
});
},
handleEdit(row){
console.log(">>>>>>",row);
},
handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
.catch(_ => {
});
},
rowUpdate(row, index, done, loading) {
update(row).then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
done();
}, error => {
loading();
console.log(error);
});
},
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(row.id);
})
.then(() => {
return remove(this.ids);
})
.then(() => {
.then(res => {
if (res.success){
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
//批量打印数据处理代码
printTemplate() {
let that=this;
this.selectionList.map(item=>{
let ids=item.id;
console.log(ids);
getPrintTemplate(ids).then(res => {
let pri_html="";
pri_html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
// console.log(pri_html);
that.w_print(pri_html);
});
// checkcode.push(item.orderPackageCode)
})
},
//批量打印打印代码
w_print(templateData){
let LODOP = getLodop();
// let templateData = "res.data.data";
// console.log(templateData);
LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能');
LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
LODOP.SET_PRINT_STYLEA(0,"TextNeatRow",true);//允许标点溢出，且英文单词拆开
// // 设置打印整宽且不变形
LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width');
// // 设置打印后自动关闭
LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
// // data就是一段html文本
LODOP.ADD_PRINT_HTM('0%', '0%', '100%', '100%', templateData);
// LODOP.PREVIEW(); //预览(预览打印无脚标)
LODOP.PRINT(); //直接打印
},
handleqr(){
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
}else {
this.$message({
type: "error",
message: "操作成功!"
})
}
});
},
handleEdit(row){
let checkcode=[]
this.selectionList.map(item=>{
checkcode.push(item.id)
// checkcode.push(item.orderPackageCode)
console.log(">>>>>>",row);
},
handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(this.ids);
})
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)
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
this.dialogVisible = true;
/* this.dialogVisible = true;
this.qrCodeObj=[];
this.selectionList.forEach(item=>{
// console.log(">>>>>>>>>>",item);
//构建生成二维码条件
let params={}
getTemplate(Object.assign(params,item)).then(res=>{
let url = window.URL.createObjectURL(res.data); // 获取返回参数中的需要的值data
console.log(">>>>>>>>>>",url);
this.qrCodeObj.push(url);
})
})*/
},
handleqr(){
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.dialogVisible = true;
this.qrCodeObj=[];
this.selectionList.forEach(item=>{
console.log(">>>>>>>>>>",item);
//构建生成二维码条件
let params={}
getTemplate(Object.assign(params,item)).then(res=>{
let url = window.URL.createObjectURL(res.data); // 获取返回参数中的需要的值data
this.qrCodeObj.push(url);
})
})
},
handleExport() {
let downloadUrl = `/blade-BasicdataGoodsAllocation/BasicdataGoodsAllocation/export-BasicdataGoodsAllocation?${this.website.tokenHeader}=${getToken()}`;
const {
} = this.query;
let values = {
};
this.$confirm("是否导出数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
NProgress.start();
exportBlob(downloadUrl, values).then(res => {
downloadXls(res.data, `货位${dateNow()}.xlsx`);
NProgress.done();
},
handleExport() {
let downloadUrl = `/blade-BasicdataGoodsAllocation/BasicdataGoodsAllocation/export-BasicdataGoodsAllocation?${this.website.tokenHeader}=${getToken()}`;
const {
} = this.query;
let values = {
};
this.$confirm("是否导出数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
NProgress.start();
exportBlob(downloadUrl, values).then(res => {
downloadXls(res.data, `货位${dateNow()}.xlsx`);
NProgress.done();
})
});
},
async beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
await getDetail(this.form.id).then(async res => {
// 这里还需要进行二维码图片显示
await getQRCode(this.form.qrCode).then(res=>{
let url = window.URL.createObjectURL(res.data);
console.log("url>>>>>>>",url);
this.form.qrCodeUrl = url;
console.log(res);
})
console.log(this.form);
this.form = res.data.data;
});
},
async beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
await getDetail(this.form.id).then(async res => {
// 这里还需要进行二维码图片显示
await getQRCode(this.form.qrCode).then(res=>{
let url = window.URL.createObjectURL(res.data);
console.log("url>>>>>>>",url);
this.form.qrCodeUrl = url;
console.log(res);
})
console.log(this.form);
this.form = res.data.data;
});
}
done();
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
done();
},
selectionChange(list) {
this.selectionList = list;
},
selectionClear() {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
currentChange(currentPage){
this.page.currentPage = currentPage;
},
sizeChange(pageSize){
this.page.pageSize = pageSize;
},
refreshChange() {
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
this.loading = true;
const {
nodeInfo,
enableStatus,
allocationStatus,
} = this.query;
let values = {
enableStatus:enableStatus,
allocationStatus:allocationStatus
};
if (!!this.query.nodeInfo){
values.warehouseId=nodeInfo[0];
values.goodsAreaId=nodeInfo[1];
values.goodsShelfId=nodeInfo[2];
}
getList(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.selectionClear();
}
done();
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
done();
},
selectionChange(list) {
this.selectionList = list;
},
selectionClear() {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
currentChange(currentPage){
this.page.currentPage = currentPage;
},
sizeChange(pageSize){
this.page.pageSize = pageSize;
},
refreshChange() {
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
this.loading = true;
const {
nodeInfo,
enableStatus,
allocationStatus,
} = this.query;
});
let values = {
enableStatus:enableStatus,
allocationStatus:allocationStatus
};
if (!!this.query.nodeInfo){
values.warehouseId=nodeInfo[0];
values.goodsAreaId=nodeInfo[1];
values.goodsShelfId=nodeInfo[2];
}
getList(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.selectionClear();
});
}
};
}
};
</script>
<style>

Write Preview
Loading…
Cancel
Save