From 7c93cd4df4d71e7b97d31f9efd5aa077e359f100 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Tue, 31 May 2022 09:33:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=EF=BC=8C=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BB=93?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E4=BB=93=E5=BA=93=E5=AD=97=E5=85=B8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E7=AC=AC=E4=B8=89=E6=96=B9=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9=E7=AD=89?= =?UTF-8?q?=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 11 + package.json | 1 + src/api/auth/deviceCheck.js | 27 + src/router/index.js | 11 +- src/views/basic/invWarehouse.vue | 74 +- src/views/business/stockOrderDelSearch.vue | 1830 ++++++++--------- src/views/thrsys/ThrInvWarehouse.vue | 84 +- .../userManage/param/phoneRegisterManage.vue | 357 ++++ 8 files changed, 1408 insertions(+), 987 deletions(-) create mode 100644 src/api/auth/deviceCheck.js create mode 100644 src/views/userManage/param/phoneRegisterManage.vue diff --git a/package-lock.json b/package-lock.json index 1ed04c3..0e1d0b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,6 +17,7 @@ "node-sass": "^6.0.1", "nprogress": "^0.2.0", "pinyin": "^2.10.2", + "qrcodejs2": "^0.0.2", "vue": "2.5.16", "vue-router": "^3.0.1", "vuedraggable": "^2.17.0", @@ -15329,6 +15330,11 @@ "teleport": ">=0.2.0" } }, + "node_modules/qrcodejs2": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/qrcodejs2/-/qrcodejs2-0.0.2.tgz", + "integrity": "sha1-Rlr+Xjnxn6zsuTLBH3oYYQkUauE=" + }, "node_modules/qs": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", @@ -34112,6 +34118,11 @@ "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", "dev": true }, + "qrcodejs2": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/qrcodejs2/-/qrcodejs2-0.0.2.tgz", + "integrity": "sha1-Rlr+Xjnxn6zsuTLBH3oYYQkUauE=" + }, "qs": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", diff --git a/package.json b/package.json index 5be6a37..377e39c 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "node-sass": "^6.0.1", "nprogress": "^0.2.0", "pinyin": "^2.10.2", + "qrcodejs2": "^0.0.2", "vue": "2.5.16", "vue-router": "^3.0.1", "vuedraggable": "^2.17.0", diff --git a/src/api/auth/deviceCheck.js b/src/api/auth/deviceCheck.js new file mode 100644 index 0000000..d8c19a4 --- /dev/null +++ b/src/api/auth/deviceCheck.js @@ -0,0 +1,27 @@ +import axios from "../../utils/axios"; + +export function registerList(query) { + return axios({ + url: "/sale/device/registerList", + method: "get", + params: query + }); +} + + +export function check(data) { + return axios({ + url: "/sale/device/check", + method: "post", + data: data + }); +} + +export function deleterKey(data) { + return axios({ + url: "/sale/info/deleterKey", + method: "post", + data: data + }); +} + diff --git a/src/router/index.js b/src/router/index.js index 66c9891..24f785d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -15,6 +15,7 @@ import authAdmin from "../views/userManage/admin/authAdmin.vue"; import authRole from "../views/userManage/admin/authRole.vue"; import authPermissionRule from "../views/userManage/admin/authPermissionRule.vue"; import systemParamConfig from "../views/userManage/param/systemParamConfig.vue"; +import phoneRegisterManage from "../views/userManage/param/phoneRegisterManage.vue"; import systemPDFTemplate from "../views/userManage/param/systemPDFTemplate"; import systemPDFModule from "../views/userManage/param/systemPDFModule"; import thirdSysApi from "../views/userManage/param/ThirdSysApiUpload.vue"; @@ -228,7 +229,15 @@ export const asyncRouterMap = [ }, ] }, - + { + path: "phoneRegisterManage", + component: phoneRegisterManage, + name: "设备管理", + icon: "", + meta: { + authRule: ["admin/phoneRegisterManage"] + } + }, { path: "/systemParam", component: Empty, diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 0ecd14e..8bcedcf 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -130,16 +130,6 @@ - - - - - - - - - -
@@ -476,14 +466,14 @@ - - - - - - - - + + + + + + + + @@ -516,6 +506,23 @@ + + + + + + + + + 查询 + + + - + +
取消 { + this.thirdQuery.thirdSysFk = this.currentSysId; + filterThrList(this.thirdQuery).then((res) => { this.thrWarehouseData = res.data.list; + this.total = res.data.total || 0; this.thrWareHouseVisible = true; }).catch((error) => { this.thrWarehouseData = []; + this.total = 0; this.thrWareHouseVisible = true; this.$message.error("第三方仓库数据加载失败"); }); }, + + + handleCurrentChange(val) { + this.thirdQuery.page = val; + this.intentSelect(); + }, changeThrWarehouse(row) { this.checkThrWarehouseRow = row; }, diff --git a/src/views/business/stockOrderDelSearch.vue b/src/views/business/stockOrderDelSearch.vue index bcb435e..27777da 100644 --- a/src/views/business/stockOrderDelSearch.vue +++ b/src/views/business/stockOrderDelSearch.vue @@ -1,340 +1,340 @@ diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue index d9c47ad..d328910 100644 --- a/src/views/thrsys/ThrInvWarehouse.vue +++ b/src/views/thrsys/ThrInvWarehouse.vue @@ -48,6 +48,7 @@ border default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> + - {{ enableMap[scope.row.advanceType] }} - - - - - - - - + + + - - - - - - - - - - - - + +
- - - - - - - - - - - - - - - - -
取消 @@ -271,7 +246,9 @@ const formJson = { code: null, status: 1, advanceType: false, - isDefault: false + isDefault: false, + page: 1, + limit: 20, }; export default { data() { @@ -283,7 +260,9 @@ export default { code: null, status: null, advanceType: null, - isDefault: null + isDefault: null, + page: 1, + limit: 20, }, mergeList: [], node: null, @@ -291,6 +270,7 @@ export default { children: "children", label: "name" }, + total: 0, treeList: [], loading: true, index: null, @@ -325,16 +305,12 @@ export default { }; }, methods: { - /*eslint-disable */ -// this.handleSubForm(node, data, "add")} -// > -// 添加货位 -// + handleCurrentChange(val) { + this.query.page = val; + this.getList(); + }, renderContent(h, {node, data, store}) { return ( { this.loading = false; this.mergeList = response.data.list || []; + this.total = response.data.total || 0; this.treeList = response.data.tree_list || []; this.getQueryThirdSysFkName(this.query.thirdSysFk); }) .catch(() => { this.loading = false; this.mergeList = []; + this.total = 0; this.treeList = []; }); }, @@ -409,6 +387,14 @@ export default { } }) }, + getThirdSysFkName(thirdSys) { + + for (let i = 0; i < this.thirdSys.length; i++) { + if (this.thirdSys[i].thirdId === thirdSys) { + return this.thirdSys[i].thirdName; + } + } + }, // 刷新表单 resetForm() { if (this.$refs["dataForm"]) { @@ -636,8 +622,8 @@ export default { }, created() { // 加载表格数据 - this.getList(); this.getBasicThirdSys(); + this.getList(); }, }; diff --git a/src/views/userManage/param/phoneRegisterManage.vue b/src/views/userManage/param/phoneRegisterManage.vue new file mode 100644 index 0000000..d9a5c01 --- /dev/null +++ b/src/views/userManage/param/phoneRegisterManage.vue @@ -0,0 +1,357 @@ + + +