fix : 修改征集类型为字典、直接上报时详情专项资金回显、项目归档-需求征集文件回显、重大项目前置流程必填

src/components/AttachmentUpload.vue

@@ -7,9 +7,11 @@
             <el-button type="primary" link @click="handleDownload(singleFile)" style="font-size: 16px">
               {{ singleFile ? singleFile?.originalFileName : formData.singleFile?.originalFileName }}
             </el-button>
-            <el-button type="danger" link @click="deleteSingleFile(singleFile?singleFile:formData.singleFile,1)">删除</el-button>
+            <el-button type="danger" link @click="deleteSingleFile(singleFile?singleFile:formData.singleFile,1)">删除
+            </el-button>
           </template>
-          <template v-else-if="!preview||JSON.stringify(singleFile) == '{}'||singleFile==null||formData.singleFile==null">
+          <template
+              v-else-if="!preview||JSON.stringify(singleFile) == '{}'||singleFile==null||formData.singleFile==null">
             <file-upload @getFile="getAttachment" :showFileList="showFileList" :multiple="false" :maxSize="1"
                          :disabled="isSingleFile" @delete="deleteAttachment"/>
           </template>
@@ -97,7 +99,7 @@ const tableConfig = reactive({
       currentRender: ({row, index}) => {
         let btn = []
         btn.push({label: '下载', func: () => handleDownload(row), type: 'primary'})
-        // if (row.newFile){
+        // if (row.newFile) {
         //   btn.push({label: '删除', func: () => handleDelete(row), type: 'primary'})
         // }
         return (
@@ -116,7 +118,7 @@ const tableConfig = reactive({
               {
                 row.newFile || props.preview || !props.preview ?
                     <popover-delete name={row.originalFileName} type={'文件'} btnType={'danger'}
-                                    perm={['mosr:requirement:del']}
+                        // perm={['']}
                                     onDelete={() => handleDelete(row)}/>
                     : ''
               }
@@ -137,7 +139,7 @@ watch(() => props.showTable, (newVal) => {
   props.showTable = newVal
 }, {deep: true})
 watch(() => props.formData.fileList, (newVal) => {
-  console.log('newVal-fileList', newVal)
+  // console.log('newVal-fileList', newVal)
   if (props.preview) {
     newVal?.forEach(item => {
       allFileList.value.push(item)
@@ -145,7 +147,7 @@ watch(() => props.formData.fileList, (newVal) => {
   }
 }, {deep: true})
 watch(() => props.otherFileList, (newVal) => {
-  console.log('newotherFileList', newVal,props.formData)
+  // console.log('newotherFileList', newVal, props.formData)
   if (props.preview) {
     if (props.formData.fileList === null || props.formData.fileList.length === 0) {
       allFileList.value = newVal
@@ -159,7 +161,7 @@ watch(() => props.otherFileList, (newVal) => {
   }
 }, {deep: true})
 watch(() => props.formData.singleFile, (newVal) => {
-  console.log('singleFile', newVal)
+  // console.log('singleFile', newVal)
   singleFile.value = newVal
 }, {deep: true})
 watch(() => isSingleFile.value, (newVal) => {

src/components/DetailComponent/ProjectApply.vue

@@ -3,7 +3,7 @@
     <el-form :model="localFormData" ref="formRef" label-width="auto" :rules="rules" v-if="step!=='50'">
       <el-row>
         <el-col :span="12">
-          <el-form-item label="前置流程" :required="true" prop="requestName">
+          <el-form-item label="前置流程" :required="preProcessRequired" prop="requestName">
             <a :href="localFormData.preProcess?.baseUrl" target="_blank"
                style="color: #2a99ff;margin-right: 10px;cursor: pointer">{{ localFormData.preProcess?.requestName }}</a>
             <el-button color="#DED0B2" @click="handleShowPreTable">
@@ -147,6 +147,7 @@ const props = defineProps({
 const preProcessList = ref([])
 //暂存数据
 const currentList = ref([])
+const preProcessRequired = ref(false)
 const total = ref(0)
 const preProcessForm = reactive({
   requestName: ''
@@ -169,6 +170,7 @@ const localFormData = ref({
   }
 })
 const attachment = ref()
+const deploymentData = ref({})
 const showPreTable = ref(false)
 const showTable = ref(true)
 const loading = ref(false)
@@ -245,7 +247,7 @@ const compositeParam = (item) => {
     originalFileName: item.originalFilename,
     fileType: item.fileType,
     url: item.url,
-    newFile: false,
+    newFile: true,
     tag: getTitleName(props.title)
   }
 }
@@ -269,12 +271,14 @@ const getFileParam = (item) => {
   }
 }
 const handleSubmit = async () => {
-  if (localFormData.value.preProcess === undefined) {
-    ElNotification({
-      title: '提示',
-      message: '请选择前置流程',
-      type: 'error'
-    })
+  if(deploymentData.value.deploymentName==='重大项目立项'||deploymentData.value.deploymentName==='重大项目验收'){
+    if (localFormData.value.preProcess === undefined) {
+      ElNotification({
+        title: '提示',
+        message: '请选择前置流程!',
+        type: 'error'
+      })
+    }
   }
   let files = []
   if (props.mode === 'resubmit') {
@@ -289,7 +293,7 @@ const handleSubmit = async () => {
   // if (localFormData.value.singleFile !== undefined) {
   //   localFormData.value.singleFile = getFileParam(localFormData.value.singleFile)
   // }
-  console.log('attachment.value.singleFile', attachment.value, attachment.value.singleFile)
+  // console.log('attachment.value.singleFile', attachment.value, attachment.value.singleFile)
   // if (localFormData.value.singleFile) {
   //
   // } else {
@@ -372,6 +376,8 @@ const init = async () => {
   if (res.code === 1000) {
     let data = res.data
     deploymentId.value = data.deploymentId
+    deploymentData.value = data
+    preProcessRequired.value = data.deploymentName === '重大项目立项'||data.deploymentName === '重大项目验收';
     processStore.setDesign(data)
     processStore.runningList.value = data.runningList;
     processStore.endList.value = data.endList;

src/components/PopoverDelete.vue

@@ -9,7 +9,8 @@
       @cancel="handleCancel"
   >
     <template #reference>
-      <el-button v-perm="perm"  :type="btnType" size="mini" :disabled="isDisabled" :icon="btnIcon" :plain="isPlain" :link="link">
+<!--      v-perm="perm"-->
+      <el-button  :type="btnType" size="mini" :disabled="isDisabled" :icon="btnIcon" :plain="isPlain" :link="link">
         {{ btnText }}
       </el-button>
     </template>