LA24030-LuLI_PackageLine.git

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,54 +64,26 @@
			<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> -->

			<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>
			@@ -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;