Browse Source

zc修改了化学品单位灵活配置

dedsudiyu 2 years ago
parent
commit
82f212e6fb

+ 6 - 1
src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/ChemicalInfo/addPage.vue

@@ -84,7 +84,7 @@
           </el-form-item>
           <el-form-item label="单位:" prop="chemicalUnit" label-width="100px">
             <el-select v-model="formData.chemicalUnit" clearable placeholder="请选择单位" style="width:210px;">
-              <el-option label="g" value="g"></el-option>
+              <el-option v-for="(item,index) in chemicalsMeasuringUnit" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
             </el-select>
           </el-form-item>
         </div>
@@ -228,11 +228,16 @@
         optionsListOne:[],
         //属性列表
         optionsListTwo:[],
+        //化学品计量单位
+        chemicalsMeasuringUnit:[],
       };
     },
     created() {
     },
     mounted(){
+      this.getDicts("chemicals_measuring_unit").then((response) => {
+        this.chemicalsMeasuringUnit = response.data;
+      });
       this.getDicts("chemical_shape").then(response => {
         this.optionsList = response.data;
       })

+ 1 - 0
src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/ChemicalInfo/index.vue

@@ -281,6 +281,7 @@
           console.log("item.id",item.id)
           this.listPropsData.id = item.id;
           this.listPropsData.chemicalName = item.chemicalName;
+          this.listPropsData.chemicalUnit = item.chemicalUnit;
           this.pageType = 3;
         }else if(type == 4){
           //MSDS

+ 3 - 3
src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/ChemicalInfo/listPage.vue

@@ -159,7 +159,7 @@
             <div class="for-max-title-box">
               <p></p>
               <p>{{item.name}}</p>
-              <p>{{listPropsData.chemicalName}}可存放量:{{item.maxNum}}g</p>
+              <p>{{listPropsData.chemicalName}}可存放量:{{item.maxNum}}{{listPropsData.chemicalUnit}}</p>
             </div>
             <div class="for-big-box">
               <div class="for-big-for-max-box">
@@ -179,7 +179,7 @@
                         v-model="bigItem.chemicalAmount"
                         placeholder="请输入">
                       </el-input-number>
-                      <p class="num-title-span">g</p>
+                      <p class="num-title-span">{{listPropsData.chemicalUnit}}</p>
                     </div>
                   </el-form-item>
                   <el-form-item class="num-input-item" label="容器重量规格" label-width="120px" :prop="'maxList.'+ index +'.list.'+ bigIndex+'.tare'" :rules="rules.tare">
@@ -194,7 +194,7 @@
                         v-model="bigItem.tare"
                         placeholder="请输入">
                       </el-input-number>
-                      <p class="num-title-span">g</p>
+                      <p class="num-title-span">{{listPropsData.chemicalUnit}}</p>
                     </div>
                   </el-form-item>
                   <el-form-item label="存放数量" label-width="90px" :prop="'maxList.'+ index +'.list.'+ bigIndex+'.storageNum'" :rules="rules.storageNum" class="el-form-item-button-box">

+ 1 - 1
src/views/medicUniversity-3_1/indexHome.vue

@@ -859,7 +859,7 @@
     }
     .bottom-max-big-box{
       /*display: flex;*/
-      padding:0 20px 20px;
+      padding:0 0 20px 20px;
       .bottom-left-max-box{
         display: inline-block;
         width: 758px;