当前仓库：
diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue
index 2af037b..61d8838 100644
--- a/src/views/warehouse/stockOrderEditor.vue
+++ b/src/views/warehouse/stockOrderEditor.vue
@@ -1,501 +1,508 @@
-
-
-
-
-
-
-
-
-
-
- {{ item.localName }}
-
-
-
-
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
- 单据日期:
-
+
+
-
-
+
+
+
+
+
+
+
+ {{ item.localName }}
+
+
+
-
-
-
- 查询
- 选入订单
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ sourceMap[scope.row.sourceType] }}
-
-
-
-
-
- {{ scope.row.status | statusFilterName }}
-
-
-
-
- {{ getActionName(scope.row.billType) }}
-
-
-
-
- {{ getStorageName(scope.row.locStorageCode) }}
-
-
-
-
-
-
-
-
-
- 编辑
-
- 删除
-
- 单据打印
-
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+ 单据日期:
+
+
+
+
+
+
+ 查询
+ 选入订单
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ sourceMap[scope.row.sourceType] }}
+
+
+
+
+
+ {{ scope.row.status | statusFilterName }}
+
+
+
+
+ {{ getActionName(scope.row.billType) }}
+
+
+
+
+ {{ getStorageName(scope.row.locStorageCode) }}
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 编辑
-
- 复制
-
- 删除
-
+
+ {{ getSubStorageName(scope.row.invWarehouseCode) }}
+
+
+
+
+
+
+
+
+
+ 编辑
+
+ 删除
+
+ 单据打印
+
+
+
+
+
+
+
-
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+ 复制
+
+ 删除
+
+
+
+
- >
-
+
+
+
+
+
+
-
-
-
+
+
+
-
-
+
-
-
-
- 单据号：
-
-
-
-
-
-
-
-
-
- 单据状态：
-
-
-
-
-
-
-
-
+
-
-
-
- 单据日期：
-
-
-
-
-
-
-
-
-
- 往来单位：
-
-
-
-
-
-
-
-
+
+
+
+ 单据号：
+
+
+
+
+
+
+
+
+
+ 单据状态：
+
+
+
+
+
+
+
+
-
-
-
- 业务类型：
-
-
-
-
-
-
- {{ item.localName }}
-
-
-
-
-
-
-
- 采购类型：
-
-
-
-
-
-
-
-
+
+
+
+ 单据日期：
+
+
+
+
+
+
+
+
+
+ 往来单位：
+
+
+
+
+
+
+
+
-
+
+
+
+ 业务类型：
+
+
+
+
+
+
+ {{ item.localName }}
+
+
+
+
+
+
+
+ 采购类型：
+
+
+
+
+
+
+
+
-
-
-
- 产品通用名：
-
-
-
-
-
-
-
-
-
- 包装规格：
-
-
-
-
-
-
-
-
-
-
-
- 单据数量：
-
-
-
-
-
-
-
-
-
- 实际数量：
-
-
-
-
-
-
-
-
-
-
-
- 生产日期：
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 失效日期：
-
-
-
-
-
-
-
+
+
+
+
+ 产品通用名：
+
+
+
+
+
+
+
+
+
+ 包装规格：
+
+
+
+
+
+
+
+
+
+
+
+ 单据数量：
+
+
+
+
+
+
+
+
+
+ 实际数量：
+
+
+
+
+
+
+
+
+
+
+
+ 生产日期：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 失效日期：
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 批次号：
-
-
-
-
-
-
-
-
-
-
价格：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 批次号：
+
+
+
+
+
+
+
+
+
+ 价格：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
diff --git a/src/views/warehouse/stockOrderNew.vue b/src/views/warehouse/stockOrderNew.vue
index d310901..e8d4917 100644
--- a/src/views/warehouse/stockOrderNew.vue
+++ b/src/views/warehouse/stockOrderNew.vue
@@ -118,6 +118,12 @@
{{ getStorageName(scope.row.locStorageCode) }}
+
+
+
+ {{ getSubStorageName(scope.row.invWarehouseCode) }}
+
+
@@ -857,6 +863,13 @@ export default {
}
}
},
+ getSubStorageName(code) {
+ for (let i = 0; i < this.subInvList.length; i++) {
+ if (this.subInvList[i].code === code) {
+ return this.subInvList[i].name;
+ }
+ }
+ },
getBusType() {
let query = {
enabled: true,
@@ -923,6 +936,7 @@ export default {
});
},
invChange() {
+ this.query.invWarehouseCode = "";
this.subInvList = [];
let query = {
pcode: this.query.locStorageCode
diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue
index 55fa222..b156a70 100644
--- a/src/views/warehouse/stockOrderNewDistribution.vue
+++ b/src/views/warehouse/stockOrderNewDistribution.vue
@@ -1119,6 +1119,7 @@ export default {
}
},
invChange() {
+ this.formData.invWarehouseCode = "";
this.subInvList = [];
let query = {
pcode: this.formData.locStorageCode
diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index 4af144f..b55561c 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/stockOrderSearch.vue
@@ -102,11 +102,16 @@
{{ getActionName(scope.row.billType) }}
-
+
{{ getStorageName(scope.row.locStorageCode) }}
+
+
+ {{ getSubStorageName(scope.row.invWarehouseCode) }}
+
+
{{ getStorageName(scope.row.locStorageCode) }}
+
+
+ {{ getSubStorageName(scope.row.invWarehouseCode) }}
+
+
@@ -340,7 +345,6 @@
import {
stockOrderList, stockOrderDetail,
deleteStockOrderById, deleteStockOrderDetailById,
- copyStockOrderDetail, submitStockOrder,
uploadStockOrderDetail, uploadStockOrderDetailCount,
generateStockOrderQRCodeText, updateStockOrder
} from "../../api/warehouse/stockOrder";
@@ -774,6 +778,15 @@ export default {
}
}
},
+
+ getSubStorageName(code) {
+ for (let i = 0; i < this.subInvList.length; i++) {
+ if (this.subInvList[i].code === code) {
+ return this.subInvList[i].name;
+ }
+ }
+ },
+
getStorage() {
this.storageList = [];
filterAllByUser()
@@ -789,6 +802,7 @@ export default {
});
},
invChange() {
+ this.query.invWarehouseCode = "";
this.subInvList = [];
let query = {
pcode: this.query.locStorageCode