zc

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

@@ -125,7 +125,7 @@
                     <div class="num-input-min-box">
                       <el-input-number
                         style="width:110px;"
-                        min=""
+                        :min="null"
                         :max="1000"
                         :precision="2"
                         :step="0.01"
@@ -148,7 +148,7 @@
                     <div class="num-input-min-box">
                       <el-input-number
                         style="width:110px;"
-                        min=""
+                        :min="null"
                         :max="9999"
                         :precision="2"
                         :step="0.01"

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

@@ -218,7 +218,9 @@
         </div>
         <div class="approvalPage-info-dialog-box-text-box">
           <p>属性：</p>
-          <p>{{infoDialogData.classifyAttribute}}</p>
+          <el-tooltip class="item" effect="dark" :content="infoDialogData.classifyAttribute" placement="top">
+            <p style="display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">{{infoDialogData.classifyAttribute}}</p>
+          </el-tooltip>
         </div>
       </div>
       <div class="approvalPage-info-dialog-text-big-box">

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

@@ -122,7 +122,7 @@
                     <div class="num-input-min-box">
                       <el-input-number
                         style="width:110px;"
-                        min=""
+                        :min="null"
                         :max="1000"
                         :precision="2"
                         :step="0.01"
@@ -145,7 +145,7 @@
                     <div class="num-input-min-box">
                       <el-input-number
                         style="width:110px;"
-                        min=""
+                        :min="null"
                         :max="9999"
                         :precision="2"
                         :step="0.01"
@@ -384,15 +384,31 @@
         let self = this;
         this.$refs["dialogForm"].validate(valid => {
           if (valid) {
-            for(let i=0;i<self.dialogData.maxList.length;i++){
-              let maxNum = parseFloat(self.dialogData.maxList[i].maxNum);
-              let num = 0;
-              for(let o=0;o<self.dialogData.maxList[i].list.length;o++){
-                num = num + parseFloat(self.dialogData.maxList[i].list[o].chemicalAmount)
+            if(this.$store.state.settings.smartAlarmType == 0){
+              for(let i=0;i<self.dialogData.maxList.length;i++){
+                let maxNum = parseFloat(self.dialogData.maxList[i].maxNum);
+                let num = 0;
+                for(let o=0;o<self.dialogData.maxList[i].list.length;o++){
+                  num = num + parseFloat(self.dialogData.maxList[i].list[o].chemicalAmount)
+                }
+                if(num>maxNum){
+                  this.msgError(self.dialogData.maxList[i].name+' 总容器容量大于可存放量');
+                  return
+                }
               }
-              if(num>maxNum){
-                this.msgError(self.dialogData.maxList[i].name+' 总容器容量大于可存放量');
-                return
+            }else if(this.$store.state.settings.smartAlarmType == 1){
+              for(let i=0;i<self.dialogData.maxList.length;i++){
+                let maxNum = parseFloat(self.dialogData.maxList[i].maxNum);
+                let num = 0;
+                for(let o=0;o<self.dialogData.maxList[i].chemicalJoinCabinetSonList.length;o++){
+                  for(let x=0;x<self.dialogData.maxList[i].chemicalJoinCabinetSonList[o].list.length;x++){
+                    num = num + parseFloat(self.dialogData.maxList[i].chemicalJoinCabinetSonList[o].list[x].chemicalAmount)
+                  }
+                }
+                if(num>maxNum){
+                  this.msgError(self.dialogData.maxList[i].name+' 总容器容量大于可存放量');
+                  return
+                }
               }
             }
             let obj = {