Merge remote-tracking branch 'origin/master'

chenyao

2026-01-23 233ca8def6816070c75fe5cee109c27f59879072

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

@@ -178,8 +178,8 @@
      <template #footer>
         <template v-if="!dialogReadonly">
            <el-button
               class="save-btn"
               color="#4C34FF"
               color="#F2F3F5"

               v-if="!dialogReadonly"
               :loading="submitting"
               :disabled="submitting"
@@ -187,7 +187,7 @@
            >
               保存
            </el-button>
            <el-button color="#F2F3F5" :loading="submitting" :disabled="submitting" @click="handleApply">申请</el-button>
            <el-button class="save-btn" color="#4C34FF" :loading="submitting" :disabled="submitting" @click="handleApply">申请</el-button>
         </template>
         <template v-if="dialogReadonly && detailObjectionStatus === '1'">
            <el-button color="#F2F3F5" :loading="submitting" :disabled="submitting" @click="visible = false">取消</el-button>
@@ -216,7 +216,7 @@
               </el-button>
         </template>
         <template v-if="detailObjectionStatus === '2'">
            <el-button color="#F2F3F5" :loading="submitting" :disabled="submitting" @click="visible = false">关闭</el-button>
<!--            <el-button color="#F2F3F5" :loading="submitting" :disabled="submitting" @click="visible = false">关闭</el-button>-->
         </template>
      </template>
   </el-dialog>