Browse Source

Merge branch 'pre-production'

master
pref_mail@163.com 2 months ago
parent
commit
13cf2b5a0a
  1. 1
      src/router/views/index.js
  2. 2
      src/views/distribution/artery/TripartiteTransfer.vue
  3. 1
      src/views/distribution/artery/VehicleArrivalManagement.vue
  4. 1
      src/views/distribution/artery/VehicleStowage.vue
  5. 28
      src/views/distribution/artery/truckLoadingDetails.vue

1
src/router/views/index.js

@ -217,6 +217,7 @@ export default [
name: '装车明细',
meta: {
i18n: 'data',
keepAlive: true,
},
component: () =>
import(

2
src/views/distribution/artery/TripartiteTransfer.vue

@ -930,6 +930,8 @@ const beforeClose = done => {
/** 显示装车详情 */
const handleShowTruckLoadingDetails = ({ row }) => {
$store.commit('DEL_ONCE_TAG', '/distribution/artery/truckLoadingDetails');
$router.push({
path: '/distribution/artery/truckLoadingDetails',
query: {

1
src/views/distribution/artery/VehicleArrivalManagement.vue

@ -1105,6 +1105,7 @@ const beforeClose = done => {
/** 显示装车详情 */
const handleShowTruckLoadingDetails = ({ row }) => {
$store.commit('DEL_ONCE_TAG', '/distribution/artery/truckLoadingDetails');
$router.push({
path: '/distribution/artery/truckLoadingDetails',
query: {

1
src/views/distribution/artery/VehicleStowage.vue

@ -1055,6 +1055,7 @@ const handleComparativeStatement = () => {
/** 显示装车详情 */
const handleShowTruckLoadingDetails = ({ row }) => {
console.log('row :>> ', row);
$store.commit('DEL_ONCE_TAG', '/distribution/artery/truckLoadingDetails');
$router.push({
path: '/distribution/artery/truckLoadingDetails',
query: {

28
src/views/distribution/artery/truckLoadingDetails.vue

@ -360,6 +360,12 @@
></edittablehead>
</template>
<script lang="ts">
export default {
name: '/distribution/artery/truckLoadingDetails',
};
</script>
<script setup lang="ts">
import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
import functions from '@/utils/functions';
@ -1650,21 +1656,13 @@ const handleBatchLoadConfirm = () => {
});
};
watch(
$route,
(newVal, oldVal) => {
console.log('newVal :>> ', newVal);
console.log('oldVal :>> ', oldVal);
if (newVal.path !== '/distribution/artery/truckLoadingDetails') return;
details.pageInfo.loadId = $route.query.loadId;
details.pageInfo.type = $route.query.type;
console.log('details.pageInfo :>> ', details.pageInfo);
onLoad();
},
{
immediate: true,
}
);
const initPage = () => {
details.pageInfo.loadId = $route.query.loadId;
details.pageInfo.type = $route.query.type;
onLoad();
};
initPage();
</script>
<style scoped lang="scss">

Loading…
Cancel
Save