From 1b6830d5f8671e48bdc13d7155b848aa938283f5 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周五, 29 11月 2024 15:53:16 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/index.vue | 73 +++++++++++++++++++++++++++---------
1 files changed, 54 insertions(+), 19 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/index.vue
index 346ab9f..1671ea0 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/index.vue
@@ -80,16 +80,17 @@
<el-input v-model="queryParams.projectNo" 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-Finished" @click="clickOut"> 寮哄埗鍑哄簱 </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>
@@ -112,7 +113,7 @@
</span>
</template>
</el-table-column>
-
+
<el-table-column prop="mesTotalCount" label="鎬绘暟" show-overflow-tooltip="" />
<el-table-column prop="count" label="宸叉湁鏁伴噺" show-overflow-tooltip="" />
@@ -140,8 +141,11 @@
row-key="newId"
@sort-change="newSortChange"
:summary-method="getNewExportTitle"
+ @selection-change="handleSelectionChange"
border=""
>
+ <el-table-column align="center" width="60" type="selection" />
+
<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>
@@ -151,7 +155,7 @@
</span>
</template>
</el-table-column>
-
+
<el-table-column prop="mesTotalCount" label="鎬绘暟" show-overflow-tooltip="" />
<el-table-column prop="count" label="宸叉湁鏁伴噺" show-overflow-tooltip="" />
<el-table-column prop="lackCount" label="缂哄皯鏁伴噺" show-overflow-tooltip="" />
@@ -169,8 +173,6 @@
</div>
</div>
</el-card>
-
-
<editDialogWmsOrderDeliver ref="editDialogRefWmsOrderDeliver" :title="editWmsOrderDeliverTitle" @reloadTable="handleQuery" />
<importExcelDialog
@@ -202,6 +204,7 @@
downloadExcelTemplateWmsOrderPurchase,
downloadExcelTemplateWmsOrderPurchaseAll,
packList,
+ ForceOutbound,
} from '/@/api/main/WmsOrder/wmsOrderPurchase';
import { handleSlectDataWmsBusinessType } from '/@/utils/selectData';
import { getAPI } from '/@/utils/axios-utils';
@@ -294,23 +297,22 @@
// 88888888鏌ヨ鎿嶄綔
const handleQuery = async () => {
loading.value = true;
- var res = await packList(Object.assign(queryParams.value, {
- ...tableParams.value,
- IsPack:true
- }));
+ 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
- }));
-
+ var res2 = await packList(
+ Object.assign(queryParams.value, {
+ ...tableParams.value,
+ IsPack: false,
+ })
+ );
newTableData.value = res2.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 ?? [];
};
// 鍒楁帓搴�
@@ -462,6 +464,39 @@
}
});
};
+
+//閫変腑鐨勮
+const checkRows = ref<{ id: number }[]>([]);
+
+// 閫夋嫨
+const handleSelectionChange = (val: any) => {
+ checkRows.value = val;
+};
+
+const clickOut = () => {
+ var PackageCodeList = checkRows.value.map((x: any) => x.packageCode);
+ if (PackageCodeList.length == 0) {
+ ElMessage.error('璇烽�夋嫨闇�瑕佸嚭搴撶殑璁㈠崟锛�');
+ return;
+ }
+ ElMessageBox.confirm('鏄惁纭寮哄埗鍑哄簱锛�', '鎻愮ず', {
+ confirmButtonText: '纭',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ })
+ .then(async () => {
+ loading.value = true;
+ var res = await ForceOutbound(
+ {
+ "PackageCodeList": PackageCodeList
+ }
+ );
+ handleQuery();
+ ElMessage.success('寮哄埗鍑哄簱鎴愬姛');
+ loading.value = false;
+ })
+ .catch(() => ElMessage.info('宸插彇娑�'));
+};
</script>
<style scoped>
:deep(.el-input),
--
Gitblit v1.9.3