From 4b2e89faeb6383335db4fc4a56d3cb71565abe08 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 26 11月 2024 17:42:24 +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/component/openAllprop.vue | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/component/openAllprop.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/component/openAllprop.vue
index 5113be7..56e8c87 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/component/openAllprop.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/packList/component/openAllprop.vue
@@ -258,11 +258,11 @@
</template>
</el-dialog>
<!-- 鍗曡鎯� -->
- <el-drawer v-model="drawerVisible" :title="`${detailForm.poId}鐗╂枡璇︽儏`" direction="rtl" size="80%" @close="handleDrawerClose">
+ <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>璇︽儏</div>
</div>
</template>
@@ -273,15 +273,20 @@
<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.packageCode" 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> -->
+ <!-- :disabled="checkRows.length == 0" -->
+ <el-button type="primary" style="margin-left: 5px" icon="ele-Printer" @click="handleHtmlPrint">
+ 鎵撳嵃
+ </el-button>
- <el-button type="primary" icon="ele-Printer" @click="getPrint">鎵撳嵃</el-button>
+
</el-form-item>
</el-col>
</el-row>
@@ -354,6 +359,11 @@
</el-dialog>
<printDialogTestStudent ref="printDialogRefTestStudent" :title="printTestStudentTitle" @reloadTable="handleQueryTestStudent" />
+
+
+ <!-- 鎵撳嵃 -->
+ <print-table-ckd ref="printTableRef"></print-table-ckd>
+
</div>
</template>
<script lang="ts" setup>
@@ -376,13 +386,13 @@
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 printTableCkd from '/@/components/printTableCkd.vue';
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>([]);
@@ -620,7 +630,7 @@
// const
//鍗曞彿
const purchaseNo = ref('');
-
+const IsPack = ref(false);
//鎵撳紑鎶藉眽
const openDrawer = async (type: number, scope: any = {}, entozhExcell?: any) => {
detailForm.value.Page = 1; //bug:鐐圭紪杈�-鍐嶇偣璇︽儏
@@ -634,6 +644,7 @@
detailForm.value.poId = scope.id;
//鍏ュ簱鍗�
purchaseNo.value = scope.packageCode;
+ IsPack.value = scope.isPack;
debugger;
detailForm.value.poId = scope.id;
//鑾峰彇鐗╂枡鍒楄〃
@@ -1129,6 +1140,15 @@
printDialogRefTestStudent.value.showDialog(new hiprint.PrintTemplate({ template: template }), row, template.panels[0].width);
};
+
+
+// 鎵撳嵃
+let itemSubTitle = ref<any[]>([]);
+const handleHtmlPrint = () => {
+ var title = IsPack.value==true?"榻愬寘娓呭崟":"缂哄寘娓呭崟";
+ proxy.$refs['printTableRef'].printHd(title, itemSubTitle.value, drawerList.value); //deltailList
+};
+
// 鏆撮湶鏂规硶
defineExpose({ openDialog, openDrawer });
</script>
--
Gitblit v1.9.3