|
|
|
|
@ -45,14 +45,14 @@
|
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-row> |
|
|
|
|
<el-col :span="10"> |
|
|
|
|
<el-form-item label="收件人电话:" prop="deliveryPhone" label-width="100px"> |
|
|
|
|
<el-input v-model="form.deliveryPhone" placeholder="请输入收件人电话" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-col :span="10"> |
|
|
|
|
<el-form-item label="配送类型:" prop="serveType" label-width="100px"> |
|
|
|
|
<!-- v-for="item in this.deliveryTypeData"--> |
|
|
|
|
@ -62,7 +62,7 @@
|
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-row> |
|
|
|
|
<el-col :span="10"> |
|
|
|
|
<el-form-item label="代收运费:" prop="replaceFee" label-width="100px"> |
|
|
|
|
@ -78,7 +78,7 @@
|
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-row> |
|
|
|
|
<!-- <el-col :span="10">--> |
|
|
|
|
<!-- <el-form-item label="到付运费:" prop="collectFee" label-width="100px">--> |
|
|
|
|
@ -100,7 +100,7 @@
|
|
|
|
|
</el-radio-group> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-col :span="10"> |
|
|
|
|
<el-form-item label="其他费用:" prop="collectFee" label-width="100px"> |
|
|
|
|
<el-input v-model="form.otherFee" placeholder="请输入其他费用" /> |
|
|
|
|
@ -123,7 +123,7 @@
|
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
</el-form> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-tabs type="border-card"> |
|
|
|
|
<el-tab-pane label="订单"> |
|
|
|
|
<el-button class="el-btn-xz" type="primary" link @click="handleAddOrder">新 增</el-button> |
|
|
|
|
@ -185,7 +185,7 @@
|
|
|
|
|
:label="item.label" |
|
|
|
|
:width="item.width" |
|
|
|
|
:key="index"> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</el-table-column> |
|
|
|
|
</template> |
|
|
|
|
<el-table-column prop="menu" label="操作" :width="220" align="center"> |
|
|
|
|
@ -195,12 +195,12 @@
|
|
|
|
|
</el-button> |
|
|
|
|
<el-button type="primary" link icon="el-icon-edit" @click="removeStockArticle(row)">移除 |
|
|
|
|
</el-button> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
</el-table> --> |
|
|
|
|
</el-tab-pane> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-tab-pane label="库存品"> |
|
|
|
|
<el-button class="el-btn-xz" link @click="handleAddInventory">新 增</el-button> |
|
|
|
|
<tablecmt |
|
|
|
|
@ -221,7 +221,7 @@
|
|
|
|
|
<!-- icon="el-icon-edit"--> |
|
|
|
|
<!-- @click="showStockListEdit(slotProps.scope.row)"--> |
|
|
|
|
<!-- >查看详情</el-text>--> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-text |
|
|
|
|
type="primary" |
|
|
|
|
link |
|
|
|
|
@ -239,7 +239,7 @@
|
|
|
|
|
</el-button> |
|
|
|
|
<el-button icon="el-icon-circle-close" @click="$router.go(-1)">返 回</el-button> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<template v-if="orderShow"> |
|
|
|
|
<el-dialog v-model="orderShow" title="在库订单信息" width="100%" :model="addvalue"> |
|
|
|
|
<!-- :before-close="handleClose"--> |
|
|
|
|
@ -262,7 +262,7 @@
|
|
|
|
|
<el-form-item label="顾客电话:"> |
|
|
|
|
<el-input v-model="query.customerTelephone" placeholder="请输入顾客电话"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!-- 查询按钮 --> |
|
|
|
|
<el-form-item> |
|
|
|
|
<el-button type="primary" icon="el-icon-search" @click="searchStockArticle" |
|
|
|
|
@ -293,7 +293,7 @@
|
|
|
|
|
</el-text> |
|
|
|
|
</template> |
|
|
|
|
</tablecmt> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-row> |
|
|
|
|
<div class="avue-crud__pagination" style="width: 100%"> |
|
|
|
|
<!-- 分页模块 --> |
|
|
|
|
@ -319,7 +319,7 @@
|
|
|
|
|
</el-form-item> |
|
|
|
|
</el-dialog> |
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-dialog v-model="zeroOrderShow" title="零担品类信息" width="50%" :model="zeroOrderData"> |
|
|
|
|
<el-row :gutter="24" class="rows"> |
|
|
|
|
<el-col :xl="4" :lg="7" :md="8" :sm="24"> |
|
|
|
|
@ -328,7 +328,7 @@
|
|
|
|
|
</h3> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<template v-if="zeroOrderData != null"> |
|
|
|
|
<div v-for="(item, index) in zeroOrderData" :key="index"> |
|
|
|
|
<el-row :gutter="24" class="rows"> |
|
|
|
|
@ -387,7 +387,7 @@
|
|
|
|
|
<el-button icon="el-icon-circle-close" @click="zeroOrderShow = false">返 回</el-button> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<template v-if="stockListShow"> |
|
|
|
|
<el-dialog v-model="stockListShow" title="库存品信息" width="100%"> |
|
|
|
|
<!-- :before-close="handleClose"--> |
|
|
|
|
@ -445,7 +445,7 @@
|
|
|
|
|
</el-form-item> |
|
|
|
|
</el-dialog> |
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<template v-if="isaddvalue"> |
|
|
|
|
<el-dialog v-model="isaddvalue" title="包件信息" width="100%" :model="addvalue"> |
|
|
|
|
<!-- 列表模块 --> |
|
|
|
|
@ -511,7 +511,7 @@
|
|
|
|
|
</el-form-item> |
|
|
|
|
</el-dialog> |
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-dialog |
|
|
|
|
v-model="dialogVisible" |
|
|
|
|
title="增值服务" |
|
|
|
|
@ -600,10 +600,10 @@
|
|
|
|
|
</div> |
|
|
|
|
</basic-container> |
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
|
import { |
|
|
|
|
autonomouslySave, |
|
|
|
|
add, |
|
|
|
|
update, |
|
|
|
|
remove, |
|
|
|
|
getReservationInfo, |
|
|
|
|
@ -620,13 +620,13 @@
|
|
|
|
|
import { getDetailDelivery } from '@/api/distribution/distributionDelivery'; |
|
|
|
|
import { addIncrement } from '@/api/distribution/distributionStockArticle'; |
|
|
|
|
import {getStockListClient,selectInventoryDetail } from '@/api/distribution/distributionStockList'; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import option from '@/option/distribution/distributionStockArticle'; |
|
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
import dayjs from 'dayjs'; |
|
|
|
|
import { entryNum, updateEntryNum } from '@/api/distribution/distributionParcelNumber'; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
|
data() { |
|
|
|
|
return { |
|
|
|
|
@ -1873,7 +1873,7 @@
|
|
|
|
|
}, |
|
|
|
|
mounted() { |
|
|
|
|
this.init(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
this.getDictionary(); |
|
|
|
|
}, |
|
|
|
|
@ -1984,9 +1984,9 @@
|
|
|
|
|
}); |
|
|
|
|
this.page.total = inventoryList.total; |
|
|
|
|
console.log('res :>> ', res); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 过滤掉已选择的数量 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const _inventoryInfo = inventoryList.records; |
|
|
|
|
this.inventoryInfo = _inventoryInfo; |
|
|
|
|
if (this.inventoryData.length !== 0) { |
|
|
|
|
@ -2035,7 +2035,7 @@
|
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
this.costList[index + 1] = e; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//费用列表 |
|
|
|
|
}, |
|
|
|
|
//数据字典数据获取 |
|
|
|
|
@ -2118,7 +2118,7 @@
|
|
|
|
|
this.zeroOrderShow = true; |
|
|
|
|
this.isrReservationEntry = false; |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 选择包件信息 |
|
|
|
|
// selectionPackageChange(list) { |
|
|
|
|
// console.log(list,'list22'); |
|
|
|
|
@ -2159,7 +2159,7 @@
|
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// if (row) { |
|
|
|
|
// this.selectionPackageChange(row) |
|
|
|
|
// console.log( this.selectionPackageChange(),'12312312312321函数'); |
|
|
|
|
@ -2202,7 +2202,7 @@
|
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 选择包件信息 |
|
|
|
|
// selectionPackageChange(list) { |
|
|
|
|
// console.log(list,'list22'); |
|
|
|
|
@ -2224,7 +2224,7 @@
|
|
|
|
|
// } |
|
|
|
|
// }, |
|
|
|
|
// 全选表格新增 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
checkPackage(row, index) { |
|
|
|
|
//区分编辑还是新增 |
|
|
|
|
//编辑需要对这个预约单下的包件信息均可进行调整 |
|
|
|
|
@ -2295,7 +2295,7 @@
|
|
|
|
|
// 提交包件数 |
|
|
|
|
onSubmitPackage() { |
|
|
|
|
// this.packageListInfo |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (this.packageDataSec.length === 0) { |
|
|
|
|
this.$message.warning('请选择包件!!!'); |
|
|
|
|
return; |
|
|
|
|
@ -2375,7 +2375,7 @@
|
|
|
|
|
}); |
|
|
|
|
console.log('------------------->this.form.inventoryList', this.form.inventoryList); |
|
|
|
|
console.log('------------------->this.form.stockArticleList', this.form.stockArticleList); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if ( |
|
|
|
|
JSON.stringify(this.form.inventoryList) === '[]' && |
|
|
|
|
JSON.stringify(this.form.stockArticleList) === '[]' |
|
|
|
|
@ -2400,7 +2400,7 @@
|
|
|
|
|
}); |
|
|
|
|
} else { |
|
|
|
|
this.form.reservationStatus = '20'; |
|
|
|
|
autonomouslySave(this.form).then(() => { |
|
|
|
|
add(this.form).then(() => { |
|
|
|
|
this.$message({ |
|
|
|
|
type: 'success', |
|
|
|
|
message: '操作成功!', |
|
|
|
|
@ -2543,17 +2543,17 @@
|
|
|
|
|
console.log('this.obj--------------------->', this.obj); |
|
|
|
|
console.log('this.zeroOrderData--------------------->', this.zeroOrderData); |
|
|
|
|
console.log('this.zeroOrderData--------------------->', this.zeroOrderData); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.isrReservationEntry = false; |
|
|
|
|
let a = this.zeroOrderData; |
|
|
|
|
if (a.length > 1) { |
|
|
|
|
let b = 0; |
|
|
|
|
//计算该品类已使用数量 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
a.forEach(item => { |
|
|
|
|
b += item.number; |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let f = a.every(item => { |
|
|
|
|
console.log('this.number--------------------->', item.number); |
|
|
|
|
console.log( |
|
|
|
|
@ -2568,7 +2568,7 @@
|
|
|
|
|
} |
|
|
|
|
return true; |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (b > this.obj.handQuantity) { |
|
|
|
|
this.$message({ |
|
|
|
|
type: 'error', |
|
|
|
|
@ -2650,7 +2650,7 @@
|
|
|
|
|
}); |
|
|
|
|
console.log('this.zeroOrderData------------->', this.zeroOrderData); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.zeroOrderShow = false; |
|
|
|
|
}, |
|
|
|
|
// 增加库存品 |
|
|
|
|
@ -2679,7 +2679,7 @@
|
|
|
|
|
this.marketName = _marketName; |
|
|
|
|
console.log('this.inventoryList :>> ', this.inventoryList); |
|
|
|
|
this.inventoryData = [...this.inventoryData, ...this.inventoryList]; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.stockListShow = false; |
|
|
|
|
}, |
|
|
|
|
/** |
|
|
|
|
@ -2693,7 +2693,7 @@
|
|
|
|
|
let _address = list[0].customerAddress; |
|
|
|
|
let _phone = list[0].customerTelephone; |
|
|
|
|
let _marketName = list[0].mallName; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 循环查看数据是否符合要求 |
|
|
|
|
const isRturn = list.every(item => { |
|
|
|
|
if (item.mallName !== _marketName) { |
|
|
|
|
@ -2710,17 +2710,17 @@
|
|
|
|
|
} |
|
|
|
|
return true; |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!isRturn) return; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 设置商场名称 |
|
|
|
|
if (this.marketName === '') this.marketName = _marketName; |
|
|
|
|
// this.marketName = list[0].marketName; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.form.consignee = _name; |
|
|
|
|
this.form.deliveryAddress = _address; |
|
|
|
|
this.form.deliveryPhone = _phone; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//这里需要对选择的订单进行筛选 |
|
|
|
|
const _ids = this.orderData.map(val => val.id); |
|
|
|
|
this.orderData = [ |
|
|
|
|
@ -2823,7 +2823,7 @@
|
|
|
|
|
} else if (row.prop === 'completeSetName') { |
|
|
|
|
this.query['completeSet'] = index; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
else { |
|
|
|
|
this.query[row.prop] = index; |
|
|
|
|
} |
|
|
|
|
@ -2843,7 +2843,7 @@
|
|
|
|
|
); |
|
|
|
|
console.log('res ===>>', res) |
|
|
|
|
const { records, total } = res.data.data; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.stockArticleInfo = records; |
|
|
|
|
this.stockArticleInfo.forEach((item, index) => { |
|
|
|
|
//检查订单是否冻结 |
|
|
|
|
@ -2857,7 +2857,7 @@
|
|
|
|
|
this.orderList = []; |
|
|
|
|
return null; |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
onLoad() { |
|
|
|
|
// this.loading = true; |
|
|
|
|
this.form.deliveryType = '2'; |
|
|
|
|
@ -2932,12 +2932,12 @@
|
|
|
|
|
input::-webkit-inner-spin-button { |
|
|
|
|
-webkit-appearance: none; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
input[type='number'] { |
|
|
|
|
-moz-appearance: textfield; |
|
|
|
|
} |
|
|
|
|
</style> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<style lang="scss" scoped> |
|
|
|
|
.el-btn-xz { |
|
|
|
|
width: 68px; |
|
|
|
|
@ -2947,4 +2947,3 @@
|
|
|
|
|
border-radius: 4px; |
|
|
|
|
} |
|
|
|
|
</style> |
|
|
|
|
|
