From a4bb1229b6bb307b73185d5b4f478c951d690e90 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Mon, 29 Jul 2024 11:30:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86=E9=99=90?=
 =?UTF-8?q?=E5=88=B6,=20=E4=BF=AE=E5=A4=8D=E5=B9=B2=E7=BA=BF=E9=83=A8?=
 =?UTF-8?q?=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arteryDistrilbutionBillLadingList.js      | 176 +++++++++++++++++-
 .../addArteryDistrilbutionBillLadingList.vue  |  20 +-
 .../arteryDistrilbutionBillLadingList.vue     |   7 +-
 src/views/waybill/CreateZeroOrder.vue         |   2 +-
 src/views/waybill/TemporaryStorageList.vue    |   8 +
 5 files changed, 203 insertions(+), 10 deletions(-)

diff --git a/src/option/distribution/arteryDistrilbutionBillLadingList.js b/src/option/distribution/arteryDistrilbutionBillLadingList.js
index 7b4d6c4e..ca9e7f57 100644
--- a/src/option/distribution/arteryDistrilbutionBillLadingList.js
+++ b/src/option/distribution/arteryDistrilbutionBillLadingList.js
@@ -516,7 +516,7 @@ export const columnDetailList = [
 ];
 
 /** 新增提货选择运单列表 */
-export const columnNewList = [
+export const columnOldList = [
   {
     prop: '',
     label: '复选框',
@@ -689,3 +689,177 @@ export const columnNewList = [
     sortable: true,
   },
 ];
+
+export const columnNewList = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: 'waybillNo',
+    label: '运单号',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: true,
+    sortable: true,
+    head: false,
+  },
+  // {
+  //   prop: 'serviceNumber',
+  //   label: '网点',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: true,
+  //   sortable: true,
+  // },
+  {
+    prop: 'shipperName',
+    label: '发货人',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'customerTrain',
+    label: '客户车次号',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'shipper',
+    label: '发货单位',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'destinationWarehouseName',
+    label: '目的仓',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'consignee',
+    label: '收货单位',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'goodsName',
+    label: '货物名称',
+    type: 2,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'realNum',
+    label: '提货数',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    isshowSummary: true,
+  },
+  // {
+  //   prop: 'noBillladingNum',
+  //   label: '未入库件数',
+  //   type: 1,
+  //   values: '',
+  //   width: '130',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   isshowSummary: true,
+  // },
+  {
+    prop: 'realWeight',
+    label: '重量',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    isshowSummary: true,
+  },
+  {
+    prop: 'realVolume',
+    label: '体积',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    isshowSummary: true,
+  },
+  {
+    prop: 'totalFreight',
+    label: '运费',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    isshowSummary: true,
+  },
+  {
+    prop: 'remark',
+    label: '运单备注',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'createTime',
+    label: '开单时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+];
diff --git a/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue
index a3ec21c1..bc67ca54 100644
--- a/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue
@@ -296,7 +296,7 @@
           <!-- 表格 -->
           <tablecmt
             class="tableNode mt10"
-            :columnList="details.columnNewList"
+            :columnList="details.columnOldList"
             :tableData="details.addInfo.oldData"
             :loading="details.loadingObj.oldListLoading"
             @inputTxt="inputsc"
@@ -356,13 +356,18 @@
           <!-- 表格 -->
           <tablecmt
             class="tableNode mt10"
-            :columnList="details.newColumnNewList"
+            :columnList="details.columnNewList"
             :tableData="details.addInfo.newRenderData"
             :loading="details.loadingObj.newlistLoading"
             @inputTxt="newInputsc"
             @timeCheck="timesc"
             @selectCheck="selectsc"
             @selection="list => selectionChange(list, 2)"
+            :isselectfun="
+              row => {
+                return !Boolean(row.realNum);
+              }
+            "
           >
             <template #default="{ scope }">
               <!-- <template v-if="scope.column.label === '计划件数'">
@@ -407,8 +412,8 @@
   <edittablehead
     @closce="showdrawer"
     :drawerShow="details.drawerShow"
-    :columnList="details.columnNewList"
-    v-model="details.columnNewList"
+    :columnList="details.columnOldList"
+    v-model="details.columnOldList"
   ></edittablehead>
 </template>
 
@@ -435,7 +440,10 @@ import {
   postFindDriverListByName,
 } from '@/api/distribution/AddVehicleStowage';
 // 引入表格配置文件
-import { columnNewList } from '@/option/distribution/arteryDistrilbutionBillLadingList';
+import {
+  columnNewList,
+  columnOldList,
+} from '@/option/distribution/arteryDistrilbutionBillLadingList';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getToken } from '@/utils/auth';
@@ -470,8 +478,8 @@ const newFormNode = ref<FormInstance>();
 const selectNodeRef = ref();
 
 const details = reactive({
+  columnOldList: deepClone(columnOldList),
   columnNewList: deepClone(columnNewList),
-  newColumnNewList: deepClone(columnNewList),
   /** 列表配置抽屉 */
   drawerShow: false,
   // 弹框标题
diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
index ca2cc50e..3df03a22 100644
--- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
@@ -697,8 +697,6 @@ export default {
 
       if (this.selectionList.length > 1) return this.$message.error('暂时只支持单条数据操作');
 
-      let content = '';
-
       const contentObj = {
         1: '确认开始提货',
         2: '确认提货完成',
@@ -708,6 +706,11 @@ export default {
         6: '确认取消提货',
       };
 
+      const _item = this.selectionList[0];
+
+      if (Number(_item.billladingStatus) === 4 && type === 6)
+        return this.$message.warning('已结算的数据不能取消提货');
+
       this.$confirm(contentObj[type], {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index 5bafe50d..a796bc17 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -3034,7 +3034,7 @@ const handleAssignmentItemPriceWarehouseManagementPrice = (
  */
 const handleAssignmentItemPrice = (value, isOnload = false, chargeType?: number | undefined) => {
   // 处理品类费用
-  const { pickup, template, trunkLine, dispatch } = details.priceTemplate;
+  const { pickup, template, trunkLine, warehouse, dispatch } = details.priceTemplate;
 
   // 干线
   if (!isOnload) {
diff --git a/src/views/waybill/TemporaryStorageList.vue b/src/views/waybill/TemporaryStorageList.vue
index eb484e16..6c1c470c 100644
--- a/src/views/waybill/TemporaryStorageList.vue
+++ b/src/views/waybill/TemporaryStorageList.vue
@@ -730,6 +730,14 @@ const details = reactive<any>({
           { required: true, message: '请输入商场名称', trigger: 'blur' },
         ],
       },
+      {
+        prop: 'materielName',
+        type: 'text',
+        label: '物料名称',
+        value: '',
+        checkArr: [],
+        rule: [{ required: false }],
+      },
     ],
     // 寄件人信息
     SenderInfo: [