From 7d180121d133a3f2400ca2870cfb6cacd605d6cf Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期二, 12 八月 2025 23:12:32 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn --- 代码管理/WMS/WIDESEA_WMSClient/src/views/stock/ProStockView.vue | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/ProStockView.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/ProStockView.vue" index e668c68..5a2de27 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/ProStockView.vue" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/ProStockView.vue" @@ -38,19 +38,24 @@ palletCode: "", // locationCode: "", materielCode:"", - batchNo:"" + batchNo:"", + specifyVer:"" }); const searchFormOptions = ref([ [ { title: "鑳舵鍙�", field: "palletCode",type: "like" }, - // { title: "璐т綅缂栧彿", field: "locationCode",type: "like" }, { title: "璐т綅鐘舵��", field: "locationStatus" ,type: "selectList",dataKey: "locationStatusEnum",data: [],}, { title: "搴撳瓨鐘舵��", field: "stockStatus",type: "selectList",dataKey: "stockStatusEmun",data: [],}, + { title: "浜у搧缂栫爜", field: "productCode",type: "like"}, ], [ - { title: "浜у搧缂栫爜", field: "productCode",type: "like"}, - { title: "浜у搧鐗堟湰", field: "productVersion",type: "like"}, + { title: "鎵规鍙�", field: "lotNumber",type: "like"}, + { title: "璐т綅缂栧彿", field: "locationCode",type: "like" }, + { title: "鎸囨淳鐗堟湰", field: "specifyVer",type: "like"}, { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],}, + ], + [ + { title: "浜у搧鐗堟湰", field: "productVersion",type: "like"}, ] ]); const columns = ref([ @@ -125,10 +130,17 @@ align: "left" }, { + field: "specifyVer", + title: "鎸囨淳鐗堟湰", + type: "string", + width: 100, + align: "left" + }, + { field: "dateCode", title: "浜у搧鍛ㄦ湡", type: "string", - width: 140, + width: 100, align: "left", }, { -- Gitblit v1.9.3