Merge branch 'master' into kdwc-web

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;
       })

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

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

@@ -101,7 +101,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" v-for="(bigItem,bigIndex) in item.chemicalJoinCabinetSonList">
               <p class="for-big-title-p">{{bigItem.lockName}}</p>
@@ -122,7 +122,7 @@
                         v-model="minItem.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 +'.chemicalJoinCabinetSonList.'+bigIndex+'.list.'+minIndex+'.tare'" :rules="rules.tare">
@@ -136,7 +136,7 @@
                         v-model="minItem.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 +'.chemicalJoinCabinetSonList.'+bigIndex+'.list.'+minIndex+'.storageNum'" :rules="rules.storageNum" class="el-form-item-button-box">
@@ -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">
@@ -378,7 +378,7 @@
                       cabinetId:self.dialogData.maxList[i].cabinetId,
                       cabinetlockId:self.dialogData.maxList[i].chemicalJoinCabinetSonList[o].id,
                       chemicalAmount:self.dialogData.maxList[i].chemicalJoinCabinetSonList[o].list[x].chemicalAmount,
-                      chemicalAmountUnit:"g/瓶",
+                      chemicalAmountUnit:self.listPropsData.chemicalUnit,
                       storageNum:self.dialogData.maxList[i].chemicalJoinCabinetSonList[o].list[x].storageNum,
                       tare:self.dialogData.maxList[i].chemicalJoinCabinetSonList[o].list[x].tare,
                     }
@@ -393,7 +393,7 @@
                   let newObj = {
                     cabinetId:self.dialogData.maxList[i].cabinetId,
                     chemicalAmount:self.dialogData.maxList[i].list[o].chemicalAmount,
-                    chemicalAmountUnit:"g/瓶",
+                    chemicalAmountUnit:self.listPropsData.chemicalUnit,
                     storageNum:self.dialogData.maxList[i].list[o].storageNum,
                     tare:self.dialogData.maxList[i].list[o].tare,
                   }

src/views/medicUniversity-3_1/chemicalManagement/chemicalProcurement/purchaseRequisition/addPage.vue

@@ -69,7 +69,7 @@
                   </el-form-item>
                 </div>
                 <p class="form-list-text-p">
-                  {{minItem.applyText?minItem.applyText+'g':'请选择化学品柜'}}
+                  {{minItem.applyText?minItem.applyText+item.chemicalUnit:'请选择化学品柜'}}
                 </p>
                 <div class="form-list-two-box">
                   <el-form-item label="" :prop="'maxList.'+ index +'.list.'+ minIndex +'.applyNum'"
@@ -80,7 +80,7 @@
                       placeholder="请输入本次申购量"
                       clearable
                       style="width: 220px"
-                    ><i slot="append">g</i></el-input>
+                    ><i slot="append">{{item.chemicalUnit}}</i></el-input>
                   </el-form-item>
                   <p class="el-icon-delete button-icon-p" v-if="formData.maxList[index].list.length>1" @click="delObj(index,minIndex)"></p>
                   <p class="el-icon-circle-plus-outline button-icon-p" v-if="minIndex ==formData.maxList[index].list.length-1" @click="addObj(index)"></p>
@@ -182,6 +182,7 @@
             let obj = {
               chemicalId:self.multipleTableList[i].id,
               chemicalName:self.multipleTableList[i].chemicalName,
+              chemicalUnit:self.multipleTableList[i].chemicalUnit,
               list:[{cabinetId:"",applyNum:"",applyText:""}],
             }
             self.formData.maxList.push(obj);

src/views/medicUniversity-3_1/chemicalManagement/chemicalProcurement/purchaseRequisition/draftPage.vue

@@ -143,6 +143,7 @@
               let obj = {
                 chemicalId:parseInt(response.data.actHxpapplyDetailList[i].chemicalId),
                 chemicalName:response.data.actHxpapplyDetailList[i].chemicalName,
+                applyUnit:response.data.actHxpapplyDetailList[i].applyUnit,
                 list:[],
               }
               maxObj.maxList.push(obj);

src/views/medicUniversity-3_1/chemicalManagement/chemicalProcurement/purchaseRequisition/editPage.vue

@@ -70,7 +70,7 @@
                     </el-form-item>
                   </div>
                   <p class="form-list-text-p">
-                    {{minItem.applyText?minItem.applyText+'g':'请选择化学品柜'}}
+                    {{minItem.applyText?minItem.applyText+item.applyUnit:'请选择化学品柜'}}
                   </p>
                   <div class="form-list-two-box">
                     <el-form-item label="" :prop="'maxList.'+ index +'.list.'+ minIndex +'.applyNum'"
@@ -81,7 +81,7 @@
                         placeholder="请输入本次申购量"
                         clearable
                         style="width: 220px"
-                      ><i slot="append">g</i></el-input>
+                      ><i slot="append">{{item.applyUnit}}</i></el-input>
                     </el-form-item>
                     <p class="el-icon-delete button-icon-p" v-if="formData.maxList[index].list.length>1" @click="delObj(index,minIndex)"></p>
                     <p class="el-icon-circle-plus-outline button-icon-p" v-if="minIndex ==formData.maxList[index].list.length-1" @click="addObj(index)"></p>

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;

src/views/studentViews/chemicalManagement/studentChemicalInfo/addPage.vue

@@ -99,7 +99,7 @@
             <div class="for-max-title-box">
               <p></p>
               <p>{{item.name}}</p>
-              <p>{{selectioned.chemicalName}}可存放量：{{item.maxNum}}g</p>
+              <p>{{selectioned.chemicalName}}可存放量：{{item.maxNum}}{{selectioned.chemicalUnit}}</p>
             </div>
             <div class="for-big-box" v-for="(bigItem,bigIndex) in item.chemicalJoinCabinetSonList">
               <p class="for-big-title-p">{{bigItem.lockName}}</p>
@@ -120,7 +120,7 @@
                         v-model="minItem.chemicalAmount"
                         placeholder="请输入">
                       </el-input-number>
-                      <p class="num-title-span">g</p>
+                      <p class="num-title-span">{{selectioned.chemicalUnit}}</p>
                     </div>
                   </el-form-item>
                   <el-form-item class="num-input-item" label="容器重量规格" label-width="120px" :prop="'maxList.'+ index +'.chemicalJoinCabinetSonList.'+bigIndex+'.list.'+minIndex+'.tare'" :rules="rules.tare">
@@ -134,7 +134,7 @@
                         v-model="minItem.tare"
                         placeholder="请输入">
                       </el-input-number>
-                      <p class="num-title-span">g</p>
+                      <p class="num-title-span">{{selectioned.chemicalUnit}}</p>
                     </div>
                   </el-form-item>
                   <el-form-item label="存放数量" label-width="90px" :prop="'maxList.'+ index +'.chemicalJoinCabinetSonList.'+bigIndex+'.list.'+minIndex+'.storageNum'" :rules="rules.storageNum" class="el-form-item-button-box">
@@ -157,7 +157,7 @@
             <div class="for-max-title-box">
               <p></p>
               <p>{{item.name}}</p>
-              <p>{{selectioned.chemicalName}}可存放量：{{item.maxNum}}g</p>
+              <p>{{selectioned.chemicalName}}可存放量：{{item.maxNum}}{{selectioned.chemicalUnit}}</p>
             </div>
             <div class="for-big-box">
               <div class="for-big-for-max-box">
@@ -177,7 +177,7 @@
                         v-model="bigItem.chemicalAmount"
                         placeholder="请输入">
                       </el-input-number>
-                      <p class="num-title-span">g</p>
+                      <p class="num-title-span">{{selectioned.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">
@@ -191,7 +191,7 @@
                         v-model="bigItem.tare"
                         placeholder="请输入">
                       </el-input-number>
-                      <p class="num-title-span">g</p>
+                      <p class="num-title-span">{{selectioned.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">
@@ -388,7 +388,7 @@
                       cabinetId:self.dialogData.maxList[i].cabinetId,
                       cabinetlockId:self.dialogData.maxList[i].chemicalJoinCabinetSonList[o].id,
                       chemicalAmount:self.dialogData.maxList[i].chemicalJoinCabinetSonList[o].list[x].chemicalAmount,
-                      chemicalAmountUnit:"g/瓶",
+                      chemicalAmountUnit:self.selectioned.chemicalUnit,
                       storageNum:self.dialogData.maxList[i].chemicalJoinCabinetSonList[o].list[x].storageNum,
                       tare:self.dialogData.maxList[i].chemicalJoinCabinetSonList[o].list[x].tare,
                     }
@@ -403,7 +403,7 @@
                   let newObj = {
                     cabinetId:self.dialogData.maxList[i].cabinetId,
                     chemicalAmount:self.dialogData.maxList[i].list[o].chemicalAmount,
-                    chemicalAmountUnit:"g/瓶",
+                    chemicalAmountUnit:self.selectioned.chemicalUnit,
                     storageNum:self.dialogData.maxList[i].list[o].storageNum,
                     tare:self.dialogData.maxList[i].list[o].tare,
                   }

src/views/studentViews/chemicalManagement/studentPurchaseRequisition/addPage.vue

@@ -69,7 +69,7 @@
                   </el-form-item>
                 </div>
                 <p class="form-list-text-p">
-                  {{minItem.applyText?minItem.applyText+'g':'请选择化学品柜'}}
+                  {{minItem.applyText?minItem.applyText+item.chemicalUnit:'请选择化学品柜'}}
                 </p>
                 <div class="form-list-two-box">
                   <el-form-item label="" :prop="'maxList.'+ index +'.list.'+ minIndex +'.applyNum'"
@@ -80,7 +80,7 @@
                       placeholder="请输入本次申购量"
                       clearable
                       style="width: 220px"
-                    ><i slot="append">g</i></el-input>
+                    ><i slot="append">{{item.chemicalUnit}}</i></el-input>
                   </el-form-item>
                   <p class="el-icon-delete button-icon-p" v-if="formData.maxList[index].list.length>1" @click="delObj(index,minIndex)"></p>
                   <p class="el-icon-circle-plus-outline button-icon-p" v-if="minIndex ==formData.maxList[index].list.length-1" @click="addObj(index)"></p>
@@ -183,6 +183,7 @@
             let obj = {
               chemicalId:self.multipleTableList[i].id,
               chemicalName:self.multipleTableList[i].chemicalName,
+              chemicalUnit:self.multipleTableList[i].chemicalUnit,
               list:[{cabinetId:"",applyNum:"",applyText:""}],
             }
             self.formData.maxList.push(obj);

src/views/studentViews/chemicalManagement/studentPurchaseRequisition/draftPage.vue

@@ -143,6 +143,7 @@
               let obj = {
                 chemicalId:parseInt(response.data.actHxpapplyDetailList[i].chemicalId),
                 chemicalName:response.data.actHxpapplyDetailList[i].chemicalName,
+                applyUnit:response.data.actHxpapplyDetailList[i].applyUnit,
                 list:[],
               }
               maxObj.maxList.push(obj);

src/views/studentViews/chemicalManagement/studentPurchaseRequisition/editPage.vue

@@ -70,7 +70,7 @@
                     </el-form-item>
                   </div>
                   <p class="form-list-text-p">
-                    {{minItem.applyText?minItem.applyText+'g':'请选择化学品柜'}}
+                    {{minItem.applyText?minItem.applyText+item.applyUnit:'请选择化学品柜'}}
                   </p>
                   <div class="form-list-two-box">
                     <el-form-item label="" :prop="'maxList.'+ index +'.list.'+ minIndex +'.applyNum'"
@@ -81,7 +81,7 @@
                         placeholder="请输入本次申购量"
                         clearable
                         style="width: 220px"
-                      ><i slot="append">g</i></el-input>
+                      ><i slot="append">{{item.applyUnit}}</i></el-input>
                     </el-form-item>
                     <p class="el-icon-delete button-icon-p" v-if="formData.maxList[index].list.length>1" @click="delObj(index,minIndex)"></p>
                     <p class="el-icon-circle-plus-outline button-icon-p" v-if="minIndex ==formData.maxList[index].list.length-1" @click="addObj(index)"></p>
@@ -368,6 +368,7 @@
         display: flex;
         flex-direction: column;
         padding:20px 80px;
+        font-weight:500;
         .two-form-flex{
           display: flex;
           .two-form-left{