From a54a089b68f0fbc27f3643544840876d9c27e099 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Wed, 11 Dec 2024 09:39:05 +0800
Subject: [PATCH] =?UTF-8?q?wms=E2=80=9C=E5=8C=85=E6=9D=90=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=98=8E=E7=BB=86=E2=80=9D=E7=95=8C=E9=9D=A2=E8=A6=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E9=87=8D=E6=96=B0=E6=8E=92=E5=88=97?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=9A=84=E6=AC=A1=E5=BA=8F=E5=A6=82=E4=B8=8B?=
 =?UTF-8?q?=20=20=20=20=E9=80=81=E8=B4=A7=E6=97=B6=E9=97=B4=EF=BC=8C?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=B7=EF=BC=8C=E7=89=A9=E6=96=99=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=EF=BC=8C=E9=80=81=E8=B4=A7=E5=8D=95=EF=BC=8C=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E5=8D=95=EF=BC=8C=E6=89=B9=E6=AC=A1=EF=BC=8C=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=95=B0=E9=87=8F=EF=BC=8C=E5=87=BA=E5=BA=93=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=EF=BC=8C=E5=89=A9=E4=BD=99=E6=95=B0=E9=87=8F(?=
 =?UTF-8?q?=E2=80=9C=E5=89=A9=E4=BD=99=E6=95=B0=E9=87=8F=E2=80=9D=E6=98=AF?=
 =?UTF-8?q?=E2=80=9C=E5=85=A5=E5=BA=93=E6=95=B0=E9=87=8F=E2=80=9D=E5=87=8F?=
 =?UTF-8?q?=E5=8E=BB=E2=80=9C=E5=87=BA=E5=BA=93=E6=95=B0=E9=87=8F=E2=80=9D?=
 =?UTF-8?q?=E5=BE=97=E5=87=BA)=EF=BC=8C=E7=8A=B6=E6=80=81=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86=E5=8D=A1=EF=BC=8C=E5=90=8E=E9=9D=A2=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=AC=A1=E5=BA=8F=E4=B8=8D=E5=8F=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/matetowsn/index.vue | 73 +++++++++----------------------
 1 file changed, 21 insertions(+), 52 deletions(-)

diff --git a/src/views/wms/matetowsn/index.vue b/src/views/wms/matetowsn/index.vue
index af51998..9e37643 100644
--- a/src/views/wms/matetowsn/index.vue
+++ b/src/views/wms/matetowsn/index.vue
@@ -43,15 +43,6 @@
 					@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
 					v-model="queryParams.materialCode"
@@ -69,18 +60,6 @@
 				/>
 			</el-form-item>
 
-<!--			<el-form-item label="数量" prop="amount">-->
-<!--				<el-input-->
-<!--					v-model="queryParams.amount"-->
-<!--					placeholder="请输入数量"-->
-<!--					clearable-->
-<!--					@keyup.enter.native="handleQuery"-->
-<!--				/>-->
-<!--			</el-form-item>-->
-
-
-
-
 			<el-form-item label="送货时间" prop="gmtCreate">
 				<el-date-picker clearable
 					v-model="queryParams.gmtCreate"
@@ -89,15 +68,6 @@
 					placeholder="请选择创建时间">
 				</el-date-picker>
 			</el-form-item>
-<!--			<el-form-item label="工厂号" prop="factoryCode">-->
-<!--				<el-input-->
-<!--					v-model="queryParams.factoryCode"-->
-<!--					placeholder="请输入工厂号"-->
-<!--					clearable-->
-<!--					@keyup.enter.native="handleQuery"-->
-<!--				/>-->
-<!--			</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>
@@ -114,40 +84,44 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
+          type="primary"
           plain
           icon="el-icon-remove"
           size="mini"
           :disabled="batchSingle"
-          @click="handleRemoveBatch(row)"
-          v-hasPermi="['mes:pro:workorder:edit']"
+          @click="handleRemoveBatch()"
+
         >删除
         </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="gmtCreate" width="180">
+      <el-table-column label="送货时间" align="center" prop="gmtCreate" width="100">
         <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="userDefined2" width="300"/>
-      <el-table-column label="物料号" align="center" prop="materialCode" width="200">
+
+      <el-table-column label="物料号" align="center" prop="materialCode" width="120">
         <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="materialDesc" width="300"/>
+      <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="userDefined2" width="100"/>
       <el-table-column label="入库数量" align="center" prop="amount" />
       <el-table-column label="出库数量" align="center" prop="outNumber" />
+      <el-table-column label="剩余数量" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.amount - (scope.row.outNumber || 0) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
           <span v-if="scope.row.outNumber === 0 || scope.row.outNumber === null">入库</span>
@@ -155,7 +129,7 @@
           <span v-else>出库完成</span>
         </template>
       </el-table-column>
-<!--			<el-table-column label="托盘号" align="center" prop="sn" />-->
+      <el-table-column label="标识卡" align="center" prop="wlCode" width="300"/>
       <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" />
@@ -173,15 +147,8 @@
 					<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="工厂号" align="center" prop="factoryCode" />
-
 		</el-table>
 
 		<pagination
@@ -630,10 +597,12 @@ export default {
       console.log("Materials processed");
       this.showMaterialDialog = false; // 关闭领料单弹窗
     },
-    handleRemoveBatch(row) {
-
+    handleRemoveBatch() {
+      const ids =  this.ids;
+      let postData = this.ids.map(id => ({ mateOrderInSnId: id }));
+      console.log(postData)
       this.$modal.confirm('是否确认删除标识卡编号为"' + wlCode + '"的数据项？').then(function() {
-        return Removecard();
+        return Removecard(postData);
       }).then(() => {
         this.editBatch();
         this.$modal.msgSuccess("删除成功");