前端

liuying

2024-11-26 dc7a24a919d03843969900e775b5c3935cad453f

前端

 LA24030_LuLiPackageLine_Web/src/api/main/WmsOrder/wmsOrderPurchase.ts

@@ -3,13 +3,22 @@
  AddWmsOrderPurchase = '/api/wmsOrderPurchase/add',
  DeleteWmsOrderPurchase = '/api/wmsOrderPurchase/delete',
  UpdateWmsOrderPurchase = '/api/wmsOrderPurchase/update',
  PageWmsOrderPurchase = '/api/wmsStockQuan/list', ///api/wmsOrderPurchase/page
  KittingList = '/api/WmsStockQuan/KittingList', ///api/wmsOrderPurchase/page
  packList = '/api/WmsStockQuan/packList', ///api/wmsOrderPurchase/page

  ListWmsOrderPurchase = '/api/wmsStockQuan/list',
  DetailWmsOrderPurchase = '/api/wmsOrderPurchase/detail',
  ImportExcelWmsOrderPurchase = '/api/wmsOrderPurchase/importExcel',
  DownloadExcelTemplateWmsOrderPurchase = '/api/wmsOrderPurchase/downloadExcelTemplate',
  DownloadExcelTemplateWmsOrderPurchaseAll = '/api/wmsOrderPurchase/pOOrderExcelOutting',
}
// åˆ†é¡µæŸ¥è¯¢PO单
export const pageWmsOrderPurchase = (params?: any) => 
    request({
            url: Api.ListWmsOrderPurchase,
            method: 'get',
            data: params,
        });

// å¢žåŠ PO单
export const addWmsOrderPurchase = (params?: any) =>
@@ -35,14 +44,24 @@
            data: params,
        });

// åˆ†é¡µæŸ¥è¯¢PO单
export const pageWmsOrderPurchase = (params?: any) => 
// é½åŒ…
export const packList = (params?: any) => 
    request({
            url: Api.PageWmsOrderPurchase,
            url: Api.packList,
            method: 'get',
            data: params,
        });

        // é½å¥—
export const KittingList = (params?: any) => 
    request({
            url: Api.KittingList,
            method: 'get',
            data: params,
        });



// ä¸åˆ†é¡µæŸ¥è¯¢PO单
export const listWmsOrderPurchase = (params?: any) => 
    request({

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/editDialog.vue

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue

copy from LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderAsn/component/openAllprop.vue
copy to LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue
Îļþ´Ó LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderAsn/component/openAllprop.vue ¸´ÖÆ
@@ -273,8 +273,8 @@
                    <el-form :model="detailForm">
                        <el-row>
                            <el-col :span="6">
                                <el-form-item label="物料编号">
                                    <el-input v-model="detailForm.materialCode" clearable placeholder="请输入物料编号" />
                                <el-form-item label="部件名称">
                                    <el-input v-model="detailForm.detailName" clearable placeholder="请输入部件名称" />
                                </el-form-item>
                            </el-col>
                            <el-col :span="4">
@@ -413,8 +413,6 @@
const hexiao = computed(() => props.hexiao);
const loading = ref(false);



const getEnumStockStatusData_Index = ref<any>([]);
  const getEnumLockStatusData_Index = ref<any>([]);
// ç™»å½•ç”¨æˆ·id
@@ -536,11 +534,10 @@
//列表的数据条数
const totalItems = ref<number>(0);

//缓存枚举
const enumList: any = cache.getCache('enumList');
console.log(enumList.inEnumOrderType);
// //缓存枚举
// const enumList: any = cache.getCache('enumList');
// console.log(enumList.inEnumOrderType);

// .inEnumOrderType

//获取PO单列表
const getTabelData = () => {
@@ -610,8 +607,8 @@
// -------------------获取PO单下物料详情-----------------------------------
//入库单下物料详情请求
const detailForm = ref({
    poId: '',
    materialCode: '',
    detailName: '',
    packageCode: '',
    Page: 1,
    PageSize: 10,
});
@@ -633,11 +630,11 @@
    drawerType.value = 'drawerAll';
    drawerVisible.value = true;
    //当前入库单号id
    detailForm.value.poId = scope.id;
    detailForm.value.orderId = scope.orderId;
    //入库单
    purchaseNo.value = scope.packageCode;
    debugger;
    detailForm.value.poId = scope.id;
    detailForm.value.packageCode = scope.packageCode;
    //获取物料列表
    if (detailForm.value.poId == '') {
        drawerList.value = [];
@@ -649,12 +646,7 @@
    //------------------获取物料列表物料明细
    getEnumStockStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('StockStatusEnum')).data.result ?? [];
    getEnumLockStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('LockStatusEnum')).data.result ?? [];
    // getBusinessTypeData_Index.value = await handleSlectDataWmsBusinessType(moveType); //下拉读取业务类型接口 create  by liuwq

    // getEnumDockData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('DockEnum')).data.result ?? [];

    // getEnumPoDetailStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('OrderStatusEnum')).data.result ?? [];
    // getEnumOrderTypeData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('OrderTypeEnum')).data.result ?? [];
    //----------------物料明细
    // æ ¹æ®çŠ¶æ€è½¬ä¸­æ–‡ ä¿ç•™3位小数
    let scopetrans = JSON.parse(JSON.stringify(scope));
@@ -670,8 +662,8 @@
//关闭抽屉
const handleDrawerClose = () => {
    detailForm.value = {
        poId: '',
        materialCode: '',
        detailName: '',
        packageCode: '',
        Page: 1,
        PageSize: 10,
    };

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

copy from LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderAsn/index.vue
copy to LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue
Îļþ´Ó LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderAsn/index.vue ¸´ÖÆ
@@ -1,14 +1,15 @@
<template>
    <div class="wmsOrderPurchase-container">
    <!-- é½å¥—管理 -->
        <el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
            <el-form :model="queryParams" ref="queryForm" labelWidth="90">
                <el-row>
                    <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="6" class="mb10">
                        <el-form-item label="关键字">
                            <el-input v-model="queryParams.searchKey" clearable="" placeholder="PO单号,供应商编号,供应商名称,ERP单号,项目号" />
                            <el-input v-model="queryParams.searchKey" clearable="" placeholder="关键字" />
                        </el-form-item>
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
                    <!-- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
                        <el-form-item label="PO单号">
                            <el-input v-model="queryParams.purchaseNo" clearable="" placeholder="请输入PO单号" />
                        </el-form-item>
@@ -36,16 +37,9 @@
                            </el-select>
                        </el-form-item>
                    </el-col>
                    <!-- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
            <el-form-item label="单据状态名称">
              <el-input v-model="queryParams.poStatusName" clearable="" placeholder="请输入单据状态名称"/>
              
            </el-form-item>
          </el-col> -->
                    <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
                        <!-- <el-form-item label="供应商编号">
              <el-input v-model="queryParams.supplierCode" clearable="" placeholder="请输入供应商编号" />
            </el-form-item> -->
	

                        <el-form-item label="供应商" prop="supplierCode">
                            <el-select
@@ -70,39 +64,16 @@
                            <el-input v-model="queryParams.supplierName" clearable="" placeholder="请输入供应商名称" />
                        </el-form-item>
                    </el-col>
                    <!-- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
            <el-form-item label="收货道口"> -->
                    <!-- <el-input v-model="queryParams.dock" clearable="" placeholder="请输入收货道口" /> -->
                    <!--     <el-select clearable v-model="queryParams.dock" placeholder="请选择收货道口">
              <el-option
                v-for="(item, index) in getEnumDockData"
                :key="index"
                :value="item.value"
                :label="`${item.describe}`"
              ></el-option>
            </el-select> -->
                    <!--   </el-form-item>
          </el-col> -->
		
                    <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
                        <el-form-item label="ERP单号">
                            <el-input v-model="queryParams.erpOrderNo" clearable="" placeholder="请输入ERP单号" />
                        </el-form-item>
                    </el-col>
                    <!-- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
            <el-form-item label="项目ID">
              <el-input v-model="queryParams.projectId" clearable="" placeholder="请输入项目ID"/>
              
            </el-form-item>
          </el-col> -->
                    <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
                        <el-form-item label="项目号">
                            <el-input v-model="queryParams.projectNo" clearable="" placeholder="请输入项目号" />
                        </el-form-item>
                    </el-col>
                    <!-- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
            <el-form-item label="项目名称">
              <el-input v-model="queryParams.projectName" clearable="" placeholder="请输入项目名称"/>
              
            </el-form-item>
          </el-col> -->

@@ -111,13 +82,8 @@
                            <el-button-group style="display: flex; align-items: center">
                                <el-button type="primary" icon="ele-Search" @click="handleQuery"> æŸ¥è¯¢ </el-button>
                                <el-button icon="ele-Refresh" @click="() => (queryParams = {})"> é‡ç½® </el-button>
                                <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUI" v-if="!showAdvanceQueryUI" style="margin-left: 5px"> é«˜çº§æŸ¥è¯¢ </el-button>
                                <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUI" v-if="showAdvanceQueryUI" style="margin-left: 5px"> éšè— </el-button>
                                <!-- <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddWmsOrderPurchase" v-auth="'wmsOrderPurchase:add'"> æ–°å¢ž </el-button> -->
                                <!-- æ–°å¢žPO单-ly -->
                                <!-- <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="showProp(1)"> æ–°å¢ž </el-button> -->
                                <!-- <el-button type="primary" style="margin-left:5px;" icon="ele-Upload" @click="openImportExcelWmsOrderDeliver"> å¯¼å…¥ </el-button> -->
                                <!-- <el-button type="primary" style="margin-left:5px;" icon="ele-Download" @click="handExport"> å¯¼å‡º </el-button> -->
                                <!-- <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUI" v-if="!showAdvanceQueryUI" style="margin-left: 5px"> é«˜çº§æŸ¥è¯¢ </el-button>
                                <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUI" v-if="showAdvanceQueryUI" style="margin-left: 5px"> éšè— </el-button> -->
                            </el-button-group>
                        </el-form-item>
                    </el-col>
@@ -142,16 +108,15 @@
                        border=""
                    >
                        <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="packageCode" width="150" align="left" show-overflow-tooltip>
                            <template #default="scope">
                                <span class="under_line" @click="openDrawer(1, scope.row)">
                                    {{ scope.row.packageCode }}
                                    {{ scope.row.orderId }}
                                </span>
                            </template>
                        </el-table-column>

                        <el-table-column prop="placeCode" 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="" />
@@ -159,7 +124,7 @@
                        <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="thk" label="厚" show-overflow-tooltip="" /> -->
                    </el-table>
                </div>

@@ -179,13 +144,15 @@
                    >
                        <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="packageCode" width="150" align="left" show-overflow-tooltip>
                            <template #default="scope">
                                <span class="under_line" @click="openDrawer(1, scope.row)">
                                    {{ scope.row.packageCode }}
                                    {{ scope.row.orderId }}
                                </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="" />
@@ -194,13 +161,13 @@
                        <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="thk" label="厚" show-overflow-tooltip="" /> -->
                    </el-table>
                </div>
            </div>
        </el-card>

        <editDialogWmsOrderDeliver ref="editDialogRefWmsOrderDeliver" :title="editWmsOrderDeliverTitle" @reloadTable="handleQuery" />
<!-- 
        <editDialogWmsOrderDeliver ref="editDialogRefWmsOrderDeliver" :title="editWmsOrderDeliverTitle" @reloadTable="handleQuery" /> -->
        <importExcelDialog
            ref="importExcelDialogRefWmsOrderDeliver"
            :title="importExcelTitleWmsOrderDeliver"
@@ -223,11 +190,11 @@
import printDialog from '/@/views/system/print/component/hiprint/preview.vue';
import editDialog from '/@/views/main/WmsOrder/wmsOrderPurchase/component/editDialog.vue';
import {
    pageWmsOrderPurchase,
    deleteWmsOrderPurchase,
    importExcelWmsOrderPurchase,
    downloadExcelTemplateWmsOrderPurchase,
    downloadExcelTemplateWmsOrderPurchaseAll,
    KittingList,
} from '/@/api/main/WmsOrder/wmsOrderPurchase';
import { handleSlectDataWmsBusinessType } from '/@/utils/selectData';
import { getAPI } from '/@/utils/axios-utils';
@@ -260,8 +227,6 @@
};
// ---------------end详情-----------------------

const getBusinessTypeData_Index = ref<any>([]); //业务类型 create by liuwq
const getEnumOrderTypeData_Index = ref<any>([]);
// const getEnumBusinessTypeData_Index = ref<any>([]); //update by liuwq
const getEnumPoStatusData_Index = ref<any>([]);

@@ -317,13 +282,22 @@
    return '新表格导出标题';
};

// æŸ¥è¯¢æ“ä½œ
// 8888888888888查询操作 IsKitting
const handleQuery = async () => {
    loading.value = true;
    var res = await pageWmsOrderPurchase(Object.assign(queryParams.value, tableParams.value));
    var res = await KittingList(Object.assign(queryParams.value, {
        ...tableParams.value,
        IsKitting:true
    }));
    tableData.value = res.data.result ?? [];

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

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

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

    // tableParams.value.total = res.data.result?.total;
    loading.value = false;

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeed/component/editDialog.vue

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

ÎļþÃû´Ó LA24030_LuLiPackageLine_Web/src/views/main/WmsBase/wmsSubstituteGood/index.vue ÐÞ¸Ä
@@ -4,8 +4,8 @@
            <el-form :model="queryParams" ref="queryForm" labelWidth="100">
                <el-row>
                    <el-col :xs="24" :sm="12" :md="12" :lg="10" :xl="4" class="mb10">
                        <el-form-item label="物料码">
                            <el-input v-model="queryParams.searchKey" clearable="" placeholder="请物料码" />
                        <el-form-item label="部件条码">
                            <el-input v-model="queryParams.upi" ref="materialCodeInput" clearable="" placeholder="请扫部件条码" />
                        </el-form-item>
                    </el-col>

@@ -13,7 +13,8 @@
                        <el-form-item>
                            <el-button-group style="display: flex; align-items: center">
                                <el-button type="primary" icon="ele-Search" @click="handleQuery"> æŸ¥è¯¢ </el-button>
                                <!-- <el-button icon="ele-Refresh" @click="() => queryParams = {}"> é‡ç½® </el-button>
                                <el-button icon="ele-Refresh" @click="() => queryParams = {}"> é‡ç½® </el-button>
                                <!-- 
                        <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUI" v-if="!showAdvanceQueryUI" style="margin-left:5px;"> é«˜çº§æŸ¥è¯¢ </el-button>
                        <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUI" v-if="showAdvanceQueryUI" style="margin-left:5px;"> éšè— </el-button> -->
                                <!-- <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddWmsSubstituteGood" v-auth="'wmsSubstituteGood:add'"> æ–°å¢ž </el-button> -->
@@ -34,12 +35,12 @@
                        <span class="text_rt">{{ tableData.Info16 }}</span>
                    </li>
                    <li>
                        <span class="text_left">齐包:</span>
                        <span class="text_rt">{{ tableData.planNo }}</span>
                        <span class="text_left">是否齐包:</span>
                        <span class="text_rt"></span>
                    </li>
                    <li>
                        <span class="text_left">齐套:</span>
                        <span class="text_rt">{{ tableData.planNo }}</span>
                        <span class="text_left">是否齐套:</span>
                        <span class="text_rt"></span>
                    </li>
                    <li>
                        <span class="text_left">批次号:</span>
@@ -65,27 +66,27 @@

                    <li>
                        <span class="text_left">长:</span>
                        <span class="text_rt">{{ ruleForm.length }}</span>
                        <span class="text_rt">{{ tableData.length }}</span>
                    </li>
                    <li>
                        <span class="text_left">宽:</span>
                        <span class="text_rt">{{ ruleForm.width }}</span>
                        <span class="text_rt">{{ tableData.width }}</span>
                    </li>
                    <li>
                        <span class="text_left">厚:</span>
                        <span class="text_rt">{{ ruleForm.thk }}</span>
                        <span class="text_rt">{{ tableData.thk }}</span>
                    </li>
                    <li>
                        <span class="text_left">部件纹理:</span>
                        <span class="text_rt">{{ ruleForm.matgrid }}</span>
                        <span class="text_rt">{{ tableData.matgrid }}</span>
                    </li>
                    <li>
                        <span class="text_left">是否封边:</span>
                        <span class="text_rt">{{ ruleForm.isEB }}</span>
                        <span class="text_rt">{{ tableData.isEB }}</span>
                    </li>
                    <li>
                        <span class="text_left">打孔设备编号:</span>
                        <span class="text_rt">{{ ruleForm.dRNum }}</span>
                        <span class="text_rt">{{ tableData.dRNum }}</span>
                    </li>
                </ul>
            </div>
@@ -119,7 +120,7 @@
</template>

<script lang="ts" setup="" name="wmsSubstituteGood">
import { ref } from 'vue';
import { onMounted, ref } from 'vue';
import { ElMessageBox, ElMessage } from 'element-plus';
import { auth } from '/@/utils/authFunction';
import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
@@ -134,7 +135,10 @@
const editDialogRef = ref();
const loading = ref(false);
const tableData = ref<any>([]);
const queryParams = ref<any>({});
const queryParams = ref<any>({
    upi:""

});
const tableParams = ref({
    page: 1,
    pageSize: 10,
@@ -157,6 +161,13 @@
const changeAdvanceQueryUI = () => {
    showAdvanceQueryUI.value = !showAdvanceQueryUI.value;
};
// ç”¨äºŽå¼•ç”¨è¾“入框
const materialCodeInput = ref(null);

onMounted(() => {
    // åœ¨ç»„件挂载后进行聚焦
    materialCodeInput.value.$el.querySelector('input').focus(); 
});

// æŸ¥è¯¢æ“ä½œ 888888888
const handleQuery = async () => {

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/component/editDialog.vue

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/component/openAllprop.vue

ÎļþÃû´Ó LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderAsn/component/openAllprop.vue ÐÞ¸Ä
@@ -536,9 +536,7 @@
//列表的数据条数
const totalItems = ref<number>(0);

//缓存枚举
const enumList: any = cache.getCache('enumList');
console.log(enumList.inEnumOrderType);


// .inEnumOrderType


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

ÎļþÃû´Ó LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderAsn/index.vue ÐÞ¸Ä
@@ -1,14 +1,19 @@
<template>
<template>
    <div class="wmsOrderPurchase-container">
        <el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
            <el-form :model="queryParams" ref="queryForm" labelWidth="90">
                <el-row>
                    <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="6" class="mb10">
                    <!-- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="6" class="mb10">
                        <el-form-item label="关键字">
                            <el-input v-model="queryParams.searchKey" clearable="" placeholder="PO单号,供应商编号,供应商名称,ERP单号,项目号" />
                            <el-input v-model="queryParams.searchKey" clearable="" placeholder="关键字" />
                        </el-form-item>
                    </el-col> -->
                    <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="6" class="mb10">
                        <el-form-item label="包装号">
                            <el-input v-model="queryParams.packageCode" clearable="" placeholder="请输入包装号" />
                        </el-form-item>
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
                    <!-- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
                        <el-form-item label="PO单号">
                            <el-input v-model="queryParams.purchaseNo" clearable="" placeholder="请输入PO单号" />
                        </el-form-item>
@@ -36,16 +41,9 @@
                            </el-select>
                        </el-form-item>
                    </el-col>
                    <!-- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
            <el-form-item label="单据状态名称">
              <el-input v-model="queryParams.poStatusName" clearable="" placeholder="请输入单据状态名称"/>
              
            </el-form-item>
          </el-col> -->
                    <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
                        <!-- <el-form-item label="供应商编号">
              <el-input v-model="queryParams.supplierCode" clearable="" placeholder="请输入供应商编号" />
            </el-form-item> -->
		

                        <el-form-item label="供应商" prop="supplierCode">
                            <el-select
@@ -70,54 +68,28 @@
                            <el-input v-model="queryParams.supplierName" clearable="" placeholder="请输入供应商名称" />
                        </el-form-item>
                    </el-col>
                    <!-- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
            <el-form-item label="收货道口"> -->
                    <!-- <el-input v-model="queryParams.dock" clearable="" placeholder="请输入收货道口" /> -->
                    <!--     <el-select clearable v-model="queryParams.dock" placeholder="请选择收货道口">
              <el-option
                v-for="(item, index) in getEnumDockData"
                :key="index"
                :value="item.value"
                :label="`${item.describe}`"
              ></el-option>
            </el-select> -->
                    <!--   </el-form-item>
          </el-col> -->
			
                    <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
                        <el-form-item label="ERP单号">
                            <el-input v-model="queryParams.erpOrderNo" clearable="" placeholder="请输入ERP单号" />
                        </el-form-item>
                    </el-col>
                    <!-- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
            <el-form-item label="项目ID">
              <el-input v-model="queryParams.projectId" clearable="" placeholder="请输入项目ID"/>
              
            </el-form-item>
          </el-col> -->
                    <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
                        <el-form-item label="项目号">
                            <el-input v-model="queryParams.projectNo" clearable="" placeholder="请输入项目号" />
                        </el-form-item>
                    </el-col>
                    <!-- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
            <el-form-item label="项目名称">
              <el-input v-model="queryParams.projectName" clearable="" placeholder="请输入项目名称"/>
              
            </el-form-item>
          </el-col> -->
		

                    <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb10">
                        <el-form-item>
                            <el-button-group style="display: flex; align-items: center">
                                <el-button type="primary" icon="ele-Search" @click="handleQuery"> æŸ¥è¯¢ </el-button>
                                <el-button icon="ele-Refresh" @click="() => (queryParams = {})"> é‡ç½® </el-button>
                                <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUI" v-if="!showAdvanceQueryUI" style="margin-left: 5px"> é«˜çº§æŸ¥è¯¢ </el-button>
                                <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUI" v-if="showAdvanceQueryUI" style="margin-left: 5px"> éšè— </el-button>
                                <!-- <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddWmsOrderPurchase" v-auth="'wmsOrderPurchase:add'"> æ–°å¢ž </el-button> -->
                                <!-- æ–°å¢žPO单-ly -->
                                <!-- <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="showProp(1)"> æ–°å¢ž </el-button> -->
                                <!-- <el-button type="primary" style="margin-left:5px;" icon="ele-Upload" @click="openImportExcelWmsOrderDeliver"> å¯¼å…¥ </el-button> -->
                                <!-- <el-button type="primary" style="margin-left:5px;" icon="ele-Download" @click="handExport"> å¯¼å‡º </el-button> -->
                                <!-- <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUI" v-if="!showAdvanceQueryUI" style="margin-left: 5px"> é«˜çº§æŸ¥è¯¢ </el-button>
                                <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUI" v-if="showAdvanceQueryUI" style="margin-left: 5px"> éšè— </el-button> -->
					
                            </el-button-group>
                        </el-form-item>
                    </el-col>
@@ -130,17 +102,7 @@
                <div class="left-table">
                    <p class="text-xtiny">齐套列表</p>

                    <el-table
                        :data="tableData"
                        style="width: 100%"
                        v-loading="loading"
                        tooltip-effect="light"
                        ref="tableRef"
                        row-key="id"
                        @sort-change="sortChange"
                        :summary-method="getExportTitle"
                        border=""
                    >
                    <el-table :data="tableData" style="width: 100%" v-loading="loading" tooltip-effect="light" ref="tableRef" row-key="id" @sort-change="sortChange" :summary-method="getExportTitle" border="">
                        <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>
@@ -150,8 +112,9 @@
                                </span>
                            </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="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="" />
@@ -159,7 +122,7 @@
                        <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="thk" label="厚" show-overflow-tooltip="" /> -->
                    </el-table>
                </div>

@@ -186,7 +149,9 @@
                                </span>
                            </template>
                        </el-table-column>
                        <el-table-column prop="placeCode" 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="" />
@@ -194,7 +159,7 @@
                        <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="thk" label="厚" show-overflow-tooltip="" /> -->
                    </el-table>
                </div>
            </div>
@@ -228,6 +193,7 @@
    importExcelWmsOrderPurchase,
    downloadExcelTemplateWmsOrderPurchase,
    downloadExcelTemplateWmsOrderPurchaseAll,
    packList,
} from '/@/api/main/WmsOrder/wmsOrderPurchase';
import { handleSlectDataWmsBusinessType } from '/@/utils/selectData';
import { getAPI } from '/@/utils/axios-utils';
@@ -317,13 +283,20 @@
    return '新表格导出标题';
};

// æŸ¥è¯¢æ“ä½œ
// 88888888查询操作
const handleQuery = async () => {
    loading.value = true;
    var res = await pageWmsOrderPurchase(Object.assign(queryParams.value, tableParams.value));
    var res = await packList(Object.assign(queryParams.value, {
        ...tableParams.value,
        IsPack:true
    }));
    tableData.value = res.data.result ?? [];
    var res2 = await packList(Object.assign(queryParams.value, {
        ...tableParams.value,
        IsPack:false
    }));

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

    // tableParams.value.total = res.data.result?.total;
    loading.value = false;

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/editDialog.vue

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

ÎļþÃû´Ó LA24030_LuLiPackageLine_Web/src/views/main/PrintCenter/wmsStockQuanPrint/index.vue ÐÞ¸Ä
@@ -133,7 +133,7 @@
                @selection-change="handleSelectionChange"
                border="">
        <el-table-column align="center" width="60" type="selection"  />
        <el-table-column type="index" fixed="left" label="序号" width="55" align="center"/>
        <el-table-column type="index"  label="序号" width="55" align="center"/>
        
        <el-table-column prop="placeCode" label="库位编码"  show-overflow-tooltip="" />
         <el-table-column prop="inTime" label="进入时间" width="80" :formatter="formatDate_T_Date"  show-overflow-tooltip="" />

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderPurchase/component/openAllprop.vue

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý