Merge remote-tracking branch 'origin/stable' into stable

yudao-ui-admin-vue3/src/api/pressure2/appointmentconfirmorderrefuseitem/index.ts

@@ -124,6 +124,13 @@ export const AppointmentConfirmOrderRefuseItemApi = {
       data
     })
   },
+  // 无需处理
+  noProcess: async (data: any) => {
+    return await request.post({
+      url: `/pressure2/appointment-confirm-refuse-year-item/no-process`,
+      data
+    })
+  },
   /** 批量退回 */
   batchRollback: async (data: any) => {
     return await request.post({

yudao-ui-admin-vue3/src/views/pressure2/appointmentconfirmorderrefuseitem/index.vue

@@ -619,9 +619,9 @@ const handleUpdate = (row: AppointmentConfirmOrderRefuseItemVO, prop: string) =>
     loading.value = true
     const params = {
       id: row.id,
-      processStatus: 1
+      scene: row.orderType === 3 ? 2 : row.scene
     }
-    AppointmentConfirmOrderRefuseItemApi.update(params)
+    AppointmentConfirmOrderRefuseItemApi.noProcess(params)
       .then((res) => {
         console.log(res)
         if (res) {

yudao-ui-admin-vue3/src/views/pressure2/boilertaskorder/components/TaskOrderDetailDialog.vue

@@ -989,8 +989,8 @@
     </el-form>
     <template #footer>
       <!-- 拒绝约检：拒绝原因=检验项目调整(6)时只显示"无需上报"(不进入上报中心，只在约检单中删除设备)；其他原因显示"上报市局" -->
-      <el-button v-if="formData.reasonDict != '6'" @click="submitForm" type="primary" :disabled="formLoading">上报市局</el-button>
-      <el-button v-if="formData.reasonDict == '6'" @click="submitFormNoReport" :disabled="formLoading" style="background-color: #F56C6C; border-color: #F56C6C; color: #ffffff;">无需上报</el-button>
+      <el-button @click="submitForm" v-if = "isFromChecker || (formData.reasonDict !== '6' && !isFromChecker)" type="primary" :disabled="formLoading">上报市局</el-button>
+      <el-button v-if="!isFromChecker" @click="submitFormNoReport" :disabled="formLoading" style="background-color: #F56C6C; border-color: #F56C6C; color: #ffffff;">无需上报</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
@@ -1890,6 +1890,9 @@ const handleFileUploadSuccess = (fileInfo:{fileName: string, fileUrl: string}) =
 }
 /*****   异常信息 end  *****/
 
+// 判断是否从检验员页面跳转
+const isFromChecker = computed(() => route.query.type === 'checker')
+
 // 获取服务单/受理单模板 1000-检验情况告知 400-重大问题线索
 type BusinessType = 100 | 1000 | 400
 const handleServiceOrder = (type: BusinessType) => {

yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/components/TaskOrderDetailDialog.vue

@@ -1003,9 +1003,15 @@
       </el-form-item>
     </el-form>
     <template #footer>
-      <!-- 拒绝约检：拒绝原因=检验项目调整(6)时只显示"无需上报"(不进入上报中心，只在约检单中删除设备)；其他原因显示"上报市局" -->
-      <el-button v-if="formData.reasonDict != '6'" @click="submitForm" type="primary" :disabled="formLoading">上报市局</el-button>
-      <el-button v-if="formData.reasonDict == '6'" @click="submitFormNoReport" :disabled="formLoading" style="background-color: #F56C6C; border-color: #F56C6C; color: #ffffff;">无需上报</el-button>
+      <!-- 管道年度检查(checkType=200)：无论来源均只显示无需上报 -->
+      <template v-if="taskOrderDetail?.checkType === 200">
+        <el-button @click="submitFormNoReport" :disabled="formLoading" style="background-color: #F56C6C; border-color: #F56C6C; color: #ffffff;">无需上报</el-button>
+      </template>
+      <!-- 管道定期检验(checkType=100)：与锅炉逻辑一致 -->
+      <template v-else>
+        <el-button @click="submitForm" v-if="isFromChecker || (formData.reasonDict !== '6' && !isFromChecker)" type="primary" :disabled="formLoading">上报市局</el-button>
+        <el-button v-if="!isFromChecker" @click="submitFormNoReport" :disabled="formLoading" style="background-color: #F56C6C; border-color: #F56C6C; color: #ffffff;">无需上报</el-button>
+      </template>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
@@ -1980,6 +1986,9 @@ const handleFileUploadSuccess = (fileInfo:{fileName: string, fileUrl: string}) =
 }
 /*****   异常信息 end  *****/
 
+// 判断是否从检验员页面跳转
+const isFromChecker = computed(() => route.query.type === 'checker')
+
 // 获取服务单/受理单模板 1000-检验情况告知 400-重大问题线索
 type BusinessType = 100 | 1000 | 400
 const handleServiceOrder = (type: BusinessType) => {