Merge remote-tracking branch 'origin/master'

src/components/Breadcrumb/index.vue

@@ -99,7 +99,7 @@ export default {
   margin-left: 10px;
 
   .no-redirect {
-    color: #97a8be;
+    color: #8A8A8A;
     cursor: text;
   }
 }

src/styles/element-ui.scss

@@ -233,6 +233,9 @@ body .el-table th.gutter{
 .el-select .el-input.is-focus .el-input__inner{
   border-color:#D20A10
 }
+.el-pagination__sizes .el-input .el-input__inner:hover{
+  border-color:#D20A10!important;
+}
 // input框点击后红色边框
 .el-input__inner{
   &:focus {

src/views/productionInfo/ModelDetails.vue

@@ -8,7 +8,7 @@
             <div class="labelName">Factory</div>
           </div>
           <div style="width: 200px">
-            {{ factory }}
+            {{ getFactory(factory) }}
           </div>
         </el-form-item>
         <el-form-item class="labelHeight" label="成品料号" prop="modelCode" style="margin-left: 20px">
@@ -1215,6 +1215,15 @@ export default {
         this.positionList = list
         this.openConfiguring = false
       }
+    },
+    // 区域工厂中文转换
+    getFactory(factory) {
+      switch (factory) {
+        case 'NB':
+          return '北京'
+        case 'NOSZ':
+          return '苏州'
+      }
     }
   }
 }