Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

shuishen

2026-01-31 5d9b82628c83f45acb1c6f4f2b7f5623cfe18e4d

Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

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

@@ -152,6 +152,7 @@
                            </template>
                            <template v-slot="{ row, $index }">
                                <el-select
                                    no-data-text="暂无推荐飞手"
                                    class="gd-select"
                                    popper-class="gd-select-popper"
                                    v-model="row.recommendFlyerName"

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

@@ -31,7 +31,7 @@
            <div class="detail-right">
                <!-- 查看模式 -->
                <div class="view-container" v-if="dialogReadonly">
                    <div class="detail-title">工单详情</div>
                    <div class="detail-title">巡查任务详情</div>
                    <el-row class="detail-row-view">
                        <el-col :span="12">
                            <div class="label">巡查任务名称</div>

 applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue

@@ -134,7 +134,7 @@
          :disabled="importSubmitting"
          @click="submitImport(importFormRef)"
        >
          保存
          导入
        </el-button>
      </template>
    </el-dialog>

 applications/task-work-order/src/views/orderView/organizational/zoningManagement/index.vue

@@ -129,7 +129,7 @@
          :disabled="importSubmitting"
          @click="submitImport(importFormRef)"
        >
          保存
          导入
        </el-button>
      </template>
    </el-dialog>