Merge remote-tracking branch 'origin/master'

chenyao

2026-01-28 78680af87284d343cf8aba9a10f6ab1923ce1acf

Merge remote-tracking branch 'origin/master'

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

@@ -50,7 +50,7 @@
                    <div class="val">{{ formData.reviewOpinion  }}</div>
                </el-col>
            </el-row>
            <div v-if=" detailObjectionStatus === '1'">
            <div v-if=" detailObjectionStatus === '1' && !requesterProvider">
                <div class="detail-title" :style="{ marginTop:pxToRem(20)}">异议反馈</div>
                <el-form ref="feedbackFormRef" class="gd-dialog-form" :model="feedbackFormData"
                                 :rules="feedbackRules" label-width="140px">
@@ -189,7 +189,7 @@
                </el-button>
                <el-button class="" color="#4C34FF" :loading="submitting" :disabled="submitting" @click="handleApply">申请</el-button>
            </template>
            <template v-if="dialogReadonly && detailObjectionStatus === '1'">
            <template v-if="dialogReadonly && detailObjectionStatus === '1' && !requesterProvider">
                <el-button color="#F2F3F5" :loading="submitting" :disabled="submitting" @click="visible = false">取消</el-button>

                <el-button
@@ -233,8 +233,12 @@
} from '@/views/orderView/orderDataManage/dataObjection/dataObjectionApi'
import { putFileAttachApi } from '@/views/orderView/orderDataManage/supplyAdd/supplyAddApi'
import { pxToRem } from '@/utils/rem'
import { useStore } from 'vuex'
const store = useStore()
const requesterProvider = computed(() => store.state.user.userInfo?.role_id === '2014158512610869250')
// 初始化表单数据
const initForm = () => ({
    id:'',
    title: '',
    objectionType: '',
    submitter: '',
@@ -365,6 +369,8 @@
    try {
        // 构建符合接口要求的提交数据
        const submitData = {
            // 编辑模式下传递id
            ...(formData.value.id && { id: formData.value.id }),
            title: formData.value.title,
            objectionType: formData.value.objectionType,
            submitter: formData.value.submitter,
@@ -438,7 +444,6 @@
    const detailPromises = ids.map(id => getAttachDetailApi({ id }))
    const results = await Promise.all(detailPromises)
    attachmentDetailsList.value = results.map(res => res.data.data).filter(Boolean)
    console.log('附件详情', attachmentDetailsList.value)
}
// 处理附件下载
async function handleDownloadAttach() {

 uniapps/work-app/src/subPackages/workDetail/index.vue

@@ -65,10 +65,13 @@
      </div>
    </div>
    <!-- 操作按钮 -->
    <div class="actionButton">
      <div class="btngroups">
    <div class="actionButton" >
      <div class="btngroups" v-if="workDetailData.eventStatus !== 3">
        <up-button type="primary"  color="#AEAEAE" text="退回" @click="rejectTicket"></up-button>
        <up-button type="primary" color="#1D6FE9" text="确认" @click="confirmTheTicket"></up-button>
      </div>
      <div class="btngroups" v-if="workDetailData.eventStatus === 3">
        <up-button type="primary" color="#1D6FE9" text="已确认" ></up-button>
      </div>
    </div>
    <!-- 分享弹出层 -->
@@ -119,8 +122,6 @@
  const res = await getGddetailedData(params)
  const response = res.data.data
  workDetailData.value = response
  console.log('详情', workDetailData.value)

}
// 图片预览
const previewImage = index => {
@@ -162,7 +163,7 @@
    })
    setTimeout(() => {
      uni.navigateBack()
    }, 1500)
    })
  })

}
@@ -177,7 +178,7 @@
    })
    setTimeout(() => {
      uni.navigateBack()
    }, 1500)
    })
  })
}
// 分享模态框状态