申请更新

.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.114:9001'
+VUE_APP_FACE_API =  'http://192.168.1.114:5000'

.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.114:9001'
+VUE_APP_FACE_API ='http://192.168.1.114:5000'
 

.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.114:9001'
+VUE_APP_FACE_API='http://192.168.1.114:5000'
 

src/router/modules/reagent.js

@@ -231,20 +231,20 @@ const reagentRouter = [
       }
     ]
   },
-  // {
-  //   path: '/reagent/client',
-  //   component: Layout,
-  //   redirect: '/reagent/client/index',
-  //   meta: { classification: 'reagent', module_code: 'CabinetIndex' },
-  //   children: [
-  //     {
-  //       path: 'index',
-  //       name: 'Client',
-  //       component: () => import('@/views/reagent/client/index'),
-  //       meta: { title: '柜体管理', icon: '柜体管理', classification: 'reagent' }
-  //     }
-  //   ]
-  // },
+  {
+    path: '/reagent/client',
+    component: Layout,
+    redirect: '/reagent/client/index',
+    meta: { classification: 'reagent', module_code: 'CabinetIndex' },
+    children: [
+      {
+        path: 'index',
+        name: 'Client',
+        component: () => import('@/views/reagent/client/index'),
+        meta: { title: '柜体管理', icon: '柜体管理', classification: 'reagent' }
+      }
+    ]
+  },
   {
     path: '/reagent/envrecord',
     component: Layout,

src/views/reagent/applymanagement/index.vue

@@ -40,6 +40,7 @@
       <el-table-column prop="solve_user_name" show-overflow-tooltip label="审批人1" align="center" />
       <el-table-column prop="solve_user_pt_name" show-overflow-tooltip label="审批人2" align="center" />
       <el-table-column prop="solve_date" show-overflow-tooltip label="审批时间" align="center" />
+      <el-table-column prop="information" show-overflow-tooltip label="备注" align="center" />
       <el-table-column
         fixed="right"
         label="操作"
@@ -69,7 +70,7 @@
       title="选择审批生效时间"
     >
       <div class="box">
-        <el-form ref="form" :model="form" label-width="80px">
+        <el-form ref="form" label-width="80px">
           <el-form-item label="生效时间">
             <el-radio-group v-model="radio1">
               <el-radio  label="2" border>2小时</el-radio>
@@ -158,8 +159,8 @@ export default {
       history_page: 1,
       history_page_size: 15,
       history_total: 100,
-      statusColorMap: ['warning','success'],
-      statusMap: ['未处理', '已处理'],
+      statusColorMap: ['warning','success','danger'],
+      statusMap: ['未处理', '已处理','已驳回'],
       row:''
     }
   },

src/views/reagent/createapply/index.vue

@@ -108,10 +108,15 @@
       <el-table-column prop="user_name_pt" show-overflow-tooltip label="陪同用户名称" align="center" />
       <el-table-column prop="use_content" show-overflow-tooltip label="试剂详情" align="center" />
       <el-table-column prop="create_date" show-overflow-tooltip label="申请时间" align="center" />
+      <el-table-column prop="is_solve" show-overflow-tooltip label="状态" align="center">
+        <template slot-scope="scope">
+          <el-tag :type="statusColorMap[scope.row.is_solve]">{{ statusMap[scope.row.is_solve] }}</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column prop="solve_user_name" show-overflow-tooltip label="审批人1" align="center" />
       <el-table-column prop="solve_user_pt_name" show-overflow-tooltip label="审批人2" align="center" />
       <el-table-column prop="solve_date" show-overflow-tooltip label="审批时间" align="center" />
-
+      <el-table-column prop="information" show-overflow-tooltip label="备注" align="center" />
     </el-table>
     <div class="my-pagination" style="text-align: center">
       <el-pagination
@@ -168,6 +173,8 @@ export default {
       pt_form:{
         user_id_pt: '',
       },
+      statusColorMap: ['warning','success','danger'],
+      statusMap: ['未处理', '已处理','已驳回'],
       rules: {
         user_id_pt: [
           { required: true, message: '请选择陪同人', trigger: 'change' }