Merge remote-tracking branch 'origin/master'

罗广辉

2026-02-03 35401373bbe0f608ee3bb7f7c54ebeef5e5dc8d2

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

@@ -9,23 +9,27 @@
      width="80%"
   >
      <div class="detail-container" style="display: flex">
         <div class="detail-left" v-if="dialogMode !== 'add' && processList.length">
            <el-timeline class="gd-timeline">
               <el-timeline-item
                  v-for="(activity, index) in processList"
                  :key="index"
                  :icon="Check"
                  :type="index === processList.length - 1 ? 'success' : 'info'"
                  :color="activity.color"
                  :hollow="activity.hollow"
                  :timestamp="activity.createTime"
               >
                  <div class="item-content">
                     <div>{{ activity.operator }}</div>
                     <div class="flowName">{{ activity.flowName }}</div>
                  </div>
               </el-timeline-item>
            </el-timeline>
         <div class="processBox">
            <div class="detail-title">巡查需求记录</div>
            <div class="detail-left" v-if="dialogMode !== 'add' && processList.length">
               <el-timeline class="gd-timeline">
                  <el-timeline-item
                     v-for="(activity, index) in processList"
                     :key="index"
                     :icon="Check"
                     :type="index === processList.length - 1 ? 'success' : 'info'"
                     :color="activity.color"
                     :hollow="activity.hollow"
                     :timestamp="activity.createTime"
                  >
                     <div class="item-content">
                        <div>{{ activity.operator }}</div>
                        <div class="flowName">{{ activity.flowName }}</div>
                     </div>
                  </el-timeline-item>
               </el-timeline>
            </div>

         </div>

         <div class="detail-right">
@@ -90,6 +94,7 @@

            <!-- 编辑模式 -->
            <el-form class="gd-dialog-form" v-else ref="formRef" :model="formData" :rules="rules" label-width="110px">
               <div class="detail-title">巡查任务详情</div>
               <el-row>
                  <el-col :span="12">
                     <el-form-item label="巡查任务名称" prop="patrolTaskName">
@@ -118,7 +123,6 @@
                     <el-form-item label="任务执行时间" prop="executeTime">
                        <el-date-picker
                           class="gd-date-picker"
                           popper-class="gd-date-picker-popper"
                           v-model="formData.executeTime"
                           type="datetime"
                           placeholder="请选择"
@@ -231,7 +235,7 @@
         </template>
         <template v-if="permission.flyOrder_controlReview">
            <el-button v-if="taskStatus === '3'" @click="addDescription" color="#F2F3F5">驳回</el-button>
            <el-button v-if="taskStatus === '3'" @click="statusChange(4)" color="#4C34FF">同意</el-button>
            <el-button v-if="taskStatus === '3'" @click="statusChange(4)" color="#4C34FF">通过</el-button>
         </template>
      </template>
      <RefuseOrderDialog1
@@ -296,10 +300,10 @@
const getAirName = inject('getAirName')

const gdStatusObj = {
   '0': { reason: '拒绝原因', operationType: '2' },
   '0': { reason: '拒绝原因', operationType: '2',title:'拒绝签收' },
   '1': { reason: '拒绝原因' },
   '2': { reason: '' },
   '3': { reason: '驳回原因', operationType: '5' },
   '3': { reason: '驳回原因', operationType: '5',title:'驳回' },
   '4': { reason: '驳回原因' },
   '5': { reason: '' },
   '6': { reason: '拒绝原因' },
@@ -333,6 +337,7 @@
         row: formData.value,
         type: gdStatusObj[taskStatus.value].operationType,
         formLabel: gdStatusObj[taskStatus.value].reason,
         title: gdStatusObj[taskStatus.value]?.title
      })
   })
}
@@ -533,7 +538,7 @@
   .item-content {
      position: relative;
      .flowName {
         width: 80px;
         width: 72px;
         position: absolute;
         left: -120px;
         top: 0px;
@@ -559,4 +564,14 @@
   color: #999;
   margin-top: 2px;
}

.processBox{
   display: flex;
   flex-direction: column;

   .detail-left{
      height: 100%;
      overflow: auto;
   }
}
</style>