From cabb1279e9370edfebdef62f6eba272eeae8fe67 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 23 Jan 2026 18:10:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue |  253 ++++++++++++++++++++++++++------------------------
 1 files changed, 132 insertions(+), 121 deletions(-)

diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue
index 49d5005..3e3cfb9 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue
@@ -1,10 +1,10 @@
 <!-- 巡查报告管理 -->
 <template>
-  <basic-container>
-    <el-form ref="queryParamsRef" :model="searchParams" class="gd-search-form">
+	<basic-container>
+		<el-form ref="queryParamsRef" :model="searchParams" class="gd-search-form">
 			<el-form-item label="模糊搜索" prop="nickName">
 				<el-input
-					class="gd-input"
+					class="gd-input gray"
 					v-model="searchParams.nickName"
 					placeholder="请输入"
 					clearable
@@ -14,7 +14,7 @@
 
 			<el-form-item label="文档类型" prop="resultType">
 				<el-select
-					class="gd-select"
+					class="gd-select gray"
 					popper-class="gd-select-popper"
 					v-model="searchParams.resultType"
 					placeholder="请选择"
@@ -37,11 +37,11 @@
 		</el-form>
 
 		<div class="gd-table-toolbar">
-      <el-button :icon="Download" color="#4C34FF" type="primary" @click="handleDownload">文档下载</el-button>
+			<el-button :icon="Download" color="#4C34FF" type="primary" @click="handleDownload">文档下载</el-button>
 			<el-button :icon="Upload" color="#4C34FF" type="primary" @click="handleUpload">文档上传</el-button>
 		</div>
 
-    <div class="gd-table-container" v-loading="loading">
+		<div class="gd-table-container" v-loading="loading">
 			<div class="gd-table-content gd-table-content-bg">
 				<el-table class="gd-table" :data="list" @selection-change="handleSelectionChange">
 					<el-table-column type="selection" width="46" />
@@ -50,7 +50,7 @@
 					<el-table-column prop="attachSize" show-overflow-tooltip label="文档大小" />
 					<el-table-column prop="deptName" show-overflow-tooltip label="文档归属" />
 					<!-- <el-table-column prop="resultType" show-overflow-tooltip label="文档类型" /> -->
-					 <el-table-column prop="resultType" show-overflow-tooltip label="文档类型">
+					<el-table-column prop="resultType" show-overflow-tooltip label="文档类型">
 						<template v-slot="{ row }">
 							{{ getDictLabel(row.resultType, dictObj.patrolTaskType) }}
 						</template>
@@ -76,71 +76,80 @@
 				/>
 			</div>
 		</div>
-    <el-dialog class="gd-dialog" append-to-body v-model="isShowEditView" :title="titleTxt"
-		:width="pxToRem(800)" :close-on-click-modal="false" :destroy-on-close="true" @close="handleClose">
-      <el-form class="gd-dialog-form" ref="ruleFormRef" :model="editParams" :rules="rules" label-width="140px">
-        <el-form-item label="文档名称" prop="nickName">
-          <el-input v-model="editParams.nickName" />
-        </el-form-item>
-        <el-form-item label="文档类型" prop="resultType" v-if="titleTxt === '上传巡查报告'">
-          <el-select
-					class="gd-select"
-					popper-class="gd-select-popper"
-					v-model="editParams.resultType"
-					placeholder="请选择"
-					clearable
+		<el-dialog
+			class="gd-dialog"
+			append-to-body
+			v-model="isShowEditView"
+			:title="titleTxt"
+			:width="pxToRem(800)"
+			:close-on-click-modal="false"
+			:destroy-on-close="true"
+			@close="handleClose"
+		>
+			<el-form class="gd-dialog-form" ref="ruleFormRef" :model="editParams" :rules="rules" label-width="140px">
+				<el-form-item label="文档名称" prop="nickName">
+					<el-input v-model="editParams.nickName" class="gd-input" placeholder="请输入" />
+				</el-form-item>
+				<el-form-item label="文档类型" prop="resultType" v-if="titleTxt === '上传巡查报告'">
+					<el-select
+						class="gd-select"
+						popper-class="gd-select-popper"
+						v-model="editParams.resultType"
+						placeholder="请选择"
+						clearable
+					>
+						<el-option
+							v-for="item in dictObj.patrolTaskType"
+							:key="item.dictKey"
+							:label="item.dictValue"
+							:value="item.dictKey"
+						/>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="上传文件" prop="link" v-if="titleTxt === '上传巡查报告'">
+					{{ uploadName }}
+					<el-upload class="avatar-uploader" action="" :show-file-list="false" :before-upload="onUploadFileBefore">
+						<el-button size="small" type="primary">点击上传</el-button>
+					</el-upload>
+				</el-form-item>
+			</el-form>
+			<!-- </div> -->
+			<template #footer>
+				<el-button color="#F2F3F5" @click="isShowEditView = false">取消</el-button>
+				<el-button
+					class="save-btn"
+					color="#4C34FF"
+					:loading="submitting"
+					:disabled="submitting"
+					@click="submit(ruleFormRef)"
 				>
-					<el-option
-						v-for="item in dictObj.patrolTaskType"
-						:key="item.dictKey"
-						:label="item.dictValue"
-						:value="item.dictKey"
-					/>
-				</el-select>
-        </el-form-item>
-        <el-form-item label="上传文件" prop="link" v-if="titleTxt === '上传巡查报告'">
-			{{ uploadName }}
-          <el-upload
-            class="avatar-uploader"
-            action=""
-            :show-file-list="false"
-            :before-upload="onUploadFileBefore"
-          >
-            <el-button size="small" type="primary">点击上传</el-button>
-          </el-upload>
-        </el-form-item>
-      </el-form>
-    <!-- </div> -->
-     <template #footer>
-			<el-button color="#F2F3F5" @click="isShowEditView = false">取消</el-button>
-			<el-button class="save-btn" color="#4C34FF" :loading="submitting" :disabled="submitting" @click="submit(ruleFormRef)">
-				保存
-			</el-button>
-		</template>
-	</el-dialog>
-	<PreviewFiles v-model="previewVisible" :src="searchUrl" type="docx"/>
-	<!-- <el-image v-if="previewVisibleImg" :src="searchUrl" fit="contain" style="height: 100%;width: 100%" /> -->
-	 <el-image-viewer
-      v-if="previewVisibleImg"
-      :url-list="[searchUrl]"
-      @close="previewVisibleImg = false"
-    ></el-image-viewer>
-  </basic-container>
+					保存
+				</el-button>
+			</template>
+		</el-dialog>
+		<PreviewFiles v-model="previewVisible" :src="searchUrl" type="docx" />
+		<!-- <el-image v-if="previewVisibleImg" :src="searchUrl" fit="contain" style="height: 100%;width: 100%" /> -->
+		<el-image-viewer
+			v-if="previewVisibleImg"
+			:url-list="[searchUrl]"
+			@close="previewVisibleImg = false"
+		></el-image-viewer>
+	</basic-container>
 </template>
 <script setup>
-  import { Search, RefreshRight, Download, Upload, Delete } from '@element-plus/icons-vue'
-  import { fjPageApi, fjSubmitApi, fjRemoveApi, fjDetailApi, fjUploadApi } from './inspectionRequestApi'
-  import { useStore } from 'vuex'
-  import { ref, computed, inject, onMounted } from 'vue'
-  import { ElMessage, ElMessageBox } from 'element-plus'
-  import { getDictLabel } from '@ztzf/utils'
-  import PreviewFiles from '@/components/PreviewFiles/PreviewFiles.vue'
-  import { getDictionaryByCode } from '@/api/system/dictbiz'
+import { Search, RefreshRight, Download, Upload, Delete } from '@element-plus/icons-vue'
+import { fjPageApi, fjSubmitApi, fjRemoveApi, fjDetailApi, fjUploadApi } from './inspectionRequestApi'
+import { useStore } from 'vuex'
+import { ref, computed, inject, onMounted } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { getDictLabel } from '@ztzf/utils'
+import PreviewFiles from '@/components/PreviewFiles/PreviewFiles.vue'
+import { getDictionaryByCode } from '@/api/system/dictbiz'
 
-  const store = useStore()
-  const userInfo = computed(() => store.getters.userInfo);
+const store = useStore()
+const userInfo = computed(() => store.getters.userInfo)
 
-  // 初始化查询参数
+// 初始化查询参数
 const initSearchParams = () => ({
 	nickName: '',
 	resultType: '',
@@ -171,17 +180,17 @@
 const isShowEditView = ref(false)
 const titleTxt = ref('上传巡查报告')
 const editParams = ref({
-  id:'',
-  nickName: '',
-  resultType: '',
-  link: '',
+	id: '',
+	nickName: '',
+	resultType: '',
+	link: '',
 })
 const ruleFormRef = ref()
 const submitting = ref(false)
 const rules = ref({
-  nickName: [{ required: true, message: '请输入文档名称', trigger: ['blur'] }],
-  resultType: [{ required: true, message: '请选择文档类型', trigger: ['change'] }],
-  link: [{ required: true, message: '请上传文件', trigger: ['change'] }],
+	nickName: [{ required: true, message: '请输入文档名称', trigger: ['blur'] }],
+	resultType: [{ required: true, message: '请选择文档类型', trigger: ['change'] }],
+	link: [{ required: true, message: '请上传文件', trigger: ['change'] }],
 })
 
 // 获取字典
@@ -191,7 +200,7 @@
 	})
 }
 
-  // 获取列表
+// 获取列表
 async function getList() {
 	loading.value = true
 	try {
@@ -219,7 +228,7 @@
 // 新增/编辑/查看 弹框
 function openForm(row) {
 	isShowEditView.value = true
-  	titleTxt.value = '编辑'
+	titleTxt.value = '编辑'
 	editParams.value.id = row.id
 	editParams.value.nickName = row.nickName
 	editParams.value.resultType = row.resultType
@@ -233,7 +242,12 @@
 	if (!row.link) {
 		ElMessage.warning('文件链接不存在')
 		return
-	} else if (!row.link.includes('docx') && !row.link.includes('pdf') && !row.link.includes('png') && !row.link.includes('jpg')) {
+	} else if (
+		!row.link.includes('docx') &&
+		!row.link.includes('pdf') &&
+		!row.link.includes('png') &&
+		!row.link.includes('jpg')
+	) {
 		ElMessage.warning(`${fileType}文件格式,可以下载再查看`)
 		return
 	} else if (row.link.includes('png') || row.link.includes('jpg')) {
@@ -266,7 +280,7 @@
 // 勾选值设置
 function handleSelectionChange(rows) {
 	selectedFiles.value = rows
-	selectedIds.value = rows.map((item) => item.id)
+	selectedIds.value = rows.map(item => item.id)
 }
 
 // 文档下载
@@ -289,69 +303,66 @@
 			}
 		}, index * 300) // 300ms delay between downloads
 	})
-
 }
 
 // 文档上传
 async function handleUpload() {
 	isShowEditView.value = true
-  	titleTxt.value = '上传巡查报告'
+	titleTxt.value = '上传巡查报告'
 }
 
 // 上传文件前处理
 function onUploadFileBefore(file) {
-  // 执行文件上传
-  let data = new FormData();
-  data.append('file', file);
-  
-  fjUploadApi(data).then(res => {
-    if (res.data.code === 200) {
-      ElMessage.success('上传成功')
-      // 保存文件URL到表单
-	  uploadName.value = res.data.data.originalName
-      editParams.value.link = res.data.data.link
-    } else {
-      ElMessage.error(res.msg || '上传失败')
-    }
-  })
-  
-  return false // 阻止组件的默认上传行为
+	// 执行文件上传
+	let data = new FormData()
+	data.append('file', file)
+
+	fjUploadApi(data).then(res => {
+		if (res.data.code === 200) {
+			ElMessage.success('上传成功')
+			// 保存文件URL到表单
+			uploadName.value = res.data.data.originalName
+			editParams.value.link = res.data.data.link
+		} else {
+			ElMessage.error(res.msg || '上传失败')
+		}
+	})
+
+	return false // 阻止组件的默认上传行为
 }
 
 // 保存上传文件数据
 async function submit(formValidate) {
-  if (!formValidate) return
-  await formValidate.validate(async (valid, fields) => {
-    if (valid) {
-      submitting.value = true
-      try {
-         await fjSubmitApi({ ...editParams.value })
-          ElMessage.success('保存成功')
-          isShowEditView.value = false
-		  getList()
-      } finally {
-        submitting.value = false
-      }
-    }
-  })
+	if (!formValidate) return
+	await formValidate.validate(async (valid, fields) => {
+		if (valid) {
+			submitting.value = true
+			try {
+				await fjSubmitApi({ ...editParams.value })
+				ElMessage.success('保存成功')
+				isShowEditView.value = false
+				getList()
+			} finally {
+				submitting.value = false
+			}
+		}
+	})
 }
 
 function handleClose() {
-  // 清除表单内容
-  uploadName.value = ''
-  editParams.value = {
-    id: '',
-    nickName: '',
-    resultType: '',
-    uploadFile: '',
-  }
+	// 清除表单内容
+	uploadName.value = ''
+	editParams.value = {
+		id: '',
+		nickName: '',
+		resultType: '',
+		uploadFile: '',
+	}
 }
 
 onMounted(() => {
 	getDictList()
 	getList()
 })
-
 </script>
-<style scoped lang="scss">
-</style>
+<style scoped lang="scss"></style>

--
Gitblit v1.9.3