diff --git a/package-lock.json b/package-lock.json index f40e6c9..4e5fb95 100644 --- a/package-lock.json +++ b/package-lock.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-clipboard2": "^0.3.3", "vue-router": "^3.0.1", @@ -15375,6 +15376,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", @@ -34230,6 +34236,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 bc01493..0b052f2 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "node-sass": "^6.0.1", "nprogress": "^0.2.0", "pinyin": "^2.10.2", + "qrcodejs2": "^0.0.2", "vue": "2.5.16", "vue-clipboard2": "^0.3.3", "vue-router": "^3.0.1", diff --git a/public/config.json b/public/config.json index 5a4ba54..61112ea 100644 --- a/public/config.json +++ b/public/config.json @@ -1,5 +1,5 @@ { - "BASE_URL": "http://127.0.0.1:9996", - "SERVER_IP": "http://127.0.0.1:9996", + "BASE_URL": "http://192.168.0.109:9996", + "SERVER_IP": "http://192.168.0.109:9996", "hosp_name": "诏安县总医院（测试）" } diff --git a/src/api/basic/EntrustRece.js b/src/api/basic/EntrustRece.js new file mode 100644 index 0000000..3787f97 --- /dev/null +++ b/src/api/basic/EntrustRece.js @@ -0,0 +1,44 @@ +import axios from "../../utils/axios"; + +export function getEntrustRece(query) { + return axios({ + url: "/spms/entrust/rece/filter", + method: "get", + params: query + }); +} + +export function deleteEntrustRece(query) { + return axios({ + url: "/spms/entrust/rece/delete", + method: "post", + data: query + }); +} + +export function updateEntrustRece(query) { + return axios({ + url: "/spms/entrust/rece/update", + method: "post", + data: query + }); +} + +export function insertEntrustRece(query) { + return axios({ + url: "/spms/entrust/rece/add", + method: "post", + data: query + }); +} + + +export function filterNoUseBusType(query) { + return axios({ + url: "/spms/entrust/rece/filterAllNoUse", + method: "get", + params: query + }); +} + + diff --git a/src/api/basic/bussinessType.js b/src/api/basic/bussinessType.js index 4f18c75..fb995cb 100644 --- a/src/api/basic/bussinessType.js +++ b/src/api/basic/bussinessType.js @@ -38,3 +38,11 @@ export function insertBussinessType(query) { data: query }); } +export function filterAllByUser(query) { + return axios({ + url: "/udiwms/bussinessType/filterAllByUser", + method: "post", + data: query + }); +} + diff --git a/src/api/inventory/InvPreInProducts.js b/src/api/inventory/InvPreInProducts.js index 6de1c9f..f65e6fb 100644 --- a/src/api/inventory/InvPreInProducts.js +++ b/src/api/inventory/InvPreInProducts.js @@ -34,3 +34,14 @@ export function statDetailProducts(query) { }); } +export function clearAllProducts(query) { + return axios( + { + url: "/spms/prein/inv/products/clearAll", + method: "post", + data: query + } + ) +} + + diff --git a/src/api/warehouse/code.js b/src/api/warehouse/code.js new file mode 100644 index 0000000..1e5a40c --- /dev/null +++ b/src/api/warehouse/code.js @@ -0,0 +1,9 @@ +import axios from "@/utils/axios"; + +export function saveCode(query) { + return axios({ + url: "/warehouse/inout/saveTempCode", + method: "post", + data: query + }); +} diff --git a/src/api/warehouse/order.js b/src/api/warehouse/order.js index b81c4a0..e3276d6 100644 --- a/src/api/warehouse/order.js +++ b/src/api/warehouse/order.js @@ -75,6 +75,15 @@ export function addOrderWeb(query) { }); } +export function enterCodeWeb(query) { + return axios({ + url: "/warehouse/inout/enterCode", + method: "post", + data: query + }); +} + + export function postOrdersWeb(query) { return axios({ url: "/warehouse/inout/postOrdersWeb", diff --git a/src/api/warehouse/stockOrder.js b/src/api/warehouse/stockOrder.js index 458479b..ca9e50b 100644 --- a/src/api/warehouse/stockOrder.js +++ b/src/api/warehouse/stockOrder.js @@ -269,3 +269,15 @@ export function stockOrderChange(query) { } +export function updateStatus(query) { + + return axios({ + url: "/spms/inout/order/web/updateStatus", + method: "post", + data: query + }); +} + + + + diff --git a/src/router/index.js b/src/router/index.js index 3bfd312..a791e2d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -90,6 +90,7 @@ import receiveOrderNew from "../views/thrsys/ThrOrdedrReceiveAdd.vue"; import receiveOrderSearch from "../views/thrsys/ThrOrdedrReceiveSearch.vue"; import spsSyncData from "../views/thrsys/SysUdimsData.vue"; import syncConfig from "../views/thrsys/SysUdimsConfig.vue"; +import BasicEntrutsRece from "../views/basic/BasicEntrutsRece.vue"; //库存 import invProducts from "../views/inventory/InvProducts.vue"; @@ -98,6 +99,7 @@ import invPreInProducts from "../views/inventory/invPreInProducts" import supInvProducts from "../views/inventory/supInvProducts.vue"; import supInvPreProducts from "../views/inventory/supInvPreProducts" +import supInvPreInProducts from "../views/inventory/supInvPreInProducts" import invUdiTrace from "@/views/inventory/invUdiTrace"; import invUdiTraceOrder from "@/views/inventory/invUdiTraceOrder"; import additionalOrder from "@/views/warehouse/AdditionalOrder"; @@ -237,35 +239,50 @@ export const asyncRouterMap = [ // noDropdown: true, children: [ - { - path: "authAdmin", - component: authAdmin, - name: "用户管理", - icon: "", - meta: { - authRule: ["admin/auth_admin"] - } - }, - { - path: "authRole", - component: authRole, - name: "角色管理", - icon: "", - meta: { - authRule: ["admin/auth_role"] - } - }, - { - path: "authPermissionRule", - component: authPermissionRule, + path: "/authMange", + component: Empty, name: "权限管理", + redirect: "/authMange/authAdmin", icon: "", meta: { - authRule: ["admin/auth_permission_rule"] - } + authRule: ["authMange/home"] + }, + children: [ + { + path: "authAdmin", + component: authAdmin, + name: "用户管理", + icon: "", + meta: { + authRule: ["authMange/auth_admin"] + } + }, + + + { + path: "authRole", + component: authRole, + name: "角色管理", + icon: "", + meta: { + authRule: ["authMange/auth_role"] + } + }, + { + path: "authPermissionRule", + component: authPermissionRule, + name: "功能配置", + icon: "", + meta: { + authRule: ["authMange/auth_permission_rule"] + } + }, + ] }, + + { path: "phoneRegisterManage", component: phoneRegisterManage, @@ -275,15 +292,6 @@ export const asyncRouterMap = [ authRule: ["admin/phoneRegisterManage"] } }, - // { - // path: "systemParamConfig", - // component: systemParamConfig, - // name: "参数设置", - // icon: "", - // meta: { - // authRule: ["param/system_param_config"] - // } - // }, { path: "/systemParam", @@ -386,6 +394,16 @@ export const asyncRouterMap = [ authRule: ["admin/spsSyncData"] } }, + + { + path: "BasicEntrutsRece", + name: "委托验收", + component: BasicEntrutsRece, + meta: { + authRule: ["basic/BasicEntrutsRece"] + } + }, + // { // path: "systemPDFTemplate", // component: systemPDFTemplate, @@ -1124,7 +1142,16 @@ export const asyncRouterMap = [ authRule: ["spInv/spPreInvProducts"] } }, - + { + path: "supInvPreInProducts", + component: supInvPreInProducts, + name: "预验收库存查询", + icon: "", + hidden: false, + meta: { + authRule: ["spInv/supInvPreInProducts"] + } + }, ] }, diff --git a/src/views/basic/BasicEntrutsRece.vue b/src/views/basic/BasicEntrutsRece.vue new file mode 100644 index 0000000..f596304 --- /dev/null +++ b/src/views/basic/BasicEntrutsRece.vue @@ -0,0 +1,266 @@ + + diff --git a/src/views/basic/BasicEntrutsReceModify.vue b/src/views/basic/BasicEntrutsReceModify.vue new file mode 100644 index 0000000..b82d484 --- /dev/null +++ b/src/views/basic/BasicEntrutsReceModify.vue @@ -0,0 +1,259 @@ + + + + + diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue index 96685f9..79f530c 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -71,9 +71,6 @@ - - -