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

删除预约时的打印功能

fix_bug_pro20231227
qb 2 years ago
parent
a9cb2a589d
commit
5e058498e9
2 changed files with 159 additions and 151 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. 7
      src/views/distribution/reservation/reservation.vue
  2. 303
      src/views/distribution/signfor/distributionSignforedt.vue

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

@ -66,13 +66,6 @@
plain
>批量转配送
</el-button>
<el-button
type="danger"
icon="el-icon-delete"
@click="batchPrintData"
plain
>批量打印
</el-button>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">

303
src/views/distribution/signfor/distributionSignforedt.vue
Unescape View File

@ -1,129 +1,146 @@
<template>
<basic-container>
<div class="avue-crud">
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<span style="padding-left: 10%">当前签收单状态>>>>>>>>> {{signfordata.signingStatusAll}}</span>
</el-col>
</el-row>
<el-divider>基本信息</el-divider>
<el-row :gutter="24" class="rows">
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>预约单号：{{signfordata.reservationCode}} </span>
</el-col>
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>商场名称：{{signfordata.mallName}} </span>
</el-col>
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>预约时间：{{signfordata.reservationDate}} </span>
</el-col>
<!-- <el-col :xl="3" :lg="7" :md="8" :sm="24">-->
<!-- <span>配送车次：{{signfordata.deliveryType}}</span>-->
<!-- </el-col>-->
<!-- <el-col :xl="3" :lg="7" :md="8" :sm="24">-->
<!-- <span>服务类型：{{signfordata.deliveryType}}</span>-->
<!-- </el-col>-->
</el-row>
<el-divider>配送信息</el-divider>
<el-row :gutter="24" class="rows">
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>配送车次：{{signfordata.trainNumber}} </span>
</el-col>
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>配送司机：{{signfordata.driverName}} </span>
</el-col>
<el-col :xl="4" :lg="7" :md="8" :sm="24">
<span>配送车辆：{{signfordata.vehicleName}} </span>
</el-col>
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>装车班组：{{signfordata.loadingTeamName}} </span>
</el-col>
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>卸车班组：{{signfordata.unLoadingTeamName}} </span>
</el-col>
<!-- <el-col :xl="3" :lg="7" :md="8" :sm="24">-->
<!-- <span>配送车次：{{signfordata.deliveryType}}</span>-->
<!-- </el-col>-->
<!-- <el-col :xl="3" :lg="7" :md="8" :sm="24">-->
<!-- <span>服务类型：{{signfordata.deliveryType}}</span>-->
<!-- </el-col>-->
</el-row>
<el-divider>收货人信息</el-divider>
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="10" :sm="24">
<span>收货人：{{signfordata.consignee}} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="10" :sm="24">
<span>手机号码：{{signfordata.deliveryPhone}} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="10" :sm="24">
<span>收货地址：{{signfordata.deliveryAddress}} </span>
</el-col>
</el-row>
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="10" :sm="24">
<span>是否加急：{{signfordata.isUrgent}} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="10" :sm="24">
<span>客户备注：{{signfordata.remarks}} </span>
</el-col>
</el-row>
<el-dialog
v-model="fbox"
title="增值服务"
width="30%"
>
<!-- :before-close="handleClose"-->
<el-form-item label="增值服务" prop="freightMark">
<el-checkbox-group v-model="form.addvalueType" @change="handleCheckedCitiesChange">
<el-checkbox style="width: 100%;margin-bottom: 3%;"
:disabled="true"
v-for="(item,index) in addvalueServeTypeData"
:key="item.dictKey"
:label="item.dictKey"
>{{item.dictValue}}
<span v-if="index===0||index===6||index===2||index===4">&nbsp;件数:
<el-input v-model="item.f"
:disabled="true"
style="width: 10%;border:none; border-bottom:2px solid #eee;"/>
</span>
<span v-if="index===1">公里:
<el-input v-model="item.a"
:disabled="true"
style="width: 10%;border:none; border-bottom:2px solid #eee;"/>
</span>
<span v-if="index===3">距离:
<el-input v-model="item.b"
:disabled="true"
style="width: 10%;border:none; border-bottom:2px solid #eee;"/>
</span>
<span v-if="index===5">人数:
<el-input v-model="item.c"
:disabled="true"
style="width: 10%;border:none; border-bottom:2px solid #eee;"/>
</span>
<span v-if="index===0">楼层:
<el-input v-model="item.d"
:disabled="true"
style="width: 10%;border:none; border-bottom:2px solid #eee;"/>
</span>
<span v-if="item">预计费用:
<el-input v-model="item.e"
:disabled="true"
style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
</span>
</el-checkbox>
</el-checkbox-group>
</el-form-item>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogVisible = false">关闭</el-button>
<!-- <el-button type="primary" @click="dialogVisible = false">-->
<!-- 确定(增值服务)-->
<!-- </el-button>-->
</span>
</template>
</el-dialog>
<basic-container>
<div class="avue-crud">
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<span style="padding-left: 10%"
>当前签收单状态>>>>>>>>> {{ signfordata.signingStatusAll }}</span
>
</el-col>
</el-row>
<el-divider>基本信息</el-divider>
<el-row :gutter="24" class="rows">
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>预约单号：{{ signfordata.reservationCode }} </span>
</el-col>
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>商场名称：{{ signfordata.mallName }} </span>
</el-col>
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>预约时间：{{ signfordata.reservationDate }} </span>
</el-col>
<!-- <el-col :xl="3" :lg="7" :md="8" :sm="24">-->
<!-- <span>配送车次：{{signfordata.deliveryType}}</span>-->
<!-- </el-col>-->
<!-- <el-col :xl="3" :lg="7" :md="8" :sm="24">-->
<!-- <span>服务类型：{{signfordata.deliveryType}}</span>-->
<!-- </el-col>-->
</el-row>
<el-divider>配送信息</el-divider>
<el-row :gutter="24" class="rows">
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>配送车次：{{ signfordata.trainNumber }} </span>
</el-col>
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>配送司机：{{ signfordata.driverName }} </span>
</el-col>
<el-col :xl="4" :lg="7" :md="8" :sm="24">
<span>配送车辆：{{ signfordata.vehicleName }} </span>
</el-col>
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>装车班组：{{ signfordata.loadingTeamName }} </span>
</el-col>
<el-col :xl="5" :lg="7" :md="8" :sm="24">
<span>卸车班组：{{ signfordata.unLoadingTeamName }} </span>
</el-col>
<!-- <el-col :xl="3" :lg="7" :md="8" :sm="24">-->
<!-- <span>配送车次：{{signfordata.deliveryType}}</span>-->
<!-- </el-col>-->
<!-- <el-col :xl="3" :lg="7" :md="8" :sm="24">-->
<!-- <span>服务类型：{{signfordata.deliveryType}}</span>-->
<!-- </el-col>-->
</el-row>
<el-divider>收货人信息</el-divider>
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="10" :sm="24">
<span>收货人：{{ signfordata.consignee }} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="10" :sm="24">
<span>手机号码：{{ signfordata.deliveryPhone }} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="10" :sm="24">
<span>收货地址：{{ signfordata.deliveryAddress }} </span>
</el-col>
</el-row>
<el-row :gutter="24" class="rows">
<el-col :xl="7" :lg="7" :md="10" :sm="24">
<span>是否加急：{{ signfordata.isUrgent }} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="10" :sm="24">
<span>客户备注：{{ signfordata.remarks }} </span>
</el-col>
</el-row>
<el-dialog v-model="fbox" title="增值服务" width="30%">
<!-- :before-close="handleClose"-->
<el-form-item label="增值服务" prop="freightMark">
<el-checkbox-group v-model="form.addvalueType" @change="handleCheckedCitiesChange">
<el-checkbox
style="width: 100%; margin-bottom: 3%"
:disabled="true"
v-for="(item, index) in addvalueServeTypeData"
:key="item.dictKey"
:label="item.dictKey"
>{{ item.dictValue }}
<span v-if="index === 0 || index === 6 || index === 2 || index === 4"
>&nbsp;件数:
<el-input
v-model="item.f"
:disabled="true"
style="width: 10%; border: none; border-bottom: 2px solid #eee"
/>
</span>
<span v-if="index === 1"
>公里:
<el-input
v-model="item.a"
:disabled="true"
style="width: 10%; border: none; border-bottom: 2px solid #eee"
/>
</span>
<span v-if="index === 3"
>距离:
<el-input
v-model="item.b"
:disabled="true"
style="width: 10%; border: none; border-bottom: 2px solid #eee"
/>
</span>
<span v-if="index === 5"
>人数:
<el-input
v-model="item.c"
:disabled="true"
style="width: 10%; border: none; border-bottom: 2px solid #eee"
/>
</span>
<span v-if="index === 0"
>楼层:
<el-input
v-model="item.d"
:disabled="true"
style="width: 10%; border: none; border-bottom: 2px solid #eee"
/>
</span>
<span v-if="item"
>预计费用:
<el-input
v-model="item.e"
:disabled="true"
style="width: 20%; border: none; border-bottom: 2px solid #eee"
/>
</span>
</el-checkbox>
</el-checkbox-group>
</el-form-item>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogVisible = false">关闭</el-button>
<!-- <el-button type="primary" @click="dialogVisible = false">-->
<!-- 确定(增值服务)-->
<!-- </el-button>-->
</span>
</template>
</el-dialog>
<!-- <el-dialog :title="title"-->
<!-- v-model="fbox"-->
@ -1621,7 +1638,7 @@ export default {
if (data.orderInfo) {
this.orderData = data.orderInfo;
}
console.log("data111>>>>>>",data)
console.log('data111>>>>>>', data);
this.stepActive = this.stepsList.findIndex(item => item.title === data.signingStatusAll);
this.signfordata = data;
this.signfordata.address = 'aa';
@ -1629,26 +1646,24 @@ export default {
// this.getListOrders(this.page)
this.getListPackage();
});
// this.getListOrders(this.page)
// this.getListOrders(this.page)
});
this.getListPackage();
let a = {
signforId:id,
addvalueId:1
this.getListPackage();
let a = {
signforId: id,
addvalueId: 1,
};
addvalueInfoList(a).then(res => {
console.log('res------------->', res.data.data);
const data = res.data.data;
if (data === null) {
this.addvalueData = [];
this.addvalueinfo = {};
} else {
this.addvalueinfo = data;
this.addvalueData = data.packageEntityList;
}
addvalueInfoList(a).then(res=>{
console.log("res------------->",res.data.data);
const data = res.data.data;
if (data === null){
this.addvalueData = [];
this.addvalueinfo = { };
}else {
this.addvalueinfo = data;
this.addvalueData = data.packageEntityList;
}
})
});
this.loading = false;
},

Write Preview
Loading…
Cancel
Save