Skip to content

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

Merge branch 'dev_hxz' into test

上级 c7021559 08bc0d86
隐藏空白字符变更
内嵌 并排
正在显示 包含 88 行增加 和 31 行删除
src/api/module/freight.js
浏览文件 @ 80269b60
......@@ -30,7 +30,7 @@ export function addFreight(data) {
// 修改freight
export function updateFreight(data) {
return request({
url: '/system/freightNew/edit',
url: '/system/freightNew/save',
method: 'post',
data: data
})
......
src/views/system/freight/freight_list/index.vue
浏览文件 @ 80269b60
......@@ -268,12 +268,16 @@
handleUpdate(row) {
this.reset();
const id = row.id
getFreight(id).then(response => {
getFreight(id).then(res => {
//let formdate = response.data
//response.data.dispatching = JSON.parse(formdate.dispatching)
this.form = response.data
this.isOpen = true;
this.title = "修改运费模板";
if(res.code == 1) {
this.form = res.data
this.isOpen = true;
this.title = "修改运费模板";
}else {
this.$message({type:'error',message: res.message ? res.message : '获取运费模板详情失败'});
}
});
},
/** 提交按钮 */
......@@ -281,7 +285,6 @@
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != 0) {
updateFreight(this.form).then(response => {
if (response.code === 0) {
......
src/views/system/freight/freight_list/indexbtn.vue
浏览文件 @ 80269b60
......@@ -147,7 +147,7 @@
</template>
<script>
import { addFreight } from '@/api/module/freight'
import { addFreight, updateFreight} from '@/api/module/freight'
export default {
name: "goodsmeter",
props: {
......@@ -267,26 +267,44 @@ export default {
},
/** 运费模板 修改/新增 的保存 */
handleinfomationclick() {
this.goodsDate.dispatching.forEach(item=>{
item.fp= Number(item.fp*100).toFixed();
item.np = Number(item.np*100).toFixed();
item.fp= Number(item.fp*100);
item.np = Number(item.np*100);
})
addFreight(this.goodsDate).then(res => {
//console.log(275,res);
if(res.code === 1) {
this.$emit("closeIndexbtn",false);
if(this.goodsDate.id === 0) {
//console.log(111,this.goodsDate);
// 新增 运费模板
if(this.goodsDate.id == 0) {
addFreight(this.goodsDate).then(res => {
if(res.code == 1) {
this.$emit("closeIndexbtn",false);
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.$message({type:'error',message: res.message ? res.message : '新增失败'});
}
});
}else { // 否则 是修改
updateFreight(this.goodsDate).then(res=> {
if(res.code == 1) {
this.$emit("closeIndexbtn",false);
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.$message({type:'error',message: res.message ? res.message : '修改失败'});
}
}else {
this.goodsDate.dispatching.forEach(item=>{
item.fp= Number(item.fp/100).toFixed();
item.np = Number(item.np/100).toFixed();
})
}
});
});
}
},
/** 配送区域 添加参数 操作 */
addguild() {
......@@ -306,6 +324,10 @@ export default {
},
info() {
this.goodsDate = this.option
this.goodsDate.dispatching.forEach(item=>{
item.fp= Number(item.fp/100).toFixed();
item.np = Number(item.np/100).toFixed();
})
},
},
};
......
src/views/system/order/components/orderDetail.vue
浏览文件 @ 80269b60
......@@ -178,11 +178,8 @@
<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' @change="handleChanges" ref="ssqCascader" placeholder="请选择具体的省市区" style="width:100%"></el-cascader>
<el-cascader :class="{ 'only-eidt-placeholder' : onlyEidtPlaceholder }" v-model="addressForm.areaList" :props='props' @change="handleChanges" ref="ssqCascader" :placeholder="addOrEditPlaceholder" 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>
......@@ -318,6 +315,8 @@ export default {
label: 'name',
leaf: 'leaf'
},
addOrEditPlaceholder: '',
onlyEidtPlaceholder: false,
goShippingNum: 0, // 发货类型
goods_ids: null, // 发货的商品订单 id
}
......@@ -587,6 +586,7 @@ export default {
street: '',
areaList: []
}
if(this.orderDetail.real_name) {
this.addressForm.shipping_name = this.orderDetail.real_name;
}
......@@ -594,12 +594,15 @@ export default {
this.addressForm.tel = this.orderDetail.mobile;
}
// 因为 后台返回的省市区 每个字段都是 汉字，所以这样处理，通过 placeholder 去回显 后台返回的数据，
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);
this.addOrEditPlaceholder = this.orderDetail.provice + '/' + this.orderDetail.city + '/' + this.orderDetail.district;
this.addressForm.areaList[0] = this.orderDetail.provice
this.addressForm.areaList[1] = this.orderDetail.city
this.addressForm.areaList[2] = this.orderDetail.district
}else {
this.addOrEditPlaceholder = "请选择具体的省市区"
this.addressForm.areaList = []
}
......@@ -663,10 +666,15 @@ export default {
return
}
// 省市区 转化
//debugger
// 省市区 转化 onlyEidtPlaceholder
let ssqLabelList = [];
if(this.addressForm.areaList && this.addressForm.areaList.length > 1) {
if(this.onlyEidtPlaceholder) {
ssqLabelList = this.$refs['ssqCascader'].getCheckedNodes()[0].pathLabels;
console.log(11,ssqLabelList);
}else {
ssqLabelList = this.addressForm.areaList;
console.log(22,ssqLabelList);
}
let params = {
......@@ -688,6 +696,8 @@ export default {
})
this.modifyinfoDialog = false
this.handleInfo()
}else {
this.$message({type:'error',message:res.message ? res.message : '修改失败'});
}
})
},
......@@ -793,7 +803,7 @@ export default {
},
handleChanges(value) {
this.addressForm.areaList = value;
console.log(797,value);
this.onlyEidtPlaceholder = true // 说明操作下拉进行完整的选择值操作了，即 this.addressForm.areaList 是数组，元素为id
},
}
}
......@@ -824,6 +834,13 @@ export default {
/deep/.el-input--medium .el-input__inner {
height: 28px;
}
/deep/input::-webkit-input-placeholder{
color:#606266;
}
/deep/input::-moz-placeholder{
color:#606266;
opacity: 1
}
.orderDetail {
height: 660px;
......@@ -885,4 +902,18 @@ export default {
.remark-con .remark-text {
}
/deep/.only-eidt-placeholder .el-input input::-webkit-input-placeholder, /deep/.only-eidt-placeholder .el-input textarea::-webkit-input-placeholder{
color: #666;
}
/deep/.only-eidt-placeholder .el-input input:-moz-placeholder, /deep/.only-eidt-placeholder .el-input textarea:-moz-placeholder {
color: #666;
opacity: 1;
}
/deep/.only-eidt-placeholder .el-input input::-moz-placeholder, /deep/.only-eidt-placeholder .el-input textarea::-moz-placeholder {
color: #666;
opacity: 1;
}
/deep/.only-eidt-placeholder .el-input input:-ms-input-placeholder, /deep/.only-eidt-placeholder .el-input textarea::-ms-input-placeholder {
color: #666;
}
</style>
src/views/system/order/index.vue
浏览文件 @ 80269b60
......@@ -609,6 +609,7 @@
if (res.code === 1) {
this.isDeliveryOpen = false;
this.excelList = [];
this.$refs.upload.clearFiles();
this.$message({type: 'success', message: '批量发货成功'});
this.getListOrder();
} else {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论