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

src/views/RMS/components/addCapacity.vue

@@ -89,11 +89,16 @@ export default {
       accessToken: null,
       userCode: null,
       carrierUserId: null,
-      carrierId: null
+      carrierId: null,
+      orgcode:null
     };
   },
   created() {
     this.carrierUserId = getCookie("userId");
+    this.orgcode = getCookie("orgCode");
+    if(this.orgcode === "wuliuyunshubu" || this.orgcode === "dagangadmin"){
+      
+    }
     this.form1 = this.form1Initialization;
   },
   mounted() {

src/views/RMS/components/editCapacity.vue

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