Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/components/WarehouseAreaDialog/index.vue

@@ -285,8 +285,10 @@ export default {
   box-shadow: #8f8f8f 7px 5px 14px 0;
 }
 .warehouse-block-active{
-  box-shadow: #7e9dbd 7px 5px 14px 0;
+  box-shadow: #b1a4cb 7px 5px 14px 0;
   transform: scale(1.04);
+  background-color: #9ab7e1;
+  color: #ffffff;
 }
 .warehouse-block-selected{
   color: #ffffff;

src/views/ecw/order/components/warehouseLocation.vue

@@ -257,8 +257,10 @@ export default {
   box-shadow: #8f8f8f 7px 5px 14px 0;
 }
 .warehouse-block-active{
-  box-shadow: #7e9dbd 7px 5px 14px 0;
+  box-shadow: #b1a4cb 7px 5px 14px 0;
   transform: scale(1.04);
+  background-color: #9ab7e1;
+  color: #ffffff;
 }
 .warehouse-block-selected{
   color: #ffffff;

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -421,7 +421,7 @@ export default {
       opened: false,
       brandList: [],
       form: {
-        // "brand": "0",
+        "brand": "",
         // "brandType": 0,
         // "inTime": "",
         // "material": "",
@@ -487,7 +487,7 @@ export default {
     opened(val) {
       if (val) {
         this.form.material = this.warehousing.material
-        this.form.brand = this.warehousing.brand
+        this.form.brand = this.warehousing.brand.toString()
         this.handleBrandChange(this.form.brand)
       } else {
         this.$emit('update:visible', false)
@@ -605,7 +605,7 @@ export default {
             // 首次入仓
             return orderWarehouseIn({
               ...this.form,
-              brandType: this.form.brand ? 1 : 0,
+              brandType: (this.form.brand && this.form.brand !== '0') ? 1 : 0,
               orderId: this.warehousing.orderId,
               orderItemId: this.warehousing.orderItemId,
               orderNo: this.warehousing.orderNo,

src/views/ecw/productBrank/Empower/index.vue

@@ -252,7 +252,7 @@ export default {
           "customerContactsId": 0,
           "customerId": 0,
           "endTime": "",
-          "feeScale": 0,
+          "feeScale": '0',
           "fileUrl": "",
           "productBrandId": null,
           "startTime": "",