From 9ac4bb2c5a2617fef31bcef0828c59be11b88381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 10 Apr 2023 12:00:21 +0800
Subject: [PATCH] =?UTF-8?q?table=E7=BB=84=E4=BB=B6=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E9=A1=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/components/currenTable/index.vue    | 27 +++++++++----------
 .../InventoryTransferLog-Query.vue            |  7 ++++-
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/fe/PC/src/components/currenTable/index.vue b/fe/PC/src/components/currenTable/index.vue
index adfabd61d..224a7af69 100644
--- a/fe/PC/src/components/currenTable/index.vue
+++ b/fe/PC/src/components/currenTable/index.vue
@@ -59,18 +59,17 @@
           :rules="item.rules"
         >
           <el-input
-            v-model="searchData[item.prop]"
+            v-model="scope.row[item.prop]"
             :maxlength="item.maxlength"
-            :onkeyup="typeNumberOnkeyup(item,searchData[item.prop])"
+            :onkeyup="typeNumberOnkeyup(item,item.prop,scope.$index)"
             clearable
             :disabled="Boolean(item.disabled)"
             :placeholder="'请输入' + item.label"
             :prefix-icon="item.icon"
             :show-password="item.showPassword"
-            @change="changeInput(item.prop,$event)"
             @clear="clearInput(item.prop,$event)"
             @blur="
-              inputPlaceholder($event, item, 'blur',searchData)
+              inputPlaceholder($event, item, 'blur',scope.row)
             "
             @focus="inputPlaceholder($event, item, 'focus')"
           ></el-input>
@@ -446,16 +445,16 @@ export default {
       }
     },
     // 数字类型input框onkeyup最大最小值处理
-    typeNumberOnkeyup(item,value){
-      if(value){
-        let _match = String(value).match(/\d+/)//正整数
-        this.searchData[item.prop] = _match?_match[0]:_match
+    typeNumberOnkeyup(item,value,index){
+      if(this.tableData[index][value]){
+        let _match = String(this.tableData[index][value]).match(/\d+/)//正整数
+        this.tableData[index][value] = _match?_match[0]:_match
       }
-      if(this.searchData[item.prop] > item.max){
-        this.searchData[item.prop] = item.max
+      if(this.tableData[index][value] > item.max){
+        this.tableData[index][value] = item.max
       }
-      if(this.searchData[item.prop] && this.searchData[item.prop] < item.min){
-        this.searchData[item.prop] = item.min
+      if(this.tableData[index][value] && this.tableData[index][value] < item.min){
+        this.tableData[index][value] = item.min
       }
       if(item.onkeyup)item.onkeyup()
     },
@@ -509,8 +508,8 @@ export default {
               func[item.prop]= Number(val.target.value)
             }
           // item.valueType
-          //   ? (this.searchData[item.prop] = item.valueType(
-          //     this.searchData[item.prop]
+          //   ? (this.tableData[index][value] = item.valueType(
+          //     this.tableData[index][value]
           //   ))
           //   : () => {
           //     return;
diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue
index 3118a3853..105024336 100644
--- a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue
+++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue
@@ -192,7 +192,9 @@ export default {
         {label: "批次", prop: "lot", width:'110px'},
         {type: "filter", filters: "inventoryStage", label: "状态", prop: "status", width:'80px'},
         {label: "单位", prop: "uom", width:'80px'},
-        {type: "input", label: "数量", prop: "qty", validType:'number' },
+        // {type: "input", label: "数量", prop: "qty", validType:'number' },
+        {type: "inputNumber", label: "数量", prop: "qty" },
+        
       ],
       editRules: {
         cerateRule: {
@@ -371,6 +373,9 @@ export default {
                 item.fromStatus = item.status
                 item.toStatus = item.status
                 item.checked = true
+                // 20230410 修改必填项参数
+                item.toLocationErpCode = item.locationErpCode
+                item.fromLocationErpCode = item.locationErpCode
               })
               let params = {
                 worker: store.getters.name.userName,