diff --git a/src/api/distribution/VehicleArrivalManagement.js b/src/api/distribution/VehicleArrivalManagement.js index 07990ed1..78e92d13 100644 --- a/src/api/distribution/VehicleArrivalManagement.js +++ b/src/api/distribution/VehicleArrivalManagement.js @@ -70,4 +70,15 @@ export const postUnloadByLoadIdBefore = (page, params) => { }); }; +/** + * 查询配载图片 + */ +export const postFindLinePhoto = data => { + return request({ + url: '/api/logpm-trunkline/carsLoad/findLinePhoto', + method: 'post', + data, + }); +}; + // /logpm-trunkline/carsLoad/unloadByLoadId diff --git a/src/option/distribution/VehicleArrivalManagement.js b/src/option/distribution/VehicleArrivalManagement.js index aedea67b..0dae89cd 100644 --- a/src/option/distribution/VehicleArrivalManagement.js +++ b/src/option/distribution/VehicleArrivalManagement.js @@ -125,7 +125,7 @@ export const columnList = [ { prop: 'loadStatusName', label: '车辆状态', - type: 14, + type: 3, values: '', width: '130', checkarr: [ diff --git a/src/option/distribution/VehicleStowage.js b/src/option/distribution/VehicleStowage.js index 144eca68..7cb52d17 100644 --- a/src/option/distribution/VehicleStowage.js +++ b/src/option/distribution/VehicleStowage.js @@ -125,7 +125,7 @@ export const columnList = [ { prop: 'loadStatusName', label: '车辆状态', - type: 14, + type: 3, values: '', width: '130', checkarr: [ diff --git a/src/router/views/index.js b/src/router/views/index.js index aec5fed6..2361f021 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -202,6 +202,16 @@ export default [ /* webpackChunkName: "views" */ '@/views/distribution/artery/AddVehicleStowage.vue' ), }, + { + path: 'VehicleNodeImgs', + name: '配载节点图片', + meta: { + i18n: 'data', + keepAlive: true, + }, + component: () => + import(/* webpackChunkName: "views" */ '@/views/distribution/artery/VehicleNodeImgs.vue'), + }, { path: 'truckLoadingDetails', name: '装车明细', diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue index 65aa515b..ea3cdfc5 100644 --- a/src/views/distribution/artery/TripartiteTransfer.vue +++ b/src/views/distribution/artery/TripartiteTransfer.vue @@ -232,7 +232,10 @@ 零担装车 @@ -748,6 +751,10 @@ const permissionObj = reactive({ TripartiteTransfer_loadingDetail: computed(() => { return $store.getters.permission.TripartiteTransfer_loadingDetail; }), + /** 零担装车 */ + TripartiteTransfer_ZeroLoading: computed( + () => $store.getters.permission.TripartiteTransfer_ZeroLoading + ), }); /** 转换码值 */ diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue index d54c2467..addc8cce 100644 --- a/src/views/distribution/artery/VehicleArrivalManagement.vue +++ b/src/views/distribution/artery/VehicleArrivalManagement.vue @@ -240,10 +240,6 @@ - - @@ -335,24 +336,22 @@ - -
-
勾选数量: {{ selectionList.length }}
- - - -
-
+
+
勾选数量: {{ selectionList.length }}
+ + + +
@@ -1536,6 +1535,9 @@ const handlePrint = () => { print(nodeList); }; + +/** 配载图片显示 */ +const handleShowVehicleImgs = async ({ row }) => {}; diff --git a/src/views/distribution/artery/VehicleNodeImgs.vue b/src/views/distribution/artery/VehicleNodeImgs.vue new file mode 100644 index 00000000..0195d700 --- /dev/null +++ b/src/views/distribution/artery/VehicleNodeImgs.vue @@ -0,0 +1,321 @@ + + + + + diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue index 1d952df3..ac2b9a44 100644 --- a/src/views/distribution/artery/VehicleStowage.vue +++ b/src/views/distribution/artery/VehicleStowage.vue @@ -219,10 +219,6 @@ > - - @@ -762,6 +764,8 @@ const permissionObj = reactive({ VehicleStowage_ManualLoading: computed(() => { return $store.getters.permission.VehicleStowage_ManualLoading; }), + /** 零担装车 */ + VehicleStowage_ZeroLoading: computed(() => $store.getters.permission.VehicleStowage_ZeroLoading), }); onMounted(() => { @@ -1446,6 +1450,17 @@ const handlePrint = () => { print(nodeList); }; + +/** 配载图片显示 */ +const handleShowVehicleImgs = async ({ row }) => { + $router.push({ + path: '/distribution/artery/VehicleNodeImgs', + query: { + name: `${row.carsNo} - 配载图片`, + loadId: row.id, + }, + }); +};