From 07cd4c0f62a7eb4f8f353086c027331b276214a7 Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Fri, 14 Jun 2024 10:58:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emisTmsScanRecord/positionScanning.vue    | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/views/emis/emisTmsScanRecord/positionScanning.vue b/src/views/emis/emisTmsScanRecord/positionScanning.vue
index 5fead701..cf8819d6 100644
--- a/src/views/emis/emisTmsScanRecord/positionScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/positionScanning.vue
@@ -2,16 +2,6 @@
   <div class="app-container">
     <el-row :gutter="0">
         <el-form ref="form" size="mini"  :model="form" :rules="rules" label-width="80px">
-          <el-col :span="8">
-            <el-form-item label="扫描单号" prop="billCode" label-width="80px">
-              <span slot="label">
-                <span style="color: red">扫描单号</span>
-              </span>
-              <el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput"  >
-                <i slot="suffix" class="iconfont">&#xe656;</i>
-              </el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item :label="$t('留仓类型')" prop="keepWarehouse" label-width="80px">
               <span slot="label">
@@ -21,9 +11,8 @@
                 style="width:100%"
                 filterable
                 clearable
-                v-model="keepWarehouseValue"
-                @change="onKeepWarehouseSelect">
-                <el-option v-for="item in dict.type.emis_keep_warehouse" :key="item.value" :label="item.label" :value="item.label" />
+                v-model="form.keepType">
+                <el-option v-for="item in dict.type.emis_keep_warehouse" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -35,7 +24,16 @@
               <el-input v-model="form.remark" type="textarea" :rows="2" placeholder="请输入"  />
             </el-form-item>
           </el-col>
-
+          <el-col :span="8">
+            <el-form-item label="扫描单号" prop="billCode" label-width="80px">
+              <span slot="label">
+                <span style="color: red">扫描单号</span>
+              </span>
+              <el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput"  >
+                <i slot="suffix" class="iconfont">&#xe656;</i>
+              </el-input>
+            </el-form-item>
+          </el-col>
         </el-form>
       </el-row>
 
@@ -100,6 +98,12 @@
             <span>{{ parseTime(scope.row.scanDate) }}</span>
           </template>
         </el-table-column>
+        <el-table-column :label="$t('留仓类型')" align="center" prop="keepType" min-width="150">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_keep_warehouse" :value="scope.row.keepType"/>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('留仓原因')" align="center" prop="remark" min-width="150" />
         <el-table-column :label="$t('派件员')" align="center" prop="dispatchOrSendMan" min-width="150" />
         <el-table-column :label="$t('重量')" align="center" prop="scanWeight" min-width="100" />
       </xd-table>
@@ -220,6 +224,10 @@ export default {
       this.form.ids= arr.map(item=>item.id)
     },
     handleBatchScan(){
+      if(this.form.keepType==null || this.form.remark==''){
+        this.$message.error("请先输入必填字段");
+        return;
+      }
       this.formBatch = {
         billCode: null,
       }
@@ -385,7 +393,8 @@ export default {
             picUrl:item.picUrl,
             scanDate:item.scanDate,
             scanWeight:item.scanWeight,
-            remark:((item.keepWarehouseRemark?item.keepWarehouseRemark+" ":"") + (item.remark ? item.remark : "")).trim(),
+            keepType:item.keepType,
+            remark:item.remark,//((item.keepWarehouseRemark?item.keepWarehouseRemark+" ":"") + (item.remark ? item.remark : "")).trim(),
             dispatchOrSendManCode:item.dispatchOrSendManCode
           }
         );
@@ -425,6 +434,10 @@ export default {
         this.$message.error("输入单号后回车");
         return;
       }
+      if(this.form.keepType==null || this.form.remark==''){
+        this.$message.error("请输入必填字段");
+        return;
+      }
 
       if(this.dataMap[this.form.billCode]){
         this.$message.error("重复扫描");