+
{{ getStorageName(scope.row.locStorageCode) }}
+
+
+
+
+ {{ getSubStorageName(scope.row.invWarehouseCode) }}
+
+
@@ -385,10 +392,19 @@
+
+
+
+
+
+
+
+
+
+
@@ -407,6 +423,14 @@
:disabled="false">
+
+
+
+
+
+
+
+
@@ -435,6 +459,17 @@
auto-complete="off" :disabled="false">
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 21a1deb..d731c44 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -240,7 +240,7 @@
- 提示：进入系统必须选择您当前所在仓库与分库
+ 提示：进入系统请先选择您当前所在仓库与分库
提交
@@ -413,6 +413,9 @@ export default {
},
locCHange() {
+ if(this.$isNotBlank(this.userInfo.locSubInvCode)){
+ this.userInfo.locSubInvCode = "";
+ }
this.findSubInvByInv();
},
@@ -479,6 +482,16 @@ export default {
},
submitInv() {
+ if (this.$isBlank(this.userInfo.locInvCode)) {
+ this.$message.error("当前仓库不能为空！");
+ return;
+ }
+ if (this.userInfo.customerId == 110) {
+ if (this.$isBlank(this.userInfo.locSubInvCode)) {
+ this.$message.error("当前分库不能为空！");
+ return;
+ }
+ }
updateInv(this.userInfo).then((res) => {
if (res.code == 20000) {
this.$message.success("设置成功!");
diff --git a/src/views/inout/IOAdditionalOrder.vue b/src/views/inout/IOAdditionalOrder.vue
index 713a945..170a597 100644
--- a/src/views/inout/IOAdditionalOrder.vue
+++ b/src/views/inout/IOAdditionalOrder.vue
@@ -27,6 +27,7 @@
+
+
+
+ {{ item.name }}
+
+
+
-
{{ getStorageName(scope.row.locStorageCode) }}
+
+
+ {{ getSubStorageName(scope.row.invWarehouseCode) }}
+
+
@@ -257,6 +274,7 @@ import {getBussinessType} from "../../api/basic/bussinessType";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {filterAllByUser} from "@/api/basic/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busLocalType";
+import {filterSubByInv} from "@/api/basic/invSubWarehouse";
const formJson = {
site_id: "",
@@ -270,6 +288,8 @@ export default {
data() {
return {
filterQuery: {
+ locStorageCode: null,
+ invWarehouseCode: null,
id: "",
mainAction: null,
action: null,
@@ -309,6 +329,7 @@ export default {
},
list: [],
storageList: [],
+ subInvList: [],
queryAdIdAsyncLoading: false,
codeDetailVisible: false,
total: 0,
@@ -510,6 +531,21 @@ export default {
.catch(() => {
});
},
+
+ invChange() {
+ this.filterQuery.invWarehouseCode = "";
+ this.subInvList = [];
+ let query = {
+ pcode: this.filterQuery.locStorageCode
+ };
+ filterSubByInv(query)
+ .then((response) => {
+ this.subInvList = response.data || [];
+ })
+ .catch(() => {
+ });
+ },
+
getStorageName(code) {
for (let i = 0; i < this.storageList.length; i++) {
if (this.storageList[i].code === code) {
@@ -517,6 +553,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;
+ }
+ }
+ },
addOrders(row) {
console.log(row)
this.idQuery.id = '';
diff --git a/src/views/inout/IOCheckErrorOrder.vue b/src/views/inout/IOCheckErrorOrder.vue
index 6c67db8..4035b3e 100644
--- a/src/views/inout/IOCheckErrorOrder.vue
+++ b/src/views/inout/IOCheckErrorOrder.vue
@@ -117,11 +117,16 @@
-
+
{{ getStorageName(scope.row.locStorageCode) }}
+
+
+ {{ getSubStorageName(scope.row.invWarehouseCode) }}
+
+
-
+
{{ getStorageName(scope.row.locStorageCode) }}
+
+
+ {{ getSubStorageName(scope.row.invWarehouseCode) }}
+
+
{
+ this.loading = false;
+ this.unitlist = response.data.list || [];
+ })
+ .catch(() => {
+ this.loading = false;
+ });
+ },
intentDetail(row) {
// this.$router.push({
// path: "../inout/detail",
@@ -831,6 +854,7 @@ export default {
});
},
invChange() {
+ this.filterQuery.invWarehouseCode = "";
this.subInvList = [];
let query = {
pcode: this.filterQuery.locStorageCode
diff --git a/src/views/inout/IOErrorOrder.vue b/src/views/inout/IOErrorOrder.vue
index 65ed4a1..2a2a0bd 100644
--- a/src/views/inout/IOErrorOrder.vue
+++ b/src/views/inout/IOErrorOrder.vue
@@ -570,6 +570,7 @@ export default {
},
invChange() {
this.subInvList = [];
+ this.filterQuery.invWarehouseCode = "";
let query = {
pcode: this.filterQuery.locStorageCode
};
diff --git a/src/views/inout/IOFinishOrder.vue b/src/views/inout/IOFinishOrder.vue
index 4384901..52a7ee8 100644
--- a/src/views/inout/IOFinishOrder.vue
+++ b/src/views/inout/IOFinishOrder.vue
@@ -114,11 +114,16 @@
-
+
{{ getStorageName(scope.row.locStorageCode) }}
+
+
+ {{ getSubStorageName(scope.row.invWarehouseCode) }}
+
+
+
+
+
+
+
+
- {{ scope.row.fromCorp }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ {{ getStorageName(scope.row.locStorageCode) }}
-
+
+
- {{ getStorageName(scope.row.locStorageCode) }}
+ {{ getSubStorageName(scope.row.invWarehouseCode) }}
+
@@ -140,29 +131,10 @@
编辑
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{
this.storageList = response.data || [];
if (this.storageList.length > 0) {
- this.filterQuery.locStorageCode = this.storageList[0].code;
this.invChange();
this.getList();
}
@@ -476,11 +445,19 @@ export default {
}
}
},
+ getSubStorageName(code) {
+ for (let i = 0; i < this.subInvList.length; i++) {
+ if (this.subInvList[i].code === code) {
+ return this.subInvList[i].name;
+ }
+ }
+ },
addOrders(row) {
console.log(row)
this.idQuery.id = '';
this.idQuery.actDate = '';
this.idQuery.corpOrderId = '';
+
this.idQuery.outChangeEnable = row.outChangeEnable;
if (row.id !== null && row.id !== undefined && row.id !== '') {
this.idQuery.id = row.id;
@@ -488,6 +465,10 @@ export default {
this.idQuery.corpOrderId = row.corpOrderId;
this.idQuery.billType = row.action;
this.idQuery.locStorageCode = row.locStorageCode;
+ this.idQuery.invWarehouseCode = row.invWarehouseCode;
+ this.idQuery.fromSubInvCode = row.fromSubInvCode;
+
+
this.idQuery.preCheck = row.preCheck;
}
this.addOrderVisible = true;
@@ -501,6 +482,7 @@ export default {
},
closeDialog() {
this.addOrderVisible = false;
+ this.addHosOrderVisible = false;
this.getList();
},
getUnitList() {
@@ -662,9 +644,11 @@ export default {
intentDetail(row) {
this.codeDetailVisible = true;
this.idQuery.id = row.id;
+
},
invChange() {
this.subInvList = [];
+ this.filterQuery.invWarehouseCode = "";
let query = {
pcode: this.filterQuery.locStorageCode
};
diff --git a/src/views/inventory/InvProductsDetail.vue b/src/views/inventory/InvProductsDetail.vue
index 007a014..5570140 100644
--- a/src/views/inventory/InvProductsDetail.vue
+++ b/src/views/inventory/InvProductsDetail.vue
@@ -173,6 +173,8 @@ export default {
customerId: null,
page: 1,
limit: 20,
+ invStorageCode: null,
+ invWarehouseCode: null,
},
codeArry: [],
total: 0,
@@ -224,6 +226,7 @@ export default {
this.query.batchNo = this.idQuery.batchNo;
this.query.supId = this.idQuery.supId;
this.query.invStorageCode = this.idQuery.invStorageCode;
+ this.query.invWarehouseCode = this.idQuery.invWarehouseCode;
filterDetailProducts(this.query) //查找该单号下的所有条码
.then((response) => {
this.loading = false;
diff --git a/src/views/inventory/InvStatistics.vue b/src/views/inventory/InvStatistics.vue
index 70700a8..7eb0b70 100644
--- a/src/views/inventory/InvStatistics.vue
+++ b/src/views/inventory/InvStatistics.vue
@@ -51,7 +51,7 @@
+ @change="invChange" size="mini">
+
+
+
+ {{ item.name }}
+
+
+
{
- console.log(response)
this.showSup = response.data.showSup;
this.loading = false;
this.list = response.data.list || [];
@@ -324,6 +338,20 @@ export default {
.catch(() => {
});
},
+ invChange() {
+ // this.$set(this.filterQuery, "entrustUser", "");
+ this.filterQuery.invWarehouseCode = "";
+ this.subInvList = [];
+ let query = {
+ pcode: this.filterQuery.invStorageCode
+ };
+ filterSubByInv(query)
+ .then((response) => {
+ this.subInvList = response.data || [];
+ })
+ .catch(() => {
+ });
+ },
},
filters: {
statusFilterType(status) {
diff --git a/src/views/inventory/invPreInProducts.vue b/src/views/inventory/invPreInProducts.vue
index 68974d1..6d2340d 100644
--- a/src/views/inventory/invPreInProducts.vue
+++ b/src/views/inventory/invPreInProducts.vue
@@ -58,6 +58,10 @@
>查询
+ 清空库存
+
@@ -88,6 +92,8 @@
width="120">
+
import {
filterProducts,
- deleteProducts,
+ deleteProducts,clearAllProducts
} from "../../api/inventory/InvPreInProducts";
import draggable from "vuedraggable";
import codeDetail from "./InvPreInProductsDetail";
@@ -270,6 +276,36 @@ export default {
.catch(() => {
});
},
+
+
+ clearAll(){
+ this.$confirm("此操作将永久清空所有预验收库存信息, 是否继续?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ let query={id:1};
+
+ clearAllProducts(query)
+ .then((response) => {
+ if (response.code == 20000) {
+ this.getList();
+ this.$message({
+ type: "success",
+ message: "删除成功！",
+ });
+ } else {
+ this.$message.error(response.message);
+ }
+
+ })
+
+
+ })
+ .catch(() => {
+ });
+ },
findMethod(query) {
console.log(query);
this.fromOptions = [];
@@ -284,6 +320,7 @@ export default {
this.fromOptions = response.data.page.list || [];
})
.catch(() => {
+ this.fromOptions = [];
this.loading = false;
});
},
diff --git a/src/views/inventory/invPreProducts.vue b/src/views/inventory/invPreProducts.vue
index 301b94d..7e8ce45 100644
--- a/src/views/inventory/invPreProducts.vue
+++ b/src/views/inventory/invPreProducts.vue
@@ -100,6 +100,8 @@
width="120">
+
{
- // this.fromOptions = response.data.list || [];
+ // this.loading = false;
+ // this.fromOptions = response.data.page.list || [];
// })
// .catch(() => {
- // this.fromOptions = [];
+ // this.loading = false;
// });
},