From d191c27fcfa83931543b88a4d6be009e29d92499 Mon Sep 17 00:00:00 2001
From: zhangsiyu <q3183592900@qq.com>
Date: Mon, 4 Sep 2023 18:03:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A1=A8=E6=A0=BC=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E9=80=89=E6=8B=A9=E5=92=8C=E6=98=AF=E5=90=A6=E5=8F=AF?=
 =?UTF-8?q?=E5=8B=BE=E9=80=89=E7=9A=84=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tablecmt/tablecmt.vue          |  30 +-
 .../inventory/distrilbutionBillLading.vue     |  18 +-
 .../reservation/reservationAddFrom.vue        | 257 +++++++++++++++++-
 3 files changed, 274 insertions(+), 31 deletions(-)

diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index 3a2e38cd..65c4968f 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -10,6 +10,7 @@
       border
       height="100%"
       :row-class-name="tableRowClassName"
+      ref="selecttable"
     >
       <el-table-column
         :type="column.type == 0 ? 'selection' : ''"
@@ -20,6 +21,7 @@
         :label="column.label"
         :fixed="column.fixed"
         :sortable="column.sortable"
+        :selectable="isselectfun"
         v-show="column.head"
       >
         <!-- <template #header>
@@ -162,10 +164,10 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, ref, watchEffect, getCurrentInstance } from 'vue';
+import { computed, ref, watchEffect, getCurrentInstance, onMounted } from 'vue';
 import type { PropType } from 'vue';
 const { proxy } = getCurrentInstance() as any;
-
+const selecttable = ref(null);
 /**
  * 对应通知事件
  * inputTxt:输入框输入的确认事件
@@ -249,6 +251,17 @@ let props = defineProps({
     type: Boolean as PropType<boolean>,
     required: true,
   },
+  //回显勾选的数据列表
+  checkselect: {
+    type: Array as PropType<TableDataType[]>,
+    required: false,
+  },
+  //是否可选择的函数
+  isselectfun: {
+    type: Function as PropType<(row: TableDataType) => boolean>,
+    required: false,
+    default: null,
+  },
 });
 let selectarr = ref([]);
 const tableRowClassName = ({ row, rowIndex }: { row: TableDataType; rowIndex: number }) => {
@@ -273,6 +286,19 @@ watchEffect(() => {
     }
   });
 });
+onMounted(() => {
+  if (props.checkselect) {
+    props.checkselect.map(item => {
+      if (props.isselectfun) {
+        if (props.isselectfun(item)) {
+          selecttable.value.toggleRowSelection(item, true);
+        }
+      } else {
+        selecttable.value.toggleRowSelection(item, true);
+      }
+    });
+  }
+});
 function godowns(url) {
   let a = document.createElement('a'); //创建一个a标签用来跳转
   a.href = url; //myurl 是后端返回的下载地址
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index f2987d4a..bc512141 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -1505,23 +1505,7 @@ export default {
   },
   mounted() {
     this.init();
-    let arr = [];
-    this.option.columnStock.map(item => {
-      if (!item.hide) {
-        arr.push({
-          prop: item.prop,
-          label: item.label,
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: true,
-          sortable: true,
-          head: false,
-        });
-      }
-    });
-    console.log(JSON.stringify(arr));
+    
     if (this.$route.query.type == '2') {
       //查询提货编辑数据
       this.getDetailOen();
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index 095a1b08..d05cdee8 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -345,7 +345,29 @@
 
       <el-dialog v-model="isaddvalue" title="包件信息" width="100%" :model="addvalue">
         <!-- 列表模块 -->
-        <el-table
+        <tablecmt
+          :columnList="columnParcels"
+          :tableData="packageData"
+          :checkselect="packageData"
+          :isselectfun="checkPackage"
+          :loading="loading"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionPackageChange"
+        >
+          <template #default="slotProps">
+            <!-- <el-text
+              type="primary"
+              link
+              icon="el-icon-edit"
+              @click="removeStockList(slotProps.scope.row)"
+              >移除</el-text
+            > -->
+          </template>
+        </tablecmt>
+        <!-- <el-table
           ref="packageList"
           v-loading="loading"
           @selection-change="selectionPackageChange"
@@ -365,7 +387,6 @@
           <el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">
           </el-table-column>
           <template v-for="(item, index) in option.columnParcels">
-            <!-- table字段 -->
             <el-table-column
               v-if="item.hide !== true"
               :prop="item.prop"
@@ -375,15 +396,11 @@
             >
             </el-table-column>
           </template>
-          <!-- 操作栏模块 -->
           <el-table-column prop="menu" label="操作" :width="220" align="center">
             <template #="{ row }">
-              <!--              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
-              <!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>-->
-              <!--              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
-            </template>
+             </template>
           </el-table-column>
-        </el-table>
+        </el-table> -->
         <el-form-item style="margin-left: 45%; margin-top: 5px">
           <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitPackage"
             >提交(包件)</el-button
@@ -1292,6 +1309,205 @@ export default {
           head: false,
         },
       ],
+      columnParcels: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: '50',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'warehouse',
+          label: '仓库',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageStatusName',
+          label: '包件状态',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageFreezeStatusName',
+          label: '冻结状态',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageGroundingStatusName',
+          label: '上架状态',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageStockupStatusName',
+          label: '备货状态',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageReservationStatusName',
+          label: '预约状态',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageCode',
+          label: '包条码',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'goodsAllocation',
+          label: '货位信息',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'pallet',
+          label: '所在托盘',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'firsts',
+          label: '一级品',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'second',
+          label: '二级品',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'thirdProduct',
+          label: '三级品',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'materialName',
+          label: '物料名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'quantity',
+          label: '数量',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'trainNumber',
+          label: '客户车次号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        // {
+        //   prop: '',
+        //   label: '操作',
+        //   type: 6,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: 'right',
+        //   hide: true,
+        // },
+      ],
       height: 0,
       // 弹框标题
       title: '',
@@ -1389,7 +1605,23 @@ export default {
   },
   mounted() {
     this.init();
-    
+    let arr = [];
+    this.option.columnParcels.map(item => {
+      if (!item.hide) {
+        arr.push({
+          prop: item.prop,
+          label: item.label,
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        });
+      }
+    });
+    console.log(JSON.stringify(arr));
     this.onLoad(this.page);
     this.getDictionary();
   },
@@ -1605,7 +1837,7 @@ export default {
             packageListInfo.forEach(p => {
               if (item.id === p.id) {
                 this.$nextTick(() => {
-                  this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
+                  // this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
                 });
               }
             });
@@ -1650,15 +1882,16 @@ export default {
     checkPackage(row, index) {
       //区分编辑还是新增
       //编辑需要对这个预约单下的包件信息均可进行调整
+      console.log(row,'rowrowrowrowrowrow')
       if (!this.reservationId) {
         if (
           row.orderPackageReservationStatusName === '已预约' ||
           row.orderPackageReservationStatusName === '20'
         ) {
-          return false;
+          return true;
         }
       }
-      if (row.orderPackageFreezeStatus === '20' || row.orderPackageFreezeStatusName === '已冻结') {
+      if (row.orderPackageFreezeStatus === '10' || row.orderPackageFreezeStatusName === '已冻结') {
         return false;
       } else {
         return true;