Merge pull request 'fix : 修复功能' (#153) from dj into master

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

src/views/projectdemand/demandcollection/detail.vue

@@ -11,7 +11,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="所属公司">
-              <span>{{ getDataSourceOptionItem(formData.companyIds) }}</span>
+              <span>{{ formData.companyIds }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -154,6 +154,7 @@ const init = async () => {
   getInfo(route.query.id).then(res => {
     let data = res.data
     formData.value = data.formData;
+    data.formData.companyIds= getDataSourceOptionItem(data.formData.companyIds)
     processInstanceData.value = data
     processStore.setDesign(data)
     processStore.runningList.value = data.runningList;
@@ -177,15 +178,10 @@ a {
 }
 
 .detail-block {
-  display: flex;
-  justify-content: space-between;
   overflow: hidden;
-  //overflow-y: auto;
   padding-right: 10px;
 
   .left-info {
-    flex: 0.6;
-
     .info {
       display: flex;
       flex-wrap: wrap;
@@ -205,36 +201,10 @@ a {
   }
 
   .approval-record {
-    flex: 0.4;
     padding-bottom: 30px;
-
     .process {
-      //padding-top: 20px;
       position: relative;
-      //max-height: calc(100vh - 96px);
-      //height: calc(100vh - 250px);
-      //height: auto;
-      //overflow: auto;
-
-      //&::-webkit-scrollbar {
-      //  width: 6px;
-      //  height: 6px;
-      //}
-      //
-      //// 滚动条轨道
-      //&::-webkit-scrollbar-track {
-      //  background: rgb(239, 239, 239);
-      //  border-radius: 2px;
-      //}
-      //
-      //// 小滑块
-      //&::-webkit-scrollbar-thumb {
-      //  background: rgba(80, 81, 82, 0.29);
-      //  border-radius: 10px;
-      //}
     }
-
-
   }
 }