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

package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     
-    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
+    "serve": "vue-cli-service serve",
     "build": "vue-cli-service build"
   },
   "dependencies": {

src/views/system/business.vue

@@ -165,7 +165,7 @@ export default {
             var j = parseInt(res.data.business_list.total)
             this.totalSize = j
             this.showSize = this.totalSize
-  
+
           }
       )
   },
@@ -216,6 +216,7 @@ export default {
               {
                 this.businessData=res.data.business_list.list;
                 this.businessShowData = this.businessData
+
               }
           )
         }
@@ -284,7 +285,9 @@ export default {
             var j = parseInt(res.data.business_list.total)
             this.totalSize = j
             this.showSize = this.totalSize
-  
+            console.log("阿斯蒂芬贵哦")
+
+            console.log(this.businessShowData)
           }
       )
       },

src/views/system/businessInfo.vue

@@ -331,7 +331,8 @@
       findCustomInfoByHead(this.headInfId).then(
               res=>
               {
-                this.customInfoData=res.data.custom_info;
+                if(res.data.custom_info){
+                this.customInfoData=res.data.custom_info;}
               }
           )
       reportFileList(this.businessNum).then(
@@ -494,6 +495,10 @@
   
       // 文件下载
       fileDown: function (){
+        if (this.downSelected2.length+this.downSelected.length==0) {
+          this.$alert("请选择下载文件");
+          return;
+        }
         for (let i = 0; i < this.downSelected2.length; i++) {
           const modname = this.downSelected2[i]; // 要下载的文件名
           request.get(`/report/downloadMod/${modname}`).then(res => {

src/views/system/fieldDerive.vue

@@ -74,7 +74,7 @@
 
               <el-table-column align="center" label="字段状态" >
                 <template v-slot="{row}">
-                  <span>{{ row.status}}</span>
+                  {{ row.status==1 ? '已启用' : '已禁用' }}
                 </template>
               </el-table-column>
 <!-- 

src/views/system/fieldInfo.vue

@@ -69,9 +69,9 @@
                 </template>
               </el-table-column>
 
-                  <el-table-column prop="state" label="状态" >
+                  <el-table-column prop="status" label="状态" >
                     <template slot-scope="scope">
-                      {{ scope.row.state ? '已启用' : '已禁用' }}
+                      {{ scope.row.status==1 ? '已启用' : '已禁用' }}
                     </template>
                   </el-table-column>