Browse Source

删除预约时的打印功能

fix_bug_pro20231227
qb 2 years ago
parent
commit
5e058498e9
  1. 7
      src/views/distribution/reservation/reservation.vue
  2. 303
      src/views/distribution/signfor/distributionSignforedt.vue

7
src/views/distribution/reservation/reservation.vue

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

303
src/views/distribution/signfor/distributionSignforedt.vue

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

Loading…
Cancel
Save