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

master
qb 1 year ago
parent
1f47338162 4c9b285ee7
commit
3a3b27cb35
8 changed files with 158 additions and 100 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. 1
      src/api/distribution/distributionSignfor.js
  2. 2
      src/views/distribution/inventory/distributionPrint.vue
  3. 2
      src/views/distribution/inventory/distributionServiceLog.vue
  4. 2
      src/views/distribution/inventory/distributionStockListInfo.vue
  5. 40
      src/views/distribution/inventory/distributionStockListMarket.vue
  6. 22
      src/views/distribution/reservation/reservationAddFrom.vue
  7. 97
      src/views/distribution/signfor/distributionSignfor.vue
  8. 92
      src/views/warehouse/warehousesignedorder/distributionStockArticle.vue

1
src/api/distribution/distributionSignfor.js
Unescape View File

@ -66,6 +66,7 @@ export const handlePicture = ids => {
params: {
ids
},
responseType: 'blob',
})
};

2
src/views/distribution/inventory/distributionPrint.vue
Unescape View File

@ -48,7 +48,7 @@
</template>
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<template #default="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
<el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>

2
src/views/distribution/inventory/distributionServiceLog.vue
Unescape View File

@ -48,7 +48,7 @@
</template>
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<template #default="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
<el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>

2
src/views/distribution/inventory/distributionStockListInfo.vue
Unescape View File

@ -48,7 +48,7 @@
</template>
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<template #default="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
<el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>

40
src/views/distribution/inventory/distributionStockListMarket.vue
Unescape View File

@ -381,17 +381,17 @@ export default {
label: '货物名称',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'cargoNumber',
label: '货物编号',
label: '物料编码',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -401,7 +401,7 @@ export default {
// label: '物流车次',
// type: 2,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true,
@ -411,7 +411,7 @@ export default {
label: '入库批次',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -421,7 +421,7 @@ export default {
// label: '商城名称',
// type: 2,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true,
@ -431,7 +431,7 @@ export default {
label: '库存数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -441,7 +441,7 @@ export default {
label: '冻结数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -451,7 +451,7 @@ export default {
label: '出库数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -461,7 +461,7 @@ export default {
label: '物流发运车次',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -471,7 +471,7 @@ export default {
// label: '品分类',
// type: 2,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true,
@ -481,7 +481,7 @@ export default {
label: '品牌',
type: 2,
values: '',
width: '130',
width: '120',
checkarr: [],
fixed: false,
sortable: true,
@ -491,7 +491,7 @@ export default {
label: '商场/客户',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -501,7 +501,7 @@ export default {
label: '门店名称',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -531,7 +531,7 @@ export default {
label: '所在托盘',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -541,7 +541,7 @@ export default {
label: '仓库名称',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -551,7 +551,7 @@ export default {
label: '物料单位',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -561,7 +561,7 @@ export default {
label: '包装数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -571,7 +571,7 @@ export default {
label: '拆包数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -581,7 +581,7 @@ export default {
label: '拆包状态',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [
{
value: `true`,

22
src/views/distribution/reservation/reservationAddFrom.vue
Unescape View File

@ -833,17 +833,17 @@ export default {
sortable: true,
head: false,
},
{
prop: 'materialId',
label: '物料ID',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// {
// prop: 'materialId',
// label: '物料ID',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'descriptionGoods',
label: '物料名称',

97
src/views/distribution/signfor/distributionSignfor.vue
Unescape View File

@ -115,6 +115,7 @@
<el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain
>导出
</el-button>
<!-- v-loading.fullscreen.lock="fullscreenLoading"-->
<el-button type="danger" icon="el-icon-picture" @click="handlePictureInfo" plain
>导出图片
</el-button>
@ -215,9 +216,29 @@
</span>
</template>
</el-dialog>
<el-dialog
title="提示"
v-model="dialogVisible"
width="15%"
:before-close="handleClose">
<div align="center">
<el-progress type="circle" :percentage="fileSize" status="success"></el-progress>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
</span>
</el-dialog>
</div>
</basic-container>
<edittablehead
@setcolum="setnewcolum"
@closce="showdrawer"
@ -572,6 +593,7 @@ export default {
// 更多列的配置...
],
columnListedit: [],
dialogVisible: false,
drawerShow: false,
height: 0,
// 弹框标题
@ -592,6 +614,7 @@ export default {
signingStatusData: [],
//业务类型
deliveryTypeData: [],
fullscreenLoading:false,
//来源
orderSourceData: [],
// 分页信息
@ -609,6 +632,7 @@ export default {
// 表单列表
data: [],
driverData: [],
fileSize:0,
};
},
mounted() {
@ -722,6 +746,9 @@ export default {
// if (!!this.ids) {
// row.ids = this.ids;
// }
// const h = this.$createElement;
console.log("this.selectionList>>>>>>>>>>",this.selectionList);
if (this.selectionList.length < 1){
this.$message({
@ -729,16 +756,69 @@ export default {
message: '请选择签收记录!',
});
}
const idList= this.selectionList.map(item=>{
return item.id
})
console.log(idList);
const ids = idList.join(',');
console.log("ids>>>>>>>>>>>>",ids);
handlePicture(ids).then(res=>{
console.log("res><>>>>>>>>>>>>>",res);
const idList= this.selectionList.map(item=>{
console.log('>>>>>>>>>',item);
return{id:item.id,reservationCode:item.reservationCode,client:item.consignee}
})
const _arr = [];
console.log(idList);
if (idList.length > 0){
// this.fullscreenLoading = true;
// this.dialogVisible = true;
idList.forEach(item=>{
return _arr.push(handlePicture(item.id));
})
console.log('arr>>>>>>>>>>>>>>>>>>>>',_arr);
function delayedTimer() {
console.log('Delayed timer executed!');
}
const timerId = setTimeout(delayedTimer, 500);
Promise.all(_arr).then((response)=>{
console.log('response>>>>>>>>>>>>>>>>>>>>>',response);
response.forEach((res, index) =>{
console.log('res>>>>>>>>>>>>>>>>>>>>>',res.data);
if (res.data.size > 0){
const _item = idList[index];
const blob = new Blob([res.data], {type: 'application/zip'});
let a = document.createElement("a");
a.href = window.URL.createObjectURL(blob);
// a.href = 'http://192.168.10.25:2888/D:/Test';
a.download = _item.client +'-'+_item.reservationCode +".zip";
// a.download = 'aaa' + ".zip";
a.style.display = "none";
document.body.appendChild(a);
a.click(); // 模拟点击了a标签，会触发a标签的href的读取，浏览器就会自动下载了
a.remove();
}
})
for (let i = 0; i < 100; i++) {
this.fileSize = i;
}
// this.dialogVisible = false;
setTimeout(() => {
clearTimeout(timerId);
console.log('延迟执行完成');
this.fullscreenLoading = false;
this.$notify({
title: '提示',
message: ('i', { style: 'color: teal'}, '开始下载...')
});
}, 3000);
})
// 在 3 秒之后，自动清除定时器
}
// row.signingStatus = '2';
// row = { ...row, ...this.query };
@ -748,6 +828,7 @@ export default {
// downloadXls(res.data, '签收数据.xlsx');
// });
},
showdrawer(value) {
this.drawerShow = value;
},

92
src/views/warehouse/warehousesignedorder/distributionStockArticle.vue
Unescape View File

@ -115,7 +115,7 @@ export default {
label: '服务号',
type: 2,
values: '',
width: '130',
width: '160',
checkarr: [],
fixed: true,
sortable: true,
@ -126,7 +126,7 @@ export default {
label: '运单号',
type: 2,
values: '',
width: '130',
width: '160',
checkarr: [],
fixed: true,
sortable: true,
@ -137,7 +137,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
width: '130',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
@ -147,7 +147,7 @@ export default {
label: '商场名称',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -157,7 +157,7 @@ export default {
label: '货物名称',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -167,7 +167,7 @@ export default {
label: '所在仓库',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -177,7 +177,7 @@ export default {
label: '入库时间',
type: 4,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -187,7 +187,7 @@ export default {
label: '在库时间',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -197,7 +197,7 @@ export default {
label: '订单总件数',
type: 1,
values: '',
width: '130',
width: '160',
checkarr: [],
fixed: false,
sortable: true,
@ -207,7 +207,7 @@ export default {
label: '收货单位',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -227,7 +227,7 @@ export default {
label: '在库件数',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -237,7 +237,7 @@ export default {
label: '可用数量',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -247,7 +247,7 @@ export default {
label: '未入库数量',
type: 1,
values: '',
width: '130',
width: '160',
checkarr: [],
fixed: false,
sortable: true,
@ -257,7 +257,7 @@ export default {
label: '分拣数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -267,7 +267,7 @@ export default {
label: '配送数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -277,7 +277,7 @@ export default {
label: '中转数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -287,7 +287,7 @@ export default {
label: '签收数量',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -297,7 +297,7 @@ export default {
label: '上架状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [
// {
// value: '0',
@ -323,7 +323,7 @@ export default {
// label: '货区-货位-货架',
// type: 1,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true,
@ -333,7 +333,7 @@ export default {
label: '订单来源',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -343,7 +343,7 @@ export default {
// label: '所在托盘',
// type: 1,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true,
@ -353,7 +353,7 @@ export default {
// label: '冻结状态',
// type: 3,
// values: '',
// width: '130',
// width: '140',
// checkarr: [
// // {
// // value: '1',
@ -372,7 +372,7 @@ export default {
label: '订单状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -382,7 +382,7 @@ export default {
label: '预约状态',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -392,7 +392,7 @@ export default {
// label: '备货状态',
// type: 3,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true,
@ -402,7 +402,7 @@ export default {
label: '是否齐套',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [
{
value: '2',
@ -421,7 +421,7 @@ export default {
// label: '品牌',
// type: 2,
// values: '',
// width: '130',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true,
@ -431,7 +431,7 @@ export default {
label: '服务类型',
type: 3,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -441,7 +441,7 @@ export default {
label: '顾客名字',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -451,7 +451,7 @@ export default {
label: '顾客电话',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -461,7 +461,7 @@ export default {
label: '顾客地址',
type: 2,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -471,7 +471,7 @@ export default {
label: '配送司机',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -481,7 +481,7 @@ export default {
label: '增值服务',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -501,7 +501,7 @@ export default {
label: '创建时间',
type: 1,
values: '',
width: '130',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
@ -756,7 +756,6 @@ export default {
}
let st = false;
this.selectionList.forEach(i => {
console.log('yuyuyuuyu', i);
if (i.reservationStatusName === '已预约') {
st = true;
this.$message.warning(i.orderCode + ' - 已预约，请勿重复预约！！！');
@ -841,28 +840,6 @@ export default {
}
}
/*else if (this.selectionList.length > 1){
this.getSock();
}else if (this.selectionList.length < 2){
//判断有没有包件
let params ={
stockArticleId : this.selectionList[0].id
}
let a = await getListOwn(this.page.currentPage,this.page.pageSize,params);
// console.log("aaaaaaa===",a.data.data);
if(a.data.data.records.length > 0){
this.$router.push({
path: '/distribution/inventory/distributionStockArticleFrom',
query: {
id : this.ids,
name : "转库存单"
}
});
}else{
this.getSock();
}
}*/
},
getSock() {
this.$confirm('确定将选择的订单转为库存品吗？', {
@ -1248,7 +1225,6 @@ export default {
(this.query.orderStatus = 80),
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
console.log('>>>>>>>', data.records);
this.page.total = data.total;
this.data = data.records;
this.data = this.data.map(i => {

Write Preview
Loading…
Cancel
Save