fix : 修改需求征集征集说明输入框

src/views/project-demand/requirement/add.vue

@@ -2,33 +2,33 @@
   <div v-loading="loading" class="add-block">
     <baseTitle title="需求征集信息录入"></baseTitle>
     <el-form :model="formData" inline class="query-form" ref="demandForm" :rules="rules">
-        <el-form-item label="名称" prop="requirementName">
+      <el-form-item label="名称" prop="requirementName">
-          <el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input>
+        <el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input>
-        </el-form-item>
+      </el-form-item>
-        <el-form-item label="所属公司" prop="companyIds">
+      <el-form-item label="所属公司" prop="companyIds">
-          <el-tree-select v-model="formData.companyIds" :data="companyOption" style="width: 100%;"
+        <el-tree-select v-model="formData.companyIds" :data="companyOption" style="width: 100%;"
-                          filterable clearable :check-strictly="true" multiple/>
+                        filterable clearable :check-strictly="true" multiple/>
-        </el-form-item>
+      </el-form-item>
-        <el-form-item label="征集类型" prop="collectType">
+      <el-form-item label="征集类型" prop="collectType">
-          <el-select v-model="formData.collectType" placeholder="征集类型" clearable filterable>
+        <el-select v-model="formData.collectType" placeholder="征集类型" clearable filterable>
-            <el-option
+          <el-option
-                v-for="item in typeOption"
+              v-for="item in typeOption"
-                :key="item.value"
+              :key="item.value"
-                :label="item.label"
+              :label="item.label"
-                :value="item.value"
+              :value="item.value"
-            />
+          />
-          </el-select>
+        </el-select>
-        </el-form-item>
+      </el-form-item>
-        <el-form-item label="截止时间" prop="deadline">
+      <el-form-item label="截止时间" prop="deadline">
-          <el-config-provider>
+        <el-config-provider>
-            <el-date-picker
+          <el-date-picker
-                v-model="formData.deadline"
+              v-model="formData.deadline"
-                type="date"
+              type="date"
-                placeholder="截止时间"
+              placeholder="截止时间"
-                value-format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
-            />
+          />
-          </el-config-provider>
+        </el-config-provider>
-        </el-form-item>
+      </el-form-item>
       <el-row>
         <el-col :span="5">
           <el-form-item label="是否专项资金" prop="isSpecialFund">
@@ -53,8 +53,13 @@
       </el-row>
     </el-form>
     <baseTitle title="征集说明"></baseTitle>
-    <Tinymce  v-if="showTinymce" image-url="/notice/file" file-url="/notice/file"
+    <el-input
-              v-model:value="formData.collectExplain"  />
+        v-model="formData.collectExplain"
+        style="width:100%"
+        :rows="5"
+        type="textarea"
+        placeholder="请输入征集说明"
+    />
     <baseTitle title="申请文件"></baseTitle>
     <file-upload v-if="checkFormPrem('fileList')" @getFile="getFile"/>
     <fvTable style="width: 100%;max-height: 300px;" v-if="showTable"
@@ -67,13 +72,11 @@
     <div class="approval-record">
       <baseTitle title="流程"></baseTitle>
       <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
-      <!--      <div class="process" id="approvalRecord">-->
-      <!--        <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>-->
-      <!--      </div>-->
     </div>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="routerName==='Requirement/add'" @click="handleSubmit(demandForm)">提交</el-button>
       <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
+      <el-button @click="handleBack">返回</el-button>
     </div>
   </div>
 </template>
@@ -91,7 +94,7 @@ import {
 } from "@/api/project-demand/index.js";
 import FileUpload from "@/components/FileUpload.vue";
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {ElMessage, ElMessageBox, ElNotification} from "element-plus";
+import {ElMessageBox, ElNotification} from "element-plus";
 import {useRoute, useRouter} from 'vue-router'
 import {getSubCompOpt} from '@/api/user/user.js'
 import {useTagsView} from '@/stores/tagsview.js'
@@ -110,7 +113,7 @@ const formData = ref({
   deadline: '',
   collectExplain: '',
   fileList: [],
-  isSpecialFund:false
+  isSpecialFund: false
 })
 const showTinymce = ref(true)
 const routerName = ref(router.currentRoute.value.name)
@@ -172,10 +175,12 @@ const tableConfig = reactive({
         return (
             <div>
               <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
+              <popover-delete name={row.originalFileName} type={'文件'} btnType={'danger'}
+                              perm={['mosr:requirement:del']}
+                              onDelete={() => handleDelete(row)}/>
             </div>
         )
       }
-    // <el-button type="primary" size="large" link onClick={() => handleDelete(row)}>删除</el-button>
     }
   ]
 })
@@ -183,7 +188,7 @@ const tableConfig = reactive({
 const checkFormPrem = (formKey) => {
   if (formPermMap.value.hasOwnProperty(formKey)) {
     let formItem = formPermMap.value[formKey];
-    return formItem.perm  === 'EDIT'
+    return formItem.perm === 'EDIT'
   } else {
     return true;
   }
@@ -203,9 +208,10 @@ const compositeParam = (item) => {
   let tag = ''
   if (!formData.value.collectType && routerName.value === 'Requirement/add') {
     tag = '需求征集'
-  }else if(!formData.value.collectType &&routerName.value === 'Requirement/edit'){
+  } else if (!formData.value.collectType && routerName.value === 'Requirement/edit') {
     tag = '需求征集'
-  }if (formData.value.collectType) {
+  }
+  if (formData.value.collectType) {
     tag = formData.value.collectType
   }
   return {
@@ -250,7 +256,7 @@ const init = async () => {
       nextTick(() => {
         processDiagramViewer.value = true
       })
-    }else {
+    } else {
       ElNotification({
         title: '提示',
         message: res.msg,
@@ -277,15 +283,15 @@ const submitParam = (item) => {
     requirementName: item.requirementName,
     fileList: files,
     deploymentId: processInstanceData.value.deploymentId,
-    isSpecialFund:item.isSpecialFund,
+    isSpecialFund: item.isSpecialFund,
-    specialFund:item.specialFund
+    specialFund: item.specialFund
   }
 }
 const handleSubmit = async (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) return
-    const {msg,code} = await addRequirement(submitParam(formData.value))
+    const {msg, code} = await addRequirement(submitParam(formData.value))
     ElNotification({
       title: '提示',
       message: msg,
@@ -338,28 +344,16 @@ const handleBack = () => {
   history.back()
 }
 const handleDelete = (row) => {
-  ElMessageBox.confirm(`确认删除名称为${row.originalFileName}的表格吗?`, '系统提示', {
+  deleteFile(row.fileId).then(res => {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-    deleteFile(row.fileId).then(res => {
-      ElNotification({
-        title: '提示',
-        message: res.msg,
-        type: res.code === 1000 ? 'success' : 'error'
-      })
-      if (res.code === 1000) {
-        formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.id === row.fileId), 1);
-      }
-    });
-  }).catch(() => {
     ElNotification({
       title: '提示',
-      message: '用户取消删除! ',
+      message: res.msg,
-      type: 'warning'
+      type: res.code === 1000 ? 'success' : 'error'
     })
-  })
+    if (res.code === 1000) {
+      formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.id === row.fileId), 1);
+    }
+  });
 }
 
 onMounted(async () => {
@@ -376,9 +370,11 @@ onMounted(async () => {
 :deep(.el-empty__description) {
   margin-top: 0;
 }
-:deep(.el-table--fit ){
+
-  height: 300px!important;
+:deep(.el-table--fit ) {
+  height: 300px !important;
 }
+
 .add-block {
   //display: flex;
   //justify-content: space-between;