Merge branch 'dev' of...

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

src/components/ProductSelector/index.vue

@@ -40,7 +40,8 @@ export default {
             let productId = val !== '' && val !== null ? this.list[val].id : null
             console.log('index val', val, productId)
             this.$emit('input', productId)
-            this.$emit('change', val != '' && val !== null ? this.list[val] : null)
+            this.$emit('change', val !== '' && val !== null ? this.list[val] : null)
+            // 0 != ''  是 false
         },
         value(val){
             console.log('初始化内容', val)

src/utils/dict.js

@@ -151,8 +151,9 @@ export const DICT_TYPE = {
   // PAY_TYPE:'payment_type',
   RECEIVE_FLAG:'receive_flag',
   COMDINED_VALUE_ADDED_FEE:'combined_value_added_fee',
-  ORDER_SPECIAL_NEEDS:'order_special_needs',
+  ORDER_SPECIAL_NEEDS:'order_special_needs', // 订单特殊需求
   ORDER_ABNORMAL_STATE:'order_abnormal_state',
+  
   // ========== 出货模块 ==========
   BOX_SHIPMENT_TRAILER_STATUS: 'shipment_trailer_status', // 拖车状态
 }

src/views/ecw/order/edit.vue

@@ -22,15 +22,15 @@
                 </el-descriptions-item>
             </el-descriptions>
             <el-descriptions :column="3" border>
-                <el-descriptions-item label="*发货人" >
-                    <el-form-item label="" label-width="0" style="margin-bottom: 0" prop="consigneeContactsId" required error="发货人不能为空">
+                <el-descriptions-item label="*收货人" >
+                    <el-form-item label="" label-width="0" style="margin-bottom: 0" prop="consigneeContactsId" required error="收货人不能为空">
                         <customer-contact-selector v-model="form.consigneeContactsId" @change="consigneeContact = $event" />
                     </el-form-item>
                 </el-descriptions-item>
                 <el-descriptions-item label="电话">
                     {{consigneeContact.phoneNew || '无'}}
                 </el-descriptions-item>
-                <el-descriptions-item label="发货人公司">
+                <el-descriptions-item label="收货人公司">
                     {{consigneeContact.customerName || '无'}}
                 </el-descriptions-item>
                 <el-descriptions-item label="Email">
@@ -100,12 +100,12 @@
               </el-table-column>
               <el-table-column label="中文品名" width="160px">
                 <template slot-scope="{row}">
-                    <product-selector v-model="row.prodId" @change="row.goodsType = $event ? $event.typeId : null" :disabled="!form.lineId" />
+                    <product-selector v-model="row.prodId" @change="onProductChange(row, $event)" :disabled="!form.lineId" />
                 </template>
               </el-table-column>
               <el-table-column label="英文品名" width="160px">
                 <template slot-scope="{row}">
-                    <product-selector v-model="row.prodId" @change="row.goodsType =$event ? $event.typeId : null" :disabled="!form.lineId" />
+                    <product-selector v-model="row.prodId" @change="onProductChange(row, $event)" :disabled="!form.lineId" />
                 </template>
               </el-table-column>
               <!-- <el-table-column label="商品类型" width="160px">
@@ -364,7 +364,7 @@
             </el-form-item>
 
             <el-form-item label="特殊要求" >
-                <dict-selector v-model="form.packageType" form-type="checkbox" :type="DICT_TYPE.ECW_PACKAGE_TYPE" multiple />
+                <dict-selector v-model="form.packageType" form-type="checkbox" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" multiple />
             </el-form-item>
             <el-form-item label="特殊要求备注">
                 <el-input v-model="form.packageRemarks"  ></el-input>
@@ -514,6 +514,9 @@ export default {
     'form.objectiveId'(){
         this.getOpenedRouterList()
     },
+    'form.transportId'(){
+        this.getOpenedRouterList
+    },
     // 发货联系人发生变化获取发货客户
     consignorContact(){
         this.getConsignor()
@@ -557,6 +560,11 @@ export default {
     }else this.addProduct()
   },
   methods: {
+    onProductChange(row, product){
+        console.log(product)
+        row.goodsType = product ? product.typeId : null
+        row.prodAttrArr = !product ? [] : product.attrId.split(',').filter(item => item !== '').map(item => +item)
+    },
     onAreaChange(type, val){
         this.$set(this.form, type, val)
     },
@@ -627,6 +635,9 @@ export default {
         if(this.form.objectiveId){
             params.destCityId = this.form.objectiveId
         }
+        if(this.form.transportId){
+            params.transportType = this.form.transportId
+        }
         getOpenedRouterList(params).then(res => this.routerList = res.data)
     },
     // 计算体积
@@ -699,7 +710,7 @@ export default {
         // 添加的提交
         createOrder(data).then(response => {
           this.$modal.msgSuccess("新增成功");
-          this.$router.replace('success?orderId=' + response.data.id)
+          this.$router.replace('success?orderId=' + response.data)
         });
       });
     },

src/views/ecw/order/index.vue

@@ -19,7 +19,7 @@
       </el-form-item>
       <el-form-item label="日期筛选">
         <dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" v-model="dateFilterType" style="width: 150px; margin-right: 5px" />
-        <el-date-picker v-model="dateFilter" type="daterange" range-separator="-"  start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd"></el-date-picker>
+        <el-date-picker v-model="dateFilter" type="daterange" range-separator="-"  start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
 
       <el-form-item label="始发地" prop="startWarehouseId">

src/views/ecw/order/success.vue

@@ -16,7 +16,7 @@
                     </span>
                 </div>
                 <div class="line">仓库地址：{{order.logisticsInfoDto.startAddressZh}}</div>
-                <div class="line">仓库电话： <!--TODO--></div>
+                <div class="line">仓库电话： {{order.logisticsInfoDto.startTell}}</div>
                 <div class="line"></div>
                 <div class="line">您的订单已提交，谢谢您选择捷道物流！</div>
           </el-col>