|
@@ -1302,25 +1302,41 @@ export default {
|
|
|
if (this.contactsData.length == 0) {
|
|
|
return this.$message.error('商品信息为空')
|
|
|
}
|
|
|
- for (let item in this.contactsData) {
|
|
|
- if (!this.contactsData[item].id) {
|
|
|
- return this.$message.error('有商品未保存,请先保存')
|
|
|
+ // for (let item in this.contactsData) {
|
|
|
+ // if (!this.contactsData[item].id) {
|
|
|
+ // return this.$message.error('有商品未保存,请先保存')
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ if (contrastObj(this.form, this.oldForm) ||
|
|
|
+ contrastList(this.contactsData, this.oldGoodsList) ||
|
|
|
+ contrastList(this.advantageProjectData, this.oldFeesList) ||
|
|
|
+ contrastList(this.bankOfDepositData, this.oldUploadList)
|
|
|
+ ) {
|
|
|
+ this.$confirm("数据发生变化未有提交记录, 是否保存?", "提示", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ }).then(() => {
|
|
|
+ this.editCustomer(false)
|
|
|
+ }).catch(() => {
|
|
|
+ this.$message.info('已取消')
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ //商品信息
|
|
|
+ this.form.deliveryItemsList = this.contactsData
|
|
|
+ this.form.deliveryFeesList = this.advantageProjectData
|
|
|
+ this.form.deliveryFilesList = this.bankOfDepositData
|
|
|
+ if (typeof this.form.corpsTypeId == 'object') {
|
|
|
+ this.form.corpsTypeId = this.form.corpsTypeId.join(",")
|
|
|
}
|
|
|
+ this.pageLoading = true
|
|
|
+ sendOutGoods(this.form).then(res => {
|
|
|
+ this.$message.success('发货成功')
|
|
|
+ this.queryData(res.data.data.id)
|
|
|
+ }).finally(() => {
|
|
|
+ this.pageLoading = false
|
|
|
+ })
|
|
|
}
|
|
|
- //商品信息
|
|
|
- this.form.deliveryItemsList = this.contactsData
|
|
|
- this.form.deliveryFeesList = this.advantageProjectData
|
|
|
- this.form.deliveryFilesList = this.bankOfDepositData
|
|
|
- if (typeof this.form.corpsTypeId == 'object') {
|
|
|
- this.form.corpsTypeId = this.form.corpsTypeId.join(",")
|
|
|
- }
|
|
|
- this.pageLoading = true
|
|
|
- sendOutGoods(this.form).then(res => {
|
|
|
- this.$message.success('发货成功')
|
|
|
- this.queryData(res.data.data.id)
|
|
|
- }).finally(() => {
|
|
|
- this.pageLoading = false
|
|
|
- })
|
|
|
} else {
|
|
|
return false;
|
|
|
}
|