|
|
|
|
@ -105,127 +105,86 @@
|
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
</el-form> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</el-form> |
|
|
|
|
<!-- <el-dialog :title="title"--> |
|
|
|
|
<!-- v-model="box"--> |
|
|
|
|
<!-- width="50%"--> |
|
|
|
|
<!-- :before-close="beforeClose"--> |
|
|
|
|
<!-- append-to-body>--> |
|
|
|
|
<!-- <el-form :disabled="view" ref="form" :model="form" label-width="80px">--> |
|
|
|
|
<!-- <!– 表单字段 –>--> |
|
|
|
|
<!-- <el-form-item label="订单自编号" prop="orderId">--> |
|
|
|
|
<!-- <el-input v-model="form.orderId" placeholder="请输入订单自编号"/>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="运单号" prop="waybillId">--> |
|
|
|
|
<!-- <el-input v-model="form.waybillId" placeholder="请输入运单号"/>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="商城编号" prop="shoppingId">--> |
|
|
|
|
<!-- <el-input v-model="form.shoppingId" placeholder="请输入商城编号"/>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="收货地址" prop="deliveryAddress">--> |
|
|
|
|
<!-- <el-input v-model="form.deliveryAddress" placeholder="请输入收货地址"/>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="收货人" prop="consignee">--> |
|
|
|
|
<!-- <el-input v-model="form.consignee" placeholder="请输入收货人"/>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="在库时长" prop="durationInStock">--> |
|
|
|
|
<!-- <el-input v-model="form.durationInStock" placeholder="请输入在库时长"/>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="总件数" prop="goodsTotal">--> |
|
|
|
|
<!-- <el-input v-model="form.goodsTotal" placeholder="请输入总件数"/>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="配载件数" prop="allocateTotal">--> |
|
|
|
|
<!-- <el-input v-model="form.allocateTotal" placeholder="请输入配载件数"/>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="体积" prop="volume">--> |
|
|
|
|
<!-- <el-input v-model="form.volume" placeholder="请输入体积"/>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="重量" prop="weight">--> |
|
|
|
|
<!-- <el-input v-model="form.weight" placeholder="请输入重量"/>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="到付费用" prop="collectFee">--> |
|
|
|
|
<!-- <el-input v-model="form.collectFee" placeholder="请输入到付费用"/>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <el-form-item label="待收货款" prop="replaceFee">--> |
|
|
|
|
<!-- <el-input v-model="form.replaceFee" placeholder="请输入待收货款"/>--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- <!– <el-form-item label="预留1" prop="reserve1">–>--> |
|
|
|
|
<!-- <!– <el-input v-model="form.reserve1" placeholder="请输入预留1"/>–>--> |
|
|
|
|
<!-- <!– </el-form-item>–>--> |
|
|
|
|
<!-- <!– <el-form-item label="预留2" prop="reserve2">–>--> |
|
|
|
|
<!-- <!– <el-input v-model="form.reserve2" placeholder="请输入预留2"/>–>--> |
|
|
|
|
<!-- <!– </el-form-item>–>--> |
|
|
|
|
<!-- <!– <el-form-item label="预留3" prop="reserve3">–>--> |
|
|
|
|
<!-- <!– <el-input v-model="form.reserve3" placeholder="请输入预留3"/>–>--> |
|
|
|
|
<!-- <!– </el-form-item>–>--> |
|
|
|
|
<!-- <!– <el-form-item label="预留4" prop="reserve4">–>--> |
|
|
|
|
<!-- <!– <el-input v-model="form.reserve4" placeholder="请输入预留4"/>–>--> |
|
|
|
|
<!-- <!– </el-form-item>–>--> |
|
|
|
|
<!-- <!– <el-form-item label="预留5" prop="reserve5">–>--> |
|
|
|
|
<!-- <!– <el-input v-model="form.reserve5" placeholder="请输入预留5"/>–>--> |
|
|
|
|
<!-- <!– </el-form-item>–>--> |
|
|
|
|
<!-- </el-form>--> |
|
|
|
|
<!-- <!– 表单按钮 –>--> |
|
|
|
|
<!-- <template #footer>--> |
|
|
|
|
<!-- <span v-if="!view" class="dialog-footer">--> |
|
|
|
|
<!-- <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>--> |
|
|
|
|
<!-- <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>--> |
|
|
|
|
<!-- </span>--> |
|
|
|
|
<!-- </template>--> |
|
|
|
|
<!-- </el-dialog>--> |
|
|
|
|
|
|
|
|
|
<el-row style="margin: 50px;"> |
|
|
|
|
<el-button-group> |
|
|
|
|
<el-button type="primary" icon="el-icon-plus" @click="bbb">增加订单</el-button> |
|
|
|
|
<el-button type="primary" icon="el-icon-plus">增加包件<i class="el-icon-arrow-right el-icon--right"></i></el-button> |
|
|
|
|
</el-button-group> |
|
|
|
|
<div class="avue-crud__left" style="margin-left: 50px"> |
|
|
|
|
<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> |
|
|
|
|
<el-table ref="table" |
|
|
|
|
v-loading="loading" |
|
|
|
|
@selection-change="selectionChange" |
|
|
|
|
:data="data" |
|
|
|
|
: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 v-if="option.index" label="序号" type="index" width="80px" align="center"></el-table-column> |
|
|
|
|
<template v-for="(item,index) in option.column"> |
|
|
|
|
<el-tabs type="border-card" > |
|
|
|
|
<el-tab-pane label="订单"> |
|
|
|
|
<el-button type="text" @click="handleAddOrder">新增</el-button> |
|
|
|
|
<el-table ref="table" |
|
|
|
|
v-loading="loading" |
|
|
|
|
@selection-change="selectionChange" |
|
|
|
|
:data="orderData" |
|
|
|
|
: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 v-if="option.index" label="序号" type="index" width="80px" align="center"></el-table-column> |
|
|
|
|
<template v-for="(item,index) in option.columnReservations"> |
|
|
|
|
<el-table-column v-if="item.hide!==true" |
|
|
|
|
:prop="item.prop" |
|
|
|
|
:label="item.label" |
|
|
|
|
:width="item.width" |
|
|
|
|
:key="index"> |
|
|
|
|
|
|
|
|
|
</el-table-column> |
|
|
|
|
</template> |
|
|
|
|
<el-table-column label="预约数量" type="index" width="100px"> |
|
|
|
|
<template #="{row}"> |
|
|
|
|
<el-input v-model="row.number" type="number" placeholder="请输入内容"></el-input> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
<!-- 操作栏模块 --> |
|
|
|
|
<el-table-column prop="menu" label="操作" :width="220" align="center"> |
|
|
|
|
<template #="{row}"> |
|
|
|
|
<el-button type="primary" text icon="el-icon-view" @click="viewPackage(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="addvalueServe(row)">增值服务</el-button> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
</el-table> |
|
|
|
|
</el-tab-pane> |
|
|
|
|
|
|
|
|
|
<el-tab-pane label="库存品"> |
|
|
|
|
<el-button type="text" @click="handleAddInventory">新增</el-button> |
|
|
|
|
<el-table ref="table" |
|
|
|
|
v-loading="loading" |
|
|
|
|
@selection-change="selectionChange" |
|
|
|
|
:data="inventoryData" |
|
|
|
|
:height="height" |
|
|
|
|
style="width: 100%" |
|
|
|
|
:border="stockList.border"> |
|
|
|
|
<el-table-column type="selection" v-if="stockList.selection" width="55" align="center"></el-table-column> |
|
|
|
|
<el-table-column v-if="stockList.index" label="序号" type="index" width="80px" align="center"></el-table-column> |
|
|
|
|
<template v-for="(item,index) in stockList.column"> |
|
|
|
|
<el-table-column v-if="item.hide!==true" |
|
|
|
|
:prop="item.prop" |
|
|
|
|
:label="item.label" |
|
|
|
|
:width="item.width" |
|
|
|
|
:key="index"> |
|
|
|
|
</el-table-column> |
|
|
|
|
</template> |
|
|
|
|
<!-- 操作栏模块 --> |
|
|
|
|
<el-table-column prop="menu" label="操作" :width="220" align="center"> |
|
|
|
|
<template #="{row}"> |
|
|
|
|
<el-button type="primary" text icon="el-icon-view" @click="viewPackage(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="addvalueServe(row)">增值服务</el-button> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</el-table> |
|
|
|
|
<el-form-item style="margin-left: 45%;margin-top: 5px"> |
|
|
|
|
</template> |
|
|
|
|
<el-table-column label="预约数量" type="index" width="100px"> |
|
|
|
|
<template #="{row}"> |
|
|
|
|
<el-input v-model="row.number" type="number" placeholder="请输入内容"></el-input> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
</el-table> |
|
|
|
|
</el-tab-pane> |
|
|
|
|
|
|
|
|
|
</el-tabs> |
|
|
|
|
<el-form-item style="margin-left: 45%;margin-top: 5px"> |
|
|
|
|
<el-button type="primary" icon="el-icon-circle-close" @click="onSubmit">提交(配送订单预约)</el-button> |
|
|
|
|
<el-button icon="el-icon-circle-close" @click="$router.go(-1)">返 回</el-button> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-row> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-dialog |
|
|
|
|
v-model="orderShow" |
|
|
|
|
title="在库订单信息" |
|
|
|
|
width="100%" |
|
|
|
|
:model="addvalue" |
|
|
|
|
:before-close="handleClose" |
|
|
|
|
> |
|
|
|
|
:before-close="handleClose"> |
|
|
|
|
<el-form :inline="true" :model="query"> |
|
|
|
|
<el-form-item label="商场名称:"> |
|
|
|
|
<el-input v-model="query.mallName" placeholder="请输入商场名称"></el-input> |
|
|
|
|
@ -273,7 +232,7 @@
|
|
|
|
|
@selection-change="selectionChange" |
|
|
|
|
:data="stockArticleInfo" |
|
|
|
|
:height="height" |
|
|
|
|
style="width: 90%" |
|
|
|
|
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 v-if="option.index" label="序号" type="index" width="80px" align="center"></el-table-column> |
|
|
|
|
@ -285,30 +244,64 @@
|
|
|
|
|
:key="index"> |
|
|
|
|
</el-table-column> |
|
|
|
|
</template> |
|
|
|
|
<!-- 操作栏模块 --> |
|
|
|
|
<!-- <el-table-column prop="menu" label="操作" :width="220" align="center">--> |
|
|
|
|
<!-- <template #="{row}">--> |
|
|
|
|
<!-- <el-button type="primary" text icon="el-icon-view" @click="viewPackage(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="addvalueServe(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="onSubmitOrder">提交(订单选择)</el-button> |
|
|
|
|
<el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder">提交(订单)</el-button> |
|
|
|
|
<el-button icon="el-icon-circle-close" @click="orderShow=false">返 回</el-button> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-dialog |
|
|
|
|
v-model="stockListShow" |
|
|
|
|
title="库存品信息" |
|
|
|
|
width="100%" |
|
|
|
|
:model="addvalue" |
|
|
|
|
:before-close="handleClose"> |
|
|
|
|
<el-form :inline="true" :model="query"> |
|
|
|
|
<el-form-item label="顾客电话:"> |
|
|
|
|
<el-input v-model="query.customerTelephone" placeholder="请输入服务类型"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="顾客地址:"> |
|
|
|
|
<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> |
|
|
|
|
<el-table ref="table" |
|
|
|
|
v-loading="loading" |
|
|
|
|
@selection-change="selectionChange" |
|
|
|
|
:data="inventoryInfo" |
|
|
|
|
:height="height" |
|
|
|
|
style="width: 90%" |
|
|
|
|
:border="stockList.border"> |
|
|
|
|
<el-table-column type="selection" v-if="stockList.selection" width="55" align="center"></el-table-column> |
|
|
|
|
<el-table-column v-if="stockList.index" label="序号" type="index" width="80px" align="center"></el-table-column> |
|
|
|
|
<template v-for="(item,index) in stockList.column"> |
|
|
|
|
<el-table-column 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="onSubmitInventory">提交(库存品)</el-button> |
|
|
|
|
<el-button icon="el-icon-circle-close" @click="stockListShow=false">返 回</el-button> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-dialog |
|
|
|
|
v-model="dialogVisible" |
|
|
|
|
title="增值服务" |
|
|
|
|
width="30%" |
|
|
|
|
:model="addvalue" |
|
|
|
|
:before-close="handleClose" |
|
|
|
|
> |
|
|
|
|
|
|
|
|
|
: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%;" |
|
|
|
|
@ -340,8 +333,6 @@
|
|
|
|
|
<el-input type="number" v-model="item.e" :disabled = "this.form?.freightMark?.indexOf(item.dictKey) == -1" |
|
|
|
|
@change="textbox($event,index,6)" style="width: 10%;border:none; border-bottom:2px solid #eee;"/> |
|
|
|
|
</span> |
|
|
|
|
<!-- <el-input type="number" v-model="item.remark" placeholder="请输入费用" :disabled = "this.form?.freightMark?.indexOf(item.dictKey) == -1"--> |
|
|
|
|
<!-- @change="textbox($event,index)" style="width: 50%;border:none; border-bottom:2px solid #eee;"/>--> |
|
|
|
|
</el-checkbox> |
|
|
|
|
</el-checkbox-group> |
|
|
|
|
</el-form-item> |
|
|
|
|
@ -362,15 +353,14 @@
|
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
|
import { add, update, remove } from "@/api/distribution/distributionReservation"; |
|
|
|
|
|
|
|
|
|
import { getList } from "@/api/distribution/distributionStockArticle"; |
|
|
|
|
|
|
|
|
|
import { getListDelivery, getDetailDelivery, addDelivery, updateDelivery, removeDelivery } from "@/api/distribution/distributionDelivery"; |
|
|
|
|
|
|
|
|
|
import { getList, getStockArticleList } from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
import { getDetailDelivery, addDelivery } from "@/api/distribution/distributionDelivery"; |
|
|
|
|
import { addIncrement } from "@/api/distribution/distributionStockArticle"; |
|
|
|
|
import { getInventoryList } from "@/api/distribution/distributionStockList"; |
|
|
|
|
|
|
|
|
|
// import option from "@/option/distribution/distributionDelivery"; |
|
|
|
|
import option from "@/option/distribution/distributionStockArticle"; |
|
|
|
|
import StockList from "@/option/distribution/distributionStockList"; |
|
|
|
|
import { mapGetters } from "vuex"; |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
|
|
|
|
|
@ -402,6 +392,7 @@ export default {
|
|
|
|
|
selectionList: [], |
|
|
|
|
// 表单配置 |
|
|
|
|
option: option, |
|
|
|
|
stockList:StockList, |
|
|
|
|
// 表单列表 |
|
|
|
|
data: [], |
|
|
|
|
//增值服务弹窗 |
|
|
|
|
@ -430,10 +421,28 @@ export default {
|
|
|
|
|
orderShow:false, |
|
|
|
|
//在库订单信息 |
|
|
|
|
stockArticleInfo:{}, |
|
|
|
|
//库存品信息 |
|
|
|
|
inventoryInfo:{}, |
|
|
|
|
//时段 |
|
|
|
|
periodOfTimeData:[], |
|
|
|
|
//路由订单编号 |
|
|
|
|
orderIds:'', |
|
|
|
|
inventoryData:[], |
|
|
|
|
orderData:[], |
|
|
|
|
stockListShow:false, |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
created() { |
|
|
|
|
this.$watch( |
|
|
|
|
() => this.$route.params, |
|
|
|
|
() => { |
|
|
|
|
this.fetchData(); |
|
|
|
|
}, |
|
|
|
|
// 组件创建完后获取数据， |
|
|
|
|
// 此时 data 已经被 observed 了 |
|
|
|
|
{ immediate: true } |
|
|
|
|
); |
|
|
|
|
}, |
|
|
|
|
mounted () { |
|
|
|
|
this.init(); |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
@ -450,6 +459,13 @@ export default {
|
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
fetchData() { |
|
|
|
|
this.error = this.post = null; |
|
|
|
|
this.loading = true; |
|
|
|
|
if (this.$route.query.id) { |
|
|
|
|
this.orderIds = this.$route.query.id; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
init () { |
|
|
|
|
this.height = this.setPx(document.body.clientHeight - 340); |
|
|
|
|
}, |
|
|
|
|
@ -487,10 +503,12 @@ export default {
|
|
|
|
|
message: "操作成功!" |
|
|
|
|
}); |
|
|
|
|
}) |
|
|
|
|
console.log("a[]>>>>>>>",params); |
|
|
|
|
}, |
|
|
|
|
bbb(){ |
|
|
|
|
this.orderShow = true; |
|
|
|
|
handleAddOrder(){ |
|
|
|
|
this.orderShow = true; |
|
|
|
|
}, |
|
|
|
|
handleAddInventory(){ |
|
|
|
|
this.stockListShow = true; |
|
|
|
|
}, |
|
|
|
|
handleCheckedCitiesChange(value) { |
|
|
|
|
console.log(">>>>>>>",value ); |
|
|
|
|
@ -528,25 +546,20 @@ export default {
|
|
|
|
|
this.costList[index+1]=e; |
|
|
|
|
|
|
|
|
|
//费用列表 |
|
|
|
|
console.log(">>>>>>>",this.costList); |
|
|
|
|
}, |
|
|
|
|
//数据字典数据获取 |
|
|
|
|
getDictionary(){ |
|
|
|
|
getDictionaryBiz("addvalue_serve_type").then(res=>{ |
|
|
|
|
this.addvalueServeTypeData = res.data.data; |
|
|
|
|
console.log(this.addvalueServeTypeData); |
|
|
|
|
}) |
|
|
|
|
getDictionaryBiz("delivery_way").then(res=>{ |
|
|
|
|
this.deliveryWayData = res.data.data; |
|
|
|
|
console.log(this.deliveryWayData); |
|
|
|
|
}) |
|
|
|
|
getDictionaryBiz("delivery_type").then(res=>{ |
|
|
|
|
this.deliveryTypeData = res.data.data; |
|
|
|
|
console.log(this.deliveryTypeData); |
|
|
|
|
}) |
|
|
|
|
getDictionaryBiz("period_of_time").then(res=>{ |
|
|
|
|
this.periodOfTimeData = res.data.data; |
|
|
|
|
console.log(this.deliveryTypeData); |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
addvalueServe(row){ |
|
|
|
|
@ -594,11 +607,12 @@ export default {
|
|
|
|
|
this.isaddvalue = true; |
|
|
|
|
}, |
|
|
|
|
onSubmit(){ |
|
|
|
|
console.log(">>>>>>>>this.form",this.form); |
|
|
|
|
let ids = []; |
|
|
|
|
this.data.forEach(item=>{ |
|
|
|
|
this.orderData.forEach(item=>{ |
|
|
|
|
ids.push(item.id) |
|
|
|
|
}) |
|
|
|
|
console.log(">>>>>>>>>>>",this.inventoryData); |
|
|
|
|
console.log(">>>>>>>>>>>",this.orderData); |
|
|
|
|
ids.join(","); |
|
|
|
|
console.log(ids); |
|
|
|
|
this.form.ids=ids.toString(); |
|
|
|
|
@ -627,15 +641,16 @@ export default {
|
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
this.form.serveType= a.toString(); |
|
|
|
|
add(this.form).then(() => { |
|
|
|
|
this.box = false; |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
this.$router.go(-1); |
|
|
|
|
this.$message({ |
|
|
|
|
type: "success", |
|
|
|
|
message: "操作成功!" |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
console.log(this.form); |
|
|
|
|
// add(this.form).then(() => { |
|
|
|
|
// this.box = false; |
|
|
|
|
// this.onLoad(this.page); |
|
|
|
|
// this.$router.go(-1); |
|
|
|
|
// this.$message({ |
|
|
|
|
// type: "success", |
|
|
|
|
// message: "操作成功!" |
|
|
|
|
// }); |
|
|
|
|
// }); |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
handleClose(done) { |
|
|
|
|
@ -645,17 +660,8 @@ export default {
|
|
|
|
|
}) |
|
|
|
|
.catch(_ => {}); |
|
|
|
|
}, |
|
|
|
|
handleAdd () { |
|
|
|
|
this.title = '新增' |
|
|
|
|
this.form = {} |
|
|
|
|
this.box = true |
|
|
|
|
}, |
|
|
|
|
handleEdit (row) { |
|
|
|
|
this.title = '编辑' |
|
|
|
|
this.box = true |
|
|
|
|
getDetailDelivery(row.id).then(res => { |
|
|
|
|
this.form = res.data.data; |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
handleView (row) { |
|
|
|
|
this.title = '查看' |
|
|
|
|
@ -713,6 +719,15 @@ export default {
|
|
|
|
|
console.log(">>>>>>>>>>>>>",list); |
|
|
|
|
this.selectionList = list; |
|
|
|
|
}, |
|
|
|
|
// 增加库存品 |
|
|
|
|
onSubmitInventory(){ |
|
|
|
|
if (this.selectionList.length === 0) { |
|
|
|
|
this.$message.warning("请选择至少一条数据"); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
this.inventoryData = this.selectionList |
|
|
|
|
this.stockListShow =false |
|
|
|
|
}, |
|
|
|
|
/** |
|
|
|
|
* 增加订单提交 |
|
|
|
|
*/ |
|
|
|
|
@ -738,7 +753,7 @@ export default {
|
|
|
|
|
}); |
|
|
|
|
return ; |
|
|
|
|
} |
|
|
|
|
this.data = this.selectionList |
|
|
|
|
this.orderData = this.selectionList |
|
|
|
|
this.orderShow =false |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -756,15 +771,60 @@ export default {
|
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
}, |
|
|
|
|
onLoad (page, params = {}) { |
|
|
|
|
console.log(">>>>>>>>>>>>>>>>",this.orderIds); |
|
|
|
|
this.loading = true; |
|
|
|
|
this.query.genre = 1; |
|
|
|
|
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
|
const data = res.data.data; |
|
|
|
|
this.page.total = data.total; |
|
|
|
|
this.stockArticleInfo = data.records; |
|
|
|
|
this.loading = false; |
|
|
|
|
this.selectionClear(); |
|
|
|
|
}); |
|
|
|
|
if (this.orderIds){ |
|
|
|
|
getStockArticleList(this.orderIds).then(res=>{ |
|
|
|
|
console.log(res.data.data); |
|
|
|
|
const data = res.data.data |
|
|
|
|
let name = ''; |
|
|
|
|
let phone = ''; |
|
|
|
|
let address = ''; |
|
|
|
|
let f = false; |
|
|
|
|
for (let i = 0; i <data.length; i++) { |
|
|
|
|
if (i===0){ |
|
|
|
|
name = data[0].customerName; |
|
|
|
|
phone = data[0].customerTelephone; |
|
|
|
|
address = data[0].customerAddress; |
|
|
|
|
} |
|
|
|
|
if (data[i].customerName === name && data[i].customerTelephone === phone && data[i].customerAddress === address){ |
|
|
|
|
f=true; |
|
|
|
|
}else |
|
|
|
|
f=false; |
|
|
|
|
} |
|
|
|
|
if (!f){ |
|
|
|
|
this.$message({ |
|
|
|
|
type: "error", |
|
|
|
|
message: "请选择同一顾客订单!" |
|
|
|
|
}); |
|
|
|
|
this.$router.go(-1); |
|
|
|
|
} |
|
|
|
|
this.form.consignee =name |
|
|
|
|
this.form.deliveryPhone=phone |
|
|
|
|
this.form.deliveryAddress=address |
|
|
|
|
|
|
|
|
|
this.orderData=data; |
|
|
|
|
this.loading = false; |
|
|
|
|
}) |
|
|
|
|
}else { |
|
|
|
|
getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)) .then(res=>{ |
|
|
|
|
const data = res.data.data; |
|
|
|
|
this.page.total = data.total; |
|
|
|
|
this.inventoryInfo = data.records; |
|
|
|
|
this.loading = false; |
|
|
|
|
this.selectionClear(); |
|
|
|
|
}) |
|
|
|
|
this.query.genre = 1; |
|
|
|
|
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
|
const data = res.data.data; |
|
|
|
|
this.page.total = data.total; |
|
|
|
|
this.stockArticleInfo = data.records; |
|
|
|
|
this.loading = false; |
|
|
|
|
this.selectionClear(); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
kilo
2 years ago