From d829337ad948f1a71778a1ee0def28a1a86d53c2 Mon Sep 17 00:00:00 2001 From: cxw <1056036578@qq.com> Date: Sat, 7 Jan 2023 13:13:35 +0800 Subject: [PATCH] 1 --- .env.development | 4 +- .env.production | 4 +- .env.staging | 4 +- src/api/reagent/dowload_file.js | 7 + src/api/reagent/purchase.js | 41 ++ src/assets/2-主界面/index.js | 2 +- src/router/modules/reagent.js | 64 ++- src/utils/index.js | 2 +- src/utils/mapTitle.js | 2 +- src/views/reagent/buy/index.vue | 472 +++++++++++++++++- src/views/reagent/purchaseapproval/index.vue | 477 +++++++++++++++++++ src/views/user/index.vue | 2 +- src/views/user/role/index.vue | 2 +- 13 files changed, 1042 insertions(+), 41 deletions(-) create mode 100644 src/api/reagent/purchase.js create mode 100644 src/views/reagent/purchaseapproval/index.vue diff --git a/.env.development b/.env.development index 8971a6a..9a40c2e 100644 --- a/.env.development +++ b/.env.development @@ -2,5 +2,5 @@ ENV = 'development' # base api -VUE_APP_BASE_API = 'http://127.0.0.1:9001' -VUE_APP_FACE_API = 'http://127.0.0.1:5000' +VUE_APP_BASE_API = 'http://192.168.1.101:9001' +VUE_APP_FACE_API = 'http://192.168.1.101:5000' diff --git a/.env.production b/.env.production index 03db484..ef2289e 100644 --- a/.env.production +++ b/.env.production @@ -2,6 +2,6 @@ ENV = 'production' # base api -VUE_APP_BASE_API = 'http://127.0.0.1:9001' -VUE_APP_FACE_API ='http://127.0.0.1:5000' +VUE_APP_BASE_API = 'http://192.168.1.101:9001' +VUE_APP_FACE_API ='http://192.168.1.101:5000' diff --git a/.env.staging b/.env.staging index c1452c1..56484f7 100644 --- a/.env.staging +++ b/.env.staging @@ -4,6 +4,6 @@ NODE_ENV = production ENV = 'staging' # base api -VUE_APP_BASE_API = 'http://127.0.0.1:9001' -VUE_APP_FACE_API='http://127.0.0.1:5000' +VUE_APP_BASE_API = 'http://192.168.1.101:9001' +VUE_APP_FACE_API='http://192.168.1.101:5000' diff --git a/src/api/reagent/dowload_file.js b/src/api/reagent/dowload_file.js index 2c3f859..647e911 100644 --- a/src/api/reagent/dowload_file.js +++ b/src/api/reagent/dowload_file.js @@ -152,3 +152,10 @@ export function dowload_putin_acceptance_record(data) { data }) } + +export function dowload(data) { + return request_server({ + url: '/api/shengou/dowload', + params: data + }) +} diff --git a/src/api/reagent/purchase.js b/src/api/reagent/purchase.js new file mode 100644 index 0000000..250fbc2 --- /dev/null +++ b/src/api/reagent/purchase.js @@ -0,0 +1,41 @@ +import request from '@/utils/request' + +export function get_list(data) { + return request({ + url: '/api/shengou/get_list', + method: 'post', + data + }) +} + +export function add(data) { + return request({ + url: '/api/shengou/add', + method: 'post', + data + }) +} + +export function update(data) { + return request({ + url: '/api/shengou/update', + method: 'post', + data + }) +} + +export function solve(data) { + return request({ + url: '/api/shengou/solve', + method: 'post', + data + }) +} + +export function del(data) { + return request({ + url: '/api/shengou/del', + method: 'post', + data + }) +} diff --git a/src/assets/2-主界面/index.js b/src/assets/2-主界面/index.js index cc7b26f..bcef190 100644 --- a/src/assets/2-主界面/index.js +++ b/src/assets/2-主界面/index.js @@ -194,7 +194,7 @@ export function getALLRouter(data) { { name: 'reagent', router: rasr[0], - title: '高危化品' + title: '易制毒易制爆' }, { name: 'standard', diff --git a/src/router/modules/reagent.js b/src/router/modules/reagent.js index 6bf7188..5f8f704 100644 --- a/src/router/modules/reagent.js +++ b/src/router/modules/reagent.js @@ -1,5 +1,5 @@ import Layout from '@/layout' -// 高危化品管理路由 +// 易制毒易制爆管理路由 const reagentRouter = [ { path: '/reagent/mainoverview', @@ -85,6 +85,34 @@ const reagentRouter = [ } ] }, + { + path: '/reagent/buy', + component: Layout, + redirect: '/reagent/buy/index', + meta: { classification: 'reagent',module_code: 'DrugPurchase'}, + children: [ + { + path: 'index', + name: 'Buy', + component: () => import('@/views/reagent/buy/index'), + meta: { title: '采购', icon: '请购', classification: 'reagent'} + } + ] + }, + { + path: '/reagent/purchaseapproval', + component: Layout, + redirect: '/reagent/purchaseapproval/index', + meta: { classification: 'reagent',module_code: 'DrugPurchaseApproval'}, + children: [ + { + path: 'index', + name: 'PurchaseApproval', + component: () => import('@/views/reagent/purchaseapproval/index'), + meta: { title: '采购审批', icon: '请购', classification: 'reagent'} + } + ] + }, { path: '/reagent/warehousing', component: Layout, @@ -95,7 +123,7 @@ const reagentRouter = [ path: 'index', name: 'Warehousing', component: () => import('@/views/reagent/warehousing/index'), - meta: { title: '高危化品入库', icon: '试剂入库', classification: 'reagent' } + meta: { title: '易制毒易制爆入库', icon: '试剂入库', classification: 'reagent' } } ] }, @@ -109,7 +137,7 @@ const reagentRouter = [ // path: 'index', // name: 'Receiving', // component: () => import('@/views/reagent/receivingandreturn/index'), - // meta: { title: '高危化品领用', icon: '试剂领用', classification: 'reagent' } + // meta: { title: '易制毒易制爆领用', icon: '试剂领用', classification: 'reagent' } // } // ] // }, @@ -123,7 +151,7 @@ const reagentRouter = [ path: 'index', name: 'SendBack', component: () => import('@/views/reagent/receivingandreturn/index'), - meta: { title: '高危化品归还', icon: '试剂归还', classification: 'reagent' } + meta: { title: '易制毒易制爆归还', icon: '试剂归还', classification: 'reagent' } } ] }, @@ -137,7 +165,7 @@ const reagentRouter = [ path: 'index', name: 'createapply', component: () => import('@/views/reagent/createapply/index'), - meta: { title: '高危化品创建申请', icon: '创建申请', classification: 'reagent' } + meta: { title: '易制毒易制爆创建申请', icon: '创建申请', classification: 'reagent' } } ] }, @@ -151,7 +179,7 @@ const reagentRouter = [ path: 'index', name: 'applymanagement', component: () => import('@/views/reagent/applymanagement/index'), - meta: { title: '高危化品申请管理', icon: '申请管理', classification: 'reagent' } + meta: { title: '易制毒易制爆申请管理', icon: '申请管理', classification: 'reagent' } } ] }, @@ -165,7 +193,7 @@ const reagentRouter = [ path: 'index', name: 'weightregistration', component: () => import('@/views/reagent/weightregistration/index'), - meta: { title: '高危化品称重登记', icon: '称重登记', classification: 'reagent' } + meta: { title: '易制毒易制爆称重登记', icon: '称重登记', classification: 'reagent' } } ] }, @@ -179,7 +207,7 @@ const reagentRouter = [ // path: 'index', // name: 'weighing', // component: () => import('@/views/reagent/weighing/index'), - // meta: { title: '高危化品称重', icon: '试剂称重', classification: 'reagent' } + // meta: { title: '易制毒易制爆称重', icon: '试剂称重', classification: 'reagent' } // } // ] // }, @@ -193,7 +221,7 @@ const reagentRouter = [ path: 'index', name: 'Inventory', component: () => import('@/views/reagent/inventory/index'), - meta: { title: '高危化品盘点', icon: '库存盘点', classification: 'reagent' } + meta: { title: '易制毒易制爆盘点', icon: '库存盘点', classification: 'reagent' } } ] }, @@ -221,13 +249,13 @@ const reagentRouter = [ path: '/reagent/management', component: Layout, redirect: '/reagent/management/index', - meta: { title: '高危化品管理', icon: '试剂管理', classification: 'reagent', module_code: 'DrugIndex' }, + meta: { title: '易制毒易制爆管理', icon: '试剂管理', classification: 'reagent', module_code: 'DrugIndex' }, children: [ { path: 'index', name: 'Management', component: () => import('@/views/reagent/management/data/index'), - meta: { title: '高危化品管理', icon: '试剂管理', classification: 'reagent' } + meta: { title: '易制毒易制爆管理', icon: '试剂管理', classification: 'reagent' } } ] }, @@ -273,20 +301,6 @@ const reagentRouter = [ // } // ] // }, - { - path: '/reagent/buy', - component: Layout, - redirect: '/reagent/buy/index', - meta: { classification: 'reagent',module_code: 'Purchase'}, - children: [ - { - path: 'index', - name: 'Buy', - component: () => import('@/views/reagent/buy/index'), - meta: { title: '请购', icon: '请购', classification: 'reagent'} - } - ] - }, { path: '/gotohome', redirect: '/home', diff --git a/src/utils/index.js b/src/utils/index.js index 1a2c8d6..6cd0690 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -200,7 +200,7 @@ export function getALLRouter(data) { { name: 'reagent', router: rasr[0], - title: '高危化品管理' + title: '易制毒易制爆管理' }, { name: 'standard', diff --git a/src/utils/mapTitle.js b/src/utils/mapTitle.js index 9c0d7c1..c9944db 100644 --- a/src/utils/mapTitle.js +++ b/src/utils/mapTitle.js @@ -1,5 +1,5 @@ const mapTitle = { - 'reagent': '高危化品', + 'reagent': '易制毒易制爆', 'user': 'user', 'standard': '危化品', 'consumables': '对照品', diff --git a/src/views/reagent/buy/index.vue b/src/views/reagent/buy/index.vue index bd9d539..7b13caf 100644 --- a/src/views/reagent/buy/index.vue +++ b/src/views/reagent/buy/index.vue @@ -1,15 +1,477 @@ - + + diff --git a/src/views/reagent/purchaseapproval/index.vue b/src/views/reagent/purchaseapproval/index.vue new file mode 100644 index 0000000..7b13caf --- /dev/null +++ b/src/views/reagent/purchaseapproval/index.vue @@ -0,0 +1,477 @@ + + + + + + + diff --git a/src/views/user/index.vue b/src/views/user/index.vue index e012a0a..ba83b93 100644 --- a/src/views/user/index.vue +++ b/src/views/user/index.vue @@ -149,7 +149,7 @@ v-loading="tabsLoading" element-loading-text="拼命加载中" > - +