装车明细 -- 装卸状态新增滞留状态

src/components/tablecmt/tablecmt.vue

@@ -123,14 +123,6 @@
                   v-model="scope.row[column.prop]"
                 />
 
-                <!-- <el-text
-              class="mx-2 tabculconte"
-              v-for="item in column.checkarr"
-              v-if="Number(column.type) < 6 && Number(column.type) > 0"
-              >
-              <span v-if="item.value==scope.row[column.prop]">{{ item.label }}</span>
-              </el-text
-              > -->
                 <el-text
                   style=""
                   class="mx-2 tabculconte colors"
@@ -161,16 +153,7 @@
                   :disabled="!scope.row.disabled"
                   clearable
                 />
-                <!-- <el-image
-              preview-teleported
-              v-else-if="column.type == 7"
-              style="width: 60px; height: 60px; margin-left: 10px"
-              :initial-index="index"
-              :z-index="100"
-              v-for="(item, index) in scope.row[column.prop].split(',')"
-              :src="item"
-              :preview-src-list="scope.row[column.prop].split(',')"
-              /> -->
+
                 <el-image
                   preview-teleported
                   v-else-if="column.type == 7"
@@ -229,15 +212,11 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, getCurrentInstance, onMounted, defineExpose, inject, watch } from 'vue';
+import { ref, getCurrentInstance, onMounted, defineExpose, watch } from 'vue';
 import type { PropType } from 'vue';
 import { computeNumber } from '@/utils/util.js';
-import { useRoute } from 'vue-router';
 import { postSaveTableSeting } from '@/api/basic/table';
 
-const $route = useRoute();
-
-const functions = inject('functions') as any;
 const { proxy } = getCurrentInstance() as any;
 const selecttable = ref(null);
 

src/option/finance/ReconciliationDepositSlip.js

@@ -19,7 +19,7 @@ export const columnList = [
     label: '品牌',
     type: 2,
     values: '',
-    width: '150',
+    width: '100',
     checkarr: [],
     fixed: true,
     sortable: true,
@@ -186,6 +186,39 @@ export const columnList = [
     head: false,
     isshowSummary: true,
   },
+  {
+    prop: 'totalNum',
+    label: '货物品类',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'totalNum',
+    label: '品类件数',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'totalNum',
+    label: '干线品类单价',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'totalWeight',
     label: '总重量',
@@ -449,6 +482,18 @@ export const columnList = [
     head: false,
     isshowSummary: true,
   },
+  {
+    prop: 'deliveryCrossingFee',
+    label: '配送专车费',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
   {
     prop: 'installFee',
     label: '安装费',
@@ -473,6 +518,42 @@ export const columnList = [
     head: false,
     isshowSummary: true,
   },
+  {
+    prop: 'deliveryCrossingFee',
+    label: '回扣',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+  {
+    prop: 'deliveryCrossingFee',
+    label: '申明价值',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+  {
+    prop: 'deliveryCrossingFee',
+    label: '保价费',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
   {
     prop: 'shipperPerson',
     label: '发货人',
@@ -609,6 +690,17 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'signNum',
+    label: '送货时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'signTime',
     label: '签收时间',
@@ -620,6 +712,28 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'signNum',
+    label: '签收人',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'signNum',
+    label: '配送司机',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'syncFeeStatus',
     label: '是否计算价格',
@@ -677,7 +791,7 @@ export const columnListB = [
     label: '品牌',
     type: 2,
     values: '',
-    width: '150',
+    width: '100',
     checkarr: [],
     fixed: true,
     sortable: true,
@@ -844,6 +958,39 @@ export const columnListB = [
     head: false,
     isshowSummary: true,
   },
+  {
+    prop: 'totalNum',
+    label: '货物品类',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'totalNum',
+    label: '品类件数',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'totalNum',
+    label: '干线品类单价',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'totalWeight',
     label: '总重量',
@@ -1108,6 +1255,18 @@ export const columnListB = [
     head: false,
     isshowSummary: true,
   },
+  {
+    prop: 'deliveryCrossingFee',
+    label: '配送专车费',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
   {
     prop: 'installFee',
     label: '安装费',
@@ -1132,6 +1291,42 @@ export const columnListB = [
     head: false,
     isshowSummary: true,
   },
+  {
+    prop: 'deliveryCrossingFee',
+    label: '回扣',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+  {
+    prop: 'deliveryCrossingFee',
+    label: '申明价值',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+  {
+    prop: 'deliveryCrossingFee',
+    label: '保价费',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
   {
     prop: 'shipperPerson',
     label: '发货人',
@@ -1268,6 +1463,17 @@ export const columnListB = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'signNum',
+    label: '送货时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'signTime',
     label: '签收时间',
@@ -1279,6 +1485,28 @@ export const columnListB = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'signNum',
+    label: '签收人',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'signNum',
+    label: '配送司机',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'syncFeeStatus',
     label: '是否计算价格',

src/views/distribution/artery/truckLoadingDetails.vue

@@ -489,6 +489,7 @@ const details = reactive<any>({
     { label: '装车', value: 1 },
     { label: '卸车', value: 2 },
     { label: '签收', value: 3 },
+    { label: '滞留', value: 4 },
   ],
   /** 有无数据 */
   isDataOption: [