From 6419bc2531c1643a86da28e99e869f983ae261cd Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Tue, 24 Sep 2024 09:43:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E6=9D=90=E5=BA=93=E5=AD=98=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86=E5=8D=A1=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/matenews.js              |   7 ++
 src/api/wms/outorderfc.js            |  19 +++++
 src/views/plan/workorder/printID.vue |  22 +++---
 src/views/wms/matenews/index.vue     | 100 +++++++++++++++++++++++----
 4 files changed, 122 insertions(+), 26 deletions(-)

diff --git a/src/api/wms/matenews.js b/src/api/wms/matenews.js
index da1312c..6cf00f1 100644
--- a/src/api/wms/matenews.js
+++ b/src/api/wms/matenews.js
@@ -42,3 +42,10 @@ export function delMatenews(storageId) {
 		method: 'delete'
 	});
 }
+export function addBS(data) {
+  return request({
+    url: '/wms/matenews/addBS',
+    method: 'post',
+    data: data
+  });
+}
diff --git a/src/api/wms/outorderfc.js b/src/api/wms/outorderfc.js
index 60bbd70..1cd839e 100644
--- a/src/api/wms/outorderfc.js
+++ b/src/api/wms/outorderfc.js
@@ -113,4 +113,23 @@ export function OutboundPostingzcSAP(data) {
   });
 }
 
+//退货接口
 
+// 查询包材出库单列表
+export function listreturnderZC(query) {
+  return request({
+    url: '/wms/outorder/listReturn',
+    method: 'post',
+    params: query
+  });
+
+}
+// 查询包材出库单列表
+export function addreturnderZC(data) {
+  return request({
+    url: '/wms/outorder/addreturnderZC',
+    method: 'post',
+    data: query
+  });
+
+}
diff --git a/src/views/plan/workorder/printID.vue b/src/views/plan/workorder/printID.vue
index bf1fb1a..8a6a320 100644
--- a/src/views/plan/workorder/printID.vue
+++ b/src/views/plan/workorder/printID.vue
@@ -3,10 +3,10 @@
     <el-dialog title="" :visible.sync="printDialogVisible" width="1000px">
       <div>
         <el-form inline  label-width="80px">
-          
+
           <el-form-item label="补打板次" prop="factory">
             <el-input v-model="idCardsNum" placeholder="请输入" style="width:100px"/>
-          </el-form-item> 
+          </el-form-item>
           <el-button type="primary" icon="el-icon-check" circle @click="showSupplementPrint()"/>
 
           <el-form-item label="增打批次" prop="batchCode">
@@ -24,13 +24,13 @@
                 :value="item.batchCode"
               ></el-option>
             </el-select>
-          </el-form-item> 
+          </el-form-item>
           <el-form-item label="增打板次" prop="idCardsNumAdd">
             <el-input v-model="idCardsNumAdd" placeholder="请输入" style="width:100px"/>
-          </el-form-item> 
+          </el-form-item>
           <el-form-item label="增打数量" prop="batchQuantity">
             <el-input v-model="batchQuantity" placeholder="请输入" style="width:100px"/>
-          </el-form-item> 
+          </el-form-item>
           <el-button type="primary" icon="el-icon-check" circle @click="showAddPrint()"/>
           <el-button type="danger" icon="el-icon-refresh" round @click="refreshCards()">重置</el-button>
         </el-form>
@@ -50,7 +50,7 @@
               </el-col>
             </el-row>
             <div class="custom-divider"></div>
-            
+
             <el-row class="my-print-foot">
               <el-col :offset="1" :span="13">
                 <div class="card-div2">产品名称: {{ item.productName  }}</div><br />
@@ -132,7 +132,7 @@ export default {
       refreshWorkerTable: true,
       // 表单校验
       rules: {
-       
+
       },
       tableIndex: "tableIndex",
     };
@@ -140,7 +140,7 @@ export default {
   created() {
   },
   mounted() {
-  
+
 
   },
   methods: {
@@ -322,12 +322,12 @@ export default {
   margin-left: 35px;
 }
 .tr-row {
-  height: 35px; 
+  height: 35px;
 }
 .tr-row-1 {
-  width: 246px; 
+  width: 246px;
 }
 .tr-row-2 {
-  width: 574px; 
+  width: 574px;
 }
 </style>
diff --git a/src/views/wms/matenews/index.vue b/src/views/wms/matenews/index.vue
index 9926a91..5e6de4e 100644
--- a/src/views/wms/matenews/index.vue
+++ b/src/views/wms/matenews/index.vue
@@ -106,6 +106,18 @@
 					v-hasPermi="['wms:matenews:export']"
 				>导出</el-button>
 			</el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-printer"
+          size="mini"
+          :disabled="single"
+          @click="openPrintDialog"
+          v-hasPermi="['mes:pro:workorder:edit']"
+        >打印标识卡
+        </el-button>
+      </el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
@@ -135,19 +147,6 @@
 			<el-table-column label="备用7" align="center" prop="userDefined7" v-if="false" />
 			<el-table-column label="备用8" align="center" prop="userDefined8" v-if="false" />
 			<el-table-column label="备用9" align="center" prop="userDefined9" v-if="false" />
-<!--			<el-table-column label="备用10" align="center" prop="userDefined10" v-if="false" />-->
-<!--			<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="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="SAP工厂号" align="center" prop="sapFactoryCode" v-if="false" />
 
@@ -284,11 +283,26 @@
 				<el-button @click="cancel">取 消</el-button>
 			</div>
 		</el-dialog>
+
+
+
+    <el-dialog title="打印标识卡" :visible.sync="dialogVisible">
+      <el-input
+        v-model="printCount"
+        type="number"
+        placeholder="请输入要打印的张数"
+        min="1"
+      ></el-input>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="confirmPrint">确 定</el-button>
+      </span>
+    </el-dialog>
 	</div>
 </template>
 
 <script>
-import { listMatenews, getMatenews, delMatenews, addMatenews, updateMatenews } from "@/api/wms/matenews";
+import { listMatenews, getMatenews, delMatenews, addMatenews, updateMatenews ,addBS} from "@/api/wms/matenews";
 
 export default {
 	name: "Matenews",
@@ -298,8 +312,12 @@ export default {
 			loading: true,
 			// 选中数组
 			ids: [],
+      dialogVisible: false,
 			// 非单个禁用
 			single: true,
+      printCount: null,
+      selectedRows: [],
+
 			// 非多个禁用
 			multiple: true,
 			// 显示搜索条件
@@ -443,6 +461,15 @@ export default {
 			this.open = true;
 			this.title = "添加包材库存主表";
 		},
+    openPrintDialog() {
+      // 检查是否选择了行
+      if (this.ids.length === 0) {
+        this.$message.warning('请先选择要打印的物料!');
+        return;
+      }
+      // 打开打印对话框
+      this.dialogVisible = true;
+    },
 		/** 修改按钮操作 */
 		handleUpdate(row) {
 			this.reset();
@@ -453,6 +480,48 @@ export default {
 				this.title = "修改包材库存主表";
 			});
 		},
+    confirmPrint() {
+      if (this.printCount < 1) {
+        this.$message.warning('打印张数必须大于 0!');
+        return;
+      }
+      const ids = this.ids[0];
+      // 发送请求到后端
+      // 发送请求到后端
+      const payload = {
+        storageId: ids, // 传递选中的 ID
+        userDefined10: this.printCount // 传递打印数量
+      };
+      // 这里假设 addBS 是一个 API 函数
+      addBS(payload)
+        .then(response => {
+          // 处理成功响应
+          this.$message.success(response.msg);
+          this.dialogVisible = false; // 关闭对话框
+          this.printCount = null; // 重置打印数量
+          this.getList(); // 重新获取数据
+        })
+        .catch(error => {
+          // 处理错误响应
+          this.$message.error('打印请求失败，请重试！');
+          console.error(error); // 打印错误到控制台
+        });
+      // this.$axios.post('/api/print', {
+      //   ids,
+      //   printCount: this.printCount,
+      // })
+      //   .then(response => {
+      //     this.$message.success('打印请求已发送成功！');
+      //     this.dialogVisible = false; // 关闭对话框
+      //     this.printCount = 1; // 重置打印数量
+      //     // 这里可以根据需要重新获取数据
+      //     this.getList();
+      //   })
+      //   .catch(error => {
+      //     this.$message.error('打印请求失败，请重试！');
+      //   });
+    },
+
 		/** 提交按钮 */
 		submitForm() {
 			this.$refs["form"].validate(valid => {
@@ -489,6 +558,7 @@ export default {
 				...this.queryParams
 			}, `matenews_${new Date().getTime()}.xlsx`)
 		}
-	}
+
+}
 };
 </script>