diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 948a3c0..c7ef0ae 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -144,7 +144,7 @@
     form.value.orderDelivererTel = res.data.data.customerPhone!// 委托方电话
     form.value.requireOverTime = res.data.data.requireOverTime!// 要求检完时间
     form.value.customerAddress = res.data.data.customerAddress!// 委托方地址
-    form.value.maintainMajor = res.data.data.maintainMajor!// 检修专业
+    // form.value.maintainMajor = res.data.data.maintainMajor!// 检修专业
     form.value.isUrgent = `${res.data.data.isUrgent}` // 是否加急
     form.value.deptId = res.data.data.deptId!// 使用部门id
     form.value.deptName = res.data.data.deptName!// 使用部门名称
@@ -587,7 +587,9 @@
       form.value.createUserName = user.name // 创建人
       form.value.createTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 创建时间
       const orderId = $route.query.orderId as string
-      clickConfirmOrder([{ id: orderId }])
+      if (orderId) {
+        clickConfirmOrder([{ id: orderId }])
+      }
       if ($route.query.from === 'sendReceive') { // 从设备收发来
         form.value.interchangeType = $route.query.interchangeType || '' as any // 交接单类型
         list.value = JSON.parse($route.query.equipmentList as any)
@@ -743,7 +745,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="检修专业:" prop="maintainMajor">
               <el-input
                 v-model="form.maintainMajor"
@@ -752,7 +754,7 @@
                 disabled
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="检定（校准）单位:">
               <el-input

diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 948a3c0..c7ef0ae 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -144,7 +144,7 @@
     form.value.orderDelivererTel = res.data.data.customerPhone!// 委托方电话
     form.value.requireOverTime = res.data.data.requireOverTime!// 要求检完时间
     form.value.customerAddress = res.data.data.customerAddress!// 委托方地址
-    form.value.maintainMajor = res.data.data.maintainMajor!// 检修专业
+    // form.value.maintainMajor = res.data.data.maintainMajor!// 检修专业
     form.value.isUrgent = `${res.data.data.isUrgent}` // 是否加急
     form.value.deptId = res.data.data.deptId!// 使用部门id
     form.value.deptName = res.data.data.deptName!// 使用部门名称
@@ -587,7 +587,9 @@
       form.value.createUserName = user.name // 创建人
       form.value.createTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 创建时间
       const orderId = $route.query.orderId as string
-      clickConfirmOrder([{ id: orderId }])
+      if (orderId) {
+        clickConfirmOrder([{ id: orderId }])
+      }
       if ($route.query.from === 'sendReceive') { // 从设备收发来
         form.value.interchangeType = $route.query.interchangeType || '' as any // 交接单类型
         list.value = JSON.parse($route.query.equipmentList as any)
@@ -743,7 +745,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="检修专业:" prop="maintainMajor">
               <el-input
                 v-model="form.maintainMajor"
@@ -752,7 +754,7 @@
                 disabled
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="检定（校准）单位:">
               <el-input
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index e547e29..2a7d859 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -218,7 +218,7 @@
   if (isMulti.value) { // 多选
     val.forEach((item: IDetailTableList) => {
       // 只添加列表里不存在的
-      const index = list.value.findIndex((i: IDetailTableList) => item.equipmentNo === i.sampleNo)
+      const index = list.value.findIndex((i: IDetailTableList) => item.id === i.sampleId)
       if (index === -1) {
         const param = {
           // ...item,
@@ -731,7 +731,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="检修专业:" prop="maintainMajor">
                 <el-input
                   v-model="form.maintainMajor"
@@ -740,7 +740,7 @@
                   :disabled="pageType === 'detail' || (pageType === 'edit' && form.receiveStatus === '2')"
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
           <el-row v-show="!isFold" :gutter="24">
             <el-col :span="6">

diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 948a3c0..c7ef0ae 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -144,7 +144,7 @@
     form.value.orderDelivererTel = res.data.data.customerPhone!// 委托方电话
     form.value.requireOverTime = res.data.data.requireOverTime!// 要求检完时间
     form.value.customerAddress = res.data.data.customerAddress!// 委托方地址
-    form.value.maintainMajor = res.data.data.maintainMajor!// 检修专业
+    // form.value.maintainMajor = res.data.data.maintainMajor!// 检修专业
     form.value.isUrgent = `${res.data.data.isUrgent}` // 是否加急
     form.value.deptId = res.data.data.deptId!// 使用部门id
     form.value.deptName = res.data.data.deptName!// 使用部门名称
@@ -587,7 +587,9 @@
       form.value.createUserName = user.name // 创建人
       form.value.createTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 创建时间
       const orderId = $route.query.orderId as string
-      clickConfirmOrder([{ id: orderId }])
+      if (orderId) {
+        clickConfirmOrder([{ id: orderId }])
+      }
       if ($route.query.from === 'sendReceive') { // 从设备收发来
         form.value.interchangeType = $route.query.interchangeType || '' as any // 交接单类型
         list.value = JSON.parse($route.query.equipmentList as any)
@@ -743,7 +745,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="检修专业:" prop="maintainMajor">
               <el-input
                 v-model="form.maintainMajor"
@@ -752,7 +754,7 @@
                 disabled
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="检定（校准）单位:">
               <el-input
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index e547e29..2a7d859 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -218,7 +218,7 @@
   if (isMulti.value) { // 多选
     val.forEach((item: IDetailTableList) => {
       // 只添加列表里不存在的
-      const index = list.value.findIndex((i: IDetailTableList) => item.equipmentNo === i.sampleNo)
+      const index = list.value.findIndex((i: IDetailTableList) => item.id === i.sampleId)
       if (index === -1) {
         const param = {
           // ...item,
@@ -731,7 +731,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="检修专业:" prop="maintainMajor">
                 <el-input
                   v-model="form.maintainMajor"
@@ -740,7 +740,7 @@
                   :disabled="pageType === 'detail' || (pageType === 'edit' && form.receiveStatus === '2')"
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
           <el-row v-show="!isFold" :gutter="24">
             <el-col :span="6">
diff --git a/src/views/business/manager/sendReceive/components/order.vue b/src/views/business/manager/sendReceive/components/order.vue
index ccf6e71..1890ab9 100644
--- a/src/views/business/manager/sendReceive/components/order.vue
+++ b/src/views/business/manager/sendReceive/components/order.vue
@@ -267,7 +267,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="检修专业:" prop="maintainMajor">
             <el-input
               v-model="form.maintainMajor"
@@ -276,7 +276,7 @@
               disabled
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
       <el-row :gutter="24">
         <el-col :span="6">

diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 948a3c0..c7ef0ae 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -144,7 +144,7 @@
     form.value.orderDelivererTel = res.data.data.customerPhone!// 委托方电话
     form.value.requireOverTime = res.data.data.requireOverTime!// 要求检完时间
     form.value.customerAddress = res.data.data.customerAddress!// 委托方地址
-    form.value.maintainMajor = res.data.data.maintainMajor!// 检修专业
+    // form.value.maintainMajor = res.data.data.maintainMajor!// 检修专业
     form.value.isUrgent = `${res.data.data.isUrgent}` // 是否加急
     form.value.deptId = res.data.data.deptId!// 使用部门id
     form.value.deptName = res.data.data.deptName!// 使用部门名称
@@ -587,7 +587,9 @@
       form.value.createUserName = user.name // 创建人
       form.value.createTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 创建时间
       const orderId = $route.query.orderId as string
-      clickConfirmOrder([{ id: orderId }])
+      if (orderId) {
+        clickConfirmOrder([{ id: orderId }])
+      }
       if ($route.query.from === 'sendReceive') { // 从设备收发来
         form.value.interchangeType = $route.query.interchangeType || '' as any // 交接单类型
         list.value = JSON.parse($route.query.equipmentList as any)
@@ -743,7 +745,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="检修专业:" prop="maintainMajor">
               <el-input
                 v-model="form.maintainMajor"
@@ -752,7 +754,7 @@
                 disabled
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="检定（校准）单位:">
               <el-input
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index e547e29..2a7d859 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -218,7 +218,7 @@
   if (isMulti.value) { // 多选
     val.forEach((item: IDetailTableList) => {
       // 只添加列表里不存在的
-      const index = list.value.findIndex((i: IDetailTableList) => item.equipmentNo === i.sampleNo)
+      const index = list.value.findIndex((i: IDetailTableList) => item.id === i.sampleId)
       if (index === -1) {
         const param = {
           // ...item,
@@ -731,7 +731,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="检修专业:" prop="maintainMajor">
                 <el-input
                   v-model="form.maintainMajor"
@@ -740,7 +740,7 @@
                   :disabled="pageType === 'detail' || (pageType === 'edit' && form.receiveStatus === '2')"
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
           <el-row v-show="!isFold" :gutter="24">
             <el-col :span="6">
diff --git a/src/views/business/manager/sendReceive/components/order.vue b/src/views/business/manager/sendReceive/components/order.vue
index ccf6e71..1890ab9 100644
--- a/src/views/business/manager/sendReceive/components/order.vue
+++ b/src/views/business/manager/sendReceive/components/order.vue
@@ -267,7 +267,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="检修专业:" prop="maintainMajor">
             <el-input
               v-model="form.maintainMajor"
@@ -276,7 +276,7 @@
               disabled
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
       <el-row :gutter="24">
         <el-col :span="6">
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index dfb5367..5863c3c 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -551,7 +551,7 @@
               filterable
               class="full-width-input"
             >
-              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
           </el-form-item>
         </el-col>

diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 948a3c0..c7ef0ae 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -144,7 +144,7 @@
     form.value.orderDelivererTel = res.data.data.customerPhone!// 委托方电话
     form.value.requireOverTime = res.data.data.requireOverTime!// 要求检完时间
     form.value.customerAddress = res.data.data.customerAddress!// 委托方地址
-    form.value.maintainMajor = res.data.data.maintainMajor!// 检修专业
+    // form.value.maintainMajor = res.data.data.maintainMajor!// 检修专业
     form.value.isUrgent = `${res.data.data.isUrgent}` // 是否加急
     form.value.deptId = res.data.data.deptId!// 使用部门id
     form.value.deptName = res.data.data.deptName!// 使用部门名称
@@ -587,7 +587,9 @@
       form.value.createUserName = user.name // 创建人
       form.value.createTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 创建时间
       const orderId = $route.query.orderId as string
-      clickConfirmOrder([{ id: orderId }])
+      if (orderId) {
+        clickConfirmOrder([{ id: orderId }])
+      }
       if ($route.query.from === 'sendReceive') { // 从设备收发来
         form.value.interchangeType = $route.query.interchangeType || '' as any // 交接单类型
         list.value = JSON.parse($route.query.equipmentList as any)
@@ -743,7 +745,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="检修专业:" prop="maintainMajor">
               <el-input
                 v-model="form.maintainMajor"
@@ -752,7 +754,7 @@
                 disabled
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="检定（校准）单位:">
               <el-input
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index e547e29..2a7d859 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -218,7 +218,7 @@
   if (isMulti.value) { // 多选
     val.forEach((item: IDetailTableList) => {
       // 只添加列表里不存在的
-      const index = list.value.findIndex((i: IDetailTableList) => item.equipmentNo === i.sampleNo)
+      const index = list.value.findIndex((i: IDetailTableList) => item.id === i.sampleId)
       if (index === -1) {
         const param = {
           // ...item,
@@ -731,7 +731,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="检修专业:" prop="maintainMajor">
                 <el-input
                   v-model="form.maintainMajor"
@@ -740,7 +740,7 @@
                   :disabled="pageType === 'detail' || (pageType === 'edit' && form.receiveStatus === '2')"
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
           <el-row v-show="!isFold" :gutter="24">
             <el-col :span="6">
diff --git a/src/views/business/manager/sendReceive/components/order.vue b/src/views/business/manager/sendReceive/components/order.vue
index ccf6e71..1890ab9 100644
--- a/src/views/business/manager/sendReceive/components/order.vue
+++ b/src/views/business/manager/sendReceive/components/order.vue
@@ -267,7 +267,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="检修专业:" prop="maintainMajor">
             <el-input
               v-model="form.maintainMajor"
@@ -276,7 +276,7 @@
               disabled
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
       <el-row :gutter="24">
         <el-col :span="6">
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index dfb5367..5863c3c 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -551,7 +551,7 @@
               filterable
               class="full-width-input"
             >
-              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index c7b7319..28f0954 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -217,7 +217,7 @@
         })
       }
       // 审批删除--已取消、全部
-      else if (type === '删除' && (row.approvalStatusName === '已取消' || active.value === '0')) {
+      else if (type === '删除' && (row.approvalStatusName === '已取消' || active.value === '0' || row.approvalStatusName === '未通过')) {
         approvalDelete({ id: row.id, taskId: row.taskId }).then(() => {
           ElMessage.success(`已${type}`)
           fetchData()
@@ -475,7 +475,7 @@
                 取消
               </el-button>
               <el-button
-                v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')"
+                v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '未通过')"
                 size="small"
                 link
                 type="danger"

diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 948a3c0..c7ef0ae 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -144,7 +144,7 @@
     form.value.orderDelivererTel = res.data.data.customerPhone!// 委托方电话
     form.value.requireOverTime = res.data.data.requireOverTime!// 要求检完时间
     form.value.customerAddress = res.data.data.customerAddress!// 委托方地址
-    form.value.maintainMajor = res.data.data.maintainMajor!// 检修专业
+    // form.value.maintainMajor = res.data.data.maintainMajor!// 检修专业
     form.value.isUrgent = `${res.data.data.isUrgent}` // 是否加急
     form.value.deptId = res.data.data.deptId!// 使用部门id
     form.value.deptName = res.data.data.deptName!// 使用部门名称
@@ -587,7 +587,9 @@
       form.value.createUserName = user.name // 创建人
       form.value.createTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 创建时间
       const orderId = $route.query.orderId as string
-      clickConfirmOrder([{ id: orderId }])
+      if (orderId) {
+        clickConfirmOrder([{ id: orderId }])
+      }
       if ($route.query.from === 'sendReceive') { // 从设备收发来
         form.value.interchangeType = $route.query.interchangeType || '' as any // 交接单类型
         list.value = JSON.parse($route.query.equipmentList as any)
@@ -743,7 +745,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="检修专业:" prop="maintainMajor">
               <el-input
                 v-model="form.maintainMajor"
@@ -752,7 +754,7 @@
                 disabled
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="检定（校准）单位:">
               <el-input
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index e547e29..2a7d859 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -218,7 +218,7 @@
   if (isMulti.value) { // 多选
     val.forEach((item: IDetailTableList) => {
       // 只添加列表里不存在的
-      const index = list.value.findIndex((i: IDetailTableList) => item.equipmentNo === i.sampleNo)
+      const index = list.value.findIndex((i: IDetailTableList) => item.id === i.sampleId)
       if (index === -1) {
         const param = {
           // ...item,
@@ -731,7 +731,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="检修专业:" prop="maintainMajor">
                 <el-input
                   v-model="form.maintainMajor"
@@ -740,7 +740,7 @@
                   :disabled="pageType === 'detail' || (pageType === 'edit' && form.receiveStatus === '2')"
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
           <el-row v-show="!isFold" :gutter="24">
             <el-col :span="6">
diff --git a/src/views/business/manager/sendReceive/components/order.vue b/src/views/business/manager/sendReceive/components/order.vue
index ccf6e71..1890ab9 100644
--- a/src/views/business/manager/sendReceive/components/order.vue
+++ b/src/views/business/manager/sendReceive/components/order.vue
@@ -267,7 +267,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="检修专业:" prop="maintainMajor">
             <el-input
               v-model="form.maintainMajor"
@@ -276,7 +276,7 @@
               disabled
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
       <el-row :gutter="24">
         <el-col :span="6">
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index dfb5367..5863c3c 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -551,7 +551,7 @@
               filterable
               class="full-width-input"
             >
-              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index c7b7319..28f0954 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -217,7 +217,7 @@
         })
       }
       // 审批删除--已取消、全部
-      else if (type === '删除' && (row.approvalStatusName === '已取消' || active.value === '0')) {
+      else if (type === '删除' && (row.approvalStatusName === '已取消' || active.value === '0' || row.approvalStatusName === '未通过')) {
         approvalDelete({ id: row.id, taskId: row.taskId }).then(() => {
           ElMessage.success(`已${type}`)
           fetchData()
@@ -475,7 +475,7 @@
                 取消
               </el-button>
               <el-button
-                v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')"
+                v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '未通过')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
index 4b6b1f8..7b175ca 100644
--- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
@@ -1223,7 +1223,7 @@
               filterable
               style="width: 120px;"
             >
-              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
           </div>
           <div v-if="itemFormData.itemCategoryName === '一般压力表' || itemFormData.itemCategoryName === '电接点一般压力表' || itemFormData.itemCategoryName === '精密压力表'" style="white-space: nowrap; font-size: 14px;color: #606266;margin-right: 20px;">

diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 948a3c0..c7ef0ae 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -144,7 +144,7 @@
     form.value.orderDelivererTel = res.data.data.customerPhone!// 委托方电话
     form.value.requireOverTime = res.data.data.requireOverTime!// 要求检完时间
     form.value.customerAddress = res.data.data.customerAddress!// 委托方地址
-    form.value.maintainMajor = res.data.data.maintainMajor!// 检修专业
+    // form.value.maintainMajor = res.data.data.maintainMajor!// 检修专业
     form.value.isUrgent = `${res.data.data.isUrgent}` // 是否加急
     form.value.deptId = res.data.data.deptId!// 使用部门id
     form.value.deptName = res.data.data.deptName!// 使用部门名称
@@ -587,7 +587,9 @@
       form.value.createUserName = user.name // 创建人
       form.value.createTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 创建时间
       const orderId = $route.query.orderId as string
-      clickConfirmOrder([{ id: orderId }])
+      if (orderId) {
+        clickConfirmOrder([{ id: orderId }])
+      }
       if ($route.query.from === 'sendReceive') { // 从设备收发来
         form.value.interchangeType = $route.query.interchangeType || '' as any // 交接单类型
         list.value = JSON.parse($route.query.equipmentList as any)
@@ -743,7 +745,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="检修专业:" prop="maintainMajor">
               <el-input
                 v-model="form.maintainMajor"
@@ -752,7 +754,7 @@
                 disabled
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="检定（校准）单位:">
               <el-input
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index e547e29..2a7d859 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -218,7 +218,7 @@
   if (isMulti.value) { // 多选
     val.forEach((item: IDetailTableList) => {
       // 只添加列表里不存在的
-      const index = list.value.findIndex((i: IDetailTableList) => item.equipmentNo === i.sampleNo)
+      const index = list.value.findIndex((i: IDetailTableList) => item.id === i.sampleId)
       if (index === -1) {
         const param = {
           // ...item,
@@ -731,7 +731,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="检修专业:" prop="maintainMajor">
                 <el-input
                   v-model="form.maintainMajor"
@@ -740,7 +740,7 @@
                   :disabled="pageType === 'detail' || (pageType === 'edit' && form.receiveStatus === '2')"
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
           <el-row v-show="!isFold" :gutter="24">
             <el-col :span="6">
diff --git a/src/views/business/manager/sendReceive/components/order.vue b/src/views/business/manager/sendReceive/components/order.vue
index ccf6e71..1890ab9 100644
--- a/src/views/business/manager/sendReceive/components/order.vue
+++ b/src/views/business/manager/sendReceive/components/order.vue
@@ -267,7 +267,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="检修专业:" prop="maintainMajor">
             <el-input
               v-model="form.maintainMajor"
@@ -276,7 +276,7 @@
               disabled
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
       <el-row :gutter="24">
         <el-col :span="6">
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index dfb5367..5863c3c 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -551,7 +551,7 @@
               filterable
               class="full-width-input"
             >
-              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index c7b7319..28f0954 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -217,7 +217,7 @@
         })
       }
       // 审批删除--已取消、全部
-      else if (type === '删除' && (row.approvalStatusName === '已取消' || active.value === '0')) {
+      else if (type === '删除' && (row.approvalStatusName === '已取消' || active.value === '0' || row.approvalStatusName === '未通过')) {
         approvalDelete({ id: row.id, taskId: row.taskId }).then(() => {
           ElMessage.success(`已${type}`)
           fetchData()
@@ -475,7 +475,7 @@
                 取消
               </el-button>
               <el-button
-                v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')"
+                v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '未通过')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
index 4b6b1f8..7b175ca 100644
--- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
@@ -1223,7 +1223,7 @@
               filterable
               style="width: 120px;"
             >
-              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
           </div>
           <div v-if="itemFormData.itemCategoryName === '一般压力表' || itemFormData.itemCategoryName === '电接点一般压力表' || itemFormData.itemCategoryName === '精密压力表'" style="white-space: nowrap; font-size: 14px;color: #606266;margin-right: 20px;">
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index e1f522f..194f382 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -310,6 +310,16 @@
 
 // -----------------------------------------钩子-----------------------------------------------
 
+// 检定结论变化
+const changeConclusion = (val: string) => {
+  if (val === '所检项目合格') {
+    form.value.meterIdentify = '合格'
+  }
+  else {
+    form.value.meterIdentify = '停用'
+  }
+}
+
 watch(() => props.dataNo, (newValue) => {
   if (newValue) {
     form.value.dataNo = newValue
@@ -505,6 +515,7 @@
                 filterable
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
+                @change="changeConclusion"
               >
                 <el-option v-for="item in conclusionList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>

diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 948a3c0..c7ef0ae 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -144,7 +144,7 @@
     form.value.orderDelivererTel = res.data.data.customerPhone!// 委托方电话
     form.value.requireOverTime = res.data.data.requireOverTime!// 要求检完时间
     form.value.customerAddress = res.data.data.customerAddress!// 委托方地址
-    form.value.maintainMajor = res.data.data.maintainMajor!// 检修专业
+    // form.value.maintainMajor = res.data.data.maintainMajor!// 检修专业
     form.value.isUrgent = `${res.data.data.isUrgent}` // 是否加急
     form.value.deptId = res.data.data.deptId!// 使用部门id
     form.value.deptName = res.data.data.deptName!// 使用部门名称
@@ -587,7 +587,9 @@
       form.value.createUserName = user.name // 创建人
       form.value.createTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 创建时间
       const orderId = $route.query.orderId as string
-      clickConfirmOrder([{ id: orderId }])
+      if (orderId) {
+        clickConfirmOrder([{ id: orderId }])
+      }
       if ($route.query.from === 'sendReceive') { // 从设备收发来
         form.value.interchangeType = $route.query.interchangeType || '' as any // 交接单类型
         list.value = JSON.parse($route.query.equipmentList as any)
@@ -743,7 +745,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="检修专业:" prop="maintainMajor">
               <el-input
                 v-model="form.maintainMajor"
@@ -752,7 +754,7 @@
                 disabled
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="检定（校准）单位:">
               <el-input
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index e547e29..2a7d859 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -218,7 +218,7 @@
   if (isMulti.value) { // 多选
     val.forEach((item: IDetailTableList) => {
       // 只添加列表里不存在的
-      const index = list.value.findIndex((i: IDetailTableList) => item.equipmentNo === i.sampleNo)
+      const index = list.value.findIndex((i: IDetailTableList) => item.id === i.sampleId)
       if (index === -1) {
         const param = {
           // ...item,
@@ -731,7 +731,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="检修专业:" prop="maintainMajor">
                 <el-input
                   v-model="form.maintainMajor"
@@ -740,7 +740,7 @@
                   :disabled="pageType === 'detail' || (pageType === 'edit' && form.receiveStatus === '2')"
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
           <el-row v-show="!isFold" :gutter="24">
             <el-col :span="6">
diff --git a/src/views/business/manager/sendReceive/components/order.vue b/src/views/business/manager/sendReceive/components/order.vue
index ccf6e71..1890ab9 100644
--- a/src/views/business/manager/sendReceive/components/order.vue
+++ b/src/views/business/manager/sendReceive/components/order.vue
@@ -267,7 +267,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="检修专业:" prop="maintainMajor">
             <el-input
               v-model="form.maintainMajor"
@@ -276,7 +276,7 @@
               disabled
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
       <el-row :gutter="24">
         <el-col :span="6">
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index dfb5367..5863c3c 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -551,7 +551,7 @@
               filterable
               class="full-width-input"
             >
-              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index c7b7319..28f0954 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -217,7 +217,7 @@
         })
       }
       // 审批删除--已取消、全部
-      else if (type === '删除' && (row.approvalStatusName === '已取消' || active.value === '0')) {
+      else if (type === '删除' && (row.approvalStatusName === '已取消' || active.value === '0' || row.approvalStatusName === '未通过')) {
         approvalDelete({ id: row.id, taskId: row.taskId }).then(() => {
           ElMessage.success(`已${type}`)
           fetchData()
@@ -475,7 +475,7 @@
                 取消
               </el-button>
               <el-button
-                v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')"
+                v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '未通过')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
index 4b6b1f8..7b175ca 100644
--- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
@@ -1223,7 +1223,7 @@
               filterable
               style="width: 120px;"
             >
-              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
           </div>
           <div v-if="itemFormData.itemCategoryName === '一般压力表' || itemFormData.itemCategoryName === '电接点一般压力表' || itemFormData.itemCategoryName === '精密压力表'" style="white-space: nowrap; font-size: 14px;color: #606266;margin-right: 20px;">
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index e1f522f..194f382 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -310,6 +310,16 @@
 
 // -----------------------------------------钩子-----------------------------------------------
 
+// 检定结论变化
+const changeConclusion = (val: string) => {
+  if (val === '所检项目合格') {
+    form.value.meterIdentify = '合格'
+  }
+  else {
+    form.value.meterIdentify = '停用'
+  }
+}
+
 watch(() => props.dataNo, (newValue) => {
   if (newValue) {
     form.value.dataNo = newValue
@@ -505,6 +515,7 @@
                 filterable
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
+                @change="changeConclusion"
               >
                 <el-option v-for="item in conclusionList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 0314454..ff14d69 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -686,8 +686,8 @@
   console.log('groupNo', user.groupNo)
   console.log('注意：此用户没有实验室或者组别代码')
   const index = useDeptList.value.findIndex(item => item.name === name)
-  form.value.groupCode = useDeptList.value[index].value
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${user.groupNo}` !== '') {
+    form.value.groupCode = useDeptList.value[index].value
     // 通过实验室组别获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, user.groupNo)
   }

diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 948a3c0..c7ef0ae 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -144,7 +144,7 @@
     form.value.orderDelivererTel = res.data.data.customerPhone!// 委托方电话
     form.value.requireOverTime = res.data.data.requireOverTime!// 要求检完时间
     form.value.customerAddress = res.data.data.customerAddress!// 委托方地址
-    form.value.maintainMajor = res.data.data.maintainMajor!// 检修专业
+    // form.value.maintainMajor = res.data.data.maintainMajor!// 检修专业
     form.value.isUrgent = `${res.data.data.isUrgent}` // 是否加急
     form.value.deptId = res.data.data.deptId!// 使用部门id
     form.value.deptName = res.data.data.deptName!// 使用部门名称
@@ -587,7 +587,9 @@
       form.value.createUserName = user.name // 创建人
       form.value.createTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 创建时间
       const orderId = $route.query.orderId as string
-      clickConfirmOrder([{ id: orderId }])
+      if (orderId) {
+        clickConfirmOrder([{ id: orderId }])
+      }
       if ($route.query.from === 'sendReceive') { // 从设备收发来
         form.value.interchangeType = $route.query.interchangeType || '' as any // 交接单类型
         list.value = JSON.parse($route.query.equipmentList as any)
@@ -743,7 +745,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="检修专业:" prop="maintainMajor">
               <el-input
                 v-model="form.maintainMajor"
@@ -752,7 +754,7 @@
                 disabled
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="检定（校准）单位:">
               <el-input
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index e547e29..2a7d859 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -218,7 +218,7 @@
   if (isMulti.value) { // 多选
     val.forEach((item: IDetailTableList) => {
       // 只添加列表里不存在的
-      const index = list.value.findIndex((i: IDetailTableList) => item.equipmentNo === i.sampleNo)
+      const index = list.value.findIndex((i: IDetailTableList) => item.id === i.sampleId)
       if (index === -1) {
         const param = {
           // ...item,
@@ -731,7 +731,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="检修专业:" prop="maintainMajor">
                 <el-input
                   v-model="form.maintainMajor"
@@ -740,7 +740,7 @@
                   :disabled="pageType === 'detail' || (pageType === 'edit' && form.receiveStatus === '2')"
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
           <el-row v-show="!isFold" :gutter="24">
             <el-col :span="6">
diff --git a/src/views/business/manager/sendReceive/components/order.vue b/src/views/business/manager/sendReceive/components/order.vue
index ccf6e71..1890ab9 100644
--- a/src/views/business/manager/sendReceive/components/order.vue
+++ b/src/views/business/manager/sendReceive/components/order.vue
@@ -267,7 +267,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="检修专业:" prop="maintainMajor">
             <el-input
               v-model="form.maintainMajor"
@@ -276,7 +276,7 @@
               disabled
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
       <el-row :gutter="24">
         <el-col :span="6">
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index dfb5367..5863c3c 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -551,7 +551,7 @@
               filterable
               class="full-width-input"
             >
-              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index c7b7319..28f0954 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -217,7 +217,7 @@
         })
       }
       // 审批删除--已取消、全部
-      else if (type === '删除' && (row.approvalStatusName === '已取消' || active.value === '0')) {
+      else if (type === '删除' && (row.approvalStatusName === '已取消' || active.value === '0' || row.approvalStatusName === '未通过')) {
         approvalDelete({ id: row.id, taskId: row.taskId }).then(() => {
           ElMessage.success(`已${type}`)
           fetchData()
@@ -475,7 +475,7 @@
                 取消
               </el-button>
               <el-button
-                v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')"
+                v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '未通过')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
index 4b6b1f8..7b175ca 100644
--- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
@@ -1223,7 +1223,7 @@
               filterable
               style="width: 120px;"
             >
-              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
           </div>
           <div v-if="itemFormData.itemCategoryName === '一般压力表' || itemFormData.itemCategoryName === '电接点一般压力表' || itemFormData.itemCategoryName === '精密压力表'" style="white-space: nowrap; font-size: 14px;color: #606266;margin-right: 20px;">
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index e1f522f..194f382 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -310,6 +310,16 @@
 
 // -----------------------------------------钩子-----------------------------------------------
 
+// 检定结论变化
+const changeConclusion = (val: string) => {
+  if (val === '所检项目合格') {
+    form.value.meterIdentify = '合格'
+  }
+  else {
+    form.value.meterIdentify = '停用'
+  }
+}
+
 watch(() => props.dataNo, (newValue) => {
   if (newValue) {
     form.value.dataNo = newValue
@@ -505,6 +515,7 @@
                 filterable
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
+                @change="changeConclusion"
               >
                 <el-option v-for="item in conclusionList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 0314454..ff14d69 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -686,8 +686,8 @@
   console.log('groupNo', user.groupNo)
   console.log('注意：此用户没有实验室或者组别代码')
   const index = useDeptList.value.findIndex(item => item.name === name)
-  form.value.groupCode = useDeptList.value[index].value
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${user.groupNo}` !== '') {
+    form.value.groupCode = useDeptList.value[index].value
     // 通过实验室组别获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, user.groupNo)
   }
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 9cb48b5..bab911a 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -82,8 +82,8 @@
   manageStatusName: string // 使用状态名称
   buildStandardReportFile: string // 建标报告
   examTableFile: string // 考核表
-  standardCertFile: string // 标准证书
-  [key: string]: string
+  standardCertFile?: string // 标准证书
+  [key: string]: string | undefined
 }
 
 // 标准配套设备列表

diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 948a3c0..c7ef0ae 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -144,7 +144,7 @@
     form.value.orderDelivererTel = res.data.data.customerPhone!// 委托方电话
     form.value.requireOverTime = res.data.data.requireOverTime!// 要求检完时间
     form.value.customerAddress = res.data.data.customerAddress!// 委托方地址
-    form.value.maintainMajor = res.data.data.maintainMajor!// 检修专业
+    // form.value.maintainMajor = res.data.data.maintainMajor!// 检修专业
     form.value.isUrgent = `${res.data.data.isUrgent}` // 是否加急
     form.value.deptId = res.data.data.deptId!// 使用部门id
     form.value.deptName = res.data.data.deptName!// 使用部门名称
@@ -587,7 +587,9 @@
       form.value.createUserName = user.name // 创建人
       form.value.createTime = dayjs().format('YYYY-MM-DD HH-mm:ss')// 创建时间
       const orderId = $route.query.orderId as string
-      clickConfirmOrder([{ id: orderId }])
+      if (orderId) {
+        clickConfirmOrder([{ id: orderId }])
+      }
       if ($route.query.from === 'sendReceive') { // 从设备收发来
         form.value.interchangeType = $route.query.interchangeType || '' as any // 交接单类型
         list.value = JSON.parse($route.query.equipmentList as any)
@@ -743,7 +745,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="检修专业:" prop="maintainMajor">
               <el-input
                 v-model="form.maintainMajor"
@@ -752,7 +754,7 @@
                 disabled
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="检定（校准）单位:">
               <el-input
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index e547e29..2a7d859 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -218,7 +218,7 @@
   if (isMulti.value) { // 多选
     val.forEach((item: IDetailTableList) => {
       // 只添加列表里不存在的
-      const index = list.value.findIndex((i: IDetailTableList) => item.equipmentNo === i.sampleNo)
+      const index = list.value.findIndex((i: IDetailTableList) => item.id === i.sampleId)
       if (index === -1) {
         const param = {
           // ...item,
@@ -731,7 +731,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="检修专业:" prop="maintainMajor">
                 <el-input
                   v-model="form.maintainMajor"
@@ -740,7 +740,7 @@
                   :disabled="pageType === 'detail' || (pageType === 'edit' && form.receiveStatus === '2')"
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
           <el-row v-show="!isFold" :gutter="24">
             <el-col :span="6">
diff --git a/src/views/business/manager/sendReceive/components/order.vue b/src/views/business/manager/sendReceive/components/order.vue
index ccf6e71..1890ab9 100644
--- a/src/views/business/manager/sendReceive/components/order.vue
+++ b/src/views/business/manager/sendReceive/components/order.vue
@@ -267,7 +267,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="检修专业:" prop="maintainMajor">
             <el-input
               v-model="form.maintainMajor"
@@ -276,7 +276,7 @@
               disabled
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
       <el-row :gutter="24">
         <el-col :span="6">
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index dfb5367..5863c3c 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -551,7 +551,7 @@
               filterable
               class="full-width-input"
             >
-              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/business/taskMeasure/certificate/list.vue b/src/views/business/taskMeasure/certificate/list.vue
index c7b7319..28f0954 100644
--- a/src/views/business/taskMeasure/certificate/list.vue
+++ b/src/views/business/taskMeasure/certificate/list.vue
@@ -217,7 +217,7 @@
         })
       }
       // 审批删除--已取消、全部
-      else if (type === '删除' && (row.approvalStatusName === '已取消' || active.value === '0')) {
+      else if (type === '删除' && (row.approvalStatusName === '已取消' || active.value === '0' || row.approvalStatusName === '未通过')) {
         approvalDelete({ id: row.id, taskId: row.taskId }).then(() => {
           ElMessage.success(`已${type}`)
           fetchData()
@@ -475,7 +475,7 @@
                 取消
               </el-button>
               <el-button
-                v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')"
+                v-if="active !== '7' && (row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消' || row.approvalStatusName === '未通过')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
index 4b6b1f8..7b175ca 100644
--- a/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/fourth/templateDetail.vue
@@ -1223,7 +1223,7 @@
               filterable
               style="width: 120px;"
             >
-              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-option v-for="item in measureMediumList" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
           </div>
           <div v-if="itemFormData.itemCategoryName === '一般压力表' || itemFormData.itemCategoryName === '电接点一般压力表' || itemFormData.itemCategoryName === '精密压力表'" style="white-space: nowrap; font-size: 14px;color: #606266;margin-right: 20px;">
diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
index e1f522f..194f382 100644
--- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue
@@ -310,6 +310,16 @@
 
 // -----------------------------------------钩子-----------------------------------------------
 
+// 检定结论变化
+const changeConclusion = (val: string) => {
+  if (val === '所检项目合格') {
+    form.value.meterIdentify = '合格'
+  }
+  else {
+    form.value.meterIdentify = '停用'
+  }
+}
+
 watch(() => props.dataNo, (newValue) => {
   if (newValue) {
     form.value.dataNo = newValue
@@ -505,6 +515,7 @@
                 filterable
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
+                @change="changeConclusion"
               >
                 <el-option v-for="item in conclusionList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 0314454..ff14d69 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -686,8 +686,8 @@
   console.log('groupNo', user.groupNo)
   console.log('注意：此用户没有实验室或者组别代码')
   const index = useDeptList.value.findIndex(item => item.name === name)
-  form.value.groupCode = useDeptList.value[index].value
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${user.groupNo}` !== '') {
+    form.value.groupCode = useDeptList.value[index].value
     // 通过实验室组别获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, user.groupNo)
   }
diff --git a/src/views/equipement/standard/book/book-interface.ts b/src/views/equipement/standard/book/book-interface.ts
index 9cb48b5..bab911a 100644
--- a/src/views/equipement/standard/book/book-interface.ts
+++ b/src/views/equipement/standard/book/book-interface.ts
@@ -82,8 +82,8 @@
   manageStatusName: string // 使用状态名称
   buildStandardReportFile: string // 建标报告
   examTableFile: string // 考核表
-  standardCertFile: string // 标准证书
-  [key: string]: string
+  standardCertFile?: string // 标准证书
+  [key: string]: string | undefined
 }
 
 // 标准配套设备列表
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index 7d69949..4af316b 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -326,7 +326,7 @@
 const confirmSelectTechFile = (val: any) => {
   if (val && val.length) {
     if (isMultiFiles.value) { // 多选
-      val.forEach((item: { fileNo: string; fileName: string; remark: string; id: string }) => {
+      val.forEach((item: any) => {
       // 只添加列表里不存在的
         const index = technologyRelationList.value.findIndex((i: ITechFiles) => item.fileNo === i.technologyFileNo)
         if (index === -1) {
@@ -384,15 +384,13 @@
   temperature: '', // 温度(℃)
   humidity: '', // 相对湿度
   voltage: '', // 电源电压
-  powerFrequency: '', // 电源频率
-  surroundEnvironment: '', // 周围环境
-  electricField: '', // 电磁场
+  otherRequirement: '', // 其他要求
   editable: true, // 是否可编辑
 }])
 
 // 处理温湿度
 function solveTemperatureHumidity() {
-  const list = technologyRelationList.value
+  const list = technologyRelationList.value as any
   let minTemperature = list[0].temperatureLowLimit // 温度找下限的最大值
   let maxTemperature = list[0].temperatureHighLimit // 温度找上限的最小值
   let minHumidity = list[0].humidityLowLimit // 湿度找下限的最大值
@@ -811,8 +809,8 @@
   console.log('groupNo', user.groupNo)
   console.log('注意：此用户没有实验室或者组别代码')
   const index = useDeptList.value.findIndex(item => item.name === name)
-  form.value.groupCode = useDeptList.value[index].value
   if (index !== -1 && `${user.bizLabCode}` !== '' && `${user.groupNo}` !== '') {
+    form.value.groupCode = useDeptList.value[index].value
     // 通过实验室组别获取部门id、并赋值给deptId
     fetchDeptIdByLabAndGroup(user.bizLabCode, user.groupNo)
   }
@@ -845,7 +843,7 @@
   }
 }
 // 创建日期变化
-const changeCreateTime = (val: Date) => {
+const changeCreateTime = (val: string) => {
   if (!form.value.lastReviewDate) {
     form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
   }
@@ -856,16 +854,22 @@
   form.value.createUserId = user.id// 创建人id
   form.value.createUserName = user.name // 创建人
   form.value.createTime = dayjs().format('YYYY-MM-DD')// 申请时间
-  changeCreateTime()
+  changeCreateTime(form.value.createTime)
+
+  form.value.labCode = user.bizLabCode // 实验室
+  form.value.labCodeName = labNameDict.value[form.value.labCode!] // 实验室名称
+  form.value.deptName = useDeptDict.value[user.groupNo] // 部门名称
+  changeDeptName(form.value.deptName)
+  console.log('-----1212121321')
+
   if (props.pageType !== 'add') {
+    console.log('-----222222222')
     if (window.sessionStorage.getItem('standardGetInfoForm')) {
+      console.log('-----33333')
       fetchInfo(false) // 获取详情信息
     }
-    else { // 新建
-      form.value.labCode = user.bizLabCode // 实验室
-      form.value.labCodeName = labNameDict.value[form.value.labCode!] // 实验室名称
-      form.value.deptName = useDeptDict.value[user.groupNo] // 部门名称
-      changeDeptName(form.value.deptName)
+    else {
+      console.log('-----44444')
       fetchInfo(true) // 获取详情信息
     }
   }