保养和检修工单打印功能，加上按钮连点问题

src/utils/disposition/defaultButtons.ts

@@ -1065,6 +1065,18 @@ export function confirmOrderBtn(option:any) {
   })
 }
 
+// 工单-打印
+export function orderPrintBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '工单打印',
+    name: 'orderPrint',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 
 
 // 默认按钮规则

src/views/eam/device/deviceinspectionjob/deviceInspectionMain.data.ts

@@ -371,7 +371,7 @@ export const DeviceInspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isForm: false,
     table: {
-      width: 150,
+      width: 200,
       fixed: 'right'
     },
     isDetail: false

src/views/eam/device/deviceinspectionjob/index.vue

@@ -121,6 +121,7 @@ import { selectAllFactoryArea } from '@/api/system/dept'
 import * as UserApi from '@/api/system/user'
 import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
 import * as DeviceMaintenanceMainApi from '@/api/eam/device/deviceMaintenanceMain'
+import { getAccessToken } from '@/utils/auth'
 
 // import TableHead from '@/components/TableHead/src/TableHead.vue'
 // import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
@@ -143,6 +144,8 @@ const verifyFormValue = ref({
   verifyContent: '',
 })
 const openRowValue = ref()
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/941184370359353344?token=' + getAccessToken())
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
@@ -239,6 +242,9 @@ const butttondata = (row) => {
     defaultButtons.verifyOrderBtn({
       hide: !(row.status == 'COMPLETED' && judgeIsTheClassEngineer(row))
     }), // 验证
+    defaultButtons.orderPrintBtn({
+      hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id) || !((row.status == 'COMPLETED' || row.status == 'PECEIVED') && judgeIsTheClassEngineer(row))
+    }) // 打印
   ]
 }
 
@@ -252,6 +258,8 @@ const buttonTableClick = async (val, row) => {
     handleFinishOrder(row)
   } else if (val == 'verifyOrder') { // 验证
     verifyOrder(row)
+  } else if (val == 'orderPrint') {
+    orderPrint(row)
   }
 }
 
@@ -666,6 +674,9 @@ const judgeIsTheClassEngineer = (row) => {
   }
 }
 
+const orderPrint = (row) => {
+  window.open(src.value + "&id=" + row.id)
+}
 
 /** 初始化 **/
 onMounted(async () => {

src/views/eam/device/devicemaintainjob/deviceMaintainOrderMain.data.ts

@@ -251,7 +251,7 @@ export const DeviceMaintainOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isForm: false,
     table: {
-      width: 150,
+      width: 200,
       fixed: 'right'
     },
     isDetail: false,

src/views/eam/device/devicemaintainjob/index.vue

@@ -140,6 +140,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { useUserStore } from '@/store/modules/user'
 import * as UserApi from '@/api/system/user'
 import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
+import { getAccessToken } from '@/utils/auth'
 
 
 defineOptions({ name: 'DeviceMaintainOrderMain' })
@@ -157,6 +158,8 @@ const dialogRowData = ref()
 const updateFormValue = ref({
   verifyContent:''
 })
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/940395429096013824?token=' + getAccessToken())
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -257,7 +260,6 @@ const butttondata = (row) => {
   return [
     // defaultButtons.mainListEditBtn(null), // 编辑
     defaultButtons.acceptOrderBtn({
-      
       hide: !(
         row.status == 'PENDING' && judgeIsTheClass(row)
       )
@@ -271,6 +273,9 @@ const butttondata = (row) => {
     defaultButtons.verifyOrderBtn({
       hide: !(row.status == 'COMPLETED'  && judgeIsTheClassEngineer(row))
     }), // 验证
+    defaultButtons.orderPrintBtn({
+      hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id) || !((row.status == 'COMPLETED' || row.status == 'PECEIVED') && judgeIsTheClassEngineer(row))
+    }) // 打印
     
   ]
 }
@@ -301,7 +306,10 @@ const buttonTableClick = async (val, row) => {
     openDialog(row)
   } else if (val == 'finishOrder') {
     finishOrder(row)
+  } else if (val == 'orderPrint') {
+    orderPrint(row)
   }
+  
 }
 
 /** 添加/修改操作 */
@@ -639,4 +647,8 @@ const onSubmit = () => {
   getList()
 }
 
+const orderPrint = (row) => {
+  window.open(src.value + "&id=" + row.id)
+}
+
 </script>

src/views/eam/device/devicemaintenancejob/index.vue

@@ -133,6 +133,8 @@
     :key="tempIdeaRefViewKey"
     :closeOnClickModal="true"
     :title="tempIdeaRefViewTitle" 
+    :vLoading="tempDialogLoading"
+    
   >
     <div style="text-align: center;">
       <el-checkbox ref="checkBoxTempDue" v-model="isTemporary">临时措施</el-checkbox>
@@ -151,6 +153,7 @@
     :maxHeight="760"
     :style="{height:'500px'}"
     :before-close="handleBeforeConfirmClose"
+    :vLoading="confirmDialogLoading"
   >
     <el-form class="demo-form-inline">
       <el-form-item label="确认意见">
@@ -186,6 +189,7 @@
     :maxHeight="700"
     :style="{height:'450px'}"
     :before-close="handleBeforeVerifyClose"
+    :vLoading="formLoading"
   >
     <el-form :model="verifyFormValue" class="demo-form-inline">
       <el-form-item label="验证意见">
@@ -273,6 +277,9 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 const openRowValue = ref()
+const formLoading = ref(false)
+const tempDialogLoading = ref(false)
+const confirmDialogLoading = ref(false)
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
@@ -901,6 +908,7 @@ function finishOrder(row) {
 }
 
 function confirmFinish(row) {
+  tempDialogLoading.value = true
   let param = {
     id: row.id,
     number: row.number,
@@ -909,6 +917,7 @@ function confirmFinish(row) {
     requestNumber: row.requestNumber,
   }
   DeviceMaintenanceMainApi.finishOrder(param).then(res => {
+    tempDialogLoading.value = false
     getList()
     showTempIdeaRefView.value = false;
     message.success('操作成功')
@@ -924,6 +933,7 @@ function verifyOrder(row) {
 
 // 验证
 function verifySubmit() {
+  formLoading.value = true
   const row = openRowValue.value
   let param = {
     id: row.id,
@@ -933,6 +943,7 @@ function verifySubmit() {
     content: verifyFormValue.value.verifyContent
   }
   DeviceMaintenanceMainApi.verifyOrder(param).then(res => {
+    formLoading.value = false
     verifyDialogVisible.value = false
     getList()
     message.success('操作成功')
@@ -954,6 +965,7 @@ function confirmOrder(row) {
 
 // 确认
 function confirmSubmit() {
+  confirmDialogLoading.value = true
   const row = openRowValue.value
   let param = {
     id: row.id,
@@ -964,6 +976,7 @@ function confirmSubmit() {
     content: confirmFormValue.value.confirmContent,
   }
   DeviceMaintenanceMainApi.confirmOrder(param).then(res => {
+    confirmDialogLoading.value = false
     confirmDialogVisible.value = false
     getList()
     message.success('操作成功')

src/views/eam/mold/moldmaintenancejob/index.vue

@@ -132,6 +132,7 @@
     :key="tempIdeaRefViewKey"
     :closeOnClickModal="true"
     :title="tempIdeaRefViewTitle" 
+    :vLoading="tempDialogLoading"
   >
     <div style="text-align: center;">
       <el-checkbox ref="checkBoxTempDue" v-model="isTemporary">临时措施</el-checkbox>
@@ -150,6 +151,7 @@
     :maxHeight="760"
     :style="{height:'500px'}"
     :before-close="handleBeforeConfirmClose"
+    :vLoading="confirmDialogLoading"
   >
     <el-form class="demo-form-inline">
       <el-form-item label="确认意见">
@@ -185,6 +187,7 @@
     :maxHeight="700"
     :style="{height:'450px'}"
     :before-close="handleBeforeVerifyClose"
+    :vLoading="formLoading"
   >
     <el-form :model="verifyFormValue" class="demo-form-inline">
       <el-form-item label="验证意见">
@@ -261,6 +264,9 @@ const verifyFormValue = ref({
   verifyContent: '',
 })
 const openRowValue = ref()
+const formLoading = ref(false)
+const tempDialogLoading = ref(false)
+const confirmDialogLoading = ref(false)
 routeName.value = route.name
 const tableColumns = ref(MoldMaintenanceMain.allSchemas.tableColumns)
 
@@ -614,6 +620,7 @@ function finishOrder(row) {
 }
 
 function confirmFinish(row) {
+  tempDialogLoading.value = true
   let param = {
     id: row.id,
     number: row.number,
@@ -622,6 +629,7 @@ function confirmFinish(row) {
     requestNumber: row.requestNumber,
   }
   MoldMaintenanceMainApi.finishOrder(param).then(res => {
+    tempDialogLoading.value = false
     getList()
     showTempIdeaRefView.value = false;
     message.success('操作成功')
@@ -637,6 +645,7 @@ function verifyOrder(row) {
 
 // 验证
 function verifySubmit() {
+  formLoading.value = true
   const row = openRowValue.value
   let param = {
     id: row.id,
@@ -646,6 +655,7 @@ function verifySubmit() {
     content: verifyFormValue.value.verifyContent
   }
   MoldMaintenanceMainApi.verifyOrder(param).then(res => {
+    formLoading.value = false
     verifyDialogVisible.value = false
     getList()
     message.success('操作成功')
@@ -667,6 +677,7 @@ function confirmOrder(row) {
 
 // 确认
 function confirmSubmit() {
+  confirmDialogLoading.value = true
   const row = openRowValue.value
   let param = {
     id: row.id,
@@ -677,6 +688,7 @@ function confirmSubmit() {
     content: confirmFormValue.value.confirmContent,
   }
   MoldMaintenanceMainApi.confirmOrder(param).then(res => {
+    confirmDialogLoading.value = false
     confirmDialogVisible.value = false
     getList()
     message.success('操作成功')
@@ -807,8 +819,8 @@ const detailSubmitForm= async (formType,data,formRef,tableList) => {
         })
         item.itemNumbers1 = str.substring(0, str.length - 1)
       }
-
     })
+    await getList()
   } finally {
     formRef.value.formLoading = false
   }