Merge remote-tracking branch 'origin/master'

chenyao

2026-01-31 d60b1396df45de76c6bae6aa75c15602dd4c2570

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

@@ -57,6 +57,7 @@
               </el-row>
               <div class="detail-title" :style="{ marginTop: pxToRem(20) }">已选设备</div>
               <el-table class="setHeight gd-dialog-table" ref="deviceTableRef" :data="deviceList" row-key="id">
                  <el-table-column type="index" label="序号" />
                  <el-table-column prop="nickname" label="设备名称" />
                  <el-table-column prop="deviceName" label="设备型号" />
                  <el-table-column prop="devicePayload" label="设备负载" />
@@ -90,6 +91,7 @@
               :disabled="dialogReadonly"
               label-width="90px"
            >
               <div class="detail-title">工单详情</div>
               <el-row>
                  <el-col :span="12">
                     <el-form-item label="工单名称" prop="workOrderName">
@@ -161,7 +163,10 @@
                  </el-col>
               </el-row>
            </el-form>
            <div class="detail-title" :style="{ marginTop: pxToRem(20) }">工单执行范围</div>
            <div class="detail-title" :style="{ marginTop: pxToRem(20) }">
               <span class="required-star" v-if="!dialogReadonly">*</span>
               工单执行范围
            </div>
            <CommonCesiumMap
               ref="mapRef"
               class="gd-cesium"
@@ -175,12 +180,17 @@
            />
         </div>
         <div class="rightBox" v-if="!dialogReadonly">
            <div class="detail-title">推荐设备</div>
            <div class="detail-title">
               <span class="required-star" v-if="!dialogReadonly">*</span>
               推荐设备
            </div>
            <el-table
               class="separateTable"
               :empty-text="(formData.deviceLoadDemand && pointList.length) ? '暂无数据' : '请先选择设备需求并在地图上绘制工单范围'"
               :empty-text="
                  formData.deviceLoadDemand && pointList.length ? '暂无数据' : '请先选择设备需求并在地图上绘制工单范围'
               "
               ref="deviceTableRef"
               :data="(formData.deviceLoadDemand && pointList.length) ? deviceList : []"
               :data="formData.deviceLoadDemand && pointList.length ? deviceList : []"
               row-key="id"
               @selection-change="handleDeviceSelectionChange"
            >
@@ -193,12 +203,8 @@
      </div>

      <template #footer>
         <el-button
            v-if="['11', '21', '23','31', '60'].includes(gdStatus)"
            @click="viewDescription"
            color="#F2F3F5"
         >
            {{ gdStatusObj[gdStatus].reason }}
         <el-button v-if="['11', '21', '23', '31', '60'].includes(gdStatus)" @click="viewDescription" color="#F2F3F5">
            {{ gdStatusObj[gdStatus]?.reason }}
         </el-button>

         <template v-if="!suddenlyEdit">
@@ -212,7 +218,7 @@
            <el-button
               color="#4C34FF"
               @click="requestModification"
               v-if="['20'].includes(gdStatus) && permission.order_applyNegotiation"
               v-if="['20'].includes(gdStatus) && permission.order_applyEdit"
            >
               申请修改
            </el-button>
@@ -239,7 +245,7 @@
         </template>
         <template v-if="permission.order_controlCancel">
            <el-button v-if="gdStatus === '21'" @click="statusChange(6)" color="#F2F3F5">驳回</el-button>
            <el-button v-if="gdStatus === '21'" @click="statusChange(5)" color="#4C34FF">同意</el-button>
            <el-button v-if="gdStatus === '21'" @click="statusChange(5)" color="#4C34FF">通过</el-button>
         </template>
         <el-button v-if="gdStatus === '30' && permission.order_applyNegotiation" @click="addDescription" color="#4C34FF">
            协商修改
@@ -326,14 +332,15 @@
const hasPatrolTaskList = computed(() => ['30', '40', '50', '60'].includes(String(formData.value.workOrderStatus)))

const gdStatusObj = {
   '10': { reason: '驳回原因', operationType: '2' },
   '11': { reason: '驳回原因' },
   '20': { reason: '取消原因', operationType: '3' },
   '10': { reason: '拒单原因', operationType: '2', title: '拒绝接单' },
   '11': { reason: '拒单原因' },
   '20': { reason: '原因', operationType: '3',title:'申请取消' },
   '21': { reason: '取消原因' },
   '23': { reason: '取消原因' },
   '30': { reason: '协商修改原因', operationType: '9' },
   '31': { reason: '协商修改原因' },
   '30': { reason: '修改原因', operationType: '9',title:'协商修改' },
   '31': { reason: '修改原因' },
   '40': { reason: '' },
   '50': { reason: '情况说明', operationType: '11' },
   '50': { reason: '情况说明', operationType: '11',title:'结算' },
   '60': { reason: '情况说明' },
}

@@ -387,6 +394,7 @@
         row: formData.value,
         type: gdStatusObj[gdStatus.value].operationType,
         formLabel: gdStatusObj[gdStatus.value].reason,
         title: gdStatusObj[gdStatus.value]?.title || '新增'
      })
   })
}
@@ -636,14 +644,14 @@
</script>

<style lang="scss" scoped>
.separateTable{
.separateTable {
   height: 0;
   flex: 1;
   :deep(){
      .el-scrollbar__view{
   :deep() {
      .el-scrollbar__view {
         height: 100%;
      }
      .el-table__empty-text{
      .el-table__empty-text {
         line-height: normal;
      }
   }
@@ -701,4 +709,9 @@
   height: 200px;
   line-height: 200px;
}

.required-star {
   color: #f56c6c;
   margin-right: 4px;
}
</style>