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

订单字段回显调整

fix_bug_pro20231227
kilo 2 years ago
parent
e356bd1fb0
commit
5b651784ca
2 changed files with 194 additions and 178 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. 8
      src/option/distribution/distributionReservation.js
  2. 364
      src/views/distribution/turndelivery/deliveryDiscuss.vue

8
src/option/distribution/distributionReservation.js
Unescape View File

@ -416,9 +416,15 @@ export default {
width: '100',
search: true
},
// {
// label: '服务类型',
// prop: 'typeService',
// width: '100',
// search: true
// },
{
label: '服务类型',
prop: 'typeService',
prop: 'typeServerName',
width: '100',
search: true
},

364
src/views/distribution/turndelivery/deliveryDiscuss.vue
Unescape View File

@ -13,17 +13,17 @@
<el-col :span="6">
<el-form-item label="车辆信息:" prop="vehicleIds">
<el-select
filterable
multiple
v-model="vehicleIds"
placeholder="请选择车辆"
@change="changeVehicle"
filterable
multiple
v-model="vehicleIds"
placeholder="请选择车辆"
@change="changeVehicle"
>
<el-option
v-for="item in vehicleData"
:key="item.id"
:label="item.vehicleNub"
:value="item.id"
v-for="item in vehicleData"
:key="item.id"
:label="item.vehicleNub"
:value="item.id"
>
</el-option>
</el-select>
@ -33,18 +33,18 @@
<el-form-item label="配送司机信息:" prop="goodsShelfId">
<!-- @change="changeSlaveDriver"-->
<el-select
v-model="deliveryDriver"
multiple
filterable
@change="changeDriver"
v-model="deliveryDriver"
multiple
filterable
@change="changeDriver"
placeholder="请选择司机"
placeholder="请选择司机"
>
<el-option
v-for="item in driverData"
:key="item.id"
:label="item.name"
:value="item.id"
v-for="item in driverData"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
@ -74,10 +74,10 @@
<el-form-item label="外协来源:" prop="goodsShelfId">
<el-select filterable v-model="waixieForm.tripartiteSource" placeholder="请选择来源">
<el-option
v-for="item in tripartiteSourceData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
v-for="item in tripartiteSourceData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
>
</el-option>
</el-select>
@ -113,10 +113,10 @@
<el-form-item label="备货人员:" prop="forklift">
<el-select filterable v-model="stockUpForm.forklift" placeholder="请选择备货人员">
<el-option
v-for="item in this.forkliftData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
v-for="item in this.forkliftData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
>
</el-option>
<!-- {{this.forkliftData}}-->
@ -127,10 +127,10 @@
<el-form-item label="装卸班组:" prop="loader">
<el-select filterable v-model="stockUpForm.loader" placeholder="请选择装卸班组">
<el-option
v-for="item in loaderData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
v-for="item in loaderData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
>
</el-option>
</el-select>
@ -140,9 +140,9 @@
<el-form-item label="班组职能:" prop="goodsAreaId">
<el-checkbox-group v-model="loadAndUnload">
<el-checkbox
v-for="item in loadAndUnloadData"
:label="item.dictKey"
:value="item.dictKey"
v-for="item in loadAndUnloadData"
:label="item.dictKey"
:value="item.dictKey"
>
<span>{{ item.dictValue }}</span>
</el-checkbox>
@ -152,7 +152,7 @@
<el-col :span="6">
<el-form-item label="配送类型:" prop="goodsAreaId">
<el-radio-group v-model="stockUpForm.deliveryType">
<el-radio :label="'10'" :value="'10'">商配&emsp; </el-radio>
<el-radio :label="'1'" :value="'1'">商配&emsp; </el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@ -162,10 +162,10 @@
<el-form-item label="备货区域:" prop="goodsAreaId">
<el-select filterable v-model="stockUpForm.goodsAreaId" placeholder="请选择备货区域">
<el-option
v-for="item in goodsAreaData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
v-for="item in goodsAreaData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
>
</el-option>
</el-select>
@ -182,7 +182,7 @@
<!-- <el-input v-model="form.serveType" clearable placeholder="请选择服务类型"/>-->
<el-radio-group v-model="stockUpForm.deliveryWay" v-for="item in this.deliveryWayData">
<el-radio :label="item.dictKey" :value="item.dictKey"
>{{ item.dictValue }}&emsp;
>{{ item.dictValue }}&emsp;
</el-radio>
</el-radio-group>
</el-form-item>
@ -193,7 +193,7 @@
<!-- <el-input v-model="form.serveType" clearable placeholder="请选择服务类型"/>-->
<el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">
<el-checkbox :label="item.dictKey" :value="item.dictKey"
>{{ item.dictValue }}&emsp;
>{{ item.dictValue }}&emsp;
</el-checkbox>
</el-checkbox-group>
</el-form-item>
@ -234,27 +234,27 @@
<el-tab-pane label="订单">
<el-button type="primary" link @click="handleAddOrder">新 增</el-button>
<el-table
ref="table"
v-loading="loading"
:data="orderData"
:height="height"
style="width: 100%; height: 50%"
:border="option.border"
ref="table"
v-loading="loading"
:data="orderData"
:height="height"
style="width: 100%; height: 50%"
:border="option.border"
>
<el-table-column
v-if="option.index"
label="序号"
type="index"
width="80px"
align="center"
v-if="option.index"
label="序号"
type="index"
width="80px"
align="center"
></el-table-column>
<template v-for="(item, index) in option.columnStockArticles">
<el-table-column
v-if="item.hide !== true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index"
v-if="item.hide !== true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index"
>
</el-table-column>
</template>
@ -262,14 +262,14 @@
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{ row }">
<el-button
type="primary"
link
icon="el-icon-view"
@click="viewStockArticlePackage(row)"
>查看包件
type="primary"
link
icon="el-icon-view"
@click="viewStockArticlePackage(row)"
>查看包件
</el-button>
<el-button type="primary" link icon="el-icon-edit" @click="removeStockArticle(row)"
>移除
>移除
</el-button>
</template>
</el-table-column>
@ -279,7 +279,7 @@
<el-form-item style="margin-left: 45%; margin-top: 10px">
<el-button type="primary" icon="el-icon-circle-close" @click="onSubmitBusiness"
>提交(商配订单)</el-button
>提交(商配订单)</el-button
>
<el-button icon="el-icon-circle-close" @click="this.$router.go(-1)">返 回</el-button>
</el-form-item>
@ -314,50 +314,50 @@
<el-input v-model="query.customerAddress" placeholder="请输入顾客地址"></el-input>
</el-form-item>
<!-- 查询按钮 -->
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
</el-form-item>
</el-form>
<!-- @selection-change="selectionChange"-->
<el-table
ref="stockArticleTable"
v-loading="loading"
@selection-change="selectionStockArticleChange"
:data="stockArticleInfo"
:height="height"
style="width: 100%; height: 80%"
:border="option.border"
ref="stockArticleTable"
v-loading="loading"
@selection-change="selectionStockArticleChange"
:data="stockArticleInfo"
:height="height"
style="width: 100%; height: 80%"
:border="option.border"
>
<el-table-column
type="selection"
v-if="option.selection"
width="55"
align="center"
type="selection"
v-if="option.selection"
width="55"
align="center"
></el-table-column>
<el-table-column
v-if="option.index"
label="序号"
type="index"
width="80px"
align="center"
v-if="option.index"
label="序号"
type="index"
width="80px"
align="center"
></el-table-column>
<template v-for="(item, index) in option.columnStockArticles">
<el-table-column
v-if="item.hide !== true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index"
v-if="item.hide !== true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index"
>
</el-table-column>
</template>
</el-table>
<el-form-item style="margin-left: 45%; margin-top: 5px">
<el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder"
>提交(订单)</el-button
>提交(订单)</el-button
>
<el-button icon="el-icon-circle-close" @click="orderShow = false">返 回</el-button>
</el-form-item>
@ -381,10 +381,10 @@
</el-dialog>
<el-dialog
v-model="stockListShow"
title="库存品信息"
width="100%"
:before-close="handleClose"
v-model="stockListShow"
title="库存品信息"
width="100%"
:before-close="handleClose"
>
<el-form :inline="true" :model="query">
<el-form-item label="顾客电话:">
@ -400,35 +400,35 @@
</el-form-item>
</el-form>
<el-table
ref="table"
v-loading="loading"
@selection-change="selectionChange"
:data="inventoryInfo"
:height="height"
style="width: 90%; height: 80%"
:border="option.border"
ref="table"
v-loading="loading"
@selection-change="selectionChange"
:data="inventoryInfo"
:height="height"
style="width: 90%; height: 80%"
:border="option.border"
>
<el-table-column
type="selection"
v-if="option.selection"
width="55"
align="center"
type="selection"
v-if="option.selection"
width="55"
align="center"
></el-table-column>
<el-table-column
v-if="option.index"
label="序号"
type="index"
width="80px"
align="center"
v-if="option.index"
label="序号"
type="index"
width="80px"
align="center"
></el-table-column>
<template v-for="(item, index) in option.columnStockLists">
<el-table-column
v-if="item.hide !== true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index"
v-if="item.hide !== true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index"
>
</el-table-column>
</template>
@ -440,7 +440,7 @@
</el-table>
<el-form-item style="margin-left: 45%; margin-top: 5px">
<el-button type="primary" icon="el-icon-circle-close" @click="onSubmitInventory"
>提交(库存品)</el-button
>提交(库存品)</el-button
>
<el-button icon="el-icon-circle-close" @click="stockListShow = false">返 回</el-button>
</el-form-item>
@ -449,19 +449,19 @@
<el-dialog v-model="isShowPackage" title="包件信息" width="100%">
<!-- 列表模块 -->
<el-table
ref="packageList"
v-loading="loading"
@selection-change="selectionChange"
:data="packageData"
:height="height"
style="width: 100%; height: 100%"
:border="option.border"
ref="packageList"
v-loading="loading"
@selection-change="selectionChange"
:data="packageData"
:height="height"
style="width: 100%; height: 100%"
:border="option.border"
>
<el-table-column
type="selection"
v-if="option.selection"
width="55"
align="center"
type="selection"
v-if="option.selection"
width="55"
align="center"
>
<!-- :selectable="checkPackage"-->
@ -473,11 +473,11 @@
<template v-for="(item, index) in option.columnPackage">
<!-- table字段 -->
<el-table-column
v-if="item.hide !== true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index"
v-if="item.hide !== true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index"
>
</el-table-column>
</template>
@ -485,14 +485,14 @@
<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)">编辑</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
</template>
</el-table-column>
</el-table>
<el-form-item style="margin-left: 45%; margin-top: 5px">
<el-button type="primary" icon="el-icon-circle-close" @click="onSubmitPackage"
>提交(包件)</el-button
>提交(包件)</el-button
>
<el-button icon="el-icon-circle-close" @click="isShowPackage = false">返 回</el-button>
</el-form-item>
@ -502,30 +502,30 @@
<div style="display: flex">
<div style="flex: 1">
<el-table
ref="multipleTable"
v-loading="loading"
:data="driverInfo"
style="width: 100%"
:border="option.border"
@select-all="handleSelect"
@select="handleSelect"
ref="multipleTable"
v-loading="loading"
:data="driverInfo"
style="width: 100%"
:border="option.border"
@select-all="handleSelect"
@select="handleSelect"
>
<el-table-column
type="selection"
v-if="option.selection"
width="55"
align="center"
type="selection"
v-if="option.selection"
width="55"
align="center"
></el-table-column>
<template v-for="(item, index) in option.columnDriverInfo">
<!-- table字段 -->
<el-table-column
v-if="item.hide !== true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index"
style="height: 50px"
v-if="item.hide !== true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index"
style="height: 50px"
>
</el-table-column>
@ -535,22 +535,22 @@
</div>
<div style="flex: 1">
<el-table
ref="table"
v-loading="loading"
:data="vehticleInfo"
style="width: 100%"
:border="option.border"
ref="table"
v-loading="loading"
:data="vehticleInfo"
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 option.columnVehicleInfo">
<!-- table字段 -->
<el-table-column
v-if="item.hide !== true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index"
style="height: 50px"
v-if="item.hide !== true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index"
style="height: 50px"
>
</el-table-column>
</template>
@ -559,7 +559,7 @@
<template #="{ row }">
<span>
<el-button type="primary" text size="small" @click="moveUpVehictle(row)"
>上移
>上移
</el-button>
</span>
</template>
@ -727,13 +727,13 @@
},
created() {
this.$watch(
() => this.$route.params,
() => {
this.fetchData();
},
// 组件创建完后获取数据，
// 此时 data 已经被 observed 了
{ immediate: true }
() => this.$route.params,
() => {
this.fetchData();
},
// 组件创建完后获取数据，
// 此时 data 已经被 observed 了
{ immediate: true }
);
this.getDictionary();
this.getFork();
@ -874,6 +874,8 @@
if (this.$route.query.id) {
this.deliveryListId = this.$route.query.id;
}
this.loading = false;
},
sizeChange(pageSize) {
this.page.pageSize = pageSize;
@ -1049,6 +1051,10 @@
* 订单提交
*/
onSubmitBusiness() {
if (this.orderData.length===0){
this.$message.warning('请选择订单');
return;
}
if (this.deliveryListId){
let data = {};
let tripartite = {};
@ -1406,7 +1412,7 @@
}
this.aaa = true;
this.bbb = false;
this.stockUpForm.deliveryType="10";
this.stockUpForm.deliveryType="1";
this.stockUpForm.deliveryWay="10";
this.loadAndUnload = ["1","2"];
this.stockUpForm.otherFee = 0;
@ -1427,7 +1433,7 @@
}
this.aaa = false;
this.bbb = true;
this.stockUpForm.deliveryType="10";
this.stockUpForm.deliveryType="1";
this.stockUpForm.deliveryWay="10";
this.loadAndUnload = ["1","2"];
this.stockUpForm.otherFee = 0;
@ -1488,7 +1494,9 @@
this.searchChange();
},
searchChange(){
let params = {};
let params = {};
this.query.typeService=1;
this.query.genre = "1";
console.log("query------------->",this.query);
const page = this.page;
selectStockArticleInfoList(page.currentPage,page.pageSize,Object.assign(params,this.query)).then(res=>{
@ -1548,14 +1556,15 @@
this.selectionList = [];
this.query={};
},
async onLoad(page, params = {}) {
async onLoad(page, params = {}) {
this.stockUpForm.deliveryType="1";
console.log("》》》》》》》》》》》》》》》",this.deliveryListId);
if (this.deliveryListId){
getDeliveryList(this.deliveryListId).then( async res=>{
let data = res.data.data;
Object.assign(this.stockUpForm,data.reservationInfo)
Object.assign(this.stockUpForm,data.stockupInfo)
this.stockUpForm.deliveryType = '10';
this.stockUpForm.deliveryType = '1';
this.stockUpForm.deliveryWay = data.reservationInfo.deliveryWay;
this.serveType = data.reservationInfo.serveType.split(",");
if (data.stockupInfo){
@ -1621,8 +1630,9 @@
let deliveryTripartiteVO = data.deliveryTripartiteVO;
this.aaa = false;
this.bbb = true;
// this.form.tripartiteSource = deliveryTripartiteVO.distributionCompanyId;
this.waixieForm.tripartiteSource = "1";
this.waixieForm.tripartiteSource = data.distributionCompanyId;
console.log("distributionCompanyId---------------->",deliveryTripartiteVO.distributionCompanyId);
console.log("deliveryTripartiteVO---------------->",deliveryTripartiteVO);
this.waixieForm.driverName = deliveryTripartiteVO.driverName ;
this.waixieForm.vehicleNum = deliveryTripartiteVO.vehicleNum ;
this.waixieForm.driverPhone = deliveryTripartiteVO.driverPhone ;
@ -1633,7 +1643,7 @@
})
this.isDisable=true;
}else {
this.stockUpForm.deliveryType="10";
this.stockUpForm.deliveryType="1";
this.stockUpForm.deliveryWay="10";
this.loadAndUnload = ["1","2"];
this.stockUpForm.otherFee = 0;

Write Preview
Loading…
Cancel
Save