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
pref_mail@163.com 2 years ago
parent
73efe06668 13e1a080db
commit
47eb6ae2e4
29 changed files with 6158 additions and 4356 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. 2
      src/api/basicdata/basicdataGoodsShelfView.ts
  4. 28
      src/api/basicdata/basicdataTray.js
  5. 23
      src/api/warehouse/warehouseUpdownGoodsLog.js
  6. 2
      src/axios.js
  7. 4
      src/components/tablecmt/tablecmt.vue
  8. 12
      src/page/index/tags.vue
  9. 74
      src/views/basicdata/brand/basicClient.vue
  10. 30
      src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
  11. 144
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
  12. 1252
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
  13. 130
      src/views/basicdata/warehouse/tray/basicdataTray.vue
  14. 4
      src/views/distribution/inventory/delivery/distributionStockArticle.vue
  15. 13
      src/views/distribution/inventory/distributionStockArticleDetails.vue
  16. 63
      src/views/distribution/inventory/distrilbutionBillLading.vue
  17. 10
      src/views/distribution/inventory/distrilbutionBillLadingList.vue
  18. 87
      src/views/distribution/inventory/distrilbutionBillLadingView.vue
  19. 12
      src/views/distribution/reservation/atlas1.vue
  20. 2840
      src/views/distribution/reservation/reservation.vue
  21. 4797
      src/views/distribution/reservation/reservationAddFrom.vue
  22. 76
      src/views/distribution/reservation/reservationSubmitFrom.vue
  23. 56
      src/views/distribution/stockup/distributionStockup.vue
  24. 36
      src/views/distribution/stockup/distributionStockupDetailsSelf.vue
  25. 64
      src/views/distribution/stockup/distributionStockupDiscuss.vue
  26. 40
      src/views/distribution/stockup/distributionStockupMarket.vue
  27. 44
      src/views/distribution/stockup/distributionStockupSelf.vue
  28. 639
      src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue
  29. 5
      src/views/warehouse/warehousingentry/warehouseWarehousingEntry.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({

2
src/api/basicdata/basicdataGoodsShelfView.ts
Unescape View File

@ -1,5 +1,5 @@
import request from '@/axios';
import { AxiosResponse } from 'axios'; // 假设使用Axios发送HTTP请求
import { AxiosResponse,AxiosRequestConfig } from 'axios'; // 假设使用Axios发送HTTP请求
interface VisualizationResponseData {
data: any; // 根据实际返回数据结构进行定义

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
})
}

23
src/api/warehouse/warehouseUpdownGoodsLog.js
Unescape View File

@ -12,6 +12,29 @@ export const getpage = (current, size, params) => {
})
}
export const getinventorypage = (current, size, params) => {
return request({
url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/inventorypage',
method: 'get',
params: {
...params,
current,
size,
}
})
}
export const gettruckloadpage = (current, size, params) => {
return request({
url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/truckloadpage',
method: 'get',
params: {
...params,
current,
size,
}
})
}
export const getDetail = (id) => {
return request({
url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/detail',

2
src/axios.js
Unescape View File

@ -18,7 +18,7 @@ import 'nprogress/nprogress.css'; // progress bar style
import { Base64 } from 'js-base64';
import { baseUrl } from '@/config/env';
axios.defaults.timeout = 10000;
axios.defaults.timeout = 60000;
//返回其他状态吗
axios.defaults.validateStatus = function (status) {
return status >= 200 && status <= 500; // 默认的

4
src/components/tablecmt/tablecmt.vue
Unescape View File

@ -634,4 +634,8 @@ function copyContent(content: string) {
display: flex;
align-items: center;
}
.el-popper{
max-width:20% !important;
}
</style>

12
src/page/index/tags.vue
Unescape View File

@ -39,6 +39,10 @@
</template>
</el-tab-pane>
</el-tabs>
<el-dropdown class="avue-tags__menu">
<el-button class="btsico" icon="el-icon-refresh" @click="replace" circle></el-button>
</el-dropdown>
<el-dropdown class="avue-tags__menu">
<el-button type="primary">
{{ $t('tagsView.menu') }}
@ -189,6 +193,14 @@ export default {
});
});
},
replace(){
location.replace(location.href)
}
},
};
</script>
<style lang="scss">
.btsico{
margin-right: 70px !important;
}
</style>

74
src/views/basicdata/brand/basicClient.vue
Unescape View File

@ -378,6 +378,7 @@ import { getSelect, getLazyTree, getLazyList, getLazyTreeAll } from '@/api/base/
import { getToken } from '@/utils/auth';
import globalc from '@/api/basicdata/globalc';
import { Base64 } from 'js-base64';
import dayjs from 'dayjs';
export default {
@ -422,7 +423,7 @@ export default {
{
prop: 'clientTypeName',
label: '客户类型',
type: 2,
type: 3,
values: '',
width: '150',
checkarr: [],
@ -433,7 +434,7 @@ export default {
{
prop: 'typeServiceName',
label: '服务类型',
type: 2,
type: 1,
values: '',
width: '180',
checkarr: [],
@ -667,6 +668,70 @@ export default {
}
},
methods: {
showdrawer(value){
this.drawerShow=value
},
/**
* 弹窗的勾选回调，用于更改头部数组
* 固定搭配，只需要更换 columnList
*/
setnewcolum(newarr, headarr,type) {
// console.log(newarr,'+++++++++++')
if(type==1){
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname+'checkList', headarr);
}else if(type==2){
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname+'flexList', headarr);
}else if(type==3){
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
}
},
selectionsc(value) {
console.log(value);
},
delectsolt(scope) {
const { row } = scope;
console.log(row);
},
editsolt(scope) {
const { row } = scope;
console.log(row);
},
btnsc(index, row) {
console.log(index, row);
},
selectsc(index, row) {
console.log("123123123",index, row);
if(row.prop ==='clientTypeName'){
this.query['clientType'] = index;
}else{
this.query[row.prop] = index;
}
this.onLoad(this.page);
},
timesc(index, row) {
console.log(index, row);
if (!!index){
index = dayjs(index).format('YYYY-MM-DD');
}
this.query[row.prop] = index
if (!index){
delete this.query[row.prop]
}
this.onLoad(this.page);
},
inputsc(index, row) {
console.log(index, row);
// console.log(index, row.prop);
this.query[row.prop] = index;
this.onLoad(this.page);
},
handleCommand(command,row){
console.log(command,row)
switch (Number(command)) {
@ -868,6 +933,11 @@ export default {
getDictionaryBiz('client_type').then(res => {
// console.log("字典》》》",res);
this.clientType = res.data.data;
this.$functions.checkcColumnList("clientTypeName", this.columnList).checkarr=res.data.data.map(item=>{
item.value=item.dictKey
item.label=item.dictValue
return item
});
});
//字典
getDictionaryBiz('basic_freight_type').then(res => {

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;

144
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';
@ -373,7 +378,7 @@ export default {
head: false,
},
{
prop: 'warehouseId',
prop: 'warehouseCode',
label: '仓库编号',
type: 2,
values: '',
@ -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;
}

1252
src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
View File

File diff suppressed because it is too large Load Diff

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=>{

4
src/views/distribution/inventory/delivery/distributionStockArticle.vue
Unescape View File

@ -6,10 +6,10 @@
<!-- 查询模块 -->
<el-form :inline="true" :model="query">
<el-form-item label="订单自编号:">
<el-input v-model="query.orderCodeNum" placeholder="请输入订单自编号" ></el-input>
<el-input v-model="query.orderCodeNum" placeholder="请输入订单自编号" clearable ></el-input>
</el-form-item>
<el-form-item label="运单">
<el-input v-model="query.waybillNum" placeholder="请输入运单编号" />
<el-input v-model="query.waybillNum" placeholder="请输入运单编号" clearable />
</el-form-item>
<el-form-item label="入库时间:">
<!-- <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->

13
src/views/distribution/inventory/distributionStockArticleDetails.vue
Unescape View File

@ -726,8 +726,11 @@ export default {
'$route.query.id': {
handler(newVal, oldVal) {
// console.log(newVal, oldVal);
this.onLoad(this.page);
this.onLoadOwn(this.page);
if(!!this.$route.query.id){
this.onLoad(this.page);
this.onLoadOwn(this.page);
}
},
deep: true,
immediate: true,
@ -1367,7 +1370,7 @@ export default {
},
onLoad(page, params = {}) {
this.loading = true;
this.query.id = this.$route.query.id;
this.query.ids = this.$route.query.id;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
// this.page.total = data.total;
@ -1377,10 +1380,10 @@ export default {
});
},
onLoadOwn(page, params = {}) {
this.loading = true;
// this.loading = true;
this.dataMaterial = false;
params = {
stockArticleId: this.$route.query.id,
stockArticleIds: this.$route.query.id,
};
getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.queryPage)).then(
res => {

63
src/views/distribution/inventory/distrilbutionBillLading.vue
Unescape View File

@ -1488,7 +1488,7 @@ export default {
fixed: false,
sortable: true,
head: false,
lessThanNum:'available'
lessThanNum:'available'
},
{
prop: '',
@ -1505,12 +1505,14 @@ export default {
},
mounted() {
this.init();
if (this.$route.query.type == '2') {
//查询提货编辑数据
this.getDetailOen();
} else {
} else if (this.$route.query.type == '1'){
this.onLoad(this.page);
}else if (this.$route.query.type == '3'){
this.onLoadCj();
}
/**
* 初始化获取本地缓存的编辑隐藏的列表
@ -1595,9 +1597,10 @@ export default {
if (this.$route.query.type == '2') {
//查询提货编辑数据
this.getDetailOen();
} else {
} else if (this.$route.query.type == '1'){
this.onLoad(this.page);
// this.onLoadOwn(this.page);
}else if (this.$route.query.type == '3'){
this.onLoadCj();
}
},
deep: true,
@ -1848,6 +1851,10 @@ export default {
},
//确定
callFordelivery(inde) {
if(this.selectionListStock.length === 0){
this.$message.warning("至少选择一条数据！");
return ;
}
let isa = false;
console.log('执行了');
this.selectionListStock.some(i => {
@ -2312,7 +2319,7 @@ export default {
}
},
selectionChangeStock(list) {
console.log('执行了啦啦啦', list);
// console.log('执行了啦啦啦', list);
this.selectionListStock = list;
},
selectionClear() {
@ -2338,7 +2345,7 @@ export default {
onLoad(page, params = {}) {
this.loading = true;
params.id = this.$route.query.id;
params.ids = this.$route.query.id;
this.orderAdd = false;
getListOne(page.currentPage, page.pageSize, params).then(res => {
const data = res.data.data;
@ -2348,24 +2355,48 @@ export default {
this.selectionClear();
});
},
/**
* 创建自提
* @param page
* @param params
*/
onLoadCj(page, params = {}) {
this.orderAdd = true;
},
//库存品
onLoadList(page, params = {}) {
this.loading = true;
getListStockList(page.currentPage, page.pageSize, params).then(res => {
const dataOwn = res.data.data;
this.pageStock.total = dataOwn.total;
this.dataOwn = dataOwn.records;
this.dataOwn.forEach(i => {
i.available = i.quantityStock - i.quantityOccupied;
let a = {};
if(this.$route.query.type == '1'){
a = this.dataList[0];
// console.log("11111111111111");
}else if(this.$route.query.type == '3'){
a = this.dataOrder[0];
// console.log("2222222222222");
}
// let a = this.dataList[0];
console.log("aaa",a);
if(!!a.mallId){
params.marketId = a.mallId;
getListStockList(page.currentPage, page.pageSize, params).then(res => {
const dataOwn = res.data.data;
this.pageStock.total = dataOwn.total;
this.dataOwn = dataOwn.records;
this.dataOwn.forEach(i => {
i.available = i.quantityStock - i.quantityOccupied;
});
this.loading = false;
this.selectionClear();
});
}else{
this.loading = false;
this.selectionClear();
});
this.pageStock.total =0;
}
},
//包件信息
onLoadOwn(page, params = {}) {
this.loading = true;
this.query.stockArticleId = this.$route.query.id;
this.query.stockArticleIds = this.$route.query.id;
getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
console.log('包件信息>>>>', res.data.data);
const dataList = res.data.data;

10
src/views/distribution/inventory/distrilbutionBillLadingList.vue
Unescape View File

@ -78,7 +78,7 @@
<div class="avue-crud__left">
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleBillAdd">创建自提</el-button>-->
<el-button type="primary" icon="el-icon-plus" @click="handleBillAdd">创建自提</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleSign(null,2)">自提签收</el-button>
</div>
@ -105,8 +105,8 @@
<template #default="slotProps">
<!-- <el-button size="small" @click="editsolt(slotProps.scope)">修改</el-button>-->
<el-text size="small" text @click="handleLike(slotProps.scope)">查看</el-text>
<el-text size="small" type="danger" icon="el-icon-edit" text @click="handleSign(slotProps.scope,1)" v-if="slotProps.scope.row.conditions < 20">签收</el-text>
<el-text type="primary" text icon="el-icon-edit" @click="handleEdits(slotProps.scope)">编辑提货信息</el-text>
<el-text size="small" type="danger" icon="el-icon-edit" text @click="handleSign(slotProps.scope,1)" v-if="slotProps.scope.row.conditions < 30">签收</el-text>
<el-text type="primary" text icon="el-icon-edit" @click="handleEdits(slotProps.scope)" v-if="slotProps.scope.row.conditions < 20">编辑提货信息</el-text>
<!-- <el-button size="small" type="danger" icon="el-icon-edit" text @click="handleDeleteOwn(slotProps.scope)">删除</el-button>-->
</template>
@ -856,7 +856,7 @@ export default {
for(let a = 0;a < clientType.length;a++){
// console.log("进来了",clientType[a].dictKey , costListName[i]);
if(clientType[a].dictKey == costListName[i]){
console.log("进来了",clientType[a].dictKey , costListName[i]);
// console.log("进来了",clientType[a].dictKey , costListName[i]);
let zhi = costList[costListName[i]];
if(!zhi){
this.pan = true;
@ -908,7 +908,7 @@ export default {
this.$router.push({
path: '/distribution/inventory/distrilbutionBillLading',
query:{
type: '1'
type: '3'
}
});
},

87
src/views/distribution/inventory/distrilbutionBillLadingView.vue
Unescape View File

@ -153,6 +153,49 @@ export default {
columnListarrs:{
//入库明细
ordoption:[
{
prop: 'serviceNumber',
label: '服务号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'waybillNumber',
label: '运单号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'waybillNumber',
label: '客户车次号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'sendWarehouseName',
label: '始发仓',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'orderCode',
label: '订单自编号',
@ -164,6 +207,7 @@ export default {
sortable: true,
head: false,
},
{
prop: 'descriptionGoods',
label: '货物名称',
@ -352,6 +396,49 @@ export default {
// checkarr: [],
// fixed: true,
// },
{
prop: 'serviceNumber',
label: '服务号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'waybillNumber',
label: '运单号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'orderCode',
label: '订单自编号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'waybillNumber',
label: '客户车次号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'orderPackageCode',
label: '包条码',

12
src/views/distribution/reservation/atlas1.vue
Unescape View File

@ -9,7 +9,9 @@
<el-scrollbar>
<div class="mbx">
<el-text v-for="item in datalists" class="mx-1 txbx" type="primary"
>{{item.content}}--时间:{{item.time}}--距离:{{item.distance}}公里</el-text
>
{{item.content}}--时间:{{item.time}}--距离:{{item.distance}}公里({{item.items.handQuantity}}件)
</el-text
>
</div>
</el-scrollbar>
@ -109,7 +111,7 @@ function init(data) {
details.mapLoc.setCenter([result.geocodes[0].location.lng, result.geocodes[0].location.lat])
geocodess.push({
pontion: result.geocodes[0].location,
content: item.customerName + '--' + item.customerAddress + '--' + item.customerTelephone,
content: item.customerName + '--' + item.customerAddress+'' + '--' + item.customerTelephone,
items: item,
});
if (index + 1 == data.length) {
@ -132,7 +134,7 @@ function maker(geocodess) {
});
marker.setMap(details.mapLoc);
marker.setLabel({
offset: new AMap.Pixel(0, -30), //设置文本标注偏移量
offset: new AMap.Pixel(0, -5), //设置文本标注偏移量
content: `<div class='info'>${item.content}</div>`, //设置文本标注内容
direction: 'top', //设置文本标注方位
});
@ -156,6 +158,7 @@ function Driving(geocodess) {
// console.log(result.routes[0]);
item.time=formatSeconds(result.routes[0].time)
item.distance=result.routes[0].distance/1000
// item.distance=result.routes[0].distance/1000
details.datalists.push(item)
} else {
console.log('获取驾车数据失败：'+ result)
@ -205,6 +208,8 @@ const { datalists } = toRefs(details);
.mbx {
display: flex;
flex-direction: column;
align-items: flex-start;
}
}
}
@ -214,5 +219,6 @@ const { datalists } = toRefs(details);
.txbx {
padding: 5px 0px;
box-sizing: border-box;
width: 100%;
}
</style>

2840
src/views/distribution/reservation/reservation.vue
View File

File diff suppressed because it is too large Load Diff

4797
src/views/distribution/reservation/reservationAddFrom.vue
View File

File diff suppressed because it is too large Load Diff

76
src/views/distribution/reservation/reservationSubmitFrom.vue
Unescape View File

@ -117,15 +117,15 @@
<el-input v-model="form.otherFee" placeholder="请输入其他费用"/>
</el-form-item>
</el-col>
<!-- <el-col :span="10">-->
<!-- <el-form-item label="服务类型:" prop="serveType" label-width="120px">-->
<!-- <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">-->
<!-- <el-checkbox :label="item.dictKey"-->
<!-- :value="item.dictKey">{{item.dictValue}}&emsp;-->
<!-- </el-checkbox>-->
<!-- </el-checkbox-group>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="10">
<el-form-item label="服务类型:" prop="serveType" label-width="120px">
<el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">
<el-checkbox :label="item.dictKey"
:value="item.dictKey">{{item.dictValue}}&emsp;
</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
<el-col :span="10">
@ -318,19 +318,19 @@
<!-- :before-close="handleClose"-->
<el-form :inline="true" :model="query">
<el-form-item label="商场名称:">
<el-input v-model="query.marketName" placeholder="请输入服务类型"></el-input>
<el-input v-model="query.marketName" placeholder="请输入商场名称"></el-input>
</el-form-item>
<el-form-item label="物料名称:">
<el-input v-model="query.descriptionGoods" placeholder="请输入服务类型"></el-input>
<el-input v-model="query.descriptionGoods" placeholder="请输入物料名称"></el-input>
</el-form-item>
<el-form-item label="商场编码:">
<el-input v-model="query.marketCode" placeholder="请输入服务类型"></el-input>
<el-input v-model="query.marketCode" placeholder="请输入商场编码"></el-input>
</el-form-item>
<el-form-item label="订单自编号:">
<el-input v-model="query.orderCode" placeholder="请输入服务类型"></el-input>
<el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>
</el-form-item>
<el-form-item label="品牌:">
<el-input v-model="query.brand" placeholder="请输入服务类型"></el-input>
<el-input v-model="query.brand" placeholder="请输入品牌"></el-input>
</el-form-item>
<!-- 查询按钮 -->
<el-form-item>
@ -500,6 +500,7 @@
import option from '@/option/distribution/distributionStockArticle';
import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
import dayjs from 'dayjs';
export default {
data() {
@ -1322,6 +1323,53 @@
this.page.pageSize = pageSize;
this.onLoad(this.page);
},
// inputscStockArtic(index, row) {
// console.log(index, row);
// this.query[row.prop] = index;
// this.onLoadOrder(this.page);
// },
// timescStockArtic(index, row) {
// console.log(index, row);
// if (!!index){
// index = dayjs(index).format('YYYY-MM-DD');
// }
// this.query[row.prop] = index
// if (!index){
// delete this.query[row.prop]
// }
// this.onLoadOrder(this.page);
// },
// btnscStockArtic(index, row) {
// console.log(index, row);
// this.onLoad(this.page);
// },
// selectscStockArtic(index, row) {
// console.log(index, row);
// if(row.prop ==='reservationStatusName'){
// this.query['reservationStatus'] = index;
// }else if(row.prop ==='freezeStatusName'){
// this.query['freezeStatus'] = index;
// }else if(row.prop ==='completeSetName'){
// this.query['completeSet'] = index;
// }
// // else if(row.prop ==='groundingStatusName'){
// // this.query['groundingStatus'] = index;
// // }else if(row.prop ==='stockupStatusName'){
// // this.query['stockupStatus'] = index;
// // }else if(row.prop ==='orderStatusName'){
// // this.query['orderStatus'] = index;
// // }else if(row.prop ==='typeServerName'){
// // this.query['typeService'] = index;
// // }
// // else if(row.prop ==='orderReceiveStatusName'){
// // this.query['orderReceiveStatus'] = index;
// // }
//
// else{
// this.query[row.prop] = index;
// }
// this.onLoadOrder(this.page);
// },
onLoadOrder(page, params = {}) {
this.query.typeService = 2;
this.query.genre = '1';

56
src/views/distribution/stockup/distributionStockup.vue
Unescape View File

@ -95,16 +95,16 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="装卸班组" :label-width="formLabelWidth">
<el-select v-model="form.loaderId" clearable placeholder="请选择装卸班组" @change="getForklift($event,'2')">
<el-option
v-for="item in loaderData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="装卸班组" :label-width="formLabelWidth">-->
<!-- <el-select v-model="form.loaderId" clearable placeholder="请选择装卸班组" @change="getForklift($event,'2')">-->
<!-- <el-option-->
<!-- v-for="item in loaderData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="备货区域" :label-width="formLabelWidth" >
<el-select v-model="form.goodsAreaId" clearable placeholder="请选择备货区编号" @change="getForklift($event,'3')">
<el-option
@ -316,14 +316,14 @@ export default {
values: '',
width: '150',
checkarr: [
{
label: '未指派',
value: '1',
},
{
label: '已指派',
value: '2',
},
// {
// label: '未指派',
// value: '1',
// },
// {
// label: '已指派',
// value: '2',
// },
],
fixed: false,
sortable: true,
@ -369,16 +369,16 @@ export default {
fixed: false,
sortable: true,
},*/
{
prop: 'loaderName',
label: '装卸班组',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: 'loaderName',
// label: '装卸班组',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'fixTime',
label: '确认完成备货时间',

36
src/views/distribution/stockup/distributionStockupDetailsSelf.vue
Unescape View File

@ -599,6 +599,10 @@ export default {
//配送类型
this.distributionType = res.data.data;
});
// 费用类型字典
getDictionaryBiz('delivery_cost').then(res => {
this.clientType = res.data.data;
});
// console.log("配送方式123", this.deliveryWayList);
getDictionaryBiz('delivery_way').then(res => {
//配送方式
@ -832,6 +836,38 @@ export default {
let a = await billStockList(page.currentPage, page.pageSize, { id: this.$route.query.id });
this.data3 = a.data.data.records;
console.log("自提任务》》》》》》",this.data3);
console.log("费用类型lll",this.clientType);
this.data3.forEach(i =>{
if(!!i.list){
i.collectFee = 0;
i.storageFee = 0;
i.transport = 0;
i.forklift = 0;
i.otherFee = 0;
i.list.forEach(a =>{
const { cost, money } = a; // 对象解构，获取a对象的cost和money属性
switch (cost) {
case '1': // 到付
i.collectFee = money ? parseInt(money) : 0;
break;
case '2': // 仓储费用
i.storageFee = money ? parseInt(money) : 0;
break;
case '3': // 搬运费
console.log("0=-0-=");
i.transport = money ? parseInt(money) : 0;
break;
case '4': // 叉车费
i.forklift = money ? parseInt(money) : 0;
break;
case '5': // 其他增值费
i.otherFee = money ? parseInt(money) : 0;
break;
}
})
}
});
// if (!!this.data3 && this.data3.length > 0) {
// this.data3.forEach(i => {

64
src/views/distribution/stockup/distributionStockupDiscuss.vue
Unescape View File

@ -177,8 +177,8 @@
<el-form-item label="备货区" prop="stockupArea">
<el-input v-model="form.stockupArea" placeholder="请输入备货区"/>
</el-form-item>
<el-form-item label="指派状态;1-未指派、2-已指派" prop="assignStatus">
<el-select v-model="form.assignStatus" clearable placeholder="请选择指派状态;1-未指派、2-已指派">
<el-form-item label="指派状态" prop="assignStatus">
<el-select v-model="form.assignStatus" clearable placeholder="请选择指派状态">
<el-option
v-for="item in assignStatusData"
:key="item.dictKey"
@ -210,7 +210,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="装卸班组" prop="loader">
<!--<el-form-item label="装卸班组" prop="loader">
<el-select v-model="form.loader" clearable placeholder="请选择装卸班组">
<el-option
v-for="item in loaderData"
@ -219,7 +219,7 @@
:value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="确认完成备货时间" prop="fixTime">
<el-date-picker v-model="form.fixTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择确认完成备货时间"></el-date-picker>
</el-form-item>
@ -355,14 +355,14 @@ export default {
values: '',
width: '150',
checkarr: [
{
label: '未指派',
value: '1',
},
{
label: '已指派',
value: '2',
},
// {
// label: '未指派',
// value: '1',
// },
// {
// label: '已指派',
// value: '2',
// },
],
fixed: false,
sortable: true,
@ -408,16 +408,16 @@ export default {
fixed: false,
sortable: true,
},*/
{
prop: 'loaderName',
label: '装卸班组',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: 'loaderName',
// label: '装卸班组',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'fixTime',
label: '确认完成备货时间',
@ -893,17 +893,17 @@ export default {
return item
});
});
getDictionaryBiz('stock_allocation').then(res => {
this.stockAllocation = res.data.data;
this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
item.value = item.dictKey
item.label = item.dictValue
return item
});
})
// getDictionaryBiz('stock_allocation').then(res => {
// this.stockAllocation = res.data.data;
// this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
// item.value = item.dictKey
// item.label = item.dictValue
// return item
// });
// })
getDictionaryBiz('stock_assign_status').then(res => { //指派
// console.log("8908098080",res.data.data);
this.distributionType = res.data.data;
console.log("8908098080",res.data.data);
// this.distributionType = res.data.data;
this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr =res.data.data.map(item=>{
item.value=item.dictKey
item.label=item.dictValue

40
src/views/distribution/stockup/distributionStockupMarket.vue
Unescape View File

@ -107,7 +107,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="装卸班组" :label-width="formLabelWidth">
<!--<el-form-item label="装卸班组" :label-width="formLabelWidth">
<el-select v-model="form.loaderId" clearable placeholder="请选择装卸班组" @change="getForklift($event,'2')">
<el-option
v-for="item in loaderData"
@ -116,7 +116,7 @@
:value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="备货区域" :label-width="formLabelWidth" >
<el-select v-model="form.goodsAreaId" clearable placeholder="请选择备货区编号" @change="getForklift($event,'3')">
<el-option
@ -401,16 +401,16 @@ export default {
// fixed: false,
// sortable: true,
// },
{
prop: 'loaderName',
label: '装卸班组',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: 'loaderName',
// label: '装卸班组',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'fixTime',
label: '确认完成备货时间',
@ -831,14 +831,14 @@ export default {
return item
});
});
getDictionaryBiz('stock_allocation').then(res => {
this.stockAllocation = res.data.data;
this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
item.value = item.dictKey
item.label = item.dictValue
return item
});
});
// getDictionaryBiz('stock_allocation').then(res => {
// this.stockAllocation = res.data.data;
// this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
// item.value = item.dictKey
// item.label = item.dictValue
// return item
// });
// });
this.onLoad(this.page);
},
searchHide () {

44
src/views/distribution/stockup/distributionStockupSelf.vue
Unescape View File

@ -107,16 +107,16 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="装卸班组" :label-width="formLabelWidth">
<el-select v-model="form.loaderId" clearable placeholder="请选择装卸班组" @change="getForklift($event,'2')">
<el-option
v-for="item in loaderData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="装卸班组" :label-width="formLabelWidth">-->
<!-- <el-select v-model="form.loaderId" clearable placeholder="请选择装卸班组" @change="getForklift($event,'2')">-->
<!-- <el-option-->
<!-- v-for="item in loaderData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="备货区域" :label-width="formLabelWidth" >
<el-select v-model="form.goodsAreaId" clearable placeholder="请选择备货区编号" @change="getForklift($event,'3')">
<el-option
@ -192,7 +192,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="装卸班组" prop="loader">
<!--<el-form-item label="装卸班组" prop="loader">
<el-select v-model="form.loader" clearable placeholder="请选择装卸班组">
<el-option
v-for="item in loaderData"
@ -201,7 +201,7 @@
:value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="确认完成备货时间" prop="fixTime">
<el-date-picker v-model="form.fixTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择确认完成备货时间"></el-date-picker>
</el-form-item>
@ -401,7 +401,7 @@ export default {
// fixed: false,
// sortable: true,
// },
{
/*{
prop: 'loaderName',
label: '装卸班组',
type: 2,
@ -410,7 +410,7 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
},
},*/
{
prop: 'fixTime',
label: '确认完成备货时间',
@ -837,14 +837,14 @@ export default {
return item
});
});
getDictionaryBiz('stock_allocation').then(res => {
this.stockAllocation = res.data.data;
this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
item.value = item.dictKey
item.label = item.dictValue
return item
});
});
// getDictionaryBiz('stock_allocation').then(res => {
// this.stockAllocation = res.data.data;
// this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
// item.value = item.dictKey
// item.label = item.dictValue
// return item
// });
// });
this.onLoad(this.page);
},
searchHide () {

639
src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue
Unescape View File

@ -1,42 +1,121 @@
<template>
<basic-container>
<div class="avue-crud">
<el-tabs type="border-card">
<el-tab-pane label="订制品">
<el-row>
<!-- 列表模块 -->
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<!-- <template #default="slotProps">-->
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
<!-- </template>-->
</tablecmt>
</el-row>
<el-row>
<div class="avue-crud__pagination" style="width: 100%">
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
</el-pagination>
</div>
</el-row>
</el-tab-pane>
<el-tab-pane label="库存品">
<el-row>
<!-- 列表模块 -->
<tablecmt
:columnList="columnList1"
:tableData="data1"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<!-- <template #default="slotProps">-->
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
<!-- </template>-->
</tablecmt>
</el-row>
<el-row>
<div class="avue-crud__pagination" style="width: 100%">
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeChange1"
@current-change="currentChange1"
:current-page="page1.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="page1.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page1.total"
>
</el-pagination>
</div>
</el-row>
</el-tab-pane>
<el-tab-pane label="零担订单">
<el-row>
<!-- 列表模块 -->
<tablecmt
:columnList="columnList2"
:tableData="data2"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<!-- <template #default="slotProps">-->
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
<!-- </template>-->
</tablecmt>
</el-row>
<el-row>
<div class="avue-crud__pagination" style="width: 100%">
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeChange2"
@current-change="currentChange2"
:current-page="page2.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="page2.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page2.total"
>
</el-pagination>
</div>
</el-row>
</el-tab-pane>
</el-tabs>
<el-row>
<!-- 列表模块 -->
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<!-- <template #default="slotProps">-->
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
<!-- </template>-->
</tablecmt>
</el-row>
<el-row>
<div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 -->
<el-pagination align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50,80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total">
</el-pagination>
</div>
</el-row>
<!-- 表单模块 -->
</div>
</basic-container>
<edittablehead
@ -48,12 +127,12 @@
</template>
<script>
import { getDetail, getpage, update, remove } from "@/api/warehouse/warehouseUpdownGoodsLog";
import option from "@/option/warehouse/warehouseUpdownGoodsLog";
import { mapGetters } from "vuex";
import { getDetail, getpage, update, remove,getinventorypage,gettruckloadpage } from '@/api/warehouse/warehouseUpdownGoodsLog';
import option from '@/option/warehouse/warehouseUpdownGoodsLog';
import { mapGetters } from 'vuex';
export default {
data () {
data() {
return {
columnList: [
// {
@ -68,7 +147,7 @@ export default {
{
prop: 'warehouseName',
label: '货物仓库',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -79,7 +158,7 @@ export default {
{
prop: 'orderCode',
label: '订单自编码',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -89,19 +168,125 @@ export default {
{
prop: 'orderPackageCode',
label: '包件编码',
type: 2,
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'bindingType',
label: '上架类型',
type: 1,
values: '',
width: '150',
checkarr: [
{ label: '上架', value: 1 },
{ label: '下架', value: 2 },
],
fixed: false,
sortable: true,
},
{
prop: 'areaTitle',
label: '货区',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'shelfTitle',
label: '货架',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'allocationTitle',
label: '货位',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'createUserName',
label: '操作员',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'palletCode',
label: '托盘码',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'logWarehouseName',
label: '记录仓库',
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'createTime',
label: '创建时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: '',
// label: '操作',
// type: 6,
// values: '',
// width: '150',
// checkarr: [],
// fixed: 'right',
// hide: true,
// },
// 更多列的配置...
],
columnList1: [
// {
// prop: '',
// label: '序号',
// type: 0,
// values: '',
// width: 55,
// checkarr: [],
// fixed: true,
// },
{
prop: 'materialCode',
label: '物料编号',
type: 2,
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
@ -109,9 +294,9 @@ export default {
{
prop: 'materialName',
label: '物料名称',
type: 2,
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
@ -119,9 +304,9 @@ export default {
{
prop: 'sku',
label: 'SKU',
type: 2,
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
@ -129,12 +314,12 @@ export default {
{
prop: 'bindingType',
label: '上架类型',
type: 3,
type: 1,
values: '',
width: '230',
width: '150',
checkarr: [
{label:'上架',value:1},
{label:'下架',value:2}
{ label: '上架', value: 1 },
{ label: '下架', value: 2 },
],
fixed: false,
sortable: true,
@ -142,9 +327,9 @@ export default {
{
prop: 'areaTitle',
label: '货区',
type: 2,
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
@ -152,9 +337,9 @@ export default {
{
prop: 'shelfTitle',
label: '货架',
type: 2,
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
@ -162,9 +347,9 @@ export default {
{
prop: 'allocationTitle',
label: '货位',
type: 2,
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
@ -172,9 +357,9 @@ export default {
{
prop: 'createUserName',
label: '操作员',
type: 2,
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
@ -182,9 +367,9 @@ export default {
{
prop: 'palletCode',
label: '托盘码',
type: 2,
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
@ -194,7 +379,7 @@ export default {
label: '记录仓库',
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
@ -202,9 +387,9 @@ export default {
{
prop: 'createTime',
label: '创建时间',
type: 2,
type: 1,
values: '',
width: '180',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
@ -214,13 +399,138 @@ export default {
// label: '操作',
// type: 6,
// values: '',
// width: '230',
// width: '150',
// checkarr: [],
// fixed: 'right',
// hide: true,
// },
// 更多列的配置...
],
columnList2: [
{
prop: 'orderCode',
label: '订单号',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'serviceNumber',
label: '服务号',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'waybillNumber',
label: '运单号',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'mallName',
label: '商城名称',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'bindingType',
label: '上架类型',
type: 1,
values: '',
width: '150',
checkarr: [
{ label: '上架', value: 1 },
{ label: '下架', value: 2 },
],
fixed: false,
sortable: true,
},
{
prop: 'areaTitle',
label: '货区',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'shelfTitle',
label: '货架',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'allocationTitle',
label: '货位',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'createUserName',
label: '操作员',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: false,
},
{
prop: 'mallCode',
label: '托盘码',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'logWarehouseName',
label: '记录仓库',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'createTime',
label: '创建时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
],
height: 0,
// 弹框标题
title: '',
@ -238,7 +548,17 @@ export default {
page: {
currentPage: 1,
pageSize: 30,
total: 40
total: 40,
},
page1: {
currentPage: 1,
pageSize: 30,
total: 40,
},
page2: {
currentPage: 1,
pageSize: 30,
total: 40,
},
// 表单数据
form: {},
@ -248,11 +568,15 @@ export default {
option: option,
// 表单列表
data: [],
}
data1:[],
data2:[],
};
},
mounted () {
mounted() {
this.init();
this.onLoad(this.page);
this.onLoad(this.page1, {}, 'page1');
this.onLoad(this.page2, {}, 'page2');
/**
* 初始化获取本地缓存的编辑隐藏的列表
* 固定搭配，不能更改
@ -330,14 +654,14 @@ export default {
}
},
computed: {
...mapGetters(["permission"]),
ids () {
...mapGetters(['permission']),
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
}
return ids.join(',');
},
},
methods: {
showdrawer(value) {
@ -376,140 +700,83 @@ export default {
},
selectsc(index, row) {
console.log(index, row);
},
timesc(index, row) {
console.log(index, row);
},
inputsc(index, row) {
console.log(index, row);
},
init () {
init() {
this.height = this.setPx(document.body.clientHeight - 340);
},
searchHide () {
this.search = !this.search;
selectionChange(list) {
this.selectionList = list;
},
selectionClear() {
this.selectionList = [];
// this.$refs.table.clearSelection();
},
searchChange () {
currentChange(currentPage) {
this.page.currentPage = currentPage;
this.onLoad(this.page);
},
searchReset () {
this.query = {};
this.page.currentPage = 1;
sizeChange(pageSize) {
this.page.pageSize = pageSize;
this.onLoad(this.page);
},
handleSubmit () {
if (!this.form.id) {
add(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
} else {
update(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
})
}
sizeChange1(pageSize) {
this.page1.pageSize = pageSize;
this.onLoad(this.page1, {}, 'page1');
},
handleAdd () {
this.title = '新增'
this.form = {}
this.box = true
currentChange1(currentPage) {
this.page1.currentPage = currentPage;
this.onLoad(this.page1, {}, 'page1');
},
handleEdit (row) {
this.title = '编辑'
this.box = true
getDetail(row.id).then(res => {
this.form = res.data.data;
});
sizeChange2(pageSize) {
this.page1.pageSize = pageSize;
this.onLoad(this.page2, {}, 'page2');
},
handleView (row) {
this.title = '查看'
this.view = true;
this.box = true;
getDetail(row.id).then(res => {
this.form = res.data.data;
});
currentChange2(currentPage) {
this.page1.currentPage = currentPage;
this.onLoad(this.page2, {}, 'page2');
},
handleDelete () {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(this.ids);
})
.then(() => {
onLoad(page, params = {}, uname) {
this.loading = true;
if (uname=='page1') {
getinventorypage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
if (uname) {
this[uname].total = data.total;
}
this.data1 = data.records;
this.data1 = this.$functions.newdatas(this.columnList1, this.data1);
this.loading = false;
this.selectionClear();
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
rowDel (row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
}else if(uname=='page2'){
gettruckloadpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
if (uname) {
this[uname].total = data.total;
}
this.data2 = data.records;
this.data2 = this.$functions.newdatas(this.columnList2, this.data2);
this.loading = false;
this.selectionClear();
});
} else {
getpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.data = this.$functions.newdatas(this.columnList, this.data);
this.loading = false;
this.selectionClear();
});
}
},
beforeClose (done) {
done()
this.form = {};
this.view = false;
},
selectionChange (list) {
this.selectionList = list;
},
selectionClear () {
this.selectionList = [];
// this.$refs.table.clearSelection();
},
currentChange (currentPage) {
this.page.currentPage = currentPage;
this.onLoad(this.page);
},
sizeChange (pageSize) {
this.page.pageSize = pageSize;
this.onLoad(this.page);
},
onLoad (page, params = {}) {
this.loading = true;
getpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.data =this.$functions.newdatas(this.columnList,this.data)
this.loading = false;
this.selectionClear();
});
}
}
},
};
</script>

5
src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
Unescape View File

@ -50,6 +50,7 @@
<template #default="slotProps">
<el-text type="primary" text icon="el-icon-view" @click="handleViewAdd(slotProps.scope)">查看</el-text>
<el-text type="primary" text icon="el-icon-edit" v-if="slotProps.scope.row.conditions != '3'" @click="handleEditOwn(slotProps.scope)">编辑</el-text>
<el-text type="primary" text icon="el-icon-edit" v-if="slotProps.scope.row.conditions != '3'" @click="handleEnter(slotProps.scope)">入库</el-text>
<el-dropdown>
<el-text type="primary" text >
@ -63,9 +64,9 @@
<el-dropdown-item>
<el-text @click="handleDrawer(slotProps.scope)">物品清单</el-text>
</el-dropdown-item>
<el-dropdown-item v-if="slotProps.scope.row.conditions != '3'">
<!-- <el-dropdown-item v-if="slotProps.scope.row.conditions != '3'">
<el-text @click="handleEnter(slotProps.scope)">入库</el-text>
</el-dropdown-item>
</el-dropdown-item>-->
</el-dropdown-menu>
</template>
</el-dropdown>

Write Preview
Loading…
Cancel
Save