领用列表展示问题修复

README.md

@@ -44,3 +44,16 @@ npm run lint
 # 代码格式检查并自动修复
 npm run lint -- --fix
 ```
+
+## 更新
+```bash
+# 仓库地址
+http://git.yanei-iot.com:600/tangxuan/yy_rms_39zhiyao_duizhao.git
+
+# 提交
+git push origin 39zhiyao:duizhaopin_ui
+
+# 拉取
+git pull origin duizhaopin_ui
+```
+

src/views/reagent/receivingandreturn/index.vue

@@ -230,14 +230,13 @@ export default {
             }).then(({ value }) => {
               if(value){
                   // 领用先进先出判断
-                get_check_last_drug(stringify(this.infoData)).then(res => {
+                get_check_last_drug(stringify(this.infoData)).then(res_is_last => {
-                  this.check_last_medicament(this.infoData).then((check_res) => {
+                  this.check_last_medicament(res_is_last).then((check_res) => {
                     // 继续领用当前试剂
                     if (check_res) {
                       use(stringify({ 'bar_code': this.barCode,notes: value})).then(res => {
                         this.tableData.push(res.data)
                         this.$message.success(res.data.name + '  试剂领用成功, 请称重！')
-                        this.getList()
                       })
                     }
                   })
@@ -304,10 +303,9 @@ export default {
     },
     pageChange(page) {
       this.page = page
+      if (this.$route.name != 'standardReceiving') {
         this.getList()
-      // if (this.$route.name != 'standardReceiving') {
+      }
-      //   this.getList()
-      // }
     },
     getDrugInfo(code) {
       get_drug_info(stringify({ 'bar_code': code })).then(res => {