Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine

schangxiang@126.com

2024-12-02 5ffe3e968652b17a2b7de39d809a099a05adadf4

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue

@@ -1,6 +1,6 @@
<template>
   <div class="wmsOrderPurchase-container">
   <!-- 齐套管理 -->
      <!-- 齐套管理 -->
      <el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
         <el-form :model="queryParams" ref="queryForm" labelWidth="90">
            <el-row>
@@ -93,7 +93,7 @@
      <el-card class="full-table" shadow="hover" style="margin-top: 5px">
         <div class="table-container">
            <!-- 左侧表格 -->
            <div class="left-table">
            <!-- <div class="left-table">
               <p class="text-xtiny">齐套列表</p>

               <el-table
@@ -116,21 +116,34 @@
                     </template>
                  </el-table-column>
                  <el-table-column prop="count" label="数量" show-overflow-tooltip="" />
                  <!-- <el-table-column prop="placeCode" label="库位编码" show-overflow-tooltip="" />
                  <el-table-column prop="inTime" label="进入时间" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
                  <el-table-column prop="upi" label="部件条码" show-overflow-tooltip="" />
                  <el-table-column prop="detailName" label="部件名称" show-overflow-tooltip="" />
                  <el-table-column prop="planNo" label="批次" show-overflow-tooltip="" />
                  <el-table-column prop="orderId" label="订单号" show-overflow-tooltip="" />
                  <el-table-column prop="length" label="长" show-overflow-tooltip="" />
                  <el-table-column prop="width" label="宽" show-overflow-tooltip="" />
                  <el-table-column prop="thk" label="厚" show-overflow-tooltip="" /> -->
               </el-table>
            </div>
            </div> -->

            <!-- ///
            <summary>/// 生产单号 ///</summary>
            public string Info5 { get; set; } ///
            <summary>/// 批次号 ///</summary>
            public string PlanNo { get; set; } ///
            <summary>/// 订单号 ///</summary>
            public string OrderId { get; set; } ///
            <summary>/// 是否齐套 ///</summary>
            public bool? IsKitting { get; set; } ///
            <summary>/// 包数 ///</summary>
            public int PackageNum { get; set; } ///
            <summary>/// 已下线包数 ///</summary>
            public int UnLinePackageNum { get; set; } ///
            <summary>/// 未下线包数 ///</summary>
            public int NoUnLinePackageNum { get; set; } ///
            <summary>/// 总包装面积 ///</summary>
            public decimal AllPackageArea { get; set; } ///
            <summary>/// 已扫描包装面积 ///</summary>
            public decimal ScanPackageArea { get; set; } ///
            <summary>/// 未扫描包装面积 ///</summary>
            public decimal NoScanPackageArea { get; set; } -->

            <!-- 右侧表格 -->
            <div class="right-table">
               <p class="text-xtiny">缺套列表</p>
               <!-- <p class="text-xtiny">缺套列表</p> -->
               <el-table
                  :data="newTableData"
                  style="width: 100%"
@@ -144,29 +157,52 @@
               >
                  <el-table-column type="index" label="序号" width="55" align="center" />
                  <!-- <el-table-column prop="packageCode" label="包装号" show-overflow-tooltip="" /> -->
                  <el-table-column label="订单号" prop="packageCode" width="150" align="left" show-overflow-tooltip>
                  <el-table-column label="生产单号" prop="info5" width="150" align="left" show-overflow-tooltip>
                     <template #default="scope">
                        <span class="under_line" @click="openDrawer(1, scope.row)">
                           {{ scope.row.orderId }}
                           {{ scope.row.info5 }}
                        </span>
                     </template>
                  </el-table-column>
                  <el-table-column prop="count" label="数量" show-overflow-tooltip="" />
                  <!-- <el-table-column prop="count" label="数量" show-overflow-tooltip="" />
                  <el-table-column prop="placeCode" label="库位编码" show-overflow-tooltip="" />
                  <el-table-column prop="inTime" label="进入时间" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
                  <el-table-column prop="upi" label="部件条码" show-overflow-tooltip="" />
                  <el-table-column prop="detailName" label="部件名称" show-overflow-tooltip="" />
                  <el-table-column prop="planNo" label="批次" show-overflow-tooltip="" />
                  <el-table-column prop="orderId" label="订单号" show-overflow-tooltip="" />
                  <el-table-column prop="length" label="长" show-overflow-tooltip="" />
                  <el-table-column prop="width" label="宽" show-overflow-tooltip="" />
                  <el-table-column prop="thk" label="厚" show-overflow-tooltip="" /> -->
                  <el-table-column prop="planNo" label="批次号"  show-overflow-tooltip="" />
        <el-table-column prop="orderId" label="订单号"  show-overflow-tooltip="" />
        <el-table-column prop="isKitting" label="是否齐套"  show-overflow-tooltip="">
          <template #default="scope">
            <el-tag v-if="scope.row.isKitting"> 是 </el-tag>
            <el-tag type="danger" v-else> 否 </el-tag>
            
          </template>
          
        </el-table-column>
        <el-table-column prop="packageNum" label="包数"  show-overflow-tooltip="" />
        <el-table-column prop="unLinePackageNum" label="已下线包数"  show-overflow-tooltip="" />
        <el-table-column prop="noUnLinePackageNum" label="未下线包数"  show-overflow-tooltip="" />
        <el-table-column prop="allPackageArea" label="总包装面积"  show-overflow-tooltip="" />
        <el-table-column prop="scanPackageArea" label="已扫描包装面积"  show-overflow-tooltip="" />
        <el-table-column prop="noScanPackageArea" label="未扫描包装面积"  show-overflow-tooltip="" />
         <el-table-column prop="createTime" label="创建时间" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
         <el-table-column prop="updateTime" label="修改时间" width="130" :formatter="formatDate_T_Time"  show-overflow-tooltip="" />
        <el-table-column prop="createUserName" label="创建人"  show-overflow-tooltip="" />
        <el-table-column prop="updateUserName" label="修改人"  show-overflow-tooltip="" />


		
               </el-table>
               <el-pagination
            v-model:currentPage="tableParams.page"
            v-model:page-size="tableParams.pageSize"
            :total="tableParams.total"
            :page-sizes="[10, 20, 50, 100, 200, 500]"
            small=""
            background=""
            @size-change="handleSizeChange"
            @current-change="handleCurrentChange"
            layout="total, sizes, prev, pager, next, jumper"
         />
            </div>
         </div>
      </el-card>
<!-- 
      <!-- 
      <editDialogWmsOrderDeliver ref="editDialogRefWmsOrderDeliver" :title="editWmsOrderDeliverTitle" @reloadTable="handleQuery" /> -->
      <importExcelDialog
         ref="importExcelDialogRefWmsOrderDeliver"
@@ -204,6 +240,7 @@
import { exportPageExcel } from '/@/utils/exportPageExcel'; //引入导出方法
import OpenAllprop from './component/openAllprop.vue';
import { ExcellTableDataExport } from '/@/hooks/exportTableDataExcell';
import { pageMes_Order_Gather } from '/@/api/main/WmsOrder/mes_Order_Gather';
const { proxy }: any = getCurrentInstance(); // 访问实例上下文 proxy同时支持开发 线上环境
const moveType = 10; //移动类型 入库
// ------------封装导出功能--前端导出+表格标题---------------
@@ -285,21 +322,21 @@
// 8888888888888查询操作 IsKitting
const handleQuery = async () => {
   loading.value = true;
   var res = await KittingList(Object.assign(queryParams.value, {
      ...tableParams.value,
      IsKitting:true
   }));
   tableData.value = res.data.result ?? [];
   // var res = await KittingList(Object.assign(queryParams.value, {
   //    ...tableParams.value,
   //    IsKitting:true
   // }));
   // tableData.value = res.data.result ?? [];

   var res2 = await pageMes_Order_Gather(
      Object.assign(queryParams.value, {
         ...tableParams.value,
         IsKitting: false,
      })
   );

   var res2 = await KittingList(Object.assign(queryParams.value, {
      ...tableParams.value,
      IsKitting:false
   }));

   newTableData.value = res2.data.result ?? [];

   // tableParams.value.total = res.data.result?.total;
   newTableData.value = res2.data.result.items ?? [];
   tableParams.value.total = res2.data.result?.total;
   loading.value = false;
   // getEnumOrderTypeData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('OrderTypeEnum')).data.result ?? [];