diff --git a/src/views/modules/eam/eamFeedBack.vue b/src/views/modules/eam/eamFeedBack.vue
index 46e9dd8..c4f1d85 100644
--- a/src/views/modules/eam/eamFeedBack.vue
+++ b/src/views/modules/eam/eamFeedBack.vue
@@ -60,7 +60,7 @@
       <el-form-item style="margin-top: 23px;">
         <laber style="margin-left: -9px;font-size: 19px">&#10142</laber>
       </el-form-item>
-      <el-form-item  :label="' '">
+      <el-form-item :label="' '">
         <el-date-picker
           style="width: 120px"
           v-model="searchData.endDate"
@@ -69,7 +69,7 @@
           placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item  :label="' '">
+      <el-form-item :label="' '">
         <el-button v-if="!authSearch" @click="getDataList">查询</el-button>
         <el-button v-if="!authSave" @click="saveModal">新增</el-button>
         <download-excel
@@ -225,7 +225,7 @@
           </el-select>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="saveModalData" :rules="saveRules" style="margin-left: 7px;margin-top: -5px;">
+      <el-form :inline="true" label-position="top" :model="saveModalData" :rules="saveRules" style="margin-left: 7px">
         <el-form-item prop="objectID">
           <span slot="label" @click="getBaseList(200)"><a href="#">设备编码</a></span>
           <el-input v-model="saveModalData.objectID" style="width: 221px"></el-input>
@@ -234,7 +234,7 @@
           <el-input v-model="saveModalData.objectDesc" disabled style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form v-if="saveModalData.repairReportingType === '设备故障'" :inline="true" label-position="top" :model="saveModalData" :rules="saveRules" style="margin-left: 7px;margin-top: -5px;">
+      <el-form v-if="saveModalData.repairReportingType === '设备故障'" :inline="true" label-position="top" :model="saveModalData" :rules="saveRules" style="margin-left: 7px">
         <el-form-item prop="defectID">
           <span slot="label" @click="getBaseList(1055)"><a href="#">故障编码</a></span>
           <el-input v-model="saveModalData.defectID" style="width: 221px"></el-input>
@@ -243,16 +243,16 @@
           <el-input v-model="saveModalData.defectDesc" disabled style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form v-else :inline="true" label-position="top" :model="saveModalData" :rules="saveRules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item prop="defectID">
-          <span slot="label" @click="getBaseList(1058)"><a href="#">问题代码</a></span>
-          <el-input v-model="saveModalData.defectID" style="width: 221px"></el-input>
-        </el-form-item>
-        <el-form-item label="问题描述">
-          <el-input v-model="saveModalData.defectDesc" disabled style="width: 221px"></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form v-if="saveModalData.repairReportingType === '设备故障'" :inline="true" label-position="top" :model="saveModalData" style="margin-left: 7px;margin-top: -5px;">
+<!--      <el-form v-else :inline="true" label-position="top" :model="saveModalData" :rules="saveRules" style="margin-left: 7px;margin-top: -5px;">-->
+<!--        <el-form-item prop="defectID">-->
+<!--          <span slot="label" @click="getBaseList(1058)"><a href="#">问题代码</a></span>-->
+<!--          <el-input v-model="saveModalData.defectID" style="width: 221px"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="问题描述">-->
+<!--          <el-input v-model="saveModalData.defectDesc" disabled style="width: 221px"></el-input>-->
+<!--        </el-form-item>-->
+<!--      </el-form>-->
+      <el-form v-if="saveModalData.repairReportingType === '设备故障'" :inline="true" label-position="top" :model="saveModalData" style="margin-left: 7px">
         <el-form-item label="故障日期">
           <el-date-picker style="width: 221px" v-model="saveModalData.defectDate" type="date" value-format="yyyy-MM-dd" format='yyyy-MM-dd' placeholder="请选择故障日期" :editable=false :picker-options="pickerOptions"></el-date-picker>
         </el-form-item>
@@ -260,7 +260,7 @@
           <el-input v-model="saveModalData.feedBackDesc" style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form v-else :inline="true" label-position="top" :model="saveModalData" style="margin-left: 7px;margin-top: -5px;">
+      <el-form v-else :inline="true" label-position="top" :model="saveModalData" style="margin-left: 7px">
         <el-form-item label="反馈时间">
           <el-date-picker style="width: 221px" v-model="saveModalData.defectDate" type="date" value-format="yyyy-MM-dd" format='yyyy-MM-dd' placeholder="请选择故障日期" :editable=false :picker-options="pickerOptions"></el-date-picker>
         </el-form-item>
@@ -268,7 +268,7 @@
           <el-input v-model="saveModalData.feedBackDesc" style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="saveModalData" :rules="saveRules" style="margin-left: 7px;margin-top: -5px;">
+      <el-form :inline="true" label-position="top" :model="saveModalData" :rules="saveRules" style="margin-left: 7px">
         <el-form-item label="紧急程度" prop="urgency" :rules="saveRules.urgency">
           <el-select v-model="saveModalData.urgency" style="width: 104px">
             <el-option label="一般" value="一般"></el-option>
@@ -276,7 +276,7 @@
             <el-option label="特急" value="特急"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="维修类型" prop="repairType">
+        <el-form-item v-if="saveModalData.repairReportingType === '设备故障'" label="维修类型" prop="repairType">
           <el-select v-model="saveModalData.repairType" style="width: 104px">
             <el-option label="换线专家组" value="换线专家组"></el-option>
             <el-option label="设备维修组" value="设备维修组"></el-option>
@@ -286,7 +286,7 @@
           <el-button type="primary" @click="uploadFaultImageModal()">故障图片</el-button>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="saveModalData" :rules="saveRules" style="margin-left: 7px;margin-top: -5px;">
+      <el-form :inline="true" label-position="top" :model="saveModalData" :rules="saveRules" style="margin-left: 7px">
         <el-form-item label="备注">
           <el-input v-model="saveModalData.remark" style="width: 456px"></el-input>
         </el-form-item>
@@ -329,7 +329,7 @@
     },
     watch: {
       "saveModalData.bu"(newV, oldV) {
-        if (newV.includes('RFID')) {
+        if (newV.includes('RFID') && this.saveModalData.repairReportingType !== 'TPM红牌') {
           this.saveModalData.repairType = '换线专家组'
         } else {
           this.saveModalData.repairType = '设备维修组'
@@ -821,6 +821,10 @@
       repairReportingTypeChange () {
         this.saveModalData.defectID = ''
         this.saveModalData.defectDesc = ''
+        if (this.saveModalData.repairReportingType === 'TPM红牌') {
+          this.saveModalData.defectID = '***'
+          this.saveModalData.repairType = '设备维修组'
+        }
       },
 
       // 新增模态框
diff --git a/src/views/modules/sys/language/common-language-list.vue b/src/views/modules/sys/language/common-language-list.vue
index a0a2c3d..ff19285 100644
--- a/src/views/modules/sys/language/common-language-list.vue
+++ b/src/views/modules/sys/language/common-language-list.vue
@@ -13,8 +13,12 @@
           </el-form-item>
           <el-form-item>
             <el-select filterable v-model="addQuery.languageCode" clearable>
-              <el-option :label="item.languageName" :value="item.languageCode" v-for="(item,index) in languageList "
-                         :key="index"></el-option>
+              <el-option
+                :label="item.languageName"
+                :value="item.languageCode"
+                v-for="(item,index) in languageList"
+                :key="index">
+              </el-option>
             </el-select>
           </el-form-item>
           <el-form-item>