Merge pull request 'fix : 修复编辑需求征集, 所有公司回显' (#628) from dd into master

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

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

@@ -54,16 +54,12 @@
           </el-form-item>
         </el-col>
         <el-col :span="24" style="margin-bottom: -25px">
-          <el-form-item label="征集公司" :required="true" prop="" class="tree-select" label-width="96">
+          <el-form-item label="征集公司" :required="true" prop="" class="company-select" label-width="96">
             <div style="width: 100%">
               <el-button color="#DED0B2" @click="showCompany">{{ selectedCompanyList.length === 0 ? '请选择征集公司' : '更改' }}
               </el-button>
             </div>
-            <div v-if="route.query.id" :class="showExpendClass(showMoreCompany)">{{
-                getName(selectedCompanyList)
-              }}
-            </div>
-            <div v-else :class="showExpendClass(showMoreCompany)">{{ getName(selectedCompanyList) }}</div>
+            <div :class="showExpendClass(showMoreCompany)">{{ getName(selectedCompanyList) }}</div>
             <div style="color: #2a99ff;text-align: center;width: 100%;font-size: 15px;cursor: pointer"
                  @click="handleExpend">
               {{ showExpendText }}
@@ -464,7 +460,16 @@ const getCompanyOptionItem = (val) => {
 const getDetailInfo = async () => {
   getFormInfo(route.query.id).then(res => {
     if (res.code === 1000) {
-      selectedCompanyList.value = getCompanyOptionItem(res.data.companyIds)
+      if (res.data.companyIds[0] == -1) {
+        selectedCompanyList.value = [
+          {
+            value:-1,
+            label:'所有公司'
+          }
+        ]
+      } else {
+        selectedCompanyList.value = getCompanyOptionItem(res.data.companyIds)
+      }
       formData.value = res.data
       if (res.data.fileList.length !== 0) {
         showTable.value = false
@@ -514,7 +519,7 @@ onMounted(async () => {
   margin-top: 0;
 }
 
-.tree-select {
+.company-select {
   :deep(.el-form-item__content .el-select__wrapper ) {
     width: 750px;
   }