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

package.json

@@ -76,7 +76,8 @@
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0",
     "xlsx": "^0.18.5",
-    "xml-js": "^1.6.11"
+    "xml-js": "^1.6.11",
+    "@vue/runtime-dom": "latest"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",

src/App.vue

@@ -50,7 +50,7 @@ export default  {
   padding: 50px;
   text-align: center;
 }
-$sizes: 0, 10,20,30,50,100,150,200,500,800,1000;
+$sizes: 0, 10,20,30,50,100,150,200,300,500,800,1000;
 @for $i from 1 through length($sizes){
   $item: nth($sizes, $i);
   .ml-#{$item}{

src/components/ChooseContactDialog/index.vue

@@ -14,7 +14,7 @@
                 </div>
                 <div class="line">
                     <div class="label">电话：</div>
-                    <div class="value">{{item.areaCode}} {{item.phoneNew}}</div>
+                    <div class="value">+{{item.areaCode}} {{item.phoneNew}}</div>
                 </div>
                 <div class="line">
                     <div class="label">邮箱：</div>

src/views/ecw/coupon/edit.vue

@@ -212,7 +212,7 @@
 				prop="brand"
                 v-if="form.type != 1"
 			>
-                <dict-selector form-type="checkbox" :type="DICT_TYPE.BRAND_REG_TYPE" v-model="form.brandArr" multiple />
+                <dict-selector form-type="checkbox" :type="DICT_TYPE.BOX_SHIPPING_BRAND_TYPE" v-model="form.brandArr" multiple />
 			</el-form-item>
             <el-form-item
 				:label="$t('是否控货')"

src/views/ecw/customer/edit.vue

@@ -770,7 +770,7 @@ export default {
         "position": "",
         "social": undefined,
         "socialNumber": "",
-        "userid": [],
+        "userid": undefined,
         // "username": ""
       })
     },

src/views/ecw/order/detail.vue

@@ -147,7 +147,7 @@
             </el-table-column>
             <el-table-column prop="warehouseInInfoVO.quantityAll" :label="$t('数量') + '(个)'"  width="90px">
               <template slot-scope="{row}">
-                {{order.inWarehouseState > 1 ? row.warehouseInInfoVO.quantityAll : row.quantity}}
+                {{(order.inWarehouseState > 1 && row.warehouseInInfoVO) ? row.warehouseInInfoVO.quantityAll : row.quantity}}
               </template>
             </el-table-column>
             <el-table-column prop="" :label="$t('费用类型')">

src/views/ecw/order/edit.vue

@@ -363,8 +363,9 @@
                     :disabled="false"
                     ></area-selector>
                 </el-form-item>
+                <br/>
                 <el-form-item :label="$t('收货详细地址')" prop="consigneeAddress">
-                    <el-input v-model="form.consigneeAddress"  :disabled="false"></el-input>
+                    <el-input v-model="form.consigneeAddress"  :disabled="false" class="w-300"></el-input>
                 </el-form-item>
             </div>
             <div>
@@ -517,6 +518,7 @@ import {calculationPrice} from '@/api/ecw/product'
 import SupplierSelector from '@/components/SupplierSelector'
 import Decimal from 'decimal.js'
 import WorkFlow from '@/components/WorkFlow'
+import { getCustomer } from "@/api/ecw/customer";
 
 // 缓存默认的表单数据
 let defaultFormData = null
@@ -793,6 +795,16 @@ export default {
             this.$set(this.form, 'externalWarehouseDtoList', [{}])
         }
     },
+    // 选择送货上门需要查询并填充默认地址
+    'form.harvestMethod'(harvestMethod){
+        if(harvestMethod == 2 && !this.form.address && this.form.consigneeId){
+            getCustomer(this.form.consigneeId).then(res => {
+                if(res.data.address){
+                    this.$set(this.form, 'consigneeAddress', res.data.address)
+                }
+            })
+        }
+    },
     /* 'form.orderItemVOList'(){
         console.log('form.orderItemVOList', this.form.orderItemVOList.length, this.form.orderItemVOList)
     }, */

src/views/ecw/order/index.vue

@@ -256,10 +256,10 @@
               </el-dropdown-menu>
             </el-dropdown>
 
-            <el-divider direction="vertical"></el-divider>
+            <el-divider direction="vertical" v-if="scope.row.status != 0"></el-divider>
 
             <!--仓库相关的-->
-            <el-dropdown>
+            <el-dropdown v-if="scope.row.status != 0">
               <el-button type="text">{{$t('仓库')}}</el-button>
               <el-dropdown-menu slot="dropdown">
                 <!-- 入仓操作 -->
@@ -325,10 +325,10 @@
               </el-dropdown-menu>
             </el-dropdown>
 
-            <el-divider direction="vertical"></el-divider>
+            <el-divider direction="vertical" v-if="scope.row.status != 0"></el-divider>
 
             <!--打印相关的-->
-            <el-dropdown>
+            <el-dropdown v-if="scope.row.status != 0">
               <el-button type="text">{{$t('打印')}}</el-button>
               <el-dropdown-menu slot="dropdown">
                 <!-- 打印标签 -->

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

@@ -57,7 +57,7 @@
               </el-descriptions-item>
             </el-descriptions>
             <el-form-item label="材质" style="margin-top: 20px">
-              <dict-selector :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" v-model="form.material"></dict-selector>
+              <dict-selector :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" v-model="form.material" clearable></dict-selector>
             </el-form-item>
             <el-form-item label="入仓时间" v-if="!edit">
               <el-date-picker v-model="form.inTime" type="datetime" placeholder="请选择入仓时间" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>

src/views/ecw/order/warehousing/index.vue

@@ -67,9 +67,15 @@
         prop="diffType"
         v-slot="{row}"
         :label="$t('状态')">
-        <dict-tag v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.diffType" :type="DICT_TYPE.ORDER_WAREHOUSE_IN_STATUS" :value="row.warehouseInInfoVO.diffType" class="red" :class="{green: row.warehouseInInfoVO.diffType === 4}"/>
-        <span class="red" v-else-if="row.warehouseInInfoVO && row.warehouseInInfoVO.cartonsNumDiff">{{ row.warehouseInInfoVO.cartonsNumDiff }}{{$t('箱')}}</span>
+        <dict-tag
+          v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.diffType"
+          :type="DICT_TYPE.ORDER_WAREHOUSE_IN_STATUS"
+          :value="row.warehouseInInfoVO.diffType"
+          class="red"
+          :class="{green: row.warehouseInInfoVO.diffType === 4}"
+        />
         <span :class="{red: row.itemStatus === 3}" v-else>{{ row.itemStatus === 3 ? ($t('少了') + row.num + $t('箱')) : $t('待入仓') }}</span>
+        <span class="red" v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.cartonsNumDiff">{{ row.warehouseInInfoVO.cartonsNumDiff }}{{$t('箱')}}</span>
       </el-table-column>
       <el-table-column
         prop="address"