Skip to content

I
integral-mall
Commit 899d04da by liuchenxi
Options

update: 自提点配置

parent 7f478bc5
Showing with 70 additions and 12 deletions
src/store/vuex/product.js
......@@ -3,7 +3,8 @@ const state = {
all: 0,
cartData: [],
total: 0,
canUseMenuUrl: []
canUseMenuUrl: [],
erpGoodsFlag: 0
};
// getters
......@@ -58,6 +59,10 @@ const mutations = {
// 更新可用菜单可用url
mutations_updateMenuUrl(state, url) {
state.canUseMenuUrl = url;
},
// 更新erp商品兑换接口开关
mutations_erpGoodsFlag(state, val) {
state.erpGoodsFlag = val;
}
};
......
src/views/goods/gift/addSku.vue
......@@ -69,7 +69,7 @@
<th style="width:80px"><span class="red-color">*</span>积分</th>
<th style="width:80px"><span class="red-color">*</span>现金（元）</th>
<th style="width:120px"><span class="red-color">*</span>库存</th>
<th style="width:120px">规格编码</th>
<th style="width:120px"><span class="red-color" v-if="$store.state.product.erpGoodsFlag">*</span>规格编码</th>
<th style="width:120px">礼品条形码</th>
<!-- <th style="width:120px;display:none"></th> -->
</tr>
......
src/views/goods/gift/info.vue
......@@ -631,6 +631,7 @@ export default {
mounted() {
this.getOpenStatus();
this.getUserId();
this.getErpGoodsFlag();
window.onbeforeunload = function(e) {
// var storage = window.localStorage;
// storage.clear('giftListObj');
......@@ -1961,6 +1962,10 @@ export default {
}
}
//校验规格明细
if(this.$store.state.product.erpGoodsFlag && !this.giftProStandardJson.length) {
this.$message.error('您已开启商品兑换库存同步接口，商品sku必填');
return false;
}
if (this.giftProStandardJson) {
for (let item of this.giftProStandardJson) {
if (item.standardId === '') {
......@@ -1979,7 +1984,6 @@ export default {
}
}
//校验规格明细
console.log(this.submitSkuJson);
if (this.submitSkuJson.length) {
for (let item of this.submitSkuJson) {
if (item.giftPropValues.length) {
......@@ -1999,6 +2003,10 @@ export default {
this.$message.error('请填写现金');
return false;
}
if(this.$store.state.product.erpGoodsFlag && !item.giftProSkuStandCode) {
this.$message.error('您已开启商品兑换库存同步接口,规格编码必填');
return false;
}
// if (Number(item.giftProSkuCash) !== 0) {
// if (!item.giftProSkuCash) {
// console.log(item.giftProSkuCash);
......@@ -2029,7 +2037,6 @@ export default {
}
}
}
// spu未填校验||this.giftForm.cashCost===''||this.giftForm.virtualStock===''
if (this.giftForm.integralCost === '') {
......@@ -2275,6 +2282,17 @@ export default {
this.$router.push({
name: 'gift'
});
},
// 检测是否开启 erp商品兑换接口
getErpGoodsFlag() {
request.get('/api-integral-mall/get-erp-config').then(res => {
if (res.data.errorCode === 0) {
const result = res.data.result || {};
this.$store.commit('mutations_erpGoodsFlag', result.goodsStockSync || 0);
} else {
this.$message.error(res.data.message);
}
});
}
// //人群筛选器使用的方法
// // 父组件调用子组件方法,触发父组件事件
......
src/views/setting/editDeliver.vue
......@@ -87,7 +87,7 @@
</div>
</template>
</el-form-item>
<el-form-item v-if="erpGoodsFlag" label="商户调货配置" prop="transferDelayDay">
<el-form-item v-if="$store.state.product.erpGoodsFlag" label="商户调货配置" prop="transferDelayDay">
门店调货情况，下单<el-input type="text" v-model="form.transferDelayDay" style="width:120px;margin-left:30px" size="mini" />
<span>天后，买家可提货</span>
<div class="tip-warm">
......@@ -307,8 +307,7 @@ export default {
storeWidgetKey: '', //传递的门店的KeyId
integralMallPickUpPointId: '-1', //自提点id
clearableBtn: false,
enableAccessControl: false,
erpGoodsFlag: 0
enableAccessControl: false
};
},
created() {
......@@ -478,7 +477,7 @@ export default {
this.form.timeMinuter = res.data.result.settingDTO.delayMinute;
this.form.timeDay = res.data.result.settingDTO.delayDay;
this.form.dateType = res.data.result.settingDTO.dateType;
this.form.transferDelayDay = res.data.result.settingDTO.transferDelayDay;
if (res.data.result.settingDTO.canChooseTime === 0) {
//自提时间关闭
// let currentTime = new Date(new Date().valueOf());
......@@ -615,7 +614,8 @@ export default {
choosenTime: [],
overTime: this.form.status ? Number(this.form.overTime) : null,
overTimeType: this.form.status ? this.form.overTimeType : 1,
dateType: this.form.status ? this.form.dateType : 1
dateType: this.form.status ? this.form.dateType : 1,
transferDelayDay: this.form.transferDelayDay * 1
}
};
let arrObj = [];
......@@ -694,7 +694,7 @@ export default {
request.get('/api-integral-mall/get-erp-config').then(res => {
if (res.data.errorCode === 0) {
const result = res.data.result || {};
this.erpGoodsFlag = result.goodsStockSync || 0;
this.$store.commit('mutations_erpGoodsFlag', result.goodsStockSync || 0);
} else {
this.$message.error(res.data.message);
}
......
src/views/setting/pickedAuto.vue
......@@ -43,6 +43,14 @@
<el-input v-model="pickedModal.overTime" style="width:120px"></el-input>
<span>天后，停止自提</span>
</el-form-item>
<el-form-item v-if="$store.state.product.erpGoodsFlag" label="商户调货配置" prop="transferDelayDay">
门店调货情况，下单<el-input type="text" v-model="pickedModal.transferDelayDay" style="width:120px;margin-left:30px" size="mini" />
<span>天后，买家可提货</span>
<div class="tip-warm">
<p>门店调货必须对接erp，开启【商品兑换库存同步接口】，否则该配置不生效。</p>
<p>门店调货情况，建议设置较长的提货有效期，以防订单超期关闭引起客诉。</p>
</div>
</el-form-item>
</div>
<div v-if="pickedModal.dateType === 2">
<el-form-item label="日期设置">
......@@ -188,6 +196,16 @@ export default {
callback();
}
};
let transferDelayDayValidator = (rule, value, callback) => {
var reg = /^[1-9]\d*$/;
if (!reg.test(Number(value))) {
callback(new Error('请输入1-90之间的整数'));
} else if (Number(value) > 90) {
callback(new Error('请输入1-90之间的整数'));
} else {
callback();
}
};
return {
getHours: getInputVal.getHours,
getTime: getInputVal.getTime,
......@@ -204,7 +222,8 @@ export default {
overTimeType: 1,
timeRangeList: [{ timeRange: '' }],
dataRangeList: [{ dataRange: '' }],
orderTimeHours: ''
orderTimeHours: '',
transferDelayDay: 7
},
//限制开始时间
pickerOptionsEnd: {
......@@ -218,6 +237,7 @@ export default {
timeHours: [{ validator: timeHoursValidator, trigger: 'blur' }],
timeMinuter: [{ validator: timeMinuterValidator, trigger: 'blur' }],
timeDay: [{ validator: timeDayValidator, trigger: 'blur' }],
transferDelayDay: [{ validator: transferDelayDayValidator, trigger: 'blur' }],
orderTimeHours: [{ required: true, message: '请输入时间', trigger: 'blur' }, { validator: orderTimeHoursValidator, trigger: 'blur' }],
overTime: [{ required: true, message: '请输入提货有效期', trigger: 'blur' }, { validator: overTimeValidator, trigger: 'blur' }]
},
......@@ -231,6 +251,9 @@ export default {
// let currentTime1 = new Date(new Date(new Date().getTime() + 1000 * 60).valueOf());
// this.pickedModal.timeRangeList[0].timeRange = [currentTime, currentTime1];
// },
created() {
this.getErpGoodsFlag();
},
methods: {
//添加时间段
addTime() {
......@@ -427,7 +450,8 @@ export default {
choosenTime: [],
overTime: this.pickedModal.status ? Number(this.pickedModal.overTime) : null,
overTimeType: this.pickedModal.status ? this.pickedModal.overTimeType : 1,
dateType: this.pickedModal.status ? this.pickedModal.dateType : 1
dateType: this.pickedModal.status ? this.pickedModal.dateType : 1,
transferDelayDay: this.pickedModal.transferDelayDay
}
};
let arrObj = [];
......@@ -475,6 +499,17 @@ export default {
// let currentTime = new Date(new Date().valueOf());
// let currentTime1 = new Date(new Date(new Date().getTime() + 1000 * 60).valueOf());
// this.pickedModal.timeRangeList[0].timeRange = [currentTime, currentTime1];
},
// 检测是否开启 erp商品兑换接口
getErpGoodsFlag() {
request.get('/api-integral-mall/get-erp-config').then(res => {
if (res.data.errorCode === 0) {
const result = res.data.result || {};
this.$store.commit('mutations_erpGoodsFlag', result.goodsStockSync || 0);
} else {
this.$message.error(res.data.message);
}
});
}
}
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment