Commit c45f35e1 authored by dragondean@qq.com's avatar dragondean@qq.com

订单复制后提交跳转,搜索联系人去空格

parent 263428c2
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
> >
<div class="header mb-10 flex-center"> <div class="header mb-10 flex-center">
<div class="flex-center">{{ $t("关键字") }}</div> <div class="flex-center">{{ $t("关键字") }}</div>
<el-input v-model="form.searchKey" clearable class="w-200"></el-input> <el-input v-model="form.searchKey" @change="replaceBlank" clearable class="w-200"></el-input>
<el-button type="primary" class="ml-10" @click="handleQuery">{{ <el-button type="primary" class="ml-10" @click="handleQuery">{{
$t("搜索") $t("搜索")
}}</el-button> }}</el-button>
...@@ -89,6 +89,7 @@ export default { ...@@ -89,6 +89,7 @@ export default {
methods: { methods: {
handleQuery() { handleQuery() {
this.form.pageNo = 1; this.form.pageNo = 1;
this.replaceBlank()
this.loadList(); this.loadList();
}, },
loadList() { loadList() {
...@@ -112,6 +113,10 @@ export default { ...@@ -112,6 +113,10 @@ export default {
choose(contact) { choose(contact) {
this.$emit("choose", contact); this.$emit("choose", contact);
}, },
replaceBlank(){
// JDAA-177 7.选择联系人弹出页,没有去掉中间和前后空格
this.form.searchKey = this.form.searchKey.replace(/\s+/g, '');
}
}, },
}; };
</script> </script>
......
...@@ -1820,6 +1820,11 @@ export default { ...@@ -1820,6 +1820,11 @@ export default {
const func = this.form.shipmentState > 0 ? updateShipmentApply : updateApply const func = this.form.shipmentState > 0 ? updateShipmentApply : updateApply
func(data).then(response => { func(data).then(response => {
this.$modal.msgSuccess(this.$t("修改成功")); this.$modal.msgSuccess(this.$t("修改成功"));
// 如果url中copy=1则表示复制后编辑订单,需要跳转到成功页面
if (this.$route.query.copy == 1) {
this.$redirect('success?orderId=' + this.form.orderId)
return
}
this.$router.back() this.$router.back()
}); });
return; return;
......
...@@ -1468,7 +1468,7 @@ export default { ...@@ -1468,7 +1468,7 @@ export default {
// 复制订单 // 复制订单
handleCopyOrder(orderId) { handleCopyOrder(orderId) {
copyOrder(orderId).then((res) => { copyOrder(orderId).then((res) => {
this.$router.push({ path: "/order/edit", query: { id: res.data } }) this.$router.push({ path: "/order/edit", query: { id: res.data, copy: "1" } })
}) })
}, },
// 查看异常 // 查看异常
......
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