Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-26 beb95fb5fc166804056abafd70fc01ac27de7621

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

@@ -10,7 +10,7 @@
   >
      <div class="content" style="display: flex">
         <div class="processBox" v-if="dialogMode !== 'add' && processList.length">
            <el-timeline>
            <el-timeline class="gd-timeline">
               <el-timeline-item
                  v-for="(activity, index) in processList"
                  :key="index"
@@ -76,13 +76,8 @@
                        </template>
                     </el-table-column>
                     <el-table-column prop="executeTime" show-overflow-tooltip label="任务执行时间" />
                     <el-table-column prop="feishou" show-overflow-tooltip label="选择飞手" />
                     <el-table-column prop="deviceId" show-overflow-tooltip label="选择设备" />
                     <el-table-column label="操作" class-name="operation-btns">
                        <template v-slot="{ row }">
                           <el-link type="primary" @click="">查看</el-link>
                        </template>
                     </el-table-column>
                     <el-table-column prop="recommendFlyerName" show-overflow-tooltip label="选择飞手" />
                     <el-table-column prop="deviceName" show-overflow-tooltip label="选择设备" />
                  </el-table>
               </template>
            </div>
@@ -154,7 +149,14 @@
                  </el-col>
                  <el-col :span="24">
                     <el-form-item label="工单备注" prop="remark">
                        <el-input class="gd-input" type="textarea" v-model="formData.remark" placeholder="请输入" clearable />
                        <el-input
                           class="gd-input"
                           type="textarea"
                           :rows="4"
                           v-model="formData.remark"
                           placeholder="请输入"
                           clearable
                        />
                     </el-form-item>
                  </el-col>
               </el-row>
@@ -187,7 +189,7 @@
                  <el-table-column prop="devicePayload" label="设备负载" />
               </el-table>
            </template>
            <div v-else>请先选择设备需求并绘制范围</div>
            <div v-else class="tipSelect">请先选择设备需求并在地图上绘制工单范围</div>
         </div>
      </div>

@@ -215,10 +217,10 @@
            </el-button>
            <el-button v-if="gdStatus === '10'" @click="addDescription">拒绝接单</el-button>
            <el-button v-if="gdStatus === '10'" @click="statusChange(1)">接单</el-button>
            <el-button v-if="gdStatus === '22'" @click="statusChange(7)">同意修改</el-button>
            <el-button v-if="gdStatus === '22'" @click="statusChange(8)">不同意修改</el-button>
            <el-button v-if="gdStatus === '21'" @click="statusChange(5)">同意取消</el-button>
            <el-button v-if="gdStatus === '22'" @click="statusChange(7)">同意修改</el-button>
            <el-button v-if="gdStatus === '21'" @click="addDescription">不同意取消</el-button>
            <el-button v-if="gdStatus === '21'" @click="statusChange(5)">同意取消</el-button>
            <el-button v-if="gdStatus === '30'" @click="addDescription">协商修改</el-button>
            <el-button v-if="gdStatus === '31'" @click="statusChange(10)">同意</el-button>
         </template>
@@ -437,7 +439,7 @@

// 加载时间线list
function loadList() {
   gdWorkOrderFlowListApi({ workOrderId: formData.value.id }).then(res => {
   gdWorkOrderFlowListApi({ workOrderId: formData.value.id,type: '0' }).then(res => {
      processList.value = res.data.data
   })
}
@@ -561,10 +563,10 @@
      hasPatrolTaskList.value && gdPatrolTaskPage()
      dialogMode.value === 'edit' ? editPolygon() : viewPolygon()
   }
   await getDeviceList()
   // setMapDevice()
   await nextTick()
   syncSelection()
   getDeviceList()
}

// 初始化地图实例
@@ -609,23 +611,21 @@

   .processBox {
      width: 312px;
      .el-timeline{
         padding-left: 100px;
      }
      .item-content{
      .item-content {
         position: relative;
         .flowName{
         .flowName {
            width: 80px;
            position: absolute;
            left: -100px;
            top: 0;
            left: -120px;
            top: 0px;
         }
      }

   }
}

.setHeight {
   //max-height: 300px;
   //min-height: 200px;
.tipSelect {
   text-align: center;
   height: 200px;
   line-height: 200px;
}
</style>