diff --git a/public/config/config.json b/public/config/config.json
index cfb4e62..442726a 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务管理系统",
-  "baseUrl": "http://111.198.10.15:21606/",
+  "baseUrl": "http://111.198.10.15:21606",
   "nbjlgl": "nbjlgl",
   "nbjszy": "nbjszy",
   "zlmbpc": "zlmbpc",
@@ -76,5 +76,27 @@
       "name":"纠正措施实施后的结果验证",
       "tips":"质量负责人进行纠正措施实施后的结果验证"
     }
+  ],
+  "noConform":[
+    {
+      "director":"",
+      "ts":"",
+      "content":"",
+      "upload":"",
+      "uploadfield":"",
+      "title":"质量负责人",
+      "name":"对问题的分析确认及处理意见",
+      "tips":"质量负责人填写问题"
+    },
+    {
+      "director":"",
+      "ts":"",
+      "content":"",
+      "upload":"",
+      "uploadfield":"",
+      "title":"计量测试站主任",
+      "name":"意见",
+      "tips":"记录测试站主任意见"
+    }
   ]
 }

diff --git a/public/config/config.json b/public/config/config.json
index cfb4e62..442726a 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务管理系统",
-  "baseUrl": "http://111.198.10.15:21606/",
+  "baseUrl": "http://111.198.10.15:21606",
   "nbjlgl": "nbjlgl",
   "nbjszy": "nbjszy",
   "zlmbpc": "zlmbpc",
@@ -76,5 +76,27 @@
       "name":"纠正措施实施后的结果验证",
       "tips":"质量负责人进行纠正措施实施后的结果验证"
     }
+  ],
+  "noConform":[
+    {
+      "director":"",
+      "ts":"",
+      "content":"",
+      "upload":"",
+      "uploadfield":"",
+      "title":"质量负责人",
+      "name":"对问题的分析确认及处理意见",
+      "tips":"质量负责人填写问题"
+    },
+    {
+      "director":"",
+      "ts":"",
+      "content":"",
+      "upload":"",
+      "uploadfield":"",
+      "title":"计量测试站主任",
+      "name":"意见",
+      "tips":"记录测试站主任意见"
+    }
   ]
 }
diff --git a/src/views/quality/correct/handle/components/ApprovalDialog.vue b/src/views/quality/correct/handle/components/ApprovalDialog.vue
index 938831b..b151671 100644
--- a/src/views/quality/correct/handle/components/ApprovalDialog.vue
+++ b/src/views/quality/correct/handle/components/ApprovalDialog.vue
@@ -197,7 +197,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="100px"
       :model="formData"
       :rules="rules"
     >

diff --git a/public/config/config.json b/public/config/config.json
index cfb4e62..442726a 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务管理系统",
-  "baseUrl": "http://111.198.10.15:21606/",
+  "baseUrl": "http://111.198.10.15:21606",
   "nbjlgl": "nbjlgl",
   "nbjszy": "nbjszy",
   "zlmbpc": "zlmbpc",
@@ -76,5 +76,27 @@
       "name":"纠正措施实施后的结果验证",
       "tips":"质量负责人进行纠正措施实施后的结果验证"
     }
+  ],
+  "noConform":[
+    {
+      "director":"",
+      "ts":"",
+      "content":"",
+      "upload":"",
+      "uploadfield":"",
+      "title":"质量负责人",
+      "name":"对问题的分析确认及处理意见",
+      "tips":"质量负责人填写问题"
+    },
+    {
+      "director":"",
+      "ts":"",
+      "content":"",
+      "upload":"",
+      "uploadfield":"",
+      "title":"计量测试站主任",
+      "name":"意见",
+      "tips":"记录测试站主任意见"
+    }
   ]
 }
diff --git a/src/views/quality/correct/handle/components/ApprovalDialog.vue b/src/views/quality/correct/handle/components/ApprovalDialog.vue
index 938831b..b151671 100644
--- a/src/views/quality/correct/handle/components/ApprovalDialog.vue
+++ b/src/views/quality/correct/handle/components/ApprovalDialog.vue
@@ -197,7 +197,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="100px"
       :model="formData"
       :rules="rules"
     >
diff --git a/src/views/quality/correct/handle/components/approvalOpinion.vue b/src/views/quality/correct/handle/components/approvalOpinion.vue
index 9fb57cb..92b5fe4 100644
--- a/src/views/quality/correct/handle/components/approvalOpinion.vue
+++ b/src/views/quality/correct/handle/components/approvalOpinion.vue
@@ -56,7 +56,7 @@
       item.director = filterData.assigneeName
       item.ts = filterData.finishTime
       item.taskId = filterData.taskId
-      item.content = filterData.comment ? filterData.comment.comment : '-'
+      item.content = filterData.comment ? filterData.comment.comment : ''
       item.ruTaskId = filterData.ruTaskId
       if (item.upload) {
         // 附件相关
@@ -86,7 +86,7 @@
 
 <template>
   <el-form label-position="right" label-width="120px" class="form" disabled>
-    <detail-block v-for="item in baseData" :key="item.tips" title="">
+    <detail-block v-for="item in baseData" v-show="item.content" :key="item.tips" title="">
       <el-row :gutter="24" class="marg">
         <el-col :span="6">
           <el-form-item :label="item.name" label-width="200px">

diff --git a/public/config/config.json b/public/config/config.json
index cfb4e62..442726a 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务管理系统",
-  "baseUrl": "http://111.198.10.15:21606/",
+  "baseUrl": "http://111.198.10.15:21606",
   "nbjlgl": "nbjlgl",
   "nbjszy": "nbjszy",
   "zlmbpc": "zlmbpc",
@@ -76,5 +76,27 @@
       "name":"纠正措施实施后的结果验证",
       "tips":"质量负责人进行纠正措施实施后的结果验证"
     }
+  ],
+  "noConform":[
+    {
+      "director":"",
+      "ts":"",
+      "content":"",
+      "upload":"",
+      "uploadfield":"",
+      "title":"质量负责人",
+      "name":"对问题的分析确认及处理意见",
+      "tips":"质量负责人填写问题"
+    },
+    {
+      "director":"",
+      "ts":"",
+      "content":"",
+      "upload":"",
+      "uploadfield":"",
+      "title":"计量测试站主任",
+      "name":"意见",
+      "tips":"记录测试站主任意见"
+    }
   ]
 }
diff --git a/src/views/quality/correct/handle/components/ApprovalDialog.vue b/src/views/quality/correct/handle/components/ApprovalDialog.vue
index 938831b..b151671 100644
--- a/src/views/quality/correct/handle/components/ApprovalDialog.vue
+++ b/src/views/quality/correct/handle/components/ApprovalDialog.vue
@@ -197,7 +197,7 @@
     <el-form
       ref="dataFormRef"
       label-position="left"
-      label-width="80px"
+      label-width="100px"
       :model="formData"
       :rules="rules"
     >
diff --git a/src/views/quality/correct/handle/components/approvalOpinion.vue b/src/views/quality/correct/handle/components/approvalOpinion.vue
index 9fb57cb..92b5fe4 100644
--- a/src/views/quality/correct/handle/components/approvalOpinion.vue
+++ b/src/views/quality/correct/handle/components/approvalOpinion.vue
@@ -56,7 +56,7 @@
       item.director = filterData.assigneeName
       item.ts = filterData.finishTime
       item.taskId = filterData.taskId
-      item.content = filterData.comment ? filterData.comment.comment : '-'
+      item.content = filterData.comment ? filterData.comment.comment : ''
       item.ruTaskId = filterData.ruTaskId
       if (item.upload) {
         // 附件相关
@@ -86,7 +86,7 @@
 
 <template>
   <el-form label-position="right" label-width="120px" class="form" disabled>
-    <detail-block v-for="item in baseData" :key="item.tips" title="">
+    <detail-block v-for="item in baseData" v-show="item.content" :key="item.tips" title="">
       <el-row :gutter="24" class="marg">
         <el-col :span="6">
           <el-form-item :label="item.name" label-width="200px">
diff --git a/src/views/quality/supervise/analysis/components/edit.vue b/src/views/quality/supervise/analysis/components/edit.vue
index adc6d6e..dff5782 100644
--- a/src/views/quality/supervise/analysis/components/edit.vue
+++ b/src/views/quality/supervise/analysis/components/edit.vue
@@ -12,6 +12,7 @@
 import { AGREE } from '@/views/quality/agree'
 import { UploadFile, getPhotoUrl } from '@/api/file'
 import { fetchApproval } from '@/api/approval'
+import ApprovalOpinion from '@/views/quality/correct/handle/components/approvalOpinion.vue'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -69,14 +70,14 @@
 }, {
   deep: true,
 })
-const qualityRecord = ref({
-  director: '', // 质量负责人
-  time1: '',
-  comment1: '', // 质量负责人意见
-  chairman: '', // 主任
-  time2: '',
-  comment2: '', // 主任意见
-})
+// const qualityRecord = ref({
+//   director: '', // 质量负责人
+//   time1: '',
+//   comment1: '', // 质量负责人意见
+//   chairman: '', // 主任
+//   time2: '',
+//   comment2: '', // 主任意见
+// })
 onMounted(() => {
   if ($route.path.includes('create')) {
     watchFlag.value = false
@@ -97,34 +98,34 @@
       }, 500)
     })
   }
-  if ($route.path.includes('detail')) {
-    // 获取审批详情
-    if (approvalStatusName === '全部' || approvalStatusName === '草稿箱') {
-      return
-    }
-    fetchApproval($route.query.processId as string).then((res) => {
-      const arr = [] as any[]
-      res.data.forEach((item: any) => {
-        item.forEach((citem: any) => {
-          arr.push(citem)
-        })
-      })
-      // 质量负责人
-      const director = arr.filter((item: any) => item.taskName.includes('质量负责人'))
-      if (director.length) {
-        qualityRecord.value.director = director[director.length - 1].assigneeName
-        qualityRecord.value.time1 = director[director.length - 1].finishTime
-        qualityRecord.value.comment1 = director[director.length - 1].comment.comment
-      }
-      // 计量站主任
-      const chairman = arr.filter((item: any) => item.taskName.includes('记录测试站主任'))
-      if (chairman.length) {
-        qualityRecord.value.chairman = chairman[chairman.length - 1].assigneeName
-        qualityRecord.value.time2 = chairman[chairman.length - 1].finishTime
-        qualityRecord.value.comment2 = chairman[chairman.length - 1].comment.comment
-      }
-    })
-  }
+  // if ($route.path.includes('detail')) {
+  //   // 获取审批详情
+  //   if (approvalStatusName === '全部' || approvalStatusName === '草稿箱') {
+  //     return
+  //   }
+  //   fetchApproval($route.query.processId as string).then((res) => {
+  //     const arr = [] as any[]
+  //     res.data.forEach((item: any) => {
+  //       item.forEach((citem: any) => {
+  //         arr.push(citem)
+  //       })
+  //     })
+  //     // 质量负责人
+  //     const director = arr.filter((item: any) => item.taskName.includes('质量负责人'))
+  //     if (director.length) {
+  //       qualityRecord.value.director = director[director.length - 1].assigneeName
+  //       qualityRecord.value.time1 = director[director.length - 1].finishTime
+  //       qualityRecord.value.comment1 = director[director.length - 1].comment.comment
+  //     }
+  //     // 计量站主任
+  //     const chairman = arr.filter((item: any) => item.taskName.includes('记录测试站主任'))
+  //     if (chairman.length) {
+  //       qualityRecord.value.chairman = chairman[chairman.length - 1].assigneeName
+  //       qualityRecord.value.time2 = chairman[chairman.length - 1].finishTime
+  //       qualityRecord.value.comment2 = chairman[chairman.length - 1].comment.comment
+  //     }
+  //   })
+  // }
 })
 onBeforeUnmount(() => {
   sessionStorage.removeItem('supervise-analyse-detail-flag')
@@ -481,7 +482,7 @@
           </el-row>
         </detail-block>
       </el-form>
-      <el-form v-if="$route.path.includes('detail') && approvalStatusName !== '草稿箱' && approvalStatusName !== '全部'" :model="qualityRecord" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+      <!-- <el-form v-if="$route.path.includes('detail') && approvalStatusName !== '草稿箱' && approvalStatusName !== '全部'" :model="qualityRecord" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <detail-block title="">
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
@@ -524,7 +525,8 @@
             </el-col>
           </el-row>
         </detail-block>
-      </el-form>
+      </el-form> -->
+      <approval-opinion v-show="showMenu === '基本信息' && approvalStatusName !== '草稿箱' && approvalStatusName !== '全部' && $route.path.includes('detail')" :file-list="[]" type="noConform" />
     </div>
     <!-- 审批详情 -->
     <approval-record-table v-if="showMenu === '审批详情'" :process-id="processId" />