Merge remote-tracking branch 'origin/master'

src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue

@@ -96,6 +96,7 @@ import * as ProductionreturnRequestDetailNoApi from '@/api/wms/productionreturnR
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import * as PackageApi from '@/api/wms/package'
+import { formatTime } from '@/utils/index'
 
 // 隔离退料申请
 defineOptions({ name: 'ProductionreturnRequestMainNo' })
@@ -130,7 +131,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if(formField == 'itemCode') {
         // row['packingNumber'] = val[0]['packingNumber']
         // row['containerNumber'] = val[0]['containerNumber']
-        row['batch'] = val[0]['batch']
+        row['batch'] = val[0]['batch']==''?formatTime(new Date(), 'yyyyMMdd'):val[0]['batch']
+
         row['itemCode'] = val[0]['itemCode']
         row['uom'] = val[0]['uom']
         row['inventoryStatus'] = val[0]['inventoryStatus']
@@ -140,6 +142,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           if(item.field == 'qty') {
             item.tableForm.max = val[0]['qty']
           }
+          if(item.field == 'batch') {
+            item.tableForm.disabled = false
+          }
         })
       } else if(formField == 'workStationCode') {
         row['workStationCode'] = val[0]['code']