新需求更改

src/views/reagent/createapply/index.vue

@@ -276,7 +276,8 @@ export default {
           { required: true, message: '请选择陪同人', trigger: 'change' }
         ]
       },
-      currentItem: {}
+      currentItem: {},
+      notes_msg: "",
     }
   },
   created() {
@@ -397,44 +398,26 @@ export default {
     //添加申请列表
     handleClick(row) {
       var that = this
-      that.$prompt('请输入领取用途', '提示', {
+      
-        confirmButtonText: '确定',
-        cancelButtonText: '取消'
-      }).then(({ value }) => {
-        if (value) {
-          row.notes = value
       // 检查先进先出
       get_check_last_drug(stringify(row)).then(res => {
         this.check_last_medicament(res.data).then((check_res) => {
           // 继续领用当前试剂
           if (check_res) {
-                var result = that.checkList.filter(item => item).map(item => item.bar_code)
+            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)
+              let getLocation = that.tableData.indexOf(row);
               that.tableData.splice(getLocation, 1)
             }
           }
         })
       })
-
-        } else {
-          that.$message({
-            type: 'info',
-            message: '请输入用途'
-          })
-        }
-      }).catch(() => {
-        that.$message({
-          type: 'info',
-          message: '取消输入'
-        })
-      })
     },
     //取消试剂申请
     cancelClick(row) {
@@ -518,47 +501,70 @@ export default {
       })
       console.log('giao')
     },
+
+    // 统一填写申请理由
+    prompt_notes(){
+      var that = this
+      return new Promise((resolve, reject) => {
+        that.$prompt('请输入领取用途', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+        }).then(({ value }) => {
+          if(value){
+            this.notes_msg =value
+            resolve(true)
+          }else{
+            that.$message({
+              type: 'info',
+              message: '请输入用途'
+            }); 
+            resolve(false)
+          }
+        }).catch(() => {
+          that.$message({
+            type: 'info',
+            message: '取消输入'
+          });    
+          resolve(false)   
+        });
+      })
+    },
+
     //提交申请
     create_apply(pt_from) {
       var that = this
+      that.prompt_notes().then(notes_res => {
+        if (!notes_res){
+          return
+        } else {
+          console.log("申请理由notes_msg", this.notes_msg)
           let datalist = that.checkList.map((item) => {
-        return Object.assign({}, {
+            return Object.assign({}, {info:'',notes:this.notes_msg,bar_code: item.bar_code,client_code: item.client_code,place: item.flow_position_code,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})
-          info: '',
-          notes: item.notes,
-          bar_code: item.bar_code,
-          client_code: item.client_code,
-          place: item.flow_position_code,
-          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({
               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)
+              use_content: JSON.stringify(datalist),
             }
             add_apply(stringify(data)).then(rsp => {
-          console.log('rsp>>', rsp)
+              console.log("rsp>>", rsp)
               if (rsp.status == 0) {
                 this.dialogTableClose()
                 //清空表格多选框
-            this.$refs.multipleTable.clearSelection()
+                this.$refs.multipleTable.clearSelection();
                 that.checkList = []
                 this.get_apply()
               }
             })
           }
+        }
+      })
     },
     //申请页翻页
     pageChange(page) {

src/views/reagent/management/variety/index.vue

@@ -25,9 +25,11 @@
       <el-table-column prop="english_name" show-overflow-tooltip label="英文名称" align="center" />
       <el-table-column prop="cas_number" show-overflow-tooltip label="药剂cas码" align="center" />
       <el-table-column prop="purity" label="纯度" align="center" />
+      <el-table-column prop="density" label="密度(g/cm³)" align="center" />
       <el-table-column prop="total" label="总量" align="center" />
       <el-table-column prop="net_weight_unit" label="净含量单位" align="center" />
       <el-table-column prop="net_weight" label="净含量" align="center" />
+      <el-table-column prop="remark5" label="有效期年份" align="center" />
       <el-table-column prop="inventory_warning_value" label="库存预警量" align="center" />
       <el-table-column prop="shelf_life_warning_value" label="保质期到期提前预警天数" align="center" />
       <el-table-column prop="use_days_warning_value" label="领用超期预警天数" align="center" />
@@ -78,6 +80,18 @@
               <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="density">
+              <el-input v-model="formData.density" placeholder="请输入密度" clearable :style="{width: '100%'}" >
+                <template slot="append">g/cm<sup>3</sup></template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="有效期年份" prop="remark5">
+              <el-input v-model="formData.remark5" placeholder="请输入有效期年份" clearable :style="{width: '100%'}" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="总量" prop="total" hidden>
               <el-input v-model="formData.total" placeholder="请输入总量" clearable :style="{width: '100%'}" />
@@ -183,6 +197,7 @@ export default {
           message: '请输入纯度',
           trigger: 'blur'
         }],
+        density: [],
         total: [{
           required: false,
           message: '请输入总量',
@@ -206,7 +221,8 @@ export default {
         empty_count: [],
         use_count: [],
         normal_count: [],
-        total_count: []
+        total_count: [],
+        remark5:[],
       },
       dialogVisible: false,
       dialogTitile: ''
@@ -244,9 +260,14 @@ export default {
         }).finally(() => { this.loadingReagent = false })
     },
     handleFormEdit(row) {
+      if(this.$store.state.user.role_name.indexOf("管理员") !== -1){
         this.dialogTitile = '编辑试剂品类信息'
         this.formData = { ...row }
         this.dialogVisible = true
+      } else {
+        this.$message.error("分类编辑只有管理员可以编辑！")
+      }
+      
     },
     // 用户多选
     handleSelectionChange(val) {

src/views/reagent/receivingandreturn/index.vue

@@ -407,7 +407,6 @@ export default {
             this.dialogVisible = false
             this.$message.success('归还成功！')
             // 归还弹框提示用量
-            if (this.$route.name === 'standardSendBack'){
             const h = this.$createElement;
             var msg = ""
             if (res.data.is_liquid){
@@ -420,7 +419,6 @@ export default {
               title: '本次使用用量',
               message: h('i', { style: 'color: teal'}, msg)
             });
-            }
             
           })
         }