From be494dd761babab4a5d045d32a2d50fc602d7562 Mon Sep 17 00:00:00 2001
From: tangxuan <2233783319@qq.com>
Date: Thu, 23 Mar 2023 22:05:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E7=85=A7=E5=93=81=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |   5 +-
 src/api/reagent/database.js                   |   8 ++
 src/components/ReagentForm/index.vue          |  43 +++++++
 src/components/UserForm/index.vue             |   4 +-
 src/layout/components/Navbar.vue              |   3 +-
 src/router/modules/consumables.js             |  84 +++++++-------
 src/router/modules/reagent.js                 |   2 +-
 src/styles/index.scss                         |   2 +-
 src/utils/request.js                          |   2 +-
 src/views/home/index.vue                      |   4 +-
 src/views/reagent/applymanagement/index.vue   |   4 +-
 src/views/reagent/buy/index.vue               |   4 +-
 src/views/reagent/createapply/index copy.vue  |   2 +-
 src/views/reagent/createapply/index.vue       | 105 ++++++++++++++++--
 src/views/reagent/management/data/index.vue   |  43 ++++---
 src/views/reagent/purchaseapproval/index.vue  |   2 +-
 .../reagent/receivingandreturn/index.vue      |  50 ++++++---
 src/views/reagent/report/index.vue            |   4 +-
 .../reagent/report/reagentconsum/index.vue    |   4 +-
 .../reagent/report/reagentinfo/index.vue      |   4 +-
 src/views/reagent/warehousing/index.vue       |   1 +
 src/views/reagent/weighing/index.vue          |   8 +-
 .../reagent/weightregistration/index.vue      |  33 +++++-
 23 files changed, 306 insertions(+), 115 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 547696a..3c09d71 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,9 @@
 <template>
   <div id="app">
-    <router-view></router-view>
+    <!--<div style='position:absolute;z-index:1000;left:45%'>snacnajkcnajkcnjancjancjkaskjnjk</div>-->
+    <router-view>
+    
+    </router-view>
   </div>
 </template>
 
diff --git a/src/api/reagent/database.js b/src/api/reagent/database.js
index af44e70..caaedf9 100644
--- a/src/api/reagent/database.js
+++ b/src/api/reagent/database.js
@@ -8,6 +8,14 @@ export function msds_db_list(data) {
   })
 }
 
+export function get_msds_drug(data) {
+  return request({
+    url: '/api/drug/get_msds_drug',
+    method: 'post',
+    data
+  })
+}
+
 export function dangerous_db_list(data) {
   return request({
     url: '/api/drug/dangerous_db_list',
diff --git a/src/components/ReagentForm/index.vue b/src/components/ReagentForm/index.vue
index a4096f7..73fc10e 100644
--- a/src/components/ReagentForm/index.vue
+++ b/src/components/ReagentForm/index.vue
@@ -144,6 +144,7 @@
 <script>
 import { throttle } from '@/utils'
 import { get_use } from '@/api/reagent/customform'
+import { weigh, get_drug_info, tare, zero } from '@/api/reagent/weight'
 import { get_drug_group_list } from '@/api/reagent/warehousing'
 
 export default {
@@ -157,6 +158,7 @@ export default {
 
   data() {
     return {
+      weight:'',
       formData: {},
       loadAll: [],
       rules: {
@@ -224,12 +226,53 @@ export default {
     }
   },
   created() {
+    //this.doZero()
     get_use().then(res => {
       this.extra_form = res.data
     })
     this.drugList()
+    //this.timer = setInterval(() => {
+    //  this.doWeigh()
+    //}, 1500)
+  },
+  destroyed() {
+    if (this.timer) {
+      clearInterval(this.timer)
+    }
   },
   methods: {
+    doWeigh() {
+      weigh().then(
+        res => {
+          let weigh = null
+          if (res.status === 0) {
+            weigh = parseFloat(res.data)
+            if (weigh == null) {
+              return
+            }
+            // 保存余量数据
+            console.log(weigh,'11111111111111111')
+            if (weigh.toFixed(2)>10){
+              this.formData.total = weigh.toFixed(2)
+            }
+          }
+        }
+      )
+    },
+    doTare() {
+      tare().then(
+        res => {
+          this.$message.success('去皮操作成功')
+        }
+      )
+    },
+    doZero() {
+      zero().then(
+        res => {
+          this.$message.success('清零成功')
+        }
+      )
+    },
     drugList() {
       get_drug_group_list().then(
         res => {
diff --git a/src/components/UserForm/index.vue b/src/components/UserForm/index.vue
index 8c4ed85..2a792cf 100644
--- a/src/components/UserForm/index.vue
+++ b/src/components/UserForm/index.vue
@@ -40,9 +40,9 @@
             <el-input v-model="formData.qq" placeholder="请输入QQ号码" clearable :style="{width: '100%'}" />
           </el-form-item>
         </el-col>
-        <el-col :span="12" v-if="title !='编辑用户'">
+        <el-col :span="12">
           <el-form-item label="角色" prop="role_id">
-            <el-select v-model="formData.role_id" placeholder="请选择角色" clearable :style="{width: '100%'}">
+            <el-select :disabled="title =='编辑用户' ? true:false" v-model="formData.role_id" placeholder="请选择角色" clearable :style="{width: '100%'}">
               <el-option
                 v-for="item in roledata"
                 :key="item.role_id"
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 4d41659..8bf6b8d 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -62,7 +62,8 @@ export default {
   },
   methods: {
     local_ops_func: function() {
-      this.local_ops = this.$store.getters.opts.filter(item => item.name !='user' && item.name != 'instrument')
+      console.log(this.$store.getters.opts)
+      this.local_ops = this.$store.getters.opts.filter(item => item.name !='user' && item.name != 'instrument' && item.name != 'reagent' && item.name !='standard')
     },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
diff --git a/src/router/modules/consumables.js b/src/router/modules/consumables.js
index 1736290..65f620d 100644
--- a/src/router/modules/consumables.js
+++ b/src/router/modules/consumables.js
@@ -133,20 +133,20 @@ const consumablesRouter = [
       }
     ]
   },
-  {
-    path: '/consumables/weighing',
-    component: Layout,
-    redirect: '/consumables/weighing/index',
-    meta: { classification: 'consumables', module_code: 'ConsumablesWeigh' },
-    children: [
-      {
-        path: 'index',
-        name: 'standardweighing',
-        component: () => import('@/views/reagent/weighing/index'),
-        meta: { title: '对照品称重', icon: '试剂称重', classification: 'consumables' }
-      }
-    ]
-  },
+  // {
+  //   path: '/consumables/weighing',
+  //   component: Layout,
+  //   redirect: '/consumables/weighing/index',
+  //   meta: { classification: 'consumables', module_code: 'ConsumablesWeigh' },
+  //   children: [
+  //     {
+  //       path: 'index',
+  //       name: 'standardweighing',
+  //       component: () => import('@/views/reagent/weighing/index'),
+  //       meta: { title: '对照品称重', icon: '试剂称重', classification: 'consumables' }
+  //     }
+  //   ]
+  // },
   {
     path: '/consumables/inventory',
     component: Layout,
@@ -209,34 +209,34 @@ const consumablesRouter = [
       }
     ]
   },
-  {
-    path: '/consumables/envrecord',
-    component: Layout,
-    redirect: '/consumables/envrecord/index',
-    meta: { classification: 'consumables', module_code: 'HumitureIndex' },
-    children: [
-      {
-        path: 'index',
-        name: 'standardEnvRecord',
-        component: () => import('@/views/reagent/envrecord/index'),
-        meta: { title: '环境记录', icon: '雪花', classification: 'consumables' }
-      }
-    ]
-  },
-  {
-    path: '/consumables/form',
-    component: Layout,
-    redirect: '/consumables/form/index',
-    meta: { classification: 'consumables', module_code: 'ConsumablesCustomForm' },
-    children: [
-      {
-        path: 'index',
-        name: 'standardForm',
-        component: () => import('@/views/reagent/customform/index'),
-        meta: { title: '对照品表单自定义', icon: '表单', classification: 'consumables' }
-      }
-    ]
-  },
+  // {
+  //   path: '/consumables/envrecord',
+  //   component: Layout,
+  //   redirect: '/consumables/envrecord/index',
+  //   meta: { classification: 'consumables', module_code: 'HumitureIndex' },
+  //   children: [
+  //     {
+  //       path: 'index',
+  //       name: 'standardEnvRecord',
+  //       component: () => import('@/views/reagent/envrecord/index'),
+  //       meta: { title: '环境记录', icon: '雪花', classification: 'consumables' }
+  //     }
+  //   ]
+  // },
+  // {
+  //   path: '/consumables/form',
+  //   component: Layout,
+  //   redirect: '/consumables/form/index',
+  //   meta: { classification: 'consumables', module_code: 'ConsumablesCustomForm' },
+  //   children: [
+  //     {
+  //       path: 'index',
+  //       name: 'standardForm',
+  //       component: () => import('@/views/reagent/customform/index'),
+  //       meta: { title: '对照品表单自定义', icon: '表单', classification: 'consumables' }
+  //     }
+  //   ]
+  // },
   {
     path: '/consumables/gotohome',
     redirect: '/home',
diff --git a/src/router/modules/reagent.js b/src/router/modules/reagent.js
index 51a8825..3c613d9 100644
--- a/src/router/modules/reagent.js
+++ b/src/router/modules/reagent.js
@@ -95,7 +95,7 @@ const reagentRouter = [
         path: 'index',
         name: 'Buy',
         component: () => import('@/views/reagent/buy/index'),
-        meta: { title: '采购', icon: '请购', classification: 'reagent'}
+        meta: { title: '采购申请', icon: '请购', classification: 'reagent'}
       }
     ]
   },
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 4d14f11..8a27d49 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -9,7 +9,7 @@ body {
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
-  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  // font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
 }
 
 label {
diff --git a/src/utils/request.js b/src/utils/request.js
index 8b87539..05fc93c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -8,7 +8,7 @@ import { get_func_type, throttle } from '@/utils/index'
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 5000 // request timeout
+  timeout: 8000 // request timeout
 })
 
 const reLogin = throttle(function() {
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 4d09fa1..9d3d172 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -7,8 +7,8 @@
     </div>
     <div class="home-content">
       <div class="home-pic">
-        <div class="home-pic-item" @click="picClick('reagent')"><img src="@/assets/2-主界面/易制毒易制爆.png" alt=""></div>
-        <div key="2" class="home-pic-item" @click="picClick('standard')"><img src="@/assets/2-主界面/一般危化品.png" alt=""></div>
+        <!--<div class="home-pic-item" @click="picClick('reagent')"><img src="@/assets/2-主界面/易制毒易制爆.png" alt=""></div>-->
+        <!--<div key="2" class="home-pic-item" @click="picClick('standard')"><img src="@/assets/2-主界面/一般危化品.png" alt=""></div>-->
         <div key="3" class="home-pic-item" @click="picClick('consumables')"><img src="@/assets/2-主界面/对照品.png" alt=""></div>
         <!-- <div key="4" class="home-pic-item" @click="picClick('instrument')"><img src="@/assets/2-主界面/instrument.png" alt=""></div> -->
         <div v-if="this.$store.getters.userAuth.includes('UserIndex')" key="5" class="home-pic-item" @click="picClick('user')"><img src="@/assets/2-主界面/用户管理.png" alt=""></div>
diff --git a/src/views/reagent/applymanagement/index.vue b/src/views/reagent/applymanagement/index.vue
index 7aa4220..99cd311 100644
--- a/src/views/reagent/applymanagement/index.vue
+++ b/src/views/reagent/applymanagement/index.vue
@@ -47,7 +47,7 @@
         width="100">
         <template slot-scope="scope">
           <el-button @click="handleCheck(scope.row)" type="text" size="small">查看</el-button>
-          <el-button @click="handleClick(scope.row)" type="text" size="small">审批</el-button>
+          <el-button v-if='scope.row.is_solve!=1 && scope.row.is_solve!=3' @click="handleClick(scope.row)" type="text" size="small">审批</el-button>
         </template>
       </el-table-column>
 
@@ -160,7 +160,7 @@ export default {
       history_page_size: 15,
       history_total: 100,
       statusColorMap: ['warning','success','danger'],
-      statusMap: ['未处理', '已处理','已驳回'],
+      statusMap: ['未处理', '已处理','已驳回','已完成'],
       row:''
     }
   },
diff --git a/src/views/reagent/buy/index.vue b/src/views/reagent/buy/index.vue
index 9e06c4b..881492e 100644
--- a/src/views/reagent/buy/index.vue
+++ b/src/views/reagent/buy/index.vue
@@ -172,7 +172,7 @@ export default {
         net_weight: ''
       },
       statusColorMap: ['warning','success','danger'],
-      statusMap: ['未处理', '已处理','已驳回'],
+      statusMap: ['未处理', '已处理','已驳回','已完成'],
       title:'',
 
       seach_word:'',
@@ -319,7 +319,7 @@ export default {
     handleCheck(row) {
       this.title='编辑采购试剂'
       this.row_id =row.id
-      if(row.is_solve==1){
+      if(row.is_solve==1 || row.is_solve==3){
         this.$message.error('已处理无法修改')
       }else{
         this.adddialogVisible = true
diff --git a/src/views/reagent/createapply/index copy.vue b/src/views/reagent/createapply/index copy.vue
index 7d8c057..15e1903 100644
--- a/src/views/reagent/createapply/index copy.vue	
+++ b/src/views/reagent/createapply/index copy.vue	
@@ -174,7 +174,7 @@ export default {
         user_id_pt: '',
       },
       statusColorMap: ['warning','success','danger'],
-      statusMap: ['未处理', '已处理','已驳回'],
+      statusMap: ['未处理', '已处理','已驳回','已完成'],
       rules: {
         user_id_pt: [
           { required: true, message: '请选择陪同人', trigger: 'change' }
diff --git a/src/views/reagent/createapply/index.vue b/src/views/reagent/createapply/index.vue
index 10dd82f..1b27c9d 100644
--- a/src/views/reagent/createapply/index.vue
+++ b/src/views/reagent/createapply/index.vue
@@ -6,7 +6,7 @@
       <!-- <el-button type="primary" plain @click="handleCheck"><i class="el-icon-edit" />详情查看</el-button> -->
 
       <el-dialog :close-on-click-modal="false" :visible.sync="dialogHistoryVisible" width="60%" title="申请详情">
-        <div class="box">
+        <div style='height:500px'>
           <el-scrollbar style="height: 100%">
             <el-table
               v-loading="loadingHistory"
@@ -25,6 +25,43 @@
         </div>
       </el-dialog>
 
+
+      <el-dialog :close-on-click-modal="false" :visible.sync="dialogMsdsVisible" width="60%" title="MSDS数据库">
+        <div class="box" style='height:500px'>
+          <el-scrollbar style='hight:500px'>
+          <div class="main-container-text">
+            <div class="title">{{ currentItem.name }}</div>
+            <div class="header">
+              <div class="title-sub"></div>
+            </div>
+            <el-descriptions :column="1" border>
+              <el-descriptions-item label="英文名称">{{ currentItem.english_name }}</el-descriptions-item>
+              <el-descriptions-item label="CAS码">{{ currentItem.cas_number }}</el-descriptions-item>
+              <el-descriptions-item label="分子式">{{ currentItem.molecular_formula }}</el-descriptions-item>
+              <el-descriptions-item label="分子量">{{ currentItem.molecular_weight }}</el-descriptions-item>
+              <el-descriptions-item label="物理数据">{{ currentItem.physical_data }}</el-descriptions-item>
+              <el-descriptions-item label="毒理数据">{{ currentItem.toxicity_data }}</el-descriptions-item>
+              <el-descriptions-item label="用途">{{ currentItem.use }}</el-descriptions-item>
+              <el-descriptions-item label="稳定性">{{ currentItem.stability }}</el-descriptions-item>
+              <el-descriptions-item label="生态性">{{ currentItem.ecological }}</el-descriptions-item>
+              <el-descriptions-item label="注意事项">{{ currentItem.precautions }}</el-descriptions-item>
+              <el-descriptions-item :style="{'hight':'80px'}" />
+              <el-descriptions-item v-if="$route.path.indexOf('msds') === -1" :label-style="{'background': '#ffcc99'}" label="试剂属性">{{ currentItem.drug_attribute }}</el-descriptions-item>
+              <el-descriptions-item v-if="$route.path.indexOf('msds') === -1" :label-style="{'background': '#ffcc99'}">
+                <template slot="label">
+                  存储禁忌 <i class="el-icon-warning-outline" />
+                </template>
+                {{ currentItem.storage_taboo }}
+              </el-descriptions-item>
+              <el-descriptions-item :label-style="{'background': '#ffcc99','width':'120px'}" label="储存方法">{{ currentItem.storage_method }}</el-descriptions-item>
+              <el-descriptions-item :label-style="{'background': '#ffcc99'}" label="柜体储存要求">{{ currentItem.client_storage_require }}</el-descriptions-item>
+              <el-descriptions-item :label-style="{'background': '#ffcc99'}" label="领用归还规定">{{ currentItem.provision }}</el-descriptions-item>
+            </el-descriptions>
+          </div>
+          </el-scrollbar>
+        </div>
+      </el-dialog>
+
       <el-dialog title="确认提交申请" :visible.sync="dialogTableVisible">
         <div style="display:flex;flex-direction: row;">   
           <el-form :inline="true" :model="pt_form" :rules="rules" ref="pt_form" class="demo-form-inline" style="padding-top:13px">
@@ -50,16 +87,33 @@
           <el-table-column prop="name" show-overflow-tooltip label="试剂名称" align="center" />
           <el-table-column prop="remain" show-overflow-tooltip label="余量" align="center" />
           <el-table-column prop="bar_code" show-overflow-tooltip label="编号" align="center" />
+          <el-table-column align="center" property="client_id" label="所属终端">
+            <template slot-scope="scope">
+              <div v-if="$store.getters.currentOptions.find(item => item.client_id === scope.row.client_id)">
+                {{ $store.getters.currentOptions.find(item => item.client_id === scope.row.client_id).client_name }}
+              </div>
+              <div v-else>
+                {{ scope.row.client_id }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="place"
+            show-overflow-tooltip
+            label="所属单元"
+            align="center"
+            width="100"
+          />
           <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="distributor" show-overflow-tooltip label="经销商" align="center" />
           <el-table-column prop="manufacturer" show-overflow-tooltip label="生产厂家" align="center" />
           <el-table-column
             fixed="right"
             label="操作"
-            width="100">
+            width="160">
             <template slot-scope="scope">
               <el-button @click="handleClick(scope.row)" type="text" size="small">添加申请</el-button>
+              <el-button @click="handleInfo(scope.row)" type="text" size="small">查看详情</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -69,9 +123,25 @@
           <el-table-column prop="name" show-overflow-tooltip label="试剂名称" align="center" />
           <el-table-column prop="remain" show-overflow-tooltip label="余量" align="center" />
           <el-table-column prop="bar_code" show-overflow-tooltip label="编号" align="center" />
+          <el-table-column align="center" property="client_id" label="所属终端">
+            <template slot-scope="scope">
+              <div v-if="$store.getters.currentOptions.find(item => item.client_id === scope.row.client_id)">
+                {{ $store.getters.currentOptions.find(item => item.client_id === scope.row.client_id).client_name }}
+              </div>
+              <div v-else>
+                {{ scope.row.client_id }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="place"
+            show-overflow-tooltip
+            label="所属单元"
+            align="center"
+            width="100"
+          />
           <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="distributor" show-overflow-tooltip label="经销商" align="center" />
           <el-table-column prop="manufacturer" show-overflow-tooltip label="生产厂家" align="center" />
           <el-table-column
             fixed="right"
@@ -142,6 +212,7 @@
 </template>
 
 <script>
+import { get_msds_drug } from '@/api/reagent/database'
 import stringify from '@/utils/stringify'
 import {
   get_pt_user_list,
@@ -178,18 +249,20 @@ export default {
       history_page_size: 15,
       history_total: 100,
       dialogTableVisible: false,
+      dialogMsdsVisible:false,
       checkList: [],
       ptUserArray:[],
       pt_form:{
         user_id_pt: '',
       },
       statusColorMap: ['warning','success','danger'],
-      statusMap: ['未处理', '已处理','已驳回'],
+      statusMap: ['未处理', '已处理','已驳回','已完成'],
       rules: {
         user_id_pt: [
           { required: true, message: '请选择陪同人', trigger: 'change' }
         ],
-      }
+      },
+      currentItem:{}
     }
   },
   created () {
@@ -215,6 +288,23 @@ export default {
       //   this.$message.warning("选择一条记录操作！")
       // }
     },
+    handleInfo(row){
+      var that =this
+      const data = {
+        seach_word: row.name,
+        cas_number:row.cas_number
+      }
+      get_msds_drug(stringify(data)).then(res => {
+
+        console.log(res.data.data_list.length>0)
+        if(res.data.data_list.length>0){
+          this.currentItem = res.data.data_list[0]
+          that.dialogMsdsVisible=true
+        }else{
+          this.$message.warning("未找到该试剂！")
+        }
+        }).finally(() => { this.loading = false })
+    },
     //查看详情关闭
     dialogHistoryClose() {
       this.dialogHistoryVisible = false
@@ -333,7 +423,7 @@ export default {
     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})
+        return Object.assign({}, { bar_code: item.bar_code,client_code: item.client_code,place: item.place,remark12: item.remark12,name: item.name, num: item.num,client_id: item.client_id, purity: item.purity, speci: item.speci,medicament_id:item.medicament_id})
       })
       if (pt_from.user_id_pt === '') {
         that.$message({
@@ -435,6 +525,7 @@ export default {
 /* 2，外包一个div,来减少对其他页面会有冲突（此时缺少scoped） */
 .box .el-scrollbar__wrap {
   overflow-x: hidden;
+  height:500px
 }
 /* .el-dialog__body {
   height: 600px !important;
diff --git a/src/views/reagent/management/data/index.vue b/src/views/reagent/management/data/index.vue
index feb24f8..b8d79d7 100644
--- a/src/views/reagent/management/data/index.vue
+++ b/src/views/reagent/management/data/index.vue
@@ -121,6 +121,27 @@
         width="100"
         show-overflow-tooltip
       />
+      <el-table-column
+        prop="client_id"
+        label="所属终端"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <div v-if="$store.getters.currentOptions.find(item => item.client_id === scope.row.client_id)">
+            {{ $store.getters.currentOptions.find(item => item.client_id === scope.row.client_id).client_name }}
+          </div>
+          <div v-else>
+            {{ scope.row.client_id }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="place"
+        show-overflow-tooltip
+        label="所属单元"
+        align="center"
+        width="100"
+      />
       <el-table-column
         prop="remark10"
         label="开启日期"
@@ -163,20 +184,6 @@
           <el-tag :type="statusColorMap[scope.row.status-1]">{{ statusMap[scope.row.status - 1] }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column
-        prop="client_id"
-        label="所属终端"
-        align="center"
-      >
-        <template slot-scope="scope">
-          <div v-if="$store.getters.currentOptions.find(item => item.client_id === scope.row.client_id)">
-            {{ $store.getters.currentOptions.find(item => item.client_id === scope.row.client_id).client_name }}
-          </div>
-          <div v-else>
-            {{ scope.row.client_id }}
-          </div>
-        </template>
-      </el-table-column>
       <!--      <el-table-column-->
       <!--        prop="inventory_warning_value"-->
       <!--        label="预警量(瓶)"-->
@@ -254,9 +261,9 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center" property="status" label="操作类型">
+        <el-table-column align="center" property="record_type" label="操作类型">
           <template slot-scope="scope">
-            <el-tag :type="statusColorMap[scope.row.status-1]">{{ recodeStatusMap[scope.row.status - 1] }}</el-tag>
+            <el-tag :type="statusColorMap[scope.row.record_type-1]">{{ recodeStatusMap[scope.row.record_type - 1] }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column align="center" property="create_date" label="操作时间" width="150" />
@@ -656,9 +663,9 @@ export default {
       page: 1,
       page_size: 15,
       total: 0,
-      recodeStatusMap: ['入库', '领用', '归还'],
+      recodeStatusMap: ['入库', '领用', '归还','登记'],
       statusMap: ['在库', '出库', '空瓶', '待登记', '预备入库'],
-      statusColorMap: ['success', '', 'warning'],
+      statusColorMap: ['success', '', 'warning','danger'],
       headerStyle: { 'background': '#E6E6E6' },
       client_id: null,
       name: null,
diff --git a/src/views/reagent/purchaseapproval/index.vue b/src/views/reagent/purchaseapproval/index.vue
index 906bee6..04b39b2 100644
--- a/src/views/reagent/purchaseapproval/index.vue
+++ b/src/views/reagent/purchaseapproval/index.vue
@@ -127,7 +127,7 @@ export default {
       history_page_size: 15,
       history_total: 100,
       statusColorMap: ['warning','success','danger'],
-      statusMap: ['未处理', '已处理','已驳回'],
+      statusMap: ['未处理', '已处理','已驳回','已完成'],
       row:''
     }
   },
diff --git a/src/views/reagent/receivingandreturn/index.vue b/src/views/reagent/receivingandreturn/index.vue
index bb25d33..d80ce34 100644
--- a/src/views/reagent/receivingandreturn/index.vue
+++ b/src/views/reagent/receivingandreturn/index.vue
@@ -73,10 +73,10 @@
           <div class="bottom">
             <el-radio v-model="radio" label="1">余量称重</el-radio>
             <!-- <el-radio v-model="radio" label="2">用量称重</el-radio> -->
-            <el-button type="primary" @click="updateDrugRemain">开始称重</el-button>
-            <el-button type="primary" plain @click="doTare">去皮（初始化天平）</el-button>
+            <el-button type="primary" @click="updateDrugRemain">归还</el-button>
+            <!-- <el-button type="primary" plain @click="doTare">去皮（初始化天平）</el-button>-->
             <el-input v-model="inputWeigh" placeholder="手动输入" />
-            <!-- <el-button type="warning">设置为空</el-button> -->
+            <el-button type="warning" @click="handleSetEmpty">设置为空</el-button>
           </div>
         </div>
       </div>
@@ -147,7 +147,7 @@ export default {
       headerStyle: { 'background': '#E6E6E6' },
       tableData: [],
       page: 1,
-      page_size: 15,
+      page_size: 1000,
       total: 0,
       loading: false,
       radio: '1',
@@ -180,10 +180,10 @@ export default {
   mounted() {
     this.pageChange(1)
     // 自动刷新获取数据(1000*60*60=>毫秒*秒*分钟，此时表示为60分钟)
-    this.timer = setInterval(() => {
-      this.doWeigh()
-    }, 500)
-    this.doZero()
+    //this.timer = setInterval(() => {
+      //this.doWeigh()
+    //}, 500)
+    //this.doZero()
   },
   destroyed() {
     if (this.timer) {
@@ -194,13 +194,26 @@ export default {
   methods: {
     getCode(code) {
       this.barCode = code
-      this.getDrugInfo(this.barCode)
-      if (this.$route.name.indexOf('Receiving') !== -1) {
-        use(stringify({ 'bar_code': this.barCode })).then(res => {
-          // this.tableData.push(res.data)
-          this.getList()
-          this.$message.success(res.data.name + '  试剂领用成功！')
-        })
+      console.log(this.$store.state.app.title)
+      if (this.$store.state.app.title=='危化品'){
+        this.getDrugInfo(this.barCode)
+        console.log('222222222222222222222222222222222222')
+        if (this.$route.name.indexOf('Receiving') !== -1) {
+          use(stringify({ 'bar_code': this.barCode })).then(res => {
+            this.tableData.push(res.data)
+            this.$message.success(res.data.name + '  试剂领用成功！')
+          })
+        }
+      }else{
+        console.log('9999999999999999999999')
+        this.getDrugInfo(this.barCode)
+        if (this.$route.name.indexOf('Receiving') !== -1) {
+          use(stringify({ 'bar_code': this.barCode })).then(res => {
+            // this.tableData.push(res.data)
+            this.getList()
+            this.$message.success(res.data.name + '  试剂领用成功！')
+          })
+        }
       }
     },
     getList() {
@@ -217,12 +230,15 @@ export default {
     },
     pageChange(page) {
       this.page = page
-      this.getList()
+      console.log(this.$route.name,'7777777777777777777777777')
+      if (this.$route.name != 'standardReceiving') {
+        this.getList()
+      }
     },
     getDrugInfo(code) {
       get_drug_info(stringify({ 'bar_code': code })).then(res => {
         this.infoData = res.data
-        this.$message.success(res.data.name + '  试剂领扫描成功！')
+        this.$message.success(res.data.name + '  试剂扫描成功！')
       })
     },
     checkInputWeigh() {
diff --git a/src/views/reagent/report/index.vue b/src/views/reagent/report/index.vue
index 7d29a94..71ff2a8 100644
--- a/src/views/reagent/report/index.vue
+++ b/src/views/reagent/report/index.vue
@@ -16,7 +16,7 @@
             src="@/assets/4-报表统计/store_info_search.png"
             alt=""
           ></div>
-          <div @click="$router.push(`/${$store.getters.classification}/report/${$store.getters.classification}info`)"><img
+          <div @click="$router.push(`/${$store.getters.classification}/report/standardinfo`)"><img
             src="@/assets/4-报表统计/试剂信息详情.png"
             alt=""
           ></div>
@@ -111,7 +111,7 @@
       </div>
       <div class="consume">
         <el-card class="box-card">
-          <div slot="header" class="clearfix" @click="$router.push(`/${$store.getters.classification}/report/${$store.getters.classification}consuminfo`)">
+          <div slot="header" class="clearfix" @click="$router.push(`/${$store.getters.classification}/report/standardconsuminfo`)">
             <span class="text">{{ $store.state.app.title }}用量消耗</span>
             <i style="float: right; padding: 3px 0" class="el-icon-arrow-right" />
           </div>
diff --git a/src/views/reagent/report/reagentconsum/index.vue b/src/views/reagent/report/reagentconsum/index.vue
index f064374..dc5e10c 100644
--- a/src/views/reagent/report/reagentconsum/index.vue
+++ b/src/views/reagent/report/reagentconsum/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="main-content-container">
-    <div class="title">试剂用量消耗</div>
+    <div class="title">对照品用量消耗</div>
     <div class="header">
       <div class="header-left">
         <el-button @click="$router.push(`/${$store.getters.classification}/report/index`)">返回上一级</el-button>
@@ -94,7 +94,7 @@ export default {
         page: this.page,
         page_size: this.page_size,
         download_type: 5,
-        file_name: '试剂用量消耗'
+        file_name: '对照品用量消耗'
       }
       dowload_drug_use_expend(data).then(
         res => {
diff --git a/src/views/reagent/report/reagentinfo/index.vue b/src/views/reagent/report/reagentinfo/index.vue
index d5c77ff..9af4a94 100644
--- a/src/views/reagent/report/reagentinfo/index.vue
+++ b/src/views/reagent/report/reagentinfo/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="main-content-container">
-    <div class="title">试剂信息详情</div>
+    <div class="title">对照品信息详情</div>
     <div class="header">
       <div class="header-left">
         <el-button @click="$router.push(`/${$store.getters.classification}/report/index`)">返回上一级</el-button>
@@ -104,7 +104,7 @@ export default {
         page: this.page,
         page_size: this.page_size,
         download_type: 3,
-        file_name: '试剂信息详情'
+        file_name: '对照品信息详情'
       }
       dowload_drug_details_info(data).then(
         res => {
diff --git a/src/views/reagent/warehousing/index.vue b/src/views/reagent/warehousing/index.vue
index 8578ca0..3621487 100644
--- a/src/views/reagent/warehousing/index.vue
+++ b/src/views/reagent/warehousing/index.vue
@@ -672,6 +672,7 @@ export default {
         if(this.radio1 !='' && this.radio2 !=''){
           const data = JSON.parse(JSON.stringify(this.currentRow))
           data.flow_position_code =this.radio2
+          data.place =this.radio2
           data.client_id=this.radio1
           const id = data.index
           delete data.status
diff --git a/src/views/reagent/weighing/index.vue b/src/views/reagent/weighing/index.vue
index b03ce82..5abfc8b 100644
--- a/src/views/reagent/weighing/index.vue
+++ b/src/views/reagent/weighing/index.vue
@@ -24,7 +24,7 @@
             <el-button type="primary" @click="updateDrugRemain">更新重量</el-button>
             <el-button type="primary" plain @click="doTare">去皮（初始化天平）</el-button>
             <el-input v-model="inputWeigh" placeholder="手动输入" />
-            <el-button type="warning">设置为空</el-button>
+            <el-button type="warning" @click="handleSetEmpty">设置为空</el-button>
           </div>
         </div>
       </div>
@@ -99,9 +99,9 @@ export default {
   },
   mounted() {
     // 自动刷新获取数据(1000*60*60=>毫秒*秒*分钟，此时表示为60分钟)
-    this.timer = setInterval(() => {
-      this.doWeigh()
-    }, 500)
+    //this.timer = setInterval(() => {
+    //  this.doWeigh()
+    //}, 500)
     // this.doZero()
   },
   destroyed() {
diff --git a/src/views/reagent/weightregistration/index.vue b/src/views/reagent/weightregistration/index.vue
index 0c9c3cd..0ed2eb4 100644
--- a/src/views/reagent/weightregistration/index.vue
+++ b/src/views/reagent/weightregistration/index.vue
@@ -67,7 +67,7 @@
             <el-button type="primary" @click="updateDrugRemain">称重登记</el-button>
             <el-button type="primary" plain @click="doTare">去皮（初始化天平）</el-button>
             <el-input v-model="inputWeigh" placeholder="手动输入" />
-            <!-- <el-button type="warning">设置为空</el-button> -->
+            <el-button type="warning" @click="empty">设置为空</el-button>
           </div>
         </div>
       </div>
@@ -148,9 +148,9 @@ export default {
   mounted() {
     this.pageChange(1)
     // 自动刷新获取数据(1000*60*60=>毫秒*秒*分钟，此时表示为60分钟)
-    this.timer = setInterval(() => {
-      this.doWeigh()
-    }, 500)
+    //this.timer = setInterval(() => {
+    //  this.doWeigh()
+    //}, 500)
     // this.doZero()
   },
   destroyed() {
@@ -176,7 +176,7 @@ export default {
     },
     getList() {
       const data = {
-        // status: 2,
+        status: 4,
         page: this.page,
         page_size: this.page_size
       }
@@ -244,6 +244,7 @@ export default {
         console.log(this.infoData)
         const data = {
           'bar_code': this.infoData.bar_code,
+          'is_empty':0,
           'remain': w ? parseFloat(this.inputWeigh).toFixed(2) : this.surplusWeigh
         }
         set_register(stringify(data)).then(
@@ -256,7 +257,27 @@ export default {
       } else {
         this.$message.warning('请选择试剂！')
       }
-    }
+    },
+    empty() {
+      if (this.infoData.medicament_id) {
+        const w = this.checkInputWeigh()
+        console.log(this.infoData)
+        const data = {
+          'bar_code': this.infoData.bar_code,
+          'is_empty':1,
+          'remain': w ? parseFloat(this.inputWeigh).toFixed(2) : this.surplusWeigh
+        }
+        set_register(stringify(data)).then(
+          res => {
+            this.$message.success(res.msg)
+            this.getList()
+            this.getDrugInfo(this.infoData.bar_code)
+          }
+        )
+      } else {
+        this.$message.warning('请选择试剂！')
+      }
+    },
   }
 }
 </script>