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

shuishen

2026-02-12 3ec8d3625e6fb7614e2ec4bb02ed99a3cdf4cdb7

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

@@ -8,6 +8,7 @@
      :close-on-click-modal="false"
   >
      <div class="detail-container  detail-container1" v-if="dialogReadonly">
         <div class="detail-title">异议详情</div>
         <el-row class="detail-row-view">
            <el-col :span="12">
               <div class="label">标题</div>
@@ -50,7 +51,7 @@
               <div class="val">{{ formData.reviewOpinion  }}</div>
            </el-col>
         </el-row>
         <div v-if=" detailObjectionStatus === '1' && !requesterProvider">
         <div v-if=" detailObjectionStatus === '1' && permission.orderData_feedback">
            <div class="detail-title" :style="{ marginTop:pxToRem(20)}">异议反馈</div>
            <el-form ref="feedbackFormRef" class="gd-dialog-form" :model="feedbackFormData"
                         :rules="feedbackRules" label-width="140px">
@@ -87,7 +88,7 @@
         :model="formData"
         :rules="rules"
         :disabled="dialogReadonly"
         label-width="180px"
         :label-width="pxToRem(144)"
      >
         <el-row>
            <el-col :span="12">
@@ -162,7 +163,7 @@
                        class="upload-demo"
                     >
                        <template #trigger>
                           <el-button type="primary">选择文件</el-button>
                           <el-button class="gd-upload-btn" type="primary">选择文件</el-button>
                        </template>
                        <template #tip>
                           <div class="el-upload__tip">支持上传 (.zip/.rar/.7z/.tar/.gz)格式</div>
@@ -188,7 +189,7 @@
   </el-button>
   <el-button class="" color="#4C34FF" :loading="submitting || uploading" :disabled="submitting || uploading" @click="handleApply">申请</el-button>
         </template>
         <template v-if="dialogReadonly && detailObjectionStatus === '1' && !requesterProvider">
         <template v-if="dialogReadonly && detailObjectionStatus === '1' && permission.orderData_feedback">
            <el-button color="#F2F3F5" :loading="submitting" :disabled="submitting" @click="visible = false">取消</el-button>

            <el-button
@@ -269,8 +270,10 @@
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 permission = computed(() => store.state.user.permission);
// const requesterProvider = computed(() => store.state.user.userInfo?.role_id === '2014158512610869250')
// 初始化表单数据
const initForm = () => ({
   id:'',
@@ -329,13 +332,13 @@

// 表单校验规则
const rules = {
   title: fieldRules(true),
   title: fieldRules(true,50),
   objectionType: fieldRules(true),
   submitter: fieldRules(true),
   submitterContact: fieldRules(true),
   catalogResourceName: fieldRules(true),
   objectionDesc: fieldRules(true),
   objectionBasis: fieldRules(true),
   submitter: fieldRules(true,50),
   submitterContact: fieldRules(true,50),
   catalogResourceName: fieldRules(true,50),
   objectionDesc: fieldRules(true,200),
   objectionBasis: fieldRules(true,200),
   attachId: fieldRules(true)

}