|
|
|
|
@ -32,15 +32,15 @@
|
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
<el-divider>订单列表</el-divider> |
|
|
|
|
<el-row> |
|
|
|
|
<div class="avue-crud__header"> |
|
|
|
|
<!-- 头部左侧按钮模块 --> |
|
|
|
|
<div class="avue-crud__left"> |
|
|
|
|
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button> |
|
|
|
|
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</el-row> |
|
|
|
|
<!-- <el-row>--> |
|
|
|
|
<!-- <div class="avue-crud__header">--> |
|
|
|
|
<!-- <!– 头部左侧按钮模块 –>--> |
|
|
|
|
<!-- <div class="avue-crud__left">--> |
|
|
|
|
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>--> |
|
|
|
|
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- </el-row>--> |
|
|
|
|
<el-row> |
|
|
|
|
<!-- 列表模块 --> |
|
|
|
|
<el-table ref="table" v-loading="loading" |
|
|
|
|
@ -49,10 +49,7 @@
|
|
|
|
|
:height="height" |
|
|
|
|
style="width: 100%" |
|
|
|
|
:border="option.border"> |
|
|
|
|
<el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column> |
|
|
|
|
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column> |
|
|
|
|
<el-table-column v-if="option.index" label="序号" type="index" width="80" align="center"> |
|
|
|
|
</el-table-column> |
|
|
|
|
<template v-for="(item,index) in option.column"> |
|
|
|
|
<!-- table字段 --> |
|
|
|
|
<el-table-column v-if="item.hide!==true" |
|
|
|
|
@ -67,8 +64,6 @@
|
|
|
|
|
<el-table-column prop="menu" label="操作" :width="220" align="center"> |
|
|
|
|
<template #="{row}"> |
|
|
|
|
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button> |
|
|
|
|
<el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)" v-if="!this.edt">编辑</el-button> |
|
|
|
|
<el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)" v-if="!this.edt">删除</el-button> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
</el-table> |
|
|
|
|
@ -76,16 +71,16 @@
|
|
|
|
|
<el-row> |
|
|
|
|
<div class="avue-crud__pagination" style="width:100%"> |
|
|
|
|
<!-- 分页模块 --> |
|
|
|
|
<el-pagination align="right" |
|
|
|
|
background |
|
|
|
|
@size-change="sizeChange" |
|
|
|
|
@current-change="currentChange" |
|
|
|
|
:current-page="page.currentPage" |
|
|
|
|
:page-sizes="[10, 20, 30, 40, 50, 100]" |
|
|
|
|
:page-size="page.pageSize" |
|
|
|
|
layout="total, sizes, prev, pager, next, jumper" |
|
|
|
|
:total="page.total"> |
|
|
|
|
</el-pagination> |
|
|
|
|
<!-- <el-pagination align="right"--> |
|
|
|
|
<!-- background--> |
|
|
|
|
<!-- @size-change="sizeChange"--> |
|
|
|
|
<!-- @current-change="currentChange"--> |
|
|
|
|
<!-- :current-page="page.currentPage"--> |
|
|
|
|
<!-- :page-sizes="[10, 20, 30, 40, 50, 100]"--> |
|
|
|
|
<!-- :page-size="page.pageSize"--> |
|
|
|
|
<!-- layout="total, sizes, prev, pager, next, jumper"--> |
|
|
|
|
<!-- :total="page.total">--> |
|
|
|
|
<!-- </el-pagination>--> |
|
|
|
|
</div> |
|
|
|
|
</el-row> |
|
|
|
|
<!-- 表单模块 --> |
|
|
|
|
@ -94,104 +89,24 @@
|
|
|
|
|
width="50%" |
|
|
|
|
:before-close="beforeClose" |
|
|
|
|
append-to-body> |
|
|
|
|
<el-form :disabled="view" :size="option.size" :rules="validatorRules" ref="form" :model="form" |
|
|
|
|
label-width="80px"> |
|
|
|
|
<!-- 表单字段 --> |
|
|
|
|
<!-- <el-form-item label="关联pdaid" prop="masterId">--> |
|
|
|
|
<!-- <el-input v-model="form.masterId" placeholder="请输入关联pdaid"/>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
|
|
|
|
|
<el-row> |
|
|
|
|
<el-col :span="11"> |
|
|
|
|
<el-form-item label="反馈日期" prop="feedbackTime" label-width="80px"> |
|
|
|
|
<el-date-picker v-model="form.feedbackTime" placeholder="请输入反馈日期" type="date" value-format="YYYY-MM-DD" |
|
|
|
|
style="position: absolute;right: 0px;width: 100%"></el-date-picker> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-form-item label="营业部" prop="businessDepartment" label-width="120px"> |
|
|
|
|
<el-input v-model="form.businessDepartment" placeholder="请输入营业部" |
|
|
|
|
style="position: absolute;right: 0px;width: 100%" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
|
|
|
|
|
<el-row> |
|
|
|
|
<el-col :span="11"> |
|
|
|
|
<el-form-item label="维修公司" prop="maintenanceCompany" label-width="80px"> |
|
|
|
|
<el-input v-model="form.maintenanceCompany" placeholder="请输入维修公司" |
|
|
|
|
style="position: absolute;right: 0px;width: 100%" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-form-item label="采买经销商" prop="dealer" label-width="120px"> |
|
|
|
|
<el-input v-model="form.dealer" placeholder="请输入采买经销商" |
|
|
|
|
style="position: absolute;right: 0px;width: 100%" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
|
|
|
|
|
<el-row> |
|
|
|
|
<el-col :span="11"> |
|
|
|
|
<el-form-item label="问题描述" prop="problemDescription" label-width="80px"> |
|
|
|
|
<el-input v-model="form.problemDescription" placeholder="请输入问题描述" |
|
|
|
|
style="position: absolute;right: 0px;width: 100%" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-form-item label="是否保修期" prop="isLiability" label-width="120px"> |
|
|
|
|
<el-select v-model="form.isLiability" clearable placeholder="是否保修期" |
|
|
|
|
style="position: absolute;right: 0px;width: 100%"> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in isLiabilityData" |
|
|
|
|
:key="item.dictKey" |
|
|
|
|
:label="item.dictValue" |
|
|
|
|
:value="item.dictKey"> |
|
|
|
|
</el-option> |
|
|
|
|
</el-select> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
|
|
|
|
|
<el-row> |
|
|
|
|
<el-col :span="11"> |
|
|
|
|
<el-form-item label="寄回日期" prop="returnDate" label-width="80px"> |
|
|
|
|
<el-date-picker v-model="form.returnDate" placeholder="请输入寄回日期" type="date" value-format="YYYY-MM-DD" |
|
|
|
|
style="position: absolute;right: 0px;width: 100%"></el-date-picker> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-form-item label="寄检修快递单号" prop="repairTrackingNub" label-width="120px"> |
|
|
|
|
<el-input v-model="form.repairTrackingNub" placeholder="请输入寄检修快递单号" |
|
|
|
|
style="position: absolute;right: 0px;width: 100%" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
|
|
|
|
|
<el-row> |
|
|
|
|
<el-col :span="11"> |
|
|
|
|
<el-form-item label="寄回单号" prop="returnOrderNub" label-width="80px"> |
|
|
|
|
<el-input v-model="form.returnOrderNub" placeholder="请输入维修寄回单号" |
|
|
|
|
style="position: absolute;right: 0px;width: 100%" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="12"> |
|
|
|
|
<el-form-item label="维修费(元)" prop="maintenanceCosts" label-width="120px"> |
|
|
|
|
<el-input v-model="form.maintenanceCosts" placeholder="请输入维修费用;单位（元）" style="width: 100%" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
|
|
|
|
|
<el-row> |
|
|
|
|
<el-col :span="23"> |
|
|
|
|
<el-form-item label="备注" prop="notes"> |
|
|
|
|
<el-input v-model="form.notes" placeholder="请输入备注" style="width: 100%" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</el-form> |
|
|
|
|
<el-table ref="table" v-loading="loading" |
|
|
|
|
@selection-change="selectionChange" |
|
|
|
|
:data="wrapdata" |
|
|
|
|
:height="height" |
|
|
|
|
style="width: 100%" |
|
|
|
|
:border="option.border"> |
|
|
|
|
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column> |
|
|
|
|
<template v-for="(item,index) in wrapoption.column"> |
|
|
|
|
<!-- table字段 --> |
|
|
|
|
<el-table-column v-if="item.hide!==true" |
|
|
|
|
:prop="item.prop" |
|
|
|
|
:label="item.label" |
|
|
|
|
align="center" |
|
|
|
|
:width="item.width" |
|
|
|
|
:key="index"> |
|
|
|
|
</el-table-column> |
|
|
|
|
</template> |
|
|
|
|
</el-table> |
|
|
|
|
<!-- 表单按钮 --> |
|
|
|
|
<template #footer> |
|
|
|
|
<span v-if="!view" class="dialog-footer"> |
|
|
|
|
@ -205,7 +120,7 @@
|
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
|
import { getList, getDetail, add, update, remove,getPage,getstatistics } from "@/api/distribution/distributionDeliveryList"; |
|
|
|
|
import { getList, getDetail, add, update, remove,getPage,getstatistics,getWrapdetail } from "@/api/distribution/distributionDeliveryList"; |
|
|
|
|
import option from '@/option/basic/basicPdarecords'; |
|
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
@ -269,7 +184,7 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "收货电话", |
|
|
|
|
prop: "businessDepartment", |
|
|
|
|
prop: "deliveryPhone", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
@ -281,25 +196,19 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "订单自编号", |
|
|
|
|
prop: "stockArticleId", |
|
|
|
|
prop: "orderIds", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "收货地址", |
|
|
|
|
prop: "businessDepartment", |
|
|
|
|
label: "配送件数", |
|
|
|
|
prop: "packageNub", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "装车件数", |
|
|
|
|
prop: "businessDepartment", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "配送件数", |
|
|
|
|
prop: "businessDepartment", |
|
|
|
|
prop: "loadedNub", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
@ -311,48 +220,51 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
] |
|
|
|
|
}, |
|
|
|
|
propertyoption: { |
|
|
|
|
height:'auto', |
|
|
|
|
calcHeight: 30, |
|
|
|
|
tip: false, |
|
|
|
|
searchShow: true, |
|
|
|
|
editBtn:false, |
|
|
|
|
emptyBtn:false,//清空按钮 |
|
|
|
|
submitBtn: false, //隐藏提交按钮 |
|
|
|
|
searchMenuSpan: 6, |
|
|
|
|
disabled: false, |
|
|
|
|
border: true, |
|
|
|
|
// 表单配置 |
|
|
|
|
wrapoption: { |
|
|
|
|
expand: false, |
|
|
|
|
index: true, |
|
|
|
|
viewBtn: false, |
|
|
|
|
border: true, |
|
|
|
|
selection: true, |
|
|
|
|
dialogClickModal: false, |
|
|
|
|
column: [ |
|
|
|
|
{ |
|
|
|
|
label: "配送类型:", |
|
|
|
|
prop: "kind", |
|
|
|
|
type: "input", |
|
|
|
|
labelWidth:'150', |
|
|
|
|
width:"120px", |
|
|
|
|
align:'center', |
|
|
|
|
dicUrl: '/api/blade-system/dict-biz/dictionary?code=distribution_deliverylist_kind', |
|
|
|
|
props: { |
|
|
|
|
label: 'dictValue', |
|
|
|
|
value: 'dictKey', |
|
|
|
|
}, |
|
|
|
|
label: "包条码", |
|
|
|
|
prop: "packetBarCode", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "一级品类", |
|
|
|
|
prop: "firsts", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "二级品类", |
|
|
|
|
prop: "second", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "三级品类", |
|
|
|
|
prop: "thirdProduct", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
{ |
|
|
|
|
label: "配送车辆:", |
|
|
|
|
prop: "vehicle", |
|
|
|
|
type: "input", |
|
|
|
|
labelWidth:'150', |
|
|
|
|
width:"120px", |
|
|
|
|
align:'center', |
|
|
|
|
label: "物料名称", |
|
|
|
|
prop: "material", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
] |
|
|
|
|
}, |
|
|
|
|
// 表单列表 |
|
|
|
|
data: [], |
|
|
|
|
// |
|
|
|
|
wrapdata:[], |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
watch: { |
|
|
|
|
@ -393,23 +305,7 @@ export default {
|
|
|
|
|
methods: { |
|
|
|
|
//修改 |
|
|
|
|
rowUpdate() { |
|
|
|
|
this.$refs.myForm.validate(valid => { |
|
|
|
|
if (valid) { |
|
|
|
|
let row = this.dataForm |
|
|
|
|
updatevalue(row).then(() => { |
|
|
|
|
this.$message({ |
|
|
|
|
type: "success", |
|
|
|
|
message: "操作成功!" |
|
|
|
|
}); |
|
|
|
|
let str = { |
|
|
|
|
val: true |
|
|
|
|
} |
|
|
|
|
this.$emit("returnpda", str); |
|
|
|
|
}, error => { |
|
|
|
|
console.log(error); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
queryDictionary() { |
|
|
|
|
getDictionaryBiz('yes_no').then(res => { |
|
|
|
|
@ -422,10 +318,7 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
//返回 |
|
|
|
|
handleViewpda() { |
|
|
|
|
let str = { |
|
|
|
|
val: this.propertyformdata.activeTab |
|
|
|
|
} |
|
|
|
|
this.$emit("returnproperty", str); |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
init() { |
|
|
|
|
this.height = this.setPx(document.body.clientHeight - 340); |
|
|
|
|
@ -492,11 +385,13 @@ export default {
|
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
handleView(row) { |
|
|
|
|
console.log("查看>>>>>>>>>>",row); |
|
|
|
|
this.title = '查看'; |
|
|
|
|
this.view = true; |
|
|
|
|
this.box = true; |
|
|
|
|
getDetail(row.id).then(res => { |
|
|
|
|
this.form = res.data.data; |
|
|
|
|
getWrapdetail(row.id).then(res => { |
|
|
|
|
console.log("查看>>>>>>>",res.data.data); |
|
|
|
|
// this.wrapdata = res.data.data; |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
handleDelete() { |
|
|
|
|
@ -564,7 +459,8 @@ export default {
|
|
|
|
|
let id = this.$route.query.id; |
|
|
|
|
getDetail(id).then(res => { |
|
|
|
|
console.log("res.data>>>>>>>>>>>>",res.data.data); |
|
|
|
|
this.deliverydata = res.data.data |
|
|
|
|
const data = res.data.data |
|
|
|
|
this.deliverydata = data |
|
|
|
|
this.data = res.data.data.reservationList |
|
|
|
|
}); |
|
|
|
|
this.loading = false; |
|
|
|
|
|
