Merge remote-tracking branch 'origin/develop' into develop

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue

@@ -138,7 +138,7 @@
               ref="multipleTable"
               :data="sarProStateListDatas"
               tooltip-effect="dark"
-              style="width: 100%"
+              style="width: 100%;"
               border
               :height="sarProStateTableHeight"
               :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -157,7 +157,7 @@
             <el-table-column
               width="150px"
               align="center"
-                prop="standNumber"
+                prop="productId"
                 label="项目编号">
             </el-table-column>
             <el-table-column
@@ -354,6 +354,13 @@ export default {
           loading: 'loading'
         }, res => {
           if (res.ok) {
+            res.data.records.forEach((item)=>{
+              for(let key  in item){
+                if(item[key] == null){
+                  item[key]='无'
+                }
+              }
+            })
             this.sarProStateListDatas = res.data.records
             this.sarProStateTotal = res.data.total
           }
@@ -385,8 +392,10 @@ export default {
   mounted () {
     this.queryStandAndLaws()
     this.tableHeight = $('.regulatory-repository').height() - 159
+    this.sarProStateTableHeight=$('.regulatory-repository').height() -120
     window.onresize = () => {
       this.tableHeight = $('.regulatory-repository').height() - 159
+      this.sarProStateTableHeight=$('.regulatory-repository').height() - 120
     }
   }
 }