diff --git a/.env.development b/.env.development
index 9a40c2e..8971a6a 100644
--- a/.env.development
+++ b/.env.development
@@ -2,5 +2,5 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'http://192.168.1.101:9001'
-VUE_APP_FACE_API =  'http://192.168.1.101:5000'
+VUE_APP_BASE_API = 'http://127.0.0.1:9001'
+VUE_APP_FACE_API =  'http://127.0.0.1:5000'
diff --git a/.env.production b/.env.production
index ef2289e..03db484 100644
--- a/.env.production
+++ b/.env.production
@@ -2,6 +2,6 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = 'http://192.168.1.101:9001'
-VUE_APP_FACE_API ='http://192.168.1.101:5000'
+VUE_APP_BASE_API = 'http://127.0.0.1:9001'
+VUE_APP_FACE_API ='http://127.0.0.1:5000'
 
diff --git a/.env.staging b/.env.staging
index 56484f7..c1452c1 100644
--- a/.env.staging
+++ b/.env.staging
@@ -4,6 +4,6 @@ NODE_ENV = production
 ENV = 'staging'
 
 # base api
-VUE_APP_BASE_API = 'http://192.168.1.101:9001'
-VUE_APP_FACE_API='http://192.168.1.101:5000'
+VUE_APP_BASE_API = 'http://127.0.0.1:9001'
+VUE_APP_FACE_API='http://127.0.0.1:5000'
 
diff --git a/src/assets/2-主界面/index.js b/src/assets/2-主界面/index.js
index bcef190..a5658ae 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 5f8f704..51a8825 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',
@@ -109,7 +109,7 @@ const reagentRouter = [
         path: 'index',
         name: 'PurchaseApproval',
         component: () => import('@/views/reagent/purchaseapproval/index'),
-        meta: { title: '采购审批', icon: '请购', classification: 'reagent'}
+        meta: { title: '采购审批', icon: '表单', classification: 'reagent'}
       }
     ]
   },
@@ -123,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' }
       }
     ]
   },
@@ -137,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' }
   //     }
   //   ]
   // },
@@ -151,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' }
       }
     ]
   },
@@ -165,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' }
       }
     ]
   },
@@ -179,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' }
       }
     ]
   },
@@ -193,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' }
       }
     ]
   },
@@ -207,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' }
   //     }
   //   ]
   // },
@@ -221,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' }
       }
     ]
   },
@@ -249,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' }
       }
     ]
   },
diff --git a/src/utils/index.js b/src/utils/index.js
index 6cd0690..1f35685 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 c9944db..9954340 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 7b13caf..5bc34b7 100644
--- a/src/views/reagent/buy/index.vue
+++ b/src/views/reagent/buy/index.vue
@@ -4,107 +4,76 @@
     <div class="header">
       <el-button type="primary" plain @click="openDialogTableVisible"><i class="el-icon-edit" />新建采购申请单</el-button>
 
+      <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="adddialogVisible">
+        <el-row :gutter="15">
+          <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="110px">
+          <el-col :span="12">
+            <el-form-item label="试剂名称" prop="name">
+              <el-input v-model="formData.name" placeholder="请输入试剂名称" clearable :style="{width: '100%'}" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="CAS码" prop="cas_number">
+              <el-input v-model="formData.cas_number" placeholder="请输入CAS码" clearable :style="{width: '100%'}" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="试剂纯度" prop="purity">
+              <el-input v-model="formData.purity" placeholder="请输入试剂纯度" clearable :style="{width: '100%'}" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="采购数量" prop="export_count">
+              <el-input v-model="formData.export_count" placeholder="请输入采购数量" clearable :style="{width: '100%'}" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="规格" prop="speci">
+              <el-input v-model="formData.speci" placeholder="请输入规格" clearable :style="{width: '100%'}" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="单位" prop="net_weight_unit">
+              <el-input v-model="formData.net_weight_unit" placeholder="请输入单位" clearable :style="{width: '100%'}" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="预估质量" prop="net_weight">
+              <el-input v-model="formData.net_weight" placeholder="请输入预估质量" clearable :style="{width: '100%'}" />
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div style="text-align: center">
+        <el-button type="primary" @click="handelConfirm">保存</el-button>
+      </div>
 
 
-      <!-- <el-dialog :title="dialogTitile" :close-on-click-modal="false" :visible.sync="dialogVisible" @close="onClose">
-        <el-row :gutter="15">
-          <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="80px">
-            <el-col :span="24">
-              <el-form-item label="柜体名称" prop="client_name">
-                <el-input
-                  v-model="formData.client_name"
-                  placeholder="请输入柜体名称"
-                  clearable
-                  :style="{width: '100%'}"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="柜体标题" prop="client_title">
-                <el-input
-                  v-model="formData.client_title"
-                  placeholder="请输入柜体标题"
-                  clearable
-                  :style="{width: '100%'}"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="柜体序号" prop="client_code">
-                <el-input v-model="formData.client_code" placeholder="请输入柜体序号" clearable :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="柜体类型" prop="client_type">
-                <el-input v-model="formData.client_type" placeholder="请输入柜体类型" clearable :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="柜体位置" prop="place">
-                <el-autocomplete
-                v-model="formData.place"
-                class="inline-input"
-                :style="{width: '100%'}"
-                :fetch-suggestions="querySearchAsync"
-                clearable
-                placeholder="请输入柜体位置"
-                @select="handleSelect"
-              />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="单元数量" prop="layer_num">
-                <el-input  v-model="formData.layer_num" placeholder="请输入柜体单元数量" clearable :style="{width: '100%'}" :disabled="dialogTitile =='编辑柜体信息' ? true:false" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="柜体滤芯 生产日期" prop="filter_production_date">
-                <el-date-picker
-                  v-model="formData.filter_production_date"
-                  style="width: 100%"
-                  type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="请选择柜体滤芯 生产日期"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="提醒滤芯 到期提前" prop="filter_shelf_life_warning_value">
-                <el-input
-                  v-model="formData.filter_shelf_life_warning_value"
-                  placeholder="请输入提醒滤芯 到期提前"
-                  clearable
-                  :style="{width: '100%'}"
-                >
-                  <template slot="append">天</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="联系人" prop="contact_people_name">
-                <el-input v-model="formData.contact_people_name" placeholder="请输入联系人" clearable :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="联系电话" prop="contact_phone">
-                <el-input v-model="formData.contact_phone" placeholder="请输入联系电话" clearable :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="说明" prop="description">
-                <el-input v-model="formData.description" placeholder="请输入说明" clearable :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-          </el-form>
-        </el-row>
-        <div slot="footer" style="text-align: center">
-          <el-button @click="onClose">取消</el-button>
-          <el-button type="primary" @click="handelConfirm">确定</el-button>
-        </div>
-      </el-dialog> -->
 
+        <el-table :data="checkList" max-height="250" style="height:250px;padding-bottom: 50px;">
+          <el-table-column type="index" align="center"  width="50" label="序号" />
+          <el-table-column prop="name" show-overflow-tooltip label="试剂名称" align="center" />
+          <el-table-column prop="cas_number" show-overflow-tooltip label="CAS码" align="center" />
+          <el-table-column prop="speci" show-overflow-tooltip label="规格" align="center" />
+          <el-table-column prop="purity" show-overflow-tooltip label="纯度" align="center" />
+          <el-table-column prop="net_weight_unit" show-overflow-tooltip label="单位" align="center" />
+          <el-table-column prop="export_count" show-overflow-tooltip label="数量" align="center" />
+          <el-table-column prop="net_weight" show-overflow-tooltip label="预估质量" align="center" />
+          <el-table-column
+            fixed="right"
+            label="操作"
+            width="100">
+            <template slot-scope="scope">
+              <el-button @click="cancelClick(scope.row)" type="text" size="small">取消申请</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
 
+        <div slot="footer" style="text-align: center">
+          <el-button @click="dialogTableClose">取消</el-button>
+          <el-button type="primary" @click="create_apply">提交申请</el-button>
+        </div>
+      </el-dialog>
 
       <el-dialog
         title="撤销采购单申请"
@@ -171,6 +140,7 @@
 </template>
 
 <script>
+import { throttle } from '@/utils'
 import stringify from '@/utils/stringify'
 import {
   get_list,
@@ -190,15 +160,24 @@ export default {
       total: 0,
       tableData: [],
       centerDialogVisible: false,
+      adddialogVisible:false,
       row_id:'',
+      formData: {
+        name: undefined,
+        cas_number: undefined,
+        purity: undefined,
+        export_count:undefined,
+        speci: undefined,
+        net_weight_unit: undefined,
+        net_weight: undefined
+      },
       statusColorMap: ['warning','success','danger'],
       statusMap: ['未处理', '已处理','已驳回'],
+      title:'',
 
       seach_word:'',
-      total1: 0,
       client_id: '',
       dialogVisible: false,
-      tableData1: [],
       headerStyle: { 'background': '#E6E6E6' },
       multipleSelection: [],
       handleSelectionSelection: [],
@@ -209,20 +188,68 @@ export default {
       history_client_id: '',
       value1: '',
       value2: ['', ''],
-      history_page: 1,
-      history_page_size: 15,
-      history_total: 100,
       dialogTableVisible: false,
       checkList: [],
-      ptUserArray:[],
-      pt_form:{
-        user_id_pt: '',
-      },
-      
       rules: {
-        user_id_pt: [
-          { required: true, message: '请选择陪同人', trigger: 'change' }
+        name: [
+          { required: true, message: '请输入试剂名称', trigger: 'change' }
+        ],
+        purity: [
+          { required: true, message: '请输入试剂纯度', trigger: 'change' }
+        ],
+        export_count:[
+          { required: true, message: '请输入数量', trigger: 'blur' },
+          { 
+            validator (rule, value, callback) {
+              if (/(^[1-9]\d*$)/.test(value)) {
+                callback()
+              } else {
+                callback(new Error('请输入正整数'))
+              }
+            },
+            trigger: 'blur'
+          }
+        ],
+        speci: [
+          { required: true, message: '请输入试剂规格', trigger: 'change' },
+          { 
+            validator (rule, value, callback) {
+              if (/(^[1-9]\d*$)/.test(value)) {
+                callback()
+              } else {
+                callback(new Error('请输入正整数'))
+              }
+            },
+            trigger: 'blur'
+          }
+        ],
+        net_weight_unit: [
+          { required: true, message: '请输入单位', trigger: 'change' },
+          { 
+            validator (rule, value, callback) {
+              if (/(^[1-9]\d*$)/.test(value)) {
+                callback()
+              } else {
+                callback(new Error('请输入正整数'))
+              }
+            },
+            trigger: 'blur'
+          }
+
         ],
+        net_weight: [
+          { required: true, message: '请输入预估质量', trigger: 'change' },
+          { 
+            validator (rule, value, callback) {
+              if (/(^[1-9]\d*$)/.test(value)) {
+                callback()
+              } else {
+                callback(new Error('请输入正整数'))
+              }
+            },
+            trigger: 'blur'
+          }
+        ]
       }
     }
   },
@@ -230,11 +257,22 @@ export default {
     this.get_drug_group()
   },
   methods: {
-    //获取试剂列表
+    //添加
+    handelConfirm:function() {
+      this.$refs['elForm'].validate(valid => {
+        if (valid) {
+          this.checkList.push(this.formData)
+          console.log(this.formData, '-----------------------')
+        }
+        if (!valid) return
+      })
+    }, 
+
+    //获取采购单
     get_drug_group: function() {
       var that =this
       const data = {
-        page:1,
+        page:that.page,
         page_size: 10
       }
       get_list(stringify(data)).then(rsp => {
@@ -243,6 +281,7 @@ export default {
         this.total = rsp.data.total_count
       })
     },
+    //导出
     handleExport(row){
       const data = {
         id: row.id,
@@ -257,10 +296,12 @@ export default {
         }
       ).finally(() => { this.recordLoading = false })
     },
+    //撤销弹窗
     handback(row){
       this.row_id =row.id
       this.centerDialogVisible =true
     },
+    //撤销
     backcheck(){
       this.recordLoading = true
       const data = {
@@ -279,14 +320,6 @@ export default {
         }
       ).finally(() => { this.recordLoading = false })
     },
-
-
-
-
-
-
-
-
     //勾选
     handleSelection(selection){
       var that =this 
@@ -294,8 +327,14 @@ export default {
     },
     // 查看详情
     handleCheck(row) {
-      this.dialogHistoryVisible = true
-      this.historyData = JSON.parse(row.use_content) 
+      this.title='编辑采购试剂'
+      this.row_id =row.id
+      if(row.is_solve==1){
+        this.$message.error('已处理无法修改')
+      }else{
+        this.adddialogVisible = true
+        this.checkList = JSON.parse(row.use_content) 
+      }
       // if (this.handleSelectionSelection.length === 1) {
       //   this.dialogHistoryVisible = true
       //   this.historyData = JSON.parse(this.handleSelectionSelection[0].use_content) 
@@ -303,122 +342,87 @@ export default {
       //   this.$message.warning("选择一条记录操作！")
       // }
     },
-    //查看详情关闭
-    dialogHistoryClose() {
-      this.dialogHistoryVisible = false
-      this.historyData = []
-    },
-
-    //添加申请列表
-    handleClick(row){
-      var that =this
-      var result = that.checkList.filter(item => item).map(item => item.bar_code);
-      if(result.indexOf(row.bar_code) !=-1){
-        that.$message({
-          type: 'info',
-          message: '不可重复添加'
-        }); 
-      }else{
-        that.checkList.push(row)
-        let getLocation = that.tableData.indexOf(row);
-        that.tableData.splice(getLocation, 1)
-      } 
-    },
     //取消试剂申请
     cancelClick(row){
       var that =this
       let getLocation = that.checkList.indexOf(row);
       that.checkList.splice(getLocation, 1)
     },
-    
-
-    //获取申请列表 
-    get_apply(){
-      const data = {
-        page:this.page,
-        page_size: this.page_size
+    //申请页翻页
+    pageChange(page) {
+      this.page = page
+      this.get_drug_group()
+    },
+    addDataIndex(initData){
+      for (let i = 0; i < initData.length; i++) {
+        initData[i]["index"] = i
       }
-      get_apply_list(stringify(data)).then(rsp => {
-        console.log("apply>>>", rsp)
-        this.tableData1 = rsp.data.data_list
-        this.total1 = rsp.data.total_count
-      })
+      return initData
     },
-
-    //陪同用户
-    get_pt_user() {
-      console.log("jjj")
-      const data = {
-        page: 1,
-        page_size: 10000,
-        user_id:this.$store.state.user.id,
-        user_code: this.user_code,
-        real_name: this.real_name,
-        role_id: this.role_id,
-        is_enabled: this.is_enabled
+    //申请
+    handleRefresh() {
+      this.page =1
+      this.get_drug_group()
+    },
+    //打开申请列表
+    openDialogTableVisible(){
+      this.title='新增采购试剂'
+      this.adddialogVisible = true
+    },
+    //关闭申请列表
+    dialogTableClose() {
+      this.adddialogVisible = false
+      this.checkList=[]
+      this.formData = {
+        name: undefined,
+        cas_number: undefined,
+        purity: undefined,
+        export_count:undefined,
+        speci: undefined,
+        net_weight_unit: undefined,
+        net_weight: undefined
       }
-      console.log("hhhhh")
-      get_pt_user_list(stringify(data)).then(res => {
-        this.ptUserArray = res.data.data_list
-        console.log("res>>>", res)
-      })
-      console.log("giao")
     },
     //提交申请
-    create_apply(pt_from){
+    create_apply(){
       var that =this 
       let datalist = that.checkList.map((item) => {
-        return Object.assign({}, { name: item.name, num: item.num,client_id: item.client_id, purity: item.purity, speci: item.speci})
+        return Object.assign({}, {net_weight_unit: item.net_weight_unit, net_weight: item.net_weight, name: item.name, cas_number: item.cas_number,purity: item.purity, export_count: item.export_count, speci: item.speci})
       })
-      if (pt_from.user_id_pt === '') {
-        that.$message({
-          type: 'info',
-          message: '请选择陪同人'
-        }); 
+      if(this.title=='编辑采购试剂'){
+        const data = {
+          id: this.row_id,
+          use_content: JSON.stringify(datalist),
+        }
+        update(stringify(data)).then(rsp => {
+          console.log("rsp>>", rsp)
+          if (rsp.status==0){
+            this.dialogTableClose()
+            //清空表格多选框
+            this.$refs.multipleTable.clearSelection();
+            that.checkList=[]
+            this.page =1
+            this.get_drug_group()
+          }
+        })
       }else{
         const data = {
-          user_id: this.$store.state.user.id,
-          user_id_pt: pt_from.user_id_pt,
+          use_doc: '',
           use_content: JSON.stringify(datalist),
         }
-        add_apply(stringify(data)).then(rsp => {
+        add(stringify(data)).then(rsp => {
           console.log("rsp>>", rsp)
           if (rsp.status==0){
             this.dialogTableClose()
             //清空表格多选框
             this.$refs.multipleTable.clearSelection();
             that.checkList=[]
-            this.get_apply()
+            this.page =1
+            this.get_drug_group()
           }
         }) 
       }
     },
-    //申请页翻页
-    pageChange(page) {
-      this.page = page
-      this.get_apply()
-    },
-    addDataIndex(initData){
-      for (let i = 0; i < initData.length; i++) {
-        initData[i]["index"] = i
-      }
-      return initData
-    },
-    //申请
-    handleRefresh() {
-      this.get_apply()
-      this.get_drug_group()
-    },
-    //打开申请列表
-    openDialogTableVisible(){
-      this.dialogTableVisible = true
-    },
-    //关闭申请列表
-    dialogTableClose() {
-      this.user_id_pt = ''
-      this.dialogTableVisible = false
-      this.checkList=[]
-    },
   }
 }
 </script>
diff --git a/src/views/reagent/purchaseapproval/index.vue b/src/views/reagent/purchaseapproval/index.vue
index 7b13caf..906bee6 100644
--- a/src/views/reagent/purchaseapproval/index.vue
+++ b/src/views/reagent/purchaseapproval/index.vue
@@ -1,138 +1,21 @@
 <template>
   <div class="main-container-text">
-    <div class="title">采购申请</div>
+    <div class="title">采购审批</div>
     <div class="header">
-      <el-button type="primary" plain @click="openDialogTableVisible"><i class="el-icon-edit" />新建采购申请单</el-button>
-
-
-
-      <!-- <el-dialog :title="dialogTitile" :close-on-click-modal="false" :visible.sync="dialogVisible" @close="onClose">
-        <el-row :gutter="15">
-          <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="80px">
-            <el-col :span="24">
-              <el-form-item label="柜体名称" prop="client_name">
-                <el-input
-                  v-model="formData.client_name"
-                  placeholder="请输入柜体名称"
-                  clearable
-                  :style="{width: '100%'}"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="柜体标题" prop="client_title">
-                <el-input
-                  v-model="formData.client_title"
-                  placeholder="请输入柜体标题"
-                  clearable
-                  :style="{width: '100%'}"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="柜体序号" prop="client_code">
-                <el-input v-model="formData.client_code" placeholder="请输入柜体序号" clearable :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="柜体类型" prop="client_type">
-                <el-input v-model="formData.client_type" placeholder="请输入柜体类型" clearable :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="柜体位置" prop="place">
-                <el-autocomplete
-                v-model="formData.place"
-                class="inline-input"
-                :style="{width: '100%'}"
-                :fetch-suggestions="querySearchAsync"
-                clearable
-                placeholder="请输入柜体位置"
-                @select="handleSelect"
-              />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="单元数量" prop="layer_num">
-                <el-input  v-model="formData.layer_num" placeholder="请输入柜体单元数量" clearable :style="{width: '100%'}" :disabled="dialogTitile =='编辑柜体信息' ? true:false" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="柜体滤芯 生产日期" prop="filter_production_date">
-                <el-date-picker
-                  v-model="formData.filter_production_date"
-                  style="width: 100%"
-                  type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="请选择柜体滤芯 生产日期"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="提醒滤芯 到期提前" prop="filter_shelf_life_warning_value">
-                <el-input
-                  v-model="formData.filter_shelf_life_warning_value"
-                  placeholder="请输入提醒滤芯 到期提前"
-                  clearable
-                  :style="{width: '100%'}"
-                >
-                  <template slot="append">天</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="联系人" prop="contact_people_name">
-                <el-input v-model="formData.contact_people_name" placeholder="请输入联系人" clearable :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="联系电话" prop="contact_phone">
-                <el-input v-model="formData.contact_phone" placeholder="请输入联系电话" clearable :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="说明" prop="description">
-                <el-input v-model="formData.description" placeholder="请输入说明" clearable :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-          </el-form>
-        </el-row>
-        <div slot="footer" style="text-align: center">
-          <el-button @click="onClose">取消</el-button>
-          <el-button type="primary" @click="handelConfirm">确定</el-button>
-        </div>
-      </el-dialog> -->
-
-
-
-      <el-dialog
-        title="撤销采购单申请"
-        :visible.sync="centerDialogVisible"
-        width="30%"
-        center>
-        <span>是否确认撤销</span>
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="centerDialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="backcheck()">确 定</el-button>
-        </span>
-      </el-dialog>
-
+      <!-- <el-button type="primary" plain @click="handleCheck"><i class="el-icon-edit" />详情查看</el-button> -->
       <div class="header-right">
         <el-button icon="el-icon-refresh" circle @click="handleRefresh" />
       </div>
     </div>
     <el-table
       stripe
-      ref="multipleTable"
       :data="tableData"
       :header-cell-style="headerStyle"
-      @select="handleSelection"
-      row-key="medicament_id"
       height="69vh"
-      class="table-style"
+      @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" />
+
+    <el-table-column type="selection" width="55" align="center" />
       <el-table-column align="center" type="index" width="50" label="序号" />
       <el-table-column prop="user_name" show-overflow-tooltip label="采购申请人" align="center" />
       <el-table-column prop="create_date" show-overflow-tooltip label="申请时间" align="center" />
@@ -149,11 +32,10 @@
         fixed="right"
         label="操作"
         align="center"
-        width="250">
+        width="100">
         <template slot-scope="scope">
-          <el-button @click="handleCheck(scope.row)" type="text" size="small">修改申请单</el-button>
-          <el-button @click="handback(scope.row)" type="text" size="small">撤销申请单</el-button>
-          <el-button @click="handleExport(scope.row)" type="text" size="small">导出申请单</el-button>
+          <el-button @click="handleCheck(scope.row)" type="text" size="small">查看</el-button>
+          <el-button @click="handleClick(scope.row)" type="text" size="small">审批</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -167,11 +49,55 @@
         @current-change="pageChange"
       />
     </div>
+    <el-dialog
+      :visible.sync="dialogVisible"
+      width="30%"
+      height="500px"
+      title="采购单审批"
+    >
+      <div class="box">
+        <el-form ref="form" label-width="80px">
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="radio2">
+              <el-radio  label="1" border>同意</el-radio>
+              <el-radio  label="0" border>驳回</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="备注">
+            <el-input type="textarea" v-model="information"></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div slot="footer" style="text-align: center">
+        <el-button @click="dialogVisible=false">取消</el-button>
+        <el-button type="primary" @click="handelConfirm">确定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :close-on-click-modal="false" :visible.sync="dialogHistoryVisible" width="60%" title="采购详情">
+      <div class="box">
+        <el-scrollbar style="height: 100%">
+          <el-table
+            v-loading="loadingHistory"
+            element-loading-text="拼命加载中"
+            :header-cell-style="headerStyle"
+            :data="historyData"
+            height="420"
+            @close="dialogHistoryClose"
+          >
+            <el-table-column align="center" type="index" width="50" label="序号" />
+            <el-table-column align="center" property="name" label="试剂名称" />
+            <el-table-column align="center" property="purity" label="纯度" />
+            <el-table-column align="center" property="speci" label="规格" />
+            <el-table-column align="center" property="export_count" label="数量" />
+          </el-table>
+        </el-scrollbar>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import stringify from '@/utils/stringify'
 import {
   get_list,
   add,
@@ -179,51 +105,30 @@ import {
   solve,
   del
 } from '@/api/reagent/purchase'
-import { dowload,click_dowload } from '@/api/reagent/dowload_file'
-
+import stringify from '@/utils/stringify'
 export default {
-  name: 'Buy',
+  name: 'PurchaseApproval',
   data() {
     return {
+      radio2:'1',
+      information:'',
       page: 1,
       page_size: 10,
       total: 0,
-      tableData: [],
-      centerDialogVisible: false,
-      row_id:'',
-      statusColorMap: ['warning','success','danger'],
-      statusMap: ['未处理', '已处理','已驳回'],
-
-      seach_word:'',
-      total1: 0,
-      client_id: '',
       dialogVisible: false,
-      tableData1: [],
+      tableData: [],
       headerStyle: { 'background': '#E6E6E6' },
       multipleSelection: [],
       handleSelectionSelection: [],
       dialogHistoryVisible: false,
       loadingHistory: false,
       historyData: [],
-      name: '',
-      history_client_id: '',
-      value1: '',
-      value2: ['', ''],
       history_page: 1,
       history_page_size: 15,
       history_total: 100,
-      dialogTableVisible: false,
-      checkList: [],
-      ptUserArray:[],
-      pt_form:{
-        user_id_pt: '',
-      },
-      
-      rules: {
-        user_id_pt: [
-          { required: true, message: '请选择陪同人', trigger: 'change' }
-        ],
-      }
+      statusColorMap: ['warning','success','danger'],
+      statusMap: ['未处理', '已处理','已驳回'],
+      row:''
     }
   },
   created () {
@@ -234,8 +139,8 @@ export default {
     get_drug_group: function() {
       var that =this
       const data = {
-        page:1,
-        page_size: 10
+        page:this.page,
+        page_size: this.page_size
       }
       get_list(stringify(data)).then(rsp => {
         console.log("rsp.data.data_list>>", rsp.data.data_list)
@@ -243,181 +148,54 @@ export default {
         this.total = rsp.data.total_count
       })
     },
-    handleExport(row){
-      const data = {
-        id: row.id,
-        file_name: '请购单'
-      }
-      this.recordLoading = true
-      // 导出
-      dowload(data).then(
-        res => {
-          this.$message.success(res.statusText)
-          click_dowload(data, res)
-        }
-      ).finally(() => { this.recordLoading = false })
-    },
-    handback(row){
-      this.row_id =row.id
-      this.centerDialogVisible =true
-    },
-    backcheck(){
-      this.recordLoading = true
-      const data = {
-        id: this.row_id,
+    addDataIndex(initData){
+      for (let i = 0; i < initData.length; i++) {
+        initData[i]["index"] = i
       }
-      // 撤销
-      del(stringify(data)).then(
-        res => {
-          if (res.status ==0){
-            this.centerDialogVisible =false
-            this.$message.success(res.msg)
-            this.get_drug_group()
-          }else{
-            this.$message.error(res.msg)
-          }    
-        }
-      ).finally(() => { this.recordLoading = false })
-    },
-
-
-
-
-
-
-
-
-    //勾选
-    handleSelection(selection){
-      var that =this 
-      that.handleSelectionSelection =selection
-    },
-    // 查看详情
-    handleCheck(row) {
-      this.dialogHistoryVisible = true
-      this.historyData = JSON.parse(row.use_content) 
-      // if (this.handleSelectionSelection.length === 1) {
-      //   this.dialogHistoryVisible = true
-      //   this.historyData = JSON.parse(this.handleSelectionSelection[0].use_content) 
-      // } else {
-      //   this.$message.warning("选择一条记录操作！")
-      // }
-    },
-    //查看详情关闭
-    dialogHistoryClose() {
-      this.dialogHistoryVisible = false
-      this.historyData = []
+      return initData
     },
-
-    //添加申请列表
     handleClick(row){
       var that =this
-      var result = that.checkList.filter(item => item).map(item => item.bar_code);
-      if(result.indexOf(row.bar_code) !=-1){
-        that.$message({
-          type: 'info',
-          message: '不可重复添加'
-        }); 
-      }else{
-        that.checkList.push(row)
-        let getLocation = that.tableData.indexOf(row);
-        that.tableData.splice(getLocation, 1)
-      } 
-    },
-    //取消试剂申请
-    cancelClick(row){
-      var that =this
-      let getLocation = that.checkList.indexOf(row);
-      that.checkList.splice(getLocation, 1)
-    },
-    
-
-    //获取申请列表 
-    get_apply(){
-      const data = {
-        page:this.page,
-        page_size: this.page_size
-      }
-      get_apply_list(stringify(data)).then(rsp => {
-        console.log("apply>>>", rsp)
-        this.tableData1 = rsp.data.data_list
-        this.total1 = rsp.data.total_count
-      })
+      that.row=row
+      that.dialogVisible=true
     },
-
-    //陪同用户
-    get_pt_user() {
-      console.log("jjj")
-      const data = {
-        page: 1,
-        page_size: 10000,
-        user_id:this.$store.state.user.id,
-        user_code: this.user_code,
-        real_name: this.real_name,
-        role_id: this.role_id,
-        is_enabled: this.is_enabled
+    handelConfirm(){
+      var that=this
+      const data={
+        id:that.row.id,
+        result:that.radio2,
+        information:that.information
       }
-      console.log("hhhhh")
-      get_pt_user_list(stringify(data)).then(res => {
-        this.ptUserArray = res.data.data_list
-        console.log("res>>>", res)
-      })
-      console.log("giao")
-    },
-    //提交申请
-    create_apply(pt_from){
-      var that =this 
-      let datalist = that.checkList.map((item) => {
-        return Object.assign({}, { name: item.name, num: item.num,client_id: item.client_id, purity: item.purity, speci: item.speci})
-      })
-      if (pt_from.user_id_pt === '') {
-        that.$message({
-          type: 'info',
-          message: '请选择陪同人'
-        }); 
-      }else{
-        const data = {
-          user_id: this.$store.state.user.id,
-          user_id_pt: pt_from.user_id_pt,
-          use_content: JSON.stringify(datalist),
-        }
-        add_apply(stringify(data)).then(rsp => {
-          console.log("rsp>>", rsp)
-          if (rsp.status==0){
-            this.dialogTableClose()
-            //清空表格多选框
-            this.$refs.multipleTable.clearSelection();
-            that.checkList=[]
-            this.get_apply()
+      solve(stringify(data)).then(rsp => {
+          console.log(rsp)
+          if (rsp.status === 0) {
+            this.$message.success("审批成功！")
+            this.handleRefresh()
+            that.dialogVisible=false
+          } else {
+            this.$message.error(rsp.msg)
           }
-        }) 
-      }
+        })
     },
-    //申请页翻页
     pageChange(page) {
       this.page = page
-      this.get_apply()
+      this.get_drug_group()
     },
-    addDataIndex(initData){
-      for (let i = 0; i < initData.length; i++) {
-        initData[i]["index"] = i
-      }
-      return initData
+    handleSelectionChange(val) {
+      this.handleSelectionSelection = val
     },
-    //申请
     handleRefresh() {
-      this.get_apply()
+      this.page = 1
       this.get_drug_group()
     },
-    //打开申请列表
-    openDialogTableVisible(){
-      this.dialogTableVisible = true
+    // 查看 录入信息
+    handleCheck(row) {
+      this.dialogHistoryVisible = true
+      this.historyData = JSON.parse(row.use_content) 
     },
-    //关闭申请列表
-    dialogTableClose() {
-      this.user_id_pt = ''
-      this.dialogTableVisible = false
-      this.checkList=[]
+    dialogHistoryClose() {
+      this.dialogHistoryVisible = false
+      this.historyData = []
     },
   }
 }
@@ -450,6 +228,7 @@ export default {
 
     .header-right {
       float: right;
+      margin-bottom: 1rem;
     }
   }
 }
@@ -472,6 +251,6 @@ export default {
   overflow-x: hidden;
 }
 /* .el-dialog__body {
-  height: 600px !important;
+  height: 500px;
 } */
 </style>
diff --git a/src/views/reagent/warehousing/index.vue b/src/views/reagent/warehousing/index.vue
index 35254f2..506db95 100644
--- a/src/views/reagent/warehousing/index.vue
+++ b/src/views/reagent/warehousing/index.vue
@@ -14,6 +14,7 @@
         </el-select>
         <el-button type="primary" @click="handleReagentToDatabase">选择{{ $store.state.app.title }}入库</el-button>
         <el-button type="primary" @click="handleBindToDB">绑定入库</el-button>
+        <el-button type="primary" @click="purchasePutIn">采购验收入库</el-button>
         <el-button type="primary" plain @click="handleAddTmp('add')">+ 新增{{ $store.state.app.title }}模板</el-button>
         <el-button @click="handleAddTmp('modify')"><i class="el-icon-edit" />编辑{{ $store.state.app.title }}模板</el-button>
         <el-button @click="handlePrintCode"><i class="el-icon-printer" /> 打印条码</el-button>
@@ -392,6 +393,80 @@
       </div>
     </el-dialog>
 
+    <el-dialog :visible.sync="PutInVisible" :close-on-click-modal="false" title="采购验收入库" width="70%">
+      <el-table
+          ref="multipleTable"
+          v-loading="loading"
+          element-loading-text="拼命加载中"
+          :header-cell-style="headerStyle"
+          :data="tableData1"
+          style="width: 100%"
+          height="420"
+          size="medium"
+          stripe
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center"
+          />
+          <el-table-column
+            align="center"
+            type="index"
+            width="50"
+            label="序号"
+          />
+          <el-table-column
+            prop="template_name"
+            label="模板名称"
+            sortable
+            align="center"
+          />
+          <el-table-column
+            prop="client_name"
+            label="所处位置"
+            sortable
+            align="center"
+          />
+          <el-table-column
+            align="center"
+            prop="all_export_count"
+            label="入库数量"
+          />
+          <el-table-column
+            align="center"
+            prop="create_date"
+            label="创建时间"
+          />
+          <el-table-column
+            align="center"
+            prop="create_user_name"
+            label="创建人"
+          />
+          <el-table-column
+            label="操作"
+            align="center"
+            width="300">
+            <template slot-scope="scope">
+              <el-button @click="handleAddTmp1(scope.row)" type="text" size="small">查看详情</el-button>
+              <el-button @click="handlePrintCode1(scope.row)" type="text" size="small">打印条码</el-button>
+              <el-button @click="handleBindToDB1(scope.row)" type="text" size="small">绑定入库</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="page my-pagination">
+          <el-pagination
+            background
+            layout="prev, pager, next"
+            :current-page.sync="page1"
+            :total="total1"
+            :page-size.sync="page_size"
+            @current-change="tmpPageChange1"
+          />
+        </div>
+    </el-dialog>
+    
     <Scanner @getcode="getCode" />
   </div>
 </template>
@@ -498,7 +573,13 @@ export default {
       importFile: undefined,
       currentItem: {},
       imgViewerVisible:false,
-      UPLOAD_URL: process.env.VUE_APP_BASE_API + '/api/drug/save_drug_img'
+      UPLOAD_URL: process.env.VUE_APP_BASE_API + '/api/drug/save_drug_img',
+
+      //采购单入库
+      PutInVisible:false,
+      page1:1,
+      total1: 0,
+      tableData1: [],
     }
   },
   created() {
@@ -650,6 +731,17 @@ export default {
         })
       }
     },
+    handlePrintCode1(row) {
+        const template_id = row.template_id
+        console.log(template_id)
+        const data = {
+          template_id: template_id
+        }
+        pring_bar_code(stringify(data)).then(res => {
+          this.$message.success(res.msg)
+        })
+
+    },
     handlePringClose() {
       this.formData = {
         start_code: undefined,
@@ -708,6 +800,13 @@ export default {
         }
       )
     },
+    //采购入库弹窗
+    purchasePutIn(){
+
+      this.getTmpList1()
+
+      this.PutInVisible =true
+    },
     // 提交导入文件
     handleSubFile() {
       if (this.importFile) {
@@ -757,7 +856,8 @@ export default {
       show_tmp(stringify({
         page: this.page,
         page_size: this.page_size,
-        client_id: this.client_id
+        client_id: this.client_id,
+        is_add:0
       })).then(res => {
         this.tableData = res.data.data_list
         this.total = res.data.total_count
@@ -765,11 +865,29 @@ export default {
         this.loading = false
       })
     },
+    getTmpList1() {
+      this.loading = true
+      show_tmp(stringify({
+        page: this.page1,
+        page_size: this.page_size,
+        client_id: this.client_id,
+        is_add:1
+      })).then(res => {
+        this.tableData1 = res.data.data_list
+        this.total1 = res.data.total_count
+      }).finally(() => {
+        this.loading = false
+      })
+    },
     // 模板页翻页
     tmpPageChange(page) {
       this.page = page
       this.getTmpList()
     },
+    tmpPageChange1(page) {
+      this.page1 = page
+      this.getTmpList1()
+    },
     // 试剂入库信息翻页
     reagentPageChange(page) {
       this.reagent_page = page
@@ -855,6 +973,20 @@ export default {
         }
       }
     },
+    handleAddTmp1(row) {
+      // / 新增 编辑 试剂模板
+
+      this.opTitle = `编辑${this.$store.state.app.title}模板`
+      this.opType ='modify'
+      const data = row
+      this.reagentAddTmpName = data.template_name
+      this.reagentAddClient = data.client_id
+      this.reagentAddTmpData = JSON.parse(data.template_content).map((v, index) => {
+        v['index'] = index
+        return v
+      })
+      this.reagentAddVisible = true
+    },
     // 处理新增试剂模板 弹框关闭清理工作
     handleAddClose() {
       this.reagentAddTmpName = ''
@@ -959,6 +1091,36 @@ export default {
       if (this.multipleSelection.length === 1) {
         this.client_id_input = this.multipleSelection[0].client_id
       }
+      // 自动选择第一行数据
+      this.$nextTick(() => {
+        this.$refs.singleTable.setCurrentRow(this.bindToDBData[0])
+      })
+      this.bindToDBVisible = true
+      this.click_num = true
+    },
+    handleBindToDB1(row) {
+      if (this.click_num) {
+        return
+      }
+      this.bindToDBData = []
+
+      const items = JSON.parse(row.template_content)
+      items.forEach(item => {
+        if (item.export_count) {
+          for (let i = 0; i < item.export_count; i++) {
+            this.bindToDBData.push({ ...item })
+          }
+        }
+      })
+
+      this.bindToDBData.map((item, index) => {
+        item.status = false
+        item.index = index
+        return item
+      })
+
+      this.client_id_input = row.client_id
+
       // 自动选择第一行数据
       this.$nextTick(() => {
         this.$refs.singleTable.setCurrentRow(this.bindToDBData[0])
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index ba83b93..13946f3 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -149,7 +149,7 @@
         v-loading="tabsLoading"
         element-loading-text="拼命加载中"
       >
-        <el-tab-pane label="易制毒易制爆管理" name="first">
+        <el-tab-pane label="易制毒易制爆品管理" name="first">
           <el-checkbox
             v-model="checkAll_drug_module_id"
             :indeterminate="isIndeterminate_drug_module_id"
diff --git a/src/views/user/role/index.vue b/src/views/user/role/index.vue
index 64908f0..b9f833b 100644
--- a/src/views/user/role/index.vue
+++ b/src/views/user/role/index.vue
@@ -184,7 +184,7 @@ export default {
         role_id: undefined,
         role_code: undefined,
         role_name: undefined,
-        // 易制毒易制爆管理
+        // 易制毒易制爆品管理
         drug_module_id: [],
         // 危化品管理
         standard_module_id: [],