From 1ecac2d4f21c7733d8c280fef7e3e3168a664026 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?=
 <9634538+git_rabbit@user.noreply.gitee.com>
Date: Thu, 21 Mar 2024 10:35:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=8A=A5=E8=A1=A8=EF=BC=9A?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD=20=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=8D=95=EF=BC=9A=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=E5=BA=93=E6=89=93=E5=8D=B0=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=88=E6=9C=AA=E5=85=A8=E9=83=A8=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +
 .../qualityManagement/qualityStatistics_V2.js |  16 +-
 src/components/Print/出库单.vue               | 276 ++++++++++++
 src/main.js                                   |   8 +-
 .../FQC/qualityStatistics.vue                 | 403 +++++++++++-------
 src/views/wmsManagement/WmOutOrder.vue        |  54 ++-
 vue.config.js                                 |   6 +-
 7 files changed, 593 insertions(+), 172 deletions(-)
 create mode 100644 src/components/Print/出库单.vue

diff --git a/package.json b/package.json
index 6daa693..c982727 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
+    "print-js": "^1.6.0",
     "quill": "1.3.7",
     "save": "^2.9.0",
     "screenfull": "4.2.0",
@@ -55,6 +56,7 @@
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.4.9",
     "vue-easytable": "^2.27.1",
+    "vue-qr": "^4.0.9",
     "vue-router": "3.4.9",
     "vue-seamless-scroll": "^1.1.23",
     "vuedraggable": "^2.20.0",
diff --git a/src/api/qualityManagement/qualityStatistics_V2.js b/src/api/qualityManagement/qualityStatistics_V2.js
index 9e9cb2a..d1a046f 100644
--- a/src/api/qualityManagement/qualityStatistics_V2.js
+++ b/src/api/qualityManagement/qualityStatistics_V2.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-
+// 获取首检表
 export function GetQualityStatisticsTable_first(query) {
     return request({
       url: 'mes/qc/statistics/queryQualityStatisticsTable_first',
@@ -7,7 +7,7 @@ export function GetQualityStatisticsTable_first(query) {
       params: query,
     })
   }
-
+//获取二检表
   export function GetQualityStatisticsTable_again(query) {
     return request({
       url: 'mes/qc/statistics/queryQualityStatisticsTable_again',
@@ -15,7 +15,7 @@ export function GetQualityStatisticsTable_first(query) {
       params: query,
     })
   }
-
+// 获取包装表
   export function GetQualityStatisticsTable_final(query) {
     return request({
       url: 'mes/qc/statistics/queryQualityStatisticsTable_final',
@@ -23,11 +23,19 @@ export function GetQualityStatisticsTable_first(query) {
       params: query,
     })
   }
-
+// 获取总表
   export function GetQualityStatisticsTable_total(query) {
     return request({
       url: 'mes/qc/statistics/queryQualityStatisticsTable_total',
       method: 'get',
       params: query,
     })
+  }
+  // 删除一条记录
+  export function deleteStatisticsTable(query) {
+    return request({
+      url: 'mes/qc/statistics/delete_statisticsTable',
+      method: 'get',
+      params: query,
+    })
   }
\ No newline at end of file
diff --git a/src/components/Print/出库单.vue b/src/components/Print/出库单.vue
new file mode 100644
index 0000000..6de99ff
--- /dev/null
+++ b/src/components/Print/出库单.vue
@@ -0,0 +1,276 @@
+<template>
+	<div>
+		<el-dialog v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" title="出库单打印" width="860px">
+			<div class="print" id="printDom" ref="printRef">
+				<div class="print-body-box">
+					<div class="title">出库单 {{ printData.shipmentNum }}</div>
+					<div class="line"></div>
+					<div class="info-box">
+						<div class="info-left">
+							<div>
+								<span>时间：{{ printData.year + '年' + printData.week + '周' + printData.date + '日' }}</span>
+							</div>
+							<div>
+								<span>客户编号：{{ printData.customNo }} </span>
+								<span>客户名称：{{ printData.customName }} </span>
+							</div>
+							<div>
+								<span>客户地址：{{ printData.customAddress }} </span>
+							</div>
+							<div>
+								<span>备注：{{ printData.remarks }} </span>
+							</div>
+						</div>
+						<div class="info-right qr">
+							<vue-qr :text="printData.shipmentNum" :size="100"></vue-qr>
+						</div>
+					</div>
+					<div class="line"></div>
+					<!-- 出库单计划物料列表 -->
+					<div class="table">
+						<div class="table-title">需求物料清单</div>
+						<table title="待出物料" align="center">
+							<thead>
+								<tr>
+									<th>物料号</th>
+									<th>描述</th>
+									<th>需求零件数</th>
+									<th>库存箱数</th>
+									<th>库存零件数</th>
+								</tr>
+							</thead>
+							<tbody>
+								<tr v-for="item in printData.materialList">
+									<td>{{ item.partnumber }}</td>
+									<td>{{ item.description }}</td>
+									<td>{{ item.requireOutNum }}</td>
+									<td>20</td>
+									<td>200</td>
+									<!-- <td>{{ item.stockQuantity }}</td>
+      						<td>{{ item.stockQuantity2 }}</td> -->
+								</tr>
+							</tbody>
+						</table>
+					</div>
+					<div class="line"></div>
+					<!-- 自定义排序列表 -->
+					<div class="table">
+						<div class="table-title">计划出库批次清单</div>
+						<table title="出库计划" align="center">
+							<thead>
+								<tr>
+									<th>批次号</th>
+									<th>物料号</th>
+									<th>所属仓库</th>
+									<th>批次箱数</th>
+									<th>批次零件数</th>
+									<th>需求零件数</th>
+									<th>批次时间</th>
+									<th>出库顺序</th>
+								</tr>
+							</thead>
+							<tbody>
+								<tr v-if="item.package_code_client !==null" v-for="item in printData.planlList">
+									<td>{{ item.package_code_client }}</td>
+									<td>{{ item.partnumber }}</td>
+									<td>{{ item.location_code }}</td>
+									<td>{{ item.count }}</td>
+									<td>{{ item.goods_num_action_count }}</td>
+									<td>{{ item.outhouse_num }}</td>
+									<td>{{ item.time }}</td>
+									<td>{{ item.sort }}</td>
+								</tr>
+								<tr v-else>
+									<td :colspan="8"><div class="line"></div></td>
+								</tr>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</div>
+			<div slot="footer">
+				<el-button @click="close">取消</el-button>
+				<el-button type="primary" @click="handelConfirm">确认打印</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+<script>
+import { getWmOutOrder } from '@/api/wmsManagement/wmOutOrder.js'
+import print from 'print-js'
+export default {
+	inheritAttrs: false,
+	components: {},
+	props: {
+		printKey: {
+			default: null,
+		},
+	},
+	data() {
+		return {
+			clearData: {},
+			// 待打印的数据
+			printData: {
+				shipmentNum: '',
+				customNo: '',
+				customName: '',
+				customAddress: '',
+				remarks: '',
+				year: 2000,
+				week: 0,
+				date: 0,
+				// 出货单需要物料列表
+				materialList: [],
+				// 出货单计划出货列表
+				planlList: [],
+			},
+		}
+	},
+	computed: {},
+	watch: {},
+	created() {
+		this.clearData = JSON.parse(JSON.stringify(this.printData))
+	},
+	mounted() {},
+	methods: {
+		onOpen() {
+			this.getPrintData()
+		},
+		onClose() {
+			this.printData = JSON.parse(JSON.stringify(this.clearData))
+		},
+		close() {
+			this.$emit('update:visible', false)
+		},
+		getPrintData() {
+			// 出库单主键
+			const getKey = this.printKey
+			if (getKey === null) {
+				this.$message('打印参数异常！', getKey)
+				return
+			}
+			getWmOutOrder(getKey).then((res) => {
+				const { code, data } = res
+				if (code == 200) {
+					this.printData = data
+					this.printData.planlList = [
+						{
+							package_code_client: 'BNW240318005',
+							partnumber: '26255122',
+							location_code: 'A1-01',
+							count: 15,
+							goods_num_action_count: 100,
+							outhouse_num: 100,
+							time: '240317',
+							sort: 1,
+						},
+						{
+							package_code_client: null,
+							partnumber: null,
+							location_code: null,
+							count: null,
+							goods_num_action_count: null,
+							outhouse_num: null,
+							time: null,
+							sort: null,
+						},
+						{
+							package_code_client: 'BNW240318006',
+							partnumber: '26372445',
+							location_code: 'A1-01',
+							count: 5,
+							goods_num_action_count: 50,
+							outhouse_num: 100,
+							time: '240318',
+							sort: 2,
+						},
+						{
+							package_code_client: 'BNW240318007',
+							partnumber: '26372445',
+							location_code: 'A1-01',
+							count: 5,
+							goods_num_action_count: 50,
+							outhouse_num: 100,
+							time: '240318',
+							sort: 3,
+						},
+					]
+				} else {
+					this.$message('打印参数异常！', getKey)
+				}
+			})
+		},
+		handelConfirm() {
+			this.$nextTick(() => {
+				printJS({
+					printable: 'printDom', // 标签元素id
+					type: 'html',
+					header: '',
+					targetStyles: ['*'],
+					font_size: '',
+					style: 'margin: 20px',
+				})
+			})
+		},
+	},
+}
+</script>
+<style scoped>
+#printDom {
+	border: 1px solid #000000;
+	padding: 10px;
+}
+.print-body-box {
+	margin: 0 auto;
+	width: 90%;
+	color: #000000;
+}
+.title {
+	width: 100%;
+	text-align: center;
+	font-size: 26px;
+	font-weight: 700;
+	margin-bottom: 10px;
+}
+.info-box {
+	width: 100%;
+	height: 120px;
+	font-size: 16px;
+	font-weight: 600;
+	display: flex;
+	align-items: center;
+}
+.info-left {
+	width: 80%;
+	display: flex;
+	flex-direction: column;
+}
+.info-right {
+	width: 20%;
+}
+.qr {
+	width: 100px;
+	height: 100px;
+	text-align: center;
+}
+.line {
+	height: 1px;
+	border-bottom: 1px solid #000000;
+}
+.table {
+	font-size: 16px;
+}
+.table-title {
+	margin: 5px;
+	width: 100%;
+	font-size: 18px;
+	font-weight: 600;
+	text-align: center;
+}
+table {
+	width: 100%;
+}
+tbody {
+	text-align: center;
+}
+</style>
diff --git a/src/main.js b/src/main.js
index 06edbc9..30bea92 100644
--- a/src/main.js
+++ b/src/main.js
@@ -38,6 +38,10 @@ import UploadFile from '@/components/FileUpload/index';
 // 字典数据组件
 import DictData from '@/components/DictData';
 
+// 二维码与打印组件相关 KrPrintDesigner+VueQr
+import VueQr from 'vue-qr'
+import printJS from 'print-js'
+
 
 
 // VXE-Table相关组件
@@ -85,7 +89,8 @@ Vue.component('DictTag', DictTag)
 Vue.component('Editor', Editor)
 Vue.component('UploadImage', UploadImage)
 Vue.component('UploadFile', UploadFile)
-
+Vue.component('VueQr', VueQr)
+// Vue.use(printJS);
 Vue.use(permission)
 Vue.use(plugins)
 Vue.use(Element, {
@@ -96,7 +101,6 @@ Vue.use(VXETable)
 
 Vue.use(dataV)
 Vue.use(AFTableColumn)
-
 DictData.install()
 
 Vue.config.productionTip = false
diff --git a/src/views/qualityManagement/FQC/qualityStatistics.vue b/src/views/qualityManagement/FQC/qualityStatistics.vue
index f8861a7..6036fbf 100644
--- a/src/views/qualityManagement/FQC/qualityStatistics.vue
+++ b/src/views/qualityManagement/FQC/qualityStatistics.vue
@@ -4,31 +4,45 @@
 		<div>
 			<el-form :model="search" inline size="mini" label-width="80px">
 				<el-form-item label="开始日期">
-					<el-date-picker :style="{width:inputWidth}" v-model="search.starttime" type="datetime" placeholder="选择日期时间" align="right" :picker-options="pickerOptions">
+					<el-date-picker
+						:style="{ width: inputWidth }"
+						v-model="search.starttime"
+						type="datetime"
+						placeholder="选择日期时间"
+						align="right"
+						:picker-options="pickerOptions"
+					>
 					</el-date-picker>
 				</el-form-item>
 				<el-form-item label="结束日期">
-					<el-date-picker :style="{width:inputWidth}" v-model="search.endtime" type="datetime" placeholder="选择日期时间" align="right" :picker-options="pickerOptions">
+					<el-date-picker
+						:style="{ width: inputWidth }"
+						v-model="search.endtime"
+						type="datetime"
+						placeholder="选择日期时间"
+						align="right"
+						:picker-options="pickerOptions"
+					>
 					</el-date-picker>
 				</el-form-item>
 				<el-form-item label="工单号">
-					<el-input v-model="search.workorderid" placeholder="输入工单号" :style="{width:inputWidth}"></el-input>
+					<el-input v-model="search.workorderid" placeholder="输入工单号" :style="{ width: inputWidth }"></el-input>
 				</el-form-item>
 				<el-form-item label="零件号">
-					<el-input v-model="search.partnumber" placeholder="输入零件号" :style="{width:inputWidth}"></el-input>
+					<el-input v-model="search.partnumber" placeholder="输入零件号" :style="{ width: inputWidth }"></el-input>
 				</el-form-item>
 				<el-form-item label="产品描述">
-					<el-input v-model="search.product_description" placeholder="输入产品描述" :style="{width:inputWidth}"></el-input>
+					<el-input v-model="search.product_description" placeholder="输入产品描述" :style="{ width: inputWidth }"></el-input>
 				</el-form-item>
 				<el-form-item label="班组">
-					<el-select v-model="search.team" placeholder="输入班组" :style="{width:inputWidth}">
+					<el-select v-model="search.team" placeholder="输入班组" :style="{ width: inputWidth }">
 						<el-option label="A班" value="A"> </el-option>
 						<el-option label="B班" value="B"> </el-option>
 						<el-option label="" value=""> </el-option>
 					</el-select>
 				</el-form-item>
 				<el-form-item label="报表类型">
-					<el-select v-model="search.reportType" placeholder="请选择" :style="{width:inputWidth}">
+					<el-select v-model="search.reportType" placeholder="请选择" :style="{ width: inputWidth }">
 						<el-option v-for="item in reportType_options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
 					</el-select>
 				</el-form-item>
@@ -38,18 +52,44 @@
 				</el-form-item>
 			</el-form>
 		</div>
-		<div style="width: 100%;display: flex;justify-content: flex-end;">
-			<pagination :pageSizes="[12,60,120,300]" :total="pagination.total" :page.sync="pagination.pageNum" :limit.sync="pagination.pageSize" @pagination="getList" />
+		<div style="width: 100%; display: flex; justify-content: flex-end">
+			<pagination
+				:pageSizes="[12, 60, 120, 300]"
+				:total="pagination.total"
+				:page.sync="pagination.pageNum"
+				:limit.sync="pagination.pageSize"
+				@pagination="getList"
+			/>
 		</div>
 		<div style="width: 100%">
-			<div style="font-size: 20px;text-align: center; margin 0 auto">{{ reportType_options[search.reportType].label }} 共 {{realTotal}} 条</div>
+			<div style="font-size: 20px;text-align: center; margin 0 auto">
+				{{ reportType_options[search.reportType].label }} 共 {{ realTotal }} 条
+			</div>
 		</div>
 		<!-- 表格部分 -->
-		<vxe-table border resizable show-overflow :header-cell-style="headerCellStyle" ref="xTable" :column-config="{ resizable: true }" :row-config="{ isHover: true,isCurrent:true,height:20 }" :loading="loading" :data="QualityStatisticsTable" :merge-cells="mergeCells" :cell-style="cellStyle" size="mini" align="center" max-height="800px" :export-config="{}">
+		<vxe-table
+			@menu-click="contextMenuClickEvent"
+			:menu-config="tableMenu"
+			border
+			resizable
+			show-overflow
+			:header-cell-style="headerCellStyle"
+			ref="xTable"
+			:column-config="{ resizable: true }"
+			:row-config="{ isHover: true, isCurrent: true, height: 20 }"
+			:loading="loading"
+			:data="QualityStatisticsTable"
+			:merge-cells="mergeCells"
+			:cell-style="cellStyle"
+			size="mini"
+			align="center"
+			max-height="800px"
+			:export-config="{}"
+		>
 			<vxe-colgroup title="订单信息" align="center" fixed="left">
 				<vxe-column field="workorderId" title="工单号" width="140px" sortable></vxe-column>
 				<vxe-column field="finishedPartNumber" title="零件号" min-width="120px" :show-overflow="false" sortable></vxe-column>
-				<vxe-column field="colour" title="颜色" min-width="120px" :show-overflow="false" sortable></vxe-column>
+				<vxe-column field="color" title="颜色" min-width="100px" :show-overflow="false" sortable></vxe-column>
 				<vxe-column field="productDescription" title="描述" min-width="100px" :show-overflow="false"></vxe-column>
 				<vxe-column field="requireNumber" title="生  产  投  入  数" min-width="60px"></vxe-column>
 				<vxe-column field="team" title="班次" sortable></vxe-column>
@@ -170,24 +210,24 @@
 				</vxe-column>
 			</vxe-colgroup>
 		</vxe-table>
-
 	</div>
 </template>
 
 <script>
-	import {
-		GetQualityStatisticsTable_first,
-		GetQualityStatisticsTable_again,
-		GetQualityStatisticsTable_final,
-		GetQualityStatisticsTable_total,
-	} from '@/api/qualityManagement/qualityStatistics_V2'
-	export default {
-		name: 'qualityStatistics',
-		data() {
-			return {
-				inputWidth: '180px',
-				pickerOptions: {
-					shortcuts: [
+import {
+	GetQualityStatisticsTable_first,
+	GetQualityStatisticsTable_again,
+	GetQualityStatisticsTable_final,
+	GetQualityStatisticsTable_total,
+	deleteStatisticsTable,
+} from '@/api/qualityManagement/qualityStatistics_V2'
+export default {
+	name: 'qualityStatistics',
+	data() {
+		return {
+			inputWidth: '180px',
+			pickerOptions: {
+				shortcuts: [
 					{
 						text: '今天',
 						onClick(picker) {
@@ -209,89 +249,113 @@
 							date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
 							picker.$emit('pick', date)
 						},
-					}, ],
-				},
-				search: {
-					starttime: new Date(new Date(new Date().toLocaleDateString()).getTime()),
-					endtime: new Date(new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1),
-					team: null,
-					workorderid: null,
-					partnumber: null,
-					reportType: 0,
-					product_description: '',
-				},
-				reportType_options: [
-					{ label: '首检报表', value: 0 },
-					{ label: '抛光报表', value: 1 },
-					{ label: '包装报表', value: 2 },
-					{ label: '总报表', value: 3 },
+					},
 				],
-				pagination: {
-					total: 0,
-					pageNum: 1,
-					pageSize: 60,
+			},
+			search: {
+				starttime: new Date(new Date(new Date().toLocaleDateString()).getTime()),
+				endtime: new Date(new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1),
+				team: null,
+				workorderid: null,
+				partnumber: null,
+				reportType: 0,
+				product_description: '',
+			},
+			reportType_options: [
+				{ label: '首检报表', value: 0 },
+				{ label: '抛光报表', value: 1 },
+				{ label: '包装报表', value: 2 },
+				{ label: '总报表', value: 3 },
+			],
+			pagination: {
+				total: 0,
+				pageNum: 1,
+				pageSize: 60,
+			},
+			realTotal: 0,
+			loading: false,
+			QualityStatisticsTable: [],
+			mergeCells: [
+				// { row: 0, col: 0, rowspan: 3, colspan: 0 },
+				// { row: 0, col: 1, rowspan: 3, colspan: 0 },
+				// { row: 0, col: 2, rowspan: 3, colspan: 0 },
+				// { row: 0, col: 3, rowspan: 3, colspan: 0 },
+				// { row: 0, col: 4, rowspan: 3, colspan: 0 },
+				// { row: 0, col: 5, rowspan: 3, colspan: 0 },
+				// { row: 0, col: 6, rowspan: 3, colspan: 0 },
+				// { row: 0, col: 7, rowspan: 3, colspan: 0 },
+				// { row: 0, col: 8, rowspan: 3, colspan: 0 },
+				// { row: 0, col: 9, rowspan: 3, colspan: 0 },
+				// { row: 0, col: 10, rowspan: 3, colspan: 0 },
+				// { row: 0, col: 11, rowspan: 3, colspan: 0 },
+			],
+			// 右键菜单
+			tableMenu: {
+				header: {
+					options: [
+						[
+							{ code: 'hideColumn', name: '隐藏列', disabled: false },
+							{ code: 'showAllColumn', name: '取消所有隐藏列', disabled: false },
+						],
+					],
 				},
-				realTotal: 0,
-				loading: false,
-				QualityStatisticsTable: [],
-				mergeCells: [
-					// { row: 0, col: 0, rowspan: 3, colspan: 0 },
-					// { row: 0, col: 1, rowspan: 3, colspan: 0 },
-					// { row: 0, col: 2, rowspan: 3, colspan: 0 },
-					// { row: 0, col: 3, rowspan: 3, colspan: 0 },
-					// { row: 0, col: 4, rowspan: 3, colspan: 0 },
-					// { row: 0, col: 5, rowspan: 3, colspan: 0 },
-					// { row: 0, col: 6, rowspan: 3, colspan: 0 },
-					// { row: 0, col: 7, rowspan: 3, colspan: 0 },
-					// { row: 0, col: 8, rowspan: 3, colspan: 0 },
-					// { row: 0, col: 9, rowspan: 3, colspan: 0 },
-					// { row: 0, col: 10, rowspan: 3, colspan: 0 },
-					// { row: 0, col: 11, rowspan: 3, colspan: 0 },
-				],
+				body: {
+					options: [
+						[
+							// { code: 'copy', name: '复制', prefixIcon: 'vxe-icon-copy', disabled: false },
+							// { code: 'reload', name: '刷新', disabled: false },
+							// { code: 'insertAt', name: '插入', disabled: false },
+							{ code: 'remove', name: '删除', disabled: false },
+							// { code: 'save', name: '保存', prefixIcon: 'vxe-icon-save', disabled: false },
+						],
+					],
+				},
+				visibleMethod: this.visibleMethod,
+			},
+		}
+	},
+	mounted() {
+		this.getList()
+	},
+	created() {},
+	methods: {
+		//todo  设置表合并行
+		mergeTable(num) {
+			this.mergeCells = []
+			for (let i = 0; i < this.QualityStatisticsTable.length; i = i + num) {
+				this.mergeCells.push({ row: i, col: 0, rowspan: num, colspan: 0 })
+				this.mergeCells.push({ row: i, col: 1, rowspan: num, colspan: 0 })
+				this.mergeCells.push({ row: i, col: 2, rowspan: num, colspan: 0 })
+				this.mergeCells.push({ row: i, col: 3, rowspan: num, colspan: 0 })
+				this.mergeCells.push({ row: i, col: 4, rowspan: num, colspan: 0 })
+				this.mergeCells.push({ row: i, col: 5, rowspan: num, colspan: 0 })
+				this.mergeCells.push({ row: i, col: 6, rowspan: num, colspan: 0 })
+				this.mergeCells.push({ row: i, col: 7, rowspan: num, colspan: 0 })
+				this.mergeCells.push({ row: i, col: 8, rowspan: num, colspan: 0 })
+				this.mergeCells.push({ row: i, col: 9, rowspan: num, colspan: 0 })
+				this.mergeCells.push({ row: i, col: 10, rowspan: num, colspan: 0 })
+				this.mergeCells.push({ row: i, col: 11, rowspan: num, colspan: 0 })
+				this.mergeCells.push({ row: i, col: 12, rowspan: num, colspan: 0 })
 			}
 		},
-		mounted() {
-			this.getList()
-		},
-		created() {},
-		methods: {
-			//todo  设置表合并行
-			mergeTable(num) {
-				this.mergeCells = []
-				for (let i = 0; i < this.QualityStatisticsTable.length; i = i + num) {
-					this.mergeCells.push({ row: i, col: 0, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 1, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 2, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 3, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 4, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 5, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 6, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 7, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 8, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 9, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 10, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 11, rowspan: num, colspan: 0 })
-					this.mergeCells.push({ row: i, col: 12, rowspan: num, colspan: 0 })
-				}
-			},
 
-			//todo 获取统计数据
-			getList() {
-				this.loading = true;
-				setTimeout(() => {
-					this.loading = false;
-				}, 30000)
-				let query = { ...this.search, ...this.pagination }
-				delete query['reportType']
-				delete query['total']
-				console.log('query', query)
-				switch (this.search.reportType) {
+		//todo 获取统计数据
+		getList() {
+			this.loading = true
+			setTimeout(() => {
+				this.loading = false
+			}, 30000)
+			let query = { ...this.search, ...this.pagination }
+			delete query['reportType']
+			delete query['total']
+			console.log('query', query)
+			switch (this.search.reportType) {
 				case 0:
 					GetQualityStatisticsTable_first(query).then((res) => {
 						if (res.code == 200) {
 							this.QualityStatisticsTable = res.data.item1
-							this.pagination.total = res.data.item2;
-							this.realTotal = parseInt(res.data.item2 / 3);
+							this.pagination.total = res.data.item2
+							this.realTotal = parseInt(res.data.item2 / 3)
 							this.mergeTable(3)
 							this.loading = false
 						}
@@ -301,8 +365,8 @@
 					GetQualityStatisticsTable_again(query).then((res) => {
 						if (res.code == 200) {
 							this.QualityStatisticsTable = res.data.item1
-							this.pagination.total = res.data.item2;
-							this.realTotal = parseInt(res.data.item2 / 2);
+							this.pagination.total = res.data.item2
+							this.realTotal = parseInt(res.data.item2 / 2)
 							this.mergeTable(2)
 							this.loading = false
 						}
@@ -312,8 +376,8 @@
 					GetQualityStatisticsTable_final(query).then((res) => {
 						if (res.code == 200) {
 							this.QualityStatisticsTable = res.data.item1
-							this.pagination.total = res.data.item2;
-							this.realTotal = parseInt(res.data.item2 / 2);
+							this.pagination.total = res.data.item2
+							this.realTotal = parseInt(res.data.item2 / 2)
 							this.mergeTable(2)
 							this.loading = false
 						}
@@ -323,56 +387,97 @@
 					GetQualityStatisticsTable_total(query).then((res) => {
 						if (res.code == 200) {
 							this.QualityStatisticsTable = res.data.item1
-							this.pagination.total = res.data.item2;
-							this.realTotal = parseInt(res.data.item2 / 2);
+							this.pagination.total = res.data.item2
+							this.realTotal = parseInt(res.data.item2 / 2)
 							this.mergeTable(2)
-							this.loading = false;
+							this.loading = false
 						}
 					})
 					break
-				}
-			},
-
-			//todo 设置表头颜色
-			headerCellStyle() {
-				return {
-					backgroundColor: '#2D3D51',
-					color: '#ffffff',
-					border: '1px solid #161823',
-					fontSize: '18px'
-				}
-			},
-
-			cellStyle() {
-				return {
-					border: '1px solid #161823',
-					fontSize: '16px',
-					fontWeight: '700'
-				}
-			},
-
-			//todo 导出excel
-			exportDataEvent() {
-				this.$refs.xTable.openExport()
-			},
-
-			// 合格率去除小数
-			offsetRate(num) {
-				if (num === null) {
-					return "";
-				}
-				return parseInt(num);
-			},
-			// 数据去除0
-			offsetValue(num) {
-				if (num === 0 || num === '0') {
-					return "";
-				}
-				return num;
 			}
 		},
-	}
+
+		//todo 设置表头颜色
+		headerCellStyle() {
+			return {
+				backgroundColor: '#2D3D51',
+				color: '#ffffff',
+				border: '1px solid #161823',
+				fontSize: '18px',
+			}
+		},
+
+		cellStyle() {
+			return {
+				border: '1px solid #161823',
+				fontSize: '16px',
+				fontWeight: '700',
+			}
+		},
+
+		//todo 导出excel
+		exportDataEvent() {
+			this.$refs.xTable.openExport()
+		},
+
+		// 合格率去除小数
+		offsetRate(num) {
+			if (num === null) {
+				return ''
+			}
+			return parseInt(num)
+		},
+		// 数据去除0
+		offsetValue(num) {
+			if (num === 0 || num === '0') {
+				return ''
+			}
+			return num
+		},
+		// 右键菜单
+		contextMenuClickEvent({ menu, row, column }) {
+			const $table = this.$refs.xTable
+			switch (menu.code) {
+				case 'hideColumn':
+					$table.hideColumn(column)
+					break
+				case 'showAllColumn':
+					$table.resetColumn()
+					break
+				case 'remove':
+					this.removeData(row)
+					// $table.remove(row)
+					break
+			}
+		},
+		// 删除数据
+		removeData(row) {
+			this.$confirm('此操作将永久删除该条记录, 是否继续?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			}).then(() => {
+				const deleteData = {
+					workorderid: row.workorderId,
+				}
+				deleteStatisticsTable(deleteData).then((res) => {
+					if (res.code === 200) {
+						this.$message({
+							type: 'success',
+							message: '删除成功!',
+						})
+						this.getList()
+					} else {
+						this.$message({
+							type: 'error',
+							message: '删除失败!请检查!',
+						})
+					}
+				})
+			})
+		},
+	},
+}
 </script>
 
-<style lang="scss" scoped>
-</style>
\ No newline at end of file
+<style lang="scss" scoped></style>
diff --git a/src/views/wmsManagement/WmOutOrder.vue b/src/views/wmsManagement/WmOutOrder.vue
index d1d2dbd..cdc35e3 100644
--- a/src/views/wmsManagement/WmOutOrder.vue
+++ b/src/views/wmsManagement/WmOutOrder.vue
@@ -25,10 +25,15 @@
 			<el-form-item label="周" prop="week">
 				<el-input v-model="queryParams.week" placeholder="请输入周" />
 			</el-form-item>
-
 			<el-form-item label="日" prop="date">
 				<el-input v-model="queryParams.date" placeholder="请输入日" />
 			</el-form-item>
+			<el-form-item label="出库单号" prop="shipmentNum">
+				<el-input v-model="queryParams.shipmentNum" placeholder="请输入周" />
+			</el-form-item>
+			<el-form-item label="客户代码" prop="customNo">
+				<el-input v-model="queryParams.customNo" placeholder="请输入周" />
+			</el-form-item>
 			<el-form-item>
 				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
 				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -91,7 +96,7 @@
 					<el-tag type="info" v-if="scope.row.type === 3">弃用</el-tag>
 				</template>
 			</el-table-column>
-			<el-table-column prop="status" label="显示状态" align="center">
+			<el-table-column prop="status" label="出库计划" align="center">
 				<template slot-scope="scope">
 					<el-tag type="success" v-if="scope.row.status === 1">启用</el-tag>
 					<el-tag type="info" v-if="scope.row.status === 0">停用</el-tag>
@@ -105,12 +110,12 @@
 			<el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" />
 			<el-table-column prop="createdTime" label="创建时间" align="center" :show-overflow-tooltip="true" />
 
-			<el-table-column label="操作" align="center" width="200">
+			<el-table-column label="操作" align="center" fixed="right" width="280">
 				<template slot-scope="scope">
 					<el-button
 						size="mini"
 						v-hasPermi="['business:wmoutorder:print']"
-						type="success"
+						type="primary"
 						icon="el-icon-printer"
 						title="打印"
 						:disabled="scope.row.status === 3"
@@ -132,6 +137,11 @@
 						title="删除"
 						@click="handleDelete(scope.row)"
 					></el-button>
+					<el-button
+						size="mini"
+						type="warning"
+						@click="handlePlan(scope.row)"
+					>出库计划</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -222,7 +232,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :lg="12">
-						<el-form-item label="显示状态" prop="status">
+						<el-form-item label="出库计划" prop="status">
 							<el-radio-group :disabled="form.type === 2" v-model="form.status">
 								<el-radio v-for="item in statusOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{
 									item.dictLabel
@@ -238,14 +248,14 @@
 					<el-button :disabled="form.type === 2" size="medium" type="success" icon="el-icon-plus" @click="handlerOpenChouseMaterial"
 						>添加物料</el-button
 					>
-					<el-button
+					<!-- <el-button
 						size="medium"
 						type="danger"
 						icon="el-icon-delete"
 						@click="handlerDeleteMaterial(null)"
 						:disabled="materialIds.length === 0 || form.type === 2"
-						>批量删除</el-button
-					>
+						>批量移除</el-button
+					> -->
 				</div>
 				<div>
 					<el-table
@@ -257,7 +267,7 @@
 						highlight-current-row
 						@selection-change="handleMaterialSelectionChange"
 					>
-						<el-table-column type="selection" width="50" align="center" />
+						<!-- <el-table-column type="selection" width="50" align="center" /> -->
 						<el-table-column prop="partnumber" label="物料号" align="center" :show-overflow-tooltip="true" />
 						<el-table-column prop="u8InventoryCode" label="U8编码" align="center" :show-overflow-tooltip="true" />
 						<el-table-column label="需求量" prop="requireOutNum" align="center" width="100">
@@ -279,7 +289,7 @@
 									type="danger"
 									icon="el-icon-delete"
 									@click="handlerDeleteMaterial([scope.row.id])"
-									>删除此物料</el-button
+									>移除此物料</el-button
 								>
 							</template>
 						</el-table-column>
@@ -291,20 +301,25 @@
 				<el-button type="primary" @click="submitForm">确定</el-button>
 			</div>
 		</el-dialog>
+		<PrintView ref="printViewRef" :visible.sync="showPrintDialog" :printKey="printKey"></PrintView>
 		<TheChouseMaterial :visible.sync="TheChouseMaterialDialogVisible" @materialChoused="handlerMaterialChoused"></TheChouseMaterial>
 	</div>
 </template>
 <script>
 import { listWmOutOrder, addWmOutOrder, delWmOutOrder, updateWmOutOrder, getWmOutOrder, getCustomList } from '@/api/wmsManagement/wmOutOrder.js'
 import TheChouseMaterial from './components/TheChouseMaterial/TheChouseMaterial.vue'
+import PrintView from '@/components/Print/出库单.vue'
 export default {
 	name: 'wmoutorder',
 	components: {
 		TheChouseMaterial,
+		PrintView,
 	},
 	data() {
 		return {
 			TheChouseMaterialDialogVisible: false,
+			showPrintDialog:false,
+			printKey:'',
 			labelWidth: '100px',
 			formLabelWidth: '100px',
 			// 选中shipmentNum数组
@@ -415,6 +430,7 @@ export default {
 			this.loading = true
 			listWmOutOrder(this.queryParams).then((res) => {
 				if (res.code == 200) {
+					console.log(res)
 					this.dataList = res.data.result
 					this.total = res.data.totalNum
 					this.loading = false
@@ -510,7 +526,7 @@ export default {
 					this.open = true
 					this.title = '编辑出库单数据'
 					this.opertype = 2
-
+					console.log('getWmOutOrder', res, data)
 					this.form = {
 						...data,
 					}
@@ -550,8 +566,9 @@ export default {
 					const list = JSON.parse(JSON.stringify(that.form.materialList))
 					const len = list.length
 					for (let index = 0; index < len; index++) {
-						console.log(list[index].id, list, len)
+						
 						if (Ids.includes(list[index].id)) {
+							console.log(that.form.materialList,index)
 							that.form.materialList.splice(index, 1)
 						}
 					}
@@ -567,17 +584,24 @@ export default {
 		// 物料已选择
 		handlerMaterialChoused(list) {
 			//TODO 需要筛选未选择的
-			console.log('handlerMaterialChoused', list,this.form)
+			console.log('handlerMaterialChoused', list, this.form)
 			const _list = JSON.parse(JSON.stringify(list))
 			for (let index = 0; index < _list.length; index++) {
-				console.log('push',_list[index],this.form);
+				console.log('push', _list[index], this.form)
 				this.form.materialList.push(_list[index])
 			}
 		},
 		// 打印出库单
 		handlePrint(row) {
+			this.printKey = row.shipmentNum
+			this.showPrintDialog = true;
+			// this.$refs.printViewRef.handlePrint(row)
 			console.log(row)
-			this.$message('打印出库单功能待完善!')
+			// this.$message('打印出库单功能待完善!')
+		},
+		// 配置出库计划
+		handlePlan(){
+			this.$message('此功能待完善')
 		},
 		// ====================================================
 		/** 提交按钮 */
diff --git a/vue.config.js b/vue.config.js
index f10fdd5..dce3808 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -40,7 +40,8 @@ module.exports = {
 			
 			// detail: https://cli.vuejs.org/config/#devserver-proxy
 			[process.env.VUE_APP_BASE_API]: {
-				target: 'http://localhost:8888/', // 后端接口地址
+				// target: 'http://192.168.90.92:8888/', // 后端接口地址
+				target: 'http://192.168.0.31:8888/', // 后端接口地址
 				changeOrigin: true,
 				pathRewrite: {
 					['^' + process.env.VUE_APP_BASE_API]: '', //需要rewrite的
@@ -48,7 +49,8 @@ module.exports = {
 			},
 
 			msgHub: {
-				target: 'http://localhost:8888/msgHub',
+				// target: 'http://192.168.90.92:8888/msgHub',
+				target: 'http://192.168.0.31:8888/msgHub',
 				ws: true,
 				changeOrigin: true,
 				pathRewrite: {