diff --git a/index.html b/index.html
index 78cb0f8..91f418d 100644
--- a/index.html
+++ b/index.html
@@ -10,7 +10,7 @@
   <script>document.write('<script src="./config/index.js?t=' + new Date().getTime() + '"><\/script>');</script>
   <% }else { %>
   <!-- 开发环境 -->
-  <link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico">
+  <link rel="shortcut icon" type="image/x-icon" href="./static/img/ckp.png">
   <script src="./static/config/index.js"></script>
   <script src="./static/plugins/mock-1.0.0-beta3/mock-min.js"></script>
   <script src="./static/plugins/echarts-3.8.5/echarts.common.min.js"></script>
diff --git a/src/assets/img/ckp.png b/src/assets/img/ckp.png
new file mode 100644
index 0000000..78205ff
Binary files /dev/null and b/src/assets/img/ckp.png differ
diff --git a/src/assets/scss/_base.scss b/src/assets/scss/_base.scss
index c6121b0..dfba98b 100644
--- a/src/assets/scss/_base.scss
+++ b/src/assets/scss/_base.scss
@@ -200,11 +200,12 @@ img {
     }
     .el-dropdown-link {
       > img {
-        width: 36px;
-        height: auto;
+        width: 55px;
+        height: 35px;
         margin-right: 5px;
-        border-radius: 100%;
+        //border-radius: 100%;
         vertical-align: middle;
+        object-fit: contain;
       }
     }
   }
diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index 9c6f071..9d615c7 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -57,7 +57,7 @@
         <el-menu-item class="site-navbar__avatar" index="4">
           <el-dropdown :show-timeout="0" placement="bottom">
                       <span class="el-dropdown-link">
-                        <img src="~@/assets/img/avatar.png" :alt="userName">{{ userName }}
+                        <img src="~@/assets/img/ckp.png" :alt="userName">{{ userName }}
                       </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item @click.native="logoutHandle()">退出</el-dropdown-item>
diff --git a/src/views/modules/eam/com_eam_object_upload_file.vue b/src/views/modules/eam/com_eam_object_upload_file.vue
index b814862..b6e80f2 100644
--- a/src/views/modules/eam/com_eam_object_upload_file.vue
+++ b/src/views/modules/eam/com_eam_object_upload_file.vue
@@ -16,7 +16,7 @@
           <el-col :span="12" style="width: 32%">
             <el-form-item class="customer-item" label="文件类型:">
               <el-select v-model="pageData.fileType" style="width: 110px">
-                <el-option label="sop" value="sop"></el-option>
+                <el-option label="SOP-ST" value="SOP-ST"></el-option>
                 <el-option label="other" value="other"></el-option>
               </el-select>
             </el-form-item>
diff --git a/src/views/modules/eam/eamFeedBack.vue b/src/views/modules/eam/eamFeedBack.vue
index a6d2716..178cbc9 100644
--- a/src/views/modules/eam/eamFeedBack.vue
+++ b/src/views/modules/eam/eamFeedBack.vue
@@ -84,6 +84,25 @@
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
       style="width: 100%;">
+      <el-table-column
+        prop="buDesc"
+        header-align="center"
+        align="center"
+        label="BU"
+        width="60">
+      </el-table-column>
+      <el-table-column
+        prop="urgency"
+        header-align="center"
+        align="center"
+        label="紧急程度"
+        width="70">
+        <template slot-scope="scope">
+          <div :style="{fontWeight:'bold', color: scope.row.urgency === '特急' ? 'red' : scope.row.urgency === '紧急' ? '#ffa500e0' : scope.row.urgency === '一般' ? '#3ac252' : ''}">
+            {{ scope.row.urgency }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         v-for="(item,index) in columnList" :key="index"
         :sortable="item.columnSortable"
@@ -337,42 +356,6 @@
         departmentList: [],
         // 展示列集
         columnList: [
-          {
-            userId: this.$store.state.user.name,
-            functionId: 101004001,
-            serialNumber: '101004001Table1BuDesc',
-            tableId: "101004001Table1",
-            tableName: "维修反馈表",
-            columnProp: 'buDesc',
-            headerAlign: "center",
-            align: "center",
-            columnLabel: 'BU',
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80,
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 101004001,
-            serialNumber: '101004001Table1Urgency',
-            tableId: "101004001Table1",
-            tableName: "维修反馈表",
-            columnProp: 'urgency',
-            headerAlign: "center",
-            align: "center",
-            columnLabel: '紧急程度',
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 60,
-          },
           {
             userId: this.$store.state.user.name,
             functionId: 101004001,
diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue
index cf5107d..0cd2080 100644
--- a/src/views/modules/eam/eamWorkOrderForDefect.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect.vue
@@ -110,7 +110,12 @@
         header-align="center"
         align="center"
         label="紧急程度"
-        width="90">
+        width="70">
+        <template slot-scope="scope">
+          <div :style="{fontWeight:'bold', color: scope.row.urgency === '特急' ? 'red' : scope.row.urgency === '紧急' ? '#ffa500e0' : scope.row.urgency === '一般' ? '#3ac252' : ''}">
+            {{ scope.row.urgency }}
+          </div>
+        </template>
       </el-table-column>
       <el-table-column
         prop="result"
diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index 3418b6c..e4eac0b 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -1396,7 +1396,9 @@
           samplingQty: '',
           rollQty: '',
           itemList:[],
-          unqualifiedQty: ''
+          unqualifiedQty: '',
+          partNo: '',
+          partDesc: '',
         },
         detailColumnList: [
           {
@@ -2867,7 +2869,7 @@
           this.$message.warning('请选择处置措施！')
           return
         }
-        if (this.detailData.inspectionResult === '不合格') {
+        if (this.detailList.length > 0 && this.detailData.inspectionResult === '不合格') {
           const flag = this.detailList.some(item => item.itemResult === 'N')
           if (!flag) {
             this.$message.warning('请选择不合格项目！')
@@ -2894,6 +2896,8 @@
         this.saveInformationData.rollQty = this.detailData.rollQty
         this.saveInformationData.samplingQty = this.detailData.samplingQty
         this.saveInformationData.unqualifiedQty = this.detailData.unqualifiedQty
+        this.saveInformationData.partNo = this.detailData.partNo
+        this.saveInformationData.partDesc = this.detailData.partDesc
         this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
         saveFAIDetailedRecord(this.saveInformationData).then(({data}) => {
           if (data && data.code === 0) {
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index 7a84771..4d1d12d 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -1369,7 +1369,9 @@
           samplingQty: '',
           rollQty: '',
           itemList:[],
-          unqualifiedQty: ''
+          unqualifiedQty: '',
+          partNo: '',
+          partDesc: '',
         },
         detailColumnList: [
           {
@@ -2839,7 +2841,7 @@
           this.$message.warning('请选择处置措施！')
           return
         }
-        if (this.detailData.inspectionResult === '不合格') {
+        if (this.detailList.length > 0 && this.detailData.inspectionResult === '不合格') {
           const flag = this.detailList.some(item => item.itemResult === 'N')
           if (!flag) {
             this.$message.warning('请选择不合格项目！')
@@ -2866,6 +2868,8 @@
         this.saveInformationData.rollQty = this.detailData.rollQty
         this.saveInformationData.samplingQty = this.detailData.samplingQty
         this.saveInformationData.unqualifiedQty = this.detailData.unqualifiedQty
+        this.saveInformationData.partNo = this.detailData.partNo
+        this.saveInformationData.partDesc = this.detailData.partDesc
         this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
         saveFQCDetailedRecord(this.saveInformationData).then(({data}) => {
           if (data && data.code === 0) {
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index af272f3..8306396 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -1417,7 +1417,9 @@
           samplingQty: '',
           rollQty: '',
           itemList:[],
-          unqualifiedQty: ''
+          unqualifiedQty: '',
+          partNo: '',
+          partDesc: '',
         },
         detailColumnList: [
           {
@@ -2906,7 +2908,7 @@
           this.$message.warning('请选择处置措施！')
           return
         }
-        if (this.detailData.inspectionResult === '不合格') {
+        if (this.detailList.length > 0 && this.detailData.inspectionResult === '不合格') {
           const flag = this.detailList.some(item => item.itemResult === 'N')
           if (!flag) {
             this.$message.warning('请选择不合格项目！')
@@ -2933,6 +2935,8 @@
         this.saveInformationData.rollQty = this.detailData.rollQty
         this.saveInformationData.samplingQty = this.detailData.samplingQty
         this.saveInformationData.unqualifiedQty = this.detailData.unqualifiedQty
+        this.saveInformationData.partNo = this.detailData.partNo
+        this.saveInformationData.partDesc = this.detailData.partDesc
         this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
         saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => {
           if (data && data.code === 0) {
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
index f17460f..f167d9e 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
@@ -91,6 +91,25 @@
       border
       v-loading="dataListLoading"
       style="width: 100%;">
+      <el-table-column
+        prop="buDesc"
+        header-align="center"
+        align="center"
+        label="BU"
+        width="60">
+      </el-table-column>
+      <el-table-column
+        prop="urgency"
+        header-align="center"
+        align="center"
+        label="紧急程度"
+        width="70">
+        <template slot-scope="scope">
+          <div :style="{fontWeight:'bold', color: scope.row.urgency === '特急' ? 'red' : scope.row.urgency === '紧急' ? '#ffa500e0' : scope.row.urgency === '一般' ? '#3ac252' : ''}">
+            {{ scope.row.urgency }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         v-for="(item,index) in columnList" :key="index"
         :sortable="item.columnSortable"
@@ -435,42 +454,6 @@
         departmentList: [],
         // 展示列集
         columnList: [
-          {
-            userId: this.$store.state.user.name,
-            functionId: 101004003,
-            serialNumber: '101004003Table1BuDesc',
-            tableId: "101004003Table1",
-            tableName: "维修执行表",
-            columnProp: 'buDesc',
-            headerAlign: "center",
-            align: "center",
-            columnLabel: 'BU',
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 60,
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 101004003,
-            serialNumber: '101004003Table1Urgency',
-            tableId: "101004003Table1",
-            tableName: "维修执行表",
-            columnProp: 'urgency',
-            headerAlign: "center",
-            align: "center",
-            columnLabel: '紧急程度',
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 60,
-          },
           {
             userId: this.$store.state.user.name,
             functionId: 101004003,
diff --git a/static/img/ckp.png b/static/img/ckp.png
new file mode 100644
index 0000000..7f594ab
Binary files /dev/null and b/static/img/ckp.png differ