Browse Source

新增预约详情查看页码,修复复选框小bug

fix_bug_pro20231227
13208366016 1 year ago
parent
commit
317ee31e24
  1. 21
      src/api/distribution/createTask.js
  2. 35
      src/views/basic/pda/basicPda1111.vue
  3. 1
      src/views/distribution/checkInventoryTask/createTask.vue
  4. 317
      src/views/distribution/checkInventoryTask/createTaskfrom.vue
  5. 86
      src/views/distribution/reservation/reservationAddFrom.vue
  6. 44
      src/views/distribution/turndelivery/deliveryDiscuss.vue

21
src/api/distribution/createTask.js

@ -64,7 +64,7 @@ export const postBatchDelete = params => {
// data,
// });
// };
// 盘点任务包条
export const $_taskQuestSelectStrip = params => {
return request({
url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/SelectStrip',
@ -72,3 +72,22 @@ export const $_taskQuestSelectStrip = params => {
params,
});
};
// 盘点任务库存品
export const $_QuestSelectInventory = params => {
return request({
url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/SelectInventory',
method: 'get',
params,
});
};
// 盘点任务零担
export const $_taskQuestSelectZreo = params => {
return request({
url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/SelectZreo',
method: 'get',
params,
});
};

35
src/views/basic/pda/basicPdaTT.vue → src/views/basic/pda/basicPda1111.vue

@ -14,8 +14,9 @@
<el-button @click="handleDelete"
><el-icon><Edit /></el-icon></el-button
>
<el-button link type="primary" icon="el-icon-view" @click="handleview(row)">多选测试</el-button
>
<el-button link type="primary" icon="el-icon-view" @click="toggleSelection()"
>多选测试</el-button
>
</div>
<!-- 表格顶部右侧按钮 -->
<div class="el-Cart-button-right">
@ -36,7 +37,7 @@
<!-- 顶部结束 -->
<div class="el-Cart">
<!-- 表格列开始 -->
<el-table :data="data" border :height="TabHeight + 'px'" style="width: 100%">
<el-table :data="data" border :height="TabHeight + 'px'" style="width: 100%" ref="tableRef">
<el-table-column type="selection" width="55" fixed="left" />
<el-table-column
type="index"
@ -91,7 +92,6 @@
<el-button link type="primary" icon="el-icon-view" @click="handleview(row)"
>查看</el-button
>
</template>
</el-table-column>
</el-table>
@ -261,18 +261,17 @@ const pageList = ref([5, 10, 50, 100, 200]); // 选择每页显示多少条
const small = ref(false);
const background = ref(true); //
const disabled = ref(false); // 使
const data = ref([]); //
const data = ref([]); //
const TabHeight = ref(); //
const AddLalog = ref(false); //
const img = ref(false); //
const ImgText = ref(''); //
const AddForm = ref({
//
});
const AddForm = ref({}); //
const value1 = ref(''); //
const optionsvalue = ref(''); //
const optionsvalue2 = ref(''); //
const uploadRef = ref(); //
const tableRef = ref(null); // table
const options = [
//
{
@ -319,6 +318,10 @@ function onLoad() {
console.log(res.data.data.records);
//
data.value = res.data.data.records;
const setIn = setTimeout(() => {
toggleSelection(); //
clearTimeout(setIn); //
}, 0);
});
}
// DOM
@ -328,18 +331,23 @@ onMounted(() => {
// DOM
onLoad();
});
//
const AddInfo = () => {
console.log(111);
AddLalog.value = true;
AddLalog.value = true; //
};
//
const toggleSelection = () => {
//,IF
data.value.forEach((row, i) => {
tableRef.value!.toggleRowSelection(data.value[i], true);
});
};
//
const imageUrl = ref('');
//
const ImgSuccess: UploadProps['onSuccess'] = (response, uploadFile) => {
console.log(response, uploadFile, '123123123123123122312123');
console.log(response.data.link);
if (response.success === true) {
img.value = true;
//
@ -347,7 +355,6 @@ const ImgSuccess: UploadProps['onSuccess'] = (response, uploadFile) => {
console.log(UrlImg.value);
//
AddForm.value.photo = response.data.link;
console.log(img.value);
//
ImgText.value = response.data.originalName;
}

1
src/views/distribution/checkInventoryTask/createTask.vue

@ -768,7 +768,6 @@ export default {
this.form = row;
console.log(row,'任务信息');
console.log(this.$router);
// this.$router.push('/distribution/checkInventoryTask/createTaskfrom')
this.$router.push({
path: '/distribution/checkInventoryTask/createTaskfrom',
query: {

317
src/views/distribution/checkInventoryTask/createTaskfrom.vue

@ -1,16 +1,35 @@
<template>
<div class="el-content-el" ref="TabHeight">
<el-tabs type="border-card">
<el-tabs type="border-card" @tab-change="TabData">
<el-tab-pane label="包条">
<el-table :data="BTtableData" :height="TabHeight + 'px'" style="width: 100%" border>
<el-table-column fixed prop="ordePackageCode" label="包条码" width="180" />
<el-table-column prop="orderCode" label="订单号" width="320" />
<el-table-column prop="orderCode" label="托盘码" width="320" />
<el-table-column prop="orderCode" label="一级品类" width="320" />
<el-table-column prop="orderCode" label="二级品类" width="320" />
<el-table-column prop="orderCode" label="三级品类" width="320" />
<el-table-column prop="orderCode" label="发站仓" width="320" />
<el-table-column prop="orderCode" label="品牌" width="320" />
<el-table-column prop="stockNum" label="在库数量" width="320" />
<el-table-column prop="trayCode" label="托盘码" width="320">
<template #default="props">
<span>
{{ props.row.trayCode ? props.row.trayCode : '/' }}
</span>
</template>
</el-table-column>
<el-table-column prop="firsts" label="一级品类" width="320" />
<el-table-column prop="second" label="二级品类" width="320" />
<el-table-column prop="thirdProduct" label="三级品类" width="320" />
<el-table-column prop="sendWarehouseName" label="发站仓" width="320">
<template #default="props">
<span>
{{ props.row.sendWarehouseName ? props.row.sendWarehouseName : '/' }}
</span>
</template>
</el-table-column>
<el-table-column prop="brandName" label="品牌" width="320">
<template #default="props">
<span>
{{ props.row.brandName ? props.row.brandName : '/' }}
</span>
</template>
</el-table-column>
<el-table-column prop="state" label="盘点状态" width="120">
<template #default="props">
@ -42,8 +61,8 @@
</span>
</template>
</el-table-column>
<el-table-column prop="serviceNumber" label="服务号" width="120">
<el-table-column prop="consigneeUnit" label="收货单位" width="320" />
<el-table-column prop="serviceNumber" label="服务号" width="250">
<template #default="props">
<span>
{{ props.row.serviceNumber ? props.row.serviceNumber : '/' }}
@ -57,16 +76,59 @@
<el-button link type="primary" size="small">Edit</el-button>
</template>
</el-table-column> -->
<el-table-column prop="state" label="托盘码" width="220">
<el-table-column prop="updateTime" label="盘点时间" width="320">
<template #default="props">
<span>
{{ props.row.trayCode ? props.row.trayCode : '/' }}
{{ props.row.updateTime ? props.row.updateTime : '/' }}
</span>
</template>
</el-table-column>
</el-table>
<!-- 表格翻页功能 -->
<div class="demo-pagination-block">
<el-pagination
v-model:current-page="PageSize"
v-model:page-size="Page"
:page-sizes="pageList"
:small="small"
:disabled="disabled"
:background="background"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
@size-change="BTSizeChange"
@current-change="BTCurrentChange"
/>
</div>
</el-tab-pane>
<el-table-column prop="state" label="服务号" width="120" />
<el-table-column prop="state" label="托盘码" width="120">
<el-tab-pane label="库存品">
<el-table :data="BTtableData" :height="TabHeight + 'px'" style="width: 100%" border>
<el-table-column fixed prop="materialCode" label="物料编码" width="180" />
<el-table-column prop="marketName" label="商场名称" width="180">
<template #default="props">
<span>
{{ props.row.marketName ? props.row.marketName : '/' }}
</span>
</template>
</el-table-column>
<el-table-column prop="incomingBatch" label="批次号" width="180">
<template #default="props">
<span>
{{ props.row.incomingBatch ? props.row.incomingBatch : '/' }}
</span>
</template>
</el-table-column>
<el-table-column prop="descriptionGoods" label="物品名称" width="250" />
<el-table-column prop="stockNum" label="在库数量" width="320" />
<el-table-column prop="positionCode" label="货位" width="320">
<template #default="props">
<span>
{{ props.row.positionCode ? props.row.positionCode : '/' }}
</span>
</template>
</el-table-column>
<el-table-column prop="trayCode" label="托盘码" width="320">
<template #default="props">
<span>
{{ props.row.trayCode ? props.row.trayCode : '/' }}
@ -74,20 +136,156 @@
</template>
</el-table-column>
<el-table-column prop="state" label="托盘码" width="120">
<el-table-column prop="state" label="盘点状态" width="120">
<template #default="props">
<span>
{{ props.row.trayCode ? props.row.trayCode : '/' }}
{{
props.row.questStatus === 0
? '待盘点'
: props.row.questStatus === 1
? '已盘'
: props.row.questStatus === 2
? '未盘点'
: '已排除'
}}
</span>
</template>
</el-table-column>
<el-table-column prop="address" label="盘点方式" width="300">
<template #default="props">
<span>
{{
props.row.questStatus === 1
? '随机'
: props.row.questStatus === 2
? '库位'
: props.row.questStatus === 3
? '订单'
: '托盘'
}}
</span>
</template>
</el-table-column>
<el-table-column prop="serviceNumber" label="服务号" width="250">
<template #default="props">
<span>
{{ props.row.serviceNumber ? props.row.serviceNumber : '/' }}
</span>
</template>
</el-table-column>
<!-- <el-table-column fixed="right" label="操作" width="120">
<template #default>
<el-button link type="primary" size="small" @click="handleClick">Detail</el-button>
<el-button link type="primary" size="small">Edit</el-button>
</template>
</el-table-column> -->
<el-table-column prop="updateTime" label="盘点时间" width="320">
<template #default="props">
<span>
{{ props.row.updateTime ? props.row.updateTime : '/' }}
</span>
</template>
</el-table-column>
</el-table>
<!-- 表格翻页功能 -->
<div class="demo-pagination-block">
<el-pagination
v-model:current-page="PageSize"
v-model:page-size="Page"
:page-sizes="pageList"
:small="small"
:disabled="disabled"
:background="background"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
@size-change="BTSizeChange"
@current-change="BTCurrentChange"
/>
</div>
</el-tab-pane>
<el-tab-pane label="零担">
<el-table :data="BTtableData" :height="TabHeight + 'px'" style="width: 100%" border>
<el-table-column fixed prop="orderCode" label="订单号" width="250" />
<el-table-column prop="categoryName" label="物品名称" width="180" />
<el-table-column prop="consigneePerson" label="收货人" width="180" />
<el-table-column prop="consigneeAddress" label="收货人地址" width="300" />
<el-table-column prop="consigneeMobile" label="收货人电话" width="180">
<template #default="props">
<span>
{{ props.row.consigneeMobile ? props.row.consigneeMobile : '/' }}
</span>
</template>
</el-table-column>
<el-table-column prop="stockNum" label="在库数量" width="320" />
<el-table-column prop="positionCode" label="货位" width="320">
<template #default="props">
<span>
{{ props.row.positionCode ? props.row.positionCode : '/' }}
</span>
</template>
</el-table-column>
<el-table-column prop="state" label="盘点时间" width="120">
<el-table-column prop="trayCode" label="托盘码" width="320">
<template #default="props">
<span>
{{ props.row.trayCode ? props.row.trayCode : '/' }}
</span>
</template>
</el-table-column>
<el-table-column prop="state" label="盘点状态" width="120">
<template #default="props">
<span>
{{
props.row.questStatus === 0
? '待盘点'
: props.row.questStatus === 1
? '已盘'
: props.row.questStatus === 2
? '未盘点'
: '已排除'
}}
</span>
</template>
</el-table-column>
<el-table-column prop="address" label="盘点方式" width="300">
<template #default="props">
<span>
{{
props.row.questStatus === 1
? '随机'
: props.row.questStatus === 2
? '库位'
: props.row.questStatus === 3
? '订单'
: '托盘'
}}
</span>
</template>
</el-table-column>
<el-table-column prop="waybillNumber" label="运单号" width="250">
<template #default="props">
<span>
{{ props.row.waybillNumber ? props.row.waybillNumber : '/' }}
</span>
</template>
</el-table-column>
<!-- <el-table-column fixed="right" label="操作" width="120">
<template #default>
<el-button link type="primary" size="small" @click="handleClick">Detail</el-button>
<el-button link type="primary" size="small">Edit</el-button>
</template>
</el-table-column> -->
<el-table-column prop="updateTime" label="盘点时间" width="320">
<template #default="props">
<span>
{{ props.row.updateTime ? props.row.updateTime : '/' }}
</span>
</template>
</el-table-column>
</el-table>
<!-- 表格翻页功能 -->
<div class="demo-pagination-block">
@ -105,14 +303,16 @@
/>
</div>
</el-tab-pane>
<el-tab-pane label="库存品">Config</el-tab-pane>
<el-tab-pane label="零担">Role</el-tab-pane>
</el-tabs>
</div>
</template>
<script lang="ts" setup>
import { $_taskQuestSelectStrip } from '@/api/distribution/createTask';
import {
$_taskQuestSelectStrip,
$_QuestSelectInventory,
$_taskQuestSelectZreo,
} from '@/api/distribution/createTask';
import { useRouter, useRoute } from 'vue-router';
import { ref } from 'vue';
const router = useRouter();
@ -126,43 +326,82 @@ const disabled = ref(false); // 是否禁止使用页码功能
const total = ref(0); //
const TabHeight = ref(); //
const BTtableData = ref([]); //
const id = ref(null); //ID
const tabCode = ref(0); //tab
onMounted(() => {
//88
TabHeight.value = TabHeight.value.offsetHeight - 127;
// DOM
onLoad();
});
const handleClick = () => {
console.log('click');
};
//
function list() {
$_taskQuestSelectStrip({
id: route.query.id, //ID
// ID
id.value = route.query.id;
//
const DataList = val => {
val({
id: id.value, //ID
current: PageSize.value, //
size: Page.value, //
}).then(res => {
console.log(
res.data.data.records,
'res================================================================'
);
console.log(res);
total.value = res.data.data.total;
BTtableData.value = res.data.data.records;
total.value = res.data.data.total; //
BTtableData.value = res.data.data.records; //
});
};
//
function BTlist() {
DataList($_taskQuestSelectStrip);
}
list(); //
//
function KCPlist() {
DataList($_QuestSelectInventory);
}
//
function Zreolist() {
DataList($_taskQuestSelectZreo);
}
//
BTlist();
const page = () => {
Page.value = 20; //
PageSize.value = 1; //
};
//
const TabData = tab => {
//
page();
if (tab == 0) {
BTlist(); //
} else if (tab == 1) {
KCPlist(); //
} else {
Zreolist(); //
}
};
//
const BTSizeChange = val => {
Page.value = val;
list();
if (tabCode.value == 0) {
Page.value = val;
BTlist();
} else if (tabCode.value == 1) {
KCPlist();
} else {
Zreolist();
}
};
//
const BTCurrentChange = val => {
PageSize.value = val;
list();
if (tabCode.value == 0) {
PageSize.value = val;
BTlist();
} else if (tabCode.value == 1) {
PageSize.value = val;
KCPlist();
} else {
PageSize.value = val;
Zreolist();
}
};
</script>
@ -184,7 +423,7 @@ const BTCurrentChange = val => {
margin-top: 15px;
}
:deep(.el-table__row) {
height: 30px;
height: 50px;
}
:deep(.el-table__cell) {
.cell {

86
src/views/distribution/reservation/reservationAddFrom.vue

@ -367,7 +367,7 @@
<el-button v-if="!isrReservationEntry" type="primary" icon="el-icon-circle-close" @click="onSubmitUpdateZeroOrder"
>修改(零担订单)
</el-button
>loading
>
<el-button type="primary" icon="el-icon-circle-close" @click="onSubmitZeroOrder"
>提交(零担订单)
</el-button
@ -2657,7 +2657,7 @@
* 增加订单提交
*/
onSubmitOrder() {
console.log('orderList-------------》', this.orderList);
console.log('-------------》', this.orderList);
if (this.orderList.length === 0) return this.$message.warning('最少选择一条数据!!!')
const list = this.orderList;
let _name = list[0].customerName;
@ -2687,60 +2687,48 @@
this.form.consignee = _name;
this.form.deliveryAddress = _address;
this.form.deliveryPhone = _phone;
this.orderData = this.orderList;
let _arr = [this.orderData,...this.orderList]
//
_arrJAONSTR = _arr.map(val => JSON.stringify(val))
//
_newSetArr = Array.from(new Set(_arrJAONSTR))
//
this.orderData = _newSetArr.map(val => JSON.parse(val))
//
// const info = [];
// this.stockArticleInfo.forEach((item, index) => {
// this.orderList.forEach(order => {
// // const newDate1 = this.orderData.map(item => { // map
// // if (this.orderList.find(o => o.id !== item.id)) { //
// // return item;
// // });
// // } info.push(order);
// //
// info.push(order);
// this.stockArticleInfo.splice(index, 1);
// });
// });
const info = [];
this.stockArticleInfo.forEach((item, index) => {
this.orderList.forEach(order => {
// const newDate1 = this.orderData.map(item => { // map
// if (this.orderList.find(o => o.id !== item.id)) { //
// return item;
// });
// } info.push(order);
//
info.push(order);
this.stockArticleInfo.splice(index, 1);
});
});
// if (this.orderData.length >= 1) {
// let newDate1 = this.orderData.map(item => {
// // map
// if (this.orderList.find(o => o.id !== item.id)) {
// //
// return item;
// }
// });
// console.log('newDate1-------------->', newDate1.length);
// if (newDate1.length >= 1) {
// console.log('newDate1-------------->', newDate1);
// newDate1.forEach(a => {
// this.orderData.push(a);
// });
// }
// console.log('this.orderData------------->', this.orderData);
// } else {
if (this.orderData.length >= 1) {
let newDate1 = this.orderData.map(item => {
// map
if (this.orderList.find(o => o.id !== item.id)) {
//
return item;
}
});
console.log('newDate1-------------->', newDate1.length);
if (newDate1.length >= 1) {
console.log('newDate1-------------->', newDate1);
newDate1.forEach(a => {
this.orderData.push(a);
});
}
console.log('this.orderData------------->', this.orderData);
} else {
// this.orderData = this.orderList;
// }
this.orderData = this.orderList;
}
// this.orderData.forEach(a => {
// a.reservationNum = a.handQuantity;
this.orderData.forEach(a => {
a.reservationNum = a.handQuantity;
// });
});
// this.orderData.push(info);

44
src/views/distribution/turndelivery/deliveryDiscuss.vue

@ -559,13 +559,14 @@
<el-dialog v-model="isShowPackage" title="包件信息" width="100%">
<!-- 列表模块 -->
<el-table
ref="packageList"
ref='tableRef'
v-loading="loading"
@selection-change="selectionChange"
:data="packageData"
:height="height"
style="width: 100%; height: 100%"
:border="option.border"
>
<el-table-column type="selection" v-if="option.selection" width="55" align="center">
<!-- :selectable="checkPackage"-->
@ -679,7 +680,6 @@
</el-form-item>
</el-dialog>
</template>
<script>
import { getDictionaryBiz } from '@/api/system/dict';
import option from '@/option/distribution/distributionReservation';
@ -720,6 +720,7 @@ import { ElMessageBox } from 'element-plus'
pageSize: 30,
total: 40
},
tableRef:null,//Ref
query: {},
aaa: true,
bbb: false,
@ -870,7 +871,7 @@ import { ElMessageBox } from 'element-plus'
},
methods: {
//
//
async getFork() {
@ -927,10 +928,6 @@ import { ElMessageBox } from 'element-plus'
await this.getStorageArea();
await this.getTeam();
},
//
handleSelectionChange(selection) {
console.log(selection);
},
//
async getTeam() {
let params = this.deptId;
@ -1211,7 +1208,27 @@ import { ElMessageBox } from 'element-plus'
this.zeroOrderShow = false;
},
//
toggleSelection (val=true,data) {
console.log('执行了此函数');
//,IF
const setIn = setTimeout(() => {
if(val){
this.packageData.forEach((row, i) => {
this.$refs.tableRef.toggleRowSelection(this.packageData[i], true)
})
}
else{
this.packageData.forEach((row, i) => {
if(row.id==data[i]){
this.$refs.tableRef.toggleRowSelection(this.packageData[i], true)
}
})
}
clearTimeout(setIn); //
}, 0);
},
/**
* 查看包件
*/
@ -1225,11 +1242,17 @@ import { ElMessageBox } from 'element-plus'
console.log('++++++++++++', row);
if (this.deliveryListId) {
getPackageListByDeliveryIdAndOrderId(page.currentPage,page.pageSize,this.deliveryListId,row.id).then(res=>{
console.log("getPackageListByDeliveryIdAndOrderId1--------------------->",res);
console.log("getPackageListByDeliveryIdAndOrderId1--------------------->",res);
this.packageData = res.data.data.data.packageList
console.log(this.packageData,'this.packageListInfo');
console.log( res.data.data.data.reservationPackageList,' res.data.data.data.reservationPackageList');
let reservationPackageList=[]
res.data.data.data.reservationPackageList.forEach(val=>{
reservationPackageList.push(val.id )
})
this.toggleSelection(false,reservationPackageList)
console.log(reservationPackageList,'reservationPackageList');
})
// //
// let params = {};
// console.log('^^^^^^^^', row);
@ -1256,7 +1279,7 @@ import { ElMessageBox } from 'element-plus'
this.packageData=res.data.data.records;
this.packageListInfo=res.data.data.records
//
this.toggleSelection()
console.log(this.selectionList,'勾选值');
})
// //
@ -1293,6 +1316,7 @@ import { ElMessageBox } from 'element-plus'
//
console.log(this.obj.parcelListVOS);
console.log('___________', this.obj);
console.log(this.orderData,'orderdata=====');
this.orderData.forEach(item => {
if (item.id === this.obj.id) {
item.packageListInfo = this.selectionList;

Loading…
Cancel
Save