update

src/assets/sass/common.scss

@@ -156,8 +156,8 @@
   }
 
   .el-table .warning-row td {
-    background: #ff4949 !important;
-    color: #fff !important;
+    // background: #ff4949 !important;
+    color: #ff4949 !important;
   }
   input, textarea {
     padding: 0 15px;

src/views/education/component/linePop.vue

@@ -49,19 +49,19 @@
                     <input v-model="Desc" class="nameipt" />
                 </div>
 
-                <div v-if="type == 6" class="name">
+                <div v-if="type == 6" class="newName">
                     <span>生产计划编号：</span>
                     <span @click="openRelate('VPID')" class="relateBtn plan_relateBtn" >选 择</span>
                     <input v-model="VPID" disabled class="nameipt disInput"/>
                     <input v-model="PID" disabled class="nameipt planName" />
                 </div>
-                  <div v-if="type == 6" style="margin-top: 20px" class="name">
+                  <div v-if="type == 6" style="margin-top: 20px" class="newName">
                     <span>产品编号：</span>
-                      <el-select class="apply planName" v-model="ProductID" clearable placeholder="请选择">
+                      <el-select class="apply applySelect" v-model="ProductID" clearable placeholder="请选择">
                         <el-option
                         v-for="item in proList"
-                        :key="item.Name"
-                        :label="item.Name"
+                        :key="item.ProNumber"
+                        :label="item.ProNumber"
                         :value="item.ID">
                         </el-option>
                     </el-select>
@@ -148,7 +148,7 @@
                 <div v-if="type == 6" class="name2" style="margin-top: 70px">
                     <span>交货日期临近报警：</span>
                     <span @click="openRelate('VStatus')" style=" float: right; margin: 0;" class="relateBtn">选 择</span>
-                    <input v-model="VStatus" disabled class="nameipt" style="width: 348px !important;height: 40px" /> 
+                    <input v-model="VStatus" disabled class="nameipt" style="width: 368px !important;height: 40px; margin-left: -20px;" /> 
                 </div>
                 <div v-if="type==3" class="namebtn">
                   <span>选择所包含的工序：</span>
@@ -868,8 +868,12 @@ export default {
                 width: 70%;
                 margin: auto;
                 line-height: 40px;
+                span:first-child {
+                    position: relative;
+                    left: -25px;
+                }
             }
-            .name{
+            .name, .newName{
                 width: 70%;
                 // height: 40px;
                 margin: auto;
@@ -884,13 +888,24 @@ export default {
                     width: 360px;   
                 }
                 .nametextar{
-                     width: 460px;
-                     margin-top:10px;
+                    width: 460px;
+                    margin-top:10px;
                     height: 60px;
                     float: right;
                 }
                 
             }
+            .newName{
+                overflow: visible;
+                span:first-child {
+                    position: relative;
+                    left: -25px;
+                }
+            } 
+            .applySelect {
+                width: 365px !important;
+                margin-right: 20px;
+            }
             .planName {
                 width: 235px !important;
                 margin-right: 20px;