Merge remote-tracking branch 'origin/master'

chenyao

2026-01-28 bcb34e720eb55bc1f9d03d4b4bca557a4b93d4e5

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

@@ -7,7 +7,7 @@
      destroy-on-close
      :close-on-click-modal="false"
   >
      <div class="detail-container" v-if="dialogReadonly">
      <div class="detail-container  detail-container1" v-if="dialogReadonly">
         <el-row class="detail-row-view">
            <el-col :span="12">
               <div class="label">标题</div>
@@ -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,13 +187,13 @@
            >
               保存
            </el-button>
            <el-button color="#F2F3F5" :loading="submitting" :disabled="submitting" @click="handleApply">申请</el-button>
            <el-button class="" 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>

            <el-button
               class="save-btn"
               class=""
               color="#4C34FF"

               :loading="submitting"
@@ -204,7 +204,7 @@
               反馈
            </el-button>
            <el-button
                  class="save-btn"
                  class=""
                  color="#4C34FF"

                  :loading="submitting"
@@ -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>
@@ -315,9 +315,7 @@

// 文件移除
const handleFileRemove = (file, fileListVal) => {
   if (file.response && file.response.attachId) {
      uploadedFiles.value = uploadedFiles.value.filter(item => item.attachId !== file.response.attachId)
   }
uploadedFiles.value = fileListVal
}

// 上传前验证
@@ -359,7 +357,11 @@
async function submitForm(objectionStatus) {
   const isValid = await formRef.value?.validate().catch(() => false)
   if (!isValid) return
   if (uploadedFiles.value.length === 0) {
      return ElMessage.warning('请上传附件')
   }
   submitting.value = true

   try {
      // 构建符合接口要求的提交数据
      const submitData = {
@@ -444,7 +446,7 @@
      ElMessage.warning('没有可下载的附件')
      return
   }
	

   // 遍历所有附件并下载
   attachmentDetailsList.value.forEach(attach => {
      if (attach.link) {
@@ -479,8 +481,9 @@
</script>

<style scoped lang="scss">
.detail-container {
   padding: 20px;
.detail-container1 {
display: flex;
flex-direction: column;
}
.upload-container {
   width: 100%;