|
@@ -15,12 +15,12 @@
|
|
<el-form ref="addItemTwo" :model="{shippingTemplateRuleList}" label-width="120px">
|
|
<el-form ref="addItemTwo" :model="{shippingTemplateRuleList}" label-width="120px">
|
|
<table style="width: 75%" bordercolor="#ccc" border="1" cellpadding="0" cellspacing="0" class="spec-table">
|
|
<table style="width: 75%" bordercolor="#ccc" border="1" cellpadding="0" cellspacing="0" class="spec-table">
|
|
<tr>
|
|
<tr>
|
|
- <th>付费区域</th>
|
|
|
|
- <th>首件(个)</th>
|
|
|
|
- <th>运费(元)</th>
|
|
|
|
- <th>续件(个)</th>
|
|
|
|
- <th>续费(元)</th>
|
|
|
|
- <th>操作</th>
|
|
|
|
|
|
+ <th width="30%">付费区域</th>
|
|
|
|
+ <th width="15%">首件(个)</th>
|
|
|
|
+ <th width="15%">运费(元)</th>
|
|
|
|
+ <th width="15%">续件(个)</th>
|
|
|
|
+ <th width="15%">续费(元)</th>
|
|
|
|
+ <th width="10%">操作</th>
|
|
</tr>
|
|
</tr>
|
|
<tr v-if="shippingTemplateRuleList == ''">
|
|
<tr v-if="shippingTemplateRuleList == ''">
|
|
<td colspan="6">
|
|
<td colspan="6">
|
|
@@ -29,8 +29,8 @@
|
|
</tr>
|
|
</tr>
|
|
<tr v-for="(item,index) in shippingTemplateRuleList" :key="index" style="">
|
|
<tr v-for="(item,index) in shippingTemplateRuleList" :key="index" style="">
|
|
<td>
|
|
<td>
|
|
- <el-form-item :prop="`shippingTemplateRuleList.${index}.shippingTemplateRuleAreaList`" :rules="[{ required: true, message: '地区不能为空', trigger:['blur','change'] },{ type: 'array', message: '请选择地区' }]" style="width: 100%">
|
|
|
|
- <el-cascader @visible-change="listPidDisabled($event,index)" ref="cascaderAdd" :options="listPidProvince" clearable :props="props" v-model="item.shippingTemplateRuleAreaList" style="" ></el-cascader>
|
|
|
|
|
|
+ <el-form-item :prop="`shippingTemplateRuleList.${index}.shippingTemplateRuleAreaList`" :rules="[{ required: true, message: '地区不能为空', trigger:['blur','change'] },{ type: 'array', message: '请选择地区' }]" style="width: 100%" label-width="0">
|
|
|
|
+ <el-cascader @visible-change="listPidDisabled($event,index)" ref="cascaderAdd" :options="listPidProvince" clearable :props="props" v-model="item.shippingTemplateRuleAreaList" style="width: 100%;" ></el-cascader>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</td>
|
|
</td>
|
|
<td>
|
|
<td>
|
|
@@ -72,9 +72,9 @@
|
|
<el-form ref="addItemThree" :model="{shippingTemplateRuleList2}" label-width="120px">
|
|
<el-form ref="addItemThree" :model="{shippingTemplateRuleList2}" label-width="120px">
|
|
<table style="width: 75%" bordercolor="#ccc" border="1" cellpadding="0" cellspacing="0" class="spec-table">
|
|
<table style="width: 75%" bordercolor="#ccc" border="1" cellpadding="0" cellspacing="0" class="spec-table">
|
|
<tr>
|
|
<tr>
|
|
- <th>不发货区域</th>
|
|
|
|
|
|
+ <th width="30%">不发货区域</th>
|
|
<th>原因</th>
|
|
<th>原因</th>
|
|
- <th>操作</th>
|
|
|
|
|
|
+ <th width="10%">操作</th>
|
|
</tr>
|
|
</tr>
|
|
<tr v-if="shippingTemplateRuleList2 == ''">
|
|
<tr v-if="shippingTemplateRuleList2 == ''">
|
|
<td colspan="3">
|
|
<td colspan="3">
|
|
@@ -83,12 +83,12 @@
|
|
</tr>
|
|
</tr>
|
|
<tr v-for="(item,index) in shippingTemplateRuleList2" :key="index">
|
|
<tr v-for="(item,index) in shippingTemplateRuleList2" :key="index">
|
|
<td>
|
|
<td>
|
|
- <el-form-item :prop="`shippingTemplateRuleList2.${index}.shippingTemplateRuleAreaList`" :rules="[{ required: true, message: '地区不能为空', trigger:['blur','change'] },{ type: 'array', message: '请选择地区' }]">
|
|
|
|
- <el-cascader @visible-change="listPidDisabled($event,shippingTemplateRuleList.length + index)" :options="listPidProvince" clearable :props="props" v-model="item.shippingTemplateRuleAreaList"></el-cascader>
|
|
|
|
|
|
+ <el-form-item :prop="`shippingTemplateRuleList2.${index}.shippingTemplateRuleAreaList`" :rules="[{ required: true, message: '地区不能为空', trigger:['blur','change'] },{ type: 'array', message: '请选择地区' }]" label-width="0">
|
|
|
|
+ <el-cascader @visible-change="listPidDisabled($event,shippingTemplateRuleList.length + index)" :options="listPidProvince" clearable :props="props" v-model="item.shippingTemplateRuleAreaList" style="width: 100%;"></el-cascader>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</td>
|
|
</td>
|
|
<td>
|
|
<td>
|
|
- <el-form-item :prop="`shippingTemplateRuleList2.${index}.remark`" :rules="{ required: true, message: '原因不能为空', trigger: 'blur' }">
|
|
|
|
|
|
+ <el-form-item :prop="`shippingTemplateRuleList2.${index}.remark`" :rules="{ required: true, message: '原因不能为空', trigger: 'blur' }" label-width="0">
|
|
<el-input v-model="item.remark" placeholder="请输入内容"></el-input>
|
|
<el-input v-model="item.remark" placeholder="请输入内容"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</td>
|
|
</td>
|
|
@@ -312,8 +312,17 @@ export default {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
+ if (this.addData.title == ""){
|
|
|
|
+ this.$message({
|
|
|
|
+ showClose: true,
|
|
|
|
+ message: '模板名称不能为空',
|
|
|
|
+ type: 'warning'
|
|
|
|
+ });
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
|
|
let arr = []
|
|
let arr = []
|
|
|
|
+ //判断付费区域
|
|
if (this.shippingTemplateRuleList){
|
|
if (this.shippingTemplateRuleList){
|
|
for (let i = 0; i < this.shippingTemplateRuleList.length; i++) {
|
|
for (let i = 0; i < this.shippingTemplateRuleList.length; i++) {
|
|
let item = this.shippingTemplateRuleList[i]
|
|
let item = this.shippingTemplateRuleList[i]
|
|
@@ -351,11 +360,10 @@ export default {
|
|
ressage.push(res)
|
|
ressage.push(res)
|
|
})
|
|
})
|
|
item.shippingTemplateRuleAreaList = ressage
|
|
item.shippingTemplateRuleAreaList = ressage
|
|
- item.createPrice = accMul(item.createPrice,100)
|
|
|
|
- item.defaultPrice = accMul(item.defaultPrice,100)
|
|
|
|
arr.push(item)
|
|
arr.push(item)
|
|
})
|
|
})
|
|
}
|
|
}
|
|
|
|
+ //判断不发货区域
|
|
if(this.shippingTemplateRuleList2){
|
|
if(this.shippingTemplateRuleList2){
|
|
for (let i = 0; i < this.shippingTemplateRuleList2.length; i++) {
|
|
for (let i = 0; i < this.shippingTemplateRuleList2.length; i++) {
|
|
let item = this.shippingTemplateRuleList2[i]
|
|
let item = this.shippingTemplateRuleList2[i]
|
|
@@ -396,9 +404,25 @@ export default {
|
|
arr.push(item)
|
|
arr.push(item)
|
|
})
|
|
})
|
|
}
|
|
}
|
|
- this.addData.shippingTemplateRuleList = arr
|
|
|
|
- this.submitForm()
|
|
|
|
|
|
+ if(arr == ""){
|
|
|
|
+ this.$message({
|
|
|
|
+ showClose: true,
|
|
|
|
+ message: '请至少添加一个区域',
|
|
|
|
+ type: 'warning'
|
|
|
|
+ });
|
|
|
|
+ return;
|
|
|
|
+ }else {
|
|
|
|
+ for (let i = 0; i < arr.length; i++) {
|
|
|
|
+ if(arr[i].type == 1){
|
|
|
|
+ arr[i].createPrice = accMul(arr[i].createPrice,100)
|
|
|
|
+ arr[i].defaultPrice = accMul(arr[i].defaultPrice,100)
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ this.addData.shippingTemplateRuleList = arr
|
|
|
|
+ this.submitForm()
|
|
|
|
+ }
|
|
},
|
|
},
|
|
|
|
+
|
|
submitForm(){
|
|
submitForm(){
|
|
if (this.id){
|
|
if (this.id){
|
|
setTemplateDetail(this.addData).then(res=>{
|
|
setTemplateDetail(this.addData).then(res=>{
|
|
@@ -426,7 +450,6 @@ export default {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
|
|
-
|
|
|
|
delRow(row){
|
|
delRow(row){
|
|
for (let i = 0; i < this.shippingTemplateRuleList.length; i++) {
|
|
for (let i = 0; i < this.shippingTemplateRuleList.length; i++) {
|
|
if(this.shippingTemplateRuleList[i] == row){
|
|
if(this.shippingTemplateRuleList[i] == row){
|
|
@@ -448,29 +471,28 @@ export default {
|
|
<style lang="scss" scoped>
|
|
<style lang="scss" scoped>
|
|
.spec-table {
|
|
.spec-table {
|
|
border-collapse: collapse;
|
|
border-collapse: collapse;
|
|
- width: 100%;
|
|
|
|
|
|
+ //width: 100%;
|
|
line-height: 32px;
|
|
line-height: 32px;
|
|
|
|
+ border-color: #DCDFE6;
|
|
color: #606266;
|
|
color: #606266;
|
|
font-size: 14px;
|
|
font-size: 14px;
|
|
-th {
|
|
|
|
- background-color: #ECECEC;
|
|
|
|
-}
|
|
|
|
-td {
|
|
|
|
- text-align: center;
|
|
|
|
-}
|
|
|
|
-.pd {
|
|
|
|
- padding: 15px;
|
|
|
|
-}
|
|
|
|
-.required {
|
|
|
|
- position: relative;
|
|
|
|
-span {
|
|
|
|
- position: relative;
|
|
|
|
- top: -6px;
|
|
|
|
- left: 2px;
|
|
|
|
- font-size: 10px;
|
|
|
|
- color: red;
|
|
|
|
-}
|
|
|
|
-}
|
|
|
|
|
|
+ th {
|
|
|
|
+ background-color: #ECECEC;
|
|
|
|
+ }
|
|
|
|
+ td {
|
|
|
|
+ text-align: center;
|
|
|
|
+ padding: 15px;
|
|
|
|
+ }
|
|
|
|
+ .required {
|
|
|
|
+ position: relative;
|
|
|
|
+ span {
|
|
|
|
+ position: relative;
|
|
|
|
+ top: -6px;
|
|
|
|
+ left: 2px;
|
|
|
|
+ font-size: 10px;
|
|
|
|
+ color: red;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
|
|
}
|
|
}
|
|
</style>
|
|
</style>
|