|
|
|
@ -125,7 +125,7 @@ |
|
|
|
</el-form> |
|
|
|
</el-form> |
|
|
|
|
|
|
|
|
|
|
|
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick"> |
|
|
|
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick"> |
|
|
|
<el-tab-pane name='orderTab' label="订单"> |
|
|
|
<el-tab-pane name="orderTab" label="订单"> |
|
|
|
<el-button class="el-btn-xz" type="primary" link @click="handleAddOrder">新 增</el-button> |
|
|
|
<el-button class="el-btn-xz" type="primary" link @click="handleAddOrder">新 增</el-button> |
|
|
|
<tablecmt |
|
|
|
<tablecmt |
|
|
|
class="tablesc" |
|
|
|
class="tablesc" |
|
|
|
@ -174,7 +174,7 @@ |
|
|
|
</tablecmt> |
|
|
|
</tablecmt> |
|
|
|
</el-tab-pane> |
|
|
|
</el-tab-pane> |
|
|
|
|
|
|
|
|
|
|
|
<el-tab-pane name='InventoryTab' label="库存品"> |
|
|
|
<el-tab-pane name="InventoryTab" label="库存品"> |
|
|
|
<el-button class="el-btn-xz" link @click="handleAddInventory">新 增</el-button> |
|
|
|
<el-button class="el-btn-xz" link @click="handleAddInventory">新 增</el-button> |
|
|
|
<tablecmt |
|
|
|
<tablecmt |
|
|
|
class="tablesc" |
|
|
|
class="tablesc" |
|
|
|
@ -513,13 +513,13 @@ import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
import dayjs from 'dayjs'; |
|
|
|
import dayjs from 'dayjs'; |
|
|
|
import { entryNum, updateEntryNum } from '@/api/distribution/distributionParcelNumber'; |
|
|
|
import { entryNum, updateEntryNum } from '@/api/distribution/distributionParcelNumber'; |
|
|
|
import { setNodeHeight, removeZeroWidth } from '@/utils/util.js'; |
|
|
|
import { setNodeHeight, removeZeroWidth } from '@/utils/util.js'; |
|
|
|
import { ElMessage, ElMessageBox } from 'element-plus' |
|
|
|
import { ElMessage, ElMessageBox } from 'element-plus'; |
|
|
|
import error from '@/error'; |
|
|
|
import error from '@/error'; |
|
|
|
export default { |
|
|
|
export default { |
|
|
|
name: '/distribution/reservation/reservationAddFrom', |
|
|
|
name: '/distribution/reservation/reservationAddFrom', |
|
|
|
data() { |
|
|
|
data() { |
|
|
|
return { |
|
|
|
return { |
|
|
|
activeName:'orderTab', |
|
|
|
activeName: 'orderTab', |
|
|
|
Inventoryloading: true, //库存品加载 |
|
|
|
Inventoryloading: true, //库存品加载 |
|
|
|
packageQuery: {}, |
|
|
|
packageQuery: {}, |
|
|
|
reservationloading: false, |
|
|
|
reservationloading: false, |
|
|
|
@ -2022,7 +2022,7 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
mounted() { |
|
|
|
mounted() { |
|
|
|
this.init(); |
|
|
|
this.init(); |
|
|
|
this.Copyfrom= JSON.parse(JSON.stringify(this.form)) |
|
|
|
this.Copyfrom = JSON.parse(JSON.stringify(this.form)); |
|
|
|
this.onLoad(this.page); |
|
|
|
this.onLoad(this.page); |
|
|
|
this.getDictionary(); |
|
|
|
this.getDictionary(); |
|
|
|
|
|
|
|
|
|
|
|
@ -2542,8 +2542,8 @@ export default { |
|
|
|
this.$store.commit('DEL_TAG_CURRENT'); |
|
|
|
this.$store.commit('DEL_TAG_CURRENT'); |
|
|
|
}, |
|
|
|
}, |
|
|
|
// 最后提交 |
|
|
|
// 最后提交 |
|
|
|
async onSubmit(formEl) { |
|
|
|
async onSubmit(formEl) { |
|
|
|
this.$refs.ruleForm.validate(async valid => { |
|
|
|
this.$refs.ruleForm.validate(async valid => { |
|
|
|
if (valid) { |
|
|
|
if (valid) { |
|
|
|
console.log('submit!'); |
|
|
|
console.log('submit!'); |
|
|
|
try { |
|
|
|
try { |
|
|
|
@ -2645,72 +2645,76 @@ this.$refs.ruleForm.validate(async valid => { |
|
|
|
// this.form.stockArticleList = this.packageList; |
|
|
|
// this.form.stockArticleList = this.packageList; |
|
|
|
console.log('>>>>>>>>', this.form); |
|
|
|
console.log('>>>>>>>>', this.form); |
|
|
|
if (this.reservationId) { |
|
|
|
if (this.reservationId) { |
|
|
|
// 判断是否都没有选择包件 |
|
|
|
// 判断是否都没有选择包件 |
|
|
|
const checkInfoValues = this.form.stockArticleList.every(item => !item.packageListInfo || !item.packageListInfo.length); |
|
|
|
const checkInfoValues = this.form.stockArticleList.every( |
|
|
|
if(checkInfoValues){ |
|
|
|
item => !item.packageListInfo || !item.packageListInfo.length |
|
|
|
ElMessageBox.prompt('当前所有订单都没有选择包件是否确认"取消本次计划"?', '请填写取消原因', { |
|
|
|
); |
|
|
|
confirmButtonText: '确认', |
|
|
|
if (checkInfoValues) { |
|
|
|
cancelButtonText: '关闭', |
|
|
|
ElMessageBox.prompt( |
|
|
|
inputPattern: /^\S+$/, |
|
|
|
'当前所有订单都没有选择包件是否确认"取消本次计划"?', |
|
|
|
inputErrorMessage: '请填写取消原因', |
|
|
|
'请填写取消原因', |
|
|
|
}) |
|
|
|
{ |
|
|
|
.then((value) => { |
|
|
|
confirmButtonText: '确认', |
|
|
|
let data={ |
|
|
|
cancelButtonText: '关闭', |
|
|
|
cancelReason:value.value, |
|
|
|
inputPattern: /^\S+$/, |
|
|
|
id:this.$route.query.reservationId |
|
|
|
inputErrorMessage: '请填写取消原因', |
|
|
|
} |
|
|
|
} |
|
|
|
this.reservationloading=true |
|
|
|
) |
|
|
|
cancelReservation(data).then(res=>{ |
|
|
|
.then(value => { |
|
|
|
console.log(res); |
|
|
|
let data = { |
|
|
|
if(res.data.code ==200){ |
|
|
|
cancelReason: value.value, |
|
|
|
ElMessage({ |
|
|
|
id: this.$route.query.reservationId, |
|
|
|
message: res.data.msg, |
|
|
|
}; |
|
|
|
type: 'success', |
|
|
|
this.reservationloading = true; |
|
|
|
}) |
|
|
|
cancelReservation(data) |
|
|
|
this.$router.push('/distribution/reservation/reservation'); |
|
|
|
.then(res => { |
|
|
|
this.$store.commit('DEL_TAG_CURRENT'); |
|
|
|
console.log(res); |
|
|
|
} |
|
|
|
if (res.data.code == 200) { |
|
|
|
|
|
|
|
ElMessage({ |
|
|
|
}).catch((error)=>{ |
|
|
|
message: res.data.msg, |
|
|
|
this.reservationloading=false |
|
|
|
type: 'success', |
|
|
|
console.log(error); |
|
|
|
}); |
|
|
|
}) |
|
|
|
this.$router.push('/distribution/reservation/reservation'); |
|
|
|
console.log(data,'要提交的数据'); |
|
|
|
this.$store.commit('DEL_TAG_CURRENT'); |
|
|
|
}) |
|
|
|
} |
|
|
|
.catch(() => { |
|
|
|
}) |
|
|
|
|
|
|
|
.catch(error => { |
|
|
|
}) |
|
|
|
this.reservationloading = false; |
|
|
|
|
|
|
|
console.log(error); |
|
|
|
}else{ |
|
|
|
}); |
|
|
|
for(let i=0;i< this.form.stockArticleList.length;i++){ |
|
|
|
console.log(data, '要提交的数据'); |
|
|
|
if(!this.form.stockArticleList[i].packageListInfo || !this.form.stockArticleList[i].packageListInfo.length ){ |
|
|
|
}) |
|
|
|
ElMessageBox.confirm( |
|
|
|
.catch(() => {}); |
|
|
|
`订单自编号:${this.form.stockArticleList[i].orderCode}没有选择包件是否移除!`, |
|
|
|
} else { |
|
|
|
'提示', |
|
|
|
for (let i = 0; i < this.form.stockArticleList.length; i++) { |
|
|
|
{ |
|
|
|
if ( |
|
|
|
confirmButtonText: '确认', |
|
|
|
!this.form.stockArticleList[i].packageListInfo || |
|
|
|
cancelButtonText: '取消', |
|
|
|
!this.form.stockArticleList[i].packageListInfo.length |
|
|
|
type: 'warning', |
|
|
|
) { |
|
|
|
} |
|
|
|
ElMessageBox.confirm( |
|
|
|
) |
|
|
|
`订单自编号:${this.form.stockArticleList[i].orderCode}没有选择包件是否移除!`, |
|
|
|
.then(() => { |
|
|
|
'提示', |
|
|
|
this.renderOrderData.splice(i, 1); |
|
|
|
{ |
|
|
|
this.form.stockArticleList.splice(i,1) |
|
|
|
confirmButtonText: '确认', |
|
|
|
}) |
|
|
|
cancelButtonText: '取消', |
|
|
|
.catch(() => { |
|
|
|
type: 'warning', |
|
|
|
|
|
|
|
} |
|
|
|
}) |
|
|
|
) |
|
|
|
return |
|
|
|
.then(() => { |
|
|
|
} |
|
|
|
this.renderOrderData.splice(i, 1); |
|
|
|
} |
|
|
|
this.form.stockArticleList.splice(i, 1); |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
.catch(() => {}); |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// 开启提交按钮loading |
|
|
|
|
|
|
|
this.loadingObj.submitBtnLoading = true; |
|
|
|
|
|
|
|
this.reservationloading = true; //开启全屏加载 |
|
|
|
|
|
|
|
this.form.id = this.reservationId; |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
const res = await update(this.form); |
|
|
|
// 开启提交按钮loading |
|
|
|
|
|
|
|
this.loadingObj.submitBtnLoading = true; |
|
|
|
|
|
|
|
this.reservationloading = true; //开启全屏加载 |
|
|
|
|
|
|
|
this.form.id = this.reservationId; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const res = await update(this.form); |
|
|
|
|
|
|
|
console.log('res :>> ', res); |
|
|
|
console.log('res :>> ', res); |
|
|
|
if (res.data.code !== 200) return; |
|
|
|
if (res.data.code !== 200) return; |
|
|
|
this.$message({ |
|
|
|
this.$message({ |
|
|
|
@ -2718,49 +2722,44 @@ ElMessageBox.prompt('当前所有订单都没有选择包件是否确认"取消 |
|
|
|
message: '操作成功!', |
|
|
|
message: '操作成功!', |
|
|
|
}); |
|
|
|
}); |
|
|
|
this.back(); |
|
|
|
this.back(); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
// 开启提交按钮loading |
|
|
|
// 开启提交按钮loading |
|
|
|
this.loadingObj.submitBtnLoading = true; |
|
|
|
this.loadingObj.submitBtnLoading = true; |
|
|
|
this.reservationloading = true; //开启全屏加载 |
|
|
|
this.reservationloading = true; //开启全屏加载 |
|
|
|
this.form.reservationStatus = '20'; |
|
|
|
this.form.reservationStatus = '20'; |
|
|
|
const res = await autonomouslySave(this.form); |
|
|
|
const res = await autonomouslySave(this.form); |
|
|
|
console.log('res :>> ', res); |
|
|
|
console.log('res :>> ', res); |
|
|
|
if (res.data.code !== 200) return; |
|
|
|
if (res.data.code !== 200) return; |
|
|
|
ElMessageBox.confirm( |
|
|
|
ElMessageBox.confirm('当前预约已完成，是否继续添加预约?', '提示', { |
|
|
|
'当前预约已完成，是否继续添加预约?', |
|
|
|
confirmButtonText: '确定', |
|
|
|
'提示', |
|
|
|
cancelButtonText: '取消', |
|
|
|
{ |
|
|
|
type: 'warning', |
|
|
|
confirmButtonText: '确定', |
|
|
|
}) |
|
|
|
cancelButtonText: '取消', |
|
|
|
.then(() => { |
|
|
|
type: 'warning', |
|
|
|
this.form = this.Copyfrom; |
|
|
|
} |
|
|
|
this.Copyfrom = JSON.parse(JSON.stringify(this.form)); |
|
|
|
) |
|
|
|
this.$refs.ruleForm.resetFields(); // 调用重置验证状态的方法 |
|
|
|
.then(() => { |
|
|
|
this.renderOrderData = []; //订单重置 |
|
|
|
this.form=this.Copyfrom |
|
|
|
this.serveType = []; //服务类型重置 |
|
|
|
this.Copyfrom= JSON.parse(JSON.stringify(this.form)) |
|
|
|
this.renderInventoryData = []; //库存品重置 |
|
|
|
this.$refs.ruleForm.resetFields(); // 调用重置验证状态的方法 |
|
|
|
this.orderList = []; |
|
|
|
this.renderOrderData=[]//订单重置 |
|
|
|
this.orderData = []; |
|
|
|
this.serveType=[];//服务类型重置 |
|
|
|
this.packageListInfo = []; |
|
|
|
this.renderInventoryData=[]//库存品重置 |
|
|
|
this.stockArticleInfo = []; |
|
|
|
this.orderList=[] |
|
|
|
this.inventoryDat = []; |
|
|
|
this.orderData = [] |
|
|
|
this.inventoryData = []; |
|
|
|
this.packageListInfo=[] |
|
|
|
this.inventoryList = []; |
|
|
|
this.stockArticleInfo=[] |
|
|
|
delete this.query.marketName; |
|
|
|
this.inventoryDat= [] |
|
|
|
this.marketName = ''; |
|
|
|
this.inventoryData=[] |
|
|
|
(this.activeName = 'orderTab'), console.log(this.orderList, ''); |
|
|
|
this.inventoryList=[] |
|
|
|
}) |
|
|
|
delete this.query.marketName |
|
|
|
.catch(() => { |
|
|
|
this.marketName='' |
|
|
|
this.$message({ |
|
|
|
this.activeName='orderTab', |
|
|
|
type: 'success', |
|
|
|
console.log(this.orderList,''); |
|
|
|
message: '操作成功!', |
|
|
|
}) |
|
|
|
}); |
|
|
|
.catch(() => { |
|
|
|
this.back(); |
|
|
|
this.$message({ |
|
|
|
}); |
|
|
|
type: 'success', |
|
|
|
|
|
|
|
message: '操作成功!', |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
this.back(); |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// this.$message({ |
|
|
|
// this.$message({ |
|
|
|
// type: 'success', |
|
|
|
// type: 'success', |
|
|
|
@ -2926,7 +2925,7 @@ console.log(this.orderList,''); |
|
|
|
// 输入值后并搜索 |
|
|
|
// 输入值后并搜索 |
|
|
|
if (type === 1) { |
|
|
|
if (type === 1) { |
|
|
|
// 动态设置正则 |
|
|
|
// 动态设置正则 |
|
|
|
const reg = new RegExp(value, 'i'); |
|
|
|
const reg = new RegExp('^' + value); |
|
|
|
|
|
|
|
|
|
|
|
this.orderQuery[row.prop] = reg; |
|
|
|
this.orderQuery[row.prop] = reg; |
|
|
|
|
|
|
|
|
|
|
|
@ -2953,7 +2952,7 @@ console.log(this.orderList,''); |
|
|
|
// 输入值后并搜索 |
|
|
|
// 输入值后并搜索 |
|
|
|
if (type === 1) { |
|
|
|
if (type === 1) { |
|
|
|
// 动态设置正则 |
|
|
|
// 动态设置正则 |
|
|
|
const reg = new RegExp(value, 'i'); |
|
|
|
const reg = new RegExp('^' + value); |
|
|
|
|
|
|
|
|
|
|
|
this.stockQuery[row.prop] = reg; |
|
|
|
this.stockQuery[row.prop] = reg; |
|
|
|
|
|
|
|
|
|
|
|
@ -3384,7 +3383,7 @@ console.log(this.orderList,''); |
|
|
|
|
|
|
|
|
|
|
|
if (code !== 200) return; |
|
|
|
if (code !== 200) return; |
|
|
|
|
|
|
|
|
|
|
|
console.log('this.orderList',this.orderList) |
|
|
|
console.log('this.orderList', this.orderList); |
|
|
|
const _chooseArr = [...this.orderList]; |
|
|
|
const _chooseArr = [...this.orderList]; |
|
|
|
|
|
|
|
|
|
|
|
this.stockArticleInfo = records; |
|
|
|
this.stockArticleInfo = records; |
|
|
|
@ -3441,13 +3440,12 @@ console.log(this.orderList,''); |
|
|
|
this.form.isUrgent = '1'; |
|
|
|
this.form.isUrgent = '1'; |
|
|
|
// this.form.reservationDate = new Date(); |
|
|
|
// this.form.reservationDate = new Date(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (this.orderIds) { |
|
|
|
if (this.orderIds) { |
|
|
|
this.reservationloading=true |
|
|
|
this.reservationloading = true; |
|
|
|
if(res.data.code !==200){ |
|
|
|
if (res.data.code !== 200) { |
|
|
|
this.reservationloading=false |
|
|
|
this.reservationloading = false; |
|
|
|
return |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
getStockArticleList(this.orderIds).then(res => { |
|
|
|
getStockArticleList(this.orderIds).then(res => { |
|
|
|
console.log(res.data.data); |
|
|
|
console.log(res.data.data); |
|
|
|
const data = res.data.data; |
|
|
|
const data = res.data.data; |
|
|
|
@ -3471,17 +3469,16 @@ console.log(this.orderList,''); |
|
|
|
this.form.deliveryAddress = address; |
|
|
|
this.form.deliveryAddress = address; |
|
|
|
this.orderData = data; |
|
|
|
this.orderData = data; |
|
|
|
this.renderOrderData = [...this.orderData]; |
|
|
|
this.renderOrderData = [...this.orderData]; |
|
|
|
this.reservationloading=false |
|
|
|
this.reservationloading = false; |
|
|
|
|
|
|
|
}); |
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
if (this.reservationId) { |
|
|
|
if (this.reservationId) { |
|
|
|
this.reservationloading=true |
|
|
|
this.reservationloading = true; |
|
|
|
this.inventoryShow = true; |
|
|
|
this.inventoryShow = true; |
|
|
|
getReservationInfo(this.reservationId).then(res => { |
|
|
|
getReservationInfo(this.reservationId).then(res => { |
|
|
|
if(res.data.code !==200){ |
|
|
|
if (res.data.code !== 200) { |
|
|
|
this.reservationloading=false |
|
|
|
this.reservationloading = false; |
|
|
|
return |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
const reservation = res.data.data; |
|
|
|
const reservation = res.data.data; |
|
|
|
const stockArticleListInfo = res.data.data.stockArticleList; |
|
|
|
const stockArticleListInfo = res.data.data.stockArticleList; |
|
|
|
@ -3508,8 +3505,8 @@ console.log(this.orderList,''); |
|
|
|
}); |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
this.form = reservation; |
|
|
|
this.form = reservation; |
|
|
|
this.reservationloading=false |
|
|
|
this.reservationloading = false; |
|
|
|
}) |
|
|
|
}); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
this.form.deliveryType = '2'; |
|
|
|
this.form.deliveryType = '2'; |
|
|
|
} |
|
|
|
} |
|
|
|
|
