Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/RMS/components/capacity.vue

@@ -243,6 +243,8 @@ export default {
         let data = dataArr.map(v => filterVal.map(j => v[j])) //3.formatJson格式转换
         export_json_to_excel(tHeader, data, title) // (title)导出的表格名称
       })
+      this.tableloading=false
+      this.selectLoading=false   
     },
     onclick() {
       this.isKuang = true;

src/views/RMS/components/editCapacity.vue

@@ -187,7 +187,7 @@ export default {
     margin-left: 40%;
   }
   .form_box_capacity {
-    margin-left: 30%;
+    margin-left: 35%;
     width: 340px;
     .el-form {
       .preview-group {

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -2269,7 +2269,7 @@ export default {
               this.getSteelReport()
               loading.close()
             } else {
-              this.$message.success('变更失败，请联系管理员')
+              this.$message.success(res.data.data)
               this.operation(this.steelMap)
               this.getSteelReport()
               loading.close()