滞留调整、签收明细增加字段、配送任务增加字段

src/api/warehouse/warehouseRetentionRecord.js

@@ -33,6 +33,22 @@ export const getDetail = id => {
   });
 };
 
+/**
+ * 根据类型查询滞留包件列表类型+
+ * @param id
+ * @returns {*}
+ */
+export const getRetentionPackageByType = (retentionId,type) => {
+  return request({
+    url: '/api/logpm-warehouse/warehouseRetentionRecord/getRetentionPackageByType',
+    method: 'get',
+    params: {
+      retentionId,
+      type
+    },
+  });
+};
+
 export const remove = ids => {
   return request({
     url: '/api/logpm-warehouse/warehouseRetentionRecord/remove',

src/router/views/index.js

@@ -604,6 +604,18 @@ export default [
       },
     ],
   },
+  {
+    path: '/warehouse/warehouseRetentionRecord/warehouseRetentionDetails',
+    component: Layout,
+    redirect: '/warehouse/warehouseRetentionRecord/warehouseRetentionDetails',
+    children: [
+      {
+        path: '/warehouse/warehouseRetentionRecord/warehouseRetentionDetails',
+        name: '滞留明细'+'name',
+        component: () => import('@/views/warehouse/warehouseRetentionRecord/warehouseRetentionDetails.vue'),
+      },
+    ],
+  },
   {
     path: '/basic/property/basicrecordslist',
     component: Layout,

src/views/distribution/deliverylist/distributionDeliveryList.vue

@@ -565,6 +565,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'signingNumber',
+          label: '签收件数',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'loadingTeamName',
           label: '装卸班组',

src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@@ -578,6 +578,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'signingNumber',
+          label: '签收件数',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'loadingTeamName',
           label: '装卸班组',

src/views/distribution/deliverylist/distributionDeliveryListmar.vue

@@ -482,6 +482,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'signingNumber',
+          label: '签收件数',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'loadingTeamName',
           label: '装车班组',

src/views/distribution/signdetail/distributionSigndetail.vue

@@ -174,7 +174,40 @@ export default {
           head: false,
         },
         {
-          prop: 'type',
+          prop: 'driverName',
+          label: '司机名称',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'driverPhone',
+          label: '司机电话',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'vehicleName',
+          label: '车牌号',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'serveType',
           label: '配送类型',
           type: 3,
           values: '',

src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue

@@ -90,7 +90,7 @@
                   :size="ElButtonS[0].size"
                   :icon="ElButtonS[0].icon"
                   @click="ViewEvent(props.row)"
-                  >详情</el-button
+                  >滞留明细</el-button
                 >
               </div>
               <span v-if="item.type == 6">{{
@@ -148,6 +148,7 @@
 
 <script setup>
 import { ref, reactive, onMounted, computed } from 'vue';
+import { useRouter} from 'vue-router';
 import { $_warehouseRetentionRecordPage } from '@/api/warehouse/warehouseRetentionRecord.js';
 import { ElMessage } from 'element-plus';
 const SoInfoData = ref({}); //搜索框参数
@@ -161,6 +162,7 @@ const disabled = ref(false); // 是否禁止使用页码功能
 const total = ref(10); //页码总数
 const loading = ref(false); //表格加载Load
 const PopupDetails = ref(false); //弹窗详情是否展示
+const router = useRouter(); //路由注册
 const Tabs = ref([
   // 标题栏
   { label: '处理中', name: 0, icon: 'Monitor' },
@@ -177,9 +179,9 @@ const menuData = ref([
     label: '滞留车次号',
     type: 4,
     values: '',
-    width: '150',
+    width: '200',
     checkarr: [],
-    fixed: false,
+    fixed: true,
     search: true,
     head: true,
   },
@@ -199,12 +201,56 @@ const menuData = ref([
     label: '装车人名称',
     type: 4,
     values: '',
+    width: '200',
+    checkarr: [],
+    fixed: false,
+    search: false,
+    head: true,
+  },
+  {
+    prop: 'retentionCreateUserName',
+    label: '滞留操作人',
+    type: 4,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: false,
+    search: false,
+    head: true,
+  },
+  {
+    prop: 'createTime',
+    label: '滞留时间',
+    type: 4,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: false,
+    search: false,
+    head: true,
+  },
+  {
+    prop: 'retentionQuantity',
+    label: '滞留数量',
+    type: 4,
+    values: '',
     width: '150',
     checkarr: [],
     fixed: false,
     search: false,
     head: true,
   },
+  {
+    prop: 'retentionWarehouseName',
+    label: '仓库名称',
+    type: 4,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: false,
+    search: false,
+    head: true,
+  },
   {
     prop: 'retentionRemarks',
     label: '备注',
@@ -265,7 +311,7 @@ const menuData = ref([
     label: '操作',
     type: 3,
     values: '',
-    width: '130',
+    width: '200',
     checkarr: [],
     fixed: 'right',
     search: false,
@@ -323,7 +369,18 @@ const searchReset = () => {
 // 点击详情按钮
 const ViewEvent = val => {
   console.log(val);
-  PopupDetails.value = true;
+
+  router.push({
+    path: '/warehouse/warehouseRetentionRecord/warehouseRetentionDetails',
+    query: {
+      id: val.id,
+      name: val.retentionCarNo + '-滞留明细',
+    },
+  });
+
+
+  // console.log(val);
+  // PopupDetails.value = true;
 };
 // 关闭弹窗关闭回调
 const handleClose = () => {