diff --git a/src/components/storegoodscheck/store-goods-check.vue b/src/components/storegoodscheck/store-goods-check.vue
index 9d926ad..ff41448 100644
--- a/src/components/storegoodscheck/store-goods-check.vue
+++ b/src/components/storegoodscheck/store-goods-check.vue
@@ -327,12 +327,19 @@
批准
+ 批准并可售
拒绝
@@ -645,7 +652,7 @@ export default {
this.selects = val;
},
// 处理
- dealCheck(handleType, row) {
+ dealCheck(handleType, row,flag) {
const { storeID, nameID, unitPrice, originPrice } = row;
// -1拒绝 1批准 2预审核
if (handleType === -1) {
@@ -703,16 +710,20 @@ export default {
const { storeID, nameID } = row;
// 修改可售参数 row.type 关注操作
- let skuName = await getStoreSku(storeID, nameID, row.type === 2 ? false : true);
- let skus = skuName.skus.map(sku => { return {
- skuID:sku.id,
- isSale:1
- } })
- let arr = [];
- arr.push({
- NameID:nameID,
- skus
- });
+ let skuName = null
+ let arr = []
+ if(flag){
+ skuName = await getStoreSku(storeID, nameID, row.type === 2 ? false : true);
+ let skus = skuName.skus.map(sku => { return {
+ skuID:sku.id,
+ isSale:1
+ } })
+ arr.push({
+ NameID:nameID,
+ skus
+ });
+ }
+
// 批准的参数
let payload = JSON.stringify([
@@ -751,29 +762,32 @@ export default {
payload
});
- updateStoreSkus(storeID, arr,(res) => {
- if (res.code === "0") {
+ if(flag){
+ updateStoreSkus(storeID, arr,(res) => {
+ if (res.code === "0") {
+ this.$message({
+ message: "[改价] 成功",
+ type: "success",
+ center: true
+ });
+ this.getStoreCheckList();
+ }else{
this.$message({
- message: "[改价] 成功",
+ message: "[改价] 成功,可售失败",
type: "success",
center: true
});
this.getStoreCheckList();
- }else{
- this.$message({
- message: "[改价] 成功,可售失败",
- type: "success",
- center: true
- });
- this.getStoreCheckList();
- }
- })
- // this.$message({
- // message: "[改价] 成功",
- // type: "success",
- // center: true
- // });
- // this.getStoreCheckList();
+ }
+ })
+ }else{
+ this.$message({
+ message: "[改价] 成功",
+ type: "success",
+ center: true
+ });
+ this.getStoreCheckList();
+ }
});
hideLoad();
} else {
@@ -784,24 +798,34 @@ export default {
isContinueWhenError: false,
payload
});
- updateStoreSkus(storeID, arr,(res) => {
- if (res.code === "0") {
+
+ if(flag){
+ updateStoreSkus(storeID, arr,(res) => {
+ if (res.code === "0") {
+ this.$message({
+ message: "[改价] 成功",
+ type: "success",
+ center: true
+ });
+ this.getStoreCheckList();
+ }else{
this.$message({
- message: "[改价] 成功",
+ message: "[改价] 成功,可售失败",
type: "success",
center: true
});
this.getStoreCheckList();
- }else{
- this.$message({
- message: "[改价] 成功,可售失败",
- type: "success",
- center: true
- });
- this.getStoreCheckList();
- }
- })
-
+ }
+ })
+ }else{
+ this.$message({
+ message: "[改价] 成功",
+ type: "success",
+ center: true
+ });
+ this.getStoreCheckList();
+ }
+
// this.$message({
// message: "[改价] 成功",
// type: "success",
diff --git a/src/components/storemanager/create-store.vue b/src/components/storemanager/create-store.vue
index 7ab31b5..93bcf11 100644
--- a/src/components/storemanager/create-store.vue
+++ b/src/components/storemanager/create-store.vue
@@ -856,6 +856,7 @@ export default {
changePriceType: 0, // 价格审核 0不审核 1审核 2禁止修改
packageSetting: 0, // 包装费
packageSwitch: 1, // 允许物料购买 0允许 1禁用
+ deliverySelf:0, // 是否允许自提 默认不允许
freightMarkup: 0, // 三方运单的配送费
cityCode: null, // 510100,
districtCode: null, // 510105,
@@ -1388,6 +1389,7 @@ export default {
this.storeInfo = JSON.parse(res.data.data)
if(this.storeInfo.openTime2) this.isShowOpenTime = true
this.storeInfo.packageSwitch = 1
+ this.storeInfo.deliverySelf = 0
this.storeInfo.printerVendorID = printerVendorID
this.storeInfo.printerSN = printerSN
this.storeInfo.printerKey = printerKey
@@ -1556,6 +1558,7 @@ export default {
this.storeInfo.packageSetting = Number(this.storeInfo.packageSetting) * 100
this.storeInfo.freightMarkup = Number(this.storeInfo.freightMarkup) * 100
this.storeInfo.packageSwitch = 1
+ this.storeInfo.deliverySelf = 0
let json = JSON.parse(JSON.stringify(this.storeInfo))
if (json.hasOwnProperty('idExpire') && !json.idExpire) json.idExpire = ''
if (json.hasOwnProperty('licenceExpire') && !json.licenceExpire)
diff --git a/src/components/storemanager/dialog/editorVendorStore.vue b/src/components/storemanager/dialog/editorVendorStore.vue
index f51e10e..a147d57 100644
--- a/src/components/storemanager/dialog/editorVendorStore.vue
+++ b/src/components/storemanager/dialog/editorVendorStore.vue
@@ -568,6 +568,17 @@
style="width: 100px; height: 100px; margin-left: 50px"
/>
+
+
+
+
+
满
@@ -1104,6 +1115,7 @@ export default {
// deliveryType: 0, // 门店快递类型
isSync: 0, // 0不同步 1同步,
isService: 0, // 切换服务商
+ deliverySelf:0, // 是否允许自提 0-不支持,1-支持
isSupplyGoods: 0, //
pricePercentagePack: '', // 调价包
freightDeductionPack: '', // 免运包
@@ -1703,6 +1715,7 @@ export default {
this.addStore.deliveryFeeDeductionFee =
data[index].deliveryFeeDeductionFee / 100
this.addStore.isOrder = data[index].isOrder
+ this.addStore.deliverySelf = data[index].deliverySelf
} else if (this.vendorQuery.vendorID === 5) {
this.addStore.status = data[index].status
this.addStore.syncRule = data[index].syncRule
@@ -1851,7 +1864,8 @@ export default {
deliveryFeeDeductionFee: Math.round(
this.addStore.deliveryFeeDeductionFee * 100
),
- isOrder: this.addStore.isOrder
+ isOrder: this.addStore.isOrder,
+ deliverySelf:this.addStore.deliverySelf
})
)
} else if (this.vendorQuery.vendorID === 4) {
@@ -1992,7 +2006,8 @@ export default {
this.addStore.deliveryFeeDeductionFee * 100
),
isOrder: this.addStore.isOrder,
- createDeliveryType: this.addStore.createDeliveryType
+ createDeliveryType: this.addStore.createDeliveryType,
+ deliverySelf:this.addStore.deliverySelf
})
)
} else {
diff --git a/src/components/storemanager/modify-store.vue b/src/components/storemanager/modify-store.vue
index 77d1937..4a16268 100644
--- a/src/components/storemanager/modify-store.vue
+++ b/src/components/storemanager/modify-store.vue
@@ -655,7 +655,7 @@