Ver código fonte

问题调整

xy 1 mês atrás
pai
commit
845ecaa9d5

+ 1 - 1
yudao-ui-admin-vue3/src/views/pressure2/boilerchecker/components/InspectionItemList.vue

@@ -117,7 +117,7 @@
                     <span v-if="activeTab == 'inspection'" :style="{color: getStatusBgColor(item.taskStatus) }">{{
                         item.checkUsers.length ? item.checkUsers[0].nickname : '未分配'
                       }}</span>
-                    <span v-else>{{ item.creatorUser ? item.creatorUser?.nickname : '' }}</span>
+                    <span v-else>{{ item.checkUsers.length ? item.checkUsers[0]?.nickname : '' }}</span>
                     <div
                       class="text-[14px]"
                       v-if="item.reportType === 300 && !item.instructionId && item.instructionTempId"

+ 3 - 0
yudao-ui-admin-vue3/src/views/pressure2/boilertaskorder/components/AddInspectionplanDetail.vue

@@ -343,6 +343,7 @@ const initData=ref<InitParams>(
     refName:'',
     insId:'',
     opType: 1, // 0:excel,1: pdf
+    manualUrl: '',
   });
 const editData=ref<InitParams>(
   {
@@ -376,6 +377,8 @@ const initPreview=()=>{
   initData.value.refId = props.editInspectionplanParams.reportId;
   initData.value.opType = 1;
 
+  initData.value.manualUrl = props.inspectionplanDetail?.manualUrl;
+
   setTimeout(()=>{
     spreadRef.value?.reloadView();
   },50)

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

@@ -1829,11 +1829,12 @@ const handleGetOperationReportAuditList = async () => {
     // notStatusList: 200,
   })
   supportingDocsAuditDataList.value = auditListResult.list.filter(item => {
-    if([PressureReportType.INSPECTIONPLAN, PressureReportType.WORKINSTRUCTION].includes(item.reportType)){
-      return item.status !== 200
-    } else {
-      return item
-    }
+    // if([PressureReportType.INSPECTIONPLAN, PressureReportType.WORKINSTRUCTION].includes(item.reportType)){
+    //   return item.status !== 200
+    // } else {
+    //   return item
+    // }
+    return item
   })
   operationReportTotal.value = auditListResult.total
 }

+ 1 - 1
yudao-ui-admin-vue3/src/views/pressure2/pipechecker/components/InspectionItemList.vue

@@ -75,7 +75,7 @@
                   <span v-if="activeTab == 'inspection'" :style="{color: getStatusBgColor(item.taskStatus) }">{{
                       item.checkUsers.length ? item.checkUsers[0].nickname : '未分配'
                     }}</span>
-                  <span v-else>{{ item.creatorUser ? item.creatorUser?.nickname : '' }}</span>
+                  <span v-else>{{ item.checkUsers.length ? item.checkUsers[0]?.nickname : '' }}</span>
                   <div
                     class="text-[14px]"
                     v-if="item.reportType === 300 && !item.instructionId && item.instructionTempId"