From 72de60dc82cf3ad4391b93dae5dbb3aadf2b01f4 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Mon, 14 Jul 2025 17:21:06 +0800
Subject: [PATCH] 优化报修完成

---
 src/api/role/roleApi.js                      |   6 +++---
 src/api/work/finishRepairApi.js              |  86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/api/work/printRepairDetailApi.js         |  38 ++++++++++++++++++++++++++++++++++++++
 src/api/work/repairPoolManageApi.js          |   2 +-
 src/components/staff/SelectStaff.vue         |   1 +
 src/components/work/AddRepairSetting.vue     |   5 +++--
 src/components/work/DeleteRepairSetting.vue  |  13 ++++---------
 src/components/work/EditRepairSetting.vue    |  91 +++++++++++++++++++++++++++++--------------------------------------------------------------
 src/components/work/EditRepairTypeUser.vue   |   6 +++---
 src/components/work/StopRepair.vue           |  28 ++++++++--------------------
 src/components/work/addOwnerRepair.vue       |   4 ++--
 src/components/work/chooseSingleResource.vue | 346 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------
 src/components/work/deleteOwnerRepair.vue    |   4 ++--
 src/components/work/dispatchRepair.vue       |   6 ++++--
 src/components/work/forceFinishRepair.vue    |   8 ++++----
 src/components/work/repairDetailPhotos.vue   |   2 +-
 src/components/work/visitOwnerRepair.vue     |  54 ++++++++++++------------------------------------------
 src/i18n/workI18n.js                         |   6 ++++++
 src/router/index.js                          |   5 +++++
 src/router/workRouter.js                     |   5 +++++
 src/views/role/roleList.vue                  |  15 ++++++++-------
 src/views/work/finishRepairLang.js           | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/work/finishRepairList.vue          | 275 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/work/ownerRepairManageList.vue     |   5 +++--
 src/views/work/printRepairDetailLang.js      |  58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/work/printRepairDetailList.vue     | 194 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/work/repairDetailLang.js           |   8 ++++++--
 src/views/work/repairDetailList.vue          |   6 ++++--
 src/views/work/repairDispatchManageList.vue  |   6 +++---
 src/views/work/repairPoolManageList.vue      |   6 +++---
 src/views/work/repairReturnVisitLang.js      |  12 ++++++++++--
 src/views/work/repairReturnVisitList.vue     |   7 ++++---
 src/views/work/repairTypeUserList.vue        |   4 ++--
 33 files changed, 1109 insertions(+), 327 deletions(-)
 create mode 100644 src/api/work/finishRepairApi.js
 create mode 100644 src/api/work/printRepairDetailApi.js
 create mode 100644 src/views/work/finishRepairLang.js
 create mode 100644 src/views/work/finishRepairList.vue
 create mode 100644 src/views/work/printRepairDetailLang.js
 create mode 100644 src/views/work/printRepairDetailList.vue

diff --git a/src/api/role/roleApi.js b/src/api/role/roleApi.js
index 4c825ed..d089c82 100644
--- a/src/api/role/roleApi.js
+++ b/src/api/role/roleApi.js
@@ -4,7 +4,7 @@ import request from '@/utils/request'
 export function savePrivilegeGroup(data) {
   return new Promise((resolve, reject) => {
     request({
-      url: '/privilegeGroup.savePrivilegeGroup',
+      url: '/save.privilegeGroup.info',
       method: 'post',
       data
     }).then(response => {
@@ -24,7 +24,7 @@ export function savePrivilegeGroup(data) {
 export function updatePrivilegeGroup(data) {
   return new Promise((resolve, reject) => {
     request({
-      url: '/privilegeGroup.updatePrivilegeGroup',
+      url: '/edit.privilegeGroup.info',
       method: 'post',
       data
     }).then(response => {
@@ -44,7 +44,7 @@ export function updatePrivilegeGroup(data) {
 export function deletePrivilegeGroup(data) {
   return new Promise((resolve, reject) => {
     request({
-      url: '/privilegeGroup.deletePrivilegeGroup',
+      url: '/delete.privilegeGroup.info',
       method: 'post',
       data
     }).then(response => {
diff --git a/src/api/work/finishRepairApi.js b/src/api/work/finishRepairApi.js
new file mode 100644
index 0000000..c872e4f
--- /dev/null
+++ b/src/api/work/finishRepairApi.js
@@ -0,0 +1,86 @@
+import request from '@/utils/request'
+import { getCommunityId } from '@/api/community/communityApi'
+
+// 获取资源类型列表
+export function listResourceStoreTypes(params) {
+  return new Promise((resolve, reject) => {
+    const communityId = getCommunityId()
+    request({
+      url: '/resourceStoreType.listResourceStoreTypes',
+      method: 'get',
+      params: {
+        ...params,
+        communityId
+      }
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 获取用户仓库商品列表
+export function listUserStorehouses(params) {
+  return new Promise((resolve, reject) => {
+    const communityId = getCommunityId()
+    request({
+      url: '/resourceStore.listUserStorehouses',
+      method: 'get',
+      params: {
+        ...params,
+        communityId
+      }
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 完成报修
+export function repairFinish(data) {
+  return new Promise((resolve, reject) => {
+    const communityId = getCommunityId()
+    request({
+      url: '/ownerRepair.repairFinish',
+      method: 'post',
+      data: {
+        ...data,
+        communityId
+      }
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 上传文件
+export function uploadFile(data) {
+  return new Promise((resolve, reject) => {
+    const communityId = getCommunityId()
+    const formData = new FormData()
+    formData.append('uploadFile', data.file)
+    formData.append('communityId', communityId)
+    
+    request({
+      url: '/uploadFile',
+      method: 'post',
+      data: formData,
+      headers: {
+        'Content-Type': 'multipart/form-data'
+      }
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
\ No newline at end of file
diff --git a/src/api/work/printRepairDetailApi.js b/src/api/work/printRepairDetailApi.js
new file mode 100644
index 0000000..6c4a09d
--- /dev/null
+++ b/src/api/work/printRepairDetailApi.js
@@ -0,0 +1,38 @@
+import request from '@/utils/request'
+import { getCommunityId } from '@/api/community/communityApi'
+
+// 获取报修单详情
+export function listOwnerRepairs(params) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/ownerRepair.listOwnerRepairs',
+      method: 'get',
+      params: {
+        ...params,
+        communityId: params.communityId || getCommunityId()
+      }
+    }).then(response => {
+      resolve(response.data)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 获取维修人员处理轨迹
+export function listRepairStaffs(params) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/ownerRepair.listRepairStaffs',
+      method: 'get',
+      params: {
+        ...params,
+        communityId: params.communityId || getCommunityId()
+      }
+    }).then(response => {
+      resolve(response.data)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
\ No newline at end of file
diff --git a/src/api/work/repairPoolManageApi.js b/src/api/work/repairPoolManageApi.js
index 761abdc..f99bc3e 100644
--- a/src/api/work/repairPoolManageApi.js
+++ b/src/api/work/repairPoolManageApi.js
@@ -38,7 +38,7 @@ export function listRepairPools(params) {
 export function dispatchRepair(data) {
   return new Promise((resolve, reject) => {
     request({
-      url: '/ownerRepair.repairDispatch',
+      url: '/callComponent/ownerRepair.repairDispatch',
       method: 'post',
       data: {
         ...data,
diff --git a/src/components/staff/SelectStaff.vue b/src/components/staff/SelectStaff.vue
index a02d69c..826ee71 100644
--- a/src/components/staff/SelectStaff.vue
+++ b/src/components/staff/SelectStaff.vue
@@ -80,6 +80,7 @@ export default {
           this.staffs = staffs
           if (this.staffs.length > 0) {
             this.curStaffId = this.staffs[0].userId
+            this.selectedStaff = this.staffs[0]
           }
       } catch (error) {
         console.error('Error loading staff:', error)
diff --git a/src/components/work/AddRepairSetting.vue b/src/components/work/AddRepairSetting.vue
index b4d9f6e..41639ce 100644
--- a/src/components/work/AddRepairSetting.vue
+++ b/src/components/work/AddRepairSetting.vue
@@ -33,7 +33,8 @@
         <el-col :span="12">
           <el-form-item :label="$t('repairSetting.publicArea')" prop="publicArea">
             <el-select v-model="formData.publicArea"
-              :placeholder="$t('repairSetting.required') + $t('repairSetting.publicAreaPlaceholder')" style="width:100%">
+              :placeholder="$t('repairSetting.required') + $t('repairSetting.publicAreaPlaceholder')"
+              style="width:100%">
               <el-option :label="$t('repairSetting.nonHouse')" value="T" />
               <el-option :label="$t('repairSetting.house')" value="F" />
             </el-select>
@@ -203,7 +204,7 @@ export default {
         if (valid) {
           try {
             await saveRepairSetting(this.formData)
-            this.$message.success(this.$t('repairSetting.addSuccess'))
+            this.$message.success(this.$t('common.submitSuccess'))
             this.$emit('success')
             this.closeDialog()
           } catch (error) {
diff --git a/src/components/work/DeleteRepairSetting.vue b/src/components/work/DeleteRepairSetting.vue
index 68c82fb..3f4d451 100644
--- a/src/components/work/DeleteRepairSetting.vue
+++ b/src/components/work/DeleteRepairSetting.vue
@@ -1,10 +1,5 @@
 <template>
-  <el-dialog
-    :title="$t('repairSetting.confirmDeleteTitle')"
-    :visible.sync="visible"
-    width="30%"
-    center
-  >
+  <el-dialog :title="$t('repairSetting.confirmDeleteTitle')" :visible.sync="visible" width="30%" center>
     <div style="text-align: center">
       <p>{{ $t('repairSetting.confirmDeleteContent') }} [{{ currentRow.repairTypeName }}]?</p>
     </div>
@@ -31,16 +26,16 @@ export default {
       this.currentRow = { ...row }
       this.visible = true
     },
-    
+
     closeDialog() {
       this.visible = false
       this.currentRow = {}
     },
-    
+
     async confirmDelete() {
       try {
         await deleteRepairSetting(this.currentRow.settingId)
-        this.$message.success(this.$t('repairSetting.deleteSuccess'))
+        this.$message.success(this.$t('common.submitSuccess'))
         this.$emit('success')
         this.closeDialog()
       } catch (error) {
diff --git a/src/components/work/EditRepairSetting.vue b/src/components/work/EditRepairSetting.vue
index 45ab88c..a6963e9 100644
--- a/src/components/work/EditRepairSetting.vue
+++ b/src/components/work/EditRepairSetting.vue
@@ -1,42 +1,29 @@
 <template>
-  <el-dialog 
-    :title="$t('repairSetting.editTitle')" 
-    :visible.sync="visible"
-    width="50%"
-    @close="closeDialog"
-  >
+  <el-dialog :title="$t('repairSetting.editTitle')" :visible.sync="visible" width="50%" @close="closeDialog">
     <el-form ref="form" :model="formData" :rules="rules" label-width="150px">
       <el-row>
         <el-col :span="12">
           <el-form-item :label="$t('repairSetting.typeName')" prop="repairTypeName">
-            <el-input 
-              v-model="formData.repairTypeName" 
-              :placeholder="$t('repairSetting.repairTypeNamePlaceholder')"
-            />
+            <el-input v-model="formData.repairTypeName" :placeholder="$t('repairSetting.repairTypeNamePlaceholder')" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('repairSetting.settingType')" prop="repairSettingType">
-            <el-select 
-              v-model="formData.repairSettingType" 
+            <el-select v-model="formData.repairSettingType"
               :placeholder="$t('repairSetting.required') + $t('repairSetting.repairSettingTypePlaceholder')"
-              style="width:100%"
-            >
+              style="width:100%">
               <el-option :label="$t('repairSetting.cleaningOrder')" value="100" />
               <el-option :label="$t('repairSetting.repairOrder')" value="200" />
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
-      
+
       <el-row>
         <el-col :span="12">
           <el-form-item :label="$t('repairSetting.dispatchMethod')" prop="repairWay">
-            <el-select 
-              v-model="formData.repairWay" 
-              :placeholder="$t('repairSetting.required') + $t('repairSetting.repairWayPlaceholder')"
-              style="width:100%"
-            >
+            <el-select v-model="formData.repairWay"
+              :placeholder="$t('repairSetting.required') + $t('repairSetting.repairWayPlaceholder')" style="width:100%">
               <el-option :label="$t('repairSetting.grabOrder')" value="100" />
               <el-option :label="$t('repairSetting.assign')" value="200" />
               <el-option :label="$t('repairSetting.polling')" value="300" />
@@ -45,26 +32,21 @@
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('repairSetting.publicArea')" prop="publicArea">
-            <el-select 
-              v-model="formData.publicArea" 
+            <el-select v-model="formData.publicArea"
               :placeholder="$t('repairSetting.required') + $t('repairSetting.publicAreaPlaceholder')"
-              style="width:100%"
-            >
+              style="width:100%">
               <el-option :label="$t('repairSetting.nonHouse')" value="T" />
               <el-option :label="$t('repairSetting.house')" value="F" />
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
-      
+
       <el-row>
         <el-col :span="12">
           <el-form-item :label="$t('repairSetting.ownerDisplay')" prop="isShow">
-            <el-select 
-              v-model="formData.isShow" 
-              :placeholder="$t('repairSetting.ownerDisplayPlaceholder')"
-              style="width:100%"
-            >
+            <el-select v-model="formData.isShow" :placeholder="$t('repairSetting.ownerDisplayPlaceholder')"
+              style="width:100%">
               <el-option :label="$t('repairSetting.yes')" value="Y" />
               <el-option :label="$t('repairSetting.no')" value="N" />
             </el-select>
@@ -72,11 +54,8 @@
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('repairSetting.notificationMethod')" prop="notifyWay">
-            <el-select 
-              v-model="formData.notifyWay" 
-              :placeholder="$t('repairSetting.notificationMethodPlaceholder')"
-              style="width:100%"
-            >
+            <el-select v-model="formData.notifyWay" :placeholder="$t('repairSetting.notificationMethodPlaceholder')"
+              style="width:100%">
               <el-option :label="$t('repairSetting.sms')" value="SMS" />
               <el-option :label="$t('repairSetting.wechat')" value="WECHAT" />
               <el-option :label="$t('repairSetting.wechatWorkLicense')" value="WORK_LICENSE" />
@@ -84,40 +63,32 @@
           </el-form-item>
         </el-col>
       </el-row>
-      
+
       <el-row>
         <el-col :span="12">
           <el-form-item :label="$t('repairSetting.processingTime')" prop="doTime">
-            <el-input 
-              v-model.number="formData.doTime" 
-              type="number"
-              :placeholder="$t('repairSetting.required') + $t('repairSetting.processingTimePlaceholder')"
-            >
+            <el-input v-model.number="formData.doTime" type="number"
+              :placeholder="$t('repairSetting.required') + $t('repairSetting.processingTimePlaceholder')">
               <template slot="append">{{ $t('repairSetting.processingTimeUnit') }}</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('repairSetting.timeoutWarning')" prop="warningTime">
-            <el-input 
-              v-model.number="formData.warningTime" 
-              type="number"
-              :placeholder="$t('repairSetting.required') + $t('repairSetting.timeoutWarningPlaceholder')"
-            >
+            <el-input v-model.number="formData.warningTime" type="number"
+              :placeholder="$t('repairSetting.required') + $t('repairSetting.timeoutWarningPlaceholder')">
               <template slot="append">{{ $t('repairSetting.timeoutWarningUnit') }}</template>
             </el-input>
           </el-form-item>
         </el-col>
       </el-row>
-      
+
       <el-row>
         <el-col :span="12">
           <el-form-item :label="$t('repairSetting.returnVisitSetting')" prop="returnVisitFlag">
-            <el-select 
-              v-model="formData.returnVisitFlag" 
+            <el-select v-model="formData.returnVisitFlag"
               :placeholder="$t('repairSetting.required') + $t('repairSetting.returnVisitFlagPlaceholder')"
-              style="width:100%"
-            >
+              style="width:100%">
               <el-option :label="$t('repairSetting.noFollowUp')" value="001" />
               <el-option :label="$t('repairSetting.followUpAfterEvaluation')" value="002" />
               <el-option :label="$t('repairSetting.followUp')" value="003" />
@@ -125,21 +96,17 @@
           </el-form-item>
         </el-col>
       </el-row>
-      
+
       <el-row>
         <el-col :span="24">
           <el-form-item :label="$t('repairSetting.explanation')" prop="remark">
-            <el-input 
-              v-model="formData.remark" 
-              type="textarea" 
-              :rows="3"
-              :placeholder="$t('repairSetting.remarkPlaceholder')"
-            />
+            <el-input v-model="formData.remark" type="textarea" :rows="3"
+              :placeholder="$t('repairSetting.remarkPlaceholder')" />
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
-    
+
     <div slot="footer" class="dialog-footer">
       <el-button @click="closeDialog">{{ $t('repairSetting.cancel') }}</el-button>
       <el-button type="primary" @click="submitForm">{{ $t('repairSetting.save') }}</el-button>
@@ -213,18 +180,18 @@ export default {
       this.formData = { ...row }
       this.visible = true
     },
-    
+
     closeDialog() {
       this.visible = false
       this.$refs.form.resetFields()
     },
-    
+
     submitForm() {
       this.$refs.form.validate(async valid => {
         if (valid) {
           try {
             await updateRepairSetting(this.formData)
-            this.$message.success(this.$t('repairSetting.updateSuccess'))
+            this.$message.success(this.$t('common.submitSuccess'))
             this.$emit('success')
             this.closeDialog()
           } catch (error) {
diff --git a/src/components/work/EditRepairTypeUser.vue b/src/components/work/EditRepairTypeUser.vue
index 329ac9c..c0a3f30 100644
--- a/src/components/work/EditRepairTypeUser.vue
+++ b/src/components/work/EditRepairTypeUser.vue
@@ -1,10 +1,10 @@
 <template>
-  <el-dialog :visible="visible" :title="$t('editRepairTypeUser.title')" width="50%" @close="handleClose">
+  <el-dialog :visible="visible" :title="$t('editRepairTypeUser.title')" width="40%" @close="handleClose">
     <el-form ref="form" :model="form" label-width="120px">
       <el-form-item :label="$t('editRepairTypeUser.status')" prop="state" required>
         <el-select v-model="form.state" style="width: 100%">
-          <el-option :value="9999" :label="$t('editRepairTypeUser.online')"></el-option>
-          <el-option :value="8888" :label="$t('editRepairTypeUser.offline')"></el-option>
+          <el-option value="9999" :label="$t('editRepairTypeUser.online')"></el-option>
+          <el-option value="8888" :label="$t('editRepairTypeUser.offline')"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('editRepairTypeUser.description')" prop="remark">
diff --git a/src/components/work/StopRepair.vue b/src/components/work/StopRepair.vue
index 0e6311b..3ee7187 100644
--- a/src/components/work/StopRepair.vue
+++ b/src/components/work/StopRepair.vue
@@ -1,25 +1,13 @@
 <template>
-  <el-dialog
-    :title="$t('repairDispatchManage.pauseRepair')"
-    :visible.sync="visible"
-    width="50%"
-    @close="resetForm"
-  >
+  <el-dialog :title="$t('repairDispatchManage.pause')" :visible.sync="visible" width="50%" @close="resetForm">
     <el-form :model="form" ref="form" label-width="120px">
-      <el-form-item
-        :label="$t('repairDispatchManage.pauseReason')"
-        prop="remark"
-        :rules="[{ required: true, message: $t('repairDispatchManage.requiredPauseReason'), trigger: 'blur' }]"
-      >
-        <el-input
-          type="textarea"
-          :rows="4"
-          v-model="form.remark"
-          :placeholder="$t('repairDispatchManage.requiredPauseReason')"
-        />
+      <el-form-item :label="$t('repairDispatchManage.pauseReason')" prop="remark"
+        :rules="[{ required: true, message: $t('repairDispatchManage.requiredPauseReason'), trigger: 'blur' }]">
+        <el-input type="textarea" :rows="4" v-model="form.remark"
+          :placeholder="$t('repairDispatchManage.requiredPauseReason')" />
       </el-form-item>
     </el-form>
-    
+
     <div slot="footer" class="dialog-footer">
       <el-button @click="visible = false">{{ $t('common.cancel') }}</el-button>
       <el-button type="primary" @click="submitForm">{{ $t('common.submit') }}</el-button>
@@ -55,13 +43,13 @@ export default {
     async submitForm() {
       this.$refs.form.validate(async valid => {
         if (!valid) return
-        
+
         try {
           const data = {
             ...this.form,
             communityId: getCommunityId()
           }
-          
+
           await repairStop(data)
           this.$emit('success')
           this.visible = false
diff --git a/src/components/work/addOwnerRepair.vue b/src/components/work/addOwnerRepair.vue
index e6c7c84..189a036 100644
--- a/src/components/work/addOwnerRepair.vue
+++ b/src/components/work/addOwnerRepair.vue
@@ -63,7 +63,7 @@
 import * as ownerRepairManageApi from '@/api/work/ownerRepairManageApi'
 import { getCommunityName } from '@/api/community/communityApi'
 import {getFloors, getUnits, queryRooms} from '@/api/room/roomApi'
-import {getDateYYYYMMDD} from '@/utils/dateUtil'
+//import {getDateYYYYMMDD} from '@/utils/dateUtil'
 
 export default {
   name: 'AddOwnerRepair',
@@ -100,7 +100,7 @@ export default {
     open() {
       this.visible = true
       this.resetForm()
-      this.formData.appointmentTime =getDateYYYYMMDD()
+     // this.formData.appointmentTime =getDateYYYYMMDD()
       this.listRepairSettings('T')
     },
     closeDialog() {
diff --git a/src/components/work/chooseSingleResource.vue b/src/components/work/chooseSingleResource.vue
index 29f6588..31a0913 100644
--- a/src/components/work/chooseSingleResource.vue
+++ b/src/components/work/chooseSingleResource.vue
@@ -1,115 +1,98 @@
 <template>
-  <el-dialog 
-    :title="$t('chooseSingleResource.title')"
-    :visible.sync="visible"
-    width="60%"
-    @close="closeDialog"
-  >
-    <el-form label-width="120px">
+  <el-dialog :title="$t('chooseSingleResource.title')" :visible.sync="dialogVisible" width="60%" @close="handleClose">
+
+    <el-form :model="form" label-width="120px">
       <el-form-item :label="$t('chooseSingleResource.goodsType')">
-        <el-select 
-          v-model="form.rsId"
-          placeholder="请选择"
-          style="width:100%"
-          @change="listSonResourceStoreType"
-        >
-          <el-option
-            v-for="item in resourceStoreTypes"
-            :key="item.rstId"
-            :label="item.name"
-            :value="item.rstId"
-          />
+        <el-select v-model="form.rsId" :placeholder="$t('chooseSingleResource.selectGoodsType')" style="width:100%"
+          @change="handleRsIdChange">
+          <el-option v-for="item in resourceStoreTypes" :key="item.rstId" :label="item.name" :value="item.rstId">
+          </el-option>
         </el-select>
       </el-form-item>
 
       <template v-if="form.isCustom">
         <el-form-item :label="$t('chooseSingleResource.goodsName')">
-          <el-input
-            v-model="form.customGoodsName"
-            :placeholder="$t('chooseSingleResource.goodsNamePlaceholder')"
-          />
+          <el-input v-model="form.customGoodsName" :placeholder="$t('chooseSingleResource.inputGoodsName')">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item :label="$t('chooseSingleResource.customPrice')" v-if="form.maintenanceType === '1001'">
+          <el-input-number v-model="form.price" :placeholder="$t('chooseSingleResource.inputPrice')" :min="0"
+            style="width:100%">
+          </el-input-number>
         </el-form-item>
       </template>
-      
+
       <template v-else>
-        <el-form-item :label="$t('chooseSingleResource.secondaryCategory')">
-          <el-select 
-            v-model="form.rstId"
-            placeholder="请选择"
-            style="width:100%"
-            @change="choseGoods"
-          >
-            <el-option
-              v-for="item in sonResourceStoreTypes"
-              :key="item.rstId"
-              :label="item.name"
-              :value="item.rstId"
-            />
+        <el-form-item :label="$t('chooseSingleResource.subCategory')">
+          <el-select v-model="form.rstId" :placeholder="$t('chooseSingleResource.selectSubCategory')" style="width:100%"
+            @change="handleRstIdChange">
+            <el-option v-for="item in sonResourceStoreTypes" :key="item.rstId" :label="item.name" :value="item.rstId">
+            </el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item v-if="form.rstId" :label="$t('chooseSingleResource.goods')">
-          <el-select 
-            v-model="form.resId"
-            placeholder="请选择"
-            style="width:100%"
-            @change="chosePrice"
-          >
-            <el-option
-              v-for="item in resourceStores"
-              :key="item.resId"
-              :label="item.resName"
-              :value="item.resId"
-            />
+        <el-form-item :label="$t('chooseSingleResource.goods')" v-if="form.rstId">
+          <el-select v-model="form.resId" :placeholder="$t('chooseSingleResource.selectGoods')" style="width:100%"
+            @change="handleResIdChange">
+            <el-option v-for="item in resourceStores" :key="item.resId" :label="item.resName" :value="item.resId">
+            </el-option>
           </el-select>
         </el-form-item>
-      </template>
 
-      <template v-if="form.resId || form.isCustom">
-        <el-form-item :label="$t('chooseSingleResource.quantity')">
-          <el-input-number
-            v-model="form.useNumber"
-            :min="1"
-            label="数量"
-          />
-        </el-form-item>
+        <template v-if="form.resId">
+          <el-form-item :label="$t('chooseSingleResource.goodsPrice')"
+            v-if="form.maintenanceType === '1001' && form.outLowPrice === form.outHighPrice">
+            <el-input-number v-model="form.price" disabled style="width:100%">
+            </el-input-number>
+          </el-form-item>
+
+          <el-form-item :label="$t('chooseSingleResource.customPrice')"
+            v-if="form.maintenanceType === '1001' && form.outLowPrice !== form.outHighPrice">
+            <el-input-number v-model="form.price" :min="form.outLowPrice" :max="form.outHighPrice" style="width:100%">
+            </el-input-number>
+            <span>{{ $t('chooseSingleResource.priceRange') }} {{ form.outLowPrice }}-{{ form.outHighPrice }}</span>
+          </el-form-item>
+
+          <el-form-item :label="$t('chooseSingleResource.spec')">
+            <el-input v-model="form.selectedGoodsInfo.specName" disabled>
+            </el-input>
+          </el-form-item>
+        </template>
       </template>
+
+      <el-form-item :label="$t('chooseSingleResource.quantity')">
+        <el-input-number v-model="form.useNumber" :min="1" @change="handleQuantityChange">
+        </el-input-number>
+      </el-form-item>
     </el-form>
 
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="closeDialog">{{ $t('chooseSingleResource.cancel') }}</el-button>
-      <el-button type="primary" @click="confirmSelection">{{ $t('chooseSingleResource.confirm') }}</el-button>
-    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">{{ $t('common.cancel') }}</el-button>
+      <el-button type="primary" @click="handleConfirm" :loading="loading">
+        {{ $t('common.confirm') }}
+      </el-button>
+    </span>
   </el-dialog>
 </template>
 
 <script>
-import { listResourceStoreTypes, listUserStorehouses } from '@/api/work/repairForceFinishManageApi'
+//import { getDict } from '@/api/community/communityApi'
+import { getCommunityId } from '@/api/community/communityApi'
+import { listResourceStoreTypes, listUserStorehouses } from '@/api/work/finishRepairApi'
 
 export default {
   name: 'ChooseSingleResource',
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    },
-    maintenanceType: {
-      type: String,
-      default: ''
-    },
-    repairId: {
-      type: String,
-      default: ''
-    }
-  },
   data() {
     return {
+      dialogVisible: false,
+      loading: false,
       form: {
         maintenanceType: '',
         resourceStoreTypes: [],
         sonResourceStoreTypes: [],
-        rstId: '',
         rsId: '',
+        rstId: '',
         resId: '',
         repairId: '',
         selectedGoodsInfo: {},
@@ -121,124 +104,191 @@ export default {
         outHighPrice: '',
         useNumber: 1,
         sign: ''
-      }
-    }
-  },
-  watch: {
-    maintenanceType(newVal) {
-      this.form.maintenanceType = newVal
-    },
-    repairId(newVal) {
-      this.form.repairId = newVal
+      },
+      resourceStoreTypes: [],
+      sonResourceStoreTypes: [],
+      resourceStores: [],
+      communityId: ''
     }
   },
-  mounted() {
-    this.listResourceStoreType()
-  },
   methods: {
-    open(param) {
-      this.form = {
-        ...this.form,
-        maintenanceType: param.maintenanceType,
-        repairId: param.repairId || '',
-        sign: param.sign || ''
+    open(params) {
+      this.resetForm()
+      this.communityId = getCommunityId()
+      this.form.maintenanceType = params.maintenanceType
+      if (params.sign) {
+        this.form.sign = params.sign
       }
-      this.listResourceStoreType()
-    },
-    closeDialog() {
-      this.$emit('update:visible', false)
+      if (params.repairId) {
+        this.form.repairId = params.repairId
+      }
+      this.dialogVisible = true
+      this.loadResourceStoreTypes()
     },
-    async listResourceStoreType() {
+    async loadResourceStoreTypes() {
       try {
-        const data = await listResourceStoreTypes('0')
-        this.form.resourceStoreTypes = [...data, { rstId: 'custom', name: '自定义' }]
+        const params = {
+          page: 1,
+          row: 100,
+          communityId: this.communityId,
+          parentId: '0',
+          giveType: 1
+        }
+        const { data } = await listResourceStoreTypes(params)
+        this.resourceStoreTypes = data
+        // 添加自定义选项
+        this.resourceStoreTypes.push({
+          rstId: 'custom',
+          name: this.$t('chooseSingleResource.custom')
+        })
       } catch (error) {
-        console.error('获取资源类型失败:', error)
-        this.$message.error('获取资源类型失败')
+        console.error('加载商品类型失败:', error)
       }
     },
-    async listSonResourceStoreType() {
-      if (this.form.rsId === 'custom') {
+    async handleRsIdChange(val) {
+      this.form.rstId = ''
+      this.sonResourceStoreTypes = []
+      this.form.resId = ''
+      this.resourceStores = []
+
+      if (val === 'custom') {
         this.form.isCustom = true
         return
       }
-      
+
       this.form.isCustom = false
       try {
-        const data = await listResourceStoreTypes(this.form.rsId)
-        this.form.sonResourceStoreTypes = data
+        const params = {
+          page: 1,
+          row: 100,
+          parentId: val,
+          communityId: this.communityId
+        }
+        const { data } = await listResourceStoreTypes(params)
+        this.sonResourceStoreTypes = data
       } catch (error) {
-        console.error('获取子资源类型失败:', error)
-        this.$message.error('获取子资源类型失败')
+        console.error('加载二级分类失败:', error)
       }
     },
-    async choseGoods() {
-      if (!this.form.rstId) return
-      
+    async handleRstIdChange(val) {
+      this.form.resId = ''
+      this.resourceStores = []
+
       try {
         const params = {
+          page: 1,
+          row: 100,
           repairId: this.form.repairId,
-          rstId: this.form.rstId,
-          sign: this.form.sign
+          rstId: val,
+          resId: this.form.resId,
+          communityId: this.communityId,
+          chooseType: "repair",
+          flag: 1,
+          sign: this.form.sign,
+          giveType: 1
         }
-        const data = await listUserStorehouses(params)
-        this.form.resourceStores = data
+        const { data } = await listUserStorehouses(params)
+        this.resourceStores = data
       } catch (error) {
-        console.error('获取商品失败:', error)
-        this.$message.error('获取商品失败')
+        console.error('加载商品失败:', error)
       }
     },
-    chosePrice() {
-      const selected = this.form.resourceStores.find(item => item.resId === this.form.resId)
-      if (selected) {
-        this.form.selectedGoodsInfo = selected
-        if (selected.outLowPrice === selected.outHighPrice) {
-          this.form.price = selected.outLowPrice
-        } else {
-          this.form.price = ''
+    handleResIdChange(val) {
+      this.resourceStores.forEach(item => {
+        if (item.resId === val) {
+          this.form.selectedGoodsInfo = item
+          if (item.outLowPrice === item.outHighPrice) {
+            this.form.price = item.outLowPrice
+          } else {
+            this.form.price = ''
+          }
+          this.form.outLowPrice = item.outLowPrice
+          this.form.outHighPrice = item.outHighPrice
         }
-        this.form.outLowPrice = selected.outLowPrice
-        this.form.outHighPrice = selected.outHighPrice
+      })
+    },
+    handleQuantityChange(val) {
+      if (val < 1) {
+        this.form.useNumber = 1
       }
     },
-    confirmSelection() {
-      if (this.validateForm()) {
-        this.$emit('confirm', {
-          ...this.form.selectedGoodsInfo,
-          price: this.form.price,
-          useNumber: this.form.useNumber,
-          isCustom: this.form.isCustom,
-          customGoodsName: this.form.customGoodsName
-        })
-        this.closeDialog()
+    handleClose() {
+      this.resetForm()
+    },
+    resetForm() {
+      this.form = {
+        maintenanceType: '',
+        resourceStoreTypes: [],
+        sonResourceStoreTypes: [],
+        rsId: '',
+        rstId: '',
+        resId: '',
+        repairId: '',
+        selectedGoodsInfo: {},
+        resourceStores: [],
+        isCustom: false,
+        customGoodsName: '',
+        price: '',
+        outLowPrice: '',
+        outHighPrice: '',
+        useNumber: 1,
+        sign: ''
       }
     },
     validateForm() {
       if (this.form.isCustom) {
         if (!this.form.customGoodsName) {
-          this.$message.warning('请填写商品名')
+          this.$message.error(this.$t('chooseSingleResource.validate.goodsNameRequired'))
           return false
         }
         if (this.form.maintenanceType === '1001' && !this.form.price) {
-          this.$message.warning('请填写价格')
+          this.$message.error(this.$t('chooseSingleResource.validate.priceRequired'))
           return false
         }
       } else {
         if (!this.form.rsId) {
-          this.$message.warning('请选择商品类型')
+          this.$message.error(this.$t('chooseSingleResource.validate.goodsTypeRequired'))
           return false
         }
         if (!this.form.rstId) {
-          this.$message.warning('请选择二级分类')
+          this.$message.error(this.$t('chooseSingleResource.validate.subCategoryRequired'))
           return false
         }
         if (!this.form.resId) {
-          this.$message.warning('请选择商品')
+          this.$message.error(this.$t('chooseSingleResource.validate.goodsRequired'))
+          return false
+        }
+        if (this.form.maintenanceType === '1001' && !this.form.price) {
+          this.$message.error(this.$t('chooseSingleResource.validate.priceRequired'))
           return false
         }
       }
       return true
+    },
+    handleConfirm() {
+      if (!this.validateForm()) return
+
+      const selectedGoods = {
+        ...this.form.selectedGoodsInfo,
+        price: this.form.price,
+        useNumber: this.form.useNumber,
+        isCustom: this.form.isCustom,
+        customGoodsName: this.form.customGoodsName
+      }
+
+      if (this.form.isCustom) {
+        selectedGoods.rstName = this.$t('chooseSingleResource.custom')
+      }
+
+      this.$emit('choose-single-resource', selectedGoods)
+      this.dialogVisible = false
     }
   }
 }
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+.el-input-number {
+  width: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/work/deleteOwnerRepair.vue b/src/components/work/deleteOwnerRepair.vue
index 95fc126..51d85d3 100644
--- a/src/components/work/deleteOwnerRepair.vue
+++ b/src/components/work/deleteOwnerRepair.vue
@@ -22,8 +22,8 @@ export default {
     }
   },
   methods: {
-    open(repairId) {
-      this.repairId = repairId
+    open(_repair) {
+      this.repairId = _repair.repairId
       this.visible = true
     },
 
diff --git a/src/components/work/dispatchRepair.vue b/src/components/work/dispatchRepair.vue
index c22612d..9ba19dd 100644
--- a/src/components/work/dispatchRepair.vue
+++ b/src/components/work/dispatchRepair.vue
@@ -15,7 +15,7 @@
       <el-form-item :label="$t('repairPoolManage.operationSuggestions')" prop="context"
         :rules="[{ required: true, message: $t('repairPoolManage.operationSuggestions'), trigger: 'blur' }]">
         <el-input v-model="formData.context" type="textarea" :rows="4"
-          :placeholder="$t('repairPoolManage.processingOpinionsPlaceholder')" />
+          :placeholder="$t('repairPoolManage.operationSuggestions')" />
       </el-form-item>
     </el-form>
 
@@ -30,6 +30,7 @@
 import { dispatchRepair } from '@/api/work/repairPoolManageApi'
 import {listRepairTypeUsers} from '@/api/work/repairTypeUserApi'
 import { getCommunityId } from '@/api/community/communityApi'
+import { getUserId } from '@/api/user/userApi'  
 
 export default {
   name: 'DispatchRepair',
@@ -55,7 +56,8 @@ export default {
         ...this.formData,
         repairId: repair.repairId,
         repairType: repair.repairType,
-        action: repair.action || 'DISPATCH'
+        action: repair.action || 'DISPATCH',
+        currentUserId: getUserId()
       }
 
       if (repair.action === 'BACK') {
diff --git a/src/components/work/forceFinishRepair.vue b/src/components/work/forceFinishRepair.vue
index f6337a3..349c48d 100644
--- a/src/components/work/forceFinishRepair.vue
+++ b/src/components/work/forceFinishRepair.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('forceFinishRepair.title')" :visible.sync="visible" width="60%" @close="closeDialog">
+  <el-dialog :title="$t('forceFinishRepair.title')" :visible.sync="visible" width="40%" @close="closeDialog">
     <el-form label-width="120px">
       <el-form-item v-if="form.repairObjType !== '004'" :label="$t('forceFinishRepair.useMaterial')">
         <el-select v-model="form.maintenanceType" placeholder="请选择" style="width:100%">
@@ -64,7 +64,7 @@
       </template>
 
       <el-form-item :label="$t('forceFinishRepair.explanation')">
-        <el-input v-model="form.context" type="textarea" :placeholder="$t('forceFinishRepair.explanationPlaceholder')"
+        <el-input v-model="form.context" type="textarea" :placeholder="$t('forceFinishRepair.explanation')"
           :rows="4" />
       </el-form-item>
     </el-form>
@@ -80,9 +80,9 @@
 import {
   listResourceStoreTypes,
   listUserStorehouses,
-  repairForceFinish,
-  getDict
+  repairForceFinish
 } from '@/api/work/repairForceFinishManageApi'
+import { getDict } from '@/api/community/communityApi'
 
 export default {
   name: 'ForceFinishRepair',
diff --git a/src/components/work/repairDetailPhotos.vue b/src/components/work/repairDetailPhotos.vue
index b0cd235..cff8f4d 100644
--- a/src/components/work/repairDetailPhotos.vue
+++ b/src/components/work/repairDetailPhotos.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="margin-top">
+  <div class="margin-top text-left">
     <div v-if="photos.length > 0" class="row padding">
       <div class="text-title">{{ $t('repairDetail.orderPhotos') }}</div>
       <div v-for="(item, index) in photos" :key="index" class="form-group margin-left">
diff --git a/src/components/work/visitOwnerRepair.vue b/src/components/work/visitOwnerRepair.vue
index 9353b9b..ced824c 100644
--- a/src/components/work/visitOwnerRepair.vue
+++ b/src/components/work/visitOwnerRepair.vue
@@ -1,50 +1,20 @@
 <template>
-  <el-dialog
-    :title="$t('repairReturnVisit.visitTitle')"
-    :visible.sync="visible"
-    width="600px"
-    @close="resetForm"
-  >
-    <el-form
-      ref="visitForm"
-      :model="formData"
-      :rules="rules"
-      label-width="100px"
-      label-position="right"
-    >
-      <el-form-item
-        :label="$t('repairReturnVisit.satisfaction')"
-        prop="visitType"
-      >
-        <el-select
-          v-model="formData.visitType"
-          :placeholder="$t('repairReturnVisit.satisfactionPlaceholder')"
-          style="width:100%"
-        >
-          <el-option
-            :label="$t('repairReturnVisit.satisfied')"
-            value="1001"
-          />
-          <el-option
-            :label="$t('repairReturnVisit.unsatisfied')"
-            value="2002"
-          />
+  <el-dialog :title="$t('repairReturnVisit.visitTitle')" :visible.sync="visible" width="600px" @close="resetForm">
+    <el-form ref="visitForm" :model="formData" :rules="rules" label-width="100px" label-position="right">
+      <el-form-item :label="$t('repairReturnVisit.satisfaction')" prop="visitType">
+        <el-select v-model="formData.visitType" :placeholder="$t('repairReturnVisit.satisfaction')"
+          style="width:100%">
+          <el-option :label="$t('repairReturnVisit.satisfied')" value="1001" />
+          <el-option :label="$t('repairReturnVisit.unsatisfied')" value="2002" />
         </el-select>
       </el-form-item>
-      
-      <el-form-item
-        :label="$t('repairReturnVisit.visitContent')"
-        prop="context"
-      >
-        <el-input
-          v-model="formData.context"
-          type="textarea"
-          :rows="4"
-          :placeholder="$t('repairReturnVisit.visitContentPlaceholder')"
-        />
+
+      <el-form-item :label="$t('repairReturnVisit.visitContent')" prop="context">
+        <el-input v-model="formData.context" type="textarea" :rows="4"
+          :placeholder="$t('repairReturnVisit.visitContent')" />
       </el-form-item>
     </el-form>
-    
+
     <div slot="footer" class="dialog-footer">
       <el-button @click="visible = false">
         {{ $t('common.cancel') }}
diff --git a/src/i18n/workI18n.js b/src/i18n/workI18n.js
index 88a511b..74b3530 100644
--- a/src/i18n/workI18n.js
+++ b/src/i18n/workI18n.js
@@ -4,6 +4,8 @@ import { messages as itemReleaseManageMessages } from '../views/work/itemRelease
 import { messages as addItemReleaseViewMessages } from '../views/work/addItemReleaseViewLang'
 import { messages as editItemReleaseViewMessages } from '../views/work/editItemReleaseViewLang'
 import { messages as itemReleaseDetailMessages } from '../views/work/itemReleaseDetailLang'
+import { messages as printRepairDetailMessages } from '../views/work/printRepairDetailLang'
+import { messages as finishRepairMessages } from '../views/work/finishRepairLang'
 export const messages = {
     zh: {
         ...itemReleaseTypeManageMessages.zh,
@@ -11,6 +13,8 @@ export const messages = {
         ...addItemReleaseViewMessages.zh,
         ...editItemReleaseViewMessages.zh,
         ...itemReleaseDetailMessages.zh,
+        ...printRepairDetailMessages.zh,
+        ...finishRepairMessages.zh,
     },
     en: {
         ...itemReleaseTypeManageMessages.en,
@@ -18,5 +22,7 @@ export const messages = {
         ...addItemReleaseViewMessages.en,
         ...editItemReleaseViewMessages.en,
         ...itemReleaseDetailMessages.en,
+        ...printRepairDetailMessages.en,
+        ...finishRepairMessages.en,
     }
 }
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 47ed122..ffc8cf9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -704,6 +704,11 @@ const routes = [
     name:'/pages/property/printSmallAccountReceipt',
     component: () => import('@/views/account/printSmallAccountReceiptList.vue')
     },
+    {
+      path:'/pages/property/printRepairDetail',
+      name:'/pages/property/printRepairDetail',
+      component: () => import('@/views/work/printRepairDetailList.vue')
+      },
 ]
 
 const router = new VueRouter({
diff --git a/src/router/workRouter.js b/src/router/workRouter.js
index 6df33a7..ddaa388 100644
--- a/src/router/workRouter.js
+++ b/src/router/workRouter.js
@@ -24,4 +24,9 @@ export default [
         name: '/views/work/itemReleaseDetail',
         component: () => import('@/views/work/itemReleaseDetailList.vue')
     },
+    {
+        path:'/views/work/finishRepair',
+        name:'/views/work/finishRepair',
+        component: () => import('@/views/work/finishRepairList.vue')
+        },
 ]
\ No newline at end of file
diff --git a/src/views/role/roleList.vue b/src/views/role/roleList.vue
index 48be5e0..94ec51a 100644
--- a/src/views/role/roleList.vue
+++ b/src/views/role/roleList.vue
@@ -12,9 +12,9 @@
             <el-button :type="activeTab === 'privilege' ? 'primary' : ''" @click="changeTab('privilege')">
               {{ $t('role.privilege') }}
             </el-button>
-            <el-button :type="activeTab === 'community' ? 'primary' : ''" @click="changeTab('community')">
+            <!-- <el-button :type="activeTab === 'community' ? 'primary' : ''" @click="changeTab('community')">
               {{ $t('role.community') }}
-            </el-button>
+            </el-button> -->
             <el-button :type="activeTab === 'staff' ? 'primary' : ''" @click="changeTab('staff')">
               {{ $t('role.staff') }}
             </el-button>
@@ -36,11 +36,11 @@
     </el-row>
   </div>
 </template>
-  
+
 <script>
 import RoleDiv from '@/components/role/RoleDiv'
 import PrivilegeTree from '@/components/role/PrivilegeTree'
-import RoleCommunity from '@/components/role/RoleCommunity'
+// import RoleCommunity from '@/components/role/RoleCommunity'
 import RoleStaff from '@/components/role/RoleStaff'
 
 export default {
@@ -48,7 +48,7 @@ export default {
   components: {
     RoleDiv,
     PrivilegeTree,
-    RoleCommunity,
+   // RoleCommunity,
     RoleStaff
   },
   data() {
@@ -70,7 +70,7 @@ export default {
   }
 }
 </script>
-  
+
 <style lang="scss" scoped>
 .role-container {
 
@@ -113,9 +113,10 @@ export default {
     .role-menu {
       text-align: left;
       margin-left: 15px;
+
       .el-button {
         margin-top: 15px;
-       
+
       }
     }
   }
diff --git a/src/views/work/finishRepairLang.js b/src/views/work/finishRepairLang.js
new file mode 100644
index 0000000..6ce66b4
--- /dev/null
+++ b/src/views/work/finishRepairLang.js
@@ -0,0 +1,124 @@
+export const messages = {
+  en: {
+    finishRepair: {
+      title: 'Repair Completion',
+      materialUsage: 'Material Usage',
+      selectMaterialUsage: 'Please select material usage',
+      repairType: 'Repair Type',
+      selectRepairType: 'Please select repair type',
+      selectGoods: 'Select Goods',
+      usedGoods: 'Used Goods',
+      category: 'Category',
+      goods: 'Goods',
+      price: 'Price',
+      quantity: 'Quantity',
+      unit: 'Unit',
+      spec: 'Spec',
+      operation: 'Operation',
+      totalAmount: 'Total Amount',
+      paymentMethod: 'Payment Method',
+      selectPaymentMethod: 'Please select payment method',
+      suggestion: 'Suggestion',
+      inputSuggestion: 'Required, please input suggestion',
+      beforeRepairPhoto: 'Before Repair Photo',
+      afterRepairPhoto: 'After Repair Photo',
+      validate: {
+        repairIdRequired: 'Repair ID is required',
+        maintenanceTypeRequired: 'Maintenance type is required',
+        contextRequired: 'Suggestion is required',
+        beforePhotoRequired: 'Before repair photo is required',
+        afterPhotoRequired: 'After repair photo is required',
+        goodsRequired: 'Please select goods',
+        paymentMethodRequired: 'Payment method is required'
+      },
+      submitSuccess: 'Submit successfully',
+      submitError: 'Submit failed'
+    },
+    chooseSingleResource: {
+      title: 'Select Item',
+      goodsType: 'Goods Type',
+      selectGoodsType: 'Please select goods type',
+      goodsName: 'Goods Name',
+      inputGoodsName: 'Required, please input goods name',
+      subCategory: 'Sub Category',
+      selectSubCategory: 'Please select sub category',
+      goods: 'Goods',
+      selectGoods: 'Please select goods',
+      goodsPrice: 'Goods Price',
+      customPrice: 'Custom Price',
+      inputPrice: 'Required, please input price',
+      priceRange: 'Price Range',
+      spec: 'Spec',
+      quantity: 'Quantity',
+      custom: 'Custom',
+      validate: {
+        goodsTypeRequired: 'Goods type is required',
+        subCategoryRequired: 'Sub category is required',
+        goodsRequired: 'Goods is required',
+        priceRequired: 'Price is required',
+        goodsNameRequired: 'Goods name is required'
+      }
+    }
+  },
+  zh: {
+    finishRepair: {
+      title: '报修结单',
+      materialUsage: '是否用料',
+      selectMaterialUsage: '请选择是否用料',
+      repairType: '维修类型',
+      selectRepairType: '请选择维修类型',
+      selectGoods: '选择商品',
+      usedGoods: '使用商品',
+      category: '分类',
+      goods: '商品',
+      price: '价格',
+      quantity: '数量',
+      unit: '单位',
+      spec: '规格',
+      operation: '操作',
+      totalAmount: '商品总金额',
+      paymentMethod: '支付方式',
+      selectPaymentMethod: '请选择支付方式',
+      suggestion: '处理意见',
+      inputSuggestion: '必填，请填写处理意见',
+      beforeRepairPhoto: '维修前图片',
+      afterRepairPhoto: '维修后图片',
+      validate: {
+        repairIdRequired: '报修单不能为空',
+        maintenanceTypeRequired: '维修类型不能为空',
+        contextRequired: '处理意见不能为空',
+        beforePhotoRequired: '维修前图片不能为空',
+        afterPhotoRequired: '维修后图片不能为空',
+        goodsRequired: '请选择商品',
+        paymentMethodRequired: '请选择支付方式'
+      },
+      submitSuccess: '提交成功',
+      submitError: '提交失败'
+    },
+    chooseSingleResource: {
+      title: '选择物品',
+      goodsType: '商品类型',
+      selectGoodsType: '请选择商品类型',
+      goodsName: '商品名',
+      inputGoodsName: '必填，请填写商品名',
+      subCategory: '二级分类',
+      selectSubCategory: '请选择二级类型',
+      goods: '商品',
+      selectGoods: '请选择商品',
+      goodsPrice: '商品价格',
+      customPrice: '自定义价格',
+      inputPrice: '必填，请填写自定义价格',
+      priceRange: '价格范围',
+      spec: '规格',
+      quantity: '商品数量',
+      custom: '自定义',
+      validate: {
+        goodsTypeRequired: '商品类型不能为空',
+        subCategoryRequired: '二级分类不能为空',
+        goodsRequired: '商品不能为空',
+        priceRequired: '商品价格不能为空',
+        goodsNameRequired: '商品名不能为空'
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/views/work/finishRepairList.vue b/src/views/work/finishRepairList.vue
new file mode 100644
index 0000000..8f2d47b
--- /dev/null
+++ b/src/views/work/finishRepairList.vue
@@ -0,0 +1,275 @@
+<template>
+  <div class="finish-repair-container">
+    <el-card class="box-card">
+      <div slot="header" class="flex justify-between">
+        <span>{{ $t('finishRepair.title') }}</span>
+      </div>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <div class="form-wrapper">
+            <el-form label-width="120px">
+              <el-form-item :label="$t('finishRepair.materialUsage')" v-if="finishRepairInfo.repairObjType != '004'">
+                <el-select v-model="finishRepairInfo.maintenanceType"
+                  :placeholder="$t('finishRepair.selectMaterialUsage')" style="width:100%">
+                  <template v-for="(item, index) in finishRepairInfo.maintenanceTypes">
+                    <el-option :key="index" :label="item.name" :value="item.statusCd"
+                      v-if="item.statusCd != '1001' && item.statusCd != '1002'">
+                    </el-option>
+                  </template>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item :label="$t('finishRepair.repairType')" v-if="finishRepairInfo.repairObjType == '004'">
+                <el-select v-model="finishRepairInfo.maintenanceType" :placeholder="$t('finishRepair.selectRepairType')"
+                  style="width:100%">
+                  <template v-for="(item, index) in finishRepairInfo.maintenanceTypes">
+                    <el-option :key="index" :label="item.name" :value="item.statusCd"
+                      v-if="item.statusCd != '1003' && item.statusCd != '1004'">
+                    </el-option>
+                  </template>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item
+                v-if="finishRepairInfo.maintenanceType == '1001' || finishRepairInfo.maintenanceType == '1003'">
+                <el-button type="primary" @click="openChooseSingleResourceModel">
+                  <i class="el-icon-plus"></i>{{ $t('finishRepair.selectGoods') }}
+                </el-button>
+              </el-form-item>
+
+              <!-- 商品列表展示 -->
+              <div
+                v-if="(finishRepairInfo.maintenanceType == '1001' || finishRepairInfo.maintenanceType == '1003') && finishRepairInfo.choosedGoodsList.length > 0">
+                <el-form-item :label="$t('finishRepair.usedGoods')">
+                  <el-table :data="finishRepairInfo.choosedGoodsList" border>
+                    <el-table-column prop="rstName" :label="$t('finishRepair.category')" width="120"></el-table-column>
+                    <el-table-column prop="resName" :label="$t('finishRepair.goods')" width="120"></el-table-column>
+                    <el-table-column prop="price" :label="$t('finishRepair.price')" width="120"
+                      v-if="finishRepairInfo.maintenanceType == '1001'">
+                      <template slot-scope="scope">
+                        <el-input-number v-model="scope.row.price"
+                          :disabled="!scope.row.isCustom && scope.row.outHighPrice == scope.row.outLowPrice"
+                          @change="updateTotalPrice" :min="scope.row.outLowPrice" :max="scope.row.outHighPrice">
+                        </el-input-number>
+                        <span v-if="!scope.row.isCustom && scope.row.outHighPrice != scope.row.outLowPrice">
+                          ({{ scope.row.outLowPrice }} - {{ scope.row.outHighPrice }})
+                        </span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column :label="$t('finishRepair.quantity')" width="150">
+                      <template slot-scope="scope">
+                        <el-input-number v-model="scope.row.useNumber" @change="updateTotalPrice" :min="1">
+                        </el-input-number>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="miniUnitCodeName" :label="$t('finishRepair.unit')"
+                      width="80"></el-table-column>
+                    <el-table-column prop="specName" :label="$t('finishRepair.spec')" width="80"></el-table-column>
+                    <el-table-column :label="$t('finishRepair.operation')" width="120">
+                      <template slot-scope="scope">
+                        <el-button type="danger" size="mini" @click="removeChoosedGoodsItem(scope.$index)">
+                          <i class="el-icon-delete"></i>{{ $t('common.remove') }}
+                        </el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-form-item>
+              </div>
+
+              <el-form-item :label="$t('finishRepair.totalAmount')" v-if="finishRepairInfo.maintenanceType == '1001'">
+                <el-input v-model="finishRepairInfo.totalPrice" disabled></el-input>
+              </el-form-item>
+
+              <el-form-item :label="$t('finishRepair.paymentMethod')" v-if="finishRepairInfo.maintenanceType == '1001'">
+                <el-select v-model="finishRepairInfo.payType" :placeholder="$t('finishRepair.selectPaymentMethod')"
+                  style="width:100%">
+                  <el-option v-for="(item, index) in finishRepairInfo.payTypes" :key="index" :label="item.name"
+                    :value="item.statusCd">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item :label="$t('finishRepair.suggestion')">
+                <el-input type="textarea" :rows="4" :placeholder="$t('finishRepair.inputSuggestion')"
+                  v-model="finishRepairInfo.context">
+                </el-input>
+              </el-form-item>
+
+              <el-form-item :label="$t('finishRepair.beforeRepairPhoto')">
+                <upload-image-url ref="beforeRepairUpload" @notifyUploadCoverImage="handleBeforeRepairImage">
+                </upload-image-url>
+              </el-form-item>
+
+              <el-form-item :label="$t('finishRepair.afterRepairPhoto')">
+                <upload-image-url ref="afterRepairUpload" @notifyUploadCoverImage="handleAfterRepairImage">
+                </upload-image-url>
+              </el-form-item>
+
+              <el-form-item>
+                <el-button type="primary" @click="submitFinishRepair">{{ $t('common.submit') }}</el-button>
+                <el-button @click="backToList">{{ $t('common.back') }}</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-col>
+      </el-row>
+    </el-card>
+
+    <choose-single-resource ref="chooseSingleResource"></choose-single-resource>
+  </div>
+</template>
+
+<script>
+import { getDict } from '@/api/community/communityApi'
+import { getCommunityId } from '@/api/community/communityApi'
+import { repairFinish } from '@/api/work/finishRepairApi'
+import UploadImageUrl from '@/components/upload/UploadImageUrl'
+import ChooseSingleResource from '@/components/work/chooseSingleResource'
+
+export default {
+  name: 'FinishRepairList',
+  components: {
+    UploadImageUrl,
+    ChooseSingleResource
+  },
+  data() {
+    return {
+      finishRepairInfo: {
+        repairId: '',
+        repairType: '',
+        context: '',
+        feeFlag: '200',
+        repairObjType: '',
+        publicArea: '',
+        repairChannel: '',
+        maintenanceTypes: [],
+        maintenanceType: '',
+        totalPrice: 0,
+        choosedGoodsList: [],
+        beforeRepairPhotos: [],
+        afterRepairPhotos: [],
+        payTypes: [],
+        payType: ''
+      },
+      communityId: ''
+    }
+  },
+  created() {
+    this.communityId = getCommunityId()
+    this.initData()
+  },
+  methods: {
+    async initData() {
+      this.finishRepairInfo.repairType = this.$route.query.repairType
+      this.finishRepairInfo.repairId = this.$route.query.repairId
+      this.finishRepairInfo.repairObjType = this.$route.query.repairObjType
+      this.finishRepairInfo.publicArea = this.$route.query.publicArea
+      this.finishRepairInfo.repairChannel = this.$route.query.repairChannel
+
+      try {
+        const maintenanceTypes = await getDict('r_repair_pool', 'maintenance_type')
+        this.finishRepairInfo.maintenanceTypes = maintenanceTypes
+
+        const payTypes = await getDict('r_repair_pool', 'pay_type')
+        this.finishRepairInfo.payTypes = payTypes
+      } catch (error) {
+        console.error('获取字典数据失败:', error)
+      }
+    },
+    openChooseSingleResourceModel() {
+      this.$refs.chooseSingleResource.open({
+        maintenanceType: this.finishRepairInfo.maintenanceType
+      })
+    },
+    handleBeforeRepairImage(photos) {
+      this.finishRepairInfo.beforeRepairPhotos = photos.map(item => ({
+        photo: item
+      }))
+    },
+    handleAfterRepairImage(photos) {
+      this.finishRepairInfo.afterRepairPhotos = photos.map(item => ({
+        photo: item
+      }))
+    },
+    removeChoosedGoodsItem(index) {
+      this.finishRepairInfo.choosedGoodsList.splice(index, 1)
+      this.updateTotalPrice()
+    },
+    updateTotalPrice() {
+      let totalPrice = 0
+      this.finishRepairInfo.choosedGoodsList.forEach(item => {
+        totalPrice += item.price * item.useNumber
+      })
+      this.finishRepairInfo.totalPrice = totalPrice.toFixed(2)
+    },
+    validateForm() {
+      if (!this.finishRepairInfo.repairId) {
+        this.$message.error(this.$t('finishRepair.validate.repairIdRequired'))
+        return false
+      }
+      if (!this.finishRepairInfo.maintenanceType) {
+        this.$message.error(this.$t('finishRepair.validate.maintenanceTypeRequired'))
+        return false
+      }
+      if (!this.finishRepairInfo.context) {
+        this.$message.error(this.$t('finishRepair.validate.contextRequired'))
+        return false
+      }
+      if (this.finishRepairInfo.beforeRepairPhotos.length === 0) {
+        this.$message.error(this.$t('finishRepair.validate.beforePhotoRequired'))
+        return false
+      }
+      if (this.finishRepairInfo.afterRepairPhotos.length === 0) {
+        this.$message.error(this.$t('finishRepair.validate.afterPhotoRequired'))
+        return false
+      }
+      if ((this.finishRepairInfo.maintenanceType === '1001' || this.finishRepairInfo.maintenanceType === '1003') &&
+        this.finishRepairInfo.choosedGoodsList.length === 0) {
+        this.$message.error(this.$t('finishRepair.validate.goodsRequired'))
+        return false
+      }
+      if (this.finishRepairInfo.maintenanceType === '1001' && !this.finishRepairInfo.payType) {
+        this.$message.error(this.$t('finishRepair.validate.paymentMethodRequired'))
+        return false
+      }
+      return true
+    },
+    async submitFinishRepair() {
+      if (!this.validateForm()) return
+
+      try {
+        const params = {
+          ...this.finishRepairInfo,
+          communityId: this.communityId
+        }
+        const res = await repairFinish(params)
+        if (res.code === 0) {
+          this.$message.success(this.$t('finishRepair.submitSuccess'))
+          this.backToList()
+        } else {
+          this.$message.error(res.msg)
+        }
+      } catch (error) {
+        this.$message.error(this.$t('finishRepair.submitError'))
+      }
+    },
+    backToList() {
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.finish-repair-container {
+  padding: 20px;
+}
+
+.box-card {
+  margin-bottom: 20px;
+}
+
+.form-wrapper {
+  padding: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/work/ownerRepairManageList.vue b/src/views/work/ownerRepairManageList.vue
index b00a6de..52b5da9 100644
--- a/src/views/work/ownerRepairManageList.vue
+++ b/src/views/work/ownerRepairManageList.vue
@@ -70,7 +70,8 @@
           <template slot-scope="scope">
             <el-button
               v-if="hasPrivilege('502021012067300023') && (scope.row.state == '1000' || scope.row.state == '1200')"
-              size="mini" type="primary" @click="_openEditOwnerRepairModel(scope.row)">{{ $t('common.edit') }}</el-button>
+              size="mini" type="primary" @click="_openEditOwnerRepairModel(scope.row)">{{ $t('common.edit')
+              }}</el-button>
             <el-button
               v-if="hasPrivilege('502021012051410024') && (scope.row.state == '1000' || scope.row.state == '1200')"
               size="mini" type="danger" @click="_openDeleteOwnerRepairModel(scope.row)">{{ $t('common.delete')
@@ -81,7 +82,7 @@
       <!-- 分页 -->
       <div style="margin-top: 20px">
         <el-row>
-          <el-col :span="18" class="text-left">
+          <el-col :span="18" class="text-left table-desc">
             <div>
               {{ $t('ownerRepairManage.tip1') }}
             </div>
diff --git a/src/views/work/printRepairDetailLang.js b/src/views/work/printRepairDetailLang.js
new file mode 100644
index 0000000..4c2ccd8
--- /dev/null
+++ b/src/views/work/printRepairDetailLang.js
@@ -0,0 +1,58 @@
+export const messages = {
+  en: {
+    printRepairDetail: {
+      repairId: 'Repair ID:',
+      printTime: 'Print Time:',
+      repairInfo: 'Repair Information',
+      repairName: 'Repairer:',
+      tel: 'Contact Number:',
+      location: 'Location:',
+      context: 'Repair Content:',
+      maintenanceType: 'Repair Type:',
+      paidService: 'Paid Service',
+      freeService: 'Free Service',
+      repairMaterials: 'Repair Materials:',
+      repairFee: 'Cost Details:',
+      yuan: 'Yuan',
+      workflow: 'Work Order Flow',
+      serialNumber: 'No.',
+      handler: 'Handler',
+      status: 'Status',
+      processTime: 'Process Time',
+      timeConsuming: 'Time Consuming',
+      comment: 'Comment',
+      remark: 'Remark',
+      repairerSign: 'Repairer Signature',
+      customerSign: 'Customer Signature',
+      time: 'Time'
+    }
+  },
+  zh: {
+    printRepairDetail: {
+      repairId: '报修单号：',
+      printTime: '打印时间：',
+      repairInfo: '报修信息',
+      repairName: '报修人：',
+      tel: '联系电话：',
+      location: '位置：',
+      context: '报修内容：',
+      maintenanceType: '报修类型：',
+      paidService: '有偿服务',
+      freeService: '无偿服务',
+      repairMaterials: '报修用料：',
+      repairFee: '费用明细：',
+      yuan: '元',
+      workflow: '工单流转',
+      serialNumber: '序号',
+      handler: '处理人',
+      status: '状态',
+      processTime: '处理时间',
+      timeConsuming: '耗时',
+      comment: '意见',
+      remark: '备注',
+      repairerSign: '维修人员签字',
+      customerSign: '客户签字',
+      time: '时间'
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/views/work/printRepairDetailList.vue b/src/views/work/printRepairDetailList.vue
new file mode 100644
index 0000000..46b2190
--- /dev/null
+++ b/src/views/work/printRepairDetailList.vue
@@ -0,0 +1,194 @@
+<template>
+  <div class="print-repair-detail-container">
+      <el-row :gutter="20" style="width:100%">
+        <el-col :span="8">
+          <span>{{ $t('printRepairDetail.repairId') }}</span>{{ printRepairDetailInfo.repairId }}
+        </el-col>
+        <el-col :span="8">
+          <span></span>
+        </el-col>
+        <el-col :span="8">
+          <span>{{ $t('printRepairDetail.printTime') }}</span>{{ nowTime }}
+        </el-col>
+      </el-row>
+
+      <table border="1" class="margin-top" style="margin-bottom: 0;width:100%; border-collapse: collapse;">
+        <thead>
+          <tr>
+            <th colspan="6" style="text-align: center;">{{ $t('printRepairDetail.repairInfo') }}</th>
+          </tr>
+          <tr>
+            <th>{{ $t('printRepairDetail.repairName') }}</th>
+            <th>{{ $t('printRepairDetail.tel') }}</th>
+            <th>{{ $t('printRepairDetail.location') }}</th>
+            <th>{{ $t('printRepairDetail.context') }}</th>
+            <th v-if="printRepairDetailInfo.maintenanceType">{{ $t('printRepairDetail.maintenanceType') }}</th>
+            <th v-if="printRepairDetailInfo.maintenanceType === '1001'">{{ $t('printRepairDetail.repairMaterials') }}</th>
+            <th v-if="printRepairDetailInfo.maintenanceType === '1001'" colspan="3">{{ $t('printRepairDetail.repairFee') }}</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td>{{ printRepairDetailInfo.repairName }}</td>
+            <td>{{ printRepairDetailInfo.tel }}</td>
+            <td>{{ printRepairDetailInfo.location }}</td>
+            <td>{{ printRepairDetailInfo.context }}</td>
+            <td v-if="printRepairDetailInfo.maintenanceType">{{ printRepairDetailInfo.maintenanceType }}</td>
+            <td v-if="printRepairDetailInfo.maintenanceType === '1001'">{{ printRepairDetailInfo.repairMaterials }}</td>
+            <td v-if="printRepairDetailInfo.maintenanceType === '1001'" colspan="3">{{ printRepairDetailInfo.repairFee }}</td>
+          </tr>
+        </tbody>
+      </table>
+
+      <table border="1" style="width:100%; border-collapse: collapse;">
+        <thead>
+          <tr>
+            <th colspan="6" style="text-align: center;">{{ $t('printRepairDetail.workflow') }}</th>
+          </tr>
+          <tr>
+            <th style="text-align: center;">{{ $t('printRepairDetail.serialNumber') }}</th>
+            <th style="text-align: center;">{{ $t('printRepairDetail.handler') }}</th>
+            <th style="text-align: center;">{{ $t('printRepairDetail.status') }}</th>
+            <th style="text-align: center;">{{ $t('printRepairDetail.processTime') }}</th>
+            <th style="text-align: center;">{{ $t('printRepairDetail.timeConsuming') }}</th>
+            <th style="text-align: center;">{{ $t('printRepairDetail.comment') }}</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="(item, index) in printRepairDetailInfo.repairUsers" :key="index">
+            <td style="text-align: center;">{{ index + 1 }}</td>
+            <td style="text-align: center;">{{ item.staffName }}</td>
+            <td style="text-align: center;">{{ item.stateName }}</td>
+            <td style="text-align: center;">{{ item.startTime }}</td>
+            <td style="text-align: center;">{{ item.duration }}</td>
+            <td style="text-align: center;">{{ item.context }}</td>
+          </tr>
+          <tr>
+            <td colspan="6">{{ printRepairDetailInfo.description }}</td>
+          </tr>
+          <tr>
+            <td colspan="2" style="height:60px; text-align: center;">{{ $t('printRepairDetail.repairerSign') }}</td>
+            <td colspan="2" style="height:60px; text-align: center;">{{ $t('printRepairDetail.customerSign') }}</td>
+          </tr>
+        </tbody>
+      </table>
+
+      <div id="print-btn" style="margin-top:20px">
+        <el-button type="primary" class="float-right" @click="_printPurchaseApplyDiv">
+          {{ $t('common.print') }}
+        </el-button>
+        <el-button type="warning" class="float-right" style="margin-right:20px" @click="_closePage">
+          {{ $t('common.cancel') }}
+        </el-button>
+      </div>
+  </div>
+</template>
+
+<script>
+import { getCommunityId } from '@/api/community/communityApi'
+import { listOwnerRepairs, listRepairStaffs } from '@/api/work/printRepairDetailApi'
+
+export default {
+  name: 'PrintRepairDetailList',
+  data() {
+    return {
+      printRepairDetailInfo: {
+        repairId: '',
+        repairTypeName: '',
+        appointmentTime: '',
+        repairName: '',
+        tel: '',
+        repairObjName: '',
+        context: '',
+        repairUsers: [],
+        maintenanceType: '',
+        repairMaterials: '',
+        repairFee: '',
+        description: ''
+      },
+      printFlag: '0',
+      nowTime: '',
+      communityId: ''
+    }
+  },
+  created() {
+    this.communityId = getCommunityId()
+    this._initPrintRepairDetailDateInfo()
+    const myDate = new Date()
+    this.nowTime = myDate.toLocaleDateString()
+  },
+  methods: {
+    _initPrintRepairDetailDateInfo() {
+      const _repairId = this.$route.query.repairId
+      const _repairType = this.$route.query.repairType
+      const param = {
+        page: 1,
+        row: 1,
+        repairId: _repairId,
+        communityId: this.communityId,
+        repairType: _repairType
+      }
+
+      listOwnerRepairs(param)
+        .then(response => {
+          const _repairDetailInfo = response.data[0]
+          Object.assign(this.printRepairDetailInfo, _repairDetailInfo)
+          this._loadRepairUser()
+        })
+        .catch(error => {
+          console.error('请求失败处理:', error)
+        })
+    },
+    _loadRepairUser() {
+      const param = {
+        page: 1,
+        row: 100,
+        communityId: this.communityId,
+        repairId: this.printRepairDetailInfo.repairId
+      }
+
+      listRepairStaffs(param)
+        .then(response => {
+          this.printRepairDetailInfo.repairUsers = response.data
+        })
+        .catch(error => {
+          console.error('请求失败处理:', error)
+        })
+    },
+    _printPurchaseApplyDiv() {
+      this.printFlag = '1'
+      document.getElementById('print-btn').style.display = 'none'
+      window.print()
+      window.opener = null
+      window.close()
+    },
+    _closePage() {
+      window.opener = null
+      window.close()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.print-repair-detail-container {
+  padding: 20px;
+
+  .margin-top {
+    margin-top: 20px;
+  }
+
+  .float-right {
+    float: right;
+  }
+
+  table {
+    width: 100%;
+    border: 1px solid #ebeef5;
+    th, td {
+      padding: 12px 0;
+      border: 1px solid #ebeef5;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/work/repairDetailLang.js b/src/views/work/repairDetailLang.js
index 5449911..7b96b85 100644
--- a/src/views/work/repairDetailLang.js
+++ b/src/views/work/repairDetailLang.js
@@ -33,7 +33,9 @@ export const messages = {
       paidService: 'Paid Service',
       freeService: 'Free Service',
       needMaterials: 'Need Materials',
-      noMaterials: 'No Materials'
+      noMaterials: 'No Materials',
+      beforeRepairPhotos: 'Before Repair Photos',
+      afterRepairPhotos: 'After Repair Photos'
     },
     repairDetailResource: {
       itemCode: 'Item Code',
@@ -103,7 +105,9 @@ export const messages = {
       paidService: '有偿服务',
       freeService: '无偿服务',
       needMaterials: '需要用料',
-      noMaterials: '无需用料'
+      noMaterials: '无需用料',
+      beforeRepairPhotos: '维修前照片',
+      afterRepairPhotos: '维修后照片'
     },
     repairDetailResource: {
       itemCode: '物品资源编号',
diff --git a/src/views/work/repairDetailList.vue b/src/views/work/repairDetailList.vue
index 3d02790..f210629 100644
--- a/src/views/work/repairDetailList.vue
+++ b/src/views/work/repairDetailList.vue
@@ -1,5 +1,6 @@
 <template>
-  <el-card class="repair-detail-container">
+  <div class="repair-detail-container padding">
+  <el-card class="">
     <div class="flex justify-between">
       <div class="text-title">{{ $t('repairDetail.title') }}</div>
       <div>
@@ -182,6 +183,7 @@
     <view-image ref="viewImage"></view-image>
     <reply-repair-appraise ref="replyAppraise"></reply-repair-appraise>
   </el-card>
+</div>
 </template>
 
 <script>
@@ -256,7 +258,7 @@ export default {
       this.$router.go(-1)
     },
     printRepairDetail() {
-      window.open(`/print.html#/pages/property/printRepairDetail?repairId=${this.repairDetailInfo.repairId}&repairType=${this.repairDetailInfo.repairType}`)
+      window.open(`/pages/property/printRepairDetail?repairId=${this.repairDetailInfo.repairId}&repairType=${this.repairDetailInfo.repairType}`)
     },
     changeTab(tab) {
       this.currentTab = tab
diff --git a/src/views/work/repairDispatchManageList.vue b/src/views/work/repairDispatchManageList.vue
index d96b646..384a905 100644
--- a/src/views/work/repairDispatchManageList.vue
+++ b/src/views/work/repairDispatchManageList.vue
@@ -98,7 +98,7 @@
                       {{ $t('repairDispatchManage.complete') }}
                     </el-button>
                     <el-button
-                      v-if="$store.getters.hasPrivilege('502021040151320003') && scope.row.state == '1800' && scope.row.returnVisitFlag == '003' && scope.row.state != '2001'"
+                      v-if="hasPrivilege('502021040151320003') && scope.row.state == '1800' && scope.row.returnVisitFlag == '003' && scope.row.state != '2001'"
                       size="mini" @click="_openAppraiseRepair(scope.row)">
                       {{ $t('repairDispatchManage.returnVisit') }}
                     </el-button>
@@ -245,7 +245,7 @@ export default {
     },
     _openFinishRepair(row) {
       this.$router.push({
-        path: '/property/finishRepair',
+        path: '/views/work/finishRepair',
         query: {
           repairType: row.repairType,
           repairId: row.repairId,
@@ -257,7 +257,7 @@ export default {
     },
     _openDispatchRepairDetail(row) {
       this.$router.push({
-        path: '/property/ownerRepairDetail',
+        path: '/views/work/repairDetail',
         query: { repairId: row.repairId }
       })
     },
diff --git a/src/views/work/repairPoolManageList.vue b/src/views/work/repairPoolManageList.vue
index ac9a826..a80fd65 100644
--- a/src/views/work/repairPoolManageList.vue
+++ b/src/views/work/repairPoolManageList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container padding">
     <el-row :gutter="20">
       <!-- 左侧状态栏 -->
       <el-col :span="3">
@@ -82,7 +82,7 @@
                     :placeholder="$t('repairPoolManage.endTime')" value-format="yyyy-MM-dd HH:mm:ss" />
                 </el-form-item>
               </el-col>
-              <el-col :span="4" >
+              <el-col :span="4">
                 <el-button type="primary" @click="queryRepairPool">{{ $t('repairPoolManage.search') }}</el-button>
                 <el-button @click="resetRepairPool">{{ $t('repairPoolManage.reset') }}</el-button>
               </el-col>
@@ -192,7 +192,7 @@ import DispatchRepair from '@/components/work/dispatchRepair'
 import EndRepair from '@/components/work/endRepair'
 import EditOwnerRepair from '@/components/work/editOwnerRepair'
 import DeleteOwnerRepair from '@/components/work/deleteOwnerRepair'
-import {listRepairSettings} from '@/api/work/ownerRepairManageApi'
+import { listRepairSettings } from '@/api/work/ownerRepairManageApi'
 
 export default {
   name: 'RepairPoolManage',
diff --git a/src/views/work/repairReturnVisitLang.js b/src/views/work/repairReturnVisitLang.js
index 095ef44..16c3f0b 100644
--- a/src/views/work/repairReturnVisitLang.js
+++ b/src/views/work/repairReturnVisitLang.js
@@ -18,7 +18,11 @@ export const messages = {
       telPlaceholder: 'Please enter repair phone',
       statePlaceholder: 'Please select visit status',
       waiting: 'Pending Visit',
-      finish: 'Visited'
+      finish: 'Visited',
+      satisfaction: 'Satisfaction',
+      visitContent: 'Visit Content',
+      satisfied: 'Satisfied',
+      unsatisfied: 'Unsatisfied'
     }
   },
   zh: {
@@ -40,7 +44,11 @@ export const messages = {
       telPlaceholder: '请输入报修电话',
       statePlaceholder: '请选择回访状态',
       waiting: '待回访',
-      finish: '已回访'
+      finish: '已回访',
+      satisfaction: '满意度',
+      visitContent: '回访内容',
+      satisfied: '满意',
+      unsatisfied: '不满意'
     }
   }
 }
\ No newline at end of file
diff --git a/src/views/work/repairReturnVisitList.vue b/src/views/work/repairReturnVisitList.vue
index db59cc9..40490b3 100644
--- a/src/views/work/repairReturnVisitList.vue
+++ b/src/views/work/repairReturnVisitList.vue
@@ -24,7 +24,8 @@
                   :placeholder="$t('repairReturnVisit.repairNamePlaceholder')" clearable />
               </el-col>
               <el-col :sm="6" :md="4">
-                <el-input v-model.trim="searchForm.tel" :placeholder="$t('repairReturnVisit.telPlaceholder')" clearable />
+                <el-input v-model.trim="searchForm.tel" :placeholder="$t('repairReturnVisit.telPlaceholder')"
+                  clearable />
               </el-col>
               <el-col :sm="6" :md="4">
                 <el-select v-model="searchForm.state" :placeholder="$t('repairReturnVisit.statePlaceholder')" clearable
@@ -119,7 +120,7 @@ export default {
         this.states = [{
           value: 'waiting',
           label: '待回访'
-        },{
+        }, {
           value: 'finish',
           label: '已回访'
         }]
@@ -179,7 +180,7 @@ export default {
     },
     openRepairDetail(repairPool) {
       this.$router.push({
-        path: '/pages/property/ownerRepairDetail',
+        path: '/views/work/repairDetail',
         query: { repairId: repairPool.repairId }
       })
     },
diff --git a/src/views/work/repairTypeUserList.vue b/src/views/work/repairTypeUserList.vue
index 7287d95..72ce4b4 100644
--- a/src/views/work/repairTypeUserList.vue
+++ b/src/views/work/repairTypeUserList.vue
@@ -14,7 +14,7 @@
               </el-button>
             </div>
           </div>
-          <div class="ibox-content">
+          <div >
             <el-table :data="repairTypeUserManageInfo.repairTypeUsers" style="width: 100%" border stripe>
               <el-table-column prop="staffId" :label="$t('repairTypeUser.repairMasterId')" align="center" />
               <el-table-column prop="staffName" :label="$t('repairTypeUser.masterName')" align="center" />
@@ -43,7 +43,7 @@
       </el-col>
     </el-row>
 
-    <SelectStaff ref="selectStaff" @selectStaff="handleSelectStaff"/>
+    <SelectStaff ref="selectStaff" @selectStaff="handleSelectStaff" />
     <DeleteRepairTypeUser ref="deleteRepairTypeUser" @success="handleDeleteSuccess" />
     <EditRepairTypeUser ref="editRepairTypeUser" @success="handleEditSuccess" />
   </div>
--
libgit2 0.21.4