新增到车同步，新增结算确认，新增新配载详情页面

src/api/distribution/VehicleArrivalManagement.js

@@ -92,3 +92,12 @@ export const postExportCarsPageList = data => {
     responseType: 'blob',
   });
 };
+
+/** 同步数据 */
+export const postSyncNoSystemData = data => {
+  return request({
+    url: '/api/logpm-trunkline/carsLoad/syncNoSystemData',
+    method: 'post',
+    data,
+  });
+};

src/api/distribution/VehicleStowageDetails.js

@@ -12,7 +12,7 @@ export const postloadFindLoadInitData = (data = {}) => {
 };
 
 /**
- * 通过名称查询仓库信息
+ * 查询配载详情
  */
 export const postCarsLoadDetailInfo = data => {
   return request({
@@ -22,6 +22,17 @@ export const postCarsLoadDetailInfo = data => {
   });
 };
 
+/**
+ * 查询配载详情
+ */
+export const postCarsLoadDetailInfoNew = data => {
+  return request({
+    url: '/api/logpm-trunkline/carsLoad/carsLoadDetailInfoNew',
+    method: 'post',
+    data,
+  });
+};
+
 /**
  * 配载日志
  */

src/api/finance/CustomerSettlement.js

@@ -14,7 +14,7 @@ export const postPageList = data => {
 };
 
 /**
- * 确认结算
+ * 提交结算信息
  * @param {*} data
  * @returns
  */
@@ -25,3 +25,16 @@ export const postCheckBalance = data => {
     data,
   });
 };
+
+/**
+ * 确认结算信息
+ * @param {*} data
+ * @returns
+ */
+export const postEnterBalance = data => {
+  return request({
+    url: '/api/logpm-statisticsdata/merchantBalance/enterBalance',
+    method: 'post',
+    data,
+  });
+};

src/option/distribution/VehicleArrivalManagement.js

@@ -380,7 +380,7 @@ export const columnList = [
     label: '操作',
     type: 6,
     values: '',
-    width: '200',
+    width: '250',
     checkarr: [],
     fixed: 'right',
     sortable: false,

src/router/views/index.js

@@ -268,6 +268,17 @@ export default [
             /* webpackChunkName: "views" */ '@/views/distribution/artery/VehicleStowageDetails.vue'
           ),
       },
+      {
+        path: 'NewVehicleStowageDetails',
+        name: '配载详情V2',
+        meta: {
+          i18n: 'data',
+        },
+        component: () =>
+          import(
+            /* webpackChunkName: "views" */ '@/views/distribution/artery/NewVehicleStowageDetails.vue'
+          ),
+      },
       {
         path: 'directGoMarket',
         name: '配置直发商家',
@@ -1190,8 +1201,7 @@ export default [
           name: route.query.name,
           id: route.query.id,
         }),
-        component: () =>
-          import('@/views/distribution/inventory/delivery/Unstoreddetails.vue'),
+        component: () => import('@/views/distribution/inventory/delivery/Unstoreddetails.vue'),
       },
     ],
   },
@@ -1473,7 +1483,7 @@ export default [
       },
     ],
   },
-  
+
   {
     path: '/aftersales/aftersalesWorkOrderInfo',
     component: Layout,

src/views/distribution/artery/VehicleArrivalManagement.vue

@@ -289,6 +289,13 @@
               Number(slotProps.scope.row.loadStatus) !== 100
             "
           >
+            <el-text
+              v-if="permissionObj.VehicleStowage_GoVehicleDetail"
+              @click="GoVehicleDetail(slotProps.scope)"
+            >
+              配载详情
+            </el-text>
+
             <!-- 装车明细 -->
             <el-text
               v-if="permissionObj.VehicleArrivalManagement_shippingSpecification"
@@ -319,6 +326,13 @@
               >编辑
             </el-text>
 
+            <el-text
+              v-if="Number(slotProps.scope.row.loadStatus) !== 100"
+              @click="handleSync(slotProps.scope)"
+            >
+              同步数据
+            </el-text>
+
             <el-dropdown v-if="Number(slotProps.scope.row.loadStatus) !== 0">
               <span class="el-dropdown-link">
                 <el-text>
@@ -674,6 +688,7 @@ import {
   postUnloadByLoadId,
   postUnloadByLoadIdBefore,
   postExportCarsPageList,
+  postSyncNoSystemData,
 } from '@/api/distribution/VehicleArrivalManagement';
 import {
   postStartCarByLoadId,
@@ -911,6 +926,10 @@ const permissionObj = reactive({
   VehicleArrivalManagement_ZeroLoading: computed(
     () => $store.getters.permission.VehicleArrivalManagement_ZeroLoading
   ),
+  /** 配载详情 */
+  VehicleStowage_GoVehicleDetail: computed(
+    () => $store.getters.permission.VehicleStowage_GoVehicleDetail
+  ),
 });
 
 /** 请求页面数据 */
@@ -1555,6 +1574,49 @@ const handleUnloadByLoadId = async (type: 1 | 2) => {
   }
 };
 
+/** 跳转配载详情 */
+const GoVehicleDetail = ({ row }) => {
+  $router.push({
+    path: '/distribution/artery/NewVehicleStowageDetails',
+    query: {
+      loadId: row.id,
+      name: `${row.carsNo} - 配载详情`,
+    },
+  });
+};
+
+/** 同步数据 */
+const handleSync = ({ row }) => {
+  ElMessageBox.confirm('确认同步数据吗?', '', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    try {
+      details.loadingObj.pageLoading = true;
+      const submitData = {
+        loadId: row.id,
+      };
+
+      const res = await postSyncNoSystemData(submitData);
+      const { code } = res.data;
+      if (code !== 200) {
+        return;
+      }
+      ElMessage({
+        type: 'success',
+        message: '同步成功',
+      });
+
+      onLoad();
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
+  });
+};
+
 /** 显示装载清单 */
 const handleShowListOfLoadedWagons = async () => {
   try {

src/views/distribution/artery/VehicleStowage.vue

@@ -264,6 +264,14 @@
             "
           >
             <div class="handleControl">
+              <!-- 装车明细 -->
+              <el-text
+                v-if="permissionObj.VehicleStowage_GoVehicleDetail"
+                @click="GoVehicleDetail(slotProps.scope)"
+              >
+                配载详情
+              </el-text>
+
               <!-- 零担补录 -->
               <el-text
                 v-if="
@@ -275,17 +283,6 @@
                 零担补录
               </el-text>
 
-              <!-- <el-text
-                v-if="
-                  slotProps.scope.row.isCustomer === '1' &&
-                  permissionObj.VehicleStowage_zeroAdditionalRecording &&
-                  Number(slotProps.scope.row.loadStatus) !== 80
-                "
-                @click="handleShowzeroAdditionalRecording(slotProps.scope, true)"
-              >
-                直发签收零担补录
-              </el-text> -->
-
               <!-- 装车明细 -->
               <el-text
                 v-if="permissionObj.VehicleStowage_loadingDetails"
@@ -827,6 +824,10 @@ const permissionObj = reactive({
   }),
   /** 零担装车 */
   VehicleStowage_ZeroLoading: computed(() => $store.getters.permission.VehicleStowage_ZeroLoading),
+  /** 配载详情 */
+  VehicleStowage_GoVehicleDetail: computed(
+    () => $store.getters.permission.VehicleStowage_GoVehicleDetail
+  ),
 });
 
 onMounted(() => {
@@ -1082,6 +1083,17 @@ const handleShowTruckLoadingDetails = ({ row }) => {
   // });
 };
 
+/** 跳转配载详情 */
+const GoVehicleDetail = ({ row }) => {
+  $router.push({
+    path: '/distribution/artery/NewVehicleStowageDetails',
+    query: {
+      loadId: row.id,
+      name: `${row.carsNo} - 配载详情`,
+    },
+  });
+};
+
 /** 显示零担补录 */
 const handleShowzeroAdditionalRecording = ({ row }, type = false) => {
   if (!ChecksWhetherTheWarehouseIsSelected())

src/views/finance/CustomerSettlement.vue

@@ -91,7 +91,7 @@
         <!-- 头部左侧按钮模块 -->
         <div class="avue-crud__left">
           <!-- 导出 -->
-          <el-button type="primary" icon="Download" @click="handleExport">导 出</el-button>
+          <!-- <el-button type="primary" icon="Download" @click="handleExport">导 出</el-button> -->
         </div>
         <!-- 头部右侧按钮模块 -->
         <div class="avue-crud__right">
@@ -116,6 +116,12 @@
           <template v-if="slotProps.scope.column.label === '操作'">
             <el-text @click="() => ViewSettlementInformation(slotProps.scope)"> 结算信息 </el-text>
             <el-text @click="() => ViewTransactionInformation(slotProps.scope)"> 异常信息 </el-text>
+            <el-text
+              v-if="Number(slotProps.scope.row.balanceStatus) !== 2"
+              @click="() => handleConfirmCustomer(slotProps.scope)"
+            >
+              确认结算
+            </el-text>
           </template>
         </template>
       </tablecmt>
@@ -158,7 +164,7 @@ import {
   getopenOrderAdvancePageList,
   postOpenOrderFreezeByAdvanceIds,
 } from '@/api/waybill/TemporaryStorageList';
-import { postPageList } from '@/api/finance/CustomerSettlement';
+import { postPageList, postEnterBalance } from '@/api/finance/CustomerSettlement';
 import {
   downloadXls,
   setNodeHeight,
@@ -242,8 +248,6 @@ const details = reactive<any>({
     pageSize: 30,
     total: 0,
   },
-  /** 列表Dom节点 */
-  listNode: '',
   form: {},
 });
 
@@ -251,25 +255,13 @@ const tableNodeRef = ref();
 
 const { search, query, shortcuts, selectionList, drawerShow, page, defaultTime2 } = toRefs(details);
 
-/** vuex */
-const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
-console.log('permission :>> ', permission);
-
-onMounted(() => {
-  const timer = setTimeout(() => {
-    details.listNode = document.querySelector('.maboxhi');
-    details.listNode.style.transition = 'all .5s ease-out';
-    clearTimeout(timer);
-  }, 100);
-});
-
 /** 请求页面数据 */
 const onLoad = async (params = {}) => {
   try {
     // 开启列表loading动画
     details.loadingObj.list = true;
     const queryCopy = { ...details.query };
-    await TimeProcessing(queryCopy);
+    TimeProcessing(queryCopy);
     const submitData = { ...queryCopy, ...params, ...details.page };
     // 获取暂存单列表
     const res = await postPageList(submitData);
@@ -409,6 +401,25 @@ const ViewTransactionInformation = ({ row }) => {
     query: { balanceOrderInfoId: row.id, backPath: '/finance/CustomerSettlement' },
   });
 };
+
+const handleConfirmCustomer = ({ row }) => {
+  ElMessageBox.confirm(`【 ${row.balanceOrderNo} 】 确认结算`, '提示', {
+    type: 'warning',
+  }).then(async () => {
+    try {
+      details.loadingObj.pageLoading = true;
+      const res = await postEnterBalance({ balanceOrderInfoId: row.id });
+      const { code, msg } = res.data;
+      if (code !== 200) return;
+      msg && ElMessage.success(msg);
+      onLoad();
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
+  });
+};
 </script>
 
 <style scoped lang="scss">