按钮颜色修改

src/styles/element-ui.scss

@@ -426,7 +426,7 @@ label {
     color: $color-theme;
   }
   &.success {
-    color: $color-green;
+    color: $color-success;
   }
   &.danger {
     color: $color-red;

src/styles/element-variables.scss

@@ -3,6 +3,7 @@
 $--color-primary: $color-theme;
 $--color-warning: $color-orange;
 $--color-danger: $color-red;
+$--color-success: $color-success;
 //$--color-info: $color-theme;
 
 /* 改变 icon 字体路径变量，必需 */

src/styles/variables.scss

 // 主题色
-$color-theme: #46BCF3;
-$color-red: #F57b7b;
+$color-theme: #0A82D2;
+$color-red: #D20A10;
 $color-purple: #ff33a9;
 $color-orange: #f4ac10;
 $color-blue: #409EFF;
+$color-success: #2BAC1C;
+
+
 // 我的单据背景色 考勤统计
 $color-cambridge-blue: #29a2db;
 // 我的单据背景色 考勤统计

src/views/productionInfo/badDefinition.vue

@@ -708,7 +708,6 @@ export default {
 
 <style lang="scss" scoped>
 .bad_definition {
-  font-size: 18px;
   .placeholder{
     height:14px;
     background-color: #F4F4F4

src/views/repair/repairRecord.vue

 <!--维修工单-->
 <template>
-  <div class="bad_definition">
-    <div class="badSearch" style="border-bottom: 14px solid #f4f4f4">
+  <div class="repair_record">
+    <div class="repSearch" style="border-bottom: 14px solid #f4f4f4">
       <el-form ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" :inline="true" label-width="auto">
         <el-form-item label="维修单号" prop="repairNo">
           <div slot="label" class="labelClass">
@@ -155,7 +155,7 @@
           />
         </el-col>
       </el-row>
-      <el-dialog :close-on-click-modal="false" class="badDialog" title="维修工单详情" :visible.sync="openBad" width="70%" append-to-body>
+      <el-dialog :close-on-click-modal="false" class="repDialog" title="维修工单详情" :visible.sync="openBad" width="70%" append-to-body>
         <el-form v-loading="openLoading" :model="form" label-width="auto" class="formClass">
           <el-row>
             <el-col :span="8">
@@ -164,8 +164,8 @@
                   <div class="labelName">维修单号</div>
                   <div class="labelName">Repair No.</div>
                 </div>
-<!--                <el-input v-model="form.repairNo" :disabled="true"></el-input>-->
-                <div style="background-color: #E9E9E9">{{ form.repairNo || '-' }}</div>
+                <el-input v-model="form.repairNo" :disabled="true"/>
+<!--                <div style="background-color: #E9E9E9">{{ form.repairNo || '-' }}</div>-->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -174,7 +174,8 @@
                   <div class="labelName">状态</div>
                   <div class="labelName">Status</div>
                 </div>
-                <div style="background-color: #E9E9E9">{{ getFlag(form.flag) || '-' }}</div>
+                <el-input v-model="form.flag" :disabled="true" />
+<!--                <div style="background-color: #E9E9E9">{{ getFlag(form.flag) || '-' }}</div>-->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -183,7 +184,8 @@
                   <div class="labelName">报修时间</div>
                   <div class="labelName">Create Date</div>
                 </div>
-                <div style="background-color: #E9E9E9">{{ form.createDate || '-' }}</div>
+                <el-input v-model="form.createDate" :disabled="true" />
+<!--                <div style="background-color: #E9E9E9">{{ form.createDate || '-' }}</div>-->
               </el-form-item>
             </el-col>
           </el-row>
@@ -194,7 +196,8 @@
                   <div class="labelName">报修工号</div>
                   <div class="labelName">B/N</div>
                 </div>
-                <div style="background-color: #E9E9E9">{{ form.maintainCode || '-' }}</div>
+                <el-input v-model="form.maintainCode" :disabled="true" />
+<!--                <div style="background-color: #E9E9E9">{{ form.maintainCode || '-' }}</div>-->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -203,7 +206,8 @@
                   <div class="labelName">报修工站</div>
                   <div class="labelName">Position</div>
                 </div>
-                <div style="background-color: #E9E9E9">{{ form.stationName || '-' }}</div>
+                <el-input v-model="form.stationName" :disabled="true" />
+<!--                <div style="background-color: #E9E9E9">{{ form.stationName || '-' }}</div>-->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -212,7 +216,8 @@
                   <div class="labelName">SN编码</div>
                   <div class="labelName">SN</div>
                 </div>
-                <div style="background-color: #E9E9E9">{{ form.sn || '-' }}</div>
+                <el-input v-model="form.sn" :disabled="true" />
+<!--                <div style="background-color: #E9E9E9">{{ form.sn || '-' }}</div>-->
               </el-form-item>
             </el-col>
           </el-row>
@@ -223,7 +228,8 @@
                   <div class="labelName">不良类型</div>
                   <div class="labelName">Code</div>
                 </div>
-                <div style="background-color: #E9E9E9">{{ form.rejectType || '-' }} {{ form.rejectLabel }}</div>
+                <el-input v-model="form.rejectType" :title="form.rejectType" :disabled="true" />
+<!--                <div style="background-color: #E9E9E9">{{ form.rejectType || '-' }} {{ form.rejectLabel }}</div>-->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -232,7 +238,8 @@
                   <div class="labelName">不良描述</div>
                   <div class="labelName">Reject Description</div>
                 </div>
-                <div style="background-color: #E9E9E9">{{ form.rejectDescription || '-' }}</div>
+                <el-input v-model="form.rejectDescription" :title="form.rejectDescription" :disabled="true" />
+<!--                <div style="background-color: #E9E9E9">{{ form.rejectDescription || '-' }}</div>-->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -241,7 +248,8 @@
                   <div class="labelName">维修时间</div>
                   <div class="labelName">Repair Time</div>
                 </div>
-                <div style="background-color: #E9E9E9">{{ form.repairDate || '-' }}</div>
+                <el-input v-model="form.repairDate" :disabled="true" />
+<!--                <div style="background-color: #E9E9E9">{{ form.repairDate || '-' }}</div>-->
               </el-form-item>
             </el-col>
           </el-row>
@@ -252,7 +260,8 @@
                   <div class="labelName">维修工号</div>
                   <div class="labelName">Repair B/N</div>
                 </div>
-                <div style="background-color: #E9E9E9">{{ form.repairCode || '-' }}</div>
+                <el-input v-model="form.repairCode" :disabled="true"></el-input>
+<!--                <div style="background-color: #E9E9E9">{{ form.repairCode || '-' }}</div>-->
               </el-form-item>
             </el-col>
             <el-col :span="16">
@@ -261,7 +270,8 @@
                   <div class="labelName">维修辅料料号</div>
                   <div>Auxiliary No</div>
                 </div>
-                <div style="background-color: #E9E9E9">{{ form.auxiliaryMatersOne || '-' }}</div>
+                <el-input v-model="form.auxiliaryMatersOne" :disabled="true"></el-input>
+<!--                <div style="background-color: #E9E9E9">{{ form.auxiliaryMatersOne || '-' }}</div>-->
               </el-form-item>
             </el-col>
           </el-row>
@@ -272,7 +282,8 @@
                   <div class="labelName">备注</div>
                   <div class="labelName">PS</div>
                 </div>
-                <div style="background-color: #E9E9E9">{{ form.remarks || '-' }}</div>
+                <el-input v-model="form.remarks" :disabled="true"></el-input>
+<!--                <div style="background-color: #E9E9E9">{{ form.remarks || '-' }}</div>-->
               </el-form-item>
             </el-col>
           </el-row>
@@ -281,27 +292,24 @@
               <el-col :span="8">
                 <el-form-item label="维修SN" prop="maintainSn">
                   <div slot="label" class="labelClass">
-                    <div>维修SN</div>
-                    <div>Reject Type</div>
+                    <div class="labelName">维修SN</div>
+                    <div class="labelName">Reject Type</div>
                   </div>
-                  <div style="background-color: #E9E9E9">{{ item.maintainSn || '-' }}</div>
+                  <el-input v-model="item.maintainSn" :disabled="true" />
                 </el-form-item>
               </el-col>
               <el-col :span="16">
                 <el-form-item label="替换SN" prop="replaceSn">
                   <div slot="label" class="labelClass">
-                    <div>替换SN</div>
-                    <div>Reject Code</div>
+                    <div class="labelName">替换SN</div>
+                    <div class="labelName">Reject Code</div>
                   </div>
-                  <div style="background-color: #E9E9E9">{{ item.replaceSn || '-' }}</div>
+                  <el-input v-model="item.replaceSn" :disabled="true" />
                 </el-form-item>
               </el-col>
             </div>
           </el-row>
         </el-form>
-<!--        <div slot="footer" class="dialog-footer">-->
-<!--          <el-button class="canleBtn" @click="cancel">关闭 Close</el-button>-->
-<!--        </div>-->
       </el-dialog>
     </div>
   </div>
@@ -343,32 +351,32 @@ export default {
       openBad: false,
       form: {
         // 维修单号
-        repairNo: '',
+        repairNo: '-',
         // 状态
-        flag: '',
+        flag: '-',
         // 报修时间
-        createDate: '',
+        createDate: '-',
         // 报修工号
-        maintainCode: '',
+        maintainCode: '-',
         // 报修工站
-        stationName: '',
+        stationName: '-',
         // sn
         sn: '',
         // 不良类型数字
-        rejectType: '',
+        rejectType: '-',
         // 不良类型文字
-        rejectLabel: '',
+        rejectLabel: '-',
         // 不良描述
-        rejectDescription: '',
+        rejectDescription: '-',
         // 维修时间
-        repairDate: '',
+        repairDate: '-',
         // 维修工号
-        repairCode: '',
+        repairCode: '-',
         // 备注
-        remarks: '',
+        remarks: '-',
         // 维修辅料料号
-        auxiliaryMaters: '',
-        auxiliaryMatersOne: '',
+        auxiliaryMaters: '-',
+        auxiliaryMatersOne: '-',
         // 维修sn, 替换sn
         materSNs: {
           maintainSn: '-',
@@ -434,13 +442,18 @@ export default {
       }
       listRepairRecordDetails(params).then(res => {
         this.form = res.data
+        if (this.form.flag === '1') {
+          this.form.flag = '已维修'
+        } else if (this.form.flag === '0') {
+          this.form.flag = '未维修'
+        }
         this.form.auxiliaryMatersOne = this.form.auxiliaryMaters.join(',')
         const params = 'defectType'
         getDicts(params).then(response => {
           this.positionOption = response.data
           this.positionOption.forEach(item => {
             if (this.form.rejectType === item.dictValue) {
-              this.form.rejectLabel = item.dictLabel
+              this.form.rejectType = this.form.rejectType + ' ' + item.dictLabel
             }
           })
           this.openLoading = false
@@ -472,13 +485,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.bad_definition {
-  font-size: 18px;
+.repair_record {
   .placeholder{
     height:14px;
     background-color: #F4F4F4
   }
-  .badSearch {
+  .repSearch {
     .el-form-item--small .el-form-item__label{
       line-height: 17px;
     }
@@ -494,8 +506,12 @@ export default {
 }
 </style>
 <style lang="scss">
-.bad_definition {
-  .badSearch{
+.repair_record {
+  .placeholder{
+    height:14px;
+    background-color: #F4F4F4
+  }
+  .repSearch{
     .el-form-item--small .el-form-item__label{
       line-height: 17px;
     }
@@ -512,7 +528,7 @@ export default {
     margin-left: 0!important;
   }
 }
-.badDialog{
+.repDialog{
   .labelHeight{
     .el-form-item__label{
       height: 40px;
@@ -527,18 +543,34 @@ export default {
   }
   .labelClass{
     position: relative;
-    right: 0;
     text-align: center;
   }
   .labelClassRequired{
     text-align: center;
     position: relative;
     bottom: 0;
-    right: 2px;
+    right: 0;
   }
   .el-input .el-input__inner {
     padding: 0 10px;
   }
+  .el-input {
+    [disabled] {
+      background-color: #E9E9E9;
+    }
+  }
+  .el-col-8 {
+    position: relative;
+    right: 25px;
+  }
+  .el-col-16 {
+    position: relative;
+    right: 25px;
+  }
+  .el-col-24 {
+    position: relative;
+    right: 25px;
+  }
 
 }
 </style>

src/views/system/synchronization/index.vue

@@ -231,7 +231,7 @@ export default {
   }
 }
 </style>
-<style lang="scss">
+<style lang="scss" scoped>
 .synchronization {
   .badSearch{
     .el-form-item--small .el-form-item__label{