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

修复二维码打印显示问题

fix_bug_pro20231227
qb 1 year ago
parent
13c2d446b3
commit
25cf41bacc
20 changed files with 470 additions and 691 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. 60
      src/api/distribution/VehicleStowage.js
  2. 210
      src/option/distribution/VehicleStowage.js
  3. 11
      src/router/views/index.js
  4. 4
      src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
  5. 4
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
  6. 2
      src/views/basicdata/warehouse/tray/basicdataTray.vue
  7. 250
      src/views/distribution/artery/VehicleStowage.vue
  8. 557
      src/views/distribution/artery/truckLoadingDetails.vue
  9. 4
      src/views/distribution/deliverylist/distributionDeliveryListdis.vue
  10. 2
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  11. 4
      src/views/distribution/deliverylist/distributionDeliveryListmar.vue
  12. 4
      src/views/distribution/inventory/distributionStockArticleDetails.vue
  13. 2
      src/views/distribution/inventory/distrilbutionBillLadingList.vue
  14. 4
      src/views/distribution/reservation/reservation.vue
  15. 8
      src/views/distribution/stockup/distributionStockupDetails.vue
  16. 10
      src/views/distribution/stockup/distributionStockupDetailsSelf.vue
  17. 4
      src/views/mail/reservation/list.vue
  18. 4
      src/views/waybill/TemporaryStorageList.vue
  19. 9
      src/views/waybill/orderPackageList.vue
  20. 8
      src/views/waybill/orderPackageListDetails.vue

60
src/api/distribution/VehicleStowage.js
Unescape View File

@ -15,88 +15,68 @@ export const postloadCarsPageList = (page, params) => {
};
/**
* 查询所有计费方式
* 发车
* data -- loadId 配载id组成的字符串
* data -- startCarType 1: 始发仓发车 2: 网点发车
*/
export const postFindChargeTypeList = data => {
export const postStartCarByLoadId = data => {
return request({
url: '/api/logpm-trunkline/billlading/findChargeTypeList',
url: '/api/logpm-trunkline/carsLoad/startCarByLoadId',
method: 'post',
data,
});
};
/**
* 创建新提货单
* 取消发车
*/
export const postSaveNew = data => {
export const postCancelStartCarByLoadId = data => {
return request({
url: '/api/logpm-trunkline/billlading/saveNew',
url: '/logpm-trunkline/carsLoad/cancelStartCarByLoadId',
method: 'post',
data,
});
};
/**
* 查询运单列表
* 卸车确认
*/
export const postList = data => {
export const postUnloadByLoadId = data => {
return request({
url: '/api/logpm-warehouseWaybill/list',
url: '/api/logpm-trunkline/carsLoad/unloadByLoadId',
method: 'post',
data,
});
};
/**
* 更新提货单状态
* 到车
*/
export const postUpdateBillladingStatus = data => {
export const postArriveCarByLoadId = data => {
return request({
url: '/api/logpm-trunkline/billlading/updateBillladingStatus',
url: '/api/logpm-trunkline/carsLoad/arriveCarByLoadId',
method: 'post',
data,
});
};
/**
* 查询提货单详情
* 取消到车
*/
export const postBillladingDetail = data => {
export const postCancelArriveCarByLoadId = data => {
return request({
url: '/api/logpm-trunkline/billlading/billladingDetail',
url: '/api/logpm-trunkline/carsLoad/cancelArriveCarByLoadId',
method: 'post',
data,
});
};
/**
* 查询提货单包件明细
* 取消配载
*/
export const postBillladingPackageDetail = data => {
export const postCancelCarsLoadByLoadId = data => {
return request({
url: '/api/logpm-trunkline/billlading/billladingPackageDetail',
method: 'post',
data,
});
};
/**
* 更新提货单关联运单数据
*/
export const postUpdateBillladingWaybillNum = data => {
return request({
url: '/api/logpm-trunkline/billlading/updateBillladingWaybillNum',
method: 'post',
data,
});
};
/**
* 提货单添加运单
*/
export const postAddWaybillToBillladingId = data => {
return request({
url: '/api/logpm-trunkline/billlading/addWaybillToBillladingId',
url: '/api/logpm-trunkline/carsLoad/cancelCarsLoadByLoadId',
method: 'post',
data,
});

210
src/option/distribution/VehicleStowage.js
Unescape View File

@ -15,7 +15,7 @@ export const columnList = [
fixed: true,
},
{
prop: 'billladingCode',
prop: 'waybillNo',
label: '批次号',
type: 13,
values: '',
@ -26,17 +26,17 @@ export const columnList = [
head: false,
},
{
prop: 'carNumber',
prop: 'carsLineName',
label: '路线',
type: 13,
values: '',
width: '180',
width: '250',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'driverName',
prop: 'planLoadingNumber',
label: '计划装车',
type: 1,
values: '',
@ -47,7 +47,7 @@ export const columnList = [
isshowSummary: true,
},
{
prop: 'driverPhone',
prop: 'realLoadingNumber',
label: '装车件数',
type: 1,
values: '',
@ -57,19 +57,19 @@ export const columnList = [
sortable: true,
isshowSummary: true,
},
{
prop: 'warehouseName',
label: '在车件数',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
{
prop: 'lineNameTitle',
// {
// prop: 'warehouseName',
// label: '在车件数',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// isshowSummary: true,
// },
{
prop: 'unloadNumber',
label: '卸车件数',
type: 1,
values: '',
@ -80,7 +80,7 @@ export const columnList = [
isshowSummary: true,
},
{
prop: 'nodeNub',
prop: 'fullLoadRate',
label: '满载率',
type: 1,
values: '',
@ -89,38 +89,38 @@ export const columnList = [
fixed: false,
sortable: true,
},
{
prop: 'startTime',
label: '滞留扫描',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'endTime',
label: '直发商家',
type: 3,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'planVolume',
label: '类型',
type: 3,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'billladingStatus',
// {
// prop: 'startTime',
// label: '滞留扫描',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'endTime',
// label: '直发商家',
// type: 3,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'planVolume',
// label: '类型',
// type: 3,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'loadStatusName',
label: '车辆状态',
type: 3,
values: '',
@ -130,7 +130,7 @@ export const columnList = [
sortable: true,
},
{
prop: 'chargeType',
prop: 'driverName',
label: '主驾司机',
type: 2,
values: '',
@ -140,7 +140,7 @@ export const columnList = [
sortable: true,
},
{
prop: 'totalFee',
prop: 'driverMobile',
label: '主驾司机手机号',
type: 2,
values: '',
@ -150,7 +150,7 @@ export const columnList = [
sortable: true,
},
{
prop: 'remark',
prop: 'carNumber',
label: '车牌号',
type: 2,
values: '',
@ -160,7 +160,7 @@ export const columnList = [
sortable: true,
},
{
prop: 'carrierName',
prop: 'startWarehouseName',
label: '起点仓库',
type: 2,
values: '',
@ -170,7 +170,7 @@ export const columnList = [
sortable: true,
},
{
prop: 'waybillCount',
prop: 'endWarehouseNames',
label: '终点仓库',
type: 2,
values: '',
@ -180,7 +180,7 @@ export const columnList = [
sortable: true,
},
{
prop: 'totalNum',
prop: 'arriveTime',
label: '到车时间',
type: 4,
values: '',
@ -190,7 +190,7 @@ export const columnList = [
sortable: true,
},
{
prop: 'totalWeight',
prop: 'startTime',
label: '实际发车时间',
type: 4,
values: '',
@ -199,19 +199,19 @@ export const columnList = [
fixed: false,
sortable: true,
},
// {
// prop: 'totalVolume',
// label: '总运输费用',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// isshowSummary: true,
// },
{
prop: 'totalVolume',
label: '总运输费用',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
{
prop: 'createUserName',
prop: 'nowTransportCost',
label: '现付运输费',
type: 1,
values: '',
@ -222,8 +222,8 @@ export const columnList = [
sortable: true,
},
{
prop: 'totalWeight',
label: '油费',
prop: 'oilCost',
label: '到付油卡费',
type: 1,
values: '',
width: '130',
@ -233,7 +233,7 @@ export const columnList = [
isshowSummary: true,
},
{
prop: 'totalVolume',
prop: 'tollFee',
label: '路桥费',
type: 1,
values: '',
@ -244,7 +244,7 @@ export const columnList = [
isshowSummary: true,
},
{
prop: 'createUserName',
prop: 'backTransportCost',
label: '回付运输费',
type: 1,
values: '',
@ -255,7 +255,7 @@ export const columnList = [
isshowSummary: true,
},
{
prop: 'createUserName',
prop: 'reachTransportCost',
label: '到付运输费',
type: 1,
values: '',
@ -266,7 +266,7 @@ export const columnList = [
isshowSummary: true,
},
{
prop: 'totalWeight',
prop: 'wholeCarInfoCost',
label: '整车信息费',
type: 1,
values: '',
@ -277,7 +277,7 @@ export const columnList = [
isshowSummary: true,
},
{
prop: 'totalVolume',
prop: 'wholeCarInsuranceCost',
label: '整车保险费',
type: 1,
values: '',
@ -288,7 +288,7 @@ export const columnList = [
isshowSummary: true,
},
{
prop: 'createUserName',
prop: 'wholeCarGroundCost',
label: '整车落地费',
type: 1,
values: '',
@ -299,7 +299,7 @@ export const columnList = [
isshowSummary: true,
},
{
prop: 'totalWeight',
prop: 'hairWholeCost',
label: '发站装车费',
type: 1,
values: '',
@ -310,7 +310,7 @@ export const columnList = [
isshowSummary: true,
},
{
prop: 'totalVolume',
prop: 'hairWholeOtherCost',
label: '发站其他费',
type: 1,
values: '',
@ -321,7 +321,7 @@ export const columnList = [
isshowSummary: true,
},
{
prop: 'createUserName',
prop: 'unloadCost',
label: '到站卸车费',
type: 1,
values: '',
@ -332,7 +332,7 @@ export const columnList = [
isshowSummary: true,
},
{
prop: 'createUserName',
prop: 'unloadOtherCost',
label: '到站其它费',
type: 1,
values: '',
@ -342,18 +342,18 @@ export const columnList = [
sortable: true,
isshowSummary: true,
},
{
prop: 'totalWeight',
label: '经办人',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'totalVolume',
// {
// prop: 'totalWeight',
// label: '经办人',
// type: 2,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'createTime',
label: '创建时间',
type: 1,
values: '',
@ -362,17 +362,17 @@ export const columnList = [
fixed: false,
sortable: true,
},
{
prop: 'createUserName',
label: '卸车总收入',
type: 1,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
// {
// prop: 'createUserName',
// label: '卸车总收入',
// type: 1,
// values: '',
// width: '130',
// checkarr: [],
// fixed: false,
// sortable: true,
// isshowSummary: true,
// },
{
prop: 'createUserName',
label: '操作',

11
src/router/views/index.js
Unescape View File

@ -202,6 +202,17 @@ export default [
/* webpackChunkName: "views" */ '@/views/distribution/artery/AddVehicleStowage.vue'
),
},
{
path: 'truckLoadingDetails',
name: '装车明细',
meta: {
i18n: 'data',
},
component: () =>
import(
/* webpackChunkName: "views" */ '@/views/distribution/artery/truckLoadingDetails.vue'
),
},
],
},
// {

4
src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
Unescape View File

@ -136,7 +136,7 @@ export default {
imgUrl: '',
qrCodeObj: [],
dialogVisible: false,
html: null, // 页面包条码内容
html: '', // 页面包条码内容
};
},
computed: {
@ -437,10 +437,10 @@ export default {
let qr = checkcode.join(',');
console.log(qr);
this.html = '';
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;

4
src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
Unescape View File

@ -612,7 +612,7 @@ export default {
selectionList: [],
//货位 选择行
allselectionList: [],
html: null, // 页面包条码内容
html: '', // 页面包条码内容
excelOption: {
submitBtn: false,
emptyBtn: false,
@ -997,10 +997,10 @@ export default {
let qr = checkcode.join(',');
console.log(qr);
this.html = '';
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;

2
src/views/basicdata/warehouse/tray/basicdataTray.vue
Unescape View File

@ -394,10 +394,10 @@ export default {
let qr = checkcode.join(',');
console.log(qr);
this.html = '';
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;

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

@ -76,12 +76,12 @@
<el-button type="primary" icon="el-icon-printer" @click="searchReset()"
>装载卸车清单(财务)</el-button
>
<el-button type="primary" icon="el-icon-van" @click="searchReset()">发 车</el-button>
<el-button type="primary" icon="el-icon-delete" @click="searchReset()"
<el-button type="primary" icon="el-icon-van" @click="handleStartCar()">发 车</el-button>
<el-button type="primary" icon="el-icon-delete" @click="handleCancelStartCar()"
>取消发车</el-button
>
<el-button type="primary" icon="el-icon-delete" @click="searchReset()"
>取消装车</el-button
<el-button type="primary" icon="el-icon-delete" @click="handleCancelCarsLoad()"
>取消配载</el-button
>
<el-button type="primary" icon="el-icon-document" @click="handleComparativeStatement()"
>对比报表</el-button
@ -100,37 +100,75 @@
</el-row>
<!-- 表格 -->
<el-row>
<!-- 列表模块 -->
<tablecmt
:columnList="details.columnList"
:tableData="data"
:loading="loadingObj.list"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '批次号'">
<el-text>123</el-text>
</template>
<!-- 列表模块 -->
<tablecmt
:columnList="details.columnList"
:tableData="data"
:loading="loadingObj.list"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '批次号'">
<el-text @click="handleGoWaybill(slotProps.scope)">123</el-text>
</template>
<template v-if="slotProps.scope.column.label === '路线'">
<span
v-for="(item, index) in slotProps.scope.row.carsLoadLineList"
:key="item"
class="flex-c-c carsLineName"
>
<el-tooltip placement="top" effect="dark">
<template #content>
<div>
<span class="mr-10">网点:</span>
<span>{{ item.nodeName }}</span>
</div>
<div>
<span class="mr-10">运单总件数:</span>
<span>{{ item.nodeName }}</span>
</div>
<div>
<span class="mr-10">实际装车件数:</span>
<span>{{ item.nodeName }}</span>
</div>
<div>
<span class="mr-10">操作人:</span>
<span>{{ item.nodeName }}</span>
</div>
<div>
<span class="mr-10">状态:</span>
<span>{{ item.nodeName }}</span>
</div>
</template>
<el-text>{{ item.nodeName }}</el-text>
</el-tooltip>
<!-- <el-text @click="handleGoWaybill(slotProps.scope)">
{{ item.nodeName }}
</el-text> -->
<el-icon v-if="index !== slotProps.scope.row.carsLoadLineList.length - 1"
><Right
/></el-icon>
</span>
</template>
<template v-if="slotProps.scope.column.label === '操作'">
<!-- <el-text @click="handleShowzeroAdditionalRecording(slotProps.scope)">
<template v-if="slotProps.scope.column.label === '操作'">
<!-- <el-text @click="handleShowzeroAdditionalRecording(slotProps.scope)">
零担补录
</el-text> -->
<el-text @click="handleShowTruckLoadingDetails(slotProps.scope)">装车明细</el-text>
<el-text>编辑</el-text>
<el-text>数据同步</el-text>
<el-text>批量装车</el-text>
<el-text>手动装车</el-text>
<el-text>节点费用</el-text>
</template>
<el-text @click="handleShowTruckLoadingDetails(slotProps.scope)">装车明细</el-text>
<el-text>编辑</el-text>
<el-text>数据同步</el-text>
<el-text>批量装车</el-text>
<el-text>手动装车</el-text>
<el-text>节点费用</el-text>
</template>
</tablecmt>
</el-row>
</template>
</tablecmt>
<!-- 统计 -->
<!-- <el-row>
@ -388,7 +426,12 @@ import {
warehouseNodeColumnList,
truckLoadingColumnList,
} from '@/option/distribution/VehicleStowage';
import { postloadCarsPageList } from '@/api/distribution/VehicleStowage';
import {
postloadCarsPageList,
postStartCarByLoadId,
postCancelStartCarByLoadId,
postCancelCarsLoadByLoadId,
} from '@/api/distribution/VehicleStowage';
import { useRouter } from 'vue-router';
import { ElMessage, ElMessageBox } from 'element-plus';
@ -481,6 +524,16 @@ const details = reactive<any>({
},
});
/** 车辆状态字典 */
const carStateDictionaries = reactive([
{ label: '未发车', code: 0 },
{ label: '已发车', code: 10 },
{ label: '网点到车', code: 20 },
{ label: '网点发车', code: 30 },
{ label: '终点到车', code: 40 },
{ label: '取消配载', code: 100 },
]);
const {
search,
query,
@ -581,7 +634,7 @@ onMounted(() => {
});
/** 请求页面数据 */
const onLoad = async (page: any, params = {}) => {
const onLoad = async (params = {}) => {
try {
// 开启loading
details.loadingObj.list = true;
@ -590,7 +643,12 @@ const onLoad = async (page: any, params = {}) => {
const res = await postloadCarsPageList(details.page, { ...details.query, ...params });
const { code, data } = res.data;
if (code !== 200) return;
details.data = data.records;
details.data = data.records.map(val => {
val.loadStatusName = carStateDictionaries.find(
item => Number(val.loadStatus) === item.code
).label;
return val;
});
details.page.total = data.total;
} catch (error) {
console.log('error :>> ', error);
@ -599,7 +657,7 @@ const onLoad = async (page: any, params = {}) => {
}
};
onLoad(details.page);
onLoad();
/** 搜索 */
const searchChange = () => {
@ -782,6 +840,118 @@ const handleAdd = () => {
query: { name: '新增配载', type: 1 },
});
};
/** 前往配载详情 */
const handleGoWaybill = ({ row }) => {
console.log('row :>> ', row);
};
/** 发车 */
const handleStartCar = () => {
if (details.selectionList.length === 0) {
return ElMessage({
message: '请选择发车数据',
type: 'warning',
});
}
ElMessageBox.confirm('确认发车吗?', 'Warning', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
}).then(async () => {
const submitData = {
loadId: details.selectionList.map(val => val.id).join(','),
startCarType: '1',
};
const res = await postStartCarByLoadId(submitData);
const { code } = res.data;
if (code !== 200) {
return;
}
ElMessage({
type: 'success',
message: '发车成功',
});
onLoad();
});
};
/** 发车 */
const handleCancelStartCar = () => {
if (details.selectionList.length === 0) {
return ElMessage({
message: '请选择发车数据',
type: 'warning',
});
}
ElMessageBox.confirm('确认取消发车吗?', 'Warning', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
}).then(async () => {
const submitData = {
loadId: details.selectionList.map(val => val.id).join(','),
startCarType: '1',
};
const res = await postCancelStartCarByLoadId(submitData);
const { code } = res.data;
if (code !== 200) {
return;
}
ElMessage({
type: 'success',
message: '取消发车成功',
});
onLoad();
});
};
/** 取消装车 */
const handleCancelCarsLoad = () => {
if (details.selectionList.length === 0) {
return ElMessage({
message: '请选择发车数据',
type: 'warning',
});
}
ElMessageBox.confirm('确认取消发车吗?', 'Warning', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
}).then(async () => {
const ids = [];
const _flag = details.selectionList.every(val => {
ids.push(val.id);
console.log('val :>> ', val);
return Number(val.loadStatus) === 0;
});
if (!_flag)
return ElMessage({
message: '车辆已发车, 无法取消配载计划',
type: 'warning',
});
const submitData = {
loadId: ids.join(','),
startCarType: '1',
};
const res = await postCancelCarsLoadByLoadId(submitData);
const { code } = res.data;
if (code !== 200) {
return;
}
ElMessage({
type: 'success',
message: '取消配载成功',
});
onLoad();
});
};
</script>
<style scoped lang="scss">
@ -831,4 +1001,14 @@ const handleAdd = () => {
.red {
color: #ff0000;
}
.carsLineName {
:deep(.el-text) {
margin-right: 0px !important;
}
}
.mr-10 {
margin-right: 10px;
}
</style>

557
src/views/distribution/artery/truckLoadingDetails.vue
Unescape View File

@ -5,37 +5,7 @@
<el-row v-if="!search">
<!-- 查询模块 -->
<el-form :inline="true" :model="query" class="el-fr-d">
<el-form-item label="网点:">
<el-input v-model="query.serviceNumber" placeholder="请选择网点" clearable></el-input>
</el-form-item>
<el-form-item label="承运时间:" class="el-times">
<el-date-picker
v-model="stockupDate"
type="daterange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
clearable
/>
</el-form-item>
<el-form-item label="发车时间:" class="el-times">
<el-date-picker
v-model="stockupDate"
type="daterange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
clearable
/>
</el-form-item>
<el-form-item label="创建时间:" class="el-times">
<el-form-item label="扫码时间:" class="el-times">
<el-date-picker
v-model="stockupDate"
type="daterange"
@ -48,7 +18,7 @@
/>
</el-form-item>
<el-form-item label="签收时间:" class="el-times">
<el-form-item label="卸车时间:" class="el-times">
<el-date-picker
v-model="stockupDate"
type="daterange"
@ -61,10 +31,6 @@
/>
</el-form-item>
<el-form-item label="车次号:" class="el-times">
<el-input v-model="query.stockupArea" placeholder="请输入车次号"></el-input>
</el-form-item>
<!-- 查询按钮 -->
<el-form-item class="el-btn">
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
@ -78,18 +44,12 @@
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button type="primary" icon="Plus" @click="handleShowTransfer('add')"
>新增中转
<el-button type="primary" icon="Edit" @click="handleShowTransfer('add')"
>计划仓更改
</el-button>
<el-button type="primary" icon="Printer" @click="searchReset()">装载清单</el-button>
<el-button type="primary" icon="Printer" @click="searchReset()"
>装载卸车清单(财务)</el-button
>
<el-button type="primary" icon="Van" @click="searchReset()">发 车</el-button>
<el-button type="primary" icon="Delete" @click="searchReset()">取消发车</el-button>
<el-button type="primary" icon="Delete" @click="searchReset()">取消装车</el-button>
<el-button type="primary" icon="CircleCheck" @click="searchReset()">到 达</el-button>
<el-button type="primary" icon="Edit" @click="searchReset()">修 改</el-button>
<el-button type="primary" icon="List" @click="searchReset()">批量卸车</el-button>
<el-button type="primary" icon="Delete" @click="searchReset()">删除</el-button>
<el-button type="primary" icon="Printer" @click="searchReset()">二维码</el-button>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
@ -104,7 +64,7 @@
<el-row>
<!-- 列表模块 -->
<tablecmt
:columnList="details.columnList"
:columnList="details.detailsColumnList"
:tableData="data"
:loading="loadingObj.list"
@inputTxt="inputsc"
@ -113,35 +73,10 @@
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '批次号'">
<el-text>123</el-text>
</template>
<template v-if="slotProps.scope.column.label === '操作'">
<el-button type="text" @click="handleShowzeroAdditionalRecording(slotProps.scope)">
删除
</el-button>
<el-button type="text" @click="handleShowzeroAdditionalRecording(slotProps.scope)">
文员签收
</el-button>
<el-button type="text" @click="handleShowzeroAdditionalRecording(slotProps.scope)">
结算
</el-button>
<el-button type="text" @click="handleShowTruckLoadingDetails(slotProps.scope)"
>装车明细</el-button
>
</template>
</template>
<template #default="slotProps"> </template>
</tablecmt>
</el-row>
<!-- 统计 -->
<el-row>
<div>选择数: , 运单数: , 件数: , 重量: , 体积: , 提货费: ,</div>
<div>总计: 总数: , 运单数: , 件数: , 重量: , 体积: , 提货费: ,</div>
</el-row>
<!-- 分页模块 -->
<el-row class="el-fy">
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
@ -164,372 +99,6 @@
</div>
</basic-container>
<!-- 编辑弹窗 -->
<el-dialog
title="装车明细"
v-model="details.popUpShow.truckLoadingDetailVisited"
width="80%"
:before-close="beforeClose"
append-to-body
class="truckLoadingDetailPopUp"
>
<el-form :inline="true" :model="query" class="el-fr-d">
<div class="fo-fl">
<el-form-item label="扫码时间:" class="el-times">
<!-- <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
<el-date-picker
v-model="stockupDate"
type="daterange"
unlink-panels
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
clearable
/>
</el-form-item>
<el-form-item label="卸车时间:" class="el-times">
<!-- <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
<el-date-picker
v-model="stockupDate"
type="daterange"
unlink-panels
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
clearable
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Edit" @click="searchChange">中转批量签收</el-button>
<el-button type="primary" icon="el-icon-search" @click="searchReset()">搜 索</el-button>
<el-button icon="el-icon-printer" @click="searchReset()">二维码</el-button>
<el-button
icon="Operation"
@click="showdrawer(true, 'truckLoadingDetail')"
circle
></el-button>
</el-form-item>
</div>
</el-form>
<tablecmt
:columnList="details.detailsColumnList"
:tableData="data"
:loading="loadingObj.list"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps"> </template>
</tablecmt>
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="trickleLoadingPage.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="trickleLoadingPage.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="trickleLoadingPage.total"
>
</el-pagination>
</el-dialog>
<!-- 创建 && 编辑 中转 -->
<el-dialog
title="新增中转"
v-model="details.popUpShow.transferVisited"
width="80%"
:before-close="beforeClose"
append-to-body
class="transferPopUp"
>
<el-form :inline="true" label-width="100px" :model="query" class="el-fr-d">
<div class="fo-fl">
<el-form-item label="中转承运商">
<el-select
teleported="true"
v-model="query.value"
class="m-2"
placeholder="Select"
size="default"
>
<el-option
v-for="item in details.options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="经办人">
<el-select v-model="query.value" class="m-2" placeholder="Select" size="default">
<el-option
v-for="item in details.options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="送货方式">
<el-select v-model="query.value" class="m-2" placeholder="Select" size="default">
<el-option
v-for="item in details.options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="付款方式">
<el-select v-model="query.value" class="m-2" placeholder="Select" size="default">
<el-option
v-for="item in details.options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="运费分摊方式">
<el-select v-model="query.value" class="m-2" placeholder="Select" size="default">
<el-option
v-for="item in details.options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="送货司机">
<el-select v-model="query.value" class="m-2" placeholder="Select" size="default">
<el-option
v-for="item in details.options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="客户类型">
<el-select v-model="query.value" class="m-2" placeholder="Select" size="default">
<el-option
v-for="item in details.options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否结算">
<el-select v-model="query.value" class="m-2" placeholder="Select" size="default">
<el-option
v-for="item in details.options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="代收贷款">
<el-input-number :precision="2" :step="1" controls-position="right" />
</el-form-item>
<el-form-item label="承运单号">
<el-input />
</el-form-item>
<el-form-item label="承运时间">
<el-date-picker
v-model="query.value1"
type="date"
placeholder="承运时间"
size="default"
/>
</el-form-item>
<el-form-item label="客户收货时间">
<el-date-picker
v-model="query.value1"
type="date"
placeholder="客户收货时间"
size="default"
/>
</el-form-item>
<el-form-item label="运费">
<el-input-number :precision="2" :step="1" controls-position="right" />
</el-form-item>
<el-form-item label="司机结算费">
<el-input-number :precision="2" :step="1" controls-position="right" />
</el-form-item>
</div>
<div style="width: 100%">
<el-form-item label="备注"> <el-input type="textarea" placeholder="备注" /></el-form-item>
</div>
</el-form>
<div class="add_row">
<!-- 列表模块 -->
<div style="width: 47%">
<div class="add_row_title">运单池</div>
<div v-if="!search">
<el-form :inline="true" label-width="80px" :model="details.oldQuery" class="el-fr-d">
<div class="fo-fl">
<el-form-item label="备注" class="el-times">
<el-input></el-input>
</el-form-item>
<el-form-item label="托盘码" class="el-times">
<el-input></el-input>
</el-form-item>
<el-form-item class="el-times">
<el-date-picker
v-model="stockupDate"
type="daterange"
unlink-panels
range-separator="-"
start-placeholder="开单日期"
end-placeholder="开单日期"
:shortcuts="shortcuts"
clearable
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchReset()"
>搜 索</el-button
>
<el-button icon="el-icon-delete" @click="searchReset()">重置</el-button>
</el-form-item>
</div>
</el-form>
</div>
<div style="margin-bottom: 10px" class="flex-c-sb">
<!-- 控件 -->
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true, 1)" circle></el-button>
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
<el-button type="text" style="cursor: pointer" @click="handleAddWaybill">
加入调度池
<el-icon><CaretRight /></el-icon>
</el-button>
</div>
<tablecmt
:columnList="details.oldColumnList"
:tableData="details.oldData"
:loading="loadingObj.oldListLoading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
</tablecmt>
<!-- 统计行 -->
<div class="statistics_row">
<!-- <div>合计: 选择数: {{ addInfo.oldSelectionList.length }}，</div>
<div>件数: {{ selectionList.length }}，</div>
<div>重量: {{ selectionList.length }}，</div>
<div>体积: {{ selectionList.length }}</div> -->
</div>
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<!-- 分页模块 -->
<el-pagination
style="zoom: 0.9"
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="zeroAdditionalRecordingInfo.oldPage.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="zeroAdditionalRecordingInfo.oldPage.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="zeroAdditionalRecordingInfo.oldPage.total"
>
</el-pagination>
</div>
</div>
<!-- 列表模块 -->
<div style="width: 47%">
<div class="add_row_title">调度池</div>
<div v-if="!search">
<el-form :inline="true" label-width="80px" :model="details.newQuery" class="el-fr-d">
<div class="fo-fl">
<el-form-item label="备注" class="el-times">
<el-input></el-input>
</el-form-item>
<el-form-item label="托盘码" class="el-times">
<el-input></el-input>
</el-form-item>
<el-form-item class="el-times">
<el-date-picker
v-model="stockupDate"
type="daterange"
unlink-panels
range-separator="-"
start-placeholder="开单日期"
end-placeholder="开单日期"
:shortcuts="shortcuts"
clearable
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchReset()"
>搜 索</el-button
>
<el-button icon="el-icon-delete" @click="searchReset()">重置</el-button>
</el-form-item>
</div>
</el-form>
</div>
<div style="margin-bottom: 10px" class="flex-c-sb">
<el-button type="text" class="pointer" @click="handleRemoveWaybill">
<el-icon><CaretLeft /></el-icon>
移除调度池
</el-button>
<!-- 控件 -->
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true, 2)" circle></el-button>
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
</div>
<tablecmt
:columnList="details.newColumnList"
:tableData="details.newData"
:loading="loadingObj.newListLoading"
@inputTxt="newInputsc"
@timeCheck="newTimesc"
@btnCheck="newBtnsc"
@selectCheck="newSelectsc"
@selection="newSelectionChange"
>
</tablecmt>
<div class="statistics_row">
<!-- <div>合计: 选择数: {{ addInfo.oldSelectionList.length }}，</div>
<div>件数: {{ selectionList.length }}，</div>
<div>重量: {{ selectionList.length }}，</div>
<div>体积: {{ selectionList.length }}</div> -->
</div>
</div>
<!-- <el-button></el-button> -->
</div>
</el-dialog>
<!-- 列表配置显示 -->
<edittablehead
@setcolum="setnewcolum"
@ -547,12 +116,7 @@ import { mapGetters } from 'vuex';
/** 获取字典 */
import { getDictionaryBiz } from '@/api/system/dict';
import { downloadXls } from '@/utils/util';
import {
columnList,
detailsColumnList,
oldColumnList,
newColumnList,
} from '@/option/distribution/TripartiteTransfer';
import { detailsColumnList } from '@/option/distribution/TripartiteTransfer';
import { useRouter } from 'vue-router';
// 获取路由实例
@ -595,25 +159,14 @@ const details = reactive<any>({
],
/** 时间选择器数据 */
stockupDate: [],
/** 列表 */
columnList,
/** 装车明细表头信息 */
detailsColumnList,
/** 修改的列表信息 */
editColumnList: [],
/** 运单池 */
oldColumnList,
/** 调度池 */
newColumnList,
/** 列表数据 */
data: [{}],
newData: [],
oldData: [],
/** 页面loading */
loadingObj: {
/** 列表加载loading */
list: false,
oldListLoading: false,
},
/** 列表复选框选中的数据 */
selectionList: [],
@ -625,12 +178,6 @@ const details = reactive<any>({
pageSize: 30,
total: 0,
},
/** 装车明细分页参数 */
trickleLoadingPage: {
currentPage: 1,
pageSize: 30,
total: 0,
},
/** 弹出层显示 */
popUpShow: {
/** 装车详情 */
@ -641,16 +188,6 @@ const details = reactive<any>({
/** 列表Dom节点 */
listNode: '',
form: {},
/** 零担补录信息 */
zeroAdditionalRecordingInfo: {
oldPage: {
pageSize: 30,
currentPage: 1,
total: 0,
},
},
/** 无用 */
options: [],
});
const {
@ -664,8 +201,6 @@ const {
drawerShow,
page,
trickleLoadingPage,
zeroAdditionalRecordingInfo,
popUpShow,
} = toRefs(details);
/** vuex */
@ -679,6 +214,78 @@ onMounted(() => {
console.log('details.listNode :>> ', details.listNode);
clearTimeout(timer);
}, 100);
/**
* 初始化获取本地缓存的编辑隐藏的列表
* 固定搭配，不能更改
*/
let checkListnewarr = functions.getStorage(window.location.pathname + 'checkList');
let flexListnewarr = functions.getStorage(window.location.pathname + 'flexList');
let sortlistnewarr = functions.getStorage(window.location.pathname + 'sortlist');
if (checkListnewarr) {
details.columnList.map(item => {
item.head = false;
});
checkListnewarr.map(ite => {
details.columnList.map(item => {
if (ite == item.label) {
item.head = true;
}
});
});
} else {
let arr = [];
details.columnList.map(item => {
if (item.head) {
arr.push(item.label);
}
});
functions.setStorage(window.location.pathname + 'checkList', arr);
}
if (flexListnewarr) {
details.columnList.map(item => {
item.fixed = false;
});
flexListnewarr.map(ite => {
details.columnList.map(item => {
if (ite == item.label) {
if (item.type == 6) {
item.fixed = 'right';
} else {
item.fixed = true;
}
}
});
});
} else {
let arr = [];
details.columnList.map(item => {
if (item.fixed) {
arr.push(item.label);
}
});
functions.setStorage(window.location.pathname + 'flexList', arr);
}
if (sortlistnewarr) {
details.columnList.map(item => {
item.sortable = false;
});
sortlistnewarr.map(ite => {
details.columnList.map(item => {
if (ite == item.label) {
item.sortable = true;
}
});
});
} else {
let arr = [];
details.columnList.map(item => {
if (item.sortable) {
arr.push(item.label);
}
});
functions.setStorage(window.location.pathname + 'sortlist', arr);
}
});
/** 请求页面数据 */

4
src/views/distribution/deliverylist/distributionDeliveryListdis.vue
Unescape View File

@ -1153,6 +1153,7 @@ export default {
return;
}
this.isShow = true;
this.html = '';
const res = await printBatch({ ids: Array.from(this.selectionList).join(','), type: 1 });
console.log('res :>> ', res);
const {
@ -1160,7 +1161,6 @@ export default {
} = res;
if (code === 200) {
// 初始化打印页面
this.html = '';
data.forEach(item => {
this.html += item.templateHtml;
});
@ -1172,6 +1172,7 @@ export default {
*/
async printOrder(row) {
console.log('row :>> ', row);
this.html = '';
const res = await printBatch({ ids: row.id, type: 1 });
console.log('res :>> ', res);
const {
@ -1179,7 +1180,6 @@ export default {
} = res;
if (code === 200) {
// 初始化打印页面
this.html = '';
data.forEach(item => {
this.html += item.templateHtml;
});

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

@ -2828,10 +2828,10 @@ export default {
let qr = {
ids: row.id,
};
this.html = '';
showOrderPackgeCode(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);
});

4
src/views/distribution/deliverylist/distributionDeliveryListmar.vue
Unescape View File

@ -1071,6 +1071,7 @@ export default {
return;
}
this.isShow = true;
this.html = '';
const res = await printBatch({ ids: Array.from(this.selectionList).join(','), type: 2 });
console.log('res :>> ', res);
const {
@ -1078,7 +1079,6 @@ export default {
} = res;
if (code === 200) {
// 初始化打印页面
this.html = '';
data.forEach(item => {
this.html += item.templateHtml;
});
@ -1090,6 +1090,7 @@ export default {
*/
async printOrder(row) {
console.log('row :>> ', row);
this.html = '';
const res = await printBatch({ ids: row.id, type: 2 });
console.log('res :>> ', res);
const {
@ -1097,7 +1098,6 @@ export default {
} = res;
if (code === 200) {
// 初始化打印页面
this.html = '';
data.forEach(item => {
this.html += item.templateHtml;
});

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

@ -1248,10 +1248,10 @@ export default {
ids: checkcode.join(','),
// qrCodes: checkcode.join(','),
};
this.html = '';
showOrderPackgeCode(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);
});
@ -1267,11 +1267,11 @@ export default {
let qr = {
ids: row.id,
};
this.html = '';
showOrderPackgeCode(qr).then(res => {
// this.orderPackageCode = res.data
// console.log(res.data);
console.log('res :>> ', res);
this.html = '';
this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
this.dialogVisible = true;
});

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

@ -1064,6 +1064,7 @@ export default {
// 预览页面
async handlePreview(row){
console.log('row :>> ', row);
this.html = '';
const res = await printBatch({ ids: row.id, type: 3 });
console.log('res :>> ', res);
const {
@ -1071,7 +1072,6 @@ export default {
} = res;
if (code === 200) {
// 初始化打印页面
this.html = '';
data.forEach(item => {
this.html += item.templateHtml;
});

4
src/views/distribution/reservation/reservation.vue
Unescape View File

@ -1599,12 +1599,12 @@ export default {
return;
}
const ids = this.selectionList.map(item => item.id);
this.html = '';
const res = await this.batchPrint(ids);
const { code, data } = res.data;
if (code === 200) {
this.dialogVisible = true;
console.log('data :>> ', data);
this.html = '';
data.forEach(item => {
return (this.html += item.templateHtml);
});
@ -1616,12 +1616,12 @@ export default {
* 单独打印
*/
async printData(rowData) {
this.html = '';
const res = await this.batchPrint([rowData.row.id]);
const { code, data } = res.data;
if (code === 200) {
this.dialogVisible = true;
console.log('data :>> ', data);
this.html = '';
data.forEach(item => {
return (this.html += item.templateHtml);
});

8
src/views/distribution/stockup/distributionStockupDetails.vue
Unescape View File

@ -979,10 +979,10 @@ export default {
ids: checkcode.join(','),
type: "2"
};
this.html=''
getPrintDetail(qr).then( res =>{
console.log(",./");
this.dialogVisible = true;
this.html=''
this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
})
}else if(type== '2'){
@ -999,10 +999,10 @@ export default {
};
console.log("><><>>",qr);
//库存品订单批量
this.html=''
getPrintDetail(qr).then( res =>{
// console.log(",./");
this.dialogVisible = true;
this.html=''
this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
})
@ -1013,10 +1013,10 @@ export default {
handlePrintDetail(row){
console.log("单个答应》》》",row);
row.type = "1";
this.html=''
getPrintDetail(row).then( res =>{
console.log(",./");
this.dialogVisible = true;
this.html=''
this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
})
@ -1164,10 +1164,10 @@ export default {
let qr = {
ids: row.id,
};
this.html=''
showOrderPackgeCode(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)
});

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

@ -1348,10 +1348,10 @@ export default {
ids: checkcode.join(','),
type: '2',
};
this.html = '';
getPrintDetail(qr).then(res => {
console.log(',./');
this.dialogVisible = true;
this.html = '';
this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
} else if (type == '2') {
@ -1367,11 +1367,11 @@ export default {
type: '3',
};
console.log('><><>>', qr);
this.html = '';
//库存品订单批量
getPrintDetail(qr).then(res => {
// console.log(",./");
this.dialogVisible = true;
this.html = '';
this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
}
@ -1395,10 +1395,10 @@ export default {
ids: checkcode.join(','),
type: '2',
};
this.html = '';
getPrintDetail(qr).then(res => {
console.log(',./');
this.dialogVisible = true;
this.html = '';
this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
} else if (type == '2') {
@ -1436,11 +1436,11 @@ export default {
//单独打印
handlePrintDetail(row) {
console.log('单个答应》》》', row);
this.html = '';
row.type = '1';
getPrintDetail(row).then(res => {
console.log(',./');
this.dialogVisible = true;
this.html = '';
this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
},
@ -1490,10 +1490,10 @@ export default {
let qr = {
ids: row.id,
};
this.html = '';
showOrderPackgeCode(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);
});

4
src/views/mail/reservation/list.vue
Unescape View File

@ -1446,12 +1446,12 @@ export default {
return;
}
const ids = this.selectionList.map(item => item.id);
this.html = '';
const res = await this.batchPrint(ids);
const { code, data } = res.data;
if (code === 200) {
this.dialogVisible = true;
console.log('data :>> ', data);
this.html = '';
data.forEach(item => {
return (this.html += item.templateHtml);
});
@ -1463,12 +1463,12 @@ export default {
* 单独打印
*/
async printData(rowData) {
this.html = '';
const res = await this.batchPrint([rowData.row.id]);
const { code, data } = res.data;
if (code === 200) {
this.dialogVisible = true;
console.log('data :>> ', data);
this.html = '';
data.forEach(item => {
return (this.html += item.templateHtml);
});

4
src/views/waybill/TemporaryStorageList.vue
Unescape View File

@ -601,11 +601,11 @@ const printOrder = ({ row }) => {
let qr = {
ids: row.id,
};
html.value = '';
showOrderPackgeCode(qr).then(res => {
// this.orderPackageCode = res.data
if (res.data.code !== 200) return;
console.log(res.data);
html.value = '';
html.value = getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
};
@ -615,11 +615,11 @@ const batchPrintOrder = ({ row }) => {
let qr = {
ids: row.id,
};
html.value = '';
showOrderPackgeCode(qr).then(res => {
// this.orderPackageCode = res.data
if (res.data.code !== 200) return;
console.log(res.data);
html.value = '';
html.value = getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
};

9
src/views/waybill/orderPackageList.vue
Unescape View File

@ -468,6 +468,7 @@ const details = reactive<any>({
/** 列表Dom节点 */
listNode: '',
form: {},
html: '',
});
const {
@ -716,12 +717,12 @@ const printOrder = ({ row }) => {
let qr = {
ids: row.id,
};
details.html = '';
showOrderPackgeCode(qr).then(res => {
// this.orderPackageCode = res.data
if (res.data.code !== 200) return;
console.log(res.data);
this.html = '';
this.html = getHtmls(res.data.data.dataList, res.data.data.templateHtml);
details.html = getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
};
@ -734,8 +735,8 @@ const batchPrintOrder = ({ row }) => {
// this.orderPackageCode = res.data
if (res.data.code !== 200) return;
console.log(res.data);
this.html = '';
this.html = getHtmls(res.data.data.dataList, res.data.data.templateHtml);
details.html = '';
details.html = getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
};

8
src/views/waybill/orderPackageListDetails.vue
Unescape View File

@ -697,8 +697,8 @@ const printOrder = ({ row }) => {
// this.orderPackageCode = res.data
if (res.data.code !== 200) return;
console.log(res.data);
this.html = '';
this.html = getHtmls(res.data.data.dataList, res.data.data.templateHtml);
details.html = '';
details.html = getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
};
@ -711,8 +711,8 @@ const batchPrintOrder = ({ row }) => {
// this.orderPackageCode = res.data
if (res.data.code !== 200) return;
console.log(res.data);
this.html = '';
this.html = getHtmls(res.data.data.dataList, res.data.data.templateHtml);
details.html = '';
details.html = getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
};

Write Preview
Loading…
Cancel
Save