|
@@ -44,9 +44,9 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="手机号:" prop="sender.phone">
|
|
|
- {{ deliveryForms.sender.phone }}
|
|
|
- <!-- <el-input v-model="deliveryForms.sender.phone" :minlength="1" :maxlength="20" :disabled="true"
|
|
|
+ <el-form-item label="手机号:" prop="sender.mobile">
|
|
|
+ {{ deliveryForms.sender.mobile }}
|
|
|
+ <!-- <el-input v-model="deliveryForms.sender.mobile" :minlength="1" :maxlength="20" :disabled="true"
|
|
|
placeholder="请输入手机号"></el-input> --> </el-form-item></el-col>
|
|
|
<el-col :span="18">
|
|
|
<el-form-item label="发货地址:" prop="sender.address">
|
|
@@ -95,8 +95,8 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="手机号:" prop="receiver.phone">
|
|
|
- {{ deliveryForms.receiver.phone }}
|
|
|
+ <el-form-item label="手机号:" prop="receiver.mobile">
|
|
|
+ {{ deliveryForms.receiver.mobile }}
|
|
|
<!-- <el-input v-model="deliveryForms.receiver.phone" :minlength="1" :maxlength="20" :disabled="true"
|
|
|
placeholder="请输入手机号"></el-input> --></el-form-item></el-col>
|
|
|
<el-col :span="18">
|
|
@@ -194,7 +194,8 @@
|
|
|
<div>
|
|
|
<p v-for="item in scope.row.area_stock_list" :key="item.id">{{ item.warehouse_area_name }}</p>
|
|
|
</div>
|
|
|
- <span slot="reference" v-if="scope.row.area_stock_list.length!==0">{{ scope.row.area_stock_list[0].warehouse_area_name }}</span>
|
|
|
+ <span slot="reference" v-if="scope.row.area_stock_list.length !== 0">{{
|
|
|
+ scope.row.area_stock_list[0].warehouse_area_name }}</span>
|
|
|
</el-popover>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -662,13 +663,13 @@ export default {
|
|
|
//发货人
|
|
|
sender: {
|
|
|
name: "",
|
|
|
- phone: "",
|
|
|
+ mobile: "",
|
|
|
address: "",
|
|
|
},
|
|
|
//收货人
|
|
|
receiver: {
|
|
|
name: "",
|
|
|
- phone: "",
|
|
|
+ mobile: "",
|
|
|
address: "",
|
|
|
},
|
|
|
//商品信息列表
|
|
@@ -699,7 +700,7 @@ export default {
|
|
|
{ required: true, message: "请输入发货人姓名", trigger: "blur" },
|
|
|
],
|
|
|
|
|
|
- phone: [
|
|
|
+ mobile: [
|
|
|
this.MixinRequired("请输入手机号码!"),
|
|
|
{
|
|
|
validator: (rule, value, callback) => {
|
|
@@ -717,7 +718,7 @@ export default {
|
|
|
name: [
|
|
|
{ required: true, message: "请输入收货人姓名", trigger: "blur" },
|
|
|
],
|
|
|
- phone: [
|
|
|
+ mobile: [
|
|
|
this.MixinRequired("请输入手机号码!"),
|
|
|
{
|
|
|
validator: (rule, value, callback) => {
|
|
@@ -805,7 +806,6 @@ export default {
|
|
|
return -1;
|
|
|
},
|
|
|
fullSenderAddress() {
|
|
|
- console.log(this.deliveryForms.sender);
|
|
|
const { province_name, city_name, area_name, address } = this.deliveryForms.sender;
|
|
|
return [province_name, city_name, area_name, address].filter(Boolean).join("");
|
|
|
},
|
|
@@ -881,9 +881,9 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
//扫序列号goodsExchangeAddForm.product_list[this.index].sn_code_list
|
|
|
- toSnCode() {
|
|
|
+ async toSnCode() {
|
|
|
if (this.sku == '') return this.$message.error('请录入正确的sku')
|
|
|
- API_GoodsExchange.getSnCode("out", this.sku, this.sn_code.replace(/\s+/g, '')).then((res) => {
|
|
|
+ await API_GoodsExchange.getSnCode("out", this.sku, this.sn_code.replace(/\s+/g, '')).then(async (res) => {
|
|
|
this.sn_code = "";
|
|
|
// 假设res是一个对象,我们根据res的某个属性(如sn)来检查重复
|
|
|
let exists = this.goodsExchangeAddForm.product_list[
|
|
@@ -891,8 +891,10 @@ export default {
|
|
|
].sn_code_list.find(
|
|
|
(item) => item.sn_code === res.sn_code && item.sku === res.sku
|
|
|
);
|
|
|
+ console.log(this.goodsExchangeAddForm.product_list[this.index]);
|
|
|
+ if (this.goodsExchangeAddForm.product_list[this.index].num >= this.goodsExchangeAddForm.product_list[this.index].orderNum) return this.$message.warning('录入完成,请录入下一条!')
|
|
|
if (!exists) {
|
|
|
- API_GoodsExchange.skuRedis({
|
|
|
+ await API_GoodsExchange.skuRedis({
|
|
|
send_order_id: this.id, item_id: this.goodsExchangeAddForm.product_list[
|
|
|
this.index
|
|
|
].id, sku: res
|
|
@@ -913,8 +915,7 @@ export default {
|
|
|
this.goodsExchangeAddForm.product_list[this.index].id = this.product_list[indexs].id
|
|
|
if (this.goodsExchangeAddForm.product_list[this.index].num == this.product_list[indexs].num) {
|
|
|
this.scanGoodsForm.bar_code = "";
|
|
|
- return this.$message.warning('录入完成,请录入下一条!')
|
|
|
- /* this.scanDialogVisible = false; */
|
|
|
+
|
|
|
} else {
|
|
|
this.scanGoodsForm.bar_code = "";
|
|
|
this.$nextTick(() => {
|
|
@@ -982,7 +983,7 @@ export default {
|
|
|
item.goods_name = el.goods_vo.name;
|
|
|
/* item.goods_price = el.product_vo.price; */
|
|
|
item.quantity = el.orderNum;
|
|
|
- item.unit = el.product_vo.unit;
|
|
|
+ /* item.unit = el.product_vo.unit; */
|
|
|
return params.goods_list.push(item);
|
|
|
});
|
|
|
params.goods_num = this.product_list.reduce(
|
|
@@ -996,6 +997,10 @@ export default {
|
|
|
params.send_address = this.send_address;
|
|
|
params.receive_address = this.receive_address;
|
|
|
params.order_code = this.id;
|
|
|
+ if(params.total_weight==0) {
|
|
|
+ this.btnType = false;
|
|
|
+ return this.$message.error("请填写物品总重量!")
|
|
|
+ }
|
|
|
API_order.getKdShip(this.id, params).then((res) => {
|
|
|
this.kdnCode = res;
|
|
|
this.btnType = false;
|
|
@@ -1215,21 +1220,28 @@ export default {
|
|
|
if (res.order_vo && res.order_vo.province_city_area) {
|
|
|
this.receiverOptions = res.order_vo.province_city_area.split(",");
|
|
|
}
|
|
|
- if (this.outType !== undefined || res.kdn_order_code !== undefined) {
|
|
|
+ if (this.outType !== undefined || res.kdn_order_code !== undefined && res.kdn_order_code !== '') {
|
|
|
this.goodsExchangeAddForm.product_list = res.order_item_vos
|
|
|
this.disabledType = true;
|
|
|
this.deliveryForms.appointment_type = res.appointment_type;
|
|
|
this.deliveryForms.appointment_time = res.appointment_time;
|
|
|
this.deliveryForms.sender.name = res.sender_name;
|
|
|
- this.deliveryForms.sender.phone = res.sender_phone;
|
|
|
+ this.deliveryForms.sender.mobile = res.sender_mobile;
|
|
|
this.deliveryForms.sender.address = res.sender_address;
|
|
|
+ this.deliveryForms.sender.province_name = res.sender_province_name;
|
|
|
+ this.deliveryForms.sender.city_name = res.sender_city_name;
|
|
|
+ this.deliveryForms.sender.area_name = res.sender_area_name;
|
|
|
this.deliveryForms.receiver.name = res.receiver_name;
|
|
|
- this.deliveryForms.receiver.phone = res.receiver_phone;
|
|
|
+ this.deliveryForms.receiver.mobile = res.receiver_mobile;
|
|
|
this.deliveryForms.receiver.address = res.receiver_address;
|
|
|
+ this.deliveryForms.receiver.province_name = res.receiver_province_name;
|
|
|
+ this.deliveryForms.receiver.city_name = res.receiver_city_name;
|
|
|
+ this.deliveryForms.receiver.area_name = res.receiver_area_name;
|
|
|
this.deliveryForms.total_volume = res.total_volume;
|
|
|
this.deliveryForms.declared_value = res.order_vo.real_price;
|
|
|
this.deliveryForms.remark = res.remark;
|
|
|
this.kdnCode = res.kdn_order_code;
|
|
|
+ console.log(this.deliveryForms.sender);
|
|
|
if (
|
|
|
JSON.stringify(res.create_order_fail) == "{}" ||
|
|
|
JSON.stringify(res.create_order_success) == "{}" ||
|
|
@@ -1250,7 +1262,7 @@ export default {
|
|
|
} else {
|
|
|
const params = this.deliveryForms
|
|
|
params.sender.name = res.warehouse_vo.user_name;
|
|
|
- params.sender.phone = res.warehouse_vo.phone;
|
|
|
+ params.sender.mobile = res.warehouse_vo.phone;
|
|
|
//this.selectedOptions = res.warehouse_vo.ware_pro_city_area.split(",")
|
|
|
params.sender.province_name =
|
|
|
codeToText[this.selectedOptions[0]];
|
|
@@ -1258,7 +1270,7 @@ export default {
|
|
|
params.sender.area_name = codeToText[this.selectedOptions[2]];
|
|
|
params.sender.address = res.warehouse_vo.warehouse_address;
|
|
|
params.receiver.name = res.order_vo.customer_name;
|
|
|
- params.receiver.phone = res.order_vo.customer_phone;
|
|
|
+ params.receiver.mobile = res.order_vo.customer_phone;
|
|
|
//this.receiverOptions = res.order_vo.province_city_area.split(",");
|
|
|
params.receiver.province_name =
|
|
|
codeToText[this.receiverOptions[0]];
|
|
@@ -1273,9 +1285,10 @@ export default {
|
|
|
API_GoodsExchange.skuRedis({ send_order_id: this.id, type: 'enter' }).then(response => {
|
|
|
res.order_item_vos.map((el) => {
|
|
|
el.orderNum = el.num
|
|
|
- if (res.kdn_order_code == undefined || res.kdn_order_code == '') {
|
|
|
- el.num = 0
|
|
|
- }
|
|
|
+ el.num = 0
|
|
|
+ /* if (res.kdn_order_code == undefined || res.kdn_order_code == ''|| JSON.stringify(response) == "{}") {
|
|
|
+
|
|
|
+ } */
|
|
|
Object.keys(response).map(item => {
|
|
|
if (el.id == item) {
|
|
|
el.sn_code_list = response[item]
|
|
@@ -1290,7 +1303,6 @@ export default {
|
|
|
this.deliveryForms.total_weight = Number(
|
|
|
el.product_vo.weight * el.num
|
|
|
);
|
|
|
- console.log(el.orderNum);
|
|
|
});
|
|
|
})
|
|
|
this.deliveryForms.status = res.status
|