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

优化自提

dev-xx
马远东 11 months ago
parent
3b8a43946c
commit
638aafef2c
7 changed files with 708 additions and 446 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/api/distribution/distributionParcelList.js
  2. 4
      src/components/tablecmt/tablecmt.vue
  3. 2
      src/views/aftersales/aftersalesWorkOrderAdd.vue
  4. 12
      src/views/aftersales/aftersalesWorkOrderInfo.vue
  5. 865
      src/views/aftersales/aftersalesWorkOrderend.vue
  6. 227
      src/views/distribution/inventory/distrilbutionBillLading.vue
  7. 35
      src/views/distribution/inventory/distrilbutionBillLadingView.vue

9
src/api/distribution/distributionParcelList.js
Unescape View File

@ -22,6 +22,15 @@ export const getEditList = (current, size, params) => {
}, },
}); });
}; };
export const $_getBillLadingPackageIds = (params) => {
return request({
url: '/api/logpm-distribution/distrilbutionBillLading/getBillLadingPackageIds',
method: 'get',
params
});
};
export const getListOwn = (current, size, params) => { export const getListOwn = (current, size, params) => {
return request({ return request({
url: '/api/logpm-distribution/distributionParcelList/list', url: '/api/logpm-distribution/distributionParcelList/list',

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

@ -191,6 +191,7 @@ import {
onMounted, onMounted,
defineExpose, defineExpose,
inject, inject,
watch,
} from 'vue'; } from 'vue';
import type { PropType } from 'vue'; import type { PropType } from 'vue';
import { computeNumber } from '@/utils/util.js'; import { computeNumber } from '@/utils/util.js';
@ -429,9 +430,11 @@ onMounted(() => {
} }
handleCheckSelect(_checkSelect); handleCheckSelect(_checkSelect);
}); });
/** 勾选 */ /** 勾选 */
function handleCheckSelect(select: any[]) { function handleCheckSelect(select: any[]) {
console.log('select :>> ', select); console.log('select :>> ', select);
console.log(props.isselectfun,'props.isselectfun');
if (select.length !== 0) { if (select.length !== 0) {
for (const item of select) { for (const item of select) {
if (props.isselectfun) { if (props.isselectfun) {
@ -615,7 +618,6 @@ const getSummaries = (param: any) => {
return; return;
} }
tji = 0; tji = 0;
console.log('item :>> ', item);
if (item?.isshowSummary && !item.head) { if (item?.isshowSummary && !item.head) {
for (let ite of data) { for (let ite of data) {
tji = computeNumber(tji, '+', Number(ite[item?.prop] || 0)).result; tji = computeNumber(tji, '+', Number(ite[item?.prop] || 0)).result;

2
src/views/aftersales/aftersalesWorkOrderAdd.vue
Unescape View File

@ -791,7 +791,7 @@ const ruleForm = reactive({
businessId: [{ required: true, message: '请选择责任方', trigger: ['bulr', 'change'] }], businessId: [{ required: true, message: '请选择责任方', trigger: ['bulr', 'change'] }],
personResponsibleId: [{ required: true, message: '请输入责任人', trigger: ['bulr', 'change'] }], personResponsibleId: [{ required: true, message: '请输入责任人', trigger: ['bulr', 'change'] }],
responsibilityRatio: [{ required: true, message: '请输入占比', trigger: ['bulr', 'change'] }], responsibilityRatio: [{ required: true, message: '请输入占比', trigger: ['bulr', 'change'] }],
tripartite: [{ required: true, message: '请输入三方责任人', trigger: ['bulr', 'change'] }], tripartite: [{ required: false, message: '请输入三方责任人', trigger: ['bulr', 'change'] }],
description: [{ required: true, message: '请输入说明', trigger: ['bulr', 'change'] }], description: [{ required: true, message: '请输入说明', trigger: ['bulr', 'change'] }],
money: [{ required: true, message: '请输入金额', trigger: ['bulr', 'change'] }], money: [{ required: true, message: '请输入金额', trigger: ['bulr', 'change'] }],
paymentUnit: [{ required: true, message: '请输入支付单位', trigger: ['bulr', 'change'] }], paymentUnit: [{ required: true, message: '请输入支付单位', trigger: ['bulr', 'change'] }],

12
src/views/aftersales/aftersalesWorkOrderInfo.vue
Unescape View File

@ -340,7 +340,7 @@
</el-form-item> </el-form-item>
<el-form-item label="支付单位"> <el-form-item label="支付单位">
<el-input v-model="item.paymentUnit" disabled /> <el-input v-model="item.paymentUnit" disabled :placeholder="item.paymentUnit ||'未填写支付单位'"/>
</el-form-item> </el-form-item>
<el-form-item label="理赔支付时间"> <el-form-item label="理赔支付时间">
<el-date-picker <el-date-picker
@ -348,13 +348,13 @@
type="datetime" type="datetime"
format="YYYY-MM-DD" format="YYYY-MM-DD"
value-format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="理赔支付时间"
size="default" size="default"
disabled disabled
:placeholder="item.compensationTime ||'未选择支付时间'"
/> />
</el-form-item> </el-form-item>
<el-form-item label="支付方式"> <el-form-item label="支付方式">
<el-input v-model="item.text" disabled /> <el-input v-model="item.text" disabled :placeholder="item.text ||'未选择支付方式'"/>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
@ -369,7 +369,7 @@
<el-form-item label="处理结果说明" class="el_resj" v-if="ProcessingList.length"> <el-form-item label="处理结果说明" class="el_resj" v-if="ProcessingList.length">
<el-input <el-input
v-model="Indexform.resultDescription" v-model="Indexform.resultDescription"
placeholder="请输入处理结果说明" :placeholder="Indexform.resultDescription ||'未填写处理结果说明'"
clearable clearable
:autosize="{ minRows: 1, maxRows: 4 }" :autosize="{ minRows: 1, maxRows: 4 }"
type="textarea" type="textarea"
@ -393,8 +393,9 @@
<div class="payanindemnity" v-for="(item, index) in CompensationParty" :key="index"> <div class="payanindemnity" v-for="(item, index) in CompensationParty" :key="index">
<div class="el_pklab"> <div class="el_pklab">
<!-- {{ item.cld }} -->
<span class="title" :style="{ color: item.state != 0 ? '#000' : '#F56C6C' }" <span class="title" :style="{ color: item.state != 0 ? '#000' : '#F56C6C' }"
>{{ item.state == 0 ? '赔款方' : '受款方' }}{{ item.cld }}</span >{{ item.state == 0 ? '赔款方' : '受款方' }}</span
> >
</div> </div>
@ -1124,7 +1125,6 @@ const onLoad = () => {
} }
}); });
companyProportion.value = 100 - sum; companyProportion.value = 100 - sum;
getDictionaryBiz('result_handling').then(res => { getDictionaryBiz('result_handling').then(res => {
console.log(res, '发现环节'); console.log(res, '发现环节');
ProcessingResults.value = res.data.data; ProcessingResults.value = res.data.data;

865
src/views/aftersales/aftersalesWorkOrderend.vue
View File

File diff suppressed because it is too large Load Diff

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

@ -95,11 +95,7 @@
<el-tabs @tab-click="handleChlickTab" style="width: 100%"> <el-tabs @tab-click="handleChlickTab" style="width: 100%">
<el-tab-pane label="定制品"> <el-tab-pane label="定制品">
<div style=" <div style="display: flex;justify-content: space-between;margin-bottom: 6px;">
display: flex;
justify-content: space-between;
margin-bottom: 6px;
">
<el-button <el-button
type="primary" type="primary"
text text
@ -588,13 +584,14 @@
<!-- 选择包件 --> <!-- 选择包件 -->
<!-- 此v-if解决关闭后选择不回显的问题 --> <!-- 此v-if解决关闭后选择不回显的问题 -->
<template v-if="dialogChooseOrderVisible">
<el-dialog v-model="dialogChooseOrderVisible" title="选择包件" center style="width: 80%"> <el-dialog v-if="dialogChooseOrderVisible" v-model="dialogChooseOrderVisible" title="选择包件" center style="width: 80%;">
<tablecmt <tablecmt
ref="orderChooseTable" ref="orderChooseTable"
class="orderChooseTable"
:columnList="order.columnOrderList" :columnList="order.columnOrderList"
:tableData="order.orderDetails" :tableData="order.orderDetails"
:checkselect="order.selectList" :checkselect="order.selectList"
:loading="order.orderChooseLoading" :loading="order.orderChooseLoading"
@inputTxt="orderInputSc" @inputTxt="orderInputSc"
@timeCheck="orderTimesc" @timeCheck="orderTimesc"
@ -612,7 +609,7 @@
@size-change="sizeChangeOrderChoose" @size-change="sizeChangeOrderChoose"
@current-change="currentChangeOrderChoose" @current-change="currentChangeOrderChoose"
:current-page="order.currentPage" :current-page="order.currentPage"
:page-sizes="[30, 50, 80, 120]" :page-sizes="[500, 550, 600]"
:page-size="order.pageSize" :page-size="order.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="order.total" :total="order.total"
@ -628,7 +625,7 @@
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
</template>
<div class="LoadIMG"> <div class="LoadIMG">
<el-dialog v-model="dialogImg"> <el-dialog v-model="dialogImg">
<img w-full :src="Imgurl" alt="Preview Image" /> <img w-full :src="Imgurl" alt="Preview Image" />
@ -647,7 +644,7 @@ import {
zeroUpdateMaterial, zeroUpdateMaterial,
} from '@/api/distribution/distrilbutionBillLading'; } from '@/api/distribution/distrilbutionBillLading';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import { getListOwn, getList, getEditList } from '@/api/distribution/distributionParcelList'; import { getListOwn, getList, getEditList ,$_getBillLadingPackageIds} from '@/api/distribution/distributionParcelList';
import option from '@/option/distribution/distrilbutionBillLading'; import option from '@/option/distribution/distrilbutionBillLading';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict'; import { getDictionaryBiz } from '@/api/system/dict';
@ -659,12 +656,12 @@ import { detail } from '@/api/flow/flow';
import { nextTick, ref } from 'vue'; import { nextTick, ref } from 'vue';
import { useStore } from 'vuex'; import { useStore } from 'vuex';
import { setNodeHeight } from '@/utils/util.js'; import { setNodeHeight } from '@/utils/util.js';
import error from '@/error';
const $store = useStore(); const $store = useStore();
export default { export default {
name: '/distribution/inventory/distrilbutionBillLading', name: '/distribution/inventory/distrilbutionBillLading',
data() { data() {
return { return {
PackageCheckList:[],//包件勾选的数据
tabletit: '', //记录当前点击的标题栏 tabletit: '', //记录当前点击的标题栏
multifunctional:'', //编辑订单搜索 multifunctional:'', //编辑订单搜索
dialogImg: false, dialogImg: false,
@ -1243,7 +1240,7 @@ export default {
{ {
prop: 'serviceNumber', prop: 'serviceNumber',
label: '服务号', label: '服务号',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1254,18 +1251,7 @@ export default {
{ {
prop: 'waybillNumber', prop: 'waybillNumber',
label: '运单号', label: '运单号',
type: 2, type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'orderPackageCode',
label: '包条码',
type: 2,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1276,7 +1262,7 @@ export default {
{ {
prop: 'orderCode', prop: 'orderCode',
label: '订单自编号', label: '订单自编号',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1287,7 +1273,7 @@ export default {
{ {
prop: 'mallName', prop: 'mallName',
label: '商场名称', label: '商场名称',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1298,7 +1284,7 @@ export default {
{ {
prop: 'descriptionGoods', prop: 'descriptionGoods',
label: '货物名称', label: '货物名称',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1309,7 +1295,7 @@ export default {
{ {
prop: 'warehouse', prop: 'warehouse',
label: '所在仓库', label: '所在仓库',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1320,7 +1306,7 @@ export default {
{ {
prop: 'warehouseEntryTime', prop: 'warehouseEntryTime',
label: '入库时间', label: '入库时间',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1331,7 +1317,7 @@ export default {
{ {
prop: 'warehouseEntryTimeEnd', prop: 'warehouseEntryTimeEnd',
label: '最新入库时间', label: '最新入库时间',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1342,7 +1328,7 @@ export default {
{ {
prop: 'storeTime', prop: 'storeTime',
label: '在库时间', label: '在库时间',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1388,7 +1374,7 @@ export default {
{ {
prop: 'consigneeUnit', prop: 'consigneeUnit',
label: '收货单位', label: '收货单位',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1399,7 +1385,7 @@ export default {
{ {
prop: 'consigneePerson', prop: 'consigneePerson',
label: '收货人', label: '收货人',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1483,7 +1469,7 @@ export default {
{ {
prop: 'groundingStatusName', prop: 'groundingStatusName',
label: '上架状态', label: '上架状态',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1494,7 +1480,7 @@ export default {
{ {
prop: 'allocation', prop: 'allocation',
label: '货区-货位-货架', label: '货区-货位-货架',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1505,7 +1491,7 @@ export default {
{ {
prop: 'resource', prop: 'resource',
label: '订单来源', label: '订单来源',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1516,7 +1502,7 @@ export default {
{ {
prop: 'trays', prop: 'trays',
label: '所在托盘', label: '所在托盘',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1527,7 +1513,7 @@ export default {
{ {
prop: 'freezeStatusName', prop: 'freezeStatusName',
label: '冻结状态', label: '冻结状态',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1538,7 +1524,7 @@ export default {
{ {
prop: 'orderStatusName', prop: 'orderStatusName',
label: '订单状态', label: '订单状态',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1549,7 +1535,7 @@ export default {
{ {
prop: 'reservationStatusName', prop: 'reservationStatusName',
label: '预约状态', label: '预约状态',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1560,7 +1546,7 @@ export default {
{ {
prop: 'stockupStatusName', prop: 'stockupStatusName',
label: '备货状态', label: '备货状态',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1571,7 +1557,7 @@ export default {
{ {
prop: 'completeSetName', prop: 'completeSetName',
label: '是否齐套', label: '是否齐套',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1582,7 +1568,7 @@ export default {
{ {
prop: 'notificationName', prop: 'notificationName',
label: '通知状态', label: '通知状态',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1593,7 +1579,7 @@ export default {
{ {
prop: 'customerName', prop: 'customerName',
label: '顾客名字', label: '顾客名字',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1604,7 +1590,7 @@ export default {
{ {
prop: 'customerTelephone', prop: 'customerTelephone',
label: '顾客电话', label: '顾客电话',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1615,7 +1601,7 @@ export default {
{ {
prop: 'customerAddress', prop: 'customerAddress',
label: '顾客地址', label: '顾客地址',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1626,7 +1612,7 @@ export default {
{ {
prop: 'fee', prop: 'fee',
label: '增值服务', label: '增值服务',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1637,7 +1623,7 @@ export default {
{ {
prop: 'createUserName', prop: 'createUserName',
label: '创建人', label: '创建人',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1648,7 +1634,7 @@ export default {
{ {
prop: 'createTime', prop: 'createTime',
label: '创建时间', label: '创建时间',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1671,7 +1657,7 @@ export default {
{ {
prop: 'orderCode', prop: 'orderCode',
label: '订单自编号', label: '订单自编号',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1682,7 +1668,7 @@ export default {
{ {
prop: 'marketName', prop: 'marketName',
label: '商场名称', label: '商场名称',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1693,7 +1679,7 @@ export default {
{ {
prop: 'descriptionGoods', prop: 'descriptionGoods',
label: '货物名称', label: '货物名称',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1704,7 +1690,7 @@ export default {
{ {
prop: 'cargoUnit', prop: 'cargoUnit',
label: '货物单位', label: '货物单位',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1715,7 +1701,7 @@ export default {
{ {
prop: 'available', prop: 'available',
label: '可用数量', label: '可用数量',
type: 2, type: 1,
values: '', values: '',
width: '150', width: '150',
checkarr: [], checkarr: [],
@ -1890,7 +1876,7 @@ export default {
// 当前页 // 当前页
currentPage: 1, currentPage: 1,
// 本页数 // 本页数
pageSize: 30, pageSize: 500,
// 总数 // 总数
total: 0, total: 0,
// 复选框选中数据 // 复选框选中数据
@ -1911,6 +1897,7 @@ export default {
// 零担在库录入弹窗开启 // 零担在库录入弹窗开启
zeroOrderVisible: false, zeroOrderVisible: false,
zeroOrderData: [{}], zeroOrderData: [{}],
Unchecked:[],//未选中的数据
}; };
}, },
mounted() { mounted() {
@ -2083,6 +2070,8 @@ export default {
}, },
orderSelectChange(list) { orderSelectChange(list) {
this.order.selectList = list; this.order.selectList = list;
console.log(this.order.selectList,'当前勾选');
}, },
scrollToElementWithinTableRow(partialIdString) { scrollToElementWithinTableRow(partialIdString) {
// 清空之前的样式 // 清空之前的样式
@ -2350,7 +2339,9 @@ export default {
}, },
// 选择包件 // 选择包件
async handleChooseOrder(row) { async handleChooseOrder (row) {
this.dialogChooseOrderVisible = true;
console.log(this.order.columnOrderList,'order.columnOrderList'); console.log(this.order.columnOrderList,'order.columnOrderList');
this.order.columnOrderList.forEach(res=>res.values='') this.order.columnOrderList.forEach(res=>res.values='')
this.order.query={} this.order.query={}
@ -2364,7 +2355,6 @@ export default {
if (Number(_type) === 2) { if (Number(_type) === 2) {
await this.onLoadEditChoose({}, row); await this.onLoadEditChoose({}, row);
} else await this.onLoadOrderChoose(); } else await this.onLoadOrderChoose();
this.dialogChooseOrderVisible = true;
}, },
// 每页数量改变 // 每页数量改变
@ -2379,9 +2369,22 @@ export default {
}, },
// 页码改变 // 页码改变
currentChangeOrderChoose(current) { currentChangeOrderChoose(current) {
// console.log('current :>> ', current);
this.order.currentPage = current; this.order.currentPage = current;
const _type = this.$route.query.type; const _type = this.$route.query.type;
console.log(this.order.selectList,'当前勾选过的参数列表-=-===');
this.PackageCheckList.push(...this.order.selectList);//勾选的数据
//对数据去重
let uniqueData = this.PackageCheckList.reduce((acc, current) => {
//如果在累加器中还没有当前元素的 id，则添加该元素
if (!acc.some(item => item.id === current.id)) {
acc.push(current);
}
return acc;
}, []);
this.PackageCheckList= uniqueData
console.log(this.PackageCheckList,'去重后的所有勾选');
// 筛选出没有勾选的数据【用于从总列表中移除】
this.Unchecked = this.order.orderDetails.filter(b => !this.order.selectList.some(c => c.id === b.id));
// 编辑状态 // 编辑状态
if (Number(_type) === 2) { if (Number(_type) === 2) {
this.onLoadEditChoose(this.order.query,this.packageRow); this.onLoadEditChoose(this.order.query,this.packageRow);
@ -2396,33 +2399,63 @@ export default {
await getList(this.order.currentPage, this.order.pageSize, { await getList(this.order.currentPage, this.order.pageSize, {
...params, ...params,
...this.order.query, ...this.order.query,
}).then(res => { }).then(async res => {
console.log('res :>> ', res); console.log('res :>> ', res);
console.log(res.data.data.records, '获取到的包件'); console.log(res.data.data.records, '获取到的包件');
const data = res.data.data; const data = res.data.data;
this.order.total = data.total; this.order.total = data.total;
this.order.orderDetails = data.records; this.order.orderDetails = data.records;
const _node = await document.querySelector('.orderChooseTable');
await setNodeHeight(_node, '',_node );
this.order.orderChooseLoading = false; this.order.orderChooseLoading = false;
this.order.selectList = []; //筛选出与data相匹配的数据
this.order.selectList = res.data.data.records; //包件自动勾选 console.log(this.order.orderDetails,'当前列表的参数');
this.selectionClear(); console.log(this.PackageCheckList,'当前勾选参数集合【去重过】');
//全部勾选的数据
let uncheckedIds = this.Unchecked.map(item => item.id);
// 过滤掉 _aa 中未勾选的项
this.PackageCheckList = this.PackageCheckList.filter(a => !uncheckedIds.includes(a.id));
let _check =await this.order.orderDetails.filter(({ id }) => new Set(this.PackageCheckList.map(({ id }) => id)).has(id));
console.log(this.order.selectList,'当前勾选的LIST');
console.log(this.order.orderDetails,'当前获得数据LIST');
console.log(this.PackageCheckList,'所有勾选的LIST');
console.log(_check,'筛选出来的参数');
if(_check.length){
this.$refs.orderChooseTable.handleCheckSelect(_check);
}else{
this.$refs.orderChooseTable.handleCheckSelect(data.records);
}
console.log(this.order.selectList,'已经回显的值');
this.selectionClear();
}); });
return null; // return null;
}, },
/** /**
* 请求包件数据 -- 修改 * 请求包件数据 -- 修改
*/ */
async onLoadEditChoose(params = {}, row) { async onLoadEditChoose(params = {}, row) {
this.order.orderChooseLoading = true; if(row){
this.order.orderChooseLoading = true;
this.order.query.stockArticleId = this.orderChooseId; this.order.query.stockArticleId = this.orderChooseId;
this.order.query.reservationId = this.$route.query.id; this.order.query.reservationId = this.$route.query.id;
this.order.query.conditions = '1'; this.order.query.conditions = '1';
let _stateData={
id:this.$route.query.id,
orderId:row.id || ''
}
let _dataList=[]
await $_getBillLadingPackageIds(_stateData).then(res=>{
console.log(res,'必须参数ID');
if(res.data.code==200){
_dataList=res.data.data
}
})
await getEditList(this.order.currentPage, this.order.pageSize, { await getEditList(this.order.currentPage, this.order.pageSize, {
...params, ...params,
...this.order.query, ...this.order.query,
}).then(res => { }).then(async res => {
if(res.data.code !=200){ if(res.data.code !=200){
return return
} }
@ -2430,47 +2463,72 @@ export default {
const data = res.data.data; const data = res.data.data;
this.order.total = data.total || 0; this.order.total = data.total || 0;
this.order.orderDetails = data.records || []; this.order.orderDetails = data.records || [];
const _node = await document.querySelector('.orderChooseTable');
await setNodeHeight(_node, '',_node );
// 被选中的包件的id list // 被选中的包件的id list
console.log(row,'row====='); console.log(row,'row=====');
if(row){
row.originalIdList = []; row.originalIdList = [];
console.log(this.order,'this.order.orderDetails'); console.log(this.order,'this.order.orderDetails');
// 回显 // // 回显
this.order.selectList = this.order.orderDetails.filter(val => { // this.order.selectList = this.order.orderDetails.filter(val => {
console.log('val :>> ', val); // console.log('val :>> ', val);
if (val.choice){ // if (val.choice){
row.originalIdList.push(val.id); // row.originalIdList.push(val.id);
} // }
return val.choice; // return val.choice;
}); // });
// 深拷贝数据 if(this.order.orderDetails.length){
let matchedItems = this.order.orderDetails.filter(item => _dataList.includes(item.id));
this.$refs.orderChooseTable.handleCheckSelect(matchedItems);
}
// 深拷贝数据
console.log('this.order.selectList :>> ', this.order.selectList); console.log('this.order.selectList :>> ', this.order.selectList);
row.originalList = JSON.parse(JSON.stringify(this.order.selectList)); row.originalList = JSON.parse(JSON.stringify(this.order.selectList));
this.order.orderChooseLoading = false; this.order.orderChooseLoading = false;
}
}).catch((error)=>{ }).catch((error)=>{
console.log(error,'error'); console.log(error,'error');
this.order.orderChooseLoading = false; this.order.orderChooseLoading = false;
}); });
return null; return null;
}
}, },
/** /**
* 确认选择包件 * 确认选择包件
*/ */
handleChooseOrderConfirm() { handleChooseOrderConfirm() {
this.PackageCheckList.push(...this.order.selectList);//勾选的数据
//对数据去重
this.PackageCheckList= this.PackageCheckList.reduce((acc, current) => {
//如果在累加器中还没有当前元素的 id，则添加该元素
if (!acc.some(item => item.id === current.id)) {
acc.push(current);
}
return acc;
}, []);
this.Unchecked = this.order.orderDetails.filter(b => !this.order.selectList.some(c => c.id === b.id));
//全部勾选的数据
let uncheckedIds = this.Unchecked.map(item => item.id);
// 过滤掉 _aa 中未勾选的项
this.PackageCheckList = this.PackageCheckList.filter(a => !uncheckedIds.includes(a.id));
console.log(this.PackageCheckList,'准备提交的参数');
console.log('111 :>> ', 111); console.log('111 :>> ', 111);
if (this.order.selectList.length === 0) { if (!this.PackageCheckList.length) {
return this.$message({ type: 'warning', message: '最少选择一项数据' }); return this.$message({ type: 'warning', message: '最少选择一项数据' });
} }
if(this.order.selectList){ if(this.order.selectList){
this.packageRow.reservationNum=this.order.selectList.length this.packageRow.reservationNum=this.PackageCheckList.length
} }
// billPackageEntityList // billPackageEntityList
console.log('this.order.dataList :>> ', this.dataList); console.log('this.order.dataList :>> ', this.dataList);
this.dataList.find(val => val.id === this.orderChooseId).billPackageEntityList = this.dataList.find(val => val.id === this.orderChooseId).billPackageEntityList =
this.order.selectList.map(val => { this.PackageCheckList.map(val => {
console.log('val :>> ', val); console.log('val :>> ', val);
return { return {
parceListId: val.id, parceListId: val.id,
@ -2969,6 +3027,7 @@ if (val.orderPackageStatus == 70) {
type: 'success', type: 'success',
message: '操作成功!', message: '操作成功!',
}); });
this.PackageCheckList=[]
this.Selfpickuploading = false; //关闭加载效果 this.Selfpickuploading = false; //关闭加载效果
this.$store.commit('DEL_TAG_CURRENT'); this.$store.commit('DEL_TAG_CURRENT');
this.$router.push('/distribution/inventory/distrilbutionBillLadingList'); this.$router.push('/distribution/inventory/distrilbutionBillLadingList');

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

@ -56,9 +56,9 @@
<el-divider>订单列表</el-divider> <el-divider>订单列表</el-divider>
<el-tabs type="border-card" v-model="activeTab" @tab-click="handleTabClick"> <el-tabs type="border-card" v-model="activeTab" @tab-click="handleTabClick">
<el-button style=" margin-bottom: 10px;" type="primary" icon="Position" @click="Listexport">清单导出</el-button>
<el-tab-pane label="订 单 列 表" name="tab2"> <el-tab-pane label="订 单 列 表" name="tab2">
<el-button type="primary" icon="Position" @click="Orderexport">订单导出</el-button> <!-- <el-button type="primary" icon="Position" @click="Orderexport">订单导出</el-button> -->
<!-- 列表模块 --> <!-- 列表模块 -->
<tablecmt <tablecmt
ref="tableNodeOrderRef" ref="tableNodeOrderRef"
@ -90,7 +90,7 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="包 件 列 表" name="tab3"> <el-tab-pane label="包 件 列 表" name="tab3">
<el-button type="primary" icon="Position" @click="Packageexport">包件导出</el-button> <!-- <el-button type="primary" icon="Position" @click="Packageexport">包件导出</el-button> -->
<el-button type="warning" plain icon="el-icon-camera" @click="handleqr('')" <el-button type="warning" plain icon="el-icon-camera" @click="handleqr('')"
>批量查看二维码 >批量查看二维码
</el-button> </el-button>
@ -130,7 +130,7 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="库 存 品 列 表" name="tab4"> <el-tab-pane label="库 存 品 列 表" name="tab4">
<el-button type="primary" icon="Position" @click="Inventoryexport">库存品导出</el-button> <!-- <el-button type="primary" icon="Position" @click="Inventoryexport">库存品导出</el-button> -->
<!-- 列表模块 --> <!-- 列表模块 -->
<tablecmt <tablecmt
@ -1431,6 +1431,27 @@ export default {
}, },
}, },
methods: { methods: {
// 清单导出(全部导出)
Listexport(){
let downloadUrl = `/logpm-distribution/distrilbutionBillLading/export-distributionBillLadingDetail?${
this.website.tokenHeader
}=${getToken()}`;
let values = {
id: this.$route.query.id,
};
this.$confirm('是否导出数据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
NProgress.start();
exportBlob(downloadUrl, values).then(res => {
downloadXls(res.data, `清单数据${dateNow()}.xlsx`);
NProgress.done();
});
});
},
// 订单导出 // 订单导出
Orderexport() { Orderexport() {
let downloadUrl = `/logpm-distribution/distrilbutionBillStock/billOrderDetailExcel?${ let downloadUrl = `/logpm-distribution/distrilbutionBillStock/billOrderDetailExcel?${
@ -1808,9 +1829,9 @@ export default {
} }
}, },
handleSetTableHeight() { handleSetTableHeight() {
setNodeHeight(this.$refs.tableNodeOrderRef.$el, '50vh'); setNodeHeight(this.$refs.tableNodeOrderRef.$el, '48vh');
setNodeHeight(this.$refs.tableNodePackageRef.$el, '50vh'); setNodeHeight(this.$refs.tableNodePackageRef.$el, '48vh');
setNodeHeight(this.$refs.tableNodeInventoryRef.$el, '50vh'); setNodeHeight(this.$refs.tableNodeInventoryRef.$el, '48vh');
}, },
}, },
}; };

Write Preview
Loading…
Cancel
Save