Merge remote-tracking branch 'origin/master'

chenyao

2026-06-30 4b3c357f2fa24a27eac3fe59cbf64e34255ab212

 applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue

@@ -8,7 +8,12 @@
      destroy-on-close
      :close-on-click-modal="false"
   >
   <el-tabs class="gd-tabs"  v-model="activeName" @tab-click="tabsClick" v-if="dialogReadonly && formData.workOrderStatus >= '30'">
      <el-tabs
         class="gd-tabs"
         v-model="activeName"
         @tab-click="tabsClick"
         v-if="dialogReadonly && formData.workOrderStatus >= '30'"
      >
         <el-tab-pane label="基础信息" name="basic"></el-tab-pane>
         <el-tab-pane label="成果数据" name="result">
            <OutcomeData :workOrderId="formData.id" />
@@ -94,17 +99,16 @@
                  </el-col>
                  <el-col :span="12">
                     <el-form-item label="工单类型" prop="workOrderType">
                        <!-- <el-cascader
                        <el-cascader
                           class="gd-cascader"
                           popper-class="gd-cascader-popper"
                           v-model="formData.workOrderType"
                           :options="workOrderTypeXT"
                           :props="taskTypeCascaderProps"
                           collapse-tags
                           :props="{...taskTypeCascaderProps,multiple:true }"
                           placeholder="请选择"
                           clearable
                        /> -->
                        <el-cascader class="gd-cascader" popper-class="gd-cascader-popper" v-model="formData.workOrderType"
               :options="workOrderTypeXT" :props="taskTypeCascaderProps" placeholder="请选择" clearable collapse-tags />
                           collapse-tags
                        />
                     </el-form-item>
                  </el-col>
                  <el-col :span="12">
@@ -130,12 +134,7 @@
                           clearable
                           @change="loadDemandChange"
                        >
                           <el-option
                              v-for="item in payloadList"
                              :key="item.name"
                              :label="item.name"
                              :value="item.name"
                           />
                           <el-option v-for="item in payloadList" :key="item.name" :label="item.name" :value="item.name" />
                        </el-select>
                     </el-form-item>
                  </el-col>
@@ -176,9 +175,7 @@
            </div>
            <el-table
               class="separateTable"
               :empty-text="
                  pointList.length ? '暂无数据' : '请先在地图上绘制工单范围'
               "
               :empty-text="pointList.length ? '暂无数据' : '请先在地图上绘制工单范围'"
               ref="deviceTableRef"
               :data="pointList.length ? deviceList : []"
               row-key="id"
@@ -284,7 +281,10 @@
import OrderStepBar from '@/views/orderView/orderManage/orderManage/OrderStepBar.vue'
import OutcomeData from './outcomeData.vue'
import { getDictListApi } from '@/api/zkxt'
import { getTaskTypeLabel, taskTypeCascaderProps, toTaskTypeCascaderValue, toTaskTypeRequestValue } from '../taskTypeOptions'
import {
   getTaskTypeLabel,
   taskTypeCascaderProps,
} from '../taskTypeOptions'
const store = useStore()
const permission = computed(() => store.state.user.permission)
const activeName = ref('basic')
@@ -455,11 +455,7 @@
      if (!formData.value.id) {
         formData.value.workOrderStatus = '10'
      }
      const payload = {
         ...formData.value,
         workOrderType: toTaskTypeRequestValue(formData.value.workOrderType),
      }
      await gdWorkOrderSaveApi(payload)
      await gdWorkOrderSaveApi(formData.value)
      ElMessage.success(dialogMode.value === 'add' ? '新增成功' : '更新成功')
      visible.value = false
      emit('success')
@@ -481,7 +477,6 @@
   loadList()
   const res = await gdWorkOrderDetailApi({ id: formData.value.id })
   formData.value = res?.data?.data ?? {}
   formData.value.workOrderType = toTaskTypeCascaderValue(formData.value.workOrderType)
   dateRange.value = [formData.value.executeStartTime, formData.value.executeEndTime]
}

@@ -725,7 +720,6 @@
      }
   }
}


.content {
   display: flex;