zc

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

@@ -44,13 +44,13 @@
               <!--</el-option>-->
             <!--</el-select>-->
           <!--</el-form-item>-->
-          <el-form-item label="临界量(T)：" prop="criticality" label-width="100px">
-            <el-input
-              maxlength="5"
+          <el-form-item class="criticality-input" label="临界量(T)：" prop="criticality" label-width="100px" v-if="formData.chemicalClassify == 1">
+            <el-input-number
+              :precision="2"
+              :step="0.01" :max="10000"
               style="width:220px;"
               v-model="formData.criticality"
-              onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')"
-              placeholder="请输入化学品名"
+              placeholder="请输入临界量"
               clearable
               size="small"/>
           </el-form-item>
@@ -265,6 +265,9 @@
             console.log('this.addPropsData',this.addPropsData);
             if(this.addPropsData.id){
               //编辑
+              if(this.formData.chemicalClassify != 1){
+                this.formData.criticality = 0;
+              }
               this.formData.classifyAttribute = this.formData.classifyAttribute+'';
               putHxpChemical(this.formData).then(response => {
                 if(response.code == 200){
@@ -274,6 +277,9 @@
               });
             }else{
               //新增
+              if(this.formData.chemicalClassify != 1){
+                this.formData.criticality = 0;
+              }
               this.formData.classifyAttribute = this.formData.classifyAttribute+'';
               addHxpChemical(this.formData).then(response => {
                 if(response.code == 200){
@@ -361,3 +367,16 @@
     }
   }
 </style>
+<style lang="scss">
+  .criticality-input{
+    .el-input-number__decrease,.el-input-number__increase{
+      display: none;
+    }
+    .el-input-number .el-input{
+      input{
+        padding:0 15px;
+        text-align: left;
+      }
+    }
+  }
+</style>

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

@@ -42,7 +42,9 @@
           <img @click="checkClick(item)" :class="approvalPagePropsData.type==1?'cursor-img':''" v-if="!item.checkType" src="@/assets/ZDimages/medicUniversity-3_1/icon_sp_wxz.png">
           <img @click="checkClick(item)" :class="approvalPagePropsData.type==1?'cursor-img':''" v-if="item.checkType" src="@/assets/ZDimages/medicUniversity-3_1/icon_ytg_xz.png">
           <p></p>
-          <p>{{item.chemicalName}}</p>
+          <el-tooltip class="item" effect="dark" :content="item.chemicalName" placement="top">
+            <p>{{item.chemicalName}}</p>
+          </el-tooltip>
           <el-tooltip class="item" effect="dark" :content="item.cabinetName" placement="top">
             <p>{{item.cabinetName}}</p>
           </el-tooltip>
@@ -71,7 +73,9 @@
           <img @click="checkClick(item)" :class="approvalPagePropsData.type==1?'cursor-img':''" v-if="!item.checkType" src="@/assets/ZDimages/medicUniversity-3_1/icon_sp_wxz.png">
           <img @click="checkClick(item)" :class="approvalPagePropsData.type==1?'cursor-img':''" v-if="item.checkType" src="@/assets/ZDimages/medicUniversity-3_1/icon_ytg_xz.png">
           <p></p>
-          <p>{{item.chemicalName}}</p>
+          <el-tooltip class="item" effect="dark" :content="item.chemicalName" placement="top">
+            <p>{{item.chemicalName}}</p>
+          </el-tooltip>
           <el-tooltip class="item" effect="dark" :content="item.cabinetName" placement="top">
             <p>{{item.cabinetName}}</p>
           </el-tooltip>
@@ -836,6 +840,11 @@
           }
           p:nth-child(3){
             width:184px;
+            padding-right:20px;
+            display:block;
+            overflow:hidden;
+            text-overflow:ellipsis;
+            white-space:nowrap;
           }
           p:nth-child(4){
             width:299px;
@@ -928,6 +937,11 @@
           }
           p:nth-child(3){
             width:113px;
+            padding-right:20px;
+            display:block;
+            overflow:hidden;
+            text-overflow:ellipsis;
+            white-space:nowrap;
           }
           p:nth-child(4){
             width:121px;

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

@@ -42,7 +42,9 @@
           <img @click="checkClick(item)" :class="approvalPagePropsData.type==1?'cursor-img':''" v-if="!item.checkType" src="@/assets/ZDimages/medicUniversity-3_1/icon_sp_wxz.png">
           <img @click="checkClick(item)" :class="approvalPagePropsData.type==1?'cursor-img':''" v-if="item.checkType" src="@/assets/ZDimages/medicUniversity-3_1/icon_ytg_xz.png">
           <p></p>
-          <p>{{item.chemicalName}}</p>
+          <el-tooltip class="item" effect="dark" :content="item.chemicalName" placement="top">
+            <p>{{item.chemicalName}}</p>
+          </el-tooltip>
           <el-tooltip class="item" effect="dark" :content="item.cabinetName" placement="top">
             <p>{{item.cabinetName}}</p>
           </el-tooltip>
@@ -794,6 +796,11 @@
           }
           p:nth-child(3){
             width:184px;
+            padding-right:20px;
+            display:block;
+            overflow:hidden;
+            text-overflow:ellipsis;
+            white-space:nowrap;
           }
           p:nth-child(4){
             width:299px;
@@ -886,6 +893,11 @@
           }
           p:nth-child(3){
             width:113px;
+            padding-right:20px;
+            display:block;
+            overflow:hidden;
+            text-overflow:ellipsis;
+            white-space:nowrap;
           }
           p:nth-child(4){
             width:121px;