diff --git a/src/router/index.js b/src/router/index.js
index 1a0d777..fd7f3a5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1042,15 +1042,6 @@ export const asyncRouterMap = [
},
]
},
- {
- path: "invSpaceManage",
- component: invSpaceManage,
- name: "货位管理",
- icon: "",
- meta: {
- authRule: ["inv/invSpaceManage"]
- }
- },
{
path: "/invCount",
component: Empty,
diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index 0244fc4..dda639a 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -171,6 +171,13 @@
>管理单据类型
+ 管理货位
+
-
+
@@ -715,6 +723,18 @@
+
+
+
+
+
@@ -743,6 +763,7 @@ import {isBlank} from "@/utils/strUtil";
import relBusUserDialog from "./invWarehouseRelBusTypes";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {filterUserBusTypeList} from "@/api/inventory/invRelBusTypes";
+import invSpaceManage from "@/views/inventory/InvSpaceManage";
const formJson = {
id: null,
@@ -880,7 +901,12 @@ export default {
},
bussinessTypeTotal: 0,
curSeleUser: null,
- busTableTitle: null
+ busTableTitle: null,
+ currentInvInfo: {
+ invStorageCode: null,
+ invWarehouseCode: null
+ },
+ invSpaceManageVisible: false
};
},
methods: {
@@ -1698,6 +1724,13 @@ export default {
}).catch((error) => {
})
},
+ invSpaceManage(row) {
+ this.currentInvInfo = {
+ invStorageCode: row.parentId,
+ invWarehouseCode: row.code
+ };
+ this.invSpaceManageVisible = true;
+ },
},
filters: {
statusFilterType(status) {
@@ -1719,6 +1752,7 @@ export default {
},
components: {
relBusUserDialog,
+ invSpaceManage
},
created() {
// 加载表格数据
diff --git a/src/views/inventory/InvSpaceManage.vue b/src/views/inventory/InvSpaceManage.vue
index 2d6838e..0e33259 100644
--- a/src/views/inventory/InvSpaceManage.vue
+++ b/src/views/inventory/InvSpaceManage.vue
@@ -6,32 +6,6 @@
-
-
-
- {{ item.name }}
-
-
-
-
-
-
- {{ item.name }}
-
-
-
+ show-overflow-tooltip width="150">
@@ -61,6 +35,7 @@
+
@@ -117,44 +93,6 @@
-
-
- 所属仓库：
-
-
-
-
-
-
-
-
-
-
-
- 所属分库：
-
-
-
-
-
-
-
-
-
-
-
备注：
@@ -196,11 +134,16 @@
import store from "../../store";
import {filterUplLocInv} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
-import {userInfo} from "@/api/auth/login";
-import {isBlank} from "@/utils/strUtil";
import {getInvSpaceList, saveSpace, deleteSpace} from "@/api/inventory/invSpace";
export default {
+ name: "invInfo",
+ props: {
+ invInfo: {
+ type: Object,
+ required: true
+ }
+ },
data() {
return {
filterQuery: {
@@ -235,8 +178,8 @@ export default {
id: null,
code: null,
name: null,
- invStorageCode: null,
- invWarehouseCode: null,
+ invStorageCode: this.invInfo.invStorageCode,
+ invWarehouseCode: this.invInfo.invWarehouseCode,
status: 1,
remark: null
},
@@ -247,12 +190,6 @@ export default {
name: [
{required: true, message: "请输入货位名称", trigger: "blur"}
],
- invStorageCode: [
- {required: true, message: "请选择所属仓库", trigger: "blur"}
- ],
- invWarehouseCode: [
- {required: true, message: "请选择所属分库", trigger: "blur"}
- ]
},
modifySubInvList: []
};
@@ -264,8 +201,8 @@ export default {
});
this.filterQuery = {
customerId: null,
- invWarehouseCode: null,
- invStorageCode: null,
+ invWarehouseCode: this.invInfo.invWarehouseCode,
+ invStorageCode: this.invInfo.invStorageCode,
page: 1,
limit: 20,
};
@@ -363,8 +300,8 @@ export default {
id: null,
code: null,
name: null,
- invStorageCode: null,
- invWarehouseCode: null,
+ invStorageCode: this.invInfo.invStorageCode,
+ invWarehouseCode: this.invInfo.invWarehouseCode,
status: 1,
remark: null
}
@@ -384,44 +321,13 @@ export default {
}
})
},
- changeStorage() {
- this.formData.invWarehouseCode = null;
- this.modifyWarehouseDisable = false;
- let query = {
- pcode: this.formData.invStorageCode
- };
- filterSubByInv(query)
- .then((response) => {
- this.modifySubInvList = response.data || [];
- })
- .catch(() => {
- });
- },
- },
- mounted() {
- document.body.ondrop = function (event) {
- event.preventDefault();
- event.stopPropagation();
- };
},
created() {
this.getStorage();
- let query = this.$route.query;
- this.filterQuery = Object.assign(this.filterQuery, query);
- this.filterQuery.limit = parseInt(this.filterQuery.limit);
- // 加载表格数据
- //获取用户默认仓库信息
- userInfo().then((res) => {
- if (res.code === 20000) {
- if (!isBlank(res.data.locInvCode)) {
- this.filterQuery.invStorageCode = res.data.locInvCode;
- this.invChange();
- this.filterQuery.invWarehouseCode = res.data.locSubInvCode;
- }
- this.getList();
- }
- }).catch((error) => {
- });
+ //加载表格数据
+ this.filterQuery.invStorageCode = this.invInfo.invStorageCode;
+ this.filterQuery.invWarehouseCode = this.invInfo.invWarehouseCode;
+ this.getList();
},
};
diff --git a/src/views/inventory/invCountOrderAudit.vue b/src/views/inventory/invCountOrderAudit.vue
index 9e8bee5..a90390a 100644
--- a/src/views/inventory/invCountOrderAudit.vue
+++ b/src/views/inventory/invCountOrderAudit.vue
@@ -60,10 +60,10 @@
-
+
@@ -82,8 +82,8 @@
详情
+ @click.native.stop="auditCountOrder(scope.row)"
+ >审批
@@ -110,16 +110,19 @@
-
-
+
-
-
-
-
+
+
+
+
+
+
+
- {{ statusMap[scope.row.status] }}
+ {{countStatusMap[scope.row.status]}}
@@ -196,6 +199,10 @@ export default {
1: "未审核",
2: "已审核"
},
+ countStatusMap: {
+ 0: '亏损',
+ 1: '盈利'
+ }
};
},
methods: {
@@ -338,6 +345,12 @@ export default {
this.detailQuery.page = 1;
this.getCountOrderDetailList();
},
+ intentDetail(row) {
+
+ },
+ auditCountOrder(row) {
+
+ },
},
created() {
this.getStorage();
diff --git a/src/views/inventory/invCountOrderNew.vue b/src/views/inventory/invCountOrderNew.vue
index b34018c..76c6232 100644
--- a/src/views/inventory/invCountOrderNew.vue
+++ b/src/views/inventory/invCountOrderNew.vue
@@ -76,11 +76,10 @@
盘点
+ @click.native.stop="editOrder(scope.row)"
+ >编辑
-
提交审核
-