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/component/editDialog.vue | 0
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/component/openAllprop.vue | 4
/dev/null | 517 ----------------------------------
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/index.vue | 96 ++----
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/index.vue | 101 ++----
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue | 100 +++---
LA24030_LuLiPackageLine_Web/src/api/main/WmsOrder/wmsOrderPurchase.ts | 27 +
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeed/index.vue | 41 +-
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/component/editDialog.vue | 0
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/editDialog.vue | 0
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/index.vue | 2
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeed/component/editDialog.vue | 0
12 files changed, 169 insertions(+), 719 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/api/main/WmsOrder/wmsOrderPurchase.ts b/LA24030_LuLiPackageLine_Web/src/api/main/WmsOrder/wmsOrderPurchase.ts
index da6522b..f0dc8f0 100644
--- a/LA24030_LuLiPackageLine_Web/src/api/main/WmsOrder/wmsOrderPurchase.ts
+++ b/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,
+ });
+
+
+
// 涓嶅垎椤垫煡璇O鍗�
export const listWmsOrderPurchase = (params?: any) =>
request({
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderAsn/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/editDialog.vue
similarity index 100%
rename from LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderAsn/component/editDialog.vue
rename to LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/editDialog.vue
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderAsn/component/openAllprop.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/component/openAllprop.vue
similarity index 90%
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
index 4491a01..407a34e 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderAsn/component/openAllprop.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/kittingList/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">
@@ -294,38 +294,38 @@
<!-- <el-table-column prop="poId" label="PO鍗旾D" show-overflow-tooltip="" /> -->
<!-- <el-table-column prop="poNo" label="PO鍗曞彿" 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="packageCode" 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="stockStatus" label="搴撳瓨鐘舵��" show-overflow-tooltip="" >
- <template #default="scope">
- <el-tag>{{ getEnumDesc(scope.row.stockStatus, getEnumStockStatusData_Index)}}</el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="stockStatusName" label="搴撳瓨鐘舵�佸悕绉�" show-overflow-tooltip="" />
- <el-table-column prop="operReason" label="鎿嶄綔鍘熷洜" show-overflow-tooltip="" />
- <el-table-column prop="operUser" label="鎿嶄綔浜�" show-overflow-tooltip="" />
- <el-table-column prop="operTime" label="鎿嶄綔鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
- <el-table-column prop="lockStatus" label="閿佸畾鐘舵��" show-overflow-tooltip="" >
- <template #default="scope">
- <el-tag>{{ getEnumDesc(scope.row.lockStatus, getEnumLockStatusData_Index)}}</el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="lockReason" label="閿佸畾鍘熷洜" show-overflow-tooltip="" />
- <el-table-column prop="lockUser" label="閿佸畾浜�" show-overflow-tooltip="" />
- <el-table-column prop="lockTime" label="閿佸畾鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
- <el-table-column prop="remarks" 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-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="packageCode" 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="stockStatus" label="搴撳瓨鐘舵��" show-overflow-tooltip="">
+ <template #default="scope">
+ <el-tag>{{ getEnumDesc(scope.row.stockStatus, getEnumStockStatusData_Index) }}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="stockStatusName" label="搴撳瓨鐘舵�佸悕绉�" show-overflow-tooltip="" />
+ <el-table-column prop="operReason" label="鎿嶄綔鍘熷洜" show-overflow-tooltip="" />
+ <el-table-column prop="operUser" label="鎿嶄綔浜�" show-overflow-tooltip="" />
+ <el-table-column prop="operTime" label="鎿嶄綔鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
+ <el-table-column prop="lockStatus" label="閿佸畾鐘舵��" show-overflow-tooltip="">
+ <template #default="scope">
+ <el-tag>{{ getEnumDesc(scope.row.lockStatus, getEnumLockStatusData_Index) }}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="lockReason" label="閿佸畾鍘熷洜" show-overflow-tooltip="" />
+ <el-table-column prop="lockUser" label="閿佸畾浜�" show-overflow-tooltip="" />
+ <el-table-column prop="lockTime" label="閿佸畾鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
+ <el-table-column prop="remarks" 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>
<Pagination :total="detailCount" v-model:page="detailForm.Page" v-model:limit="detailForm.PageSize" @pagination="getDetail" style="margin-top: 20px; text-align: center"></Pagination>
@@ -413,10 +413,8 @@
const hexiao = computed(() => props.hexiao);
const loading = ref(false);
-
-
const getEnumStockStatusData_Index = ref<any>([]);
- const getEnumLockStatusData_Index = ref<any>([]);
+const getEnumLockStatusData_Index = ref<any>([]);
// 鐧诲綍鐢ㄦ埛id
// const LoginUserID = computed(() => store.state.login.userInfo.id || localCache.getCache("LoginUserID"))
@@ -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 = [];
@@ -648,13 +645,8 @@
getDetail();
//------------------鑾峰彇鐗╂枡鍒楄〃鐗╂枡鏄庣粏
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 ?? [];
+ getEnumLockStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('LockStatusEnum')).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,
};
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;
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsBase/wmsSubstituteGood/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeed/component/editDialog.vue
similarity index 100%
rename from LA24030_LuLiPackageLine_Web/src/views/main/WmsBase/wmsSubstituteGood/component/editDialog.vue
rename to LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeed/component/editDialog.vue
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsBase/wmsSubstituteGood/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeed/index.vue
similarity index 87%
rename from LA24030_LuLiPackageLine_Web/src/views/main/WmsBase/wmsSubstituteGood/index.vue
rename to LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeed/index.vue
index 5d3e34b..f57499c 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsBase/wmsSubstituteGood/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeed/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 () => {
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderPurchase/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/component/editDialog.vue
similarity index 100%
rename from LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderPurchase/component/editDialog.vue
rename to LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/component/editDialog.vue
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderAsn/component/openAllprop.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/component/openAllprop.vue
similarity index 99%
rename from LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderAsn/component/openAllprop.vue
rename to LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/component/openAllprop.vue
index 4491a01..5113be7 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderAsn/component/openAllprop.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/component/openAllprop.vue
@@ -536,9 +536,7 @@
//鍒楄〃鐨勬暟鎹潯鏁�
const totalItems = ref<number>(0);
-//缂撳瓨鏋氫妇
-const enumList: any = cache.getCache('enumList');
-console.log(enumList.inEnumOrderType);
+
// .inEnumOrderType
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderAsn/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/index.vue
similarity index 84%
rename from LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderAsn/index.vue
rename to LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/index.vue
index 7caf6ee..c248f24 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderAsn/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/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="璇疯緭鍏O鍗曞彿" />
</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="璇疯緭鍏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>
@@ -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;
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/PrintCenter/wmsStockQuanPrint/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/editDialog.vue
similarity index 100%
rename from LA24030_LuLiPackageLine_Web/src/views/main/PrintCenter/wmsStockQuanPrint/component/editDialog.vue
rename to LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/editDialog.vue
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/PrintCenter/wmsStockQuanPrint/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/index.vue
similarity index 99%
rename from LA24030_LuLiPackageLine_Web/src/views/main/PrintCenter/wmsStockQuanPrint/index.vue
rename to LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/index.vue
index c715d65..87b8cea 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/PrintCenter/wmsStockQuanPrint/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/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="" />
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderPurchase/component/openAllprop.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderPurchase/component/openAllprop.vue
deleted file mode 100644
index 4491a01..0000000
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderPurchase/component/openAllprop.vue
+++ /dev/null
@@ -1,1159 +0,0 @@
-<template>
- <div>
- <!-- 娣诲姞銆佺紪杈� -->
- <el-dialog v-model="dialogVisible" width="95%" @close="closeDialog" :close-on-click-modal="false">
- <template #header>
- <div style="color: #fff">
- <span>{{ dialogType == 'add' ? '娣诲姞' : '缂栬緫' }}</span>
- </div>
- </template>
-
- <el-form :model="addForm" ref="dialogRef" labelWidth="90" :rules="formRules">
- <el-row>
- <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb20">
- <el-form-item label="涓氬姟绫诲瀷" prop="businessType">
- <el-select clearable v-model="addForm.businessType" placeholder="璇烽�夋嫨涓氬姟绫诲瀷">
- <el-option v-for="(item, index) in getBusinessTypeData_Index" :key="index" :value="item.businessTypeValue" :label="`[${item.businessTypeValue}] ${item.businessTypeName}`"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb20">
- <el-form-item label="渚涘簲鍟�" prop="supplierCode">
- <el-select
- v-model="addForm.supplierCode"
- filterable
- remote
- reserve-keyword
- remote-show-suffix
- :remote-method="remoteMethod"
- :loading="loading"
- placeholder="璇烽�夋嫨渚涘簲鍟�"
- clearable
- style="width: 100%"
- @change="changeXmbh(addForm.supplierCode)"
- >
- <el-option v-for="(item, index) in arrTdp" :key="index" :value="item.custCode" :label="`[${item.custCode}]${item.custChinaName}`"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
-
- <!-- <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb20">
- <el-form-item label="鏀惰揣閬撳彛" prop="dock">
- <el-select clearable v-model="addForm.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="6" :xl="6" class="mb20">
- <el-form-item label="鏀惰揣閬撳彛" prop="dock">
- <el-input
- v-model="addForm.dock"
- placeholder="璇疯緭鍏ユ敹璐ч亾鍙�"
- maxlength="50"
- show-word-limit
- clearable
- />
- </el-form-item>
- </el-col> -->
-
- <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb20">
- <el-form-item label="ERP鍗曞彿" prop="erpOrderNo">
- <el-input v-model="addForm.erpOrderNo" placeholder="璇疯緭鍏RP鍗曞彿" maxlength="50" show-word-limit clearable />
- </el-form-item>
- </el-col>
-
- <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb20">
- <el-form-item label="椤圭洰鍙�" prop="projectNo">
- <el-input v-model="addForm.projectNo" placeholder="璇疯緭鍏ラ」鐩彿" maxlength="50" show-word-limit clearable />
- </el-form-item>
- </el-col>
-
- <!-- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="dialogType == 'add'">
- <el-form-item label="璁㈠崟绫诲瀷:" prop="materialType">
- <el-select v-model="addForm.materialType" placeholder="璇烽�夋嫨璁㈠崟绫诲瀷" @change="changDdlx"
- style="width: 100%">
- <el-option v-for="item in statusEnums" :key="item.value" :label="item.title" :value="item.value" />
- </el-select>
- </el-form-item>
- </el-col>
-
- <el-col :span="8" v-if="dialogType == 'edit'">
- <el-form-item label="璁㈠崟绫诲瀷:" prop="materialType">
- <el-select v-model="addForm.materialType" disabled placeholder="璇烽�夋嫨璁㈠崟绫诲瀷" style="width: 100%">
- <el-option v-for="item in outInTypeEnum" :key="item.value" :label="item.title" :value="item.value" />
- </el-select>
- </el-form-item>
- </el-col>
-
- <el-col :span="8" v-if="addForm.materialType == 5">
- <el-form-item label="鍏嶈垂浠剁被鍨�:" prop="freeOrderType">
- <el-select v-model="addForm.freeOrderType" placeholder="璇烽�夋嫨鍏嶈垂浠剁被鍨�" style="width: 100%"
- @change="changMfj" :disabled="dialogType == 'edit'">
- <el-option v-for="item in statusEnumsMFj" :key="item.value" :label="item.title" :value="item.value" />
- </el-select>
- </el-form-item>
- </el-col>
-
- <el-col :span="8">
- <el-form-item label="鍗曞彿:" prop="purchaseNo">
- <el-input v-model="addForm.purchaseNo" :disabled="dialogType == 'edit'" clearable placeholder="璇疯緭鍏ュ崟鍙�" />
- </el-form-item>
- </el-col>
-
- <el-col :span="8">
- <el-form-item label="澶囨敞:">
- <el-input v-model="addForm.remark" clearable placeholder="璇疯緭鍏ュ娉�" />
- </el-form-item>
- </el-col>
-
- <el-col :span="8">
- <el-form-item label="棰勮鍒拌揪鏃堕棿:" prop="EstimatedDate">
- <el-date-picker v-model="addForm.EstimatedDate" type="datetime" :disabled-date="disabledDate"
- value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨棰勮鍒拌揪鏃堕棿"
- style="width: 100%;" />
- </el-form-item>
- </el-col> -->
- </el-row>
- </el-form>
- <div class="msi-content" style="margin-top: 10px">
- <div class="header" style="margin-bottom: 10px">
- <div>
- <el-button type="primary" icon="el-icon-plus" @click="addMaterialDialog">鏂板鐗╂枡</el-button>
-
- <el-button icon="el-icon-delete" plain :disabled="checkedDetails.length == 0" @click="delCheckedDetails">鍒犻櫎閫変腑琛�</el-button>
- </div>
- </div>
-
- <el-table :data="warehousOrderDetails" border style="width: 100%" row-key="setRowKey" ref="detailRef" @selection-change="detailsCheckChange" max-height="480">
- <el-table-column align="center" width="60" type="selection" />
- <el-table-column label="搴忓彿" align="center" width="60" type="index" />
- <el-table-column label="鐗╂枡缂栧彿" min-width="140" prop="materialCode" align="center" show-overflow-tooltip />
- <el-table-column label="鐗╂枡鍚嶇О" min-width="140" prop="materialName" align="center" show-overflow-tooltip />
-
- <!-- clientCode -->
- <el-table-column label="瀹㈡埛缂栧彿" v-if="isShowBomBtn" prop="diCustomCode" align="center" min-width="110" />
- <el-table-column label="瀹㈡埛涓枃鍚嶇О" v-if="isShowBomBtn" prop="diCustomChinaName" align="center" min-width="110" />
-
- <el-table-column label="琛屽彿" prop="poLineNumber" align="center" min-width="120">
- <template #default="scope">
- <el-input v-model.trim="scope.row.poLineNumber" clearable min-width="150" placeholder="璇疯緭鍏ヨ鍙�" />
- </template>
- </el-table-column>
-
- <el-table-column label="渚涘簲鍟嗘壒娆�" prop="supplierBatch" align="center" min-width="120">
- <template #default="scope">
- <el-input v-model.trim="scope.row.supplierBatch" clearable min-width="150" placeholder="璇疯緭鍏ヤ緵搴斿晢鎵规" />
- </template>
- </el-table-column>
-
- <el-table-column label="ERP搴撳瓨鍦�" prop="erpCode" align="center" min-width="120">
- <template #default="scope">
- <el-input v-model.trim="scope.row.erpCode" clearable min-width="150" placeholder="璇疯緭鍏RP搴撳瓨鍦�" />
- </template>
- </el-table-column>
-
- <el-table-column label="鏁伴噺" align="center" min-width="180">
- <template #default="scope">
- <el-input-number :precision="3" min="0" v-model="scope.row.quantity" size="small" />
- </template>
- </el-table-column>
-
- <el-table-column label="璁″垝寮�濮嬫椂闂�" align="center" min-width="180">
- <template #default="scope">
- <el-date-picker
- v-model="scope.row.plannedStartTime"
- type="datetime"
- :disabled-date="disabledDate"
- value-format="YYYY-MM-DD HH:mm:ss"
- format="YYYY-MM-DD HH:mm:ss"
- placeholder="璇烽�夋嫨璁″垝寮�濮嬫椂闂�"
- style="width: 100%"
- />
- </template>
- </el-table-column>
- <el-table-column label="璁″垝缁撴潫鏃堕棿" align="center" min-width="180">
- <template #default="scope">
- <el-date-picker
- v-model="scope.row.plannedEndTime"
- type="datetime"
- :disabled-date="disabledDate"
- value-format="YYYY-MM-DD HH:mm:ss"
- format="YYYY-MM-DD HH:mm:ss"
- placeholder="璇烽�夋嫨璁″垝缁撴潫鏃堕棿"
- style="width: 100%"
- />
- </template>
- </el-table-column>
- <el-table-column label="閲囪喘鍗曚綅" prop="unit" align="center" min-width="80" />
- </el-table>
- </div>
- <template #footer>
- <span class="dialog-footer">
- <el-button @click="dialogVisible = false">鍙栨秷</el-button>
- <el-button type="primary" :disabled="load" @click="confirm">纭</el-button>
- </span>
- </template>
- </el-dialog>
- <!-- 娣诲姞鐗╂枡 -->
- <el-dialog v-model="addMaterialVisible" title="娣诲姞鐗╂枡璇︽儏" width="60%" @close="closeMaterialDialog">
- <template #header>
- <div style="color: #fff">
- <span>娣诲姞鐗╂枡璇︽儏</span>
- </div>
- </template>
-
- <div class="msi-form" style="padding-top: 0px">
- <el-form :model="materialForm">
- <el-row>
- <el-col :span="8">
- <el-form-item label="鐗╂枡缂栧彿">
- <el-input v-model="materialForm.MaterialCode" placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" clearable></el-input>
- </el-form-item>
- </el-col>
-
- <!-- <el-col :span="8">
- <el-form-item label="鐗╂枡澶х被:">
- <el-input v-model="materialForm.MaterialTypeId" placeholder="璇疯緭鍏ョ墿鏂欏ぇ绫�" clearable></el-input>
- </el-form-item>
- </el-col> -->
-
- <el-col :span="8">
- <el-form-item label-width="20px">
- <el-button type="primary" icon="el-icon-search" @click="getMaterialList">鏌ヨ</el-button>
- <!-- <el-button icon="el-icon-refresh-right" @click="resetMaterialForm"
- >閲嶇疆</el-button
- > -->
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- </div>
- <div class="msi-content" style="padding-top: 0; margin-top: 10px">
- <el-table :data="materialList" border style="width: 100%" row-key="id" ref="materialRef" @selection-change="materialSelectionChange" :max-height="480">
- <el-table-column align="center" width="60" type="selection" />
- <el-table-column label="搴忓彿" align="center" width="60" type="index" />
- <el-table-column label="鐗╂枡缂栧彿" prop="materialCode" align="center" min-width="140" show-overflow-tooltip />
- <el-table-column label="鐗╂枡鍚嶇О" prop="materialName" align="center" min-width="140" show-overflow-tooltip />
- <el-table-column label="閲囪喘鍗曚綅" prop="poUnit" align="center" min-width="140" show-overflow-tooltip />
- </el-table>
- <Pagination
- :total="materialTotal"
- v-model:page="materialForm.Page"
- v-model:limit="materialForm.PageSize"
- @pagination="getMaterialList"
- style="margin-top: 20px; text-align: center"
- ></Pagination>
- </div>
- <template #footer>
- <span class="dialog-footer">
- <el-button @click="addMaterialVisible = false">鍙栨秷</el-button>
- <el-button type="primary" @click="confirmAddMaterial">纭</el-button>
- </span>
- </template>
- </el-dialog>
- <!-- 鍗曡鎯� -->
- <el-drawer v-model="drawerVisible" :title="`${detailForm.poId}鐗╂枡璇︽儏`" direction="rtl" size="80%" @close="handleDrawerClose">
- <template #title>
- <div class="slot_title">
- <div class="title_orderNo">{{ title }}</div>
- <div>鐗╂枡璇︽儏</div>
- </div>
- </template>
-
- <div class="detailBoxWrap">
- <!-- 璇︽儏缁勪欢 -->
- <open-details ref="propDetailRef"></open-details>
- <div class="msi-form">
- <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>
- </el-col>
- <el-col :span="4">
- <el-form-item label-width="20px">
- <el-button type="primary" icon="el-icon-search" @click="getDetail">鏌ヨ</el-button>
-
- <el-button type="primary" icon="ele-Printer" @click="getPrint">鎵撳嵃</el-button>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- </div>
- <div class="msi-content">
- <!-- <p style="margin-bottom: 10px">鐗╂枡鏄庣粏</p> -->
- <el-table :data="drawerList" border striped :max-height="480">
- <el-table-column fixed="left" type="index" label="搴忓彿" width="55" align="center" />
- <!-- <el-table-column prop="poId" label="PO鍗旾D" show-overflow-tooltip="" /> -->
- <!-- <el-table-column prop="poNo" label="PO鍗曞彿" 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="packageCode" 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="stockStatus" label="搴撳瓨鐘舵��" show-overflow-tooltip="" >
- <template #default="scope">
- <el-tag>{{ getEnumDesc(scope.row.stockStatus, getEnumStockStatusData_Index)}}</el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="stockStatusName" label="搴撳瓨鐘舵�佸悕绉�" show-overflow-tooltip="" />
- <el-table-column prop="operReason" label="鎿嶄綔鍘熷洜" show-overflow-tooltip="" />
- <el-table-column prop="operUser" label="鎿嶄綔浜�" show-overflow-tooltip="" />
- <el-table-column prop="operTime" label="鎿嶄綔鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
- <el-table-column prop="lockStatus" label="閿佸畾鐘舵��" show-overflow-tooltip="" >
- <template #default="scope">
- <el-tag>{{ getEnumDesc(scope.row.lockStatus, getEnumLockStatusData_Index)}}</el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="lockReason" label="閿佸畾鍘熷洜" show-overflow-tooltip="" />
- <el-table-column prop="lockUser" label="閿佸畾浜�" show-overflow-tooltip="" />
- <el-table-column prop="lockTime" label="閿佸畾鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
- <el-table-column prop="remarks" 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>
- <Pagination :total="detailCount" v-model:page="detailForm.Page" v-model:limit="detailForm.PageSize" @pagination="getDetail" style="margin-top: 20px; text-align: center"></Pagination>
-
- <div></div>
- </div>
- </div>
- </el-drawer>
-
- <el-dialog v-model="outVisible2" title="SPA鑾峰彇" width="20%" @close="closeOutDialog2">
- <el-form :model="outerForm2" label-width="120px">
- <el-row style="font-size: 16px">
- <el-col :span="23">
- <el-form-item label="鍗曞彿:" required>
- <el-input v-model="outerForm2.purchaseNo" clearable placeholder="璇疯緭鍏ュ崟鍙�" />
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
-
- <template #footer>
- <span class="dialog-footer">
- <el-button @click="outVisible2 = false">鍙栨秷</el-button>
- <el-button type="primary" @click="getSapOrderPO">纭</el-button>
- </span>
- </template>
- </el-dialog>
-
- <printDialogTestStudent ref="printDialogRefTestStudent" :title="printTestStudentTitle" @reloadTable="handleQueryTestStudent" />
- </div>
-</template>
-<script lang="ts" setup>
-import Pagination from '/@/components/Pagination/index.vue';
-import { ElMessage, ElMessageBox } from 'element-plus';
-import { ref, nextTick, computed, getCurrentInstance, watch, defineExpose, defineProps, onMounted } from 'vue';
-import { getTypeStatus } from '/@/utils/formate';
-
-import { formatDecimalData } from '/@/utils/formate';
-import { expandMore } from '/@/hooks/expandMore';
-import cache from '/@/utils/cache';
-import { pageWmsMaterial } from '/@/api/main/WmsBase/wmsMaterial';
-import { getAPI } from '/@/utils/axios-utils';
-import { SysEnumApi } from '/@/api-services/api';
-
-import printDialogTestStudent from '/@/views/system/print/component/hiprint/preview.vue';
-
-import { addWmsOrderPurchase, updateWmsOrderPurchase, detailWmsOrderPurchase } from '/@/api/main/WmsOrder/wmsOrderPurchase';
-import OpenDetails from '/@/components/openDetails/openDetails.vue';
-import { pageBaseCustomer } from '/@/api/main/WmsBase/baseCustomer';
-import { listWmsOrderPurchaseDetails, pageWmsOrderPurchaseDetails } from '/@/api/main/WmsOrder/wmsOrderPurchaseDetails';
-import { formatDate, formatDate_T_Date, formatDate_T_Time, defaultTimeRange } from '/@/utils/formatTime';
-import commonFunction from '/@/utils/commonFunction';
-import { handleSlectDataWmsBusinessType } from '/@/utils/selectData';
-// 鎺ㄨ崘璁剧疆鎿嶄綔 width 涓� 200
-import { hiprint } from 'vue-plugin-hiprint';
-import { SysPrintApi } from '/@/api-services/api';
-import { SysPrint } from '/@/api-services/models';
-
-const moveType = 10; //绉诲姩绫诲瀷 鍏ュ簱
-const { proxy }: any = getCurrentInstance(); // 璁块棶瀹炰緥涓婁笅鏂� proxy鍚屾椂鏀寔寮�鍙� 绾夸笂鐜
-const getEnumOrderTypeData = ref<any>([]);
-
-const getEnumDockData = ref<any>([]);
-const getBusinessTypeData_Index = ref<any>([]); //涓氬姟绫诲瀷 create by liuwq
-// const getEnumBusinessTypeData = ref<any>([]); update by liuwq
-const getEnumPoStatusData = ref<any>([]);
-const { getEnumDesc } = commonFunction();
-const emits = defineEmits(['getTabelData']);
-const getEnumPoDetailStatusData_Index = ref<any>([]);
-const getEnumOrderTypeData_Index = ref<any>([]);
-
-const props = defineProps({
- titleAuthor: {
- type: Number,
- required: true,
- },
- hexiao: {
- type: Number,
- default: 1,
- required: true,
- },
-});
-//鎺у埗璁㈠崟绫诲瀷 - 涓嬫媺鑿滃崟
-const titleAuthor = computed(() => props.titleAuthor);
-// 鏄惁鏄剧ず鏍搁攢鎸夐挳
-const hexiao = computed(() => props.hexiao);
-const loading = ref(false);
-
-
-
-const getEnumStockStatusData_Index = ref<any>([]);
- const getEnumLockStatusData_Index = ref<any>([]);
-// 鐧诲綍鐢ㄦ埛id
-// const LoginUserID = computed(() => store.state.login.userInfo.id || localCache.getCache("LoginUserID"))
-
-// const EnumWriteOffState = computed(
-// () => store.state.login.enums.enumWriteOffState
-// );
-
-let itemBtnArr = ['鎵归噺鍒犻櫎', '缂栬緫', '鏂板'];
-const boolEnum = ref([
- {
- title: '鏄�',
- value: true,
- },
- {
- title: '鍚�',
- value: false,
- },
-]);
-
-// form琛ㄥ崟灞曞紑
-
-const orderType = ref('');
-const orderDoRuType = ref(); // 鐢ㄤ簬瀵煎叆鐨勫彉閲�
-const itemBtn = ref(1);
-// 鎺у埗bom鐗╂枡鏉冮檺
-const isShowBomBtn = ref(0);
-
-// 绂佹涔嬪墠鐨勬棩鏈�
-const disabledDate = (time: Date) => {
- return time.getTime() + 3600 * 1000 * 24 < Date.now();
-};
-// 涓婁紶绐楀彛
-const uploadVisible = ref(false);
-//鎵撳紑瀵煎叆绐楀彛
-const openUploadDialog = (param: any) => {
- orderDoRuType.value = param;
- uploadVisible.value = true;
-};
-//鍏抽棴绐楀彛
-const closeUploadDialog = () => {
- getTabelData();
-};
-//sap鑾峰彇
-const getSapOrder = () => {
- ElMessageBox.confirm('鏄惁纭鑾峰彇鏇存柊锛�', '鎻愮ず', {
- confirmButtonText: '纭',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- }).then(() => {
- // getSapRkPurchase().then((res) => {
- // if (res.code == 200) {
- // ElMessage.success("宸插紑濮嬮噸鏂拌幏鍙栵紝璇风◢鍚庢煡鐪嬬粨鏋滐紒");
- // } else {
- // ElMessage.error(
- // `sap鑾峰彇澶辫触${res.code}:${JSON.stringify(res.message)}`
- // );
- // }
- // })
- });
-};
-
-//------------sap鑾峰彇PO鍗�
-const outVisible2 = ref(false);
-const outerForm2 = ref({
- purchaseNo: '',
-});
-const getSapOrderPO = (param?: number) => {
- if (param && param == 1) {
- outVisible2.value = true;
- return;
- }
- if (outerForm2.value.purchaseNo == '') {
- ElMessage.warning('璇疯緭鍏ュ崟鍙�');
- return;
- }
-};
-//鍏抽棴鍑哄簱绐楀彛鐨勫洖璋�
-const closeOutDialog2 = () => {
- outerForm2.value.purchaseNo = '';
-};
-
-//------------sap鑾峰彇PO鍗�
-
-// --------------------PO鍗曞垪琛�-----------------------------------
-//鏌ヨ
-const formModel = ref({
- WareMaterialCode: '',
- WareMaterialName: '',
- PurchaseNo: '',
- CreatedUserName: '',
- CreatedTimeBegin: '',
- CreatedTimeEnd: '',
- CreateDate: [],
- IssueTimeBegin: '',
- IssueTimeEnd: '',
- IssueDate: [],
- MaterialTypeStaus: '',
- SourceBy: '',
- WriteOffState: '',
- signStatus: '',
- status: '',
- freeOrderType: '',
- IsQueryAll: false, //鏄惁鏄剧ず鍏ㄩ儴鏁版嵁
- // LoginUserID: LoginUserID, //鐢ㄦ埛id
- OrderMenuType: '', //鍒ゆ柇鏄摢涓彍鍗曞叆搴�
- Page: 1,
- PageSize: 10,
- poApprovalStatus: '',
- keyCode: '',
- IsDisable: '', //鏄惁浣滃簾
-});
-
-//鍏ュ簱鍗曞垪琛ㄦ暟鎹�
-let tableData = ref([]);
-const tableRef = ref();
-
-//鍒楄〃鐨勬暟鎹潯鏁�
-const totalItems = ref<number>(0);
-
-//缂撳瓨鏋氫妇
-const enumList: any = cache.getCache('enumList');
-console.log(enumList.inEnumOrderType);
-
-// .inEnumOrderType
-
-//鑾峰彇PO鍗曞垪琛�
-const getTabelData = () => {
- //鍒ゆ柇鍒涘缓鏃堕棿鏄惁鏈夐�夋嫨
- if (formModel.value.CreateDate && formModel.value.CreateDate.length > 0) {
- formModel.value.CreatedTimeBegin = formModel.value.CreateDate[0];
- formModel.value.CreatedTimeEnd = ''; //addDate(formModel.value.CreateDate[1], 1); //鏃ユ湡鏌ヨ 缁撴潫鏃堕棿 闇�瑕佸姞涓�澶�
- } else {
- // 鏃ュ巻娓呯┖ 鍐嶆煡璇ug
- if (formModel.value.CreatedTimeBegin || formModel.value.CreatedTimeEnd) {
- formModel.value.CreatedTimeBegin = '';
- formModel.value.CreatedTimeEnd = '';
- }
- }
- //鍒ゆ柇涓嬪彂鏃堕棿鏄惁鏈夐�夋嫨
- if (formModel.value.IssueDate && formModel.value.IssueDate.length > 0) {
- formModel.value.IssueTimeBegin = formModel.value.IssueDate[0];
- formModel.value.IssueTimeEnd = formModel.value.IssueDate[1];
- } else {
- // 鏃ュ巻娓呯┖ 鍐嶆煡璇ug
- if (formModel.value.IssueTimeBegin || formModel.value.IssueTimeEnd) {
- formModel.value.IssueTimeBegin = '';
- formModel.value.IssueTimeEnd = '';
- }
- }
-};
-getTabelData();
-
-//閲嶇疆鎼滅储
-const resetForm = () => {
- formModel.value = {
- WareMaterialCode: '',
- WareMaterialName: '',
- PurchaseNo: '',
- CreatedUserName: '',
- CreatedTimeBegin: '',
- CreatedTimeEnd: '',
- CreateDate: [],
- IssueTimeBegin: '',
- IssueTimeEnd: '',
- IssueDate: [],
- MaterialTypeStaus: '',
- SourceBy: '',
- WriteOffState: '',
- signStatus: '',
- status: '',
- freeOrderType: '',
- IsQueryAll: false, //鏄惁鏄剧ず鍏ㄩ儴鏁版嵁
- // LoginUserID: LoginUserID, //鐢ㄦ埛id
- OrderMenuType: '', //鍒ゆ柇鏄摢涓彍鍗曞叆搴�
- Page: 1,
- PageSize: 10,
- poApprovalStatus: '',
- keyCode: '',
- IsDisable: '', //鏄惁浣滃簾
- };
- getTabelData();
-};
-// -----------------鍒犻櫎銆佸鍑烘搷浣�--------------------------
-//閫変腑鐨勮
-const checkRows = ref<{ id: number }[]>([]);
-// 閫夋嫨
-const handleSelectionChange = (val: any) => {
- checkRows.value = val;
-};
-
-// -------------------鑾峰彇PO鍗曚笅鐗╂枡璇︽儏-----------------------------------
-//鍏ュ簱鍗曚笅鐗╂枡璇︽儏璇锋眰
-const detailForm = ref({
- poId: '',
- materialCode: '',
- Page: 1,
- PageSize: 10,
-});
-
-// 鐗╂枡璇︽儏鎶藉眽
-const drawerVisible = ref(false);
-const drawerType = ref('drawerAll');
-// const
-//鍗曞彿
-const purchaseNo = ref('');
-
-//鎵撳紑鎶藉眽
-const openDrawer = async (type: number, scope: any = {}, entozhExcell?: any) => {
- detailForm.value.Page = 1; //bug:鐐圭紪杈�-鍐嶇偣璇︽儏
- detailForm.value.PageSize = 10; //bug:鐐圭紪杈�-鍐嶇偣璇︽儏
- if (scope.packageCode) {
- title.value = `${scope.packageCode}`;
- }
- drawerType.value = 'drawerAll';
- drawerVisible.value = true;
- //褰撳墠鍏ュ簱鍗曞彿id
- detailForm.value.poId = scope.id;
- //鍏ュ簱鍗�
- purchaseNo.value = scope.packageCode;
- debugger;
- detailForm.value.poId = scope.id;
- //鑾峰彇鐗╂枡鍒楄〃
- if (detailForm.value.poId == '') {
- drawerList.value = [];
- detailCount.value = 0;
- return;
- }
- //------------------鑾峰彇鐗╂枡鍒楄〃鐗╂枡鏄庣粏
- getDetail();
- //------------------鑾峰彇鐗╂枡鍒楄〃鐗╂枡鏄庣粏
- 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));
- // scopetrans.totalquantity = Number(scopetrans.totalquantity).toFixed(3);
- nextTick(() => {
- scopetrans.poStatus = getEnumDesc(scopetrans.poStatus, getEnumPoDetailStatusData_Index.value);
- scopetrans.businessType = getEnumDesc(scopetrans.businessType, getBusinessTypeData_Index.value);
- scopetrans.orderType = getEnumDesc(scopetrans.orderType, getEnumOrderTypeData_Index.value);
- proxy.$refs['propDetailRef'].openADialog(scopetrans, entozhExcell);
- });
-};
-
-//鍏抽棴鎶藉眽
-const handleDrawerClose = () => {
- detailForm.value = {
- poId: '',
- materialCode: '',
- Page: 1,
- PageSize: 10,
- };
- deltailList.value = [];
- detailCount.value = 0;
- drawerList.value = [];
- detailCount.value = 0;
-};
-
-//鐗╂枡璇︽儏绫诲瀷
-interface DetailType {
- id: number;
-}
-
-//鍏ュ簱鍗曡鎯呭垪琛�
-const deltailList = ref<DetailType[]>([]);
-//寮瑰嚭灞傛暟鎹�
-const drawerList = ref<DetailType[]>([]);
-
-//鍏ュ簱鍗曡鎯呭垪琛ㄦ暟鎹潯鏁�
-const detailCount = ref(0);
-
-//寮瑰嚭灞傛爣棰�
-let title = ref('');
-//鑾峰彇鍏ュ簱鍗曚笅鐗╂枡璇︽儏
-const getDetail = async (callback?: any) => {
- loading.value = true;
-
- var res = await pageWmsOrderPurchaseDetails(Object.assign(detailForm.value));
- if (callback == 1) {
- //缂栬緫鍏ュ彛
- warehousOrderDetails.value = res.data.result?.items ?? [];
- detailCount.value = res.data.result?.total;
- } else {
- drawerList.value = res.data.result?.items ?? [];
- detailCount.value = res.data.result?.total;
- }
- loading.value = false;
-};
-// ----------------鏂板銆佺紪杈�-------------------------------
-//绐楀彛绫诲瀷
-const dialogType = ref('add');
-
-const dialogVisible = ref(false);
-
-//娣诲姞缂栬緫琛ㄥ崟ref
-const dialogRef = ref();
-
-//娣诲姞/缂栬緫鍙傛暟
-let addForm = ref({
- createdTime: '',
- updatedTime: '',
- createdUserName: '',
- createdUserId: '',
- purchaseNo: '',
- purchaserUserId: 0,
- basicExpressInfoCode: null,
- materialType: '', //5
- status: 0,
- supplierCode: '',
- supplierName: '',
- remark: '',
- deliveryType: 1,
- EstimatedDate: '',
- purchaseOrderDetails: [] as any[],
- dI_NO: '',
- sJ_NO: '',
- machineToolTypeName: '',
- machineToolNo: '',
- freeOrderType: '',
-});
-
-//rules
-const formRules = {
- businessType: [{ required: true, message: '璇烽�夋嫨涓氬姟绫诲瀷锛�', trigger: 'change' }],
- supplierCode: [{ required: true, message: '璇疯緭鍏ヤ緵搴斿晢锛�', trigger: 'blur' }],
- purchaseNo: [{ required: true, message: '璇疯緭鍏O鍗曞彿锛�', trigger: 'blur' }],
- orderTypeName: [{ required: true, message: '璇疯緭鍏ヨ鍗曠被鍨嬪悕绉帮紒', trigger: 'blur' }],
-};
-//鎵撳紑鏂板銆佺紪杈戠獥鍙�
-const openDialog = async (type: number, scope: any = {}) => {
- handleQueryTdp();
- getEnumOrderTypeData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('OrderTypeEnum')).data.result ?? [];
- getBusinessTypeData_Index.value = await handleSlectDataWmsBusinessType(moveType); //涓嬫媺璇诲彇涓氬姟绫诲瀷鎺ュ彛 create by liuwq
- getEnumPoStatusData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('OrderStatusEnum')).data.result ?? [];
-
- getEnumDockData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('DockEnum')).data.result ?? [];
-
- if (type == 1) {
- detailForm.value.PageSize = 10;
- dialogType.value = 'add';
- } else {
- dialogType.value = 'edit';
- detailForm.value.PageSize = 1000;
- addForm.value = { ...scope };
-
- console.log(addForm.value);
- detailForm.value.poId = scope.id;
- //鑾峰彇鐗╂枡 - 鍥炶皟鍑芥暟鏇挎崲瀹氭椂鍣�
-
- //------------------鑾峰彇鐗╂枡鍒楄〃鐗╂枡鏄庣粏
- getDetail(1);
- //----------------鐗╂枡鏄庣粏
- }
- dialogVisible.value = true;
- load.value = false;
- //娓呴櫎閫変腑椤�
- nextTick(() => {
- if (dialogRef.value) {
- dialogRef.value.clearValidate();
- }
- });
-};
-
-//鐗╂枡璇︽儏鐨則able ref
-const detailRef = ref();
-const setRowKey = (row: any) => {
- return row.id + row.poLineNumber;
-};
-//鍏抽棴绐楀彛
-const closeDialog = () => {
- load.value = false;
- addForm.value = {
- createdTime: '',
- updatedTime: '',
- createdUserName: '',
- createdUserId: '',
- purchaseNo: '',
- purchaserUserId: 0,
- basicExpressInfoCode: null,
- materialType: '', //5
- status: 0,
- supplierCode: '',
- supplierName: '',
- remark: '',
- deliveryType: 1,
- EstimatedDate: '',
- purchaseOrderDetails: [] as any[],
- dI_NO: '',
- sJ_NO: '',
- machineToolTypeName: '',
- machineToolNo: '',
- freeOrderType: '',
- };
- warehousOrderDetails.value = [];
- checkedDetails.value = [];
- deltailList.value = [];
- detailCount.value = 0;
- detailRef.value.clearSelection();
-};
-
-//娣诲姞缂栬緫绐楀彛鐗╂枡鍒楄〃
-const warehousOrderDetails = ref<any[]>([]);
-
-//鐗╂枡璇︽儏鍒楄〃閫変腑鐨勭墿鏂�
-const checkedDetails = ref<any[]>([]);
-
-//鐗╂枡璇︽儏鍒楄〃涓嬀閫変簨浠�
-const detailsCheckChange = (val: any) => {
- checkedDetails.value = val;
-};
-
-//鍒犻櫎閫変腑鐨勭墿鏂欒鎯�
-const delCheckedDetails = () => {
- ElMessageBox.confirm('鏄惁纭鍒犻櫎锛�', '鎻愮ず', {
- confirmButtonText: '纭',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- })
- .then(() => {
- let arr = [];
- if (checkedDetails.value[0].diRelationID) {
- checkedDetails.value.forEach((item) => {
- console.log(item);
- let index = warehousOrderDetails.value.findIndex((detail) => detail.code == item.code && detail.diRelationID == item.diRelationID);
- if (index > -1) {
- warehousOrderDetails.value.splice(index, 1);
- }
- });
- } else {
- checkedDetails.value.forEach((item) => {
- let index = warehousOrderDetails.value.findIndex((detail) => detail.code == item.code && detail.poLineNumber == item.poLineNumber);
- warehousOrderDetails.value.splice(index, 1);
- });
- }
- arr = warehousOrderDetails.value;
- warehousOrderDetails.value = [];
- //bug 鐩稿悓鐗╂枡 涓嶅悓Bom
- nextTick(() => {
- warehousOrderDetails.value = arr;
- checkedDetails.value = [];
- detailRef.value.clearSelection();
- });
- })
- .catch(() => ElMessage.info('宸插彇娑堝垹闄�'));
-};
-
-const load = ref(false);
-//缂栬緫銆佹坊鍔犳彁浜�
-const confirm = () => {
- dialogRef.value.validate(async (vali: any) => {
- if (vali) {
- console.log('纭');
- if (warehousOrderDetails.value.length < 0) {
- ElMessage.warning('璇烽�夋嫨鐗╂枡');
- return;
- }
- let idx = warehousOrderDetails.value.findIndex((v) => v.poLineNumber == '' || v.poLineNumber == undefined);
- if (idx > -1) {
- ElMessage.warning('璇疯緭鍏ヨ鍙�');
- return;
- }
- let isNext = '';
- warehousOrderDetails.value.forEach((item) => {
- const arr: any = warehousOrderDetails.value.filter((detail) => detail.poLineNumber == item.poLineNumber);
- if (arr.length > 1) {
- isNext = `琛屽彿锛�${arr[0].poLineNumber}涓嶈兘鐩稿悓`;
- return;
- }
- });
- if (isNext != '') {
- ElMessage.warning(isNext);
- return;
- }
-
- let idx2 = warehousOrderDetails.value.findIndex((v) => v.quantity == '' || v.quantity == undefined || v.quantity <= 0);
- if (idx2 > -1) {
- ElMessage.warning('鏁伴噺涓嶅悎瑙勮寖锛�');
- return;
- }
- addForm.value.purchaseOrderDetails = [];
- warehousOrderDetails.value.forEach((item) => {
- const obj = {
- poId: item.poId || 0,
- materialCode: item.materialCode,
- materialName: item.materialName,
- id: item.id || '',
- quantity: item.quantity,
- barNo: item.barNo,
- remark: addForm.value.remark,
- poLineNumber: item.poLineNumber,
- materialType: item.deliveryType,
- clientCode: item.diCustomCode || '',
- clientChinaName: item.diCustomChinaName || '',
- plannedStartTime: item.plannedStartTime,
- plannedEndTime: item.plannedEndTime,
- projectNo: item.projectNo,
- erpCode: item.erpCode,
- supplierBatch: item.supplierBatch,
- unit: item.unit,
- };
- addForm.value.purchaseOrderDetails.push(obj);
- });
- load.value = true;
- //娣诲姞
- if (dialogType.value == 'add') {
- load.value = true;
- let res = await addWmsOrderPurchase(addForm.value);
- if (res.data && res.data.code == 200) {
- ElMessage.success('娣诲姞鎴愬姛');
- dialogVisible.value = false;
- emits('getTabelData');
- }
- load.value = false;
- } else {
- load.value = true;
- let res = await updateWmsOrderPurchase(addForm.value);
- if (res.data && res.data.code == 200) {
- ElMessage.success('缂栬緫鎴愬姛');
- dialogVisible.value = false;
- emits('getTabelData');
- }
- load.value = false;
- }
- } else {
- ElMessage.warning('琛ㄥ崟楠岃瘉澶辫触');
- }
- });
-};
-// -----------------娣诲姞鐗╂枡鎿嶄綔-------------------------
-//鐗╂枡鍩虹鏁版嵁绐楀彛
-const addMaterialVisible = ref(false);
-
-//鐗╂枡鍩虹鏁版嵁鍒楄〃
-const materialList = ref([]);
-
-//鐗╂枡鍩虹鏁版嵁鏉℃暟
-const materialTotal = ref(0);
-
-//鐗╂枡鍩虹鏁版嵁form
-const materialForm = ref({
- MaterialTypeId: '',
- Code: '',
- MaterialCode: '',
- // MaterialType: 1,
- Page: 1,
- PageSize: 10,
-});
-
-//鑾峰彇鐗╂枡鍩虹鍒楄〃
-const getMaterialList = async () => {
- loading.value = true;
- // var res = await pageWmsMaterial(Object.assign(queryParams.value, tableParams.value));
- var res = await pageWmsMaterial(Object.assign(materialForm.value));
-
- materialList.value = res.data.result?.items ?? [];
- //tableParams.value.total = res.data.result?.total;
- materialTotal.value = res.data.result?.total;
- loading.value = false;
-};
-
-//閲嶇疆鐗╂枡
-const resetMaterialForm = () => {
- materialForm.value = {
- MaterialTypeId: '',
- Code: '',
- MaterialCode: '',
- Page: 1,
- // MaterialType: 1,
- PageSize: 10,
- };
- getMaterialList();
-};
-
-//閫変腑鐨勫熀纭�鐗╂枡鏁版嵁
-const checkedMaterial = ref<any[]>([]);
-
-//鐗╂枡鍩虹鏁版嵁鍕鹃��
-const materialSelectionChange = (val: any) => {
- checkedMaterial.value = val;
-};
-
-//鎵撳紑鏂板鐗╂枡绐楀彛
-const addMaterialDialog = () => {
- // if ( addForm.value.freeOrderType && isShowBomBtn.value ) {
- // ElMessage.warning("鍏嶈垂浠剁被鍨嬫槸PR2锛屽彧鑳芥柊澧濪I缁存姢鐨勭墿鏂欙紒");
- // return;
- // }
- getMaterialList();
- addMaterialVisible.value = true;
-};
-
-//鍩虹鐗╂枡table鐨剅ef瀵硅薄
-const materialRef = ref();
-
-//纭娣诲姞鏉愭枡
-const confirmAddMaterial = () => {
- //鐗╂枡鍒楄〃娌℃暟鎹紝鐩存帴娣诲姞
- if (warehousOrderDetails.value.length == 0) {
- // 鑷姩缁欒鍙峰鍊�
- checkedMaterial.value.forEach((item, index) => {
- item.unit = item.poUnit;
- if (!item.poLineNumber) {
- item.poLineNumber = index + 1 + warehousOrderDetails.value.length;
- }
- });
-
- warehousOrderDetails.value.push(...checkedMaterial.value);
- } else {
- for (let i = 0; i < checkedMaterial.value.length; i++) {
- let idx = warehousOrderDetails.value.findIndex(
- (item: { poLineNumber: any; code: any }) => item.code == checkedMaterial.value[i].code && item.poLineNumber == checkedMaterial.value[i].poLineNumber
- );
- if (idx > -1) {
- return ElMessage.warning(`鐗╂枡缂栧彿${checkedMaterial.value[i].code}锛岃鍙凤細${checkedMaterial.value[i].poLineNumber || ''}鍦ㄧ墿鏂欏垪琛ㄤ腑宸插瓨鍦�,璇峰幓闄ゅ嬀閫塦);
- }
- }
-
- // 鑷姩缁欒鍙峰鍊�
- checkedMaterial.value.forEach((item, index) => {
- item.unit = item.poUnit;
- if (!item.poLineNumber) {
- item.poLineNumber = index + 1 + warehousOrderDetails.value.length;
- }
- });
- warehousOrderDetails.value.push(...checkedMaterial.value);
- }
-
- addMaterialVisible.value = false;
-};
-
-//鍏抽棴鏂板鐗╂枡绐楀彛
-const closeMaterialDialog = () => {
- materialForm.value = {
- MaterialTypeId: '',
- Code: '',
- Page: 1,
- // MaterialType: 1,
- PageSize: 10,
- };
- materialList.value = [];
- checkedMaterial.value = [];
- materialRef.value.clearSelection();
-};
-
-// 椤甸潰鍔犺浇鏃�
-onMounted(async () => {});
-
-//================
-const arrTdp = ref<any[]>([]);
-const queryParamsW = ref<any>({});
-const tableParamsW = ref({
- page: 1,
- pageSize: 200,
- total: 0,
- custType: '渚涘簲鍟�',
-});
-
-//-----------------杩滅▼鎼滅储----------------
-const handleQueryTdp = async () => {
- var res = await pageBaseCustomer(Object.assign(queryParamsW.value, tableParamsW.value));
- arrTdp.value = res.data.result?.items ?? [];
-};
-const changeXmbh = async (query?: any) => {
- loading.value = true;
- var res = await pageBaseCustomer({
- page: 1,
- pageSize: 200,
- custCode: query,
- custType: '渚涘簲鍟�',
- });
- loading.value = false;
- arrTdp.value = res.data.result?.items ?? [];
-};
-// 杩滅▼鎼滅储 杈撳叆鍏抽敭瀛椾互浠庤繙绋嬫湇鍔″櫒涓煡鎵炬暟鎹��
-const remoteMethod = async (query: string) => {
- loading.value = true;
- var res = await pageBaseCustomer({
- page: 1,
- pageSize: 200,
- custCode: query,
- custType: '渚涘簲鍟�',
- });
- loading.value = false;
- arrTdp.value = res.data.result?.items ?? [];
-};
-//-----------------杩滅▼鎼滅储----------------
-
-const printDialogRefTestStudent = ref();
-const printTestStudentTitle = ref('');
-//鎵撳嵃
-const getPrint = async (row?: any) => {
- printTestStudentTitle.value = '鎵撳嵃';
- var res = await getAPI(SysPrintApi).apiSysPrintPrintNameGet('娴嬭瘯鎵撳嵃妯＄増');
- var printTemplate = res.data.result as SysPrint;
- var template = JSON.parse(printTemplate.template);
- var resList = await listWmsOrderPurchaseDetails(detailForm.value);
- var printData = resList.data.result || [];
- printData.forEach((item: any, index?: any) => {
- item.no = index + 1;
- });
- //鎵撳嵃鏁版嵁
- var row: any = {
- text1: title.value, //鍗曞彿
- table: printData, //琛ㄦ牸鏁版嵁
- };
- printDialogRefTestStudent.value.showDialog(new hiprint.PrintTemplate({ template: template }), row, template.panels[0].width);
-};
-
-// 鏆撮湶鏂规硶
-defineExpose({ openDialog, openDrawer });
-</script>
-<style lang="less" scoped>
-.detailBoxWrap {
- margin: 10px;
-}
-
-.msi-form {
- margin-top: 10px;
-}
-.msi-form {
- margin-bottom: 10px;
-}
-.slot_title {
- display: flex;
- align-items: center;
- // margin-left: 20px;
- .title_orderNo {
- font-size: 18px;
- color: #f18201;
- font-weight: bold;
- margin-right: 5px;
- }
-}
-</style>
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderPurchase/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderPurchase/index.vue
deleted file mode 100644
index 14310c0..0000000
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/wmsOrderPurchase/index.vue
+++ /dev/null
@@ -1,517 +0,0 @@
-<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-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="PO鍗曞彿">
- <el-input v-model="queryParams.purchaseNo" clearable="" placeholder="璇疯緭鍏O鍗曞彿" />
- </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-select clearable="" v-model="queryParams.businessType" placeholder="璇烽�夋嫨涓氬姟绫诲瀷">
- <el-option v-for="(item, index) in getBusinessTypeData_Index" :key="index" :value="item.businessTypeValue" :label="`[${item.businessTypeValue}] ${item.businessTypeName}`" />
- </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-select clearable="" v-model="queryParams.orderSocure" placeholder="璇烽�夋嫨鍗曟嵁鏉ユ簮">
- <el-option v-for="(item, index) in getEnumOrderSocureData_Index" :key="index" :value="item.describe" :label="`${item.describe}`" />
- </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-select clearable="" v-model="queryParams.poStatus" placeholder="璇烽�夋嫨鍗曟嵁鐘舵��">
- <el-option v-for="(item, index) in getEnumPoStatusData_Index" :key="index" :value="item.value" :label="`${item.describe}`" />
- </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
- v-model="queryParams.supplierCode"
- filterable
- remote
- reserve-keyword
- remote-show-suffix
- :remote-method="remoteMethod"
- :loading="loading"
- placeholder="璇烽�夋嫨渚涘簲鍟�"
- clearable
- style="width: 100%"
- @change="changeXmbh(queryParams.supplierCode)"
- >
- <el-option v-for="(item, index) in arrTdp" :key="index" :value="item.custCode" :label="`[${item.custCode}]${item.custChinaName}`"></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="渚涘簲鍟嗗悕绉�">
- <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 :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-group>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- </el-card>
- <el-card class="full-table" shadow="hover" style="margin-top: 5px">
- <div class="table-container">
- <!-- 宸︿晶琛ㄦ牸 -->
- <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-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>
- <template #default="scope">
- <span class="under_line" @click="openDrawer(1, scope.row)">
- {{ scope.row.packageCode }}
- </span>
- </template>
- </el-table-column>
-
- <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 class="right-table">
- <p class="text-xtiny">涓嶉綈鍖呭垪琛�</p>
- <el-table
- :data="newTableData"
- style="width: 100%"
- v-loading="loading"
- tooltip-effect="light"
- ref="newTableRef"
- row-key="newId"
- @sort-change="newSortChange"
- :summary-method="getNewExportTitle"
- 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>
- <template #default="scope">
- <span class="under_line" @click="openDrawer(1, scope.row)">
- {{ scope.row.packageCode }}
- </span>
- </template>
- </el-table-column>
- <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>
- </el-card>
-
- <editDialogWmsOrderDeliver ref="editDialogRefWmsOrderDeliver" :title="editWmsOrderDeliverTitle" @reloadTable="handleQuery" />
- <importExcelDialog
- ref="importExcelDialogRefWmsOrderDeliver"
- :title="importExcelTitleWmsOrderDeliver"
- @parentUploadFun="handleImportExcelWmsOrderDeliver"
- @parentDownFun="handleDownExcelWmsOrderDeliver"
- />
- <!-- 鎵�鏈夊脊妗� 锛氭柊澧� 缂栬緫 璇︽儏 -->
- <open-allprop titleAuthor="1" hexiao="0" ref="propALlProp" @getTabelData="handleQuery"></open-allprop>
- </div>
-</template>
-
-<script lang="ts" setup="" name="wmsOrderPurchase">
-import { getCurrentInstance, nextTick, 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';
-import { formatDate, formatDate_T_Date, formatDate_T_Time, defaultTimeRange } from '/@/utils/formatTime';
-import { pageBaseCustomer } from '/@/api/main/WmsBase/baseCustomer';
-import { formatUtcToData, getTypeStatus } from '/@/utils/formate';
-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,
-} from '/@/api/main/WmsOrder/wmsOrderPurchase';
-import { handleSlectDataWmsBusinessType } from '/@/utils/selectData';
-import { getAPI } from '/@/utils/axios-utils';
-import { SysEnumApi } from '/@/api-services/api';
-import commonFunction from '/@/utils/commonFunction';
-import importExcelDialog from '/@/components/importExcel/index.vue'; //寮曞叆瀵煎叆缁勪欢
-import { exportPageExcel } from '/@/utils/exportPageExcel'; //寮曞叆瀵煎嚭鏂规硶
-import OpenAllprop from './component/openAllprop.vue';
-import { ExcellTableDataExport } from '/@/hooks/exportTableDataExcell';
-const { proxy }: any = getCurrentInstance(); // 璁块棶瀹炰緥涓婁笅鏂� proxy鍚屾椂鏀寔寮�鍙� 绾夸笂鐜
-const moveType = 10; //绉诲姩绫诲瀷 鍏ュ簱
-// ------------灏佽瀵煎嚭鍔熻兘--鍓嶇瀵煎嚭+琛ㄦ牸鏍囬---------------
-const jsonExcellTableExport = {
- titleName: '', //瀵煎嚭琛ㄦ牸鍚嶇О
- interfaceListName: '', //瀵煎嚭鎺ュ彛鍚嶇О
-};
-const { getExportTitle, handleExportExcell, formExport, entozhExcell } = ExcellTableDataExport(jsonExcellTableExport);
-// --------------end 灏佽瀵煎嚭鍔熻兘--鍓嶇瀵煎嚭+琛ㄦ牸鏍囬-----------------
-// ---------------鏂板-----------------------
-const showProp = (item?: any) => {
- if (item == 1) {
- proxy.$refs['propALlProp'].openDialog(1);
- } else {
- proxy.$refs['propALlProp'].openDialog(2, item);
- }
-};
-// ---------------璇︽儏-----------------------
-const openDrawer = (type: number, item?: any) => {
- proxy.$refs['propALlProp'].openDrawer(type, item, entozhExcell);
-};
-// ---------------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>([]);
-
-const { getEnumDesc } = commonFunction();
-
-const getEnumOrderSocureData_Index = ref<any>([]);
-
-const showAdvanceQueryUI = ref(false);
-const printDialogRef = ref();
-const editDialogRef = ref();
-const loading = ref(false);
-const tableData = ref<any>([]);
-const queryParams = ref<any>({});
-const tableParams = ref({
- page: 1,
- pageSize: 10,
- total: 0,
-});
-
-const printWmsOrderPurchaseTitle = ref('');
-const editWmsOrderPurchaseTitle = ref('');
-
-// 鏀瑰彉楂樼骇鏌ヨ鐨勬帶浠舵樉绀虹姸鎬�
-const changeAdvanceQueryUI = () => {
- showAdvanceQueryUI.value = !showAdvanceQueryUI.value;
-};
-
-const newTableData = ref([]);
-
-const fetchNewTableData = async () => {
- loading.value = true;
- try {
- const response = await fetch('your-api-endpoint'); // 鏇挎崲涓烘偍鐨凙PI鍦板潃
- const data = await response.json();
- newTableData.value = data;
- } catch (error) {
- console.error('鑾峰彇鏂拌〃鏁版嵁閿欒:', error);
- } finally {
- loading.value = false;
- }
-};
-
-const newSortChange = ({ prop, order }) => {
- console.log(`鎺掑簭瀛楁: ${prop}, 鎺掑簭椤哄簭: ${order}`);
- // 澶勭悊鎺掑簭閫昏緫
-};
-
-const openNewDrawer = (type, row) => {
- console.log('鎵撳紑鏂扮殑鎶藉眽锛岀被鍨�:', type, ', 鏁版嵁:', row);
-};
-
-const getNewExportTitle = () => {
- return '鏂拌〃鏍煎鍑烘爣棰�';
-};
-
-// 鏌ヨ鎿嶄綔
-const handleQuery = async () => {
- loading.value = true;
- var res = await pageWmsOrderPurchase(Object.assign(queryParams.value, tableParams.value));
- tableData.value = res.data.result ?? [];
-
- newTableData.value = res.data.result ?? [];
-
- // tableParams.value.total = res.data.result?.total;
- loading.value = false;
- // getEnumOrderTypeData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('OrderTypeEnum')).data.result ?? [];
-
- // getEnumPoStatusData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('OrderStatusEnum')).data.result ?? [];
-};
-
-// 鍒楁帓搴�
-const sortChange = async (column: any) => {
- queryParams.value.field = column.prop;
- queryParams.value.order = column.order;
- await handleQuery();
-};
-
-// 鎵撳紑鏂板椤甸潰
-const openAddWmsOrderPurchase = () => {
- editWmsOrderPurchaseTitle.value = '娣诲姞PO鍗�';
- editDialogRef.value.openDialog({});
-};
-
-// 鎵撳紑鎵撳嵃椤甸潰
-const openPrintWmsOrderPurchase = async (row: any) => {
- printWmsOrderPurchaseTitle.value = '鎵撳嵃PO鍗�';
-};
-
-// 鎵撳紑缂栬緫椤甸潰
-const openEditWmsOrderPurchase = (row: any) => {
- editWmsOrderPurchaseTitle.value = '缂栬緫PO鍗�';
- editDialogRef.value.openDialog(row);
-};
-
-// 鍒犻櫎
-const delWmsOrderPurchase = (row: any) => {
- ElMessageBox.confirm(`纭畾瑕佸彇娑堝悧?`, '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- })
- .then(async () => {
- await deleteWmsOrderPurchase(row);
- handleQuery();
- ElMessage.success('鍙栨秷鎴愬姛');
- })
- .catch(() => {});
-};
-
-// 鏀瑰彉椤甸潰瀹归噺
-const handleSizeChange = (val: number) => {
- tableParams.value.pageSize = val;
- handleQuery();
-};
-
-// 鏀瑰彉椤电爜搴忓彿
-const handleCurrentChange = (val: number) => {
- tableParams.value.page = val;
- handleQuery();
-};
-
-// 鏍规嵁businessTypeValue鑾峰彇businessTypeName
-const getBusinessTypeByValue = (key: any, itemLst: any) => {
- return itemLst.find((x: any) => x.businessTypeValue == key)?.businessTypeName;
-};
-
-handleQuery();
-
-//================
-const arrTdp = ref<any[]>([]);
-const queryParamsW = ref<any>({});
-const tableParamsW = ref({
- page: 1,
- pageSize: 200,
- total: 0,
- custType: '渚涘簲鍟�',
-});
-
-//-----------------杩滅▼鎼滅储----------------
-const handleQueryTdp = async () => {
- var res = await pageBaseCustomer(Object.assign(queryParamsW.value, tableParamsW.value));
- arrTdp.value = res.data.result?.items ?? [];
-};
-const changeXmbh = async (query?: any) => {
- loading.value = true;
- var res = await pageBaseCustomer({
- page: 1,
- pageSize: 200,
- custCode: query,
- custType: '渚涘簲鍟�',
- });
- loading.value = false;
- arrTdp.value = res.data.result?.items ?? [];
-};
-// 杩滅▼鎼滅储 杈撳叆鍏抽敭瀛椾互浠庤繙绋嬫湇鍔″櫒涓煡鎵炬暟鎹��
-const remoteMethod = async (query: string) => {
- loading.value = true;
- var res = await pageBaseCustomer({
- page: 1,
- pageSize: 200,
- custCode: query,
- custType: '渚涘簲鍟�',
- });
- loading.value = false;
- arrTdp.value = res.data.result?.items ?? [];
-};
-//-----------------杩滅▼鎼滅储----------------
-
-const getEnumDockData = ref<any>([]);
-
-onMounted(async () => {
- nextTick(async () => {
- // getBusinessTypeData_Index.value = await handleSlectDataWmsBusinessType(moveType); //涓嬫媺璇诲彇鎺ュ彛
- // getEnumDockData.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('DockEnum')).data.result ?? [];
- // getEnumOrderSocureData_Index.value = (await getAPI(SysEnumApi).apiSysEnumEnumDataListGet('SourceByEnum')).data.result ?? [];
- });
-});
-
-/***************************************************[DO鍗曟搷浣淽缁撴潫***************************************************/
-/***************************************************[DO鍗曞鍏寮�濮�***************************************************/
-const printWmsOrderDeliverTitle = ref('');
-const editWmsOrderDeliverTitle = ref('');
-const importExcelTitleWmsOrderDeliver = ref('');
-const importExcelDialogRefWmsOrderDeliver = ref();
-//鎵撳紑瀵煎叆鐣岄潰
-const openImportExcelWmsOrderDeliver = () => {
- importExcelTitleWmsOrderDeliver.value = '瀵煎叆PO鍗�';
- importExcelDialogRefWmsOrderDeliver.value.openDialog({});
-};
-//瀵煎叆鏁版嵁
-const handleImportExcelWmsOrderDeliver = async (formData: Blob) => {
- var result = await importExcelWmsOrderPurchase(formData);
- importExcelDialogRefWmsOrderDeliver.value.callBackUploadFun(result.data); //鍥炶皟瀵煎叆瀛愰〉闈㈢殑鏂规硶
- if (result.data.type == 'success') {
- handleQuery();
- }
-};
-//涓嬭浇瀵煎叆妯℃澘
-const handleDownExcelWmsOrderDeliver = async () => {
- var result = await downloadExcelTemplateWmsOrderPurchase();
- importExcelDialogRefWmsOrderDeliver.value.callBackDownFun(result); //鍥炶皟瀵煎叆瀛愰〉闈㈢殑鏂规硶
-};
-/***************************************************[DO鍗曞鍏缁撴潫***************************************************/
-/***************************************************[DO鍗曞鍑篯寮�濮�***************************************************/
-
-//瀵煎嚭
-const handExport = () => {
- downloadExcelTemplateWmsOrderPurchaseAll(queryParams.value).then((res) => {
- if (res.status == 200) {
- const link = document.createElement('a'); //鍒涘缓a鏍囩
- let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' }); // response灏辨槸鎺ュ彛杩斿洖鐨勬枃浠舵祦
- let objectUrl = URL.createObjectURL(blob);
- link.href = objectUrl;
- link.download = `PO鍗曞鍑�${formatUtcToData(new Date().toString(), 'YYYY-MM-DD hh:mm:ss')}`; // 鑷畾涔夋枃浠跺悕
- link.click(); // 涓嬭浇鏂囦欢
- URL.revokeObjectURL(objectUrl); // 閲婃斁鍐呭瓨
- }
- });
-};
-</script>
-<style scoped>
-:deep(.el-input),
-:deep(.el-select),
-:deep(.el-input-number) {
- width: 100%;
-}
-
-.under_line {
- color: #f18201;
- text-decoration: underline;
- cursor: pointer;
-}
-.table-container {
- display: flex; /* 浣跨敤 flexbox 甯冨眬 */
- justify-content: space-between; /* 琛ㄦ牸涔嬮棿淇濇寔闂磋窛 */
-}
-
-.table-container .left-table,
-.table-container .right-table {
- flex: 1; /* 浣挎瘡涓〃鏍煎崰鎹浉鍚屽搴� */
- margin-right: 10px; /* 瀹氫箟鍙充晶鐨勯棿璺� */
- width: 50%;
-}
-.text-xtiny {
- font-size: 14px;
- font-weight: 700;
- display: block;
- padding: 0 0 10px 0;
-}
-.table-container .right-table {
- margin-right: 0; /* 鏈�鍚庝竴涓〃鏍兼病鏈夊彸闂磋窛 */
-}
-</style>
--
Gitblit v1.9.3