|
|
|
@ -33,96 +33,153 @@
|
|
|
|
|
<span>收货地址:{{signfordata.deliveryAddress}} </span> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
<el-dialog :title="title" |
|
|
|
|
v-model="fbox" |
|
|
|
|
width="50%" |
|
|
|
|
:before-close="beforeClose" |
|
|
|
|
append-to-body> |
|
|
|
|
<div class="topbox"> |
|
|
|
|
<div class="titlxbx"> |
|
|
|
|
<div> |
|
|
|
|
<div>上楼</div> |
|
|
|
|
<div>2178501088045989849</div> |
|
|
|
|
</div> |
|
|
|
|
<div> |
|
|
|
|
<div>货物件数:</div> |
|
|
|
|
<div>预估费用:500.00</div> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="titlxbx"> |
|
|
|
|
<div> |
|
|
|
|
<div>超区</div> |
|
|
|
|
<div>超区公里:10KM</div> |
|
|
|
|
</div> |
|
|
|
|
<div> |
|
|
|
|
<div></div> |
|
|
|
|
<div>预估费用:500.00</div> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="titlxbx"> |
|
|
|
|
<div> |
|
|
|
|
<div>拆样</div> |
|
|
|
|
<div>货物件数:10件</div> |
|
|
|
|
</div> |
|
|
|
|
<div> |
|
|
|
|
<div></div> |
|
|
|
|
<div>预估费用:500.00</div> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="titlxbx"> |
|
|
|
|
<div> |
|
|
|
|
<div>返货</div> |
|
|
|
|
<div>货物件数:10件</div> |
|
|
|
|
</div> |
|
|
|
|
<div> |
|
|
|
|
<div></div> |
|
|
|
|
<div>预估费用:500.00</div> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="titlxbx"> |
|
|
|
|
<div> |
|
|
|
|
<div>搬运</div> |
|
|
|
|
<div>人员:张三,李四</div> |
|
|
|
|
</div> |
|
|
|
|
<div> |
|
|
|
|
<div></div> |
|
|
|
|
<div></div> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
<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"> 件数: |
|
|
|
|
<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> |
|
|
|
|
|
|
|
|
|
<div class="titlxbx"> |
|
|
|
|
<div> |
|
|
|
|
<div>返货</div> |
|
|
|
|
<div>货物件数:10件</div> |
|
|
|
|
</div> |
|
|
|
|
<div> |
|
|
|
|
<div></div> |
|
|
|
|
<div>预估费用:500.00</div> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
<!-- <el-dialog :title="title"--> |
|
|
|
|
<!-- v-model="fbox"--> |
|
|
|
|
<!-- width="50%"--> |
|
|
|
|
<!-- :before-close="beforeClose"--> |
|
|
|
|
<!-- append-to-body>--> |
|
|
|
|
<!-- <div class="topbox">--> |
|
|
|
|
<!-- <div class="titlxbx">--> |
|
|
|
|
<!-- <div>--> |
|
|
|
|
<!-- <div>上楼</div>--> |
|
|
|
|
<!-- <div>2178501088045989849</div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- <div>--> |
|
|
|
|
<!-- <div>货物件数:</div>--> |
|
|
|
|
<!-- <div>预估费用:500.00</div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- <div class="titlxbx">--> |
|
|
|
|
<!-- <div>--> |
|
|
|
|
<!-- <div>超区</div>--> |
|
|
|
|
<!-- <div>超区公里:10KM</div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- <div>--> |
|
|
|
|
<!-- <div></div>--> |
|
|
|
|
<!-- <div>预估费用:500.00</div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- <div class="titlxbx">--> |
|
|
|
|
<!-- <div>--> |
|
|
|
|
<!-- <div>拆样</div>--> |
|
|
|
|
<!-- <div>货物件数:10件</div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- <div>--> |
|
|
|
|
<!-- <div></div>--> |
|
|
|
|
<!-- <div>预估费用:500.00</div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- <div class="titlxbx">--> |
|
|
|
|
<!-- <div>--> |
|
|
|
|
<!-- <div>返货</div>--> |
|
|
|
|
<!-- <div>货物件数:10件</div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- <div>--> |
|
|
|
|
<!-- <div></div>--> |
|
|
|
|
<!-- <div>预估费用:500.00</div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- <div class="titlxbx">--> |
|
|
|
|
<!-- <div>--> |
|
|
|
|
<!-- <div>搬运</div>--> |
|
|
|
|
<!-- <div>人员:张三,李四</div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- <div>--> |
|
|
|
|
<!-- <div></div>--> |
|
|
|
|
<!-- <div></div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
|
|
|
|
|
<div class="titlxbx"> |
|
|
|
|
<div> |
|
|
|
|
<div>到付运费</div> |
|
|
|
|
<div></div> |
|
|
|
|
</div> |
|
|
|
|
<div> |
|
|
|
|
<div></div> |
|
|
|
|
<div>费用:500.00</div> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="titlxbx"> |
|
|
|
|
<div> |
|
|
|
|
<div>代收货款</div> |
|
|
|
|
<div></div> |
|
|
|
|
</div> |
|
|
|
|
<div> |
|
|
|
|
<div></div> |
|
|
|
|
<div>费用:500.00</div> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</el-dialog> |
|
|
|
|
<!-- <div class="titlxbx">--> |
|
|
|
|
<!-- <div>--> |
|
|
|
|
<!-- <div>返货</div>--> |
|
|
|
|
<!-- <div>货物件数:10件</div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- <div>--> |
|
|
|
|
<!-- <div></div>--> |
|
|
|
|
<!-- <div>预估费用:500.00</div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
|
|
|
|
|
<!-- <div class="titlxbx">--> |
|
|
|
|
<!-- <div>--> |
|
|
|
|
<!-- <div>到付运费</div>--> |
|
|
|
|
<!-- <div></div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- <div>--> |
|
|
|
|
<!-- <div></div>--> |
|
|
|
|
<!-- <div>费用:500.00</div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- <div class="titlxbx">--> |
|
|
|
|
<!-- <div>--> |
|
|
|
|
<!-- <div>代收货款</div>--> |
|
|
|
|
<!-- <div></div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- <div>--> |
|
|
|
|
<!-- <div></div>--> |
|
|
|
|
<!-- <div>费用:500.00</div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- </el-dialog>--> |
|
|
|
|
<el-divider>订单信息</el-divider> |
|
|
|
|
<tablecmt |
|
|
|
|
:columnList="columnList" |
|
|
|
@ -136,7 +193,7 @@
|
|
|
|
|
> |
|
|
|
|
<template #default="slotProps"> |
|
|
|
|
<el-button size="small" @click="editsolt(slotProps.scope)">查 看 包 条</el-button> |
|
|
|
|
<el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button> |
|
|
|
|
<el-button size="small" @click="checkAddValue(slotProps.scope)">费 用 增 项</el-button> |
|
|
|
|
</template> |
|
|
|
|
</tablecmt> |
|
|
|
|
<div class="avue-crud__pagination" style="width:100%"> |
|
|
|
@ -217,6 +274,7 @@ import { getList, getDetail, add, update, remove ,getDetailById,getListOrder} fr
|
|
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
import { getWrapdetail } from '@/api/distribution/distributionDeliveryList'; |
|
|
|
|
import { getStockAddValue } from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
|
data() { |
|
|
|
@ -435,6 +493,8 @@ export default {
|
|
|
|
|
// 选择行 |
|
|
|
|
selectionList: [], |
|
|
|
|
isLiabilityData: [], |
|
|
|
|
addvalueServeTypeData:[], |
|
|
|
|
dialogVisible:false, |
|
|
|
|
//状态列表 |
|
|
|
|
stateData: [], |
|
|
|
|
//包肩分页信息 |
|
|
|
@ -535,6 +595,7 @@ export default {
|
|
|
|
|
mounted() { |
|
|
|
|
this.init(); |
|
|
|
|
this.onLoad(); |
|
|
|
|
this.queryDictionary(); |
|
|
|
|
}, |
|
|
|
|
created() { |
|
|
|
|
// //查询字典 |
|
|
|
@ -555,6 +616,7 @@ export default {
|
|
|
|
|
rowUpdate() { |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
queryDictionary() { |
|
|
|
|
getDictionaryBiz('yes_no').then(res => { |
|
|
|
|
this.isLiabilityData = res.data.data; |
|
|
|
@ -562,11 +624,33 @@ export default {
|
|
|
|
|
getDictionaryBiz('basic_in_type').then(res => { |
|
|
|
|
this.inputTypeData = res.data.data; |
|
|
|
|
}); |
|
|
|
|
getDictionaryBiz('addvalue_serve_type').then(res => { |
|
|
|
|
this.addvalueServeTypeData = res.data.data; |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
//返回 |
|
|
|
|
handleViewpda() { |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
//增值服务 |
|
|
|
|
handleCheckedCitiesChange(value) { |
|
|
|
|
if (value) { |
|
|
|
|
this.form.addvalueType = value; |
|
|
|
|
} |
|
|
|
|
console.log('>>>>>', this.form); |
|
|
|
|
if (value.length < 1) { |
|
|
|
|
this.costList = []; |
|
|
|
|
this.costListName = []; |
|
|
|
|
} |
|
|
|
|
this.deliveryWayData.forEach(i => { |
|
|
|
|
if (value.includes(i.dictKey)) { |
|
|
|
|
console.log(i); |
|
|
|
|
i.pitch = true; |
|
|
|
|
this.costListName = value; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
init() { |
|
|
|
|
this.height = this.setPx(document.body.clientHeight - 340); |
|
|
|
@ -702,6 +786,55 @@ export default {
|
|
|
|
|
console.log("查看>>>>>>>",res.data.data); |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
//查看增值服务 |
|
|
|
|
checkAddValue(scope) { |
|
|
|
|
const { row } = scope; |
|
|
|
|
this.fbox =true; |
|
|
|
|
let id = row.id |
|
|
|
|
getStockAddValue(id).then(res=>{ |
|
|
|
|
let data= res.data.data.data; |
|
|
|
|
//存在多种增值服务项 |
|
|
|
|
let a=[]; |
|
|
|
|
data.forEach((item,index)=>{ |
|
|
|
|
if (item.addvalueId === "1" ){ |
|
|
|
|
this.addvalueServeTypeData[0].f = item.number; |
|
|
|
|
this.addvalueServeTypeData[0].e = item.fee; |
|
|
|
|
this.addvalueServeTypeData[0].d = item.floor; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (item.addvalueId === "2"){ |
|
|
|
|
this.addvalueServeTypeData[1].a = item.kilometer; |
|
|
|
|
this.addvalueServeTypeData[1].e = item.fee; |
|
|
|
|
} |
|
|
|
|
if (item.addvalueId === "3"){ |
|
|
|
|
this.addvalueServeTypeData[2].f = item.number; |
|
|
|
|
this.addvalueServeTypeData[2].e = item.fee; |
|
|
|
|
} |
|
|
|
|
if (item.addvalueId === "4"){ |
|
|
|
|
this.addvalueServeTypeData[3].b = item.distance; |
|
|
|
|
this.addvalueServeTypeData[3].e = item.fee; |
|
|
|
|
} |
|
|
|
|
if (item.addvalueId === "5"){ |
|
|
|
|
this.addvalueServeTypeData[4].f = item.number; |
|
|
|
|
this.addvalueServeTypeData[4].e = item.fee; |
|
|
|
|
} |
|
|
|
|
if (item.addvalueId === "6"){ |
|
|
|
|
this.addvalueServeTypeData[5].c = item.peopleNum; |
|
|
|
|
this.addvalueServeTypeData[5].e = item.fee; |
|
|
|
|
} |
|
|
|
|
if (item.addvalueId === "7"){ |
|
|
|
|
this.addvalueServeTypeData[6].f = item.number; |
|
|
|
|
this.addvalueServeTypeData[6].e = item.fee; |
|
|
|
|
} |
|
|
|
|
a.push(item.addvalueId); |
|
|
|
|
console.log("<<<<<<<<<<",a); |
|
|
|
|
|
|
|
|
|
}) |
|
|
|
|
this.form.addvalueType=a; |
|
|
|
|
|
|
|
|
|
console.log(">>>>>>>>>>>>>>>>>>>>>>>>>",res); |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
handleDelete() { |
|
|
|
|
if (this.selectionList.length === 0) { |
|
|
|
|
this.$message.warning('请选择至少一条数据'); |
|
|
|
|