|
|
|
|
@ -7,13 +7,32 @@
|
|
|
|
|
<!-- <el-tag>序号:{{row.$index}}-数据:{{row.input}}</el-tag>--> |
|
|
|
|
<!-- </template>--> |
|
|
|
|
<!-- </avue-form>--> |
|
|
|
|
<el-row> |
|
|
|
|
<el-col :offset="11" > |
|
|
|
|
<el-button type="primary" @click="rowUpdate" v-if="!this.edt">提 交</el-button> |
|
|
|
|
<el-row :gutter="24" class="rows"> |
|
|
|
|
<el-col :xl="7" :lg="7" :md="8" :sm="24" > |
|
|
|
|
<span>配送类型：{{deliverydata.kind}} </span> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :xl="7" :lg="7" :md="8" :sm="24"> |
|
|
|
|
<span>配送车辆：{{deliverydata.vehicleName}} </span> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
<el-row :gutter="24" class="rows"> |
|
|
|
|
<el-col :xl="7" :lg="7" :md="8" :sm="24"> |
|
|
|
|
<span>配送司机：{{deliverydata.driverName}} </span> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :xl="7" :lg="7" :md="8" :sm="24"> |
|
|
|
|
<span>叉车司机：{{deliverydata.forkliftName}} </span> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
<el-divider>维修记录</el-divider> |
|
|
|
|
<el-row v-if="!this.edt"> |
|
|
|
|
<el-row :gutter="24" class="rows"> |
|
|
|
|
<el-col :xl="7" :lg="7" :md="8" :sm="24"> |
|
|
|
|
<span>装卸班组：{{deliverydata.loadingTeamName}} </span> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :xl="7" :lg="7" :md="8" :sm="24"> |
|
|
|
|
<span>{{deliverydata.loadingTeamType}} </span> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
<el-divider>订单列表</el-divider> |
|
|
|
|
<el-row> |
|
|
|
|
<div class="avue-crud__header"> |
|
|
|
|
<!-- 头部左侧按钮模块 --> |
|
|
|
|
<div class="avue-crud__left"> |
|
|
|
|
@ -186,9 +205,7 @@
|
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
|
import {getList as getListvalue, getDetail as getDetailvalue, add as addvalue, update as updatevalue, remove as value} from "@/api/basic/basicPropertyvalue"; |
|
|
|
|
import {getList as getListField} from "@/api/basic/basicPropertyfield"; |
|
|
|
|
import { getList, getDetail, add, update, remove } from '@/api/basic/basicrecords'; |
|
|
|
|
import { getList, getDetail, add, update, remove,getPage,getstatistics } from "@/api/distribution/distributionDeliveryList"; |
|
|
|
|
import option from '@/option/basic/basicPdarecords'; |
|
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
@ -206,6 +223,7 @@ export default {
|
|
|
|
|
search: true, |
|
|
|
|
//是否显示新增 |
|
|
|
|
isadd: false, |
|
|
|
|
deliverydata:{}, |
|
|
|
|
// 加载中 |
|
|
|
|
loading: true, |
|
|
|
|
//查看按钮 |
|
|
|
|
@ -231,7 +249,68 @@ export default {
|
|
|
|
|
//状态列表 |
|
|
|
|
stateData: [], |
|
|
|
|
// 表单配置 |
|
|
|
|
option: option, |
|
|
|
|
option: { |
|
|
|
|
expand: false, |
|
|
|
|
index: true, |
|
|
|
|
border: true, |
|
|
|
|
selection: true, |
|
|
|
|
column: [ |
|
|
|
|
{ |
|
|
|
|
label: "配送单号", |
|
|
|
|
prop: "noteNumber", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "收货人", |
|
|
|
|
prop: "consignee", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "收货电话", |
|
|
|
|
prop: "businessDepartment", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "收货地址", |
|
|
|
|
prop: "deliveryAddress", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "订单自编号", |
|
|
|
|
prop: "stockArticleId", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "收货地址", |
|
|
|
|
prop: "businessDepartment", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "装车件数", |
|
|
|
|
prop: "businessDepartment", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "配送件数", |
|
|
|
|
prop: "businessDepartment", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "是否加急", |
|
|
|
|
prop: "businessDepartment", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
] |
|
|
|
|
}, |
|
|
|
|
propertyoption: { |
|
|
|
|
height:'auto', |
|
|
|
|
calcHeight: 30, |
|
|
|
|
@ -274,21 +353,28 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
// 表单列表 |
|
|
|
|
data: [], |
|
|
|
|
|
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
// props: { |
|
|
|
|
// propertyformdata:{ |
|
|
|
|
// type:Object, |
|
|
|
|
// }, |
|
|
|
|
// propertyoptiondata:{ |
|
|
|
|
// type:Object, |
|
|
|
|
// }, |
|
|
|
|
// }, |
|
|
|
|
watch: { |
|
|
|
|
// eslint-disable-next-line no-unused-vars |
|
|
|
|
'$route'(to, from) { |
|
|
|
|
// this.isadd =false; |
|
|
|
|
// this.query.masterId = null; |
|
|
|
|
// this.masterId = null; |
|
|
|
|
if (!!this.$route.query.data) { |
|
|
|
|
// //做一些路由变化的响应 |
|
|
|
|
// // this.isadd =true; |
|
|
|
|
// this.query.masterId = this.$route.query.data; |
|
|
|
|
// this.masterId = this.$route.query.data; |
|
|
|
|
//重新获取数据 |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
} else { |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
mounted() { |
|
|
|
|
// this.init(); |
|
|
|
|
// this.onLoad(this.page); |
|
|
|
|
this.init(); |
|
|
|
|
this.onLoad(); |
|
|
|
|
}, |
|
|
|
|
created() { |
|
|
|
|
// //查询字典 |
|
|
|
|
@ -358,13 +444,6 @@ export default {
|
|
|
|
|
handleSubmit() { |
|
|
|
|
this.$refs.form.validate(valid => { |
|
|
|
|
if (valid) { |
|
|
|
|
//转换json |
|
|
|
|
const filteredKeys = Object.keys(this.form).filter(key => key.includes('value')); |
|
|
|
|
const filteredObj = filteredKeys.reduce((result, key) => { |
|
|
|
|
result[key] = this.form[key]; |
|
|
|
|
return result; |
|
|
|
|
}, {}); |
|
|
|
|
const jsonString = JSON.stringify(filteredObj); |
|
|
|
|
this.form.stringValue =jsonString; |
|
|
|
|
if (!this.form.id) { |
|
|
|
|
this.form.masterId = this.propertyformdata.id; |
|
|
|
|
@ -479,42 +558,16 @@ export default {
|
|
|
|
|
this.page.pageSize = pageSize; |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
}, |
|
|
|
|
onLoad(page, params = {}) { |
|
|
|
|
// if (this.pdaformdata) { |
|
|
|
|
let id = this.propertyformdata.id; |
|
|
|
|
this.query.masterId = id |
|
|
|
|
// } |
|
|
|
|
onLoad() { |
|
|
|
|
//查询详情 |
|
|
|
|
this.loading = true; |
|
|
|
|
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
|
const data = res.data.data; |
|
|
|
|
// eslint-disable-next-line no-empty |
|
|
|
|
for (let i = 0; i < data.records.length; i++) { |
|
|
|
|
// eslint-disable-next-line no-empty |
|
|
|
|
for (let j = 0; j < this.isLiabilityData.length; j++) { |
|
|
|
|
// eslint-disable-next-line no-empty |
|
|
|
|
if (data.records[i].isLiability == this.isLiabilityData[j].dictKey) { |
|
|
|
|
data.records[i].isLiability = this.isLiabilityData[j].dictValue; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
this.page.total = data.total; |
|
|
|
|
this.data = data.records; |
|
|
|
|
this.loading = false; |
|
|
|
|
this.selectionClear(); |
|
|
|
|
let id = this.$route.query.id; |
|
|
|
|
getDetail(id).then(res => { |
|
|
|
|
console.log("res.data>>>>>>>>>>>>",res.data.data); |
|
|
|
|
this.deliverydata = res.data.data |
|
|
|
|
this.data = res.data.data.reservationList |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
// getDetailPda(id).then(res => { |
|
|
|
|
// const data = res.data.data; |
|
|
|
|
// this.dataForm = data; |
|
|
|
|
// |
|
|
|
|
// }); |
|
|
|
|
console.log('this.edt>>>>>>>>>>>>>>',this.edt); |
|
|
|
|
|
|
|
|
|
this.dataForm = this.propertyformdata; |
|
|
|
|
this.propertyoption = this.propertyoptiondata; |
|
|
|
|
this.propertyoption.emptyBtn = false,//清空按钮 |
|
|
|
|
this.propertyoption.submitBtn = false //隐藏提交按钮 |
|
|
|
|
this.loading = false; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
kilo
2 years ago