xy преди 6 дни
родител
ревизия
1232889a2d

+ 33 - 30
yudao-ui-admin-vue3/src/views/pressure2/boilertaskorder/components/AddInspectionplanDetail.vue

@@ -13,11 +13,11 @@
     class="check-record-wrapper"
     v-loading="pdfLoading"
   >
-    <div class="designer-inner" ref="wrapperContainerRef" v-if="['add', 'edit'].includes(isEdit)">
-<!--      <SpreadViewer :initData="initData" ref="spreadRef" />-->
-      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" isFullscreen @saveSuccess="saveSuccessRecord"/>
-    </div>
-    <div class="designer-inner" ref="wrapperContainerRef" v-else>
+<!--    <div class="designer-inner" ref="wrapperContainerRef">-->
+<!--&lt;!&ndash;      <SpreadViewer :initData="initData" ref="spreadRef" />&ndash;&gt;-->
+<!--      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" isFullscreen @saveSuccess="saveSuccessRecord"/>-->
+<!--    </div>-->
+    <div class="designer-inner" ref="wrapperContainerRef">
        <SpreadViewer :initData="initData" ref="spreadRef" />
     </div>
     <div class="operation-inner relative">
@@ -225,7 +225,7 @@ const handleSuccess = (info) => {
   // 更新相关的信息,reportId prepareJson 等
   console.log('handleSuccess-info:', info )
   emits('success', info)
-  initPreview()
+  // initPreview()
 }
 
 const uploadRef = ref()
@@ -308,16 +308,18 @@ const handlePostFile = async (options: UploadRequestOptions) => {
 }
 // 关联文件到任务单(仅关联不提交审核)
 const relaseReport = (manualUrl: string) => {
-  const { reportId, templateId } = props.editInspectionplanParams
-  const params = {
-    id: reportId,
-    manualUrl,
-    templateId
-  }
-  BoilerTaskOrderApi.releaseManualReport(params).then(() => {
-    ElMessage.success('关联文件成功')
-    editData.value.manualUrl = manualUrl
-  })
+  // const { reportId, templateId } = props.editInspectionplanParams
+  // const params = {
+  //   id: reportId,
+  //   manualUrl,
+  //   templateId
+  // }
+  // BoilerTaskOrderApi.releaseManualReport(params).then(() => {
+  //   ElMessage.success('关联文件成功')
+  //   initPreview(manualUrl)
+  // })
+  ElMessage.success('关联文件成功')
+  initPreview(manualUrl)
 }
 // 提交审核
 const handleSubmitOperationReport = async (manualUrl = '') => {
@@ -364,13 +366,13 @@ const handleSubmitConfirm = () => {
 }
 const handleSubmitBefore = async () => {
 
-  try {
-    await editSpreadRecordRef.value?.handleSave()
-  } catch (error) {
-    console.error('保存数据失败:', error)
-    ElMessage.error('保存数据失败,请重试')
-    return
-  }
+  // try {
+  //   await editSpreadRecordRef.value?.handleSave()
+  // } catch (error) {
+  //   console.error('保存数据失败:', error)
+  //   ElMessage.error('保存数据失败,请重试')
+  //   return
+  // }
 
   // console.log(props.editInspectionplanParams, 'props.editInspectionplanParams')
   // if (props.isEdit === 'add' && !fileList.value.length) return ElMessage.error('请先上传方案文件')
@@ -429,13 +431,13 @@ const editPreview=()=>{
 
   console.log('editDataPreview', editData.value)
 }
-const initPreview=()=>{
+const initPreview=(manualUrl:string)=>{
 
   initData.value.templateId = props.editInspectionplanParams.templateId;
   initData.value.refId = props.editInspectionplanParams.reportId;
   initData.value.opType = 1;
 
-  initData.value.manualUrl = props.inspectionplanDetail?.manualUrl;
+  initData.value.manualUrl = manualUrl;
 
   setTimeout(()=>{
     spreadRef.value?.reloadView();
@@ -448,12 +450,13 @@ onMounted(()=>{
   handleWindowResize()
   // console.log('wrapperContainerHeight.value ', wrapperContainerHeight.value)
   window.addEventListener('resize', handleWindowResize)
+  initPreview(props.inspectionplanDetail?.manualUrl)
   // initPreview()
-  if (['add', 'edit'].includes(props.isEdit)){
-    editPreview()
-  }else{
-    initPreview()
-  }
+  // if (['add', 'edit'].includes(props.isEdit)){
+  //   editPreview()
+  // }else{
+  //   initPreview()
+  // }
 
 })
 onUnmounted(() => {

+ 35 - 31
yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/components/AddInspectionplanDetail.vue

@@ -13,11 +13,11 @@
     class="check-record-wrapper"
     v-loading="pdfLoading"
   >
-    <div class="designer-inner" ref="wrapperContainerRef" v-if="['add', 'edit'].includes(isEdit)">
-      <!--      <SpreadViewer :initData="initData" ref="spreadRef" />-->
-      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" isFullscreen @saveSuccess="saveSuccessRecord"/>
-    </div>
-    <div class="designer-inner" ref="wrapperContainerRef" v-else>
+<!--    <div class="designer-inner" ref="wrapperContainerRef">-->
+<!--      &lt;!&ndash;      <SpreadViewer :initData="initData" ref="spreadRef" />&ndash;&gt;-->
+<!--      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" isFullscreen @saveSuccess="saveSuccessRecord"/>-->
+<!--    </div>-->
+    <div class="designer-inner" ref="wrapperContainerRef">
       <SpreadViewer :initData="initData" ref="spreadRef" />
     </div>
     <div class="operation-inner relative">
@@ -216,7 +216,7 @@ const handleSuccess = (info) => {
   // 更新相关的信息,reportId prepareJson 等
   console.log('handleSuccess-info:', info )
   emits('success', info)
-  initPreview()
+  // initPreview()
 }
 
 const uploadRef = ref()
@@ -307,16 +307,20 @@ const handlePostFile = async (options: UploadRequestOptions) => {
 }
 // 关联文件到任务单(仅关联不提交审核)
 const relaseReport = (manualUrl: string) => {
-  const { reportId, templateId } = props.editInspectionplanParams
-  const params = {
-    id: reportId,
-    manualUrl,
-    templateId
-  }
-  PipeTaskOrderApi.releaseManualReport(params).then(() => {
-    ElMessage.success('关联文件成功')
-    editData.value.manualUrl = manualUrl
-  })
+  // const { reportId, templateId } = props.editInspectionplanParams
+  // const params = {
+  //   id: reportId,
+  //   manualUrl,
+  //   templateId
+  // }
+  // PipeTaskOrderApi.releaseManualReport(params).then(() => {
+  //   ElMessage.success('关联文件成功')
+  //   initPreview(manualUrl)
+  // })
+
+  ElMessage.success('关联文件成功')
+  initPreview(manualUrl)
+
 }
 // 提交审核
 const handleSubmitOperationReport = async (manualUrl = '') => {
@@ -365,13 +369,13 @@ const handleSubmitConfirm = () => {
 }
 const handleSubmitBefore = async () => {
 
-  try {
-    await editSpreadRecordRef.value?.handleSave()
-  } catch (error) {
-    console.error('保存数据失败:', error)
-    ElMessage.error('保存数据失败,请重试')
-    return
-  }
+  // try {
+  //   await editSpreadRecordRef.value?.handleSave()
+  // } catch (error) {
+  //   console.error('保存数据失败:', error)
+  //   ElMessage.error('保存数据失败,请重试')
+  //   return
+  // }
 
   // console.log(props.editInspectionplanParams, 'props.editInspectionplanParams')
   // if (props.isEdit === 'add' && !fileList.value.length) return ElMessage.error('请先上传方案文件')
@@ -429,13 +433,13 @@ const editPreview=()=>{
 
   console.log('editDataPreview', editData.value)
 }
-const initPreview=()=>{
+const initPreview=(manualUrl:string)=>{
 
   initData.value.templateId = props.editInspectionplanParams.templateId;
   initData.value.refId = props.editInspectionplanParams.reportId;
   initData.value.opType = 1;
 
-  initData.value.manualUrl = props.inspectionplanDetail?.manualUrl;
+  initData.value.manualUrl = manualUrl;
 
   setTimeout(()=>{
     spreadRef.value?.reloadView();
@@ -448,12 +452,12 @@ onMounted(()=>{
   handleWindowResize()
   // console.log('wrapperContainerHeight.value ', wrapperContainerHeight.value)
   window.addEventListener('resize', handleWindowResize)
-  // initPreview()
-  if (['add', 'edit'].includes(props.isEdit)){
-    editPreview()
-  }else{
-    initPreview()
-  }
+  initPreview(props.inspectionplanDetail?.manualUrl)
+  // if (['add', 'edit'].includes(props.isEdit)){
+  //   editPreview()
+  // }else{
+  //   initPreview()
+  // }
 })
 onUnmounted(() => {
   window.removeEventListener('resize', handleWindowResize)