Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/project-demand/requirement/detail.vue

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

@@ -57,7 +57,7 @@
               v-model:value="formData.collectExplain"  />
     <baseTitle title="申请文件"></baseTitle>
     <file-upload v-if="checkFormPrem('fileList')" @getFile="getFile"/>
-    <fvTable style="width: 100%;max-height: 600px;height: 600px" v-if="showTable"
+    <fvTable style="width: 100%;max-height: 300px;" v-if="showTable"
              :tableConfig="tableConfig" :data="formData.fileList"
              :isSettingCol="false" :pagination="false" perm="EDIT">
       <template #empty>
@@ -74,7 +74,6 @@
     <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>
@@ -367,7 +366,7 @@ onMounted(async () => {
   margin-top: 0;
 }
 :deep(.el-table--fit ){
-  height: 600px;
+  height: 300px!important;
 }
 .add-block {
   //display: flex;

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

@@ -76,7 +76,7 @@
       </el-row>
     </el-form>
     <div class="oper-page-btn" v-if="processInstanceData.state === '1' && processInstanceData.taskId">
-      <el-button @click="handleReject(demandForm)">驳回</el-button>
+      <el-button type="danger" @click="handleReject(demandForm)">驳回</el-button>
       <el-button color="#DED0B2" @click="handleSubmit">同意</el-button>
     </div>
   </div>
@@ -247,6 +247,13 @@ const init = async () => {
   await getCompanyOption()
   await getFundOptions()
   getInfo(route.query.id).then(res => {
+    if (res.code !== 1000) {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
+    }
     loading.value = false
     let data = res.data
     formData.value = data.formData;
@@ -335,9 +342,8 @@ const handleDelete = (row) => {
 }
 
 :deep(.el-table--fit ) {
-  height: 600px;
+  height: 300px !important;
 }
-
 .detail-block {
   overflow: hidden;
   padding-right: 10px;