Skip to content

J
jiedao-app-operator-master
Commit d9111ce4 authored by 邓春圆's avatar 邓春圆
Browse files
Options

去掉检验

parent f0bd0d76
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 74 deletions
src/views/ecw/product/index.vue
View file @ d9111ce4
...@@ -224,18 +224,22 @@ ...@@ -224,18 +224,22 @@
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
<packaging-type key-arr="priceStepClearanceList" v-model="form"> <el-form-item label-width="150px" label="空运订单重量上限kg">
<el-button @click="visible = true; open = false;" type="text">选择空运模板</el-button> <el-input-number v-model="form.airWeightLimit" controls-position="right" ></el-input-number>
</packaging-type>
<p v-if="lineNum"> </el-form-item>
<span> <!-- <packaging-type key-arr="priceStepClearanceList" v-model="form">-->
复制模板线路价格：{{lineNum}}个 <!-- <el-button @click="visible = true; open = false;" type="text">选择空运模板</el-button>-->
</span> <!-- </packaging-type>-->
<span @click="toPriceManager(formCopy, true)" style="color: #0a84ff;cursor: pointer;"> <!-- <p v-if="lineNum">-->
查看《#{{$l(formCopy,'title')}}#》路线价格 <!-- <span>-->
</span> <!-- 复制模板线路价格：{{lineNum}}个-->
<el-button style="font-size: 12px;margin-left: 15px;color: red;" type="text" @click="form.priceStepClearanceList = [];lineNum = 0" >清除路线</el-button> <!-- </span>-->
</p> <!-- <span @click="toPriceManager(formCopy, true)" style="color: #0a84ff;cursor: pointer;">-->
<!-- 查看《#{{$l(formCopy,'title')}}#》路线价格-->
<!-- </span>-->
<!-- <el-button style="font-size: 12px;margin-left: 15px;color: red;" type="text" @click="form.priceStepClearanceList = [];lineNum = 0" >清除路线</el-button>-->
<!-- </p>-->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">{{$t('确定')}}</el-button> <el-button type="primary" @click="submitForm">{{$t('确定')}}</el-button>
...@@ -415,59 +419,59 @@ export default { ...@@ -415,59 +419,59 @@ export default {
}, },
methods: { methods: {
copyLine(val , bol){ // copyLine(val , bol){
this.formCopy = val; // this.formCopy = val;
let copy = ()=>{ // let copy = ()=>{
if(val.priceStepClearanceList.length === 0) return this.form.priceStepClearanceList = [] // if(val.priceStepClearanceList.length === 0) return this.form.priceStepClearanceList = []
this.form.airWeightLimit = val.airWeightLimit; // this.form.airWeightLimit = val.airWeightLimit;
val.priceStepClearanceList.forEach((item ,index) =>{ // val.priceStepClearanceList.forEach((item ,index) =>{
if(this.form.priceStepClearanceList[index]){ // if(this.form.priceStepClearanceList[index]){
this.form.priceStepClearanceList[index].clearancePrice = item.clearancePrice // this.form.priceStepClearanceList[index].clearancePrice = item.clearancePrice
this.form.priceStepClearanceList[index].clearancePriceUnit = item.clearancePriceUnit // this.form.priceStepClearanceList[index].clearancePriceUnit = item.clearancePriceUnit
this.form.priceStepClearanceList[index].clearanceVolumeUnit = item.clearanceVolumeUnit // this.form.priceStepClearanceList[index].clearanceVolumeUnit = item.clearanceVolumeUnit
this.form.priceStepClearanceList[index].endNum = item.endNum // this.form.priceStepClearanceList[index].endNum = item.endNum
this.form.priceStepClearanceList[index].startNum = item.startNum // this.form.priceStepClearanceList[index].startNum = item.startNum
this.form.priceStepClearanceList[index].weightUnit = item.weightUnit // this.form.priceStepClearanceList[index].weightUnit = item.weightUnit
}else { // }else {
let p = { // let p = {
"channelId":undefined, // "channelId":undefined,
"clearancePrice":item.clearancePrice, // "clearancePrice":item.clearancePrice,
"clearancePriceUnit":item.clearancePriceUnit, // "clearancePriceUnit":item.clearancePriceUnit,
"clearanceVolumeUnit":item.clearanceVolumeUnit, // "clearanceVolumeUnit":item.clearanceVolumeUnit,
"endNum":item.endNum, // "endNum":item.endNum,
"packagingId":undefined, // "packagingId":undefined,
"startNum":item.startNum, // "startNum":item.startNum,
"weightUnit":item.weightUnit // "weightUnit":item.weightUnit
} // }
this.form.priceStepClearanceList.push(p) // this.form.priceStepClearanceList.push(p)
} // }
}) // })
} // }
this.visible = false; // this.visible = false;
if(bol){ // if(bol){
let message = this.$l(this.form,'title') ? `请确认是否要将#${this.$l(val,'title')}#的所有路线价格复制到当前商品#${this.$l(this.form,'title')}#中？` : `请确认是否要将#${this.$l(val,'title')}#的所有路线价格复制到当前商品中？` // let message = this.$l(this.form,'title') ? `请确认是否要将#${this.$l(val,'title')}#的所有路线价格复制到当前商品#${this.$l(this.form,'title')}#中？` : `请确认是否要将#${this.$l(val,'title')}#的所有路线价格复制到当前商品中？`
this.$confirm(message, '提示', { // this.$confirm(message, '提示', {
confirmButtonText: '确定', // confirmButtonText: '确定',
cancelButtonText: '取消', // cancelButtonText: '取消',
type: 'warning' // type: 'warning'
}).then(() => { // }).then(() => {
// this.form.priceLineCount = val.id; // // this.form.priceLineCount = val.id;
this.lineNum = val.priceLineCount; // this.lineNum = val.priceLineCount;
this.form.productTemplateId = val.id; // this.form.productTemplateId = val.id;
this.form.isCopyProductPriceTemplate = true; // this.form.isCopyProductPriceTemplate = true;
copy() // copy()
this.open = true; // this.open = true;
}).catch(() => { // }).catch(() => {
this.open = true; // this.open = true;
}); // });
}else { // }else {
this.open = true; // this.open = true;
copy() // copy()
this.lineNum = 0 // this.lineNum = 0
this.form.isCopyProductPriceTemplate = false; // this.form.isCopyProductPriceTemplate = false;
} // }
this.$forceUpdate() // this.$forceUpdate()
}, // },
/** 获取产品属性列表 */ /** 获取产品属性列表 */
getAttrList() { getAttrList() {
getProductAttrList().then(response => { getProductAttrList().then(response => {
...@@ -556,6 +560,7 @@ export default { ...@@ -556,6 +560,7 @@ export default {
priceStepClearanceList:[], priceStepClearanceList:[],
isCopyProductPriceTemplate:false, isCopyProductPriceTemplate:false,
productTemplateId:undefined, productTemplateId:undefined,
}; };
this.lineNum = 0 this.lineNum = 0
this.resetForm("form"); this.resetForm("form");
...@@ -583,6 +588,7 @@ export default { ...@@ -583,6 +588,7 @@ export default {
if (this.queryParams.typeId) { if (this.queryParams.typeId) {
this.form.typeId = this.queryParams.typeId; this.form.typeId = this.queryParams.typeId;
} }
this.form.airWeightLimit = this.getDictDatas(this.DICT_TYPE. AIR_COMMODITY_CUSTOM_CLEARANCE)[0]?.value
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
...@@ -607,6 +613,7 @@ export default { ...@@ -607,6 +613,7 @@ export default {
this.form.couponIds = this.preferentialList.filter(i => i.isDefault).map(i => i.couponId) this.form.couponIds = this.preferentialList.filter(i => i.isDefault).map(i => i.couponId)
// this.reset() // this.reset()
}) })
}); });
}, },
verify(row){ verify(row){
...@@ -621,15 +628,15 @@ export default { ...@@ -621,15 +628,15 @@ export default {
if(!this.form.airWeightLimit){ if(!this.form.airWeightLimit){
return this.$message.warning('请输入空运订单重量上限') return this.$message.warning('请输入空运订单重量上限')
} }
if(this.form.priceStepClearanceList.length === 0){ // if(this.form.priceStepClearanceList.length === 0){
return this.$message.warning('阶梯定价输入不完整！') // return this.$message.warning('阶梯定价输入不完整！')
}else { // }else {
let bol = this.form.priceStepClearanceList.every(this.verify) // let bol = this.form.priceStepClearanceList.every(this.verify)
if(!bol){ // if(!bol){
return this.$message.warning('阶梯定价输入不完整！') // return this.$message.warning('阶梯定价输入不完整！')
} // }
//
} // }
//商品特性转字符串 //商品特性转字符串
this.form.attrId = this.form.attrArray.join(','); this.form.attrId = this.form.attrArray.join(',');
// 修改的提交 // 修改的提交
......
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