Merge branch 'master' of http://47.99.164.66:3000/hzdyjs-xg/all-project

web/src/views/hq/pm/repairOrder/index.vue

@@ -968,45 +968,17 @@
                 <div class="progress-detail">
                   <p class="detail-text">{{ progress.progressDetail }}</p>
                 </div>
-
-                <!-- <div class="progress-info-grid" v-if="hasAdditionalInfo(progress)">
-                  <div class="info-item" v-if="progress.locationInfo">
-                    <label
-                      ><el-icon><Location /></el-icon> 位置信息：</label
-                    >
-                    <span>{{ progress.locationInfo }}</span>
+                <!-- 仅维修管理人员可见，且进度为完成维修 -->
+                <div v-if="progress.progressType === '6' && isMaintenanceAdmin.value" class="progress-extra-info">
+                  <div v-if="progress.usedMaterials">
+                    <label>使用材料：</label>
+                    <span>{{ progress.usedMaterials }}</span>
                   </div>
-                  <div class="info-item" v-if="progress.estimatedDuration">
-                    <label
-                      ><el-icon><Timer /></el-icon> 预计时长：</label
-                    >
-                    <span>{{ progress.estimatedDuration }}分钟</span>
+                  <div v-if="progress.followSuggestions">
+                    <label>后续建议：</label>
+                    <span>{{ progress.followSuggestions }}</span>
                   </div>
-                  <div class="info-item" v-if="progress.nextStep">
-                    <label
-                      ><el-icon><Right /></el-icon> 下一步：</label
-                    >
-                    <span>{{ progress.nextStep }}</span>
-                  </div>
-                  <div class="info-item" v-if="progress.issuesEncountered">
-                    <label
-                      ><el-icon><Warning /></el-icon> 遇到问题：</label
-                    >
-                    <span>{{ progress.issuesEncountered }}</span>
-                  </div>
-                  <div class="info-item" v-if="progress.materialsNeeded">
-                    <label
-                      ><el-icon><ShoppingBag /></el-icon> 需要材料：</label
-                    >
-                    <span>{{ progress.materialsNeeded }}</span>
-                  </div>
-                  <div class="info-item" v-if="progress.remark">
-                    <label
-                      ><el-icon><EditPen /></el-icon> 备注：</label
-                    >
-                    <span>{{ progress.remark }}</span>
-                  </div>
-                </div> -->
+                </div>
               </div>
             </div>
           </div>
@@ -1784,6 +1756,7 @@ const handleSelectionChange = (selection: RepairOrderVO[]) => {
 
 /** 新增按钮操作 */
 const handleAdd = async () => {
+  await getCategoryTreeOptions(); // 新增：每次弹窗前获取最新维修类型
   await reset(true); // 传入true表示是新增操作，需要自动填充用户信息
   dialog.visible = true;
   dialog.title = '添加报修工单';
@@ -1791,6 +1764,7 @@ const handleAdd = async () => {
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: RepairOrderVO) => {
+  await getCategoryTreeOptions(); // 新增：每次弹窗前获取最新维修类型
   await reset(); // 修改操作不自动填充用户信息
   const id = row?.id || ids.value[0];