Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue

@@ -188,7 +188,7 @@
         formobj: {
           sid: '',
           warehouseName: '',
-          warehouseCode: '由系统自动生成。',
+          warehouseCode: '由系统自动生成',
           warehouseTypeKey: '',
           warehouseTypeValue: '',
           contacts: "",
@@ -198,7 +198,7 @@
           managerSid: '',
           longitude: '',
           latitude: '',
-          usageStatus: "",
+          usageStatus: "1",
           address: '',
           squareMeter: '',
           sortNo: '',
@@ -268,19 +268,19 @@
         }).then((res) => {
           if (res.success) {
             this.formobj.createOrgSid = res.data
-
-            req.selMangerByRole({
-                createOrgSid: res.data
-              })
-              .then(resp => {
-                if (resp.success) {
-                  this.managerList = resp.data
-                }
-              })
-              .catch(e => {})
           }
         })
 
+        req.selMangerByRole({
+            useOrgSid: window.sessionStorage.getItem('departmentSid')
+          })
+          .then(resp => {
+            if (resp.success) {
+              this.managerList = resp.data
+            }
+          })
+          .catch(e => {})
+
       },
       selectWarehouseTypeChange(val) {
 
@@ -318,7 +318,7 @@
         this.formobj = {
           sid: '',
           warehouseName: '',
-          warehouseCode: '',
+          warehouseCode: '由系统自动生成',
           warehouseTypeKey: '',
           warehouseTypeValue: '',
           contacts: "",
@@ -327,7 +327,7 @@
           manager: '',
           longitude: '',
           latitude: '',
-          usageStatus: "",
+          usageStatus: "1",
           address: '',
           squareMeter: '',
           sortNo: '',
@@ -401,4 +401,10 @@
     justify-content: space-between;
     align-items: center;
   }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+    display: inline;
+    line-height: 1px;
+    vertical-align: middle;
+  }
 </style>

yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue

@@ -152,7 +152,7 @@
         formobj: {
           sid: '',
           areaName: '',
-          areaCode: '由系统自动生成。',
+          areaCode: '由系统自动生成',
           volume: '',
           unit: '',
           remarks: '',
@@ -273,7 +273,7 @@
         this.formobj = {
           sid: '',
           areaName: '',
-          areaCode: '',
+          areaCode: '由系统自动生成',
           volume: '',
           unit: '',
           remarks: '',