|
|
@@ -92,7 +92,7 @@
|
|
|
:buttonIf="false"
|
|
|
:filterable="true"
|
|
|
:remote="true"
|
|
|
- :disabled="editDis"
|
|
|
+ :disabled="editDis || form.orderItemsList.length"
|
|
|
placeholder="请选择店铺名称"
|
|
|
:forParameter="{ key: 'id', label: 'cname', value: 'cname' }"
|
|
|
@corpFocus="KHgetListfun"
|
|
|
@@ -1961,26 +1961,24 @@ export default {
|
|
|
if (item.cname == value) {
|
|
|
this.$set(this.form, "customerId", item.id);
|
|
|
this.$set(this.form, "customerName", item.cname);
|
|
|
+ getCustom({ id: item.id }).then((res) => {
|
|
|
+ if (res.data.data) {
|
|
|
+ this.dicUrlWithCustomId = res.data.data.id ? res.data.data.id : "";
|
|
|
+ this.form.storageId = res.data.data.deliveryWarehouseId;
|
|
|
+ this.form.storageName = res.data.data.deliveryWarehouseName;
|
|
|
|
|
|
- if (this.$refs.form.DIC.customerId || !this.onLoad.id) {
|
|
|
- getCustom({ id: item.id }).then((res) => {
|
|
|
- if (res.data.data) {
|
|
|
- this.dicUrlWithCustomId = res.data.data.id ? res.data.data.id : "";
|
|
|
- this.form.storageId = res.data.data.deliveryWarehouseId;
|
|
|
- this.form.storageName = res.data.data.deliveryWarehouseName;
|
|
|
- this.form.contacts = res.data.data.corpsAttnList[0].cname;
|
|
|
- this.form.phone = res.data.data.corpsAttnList[0].tel;
|
|
|
- this.contactsOption = res.data.data.corpsAddrList;
|
|
|
- this.form.recAddress =
|
|
|
- res.data.data.corpsAddrList[0].belongtoarea + res.data.data.corpsAddrList[0].detailedAddress;
|
|
|
- this.form.salerId = res.data.data.salesmanId ? res.data.data.salesmanId : "";
|
|
|
- this.form.salerName = res.data.data.salesmanName ? res.data.data.salesmanName : "";
|
|
|
- }
|
|
|
- if (!res.data.data.deliveryWarehouseId) {
|
|
|
- return this.$message.error("请维护店铺名称的发货仓库");
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
+ this.form.contacts = res.data.data.corpsAttnList[0].cname;
|
|
|
+ this.form.phone = res.data.data.corpsAttnList[0].tel;
|
|
|
+ this.contactsOption = res.data.data.corpsAddrList;
|
|
|
+ this.form.recAddress =
|
|
|
+ res.data.data.corpsAddrList[0].belongtoarea + res.data.data.corpsAddrList[0].detailedAddress;
|
|
|
+ this.form.salerId = res.data.data.salesmanId ? res.data.data.salesmanId : "";
|
|
|
+ this.form.salerName = res.data.data.salesmanName ? res.data.data.salesmanName : "";
|
|
|
+ }
|
|
|
+ if (!res.data.data.deliveryWarehouseId) {
|
|
|
+ return this.$message.error("请维护店铺名称的发货仓库");
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -2130,6 +2128,8 @@ export default {
|
|
|
goodsName: item.cname,
|
|
|
goodsNum: item.goodsNum,
|
|
|
brandName: item.brandName,
|
|
|
+ storageId: this.form.storageId,
|
|
|
+ storageName: this.form.storageName,
|
|
|
brandId: item.brandId,
|
|
|
goodsNo: item.code,
|
|
|
propertyName: item.specificationAndModel,
|
|
|
@@ -2352,21 +2352,13 @@ export default {
|
|
|
spinner: "el-icon-loading",
|
|
|
background: "rgba(255,255,255,0.7)",
|
|
|
});
|
|
|
- // this.form.orderItemsList.forEach(its => {
|
|
|
- // console.log(its.goodsId);
|
|
|
- // console.log(its.goodsName);
|
|
|
- // its.brandId = its.brandName
|
|
|
- // let goodsName = its.goodsId
|
|
|
- // its.goodsId = its.goodsName
|
|
|
- // its.goodsName = goodsName
|
|
|
- // })
|
|
|
for (let courierCompanies of this.courierCompaniesList) {
|
|
|
if (courierCompanies.dictValue === this.form.logisticsCorpName) {
|
|
|
this.form.logisticsCorpId = courierCompanies.dictKey;
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
- this.form.storageName = this.form.$storageId ? this.form.$storageId : "";
|
|
|
+ // this.form.storageName = this.form.$storageId ? this.form.$storageId : "";
|
|
|
this.form.billType = this.form.billType ? this.form.billType : 0;
|
|
|
submit({
|
|
|
bsType: "XS",
|