添加手动输入模板动态添加功能;

修复已入库后页面数据刷新问题
修复柜体禁止显示异常问题;

.eslintignore

@@ -1,4 +1,4 @@
 build/*.js
-src/assets
+src/*
 public
 dist

src/api/reagent/warehousing.js

@@ -69,3 +69,12 @@ export function pring_bar_code(data) {
     data
   })
 }
+
+//  /api/drug_tmplate/pring_bar_code
+export function get_drug_group_list(data) {
+  return request({
+    url: '/api/drug_tmplate/get_drug_group_list',
+    method: 'post',
+    data
+  })
+}

src/components/ReagentForm/index.vue

@@ -4,7 +4,16 @@
       <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="80px">
         <el-col :span="24">
           <el-form-item label="试剂名称" prop="name">
-            <el-input v-model="formData.name" placeholder="请输入试剂名称" clearable :style="{width: '100%'}" />
+            <!-- <el-input v-model="formData.name" placeholder="请输入试剂名称" clearable :style="{width: '100%'}" /> -->
+            <el-autocomplete
+              v-model="formData.value"
+              class="inline-input"
+              :style="{width: '100%'}"
+              :fetch-suggestions="querySearchAsync"
+              clearable
+              placeholder="请输入试剂名称"
+              @select="handleSelect"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -125,6 +134,8 @@
 <script>
 import { throttle } from '@/utils'
 import { get_use } from '@/api/reagent/customform'
+import { get_drug_group_list } from '@/api/reagent/warehousing'
+
 export default {
   name: 'ReagentForm',
   // title dialog title
@@ -137,6 +148,7 @@ export default {
   data() {
     return {
       formData: {},
+      loadAll: [],
       rules: {
         name: [{
           required: true,
@@ -187,9 +199,44 @@ export default {
     get_use().then(res => {
       this.extra_form = res.data
     })
+    this.drugList()
   },
   methods: {
+    drugList() {
+      get_drug_group_list().then(
+        res => {
+      if (res.status === 0) {
+        this.loadAll = res.data
+      }
+    })
+    },
+    querySearchAsync(queryString, cb) {
+      var restaurants = this.loadAll
+      var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+
+      clearTimeout(this.timeout)
+      cb(results)
+    },
+    createStateFilter(queryString) {
+      return (state) => {
+        return (state.name.toLowerCase().indexOf(queryString.toLowerCase()) >= 0)
+      }
+    },
+    handleSelect(item) {
+      console.log(item)
+
+      this.formData = item
+      this.formData.name = item.value
+    },
+    isNumber(val) {
+      const regPos = /^\d+(\.\d+)?$/
+      const regNeg = /^(-(([0-9]+\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\.[0-9]+)|([0-9]*[1-9][0-9]*)))$/
+      return regPos.test(val) || regNeg.test(val)
+    },
+
     handleConfirm: throttle(function() {
+      // 刷新试剂列表展示
+      this.drugList()
       this.$refs['elForm'].validate(valid => {
         if (valid) {
           // 时间格式处理
@@ -208,6 +255,12 @@ export default {
           } else {
             this.formData.shelf_life = 0
           }
+
+          // this.formData['name'] = this.formData.value
+          //
+          this.$set(this.formData, 'name', this.formData.value)
+          // delete this.formData['value']
+          console.log(this.formData, '-----------------------')
           this.$emit('handlefunc', this.formData)
         }
         if (!valid) return

src/views/reagent/client/index.vue

@@ -229,8 +229,8 @@
       <div class="user-header">
         <el-input v-model="seach_user" clearable placeholder="请输入内容" />
         <el-button type="primary" icon="el-icon-search" @click="getUserList">搜索</el-button>
-        <el-button plain type="danger" @click="handleDisUser"><svg-icon icon-class="确认禁用" /> 确认禁用</el-button>
+        <el-button plain type="danger" @click="handleEnUser"><svg-icon icon-class="确认禁用" /> 确认禁用</el-button>
-        <el-button plain type="success" @click="handleEnUser"><svg-icon icon-class="解除禁用" /> 解除禁用</el-button>
+        <el-button plain type="success" @click="handleDisUser"><svg-icon icon-class="解除禁用" /> 解除禁用</el-button>
       </div>
       <el-table
         v-loading="loadingUser"
@@ -251,8 +251,8 @@
         <el-table-column align="center" property="role_name" label="用户身份" />
         <el-table-column align="center" label="禁用状态">
           <template slot-scope="scope">
-            <el-tag :type="scope.row.status_type === 1?'danger':'success'">
+            <el-tag :type="scope.row.status_type === 0?'danger':'success'">
-              {{ scope.row.status_type === 1? '已禁用':'未禁用' }}
+              {{ scope.row.status_type === 0? '已禁用':'未禁用' }}
             </el-tag>
           </template>
         </el-table-column>

src/views/reagent/warehousing/index.vue

@@ -341,13 +341,13 @@ export default {
       client_id: '',
       selectReagentValue: '',
       multipleSelection: [],
-      loading: true,
+      loading: false,
       // 模板翻页信息
       page: 1,
       page_size: 15,
       total: 0,
       // 试剂翻页信息
-      loadingReagent: true,
+      loadingReagent: false,
       reagentData: [],
       reagent_page: 1,
       reagent_page_size: 15,
@@ -375,6 +375,7 @@ export default {
       barCode: '',
       currentRow: null,
       client_id_input: '',
+      click_num: false,
 
       // 导入入库模板
       fileList: [],
@@ -400,7 +401,16 @@ export default {
     },
     // 处理打印条码按钮事件
     handlePrintCode() {
-      this.dialogVisible = true
+      if (this.multipleSelection.length === 1) {
+        const template_id = this.multipleSelection[0].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 = {
@@ -510,11 +520,11 @@ export default {
     },
     getTmpList() {
       this.loading = true
-      show_tmp({
+      show_tmp(stringify({
         page: this.page,
         page_size: this.page_size,
         client_id: this.client_id
-      }).then(res => {
+      })).then(res => {
         this.tableData = res.data.data_list
         this.total = res.data.total_count
       }).finally(() => {
@@ -530,7 +540,7 @@ export default {
     reagentPageChange(page) {
       this.reagent_page = page
       const data = { seach_word: this.selectReagentValue, page: this.reagent_page, page_size: this.reagent_page_size }
-      this.getSelectDrug(stringify(data))
+      this.getSelectDrug(data)
     },
     // 选择试剂
     handleReagentClick(row) {
@@ -542,7 +552,7 @@ export default {
       this.formVisible = false
       this.bindToDBData = []
       for (let i = 0; i < obj.export_count; i++) {
-        this.bindToDBData.push({ ...this.propsformdata, ...obj, 'status': true, 'index': i })
+        this.bindToDBData.push({ ...this.propsformdata, ...obj, 'status': false, 'index': i })
       }
       this.client_id_input = obj.client_id
       // 自动选择第一行数据
@@ -551,6 +561,7 @@ export default {
       })
       this.bindToDBDataTmp = this.bindToDBData
       this.bindToDBVisible = true
+      this.click_num = true
     },
     // 处理选择试剂入库弹框关闭后数据留存问题
     handleSelectClose() {
@@ -561,7 +572,7 @@ export default {
     getSelectDrug(data) {
       this.loadingReagent = true
       this.reagentData = []
-      select_drug(data).then(res => {
+      select_drug(stringify(data)).then(res => {
         this.reagentData = res.data.data_list
         this.reagent_total = res.data.total_count
       }).finally(() => {
@@ -664,7 +675,8 @@ export default {
     },
     // 处理新增 条目form
     handleReagentAddForm(obj) {
-      if (this.reagentAddFormTitle === '新增模板条目') {
+      obj.name = obj.value
+      if (this.reagentAddFormTitle.indexOf('新增') !== -1) {
         this.reagentAddTmpData.push(obj)
       } else {
         // 修改
@@ -681,6 +693,9 @@ export default {
     },
     // 绑定入库
     handleBindToDB() {
+      if (this.click_num) {
+        return
+      }
       if (this.bindToDBData.length === 0 && this.multipleSelection.length === 0) {
         this.$message.warning('请选择入库试剂或模板！')
         return
@@ -709,6 +724,7 @@ export default {
         this.$refs.singleTable.setCurrentRow(this.bindToDBData[0])
       })
       this.bindToDBVisible = true
+      this.click_num = true
     }
   }
 }