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

Merge branch 'dev' into pre-production

fix_bug_pro20231227
pref_mail@163.com 1 year ago
parent
9260d844f8 3d435a3212
commit
6517cb2c18
6 changed files with 2715 additions and 2554 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. 6
      src/components/tablecmt/tablecmt.vue
  2. 54
      src/views/distribution/artery/AddVehicleStowage.vue
  3. 5
      src/views/distribution/artery/VehicleStowage.vue
  4. 45
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  5. 121
      src/views/distribution/signfor/distributionSignfor.vue
  6. 5038
      src/views/mail/order/add.vue

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

@ -40,7 +40,7 @@
<!-- <el-text class="mx-1">{{ column.label }}</el-text> -->
<el-input
v-if="column.type == 2 || column.type == 13"
v-model="column.values"
v-model.trim="column.values"
clearable
:placeholder="`请输入${column.label}`"
@change="inputchange($event, column)"
@ -116,7 +116,7 @@
<el-input
@blur="handleNumberRange(column, scope.row)"
v-if="column.type == 10"
v-model="scope.row[column.prop]"
v-model.trim="scope.row[column.prop]"
type="number"
:min="0"
:max="scope.row.residueNumber"
@ -350,6 +350,8 @@ function handleCheckSelect(select: []) {
selecttable.value.toggleRowSelection(item, true);
}
});
} else {
selecttable.value.clearSelection();
}
}
function godowns(url) {

54
src/views/distribution/artery/AddVehicleStowage.vue
Unescape View File

@ -8,7 +8,7 @@
<!-- 表单内容 -->
<el-form label-width="80px">
<!-- 仓库节点 -->
<el-steps finish-status="success" :active="details.nodeInfoData.length" space="300px">
<el-steps finish-status="success" :active="details.active" space="300px">
<el-step v-for="(item, index) in details.nodeInfoData" :key="item">
<template #icon>
<el-icon size="20px" v-if="index === 0"><LocationFilled /></el-icon>
@ -275,6 +275,7 @@
<!-- 列表模块 -->
<tablecmt
ref="oldColumnListNode"
class="columnList"
:columnList="details.columnList"
:tableData="details.data"
@ -362,7 +363,7 @@
<!-- 控件 -->
<div style="margin-bottom: 10px" class="flex-c-sb">
<el-button type="text" class="pointer" @click="handleRemoveWaybill">
<el-button type="text" class="pointer" @click="handleRemoveWaybill(index)">
<el-icon><CaretLeft /></el-icon>
移除调度池
</el-button>
@ -375,6 +376,7 @@
</div>
<tablecmt
class="columnList"
ref="newColumnListNode"
:columnList="details.newColumnList"
:tableData="item.data"
:loading="item.loading"
@ -407,7 +409,7 @@ import {
postFindWarehouseListByName,
postFindAllOrderList,
} from '@/api/distribution/AddVehicleStowage';
import { useRouter } from 'vue-router';
import { useRouter, useRoute } from 'vue-router';
import { ElMessage, ElMessageBox } from 'element-plus';
import { useStore } from 'vuex';
@ -416,6 +418,7 @@ const nodeInfokeys = nodeInfoColumnList.slice(1).map(val => val.prop);
// 获取路由实例
const $router = useRouter();
const $route = useRoute();
// vuex 实例
const $store = useStore();
@ -522,6 +525,20 @@ const details = reactive<any>({
/** 页面信息 */
pageInfo: {},
options: [],
/** 当前页面类型 -- 1: 新增; 2: 编辑 */
pageType: 1,
/** 编辑模式下当前仓的位置索引 */
warehouseIndex: computed(() => {
if (Number(details.pageType) === 1) return 0;
else if (Number(details.pageType) === 2) return 0;
}),
/** 步骤条激活位置 */
active: computed(() => {
if (Number(details.pageType) === 1) return details.nodeInfoData.length;
else if (Number(details.pageType) === 2) return 0;
}),
/** 被选中的orderCode组成的list */
orderCodeList: [],
});
const {
@ -543,6 +560,9 @@ const {
// 列表组件实例 -- 节点信息
const nodeInfoRef = ref(null);
const oldColumnListNode = ref();
const newColumnListNode = ref();
/** vuex */
const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
console.log('permission :>> ', permission);
@ -570,6 +590,20 @@ onMounted(() => {
setTabelHeight();
});
// 清空复选框
const clearSelectionList = () => {
details.selectionList = [];
console.log('newColumnListNode :>> ', newColumnListNode);
console.log('oldColumnListNode :>> ', oldColumnListNode);
newColumnListNode.value.forEach(val => {
console.log('val :>> ', val);
val.handleCheckSelect([]);
});
oldColumnListNode.value.forEach(val => {
val.handleCheckSelect([]);
});
};
/** 设置节点费用禁用 */
const handleEditForbidden = (_arr: []) => {
if (_arr.length === 0) return;
@ -855,17 +889,31 @@ const handleAddWaybill = (index: number) => {
});
}
details.nodeInfoData[index].data = details.selectionList;
details.orderCodeList = [
...new Set([
...details.orderCodeList,
...details.selectionList.map(val => val.orderCode + ',' + val.waybillNo),
]),
];
console.log('details.orderCodeList :>> ', details.orderCodeList);
const orderCodes = details.selectionList.map(val => val.orderCode);
clearSelectionList();
details.page.pageNum = 1;
initOriginWarehouseOrder({ orderCodes: details.orderCodeList });
};
/** 移除调度池 */
const handleRemoveWaybill = (index: number) => {
const _node = details.nodeInfoData[index];
console.log('details.nodeInfoData[index] :>> ', details.nodeInfoData[index]);
if (!_node.nodeName || !_node.nodeId) {
return ElMessage({
type: 'warning',
message: '未选择目的仓或目的仓信息异常',
});
}
clearSelectionList();
};
</script>

5
src/views/distribution/artery/VehicleStowage.vue
Unescape View File

@ -705,7 +705,10 @@ const handleFullScrean = (_type: 'open' | 'close', _name: string) => {
/** 新增配载 */
const handleAdd = () => {
$router.push({ path: '/distribution/artery/AddVehicleStowage' });
$router.push({
path: '/distribution/artery/AddVehicleStowage',
query: { name: '新增配载', type: 1 },
});
};
</script>

45
src/views/distribution/deliverylist/distributionDeliveryListedt.vue
Unescape View File

@ -3139,33 +3139,48 @@ export default {
// this.wid= row.id
// this.getWrapdetails(this.wpage)
},
handleOne(row) {
console.log('签收>>>>>>>>>>', row);
this.loading = true;
this.$confirm('确认一键装车？')
.then(_ => {
let data = {};
data.reservationId = row.id;
data.deliveryId = this.deliverydata.id;
console.log('------------->data', data);
getOneclick(data).then(res => {
this.$message.success(res.data.msg);
this.onLoad();
});
})
.catch(_ => {})
.finally(()=>{
this.loading = false;
});
},
//一键签收
handleSignone(row) {
console.log('一键签收222>>>>>>>>>>', row);
if (row.loadingStatus != '已装车'){
ElMessage({
message: '请先进行装车',
type: 'warning',
});
return;
}
this.reservationId = row.reservationId; //存储当前行的ID
this.signtitle = '一键签收';
this.signform = row;
this.TcForm = row;
this.signBox = true;
},
inventoryDetail(row) {
console.log('一键签收当前行参数>>>>>>>>>>', row);
},
handleOne(row) {
console.log('签收>>>>>>>>>>', row);
this.$confirm('确认一键装车？')
.then(_ => {
let data = {};
data.reservationId = row.id;
data.deliveryId = this.deliverydata.id;
console.log('------------->data', data);
getOneclick(data).then(res => {
this.$message.success(res.data.msg);
this.onLoad();
});
})
.catch(_ => {});
},
getWrapdetails(page) {
let params = {};
params.reservationId = this.wid;

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

@ -759,64 +759,83 @@ export default {
const idList= this.selectionList.map(item=>{
console.log('>>>>>>>>>',item);
return{id:item.id,reservationCode:item.reservationCode,client:item.consignee}
return item.id;
})
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;
console.log("ids-------------->",idList);
handlePicture(idList.join(",")).then(res=>{
if (res.data.size > 0){
// const _item = this.selectionList[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 = (new Date()).valueOf() + ".zip";
a.style.display = "none";
document.body.appendChild(a);
a.click(); // 模拟点击了a标签，会触发a标签的href的读取，浏览器就会自动下载了
a.remove();
}
})
this.$notify({
title: '提示',
message: ('i', { style: 'color: teal'}, '开始下载...')
});
}, 3000);
})
// 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 秒之后，自动清除定时器
}
// }

5038
src/views/mail/order/add.vue
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save