fix: 发货弹窗取消

feature/task1.0.0__0514__ch
向文可 3 years ago
parent 244ed33ed4
commit d7d44fc29f

@ -54,7 +54,7 @@
</TableList> </TableList>
<CloseOrder ref="refsCloseOrder" /> <CloseOrder ref="refsCloseOrder" />
<OrderTrack ref="refsOrderTrack" /> <OrderTrack ref="refsOrderTrack" />
<OrderShip ref="refsOrderShip" @close="handleSearch" /> <OrderShip ref="refsOrderShip" @save="handleSearch" />
</div> </div>
</template> </template>

@ -9,7 +9,7 @@
@search="handleSearch" @search="handleSearch"
/> />
<template #footer> <template #footer>
<el-button type="danger" @click="handleCancel"></el-button> <el-button type="danger" @click="handleClose"></el-button>
<el-button :loading="loading" type="primary" @click="handleSave"></el-button> <el-button :loading="loading" type="primary" @click="handleSave"></el-button>
</template> </template>
</el-dialog> </el-dialog>
@ -18,7 +18,6 @@
<script setup lang="jsx"> <script setup lang="jsx">
import ElInput from '@/components/extra/ElInput.vue'; import ElInput from '@/components/extra/ElInput.vue';
import ElSelect from '@/components/extra/ElSelect.vue'; import ElSelect from '@/components/extra/ElSelect.vue';
const router = useRouter();
const store = useStore(); const store = useStore();
const loading = ref(false); const loading = ref(false);
const visible = ref(false); const visible = ref(false);
@ -36,14 +35,16 @@
loading.value = false; loading.value = false;
}; };
/* 取消 */ /* 取消 */
const handleCancel = () => { const handleClose = () => {
router.push({ name: 'OrderManagement' }); visible.value = false;
}; };
const emits = defineEmits(['save']);
const handleSave = async () => { const handleSave = async () => {
loading.value = true; loading.value = true;
let res = await store.dispatch('orderShip/save', unref(list)); let res = await store.dispatch('orderShip/save', unref(list));
if (res) { if (res) {
handleClose(); handleClose();
emits('save');
} }
loading.value = false; loading.value = false;
}; };
@ -51,11 +52,6 @@
visible.value = true; visible.value = true;
handleSearch(); handleSearch();
}; };
const emits = defineEmits(['save']);
const handleClose = () => {
visible.value = false;
emits('save');
};
defineExpose({ defineExpose({
show: handleShow, show: handleShow,
close: handleClose, close: handleClose,

@ -25,7 +25,7 @@ export default (configEnv) => {
// target: 'http://192.168.10.67:8090', // 罗战 // target: 'http://192.168.10.67:8090', // 罗战
// target: 'https://k8s-horse-gateway.mashibing.cn/', // 测试地址 // target: 'https://k8s-horse-gateway.mashibing.cn/', // 测试地址
// target: 'https://gateway.mashibing.cn', // 预发地址 // target: 'https://gateway.mashibing.cn', // 预发地址
target: 'https://like-gateway.mashibing.com', // 生产环境 target: 'https://you-gateway.mashibing.com', // 生产环境
changeOrigin: true, changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, ''), rewrite: (path) => path.replace(/^\/api/, ''),
}, },

Loading…
Cancel
Save