From 0b10c798d6bd9f812130d7056534376a99d624fb Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Wed, 29 Oct 2025 10:50:46 +0800
Subject: [PATCH] v1.9 优化报修相关bug

---
 src/api/work/repairPoolManageApi.js          |  4 ++--
 src/components/room/addShops.vue             |  1 +
 src/components/work/addOwnerRepair.vue       | 12 ++++++------
 src/components/work/chooseSingleResource.vue |  3 ++-
 src/components/work/dispatchRepair.vue       |  1 +
 src/components/work/forceFinishRepair.vue    | 24 +++++++++++++-----------
 src/components/work/visitOwnerRepair.vue     |  2 +-
 src/i18n/commonLang.js                       |  4 +++-
 src/views/work/finishRepairList.vue          | 18 ++++++++++++------
 src/views/work/ownerRepairManageList.vue     |  2 +-
 src/views/work/repairPoolManageLang.js       |  6 ++++--
 src/views/work/repairPoolManageList.vue      |  4 ++--
 src/views/work/repairReturnVisitLang.js      | 10 ++++++++--
 src/views/work/repairSettingList.vue         |  4 ++--
 14 files changed, 58 insertions(+), 37 deletions(-)

diff --git a/src/api/work/repairPoolManageApi.js b/src/api/work/repairPoolManageApi.js
index f99bc3e..c37c3a1 100644
--- a/src/api/work/repairPoolManageApi.js
+++ b/src/api/work/repairPoolManageApi.js
@@ -46,10 +46,10 @@ export function dispatchRepair(data) {
       }
     }).then(response => {
       const res = response.data
-      if (res.code === 0) {
+      if (res.code == 0) {
         resolve(res)
       } else {
-        reject(new Error(res.msg || 'Dispatch failed'))
+        reject(new Error(res.msg ))
       }
     }).catch(error => {
       reject(error)
diff --git a/src/components/room/addShops.vue b/src/components/room/addShops.vue
index bc16afa..08175bc 100644
--- a/src/components/room/addShops.vue
+++ b/src/components/room/addShops.vue
@@ -50,6 +50,7 @@ export default {
   data() {
     return {
       dialogVisible: false,
+      floors:[],
       formData: {
         roomNum: '',
         layer: '',
diff --git a/src/components/work/addOwnerRepair.vue b/src/components/work/addOwnerRepair.vue
index b9f1216..b8e499f 100644
--- a/src/components/work/addOwnerRepair.vue
+++ b/src/components/work/addOwnerRepair.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog :title="$t('addOwnerRepair.title')" :visible.sync="visible" width="50%" @close="closeDialog">
     <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
-      <el-form-item :label="$t('addOwnerRepair.repairScope')" prop="repairObjType" required>
+      <el-form-item :label="$t('addOwnerRepair.repairScope')" prop="repairObjType" >
         <el-select v-model="formData.repairObjType" style="width:100%" @change="changeRepairObjType">
           <el-option v-for="item in repairObjTypes" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
@@ -27,26 +27,26 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item :label="$t('addOwnerRepair.repairType')" prop="repairType" required>
+      <el-form-item :label="$t('addOwnerRepair.repairType')" prop="repairType" >
         <el-select v-model="formData.repairType" style="width:100%">
           <el-option v-for="item in repairSettings" :key="item.repairType" :label="item.repairTypeName"
             :value="item.repairType" />
         </el-select>
       </el-form-item>
 
-      <el-form-item :label="$t('addOwnerRepair.repairName')" prop="repairName" required>
+      <el-form-item :label="$t('addOwnerRepair.repairName')" prop="repairName" >
         <el-input v-model.trim="formData.repairName" :placeholder="$t('addOwnerRepair.placeholder.repairName')" />
       </el-form-item>
 
-      <el-form-item :label="$t('addOwnerRepair.tel')" prop="tel" required>
+      <el-form-item :label="$t('addOwnerRepair.tel')" prop="tel" >
         <el-input v-model.trim="formData.tel" type="tel" :placeholder="$t('addOwnerRepair.placeholder.tel')" />
       </el-form-item>
 
-      <el-form-item :label="$t('addOwnerRepair.appointmentTime')" prop="appointmentTime" required>
+      <el-form-item :label="$t('addOwnerRepair.appointmentTime')" prop="appointmentTime" >
         <el-date-picker v-model="formData.appointmentTime" type="datetime" style="width:100%" value-format="yyyy-MM-dd HH:mm:ss"          :placeholder="$t('addOwnerRepair.placeholder.appointmentTime')"  />
       </el-form-item>
 
-      <el-form-item :label="$t('addOwnerRepair.context')" prop="context" required>
+      <el-form-item :label="$t('addOwnerRepair.context')" prop="context" >
         <el-input v-model.trim="formData.context" type="textarea" rows="4" :placeholder="$t('addOwnerRepair.placeholder.context')" />
       </el-form-item>
     </el-form>
diff --git a/src/components/work/chooseSingleResource.vue b/src/components/work/chooseSingleResource.vue
index 7b89a49..7766e8e 100644
--- a/src/components/work/chooseSingleResource.vue
+++ b/src/components/work/chooseSingleResource.vue
@@ -273,7 +273,8 @@ export default {
         price: this.form.price,
         useNumber: this.form.useNumber,
         isCustom: this.form.isCustom,
-        customGoodsName: this.form.customGoodsName
+        customGoodsName: this.form.customGoodsName,
+        resName:this.form.customGoodsName
       }
 
       if (this.form.isCustom) {
diff --git a/src/components/work/dispatchRepair.vue b/src/components/work/dispatchRepair.vue
index 132409f..47cfd57 100644
--- a/src/components/work/dispatchRepair.vue
+++ b/src/components/work/dispatchRepair.vue
@@ -111,6 +111,7 @@ export default {
             this.$emit('success')
           } catch (error) {
             console.error('Dispatch repair failed:', error)
+            this.$message.error(error)
           }
         }
       })
diff --git a/src/components/work/forceFinishRepair.vue b/src/components/work/forceFinishRepair.vue
index 486d8ca..cd2fc97 100644
--- a/src/components/work/forceFinishRepair.vue
+++ b/src/components/work/forceFinishRepair.vue
@@ -1,7 +1,7 @@
 <template>
   <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-form-item v-if="form.repairObjType !== '004'" :label="$t('forceFinishRepair.useMaterial')">
         <el-select v-model="form.maintenanceType" placeholder="请选择" style="width:100%">
           <template v-for="item in maintenanceTypes">
             <el-option :key="item.statusCd" :label="item.name" :value="item.statusCd"
@@ -17,18 +17,18 @@
               v-if="item.statusCd !== '1003' && item.statusCd !== '1004'" />
           </template>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
 
       <template v-if="form.maintenanceType === '1001' || form.maintenanceType === '1003'">
         <el-form-item :label="$t('forceFinishRepair.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-option v-for="item in form.resourceStoreTypes" :key="item.rstId" :label="item.name" :value="item.rstId" />
           </el-select>
         </el-form-item>
 
         <template v-if="form.isCustom">
           <el-form-item :label="$t('forceFinishRepair.goodsName')">
-            <el-input v-model="form.customGoodsName" :placeholder="$t('forceFinishRepair.goodsNamePlaceholder')" />
+            <el-input v-model="form.customGoodsName" :placeholder="$t('forceFinishRepair.goodsName')" />
           </el-form-item>
 
           <el-form-item v-if="form.maintenanceType === '1001'" :label="$t('forceFinishRepair.customPrice')">
@@ -39,13 +39,14 @@
         <template v-else>
           <el-form-item :label="$t('forceFinishRepair.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-option v-for="item in form.sonResourceStoreTypes" :key="item.rstId" :label="item.name"
+                :value="item.rstId" />
             </el-select>
           </el-form-item>
 
           <el-form-item v-if="form.rstId" :label="$t('forceFinishRepair.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-option v-for="item in form.resourceStores" :key="item.resId" :label="item.resName" :value="item.resId" />
             </el-select>
           </el-form-item>
         </template>
@@ -64,8 +65,7 @@
       </template>
 
       <el-form-item :label="$t('forceFinishRepair.explanation')">
-        <el-input v-model="form.context" type="textarea" :placeholder="$t('forceFinishRepair.explanation')"
-          :rows="4" />
+        <el-input v-model="form.context" type="textarea" :placeholder="$t('forceFinishRepair.explanation')" :rows="4" />
       </el-form-item>
     </el-form>
 
@@ -99,7 +99,7 @@ export default {
         repairType: '',
         repairObjType: '',
         context: '',
-        maintenanceType: '',
+        maintenanceType: '1002',
         resId: '',
         rsId: '',
         isCustom: false,
@@ -174,13 +174,15 @@ export default {
       try {
         const params = {
           repairId: this.form.repairId,
-          rstId: this.form.rstId
+          rstId: this.form.rstId,
+          page:1,
+          row:50
         }
         const data = await listUserStorehouses(params)
         this.form.resourceStores = data
       } catch (error) {
         console.error('获取商品失败:', error)
-        this.$message.error('获取商品失败')
+        this.$message.error(error)
       }
     },
     chosePrice() {
diff --git a/src/components/work/visitOwnerRepair.vue b/src/components/work/visitOwnerRepair.vue
index b5acefd..77042d3 100644
--- a/src/components/work/visitOwnerRepair.vue
+++ b/src/components/work/visitOwnerRepair.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('repairReturnVisit.visitTitle')" :visible.sync="visible" width="600px" @close="resetForm">
+  <el-dialog :title="$t('repairReturnVisit.visit')" :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')"
diff --git a/src/i18n/commonLang.js b/src/i18n/commonLang.js
index 684169c..7ce3b15 100644
--- a/src/i18n/commonLang.js
+++ b/src/i18n/commonLang.js
@@ -80,7 +80,8 @@ export const messages = {
         friday: 'Friday',
         saturday: 'Saturday',
         sunday: 'Sunday',
-        map:'Map'
+        map:'Map',
+        remove:'Remove'
       }
     },
     zh: {
@@ -129,6 +130,7 @@ export const messages = {
         disabled: '禁用',
         import: '导入',
         remark: '备注',
+        remove: '删除',
         hour:'时',
         more:'更多',
         tip:'提示',
diff --git a/src/views/work/finishRepairList.vue b/src/views/work/finishRepairList.vue
index a2ff85c..181490a 100644
--- a/src/views/work/finishRepairList.vue
+++ b/src/views/work/finishRepairList.vue
@@ -42,9 +42,9 @@
                 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"
+                    <el-table-column prop="rstName" :label="$t('finishRepair.category')" ></el-table-column>
+                    <el-table-column prop="resName" :label="$t('finishRepair.goods')"></el-table-column>
+                    <el-table-column prop="price" :label="$t('finishRepair.price')" 
                       v-if="finishRepairInfo.maintenanceType == '1001'">
                       <template slot-scope="scope">
                         <el-input-number v-model="scope.row.price"
@@ -56,7 +56,7 @@
                         </span>
                       </template>
                     </el-table-column>
-                    <el-table-column :label="$t('finishRepair.quantity')" width="150">
+                    <el-table-column :label="$t('finishRepair.quantity')" >
                       <template slot-scope="scope">
                         <el-input-number v-model="scope.row.useNumber" @change="updateTotalPrice" :min="1">
                         </el-input-number>
@@ -115,7 +115,7 @@
       </el-row>
     </el-card>
 
-    <choose-single-resource ref="chooseSingleResource"></choose-single-resource>
+    <choose-single-resource ref="chooseSingleResource" @choose-single-resource="chooseSingleResource"></choose-single-resource>
   </div>
 </template>
 
@@ -123,6 +123,7 @@
 import { getDict } from '@/api/community/communityApi'
 import { getCommunityId } from '@/api/community/communityApi'
 import { repairFinish } from '@/api/work/finishRepairApi'
+import {getUserName} from '@/api/user/userApi'
 import UploadImageUrl from '@/components/upload/UploadImageUrl'
 import ChooseSingleResource from '@/components/work/chooseSingleResource'
 
@@ -159,6 +160,10 @@ export default {
     this.initData()
   },
   methods: {
+    chooseSingleResource(goods) {
+      this.finishRepairInfo.choosedGoodsList.push(goods)
+      this.updateTotalPrice()
+    },
     async initData() {
       this.finishRepairInfo.repairType = this.$route.query.repairType
       this.finishRepairInfo.repairId = this.$route.query.repairId
@@ -240,7 +245,8 @@ export default {
       try {
         const params = {
           ...this.finishRepairInfo,
-          communityId: this.communityId
+          communityId: this.communityId,
+          userName:getUserName()
         }
         const res = await repairFinish(params)
         if (res.code === 0) {
diff --git a/src/views/work/ownerRepairManageList.vue b/src/views/work/ownerRepairManageList.vue
index f41bd86..75150c0 100644
--- a/src/views/work/ownerRepairManageList.vue
+++ b/src/views/work/ownerRepairManageList.vue
@@ -222,6 +222,6 @@ export default {
 }
 
 .search-content {
-  padding: 20px;
+  padding: 0px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/work/repairPoolManageLang.js b/src/views/work/repairPoolManageLang.js
index 629a950..996daf4 100644
--- a/src/views/work/repairPoolManageLang.js
+++ b/src/views/work/repairPoolManageLang.js
@@ -44,7 +44,8 @@ export const messages = {
       freeService: 'Free Service',
       needMaterials: 'Need Materials',
       noMaterialsNeeded: 'No Materials Needed',
-      timedTaskProcessing: 'Timed Task Processing'
+      timedTaskProcessing: 'Timed Task Processing',
+      cannotTransferSelf:' can not transfer to yourself'
     }
   },
   zh: {
@@ -92,7 +93,8 @@ export const messages = {
       freeService: '免费服务',
       needMaterials: '需要材料',
       noMaterialsNeeded: '不需要材料',
-      timedTaskProcessing: '定时任务处理中'
+      timedTaskProcessing: '定时任务处理中',
+      cannotTransferSelf: '不能转单给自己'
     }
   }
 }
\ No newline at end of file
diff --git a/src/views/work/repairPoolManageList.vue b/src/views/work/repairPoolManageList.vue
index 9a5e901..607cc19 100644
--- a/src/views/work/repairPoolManageList.vue
+++ b/src/views/work/repairPoolManageList.vue
@@ -19,9 +19,9 @@
         <el-card class="box-card">
           <div slot="header" class="flex justify-between">
             <span>{{ $t('repairPoolManage.queryConditions') }}</span>
-            <el-button style="float: right; padding: 3px 0" type="text" @click="toggleMoreCondition">
+            <!-- <el-button style="float: right; padding: 3px 0" type="text" @click="toggleMoreCondition">
               {{ moreCondition ? $t('repairPoolManage.hide') : $t('repairPoolManage.more') }}
-            </el-button>
+            </el-button> -->
           </div>
 
           <el-form :model="conditions" label-width="auto">
diff --git a/src/views/work/repairReturnVisitLang.js b/src/views/work/repairReturnVisitLang.js
index 16c3f0b..5ea9066 100644
--- a/src/views/work/repairReturnVisitLang.js
+++ b/src/views/work/repairReturnVisitLang.js
@@ -22,7 +22,10 @@ export const messages = {
       satisfaction: 'Satisfaction',
       visitContent: 'Visit Content',
       satisfied: 'Satisfied',
-      unsatisfied: 'Unsatisfied'
+      unsatisfied: 'Unsatisfied',
+      satisfactionRequired: 'Please select satisfaction',
+      visitContentRequired: 'Please enter visit content',
+      visitContentMaxLength: 'The length of visit content cannot exceed 1000 characters'
     }
   },
   zh: {
@@ -48,7 +51,10 @@ export const messages = {
       satisfaction: '满意度',
       visitContent: '回访内容',
       satisfied: '满意',
-      unsatisfied: '不满意'
+      unsatisfied: '不满意',
+      satisfactionRequired: '请选择满意度',
+      visitContentRequired: '请输入回访内容',
+      visitContentMaxLength: '回访内容长度不能超过1000个字符'
     }
   }
 }
\ No newline at end of file
diff --git a/src/views/work/repairSettingList.vue b/src/views/work/repairSettingList.vue
index 32aa927..ab1dc36 100644
--- a/src/views/work/repairSettingList.vue
+++ b/src/views/work/repairSettingList.vue
@@ -44,9 +44,9 @@
       <div slot="header" class="flex justify-between">
         <span>{{ $t('repairSetting.repairSettingTitle') }}</span>
         <div style="float: right">
-          <el-button type="text" @click="showDocumentation">
+          <!-- <el-button type="text" @click="showDocumentation">
             {{ $t('repairSetting.documentation') }}
-          </el-button>
+          </el-button> -->
           <el-button type="primary" size="small" @click="openAddDialog">
             {{ $t('repairSetting.add') }}
           </el-button>
--
libgit2 0.21.4