heyang

src/views/chemicalManage/purchaseManage/purchaseRegister/addPage.vue

@@ -15,7 +15,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="申购人：" prop="name">
-              <el-input v-model="newData.deviceName" placeholder="回显当前账号姓名-联系电话" maxLength="20" style="width:350px;"></el-input>
+              <el-input v-model="newData.deviceName" placeholder="回显当前账号姓名-联系电话"  style="width:350px;"></el-input>
             </el-form-item>
             <div class="research-selete">
               <img src="@/assets/ZDimages/chemicalManage/icon_6.png">
@@ -27,17 +27,21 @@
           </div>
           <div class="content-box-t-b">
             <el-form-item label="用途：">
-              <el-input type="textarea" v-model="newData.deviceName" placeholder="请输入用途" maxLength="20" style="width:350px;height:100px;"></el-input>
+              <el-input type="textarea" v-model="newData.deviceName" placeholder="请输入用途"  :rows="4"style="width:350px;"></el-input>
             </el-form-item>
             <div class="content-box-t-b-r">
               <el-form-item label="导师：">
-                <el-input  v-model="newData.deviceName" placeholder="回显所属导师-联系电话" maxLength="20" style="width:825px;"></el-input>
+                <el-input  v-model="newData.deviceName" placeholder="回显所属导师-联系电话"  style="width:825px;"></el-input>
               </el-form-item>
-              <div><p>液体已存储量：6666ml（上限100000ml）</p><p>固体已存储量：1000g（上限100000g）</p></div>
+              <div class="content-box-t-b-r-b"><p>液体已存储量：6666ml（上限100000ml）</p><p>固体已存储量：1000g（上限100000g）</p></div>
             </div>
           </div>
         </el-form>
       </div>
+      <div class="line"></div>
+      <div class="content-box-b">
+        <div class="content-box-b-t"><p>化学品信息</p></div>
+      </div>
     </div>
     <div class="page-bottom-button-box">
       <p class="page-bottom-button-null-p"></p>
@@ -128,9 +132,6 @@
 <style scoped lang="scss">
   .purchaseRegister-addPage{
     .content-box{
-      flex:1;
-      display: flex;
-      overflow: hidden;
       .content-box-t{
         width: 100%;
         padding: 34px 100px 40px 0px;
@@ -143,11 +144,13 @@
           font-weight: 400;
           color: #333333;
           line-height: 24px;
+          margin-bottom: 20px;
         }
         .content-box-t-m{
           display: flex;
           justify-content: flex-start;
           align-items: center;
+          margin-bottom: 10px;
           .research-selete{
             display: flex;
             justify-content: flex-start;
@@ -175,10 +178,33 @@
           display: flex;
           justify-content: flex-start;
           .content-box-t-b-r{
+            .content-box-t-b-r-b{
+              display: flex;
+              justify-content: flex-start;
+              >p{
+                font-size: 16px;
+                font-family: Microsoft YaHei, Microsoft YaHei;
+                font-weight: 400;
+                color: #333333;
+                line-height: 24px;
+              }
+              >p:nth-of-type(1){
+                margin-left: 35px;
+              }
+              >p:nth-of-type(2){
+                margin-left: 146px;
+              }
+            }
 
           }
+
         }
       }
+      .line{
+        width: 1579px;
+        height: 20px;
+        background: #F5F5F5;
+      }
     }
   }
 </style>

src/views/integratedManagement/messageNotice/warningNotice/forewarningConfig.vue

@@ -265,8 +265,8 @@
                :visible.sync="dialogType" v-if="dialogType" @close="dialogOff()"
                :close-on-click-modal="false" :close-on-press-escape="false">
       <div class="question-box">
-        <i class="el-icon-question question-icon"></i>
-        <i class="question-text">如在设定的处理时间内未处理，则报警升级执行下一步流程。</i>
+        <p class="el-icon-question question-icon"></p>
+        <p class="question-text">如在设定的处理时间内未处理，则报警升级执行下一步流程。</p>
       </div>
       <el-form :model="dialogForm" ref="dialogForm" :inline="true" :rules="dialogRules" class="addCheckPage-min" label-width="80px">
         <el-form-item label="名称" prop="dictKey">
@@ -666,6 +666,7 @@
 <style lang="scss">
   .forewarningUp-dialog{
     .question-box{
+      display: flex;
       padding:0 45px 20px;
       .question-icon{
         color:#FFC000;
@@ -674,6 +675,7 @@
         line-height:16px;
       }
       .question-text{
+        color:#333;
         margin-left:12px;
         height:20px;
         line-height:16px;