Skip to content

S
shop-new
提交 47e7f19a authored 作者: huaxinzhu's avatar huaxinzhu
浏览文件
操作

Merge branch 'dev_hxz' into test

上级 ecef67fa 2adddc4c
隐藏空白字符变更
内嵌 并排
正在显示 包含 93 行增加 和 67 行删除
src/views/system/freight/freight_list/index.vue
浏览文件 @ 47e7f19a
......@@ -250,7 +250,7 @@
name: "",
isDefault: 0,
chargeType: 0,
Dispatching: [
dispatching: [
{
a: "全国",
f: 500,
......@@ -259,8 +259,8 @@
np: 5,
}
],
Disdispatching: "",
Publish: 0,
disDispatching: "",
publish: 0,
};
this.title = "添加运费模板";
},
......@@ -269,8 +269,8 @@
this.reset();
const id = row.id
getFreight(id).then(response => {
let formdate = response.data
response.data.Dispatching = JSON.parse(formdate.Dispatching)
//let formdate = response.data
//response.data.dispatching = JSON.parse(formdate.dispatching)
this.form = response.data
this.isOpen = true;
this.title = "修改运费模板";
......
src/views/system/freight/freight_list/indexbtn.vue
浏览文件 @ 47e7f19a
......@@ -3,26 +3,26 @@
<el-form class='el_form' ref="form" label-width="100px">
<el-form-item label="排序">
<el-input
v-model="goodsDate.Sort"
v-model="goodsDate.sort"
placeholder=""
style="width: 70%"
></el-input>
</el-form-item>
<el-form-item label="模板名称">
<el-input
v-model="goodsDate.Name"
v-model="goodsDate.name"
placeholder=""
style="width: 70%"
></el-input>
</el-form-item>
<el-form-item label="是否默认">
<el-radio-group v-model="goodsDate.IsDefault">
<el-radio-group v-model="goodsDate.is_default">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="计费方式">
<el-radio-group v-model="goodsDate.ChargeType">
<el-radio-group v-model="goodsDate.charge_type">
<el-radio :label="1">按重量</el-radio>
<el-radio :label="2">按数量</el-radio>
</el-radio-group>
......@@ -39,7 +39,7 @@
<p class="col_pr">管理</p>
</div>
<div
v-for="(item, index) in goodsDate.Dispatching"
v-for="(item, index) in goodsDate.dispatching"
:key="index"
class="tablessst"
>
......@@ -106,20 +106,19 @@
</el-form-item>
<el-form-item label="不配送区域">
<el-input
v-model="goodsDate.Disdispatching"
v-model="goodsDate.dis_dispatching"
placeholder=""
style="width: 80%"
disabled
>
<template slot="prepend">
<span @click="opendias(goodsDate.Disdispatching, 1, 99)"
>选择</span
>
<span @click="opendias(goodsDate.dis_dispatching, 1, 99)"
>选择</span>
</template>
</el-input>
</el-form-item>
<el-form-item label="状态">
<el-radio-group v-model="goodsDate.Publish">
<el-radio-group v-model="goodsDate.publish">
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">禁用</el-radio>
</el-radio-group>
......@@ -201,16 +200,16 @@ export default {
disabledate: [], //不能选择
dialogVisible: false,
goodsDate: {
Id:0,
Sort: 0,
Name: "0",
IsDefault: 0,
ChargeType: 0,
Dispatching: [
id:0,
sort: 0,
name: "0",
is_default: 0,
charge_type: 0,
dispatching: [
{ a: "全国", f: 500, fp: 10, n: 100, np: 5 }
],
Disdispatching: "",
Publish: 0,
dis_dispatching: "",
publish: 0,
},
};
},
......@@ -226,9 +225,9 @@ export default {
if(checkListString.substr(0,1) === ',') {
checkListString = checkListString.slice(1);
}
this.goodsDate.Disdispatching = checkListString;
this.goodsDate.dis_dispatching = checkListString;
}else{
this.goodsDate.Dispatching[this.btnindex].a = this.checkList.join()
this.goodsDate.dispatching[this.btnindex].a = this.checkList.join()
}
this.dialogVisible = false
},
......@@ -240,13 +239,13 @@ export default {
},
opendias(type, i, index) {
this.goodsDate.Dispatching.forEach((element) => {
this.goodsDate.dispatching.forEach((element) => {
let arrd = element.a.split(',')
for(let i=0;i<arrd.length;i++){
this.disabledate.push(arrd[i]);
}
});
let arr = this.goodsDate.Disdispatching.split(',');
let arr = this.goodsDate.dis_dispatching.split(',');
for(let i=0;i<arr.length;i++){
this.disabledate.push(arr[i]);
}
......@@ -266,25 +265,30 @@ export default {
this.dialogVisible = true;
},
handleinfomationclick() {//提交
this.goodsDate.Dispatching.forEach(item=>{
/** 运费模板 修改/新增 的保存 */
handleinfomationclick() {
this.goodsDate.dispatching.forEach(item=>{
item.fp= Number(item.fp*100).toFixed();
item.np = Number(item.np*100).toFixed();
})
this.loading = true
addFreight(this.goodsDate).then(res => {
//console.log(275,res);
if(res.code === 1) {
this.$emit("closeIndexbtn",false);
if(this.goodsDate.Id === 0) {
if(this.goodsDate.id === 0) {
this.$message({ message: '新增成功', type: 'success'});
}else {
this.$message({ message: '修改成功', type: 'success'});
}
}else {
this.goodsDate.dispatching.forEach(item=>{
item.fp= Number(item.fp/100).toFixed();
item.np = Number(item.np/100).toFixed();
})
}
this.loading = false;
});
},
/** 配送区域 添加参数 操作 */
addguild() {
//添加
let arrchild = {
......@@ -294,15 +298,11 @@ export default {
n: "",
np: "",
};
this.$set(
this.goodsDate.Dispatching,
this.goodsDate.Dispatching.length,
arrchild
);
this.$set(this.goodsDate.dispatching, this.goodsDate.dispatching.length, arrchild);
},
/** 删除 运费模板 */
deletearrinput(index) {
//删除
this.goodsDate.Dispatching.splice(index, 1);
this.goodsDate.dispatching.splice(index, 1);
},
info() {
this.goodsDate = this.option
......
src/views/system/order/components/orderDetail.vue
浏览文件 @ 47e7f19a
......@@ -178,8 +178,11 @@
<el-input size="mini" v-model="addressForm.tel" placeholder="请输入联系电话"></el-input>
</el-form-item>
<el-form-item label="收货地址：">
<el-cascader v-model="addressForm.areaList" :props='props' ref="ssqCascader" placeholder="请选择具体的省市区" style="width:100%"></el-cascader>
<el-cascader v-model="addressForm.areaList" :props='props' @change="handleChanges" ref="ssqCascader" placeholder="请选择具体的省市区" style="width:100%"></el-cascader>
</el-form-item>
<!-- <el-form-item label="省市区：" prop="address_ids">-->
<!-- <el-cascader v-model="areaList" :props='props' @change="handleChanges" placeholder="请选择具体的省市区" style="width:100%"></el-cascader>-->
<!-- </el-form-item>-->
<el-form-item label="街道：">
<el-input size="mini" v-model="addressForm.street" placeholder="请输入街道"></el-input>
</el-form-item>
......@@ -590,13 +593,15 @@ export default {
if(this.orderDetail.mobile) {
this.addressForm.tel = this.orderDetail.mobile;
}
// if(this.orderDetail.provice && this.orderDetail.city && this.orderDetail.district) {
// this.addressForm.areaList.push(this.orderDetail.provice) //this.orderDetail.provice + this.orderDetail.city + this.orderDetail.district
// this.addressForm.areaList.push(this.orderDetail.this.city) //this.orderDetail.provice + this.orderDetail.city + this.orderDetail.district
// this.addressForm.areaList.push(this.orderDetail.district) //this.orderDetail.provice + this.orderDetail.city + this.orderDetail.district
// }else {
// this.addressForm.areaList = []
// }
if(this.orderDetail.provice && this.orderDetail.city && this.orderDetail.district) {
this.addressForm.areaList[0] = Number(this.orderDetail.provice)
this.addressForm.areaList[1] = Number(this.orderDetail.city)
this.addressForm.areaList[2] = Number(this.orderDetail.district)
//console.log(66,this.addressForm.areaList);
}else {
this.addressForm.areaList = []
}
if(this.orderDetail.street) {
this.addressForm.street = this.orderDetail.street;
......@@ -605,8 +610,6 @@ export default {
this.addressForm.address = this.orderDetail.address;
}
this.modifyinfoDialog = true
},
/** 保存 买家信息 */
......@@ -788,6 +791,10 @@ export default {
resolve(result)
})
},
handleChanges(value) {
this.addressForm.areaList = value;
console.log(797,value);
},
}
}
</script>
......
src/views/system/order/index.vue
浏览文件 @ 47e7f19a
......@@ -595,7 +595,6 @@
this.$refs.upload.clearFiles();
this.isDeliveryOpen = false;
this.excelList = [];
//console.log(88,this.excelList);
},
// 提交导入数据
......@@ -609,6 +608,7 @@
deliveryOrderExport(this.excelList).then(res => {
if (res.code === 1) {
this.isDeliveryOpen = false;
this.excelList = [];
this.$message({type: 'success', message: '批量发货成功'});
this.getListOrder();
} else {
......
src/views/system/retreat/edit.vue
浏览文件 @ 47e7f19a
......@@ -149,8 +149,8 @@
<el-button class="as-btn" type="primary" @click="refuseHandle(4)" :disabled="isFinishedButtonDisabled">拒绝退货退款</el-button>
</div>
<div class="as-handle-btn" v-if="onlyOrRefundBtnType == 3">
<el-button class="as-btn" type="primary" @click="refuseHandle(4)" :disabled="isFinishedButtonDisabled">拒收包裹</el-button>
<el-button class="as-btn" type="primary" @click="agreeHandle(1)" :disabled="isFinishedButtonDisabled">确定退款</el-button>
<el-button class="as-btn" type="primary" @click="refuseHandle(4)" :disabled="isFinishedButtonDisabled || returnRefundDisabled">拒收包裹</el-button>
<el-button class="as-btn" type="primary" @click="agreeHandle(1)" :disabled="isFinishedButtonDisabled || returnRefundDisabled" >确定退款</el-button>
</div>
</el-card>
......@@ -265,7 +265,8 @@
sellerId: 0,
asAddressOptions: [],
order_refund_address:'',
isFinishedButtonDisabled: false
isFinishedButtonDisabled: false,
returnRefundDisabled: false, // 仅 退货退款 订单，需要此参数，控制，拒收包裹-同意退款按钮是否可以点击
} // return end
},
watch: {
......@@ -479,6 +480,7 @@
this.onlyOrRefundBtnType = 1
}else if(row.refund_type == 2) {
this.onlyOrRefundBtnType = (row.status == 1) ? 2 : 3
this.returnRefundDisabled = (row.status == 2) ? true : false // 仅 退货退款 订单，当买家未回填物流单号时，不允许点击 “拒收包裹” 按钮
}else {
this.onlyOrRefundBtnType = 0;
}
......@@ -676,13 +678,21 @@
reasonFormatter(type) {
let reasonText = ''
if ( type == 1 ) {
reasonText = '其他'
reasonText = '协商一致退款'
} else if( type == 2 ) {
reasonText = '漏发'
reasonText = '质量问题'
}else if( type == 3 ) {
reasonText = '协商一致'
reasonText = '物流问题'
}else if( type == 4 ) {
reasonText = '质量不符'
reasonText = '假冒品牌'
}else if( type == 5 ) {
reasonText = '少件/漏发/破损/污渍'
}else if( type == 6 ) {
reasonText = '7天无理由'
}else if( type == 7 ) {
reasonText = '拍错/多拍/不想要'
}else if( type == 8 ) {
reasonText = '其他'
}
return reasonText
},
......
src/views/system/retreat/retreat/index.vue
浏览文件 @ 47e7f19a
......@@ -79,10 +79,14 @@
</el-table-column>
<el-table-column label="退换货原因" align="center" prop="reason">
<template slot-scope="scope">
<span v-if="scope.row.reason==1">其他</span>
<span v-if="scope.row.reason==2">漏发</span>
<span v-if="scope.row.reason==3">协商一致</span>
<span v-if="scope.row.reason==4">质量不符</span>
<span v-if="scope.row.reason==1">协商一致退款</span>
<span v-if="scope.row.reason==2">质量问题</span>
<span v-if="scope.row.reason==3">物流问题</span>
<span v-if="scope.row.reason==4">假冒品牌</span>
<span v-if="scope.row.reason==5">少件/漏发/破损/污渍</span>
<span v-if="scope.row.reason==6">7天无理由</span>
<span v-if="scope.row.reason==7">拍错/多拍/不想要</span>
<span v-if="scope.row.reason==8">其他</span>
</template>
</el-table-column>
<el-table-column label="申请时间" align="center" prop="created_time">
......@@ -172,10 +176,14 @@
// 退换货原因
needMsgOptions: [
{value: -1,label: '全部原因'},
{value: 3,label: '协商一致退款'},
{value: 1,label: '其他'},
{value: 2,label: '漏发'},
{value: 4,label: '质量不符'},
{value: 1,label: '协商一致退款'},
{value: 2,label: '质量问题'},
{value: 3,label: '物流问题'},
{value: 4,label: '假冒品牌'},
{value: 5,label: '少件/漏发/破损/污渍'},
{value: 6,label: '7天无理由'},
{value: 7,label: '拍错/多拍/不想要'},
{value: 8,label: '其他'},
],
fullHeight: 0,
afterSaleHeight: 200,
......@@ -195,12 +203,13 @@
}
},
created() {
this.searchList();
this.$nextTick(() => {
this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
})
},
mounted() {},
mounted() {
this.searchList();
},
methods: {
/** 顶部 状态页签切换
* 1-未处理；2-处理中；3-已完成
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论