From bcb34e720eb55bc1f9d03d4b4bca557a4b93d4e5 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 28 Jan 2026 11:31:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue | 14 ++++++++++----
applications/task-work-order/src/styles/common/cockpit.scss | 2 +-
applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue | 20 +++-----------------
applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/reasonForRejectionDialog.vue | 6 +++++-
4 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/applications/task-work-order/src/styles/common/cockpit.scss b/applications/task-work-order/src/styles/common/cockpit.scss
index 3c10b27..64f2e18 100644
--- a/applications/task-work-order/src/styles/common/cockpit.scss
+++ b/applications/task-work-order/src/styles/common/cockpit.scss
@@ -475,7 +475,7 @@
.detail-container {
display: flex;
justify-content: space-between;
- height: 680px;
+ max-height: 680px;
.detail-left {
margin-right: 20px;
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue
index c5d77b1..9768af6 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue
+++ b/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>
@@ -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 = {
@@ -479,6 +481,10 @@
</script>
<style scoped lang="scss">
+.detail-container1 {
+display: flex;
+flex-direction: column;
+}
.upload-container {
width: 100%;
}
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue
index f25db98..40cedcf 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue
@@ -183,21 +183,7 @@
const tableData = ref([]) // 附件表格数据
// 文件移除
const handleFileRemove = (file, fileList) => {
-console.log('删除文件', fileList);
uploadedFiles.value = fileList
- // 从已上传文件列表中移除对应文件
- // if (file.response && file.response.attachId) {
- // // uploadedFiles.value = uploadedFiles.value.filter(item => item.attachId !== file.response.attachId)
- // // 找到 id=1 的对象的索引
- // const index = uploadedFiles.value.findIndex(item => item.attachId !== file.response.attachId)
-
- // // 如果找到了，移除该对象
- // if (index !== -1) {
- // uploadedFiles.value.splice(index, 1)
- // }
- // console.log('删除文件', uploadedFiles.value);
-
- // }
// 清空响应数据
if (responseData.value && responseData.value.attachId === file.response?.attachId) {
responseData.value = null
@@ -389,9 +375,9 @@
// 拒绝申请
const rejectTheApplication = () => {
- if (uploadedFiles.value.length === 0) {
- return ElMessage.warning('请上传数据')
- }
+ // if (uploadedFiles.value.length === 0) {
+ // return ElMessage.warning('请上传数据')
+ // }
// 打开拒绝申请弹框
rejectionDialogVisible.value = true
}
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/reasonForRejectionDialog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/reasonForRejectionDialog.vue
index 3fa0b0e..fb8977e 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/reasonForRejectionDialog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/reasonForRejectionDialog.vue
@@ -10,7 +10,7 @@
:close-on-click-modal="false"
>
<div class="detail-container">
- <div class="detail-cell">
+ <div class="detail-cell-reject">
<span class="cell-label">拒绝原因：</span>
<el-input v-model="reasonForRejection" style="width: 380px" type="textarea" :rows="4" placeholder="请输入" />
</div>
@@ -65,4 +65,8 @@
</script>
<style scoped lang="scss">
+.detail-cell-reject {
+display: flex;
+justify-content: flex-start;
+ }
</style>
--
Gitblit v1.9.3