From d53840b98f74ef50aba73d8379dc5758a5144c2e Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Fri, 11 Oct 2024 11:28:01 +0800
Subject: [PATCH] =?UTF-8?q?wms=E5=A6=82=E6=9E=9C=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E7=9A=84=E6=A0=87=E8=AF=86=E5=8D=A1=E4=B8=A2=E5=A4=B1=E7=9A=84?=
 =?UTF-8?q?=E8=AF=9D=EF=BC=8C=E9=9C=80=E8=A6=81=E5=8F=AF=E4=BB=A5=E8=A1=A5?=
 =?UTF-8?q?=E6=89=93=E4=B9=8B=E5=89=8D=E7=9A=84=E6=A0=87=E8=AF=86=E5=8D=A1?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=8A=A0=E5=88=B0=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/matetowsn.js          |   8 +-
 src/views/wms/matetowsn/index.vue | 142 +++++++++++++++---------------
 2 files changed, 80 insertions(+), 70 deletions(-)

diff --git a/src/api/wms/matetowsn.js b/src/api/wms/matetowsn.js
index 398dbc2..4811301 100644
--- a/src/api/wms/matetowsn.js
+++ b/src/api/wms/matetowsn.js
@@ -8,7 +8,13 @@ export function listMatetowsn(query) {
 		params: query
 	});
 }
-
+export function cardDy(data) {
+  return request({
+    url: '/wms/matetowsn/cardDy',
+    method: 'post',
+    data: data
+  });
+}
 // 查询包材库存明细表详细
 export function getMatetowsn(mateOrderInSnId) {
 	return request({
diff --git a/src/views/wms/matetowsn/index.vue b/src/views/wms/matetowsn/index.vue
index 95a7df4..dc02094 100644
--- a/src/views/wms/matetowsn/index.vue
+++ b/src/views/wms/matetowsn/index.vue
@@ -1,6 +1,25 @@
 <template>
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
+
+
+      <el-form-item label="送货单" prop="poNo">
+        <el-input
+          v-model="queryParams.poNo"
+          placeholder="请输入仓库"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="采购单" prop="orderNo">
+        <el-input
+          v-model="queryParams.orderNo"
+          placeholder="请输入仓库"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
 			<el-form-item label="仓库" prop="whCode">
 				<el-input
 					v-model="queryParams.whCode"
@@ -17,14 +36,14 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="库位" prop="wlCode">
-				<el-input
-					v-model="queryParams.wlCode"
-					placeholder="请输入库位"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
+<!--			<el-form-item label="库位" prop="wlCode">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.wlCode"-->
+<!--					placeholder="请输入库位"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
 
 			<el-form-item label="物料号" prop="materialCode">
 				<el-input
@@ -42,14 +61,6 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="托盘号" prop="sn">
-				<el-input
-					v-model="queryParams.sn"
-					placeholder="请输入托盘号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
 
 			<el-form-item label="数量" prop="amount">
 				<el-input
@@ -63,7 +74,7 @@
 
 
 
-			<el-form-item label="创建时间" prop="gmtCreate">
+			<el-form-item label="送货时间" prop="gmtCreate">
 				<el-date-picker clearable
 					v-model="queryParams.gmtCreate"
 					type="date"
@@ -71,23 +82,6 @@
 					placeholder="请选择创建时间">
 				</el-date-picker>
 			</el-form-item>
-			<el-form-item label="最后更新人" prop="lastModifiedBy">
-				<el-input
-					v-model="queryParams.lastModifiedBy"
-					placeholder="请输入最后更新人"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="更新时间" prop="gmtModified">
-				<el-date-picker clearable
-					v-model="queryParams.gmtModified"
-					type="date"
-					value-format="yyyy-MM-dd"
-					placeholder="请选择更新时间">
-				</el-date-picker>
-			</el-form-item>
-
 			<el-form-item label="工厂号" prop="factoryCode">
 				<el-input
 					v-model="queryParams.factoryCode"
@@ -104,36 +98,34 @@
 		</el-form>
 
 		<el-row :gutter="10" class="mb8">
-
-
-
-			<el-col :span="1.5">
-				<el-button
-					type="warning"
-					plain
-					icon="el-icon-download"
-					size="mini"
-					@click="handleExport"
-					v-hasPermi="['wms:matetowsn:export']"
-				>导出</el-button>
-			</el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" @click="handleUpdate">打印</el-button>
+      </el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
 		<el-table v-loading="loading" :data="matetowsnList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="唯一序列号" align="center" prop="mateOrderInSnId"  v-if="false" />
-			<el-table-column label="仓库" align="center" prop="whCode" />
-			<el-table-column label="库区" align="center" prop="waCode" />
-			<el-table-column label="标识卡" align="center" prop="wlCode" />
-      <el-table-column label="物料号" align="center" prop="materialCode" width="250">
+      <el-table-column label="送货时间" align="center" prop="gmtCreate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="送货单" align="center" prop="poNo"  width="100"/>
+      <el-table-column label="采购单" align="center" prop="orderNo" width="100"/>
+			<el-table-column label="标识卡" align="center" prop="wlCode" width="300"/>
+      <el-table-column label="物料号" align="center" prop="materialCode" width="200">
         <template slot-scope="scope">
           <span>{{ formatProductCode(scope.row.materialCode) }}</span>
         </template>
       </el-table-column>
 			<el-table-column label="物料描述" align="center" prop="materialDesc" width="300"/>
-			<el-table-column label="托盘号" align="center" prop="sn" />
-			<el-table-column label="数量" align="center" prop="amount" />
+      <el-table-column label="数量" align="center" prop="amount" />
+<!--			<el-table-column label="托盘号" align="center" prop="sn" />-->
+      <el-table-column label="仓库" align="center" prop="whCode" />
+      <el-table-column label="库区" align="center" prop="waCode" />
+
 			<el-table-column label="备用1" align="center" prop="userDefined1" v-if="false" />
 			<el-table-column label="备用2" align="center" prop="userDefined2"  v-if="false" />
 			<el-table-column label="备用3" align="center" prop="userDefined3"  v-if="false" />
@@ -149,12 +141,12 @@
 					<span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="更新人" align="center" prop="lastModifiedBy" />
-			<el-table-column label="更新时间" align="center" prop="gmtModified" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.gmtModified, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
+<!--			<el-table-column label="更新人" align="center" prop="lastModifiedBy" />-->
+<!--			<el-table-column label="更新时间" align="center" prop="gmtModified" width="180">-->
+<!--				<template slot-scope="scope">-->
+<!--					<span>{{ parseTime(scope.row.gmtModified, '{y}-{m}-{d}') }}</span>-->
+<!--				</template>-->
+<!--			</el-table-column>-->
 			<el-table-column label="有效标记" align="center" prop="activeFlag"v-if="false" />
 			<el-table-column label="工厂号" align="center" prop="factoryCode" />
 
@@ -272,7 +264,7 @@
 </template>
 
 <script>
-import { listMatetowsn, getMatetowsn, delMatetowsn, addMatetowsn, updateMatetowsn } from "@/api/wms/matetowsn";
+import { listMatetowsn,cardDy, getMatetowsn, delMatetowsn, addMatetowsn, updateMatetowsn } from "@/api/wms/matetowsn";
 
 export default {
 	name: "Matetowsn",
@@ -353,6 +345,18 @@ export default {
 			this.open = false;
 			this.reset();
 		},
+    /** 过账按钮操作 */
+    handleUpdate(row) {
+      const ids = row.id || this.ids;
+      let postData = this.ids.map(id => ({ mateOrderInSnId: id }));
+      console.log(postData)
+      this.$modal.confirm('是否进行打印').then(function() {
+        return cardDy(JSON.stringify(postData));
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("打印完成");
+      }).catch(() => {});
+    },
     formatProductCode(code) {
       // 检查是否有效，去掉前7个零
       if (!code) return code; // 处理 null 或 undefined 情况
@@ -416,15 +420,15 @@ export default {
 			this.title = "添加包材库存明细表";
 		},
 		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const mateOrderInSnId = row.mateOrderInSnId || this.ids
-			getMatetowsn(mateOrderInSnId).then(response => {
-				this.form = response.data;
-				this.open = true;
-				this.title = "修改包材库存明细表";
-			});
-		},
+		// handleUpdate(row) {
+		// 	this.reset();
+		// 	const mateOrderInSnId = row.mateOrderInSnId || this.ids
+		// 	getMatetowsn(mateOrderInSnId).then(response => {
+		// 		this.form = response.data;
+		// 		this.open = true;
+		// 		this.title = "修改包材库存明细表";
+		// 	});
+		// },
 		/** 提交按钮 */
 		submitForm() {
 			this.$refs["form"].validate(valid => {