From a7b15461d3dc6d07c18e065fa3a6acd234c2d7c8 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期二, 09 十二月 2025 19:51:55 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue | 97 +++++-------------------------------------------
1 files changed, 11 insertions(+), 86 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue"
index 0e48a14..8db255e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue"
@@ -12,9 +12,9 @@
const table = ref({
key: "id",
footer: "Foots",
- cnName: "搴撳瓨淇℃伅鏄庣粏",
- name: "stockInfoDetail",
- url: "/StockInfoDetail/",
+ cnName: "搴撳瓨姹囨��",
+ name: "StockDetailByMateriel",
+ url: "/StockDetailByMateriel/",
sortName: "id",
});
const editFormFields = ref({
@@ -59,14 +59,17 @@
const searchFormFields = ref({
materielCode: "",
materielName: "",
- orderNo: "",
+ batchNo: "",
+ supplyCode:"",
+ warehouseCode:""
});
const searchFormOptions = ref([
[
{ title: "鐗╂枡缂栧彿", field: "materielCode" ,type:'like'},
{ title: "鐗╂枡鍚嶇О", field: "materielName" ,type:'like'},
- { title: "鍗曟嵁缂栧彿", field: "orderNo" ,type:'like'},
- { title: "鎵樼洏鍙�", field: "palletCode" ,type:'like'},
+ { title: "鎵规鍙�", field: "batchNo" ,type:'like'},
+ { title: "渚涘簲鍟嗙紪鍙�", field: "supplyCode" ,type:'like'},
+ { title: "浠撳簱鍙�", field: "warehouseCode" ,type:'like'},
],
]);
const columns = ref([
@@ -78,13 +81,6 @@
hidden: true,
readonly: true,
require: true,
- align: "left",
- },
- {
- field: "stockId",
- title: "搴撳瓨淇℃伅涓婚敭",
- type: "string",
- width: 90,
align: "left",
},
{
@@ -102,24 +98,10 @@
align: "left",
},
{
- field: "orderNo",
- title: "鍗曟嵁缂栧彿",
- type: "decimal",
- width: 90,
- align: "left",
- },
- {
field: "batchNo",
title: "鎵规鍙�",
type: "string",
width: 90,
- align: "left",
- },
- {
- field: "serialNumber",
- title: "搴忓垪鍙�",
- type: "int",
- width: 120,
align: "left",
},
{
@@ -135,71 +117,14 @@
type: "string",
width: 120,
align: "left",
- },
- {
- field: "barcode",
- title: "鏉＄爜",
- type: "string",
- width: 120,
- align: "left",
- },
+ },
{
field: "stockQuantity",
title: "搴撳瓨鏁伴噺",
type: "string",
width: 200,
align: "left",
- },
- {
- field: "outboundQuantity",
- title: "鍑哄簱鏁伴噺",
- type: "string",
- width: 180,
- align: "left",
- },
- {
- field: "status",
- title: "搴撳瓨鏄庣粏鐘舵��",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "stockStatusEmun", data: [] },
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
+ }
]);
const detail = ref({
cnName: "#detailCnName",
--
Gitblit v1.9.3