Merge pull request 'fix : 优化需求上报时需求征集显示' (#933) from dj into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/933

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

@@ -231,10 +231,10 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <!--        :style="{marginLeft:!formData.isSpecialFund?route.query.id?'-10px':'-10px':route.query.id?'0':'-40px'}">-->
-        <el-col :span="6">
+        <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?route.query.id?'-10px':'0':'0'}">
           <el-form-item label="需求征集" prop="requirementId">
-            <el-select v-model="formData.requirementId" clearable placeholder="请选择需求征集"
+            <template v-if="formData.requirementDefaultName">{{ formData.requirementDefaultName }}</template>
+            <el-select v-else v-model="formData.requirementId" clearable placeholder="请选择需求征集"
                        @change="changeCollectData">
               <el-option
                   v-for="item in requirementList"
@@ -481,7 +481,7 @@ const changeCollectData = () => {
       ...formData.value,
       deploymentId: deploymentId.value,
       fileList: [],
-      requirementId: route.query.id ? route.query.id : formData.value.requirementId ? formData.value.requirementId : '-1'
+      requirementId: route.query.id ? route.query.id : formData.value.requirementId ? formData.value.requirementId : null
     }
     params.fileList = otherFileList.value
     localStorage.setItem('collectData', JSON.stringify(params))
@@ -525,6 +525,7 @@ const getIsFund = async () => {
   // loading.value = true
   await getFormInfo(route.query.id).then(res => {
     if (res.code === 1000) {
+      formData.value.requirementDefaultName = res.data.requirementName
       // loading.value = false
       formData.value.isSpecialFund = res.data.isSpecialFund
       if (res.data.isSpecialFund) {
@@ -742,17 +743,21 @@ const handleResubmit = debounce((instance) => {
 const getDetailInfo = async () => {
   loading.value = true
   await getDetail(route.query.projectId).then(res => {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
     if (res.code === 1000) {
       res.data.formData.specialFundId = res.data.formData.specialFundId === 0 ? null : res.data.formData.specialFundId
+      if (res.data.formData.requirementId == -1) {
+        res.data.formData.requirementId = null
+      }
       formData.value = res.data.formData
       opentionData.value = res.data
       optionalChargeLeadershipList.value = formData.value.optionalChargeLeadership
       loading.value = false
+    }else{
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: res.code === 1000 ? 'success' : 'error'
+      })
     }
   })
 }