From dc7a24a919d03843969900e775b5c3935cad453f Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周二, 26 11月 2024 09:03:21 +0800
Subject: [PATCH] 前端
---
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue | 96 +++++++++++++++++------------------------------
1 files changed, 35 insertions(+), 61 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderAsn/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue
similarity index 83%
copy from LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderAsn/index.vue
copy to LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue
index 7caf6ee..213574f 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderAsn/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/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="璇疯緭鍏O鍗曞彿" />
</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="璇疯緭鍏RP鍗曞彿" />
</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="璇疯緭鍏ラ」鐩甀D"/>
-
- </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;
--
Gitblit v1.9.3