Merge branch 'stable' of http://39.98.153.250:9080/yudao/yudao-admin-yiqun into stable

yudao-ui-admin-vue3/src/views/pressure2/boilerchecker/task.vue

@@ -209,6 +209,7 @@
             v-if="scope.row.taskStatus === PressureTaskOrderTaskStatus.CONFIRMED"
             link
             type="primary"
+            :disabled="scope.row.manager?.id !== userStore?.user?.id"
             @click="handleCancelConfirm(scope.row.id)"
           >
             取消认领

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

@@ -430,11 +430,19 @@
     :pdfBlob="currentPdfBlob"
     @close="handlePdfPreviewClose"
   />
+
+  <!-- 服务单/受理单 -->
+  <OrderDialog
+    v-if="orderReportVisible"
+    v-model:visible="orderReportVisible"
+    :orderId="currentTaskOrderId"
+    type="boiler"
+  />
+
 </template>
 
 <script setup lang="ts">
 import { ref, reactive, onMounted, getCurrentInstance } from 'vue'
-const { proxy } = getCurrentInstance()
 import { ElMessage } from 'element-plus'
 import { formatArrayDate, formatDate } from '@/utils/formatTime'
 import { BoilerTaskOrderApi, BoilerTaskOrderVO } from '@/api/pressure2/boilertaskorder'
@@ -456,6 +464,7 @@ import {getJCP} from '@/utils/jcp/jcp-vue'
 import {PipeInputApi} from "@/api/pressure2/pipeInput";
 import PdfPreviewDialog from './PdfPreviewDialog.vue'
 import 'https://printjs-4de6.kxcdn.com/print.min.js'
+import OrderDialog from "@/views/pressure2/boilertaskorder/components/OrderDialog.vue";
 
 const router = useRouter()
 /** 出具报告任务单 列表 */
@@ -670,16 +679,21 @@ const handleViewPrintRecord = (row) => {
 }
 
 // 委托协议
+const orderReportVisible = ref(false)
 const handleConsignmentAgreement = (row) => {
-  businessType.value = 100
-  serviceRecordListVisible.value = true
-  isAddMainquestion.value = 'view'
-  taskOrderDetail.value = { ...row, id: row.orderId } //'a08885bd8f4f1607acb3b4e41d99fd11'
-  if (row.checkType == PressureBoilerCheckType.IN || row.checkType == PressureBoilerCheckType.OUT) {
-    // 内外检验
-  } else if (row.checkType == PressureBoilerCheckType.PRESSURE) {
-    // 耐压检验
-  }
+  // businessType.value = 100
+  // serviceRecordListVisible.value = true
+  // isAddMainquestion.value = 'view'
+  // taskOrderDetail.value = { ...row, id: row.orderId } //'a08885bd8f4f1607acb3b4e41d99fd11'
+  // if (row.checkType == PressureBoilerCheckType.IN || row.checkType == PressureBoilerCheckType.OUT) {
+  //   // 内外检验
+  // } else if (row.checkType == PressureBoilerCheckType.PRESSURE) {
+  //   // 耐压检验
+  // }
+
+  currentTaskOrderId.value = row.orderId
+  orderReportVisible.value = true
+
 }
 /** 电子发放 */
 const handleElectronicDistribution = (id) => {

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

@@ -430,11 +430,19 @@
     :pdfBlob="currentPdfBlob"
     @close="handlePdfPreviewClose"
   />
+
+  <!-- 服务单/受理单 -->
+  <OrderDialog
+    v-if="orderReportVisible"
+    v-model:visible="orderReportVisible"
+    :orderId="currentTaskOrderId"
+    type="pipe"
+  />
+
 </template>
 
 <script setup lang="ts">
 import { ref, reactive, onMounted, getCurrentInstance } from 'vue'
-const { proxy } = getCurrentInstance()
 import { ElMessage } from 'element-plus'
 import { formatArrayDate, formatDate } from '@/utils/formatTime'
 import { PipeTaskOrderApi, PipeTaskOrderVO } from '@/api/pressure2/pipetaskorder'
@@ -454,6 +462,7 @@ import {getJCP} from '@/utils/jcp/jcp-vue'
 import {PipeInputApi} from "@/api/pressure2/pipeInput";
 import PdfPreviewDialog from './PdfPreviewDialog.vue'
 import 'https://printjs-4de6.kxcdn.com/print.min.js'
+import OrderDialog from "@/views/pressure2/boilertaskorder/components/OrderDialog.vue";
 
 const router = useRouter()
 /** 出具报告任务单 列表 */
@@ -668,16 +677,21 @@ const handleViewPrintRecord = (row) => {
 }
 
 // 委托协议
+const orderReportVisible = ref(false)
 const handleConsignmentAgreement = (row) => {
-  businessType.value = 100
-  serviceRecordListVisible.value = true
-  isAddMainquestion.value = 'view'
-  taskOrderDetail.value = { ...row, id: row.orderId } //'a08885bd8f4f1607acb3b4e41d99fd11'
-  if (row.checkType == PressurePipeCheckType.ANNUAL) {
-
-  } else if (row.checkType == PressurePipeCheckType.REGULAR) {
+  // businessType.value = 100
+  // serviceRecordListVisible.value = true
+  // isAddMainquestion.value = 'view'
+  // taskOrderDetail.value = { ...row, id: row.orderId } //'a08885bd8f4f1607acb3b4e41d99fd11'
+  // if (row.checkType == PressureBoilerCheckType.IN || row.checkType == PressureBoilerCheckType.OUT) {
+  //   // 内外检验
+  // } else if (row.checkType == PressureBoilerCheckType.PRESSURE) {
+  //   // 耐压检验
+  // }
+
+  currentTaskOrderId.value = row.orderId
+  orderReportVisible.value = true
 
-  }
 }
 /** 电子发放 */
 const handleElectronicDistribution = (id) => {