backup

src/components/ProductSelector/index.vue

@@ -13,7 +13,7 @@
         <el-option
         v-for="(item, index) in list"
         :key="item.id"
-        :label="item.titleZh"
+        :label="item['title' + lang]"
         
         :value="index">
         </el-option>
@@ -26,7 +26,11 @@ export default {
     props:{
         productType: [String, Number],
         value: [String, Number],
-        disabled: Boolean
+        disabled: Boolean,
+        lang: {
+            type: String,
+            default: 'Zh'
+        }
     },
     data(){
         return {

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

@@ -16,6 +16,8 @@
         <template v-for="item in detail.orderSplitBackVOList">
         <div class="title" :key="item.orderNo">
             {{item.orderNo}}
+            <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="item.transportId" />
+            
         </div>
         <el-table :data="item.orderSplitItemBackVOList" :key="'items-' + item.orderNo">
           <el-table-column label="序号">

src/views/ecw/order/edit.vue

@@ -112,7 +112,7 @@
               </el-table-column>
               <el-table-column label="英文品名" width="160px">
                 <template slot-scope="{row}">
-                    <product-selector v-model="row.prodId" @change="onProductChange(row, $event)" :disabled="!form.lineId" />
+                    <product-selector lang="En" v-model="row.prodId" @change="onProductChange(row, $event)" :disabled="!form.lineId" />
                 </template>
               </el-table-column>
               <!-- <el-table-column label="商品类型" width="160px">
@@ -314,27 +314,25 @@
                     </el-form-item>
                 </el-descriptions-item>
 
-                <template v-if="homeDeliveryService">
                 
-                    <el-descriptions-item label="入仓类型">
-                        <dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="form.warehouseType" />
-                    </el-descriptions-item>
-                    <el-descriptions-item label="收货方式">
-                        <dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.harvestMethod" />
-                    </el-descriptions-item>
-                    <el-descriptions-item label="收货地区" :span="2">
-                        <area-selector
-                        @countryChange="onAreaChange('country', $event)"
-                        @provinceChange="onAreaChange('province', $event)"
-                        @cityChange="onAreaChange('city', $event)"
-                        ></area-selector>
-                    </el-descriptions-item>
-                    <el-descriptions-item label="收货详细地址" :span="2">
-                        <el-form-item label="" label-width="0" style="margin-bottom: 0" prop="consigneeAddress" required error="收货详细地址不能为空">
-                            <el-input v-model="form.consigneeAddress" placeholder=""></el-input>
-                        </el-form-item>
-                    </el-descriptions-item>
-                </template>
+                <el-descriptions-item label="入仓类型">
+                    <dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="form.warehouseType" />
+                </el-descriptions-item>
+                <el-descriptions-item label="收货方式">
+                    <dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.harvestMethod" :filter="item => item.value == 1 || homeDeliveryService" defaultable />
+                </el-descriptions-item>
+                <el-descriptions-item label="收货地区" :span="2" v-if="homeDeliveryService">
+                    <area-selector
+                    @countryChange="onAreaChange('country', $event)"
+                    @provinceChange="onAreaChange('province', $event)"
+                    @cityChange="onAreaChange('city', $event)"
+                    ></area-selector>
+                </el-descriptions-item>
+                <el-descriptions-item label="收货详细地址" :span="2" v-if="homeDeliveryService">
+                    <el-form-item label="" label-width="0" style="margin-bottom: 0" prop="consigneeAddress" required error="收货详细地址不能为空">
+                        <el-input v-model="form.consigneeAddress" placeholder=""></el-input>
+                    </el-form-item>
+                </el-descriptions-item>
                 
                 <el-descriptions-item label="付款人" :span="2">
                      <dict-selector :type="DICT_TYPE.DRAWEE" v-model="form.drawee" defaultable form-type="radio" />

src/views/ecw/order/release.vue

@@ -5,7 +5,7 @@
             <dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.pickType" form-type="radio" formatter="number"></dict-selector>
           </el-form-item>
           <el-form-item label="提货时间" v-if="form.pickType == 1">
-            <el-date-picker v-model="form.pickTime" placeholder="" value-format="yyyy-MM-dd"></el-date-picker>
+            <el-date-picker v-model="form.pickTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
           </el-form-item>
 
           <template v-if="form.pickType == 2">
@@ -23,10 +23,10 @@
                 <el-input v-model="form.trackingNumber" placeholder=""></el-input>
             </el-form-item>
             <el-form-item label="送货时间">
-                <el-date-picker v-model="form.deliverTime" placeholder="" value-format="yyyy-MM-dd"></el-date-picker>
+                <el-date-picker v-model="form.deliverTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
             </el-form-item>
             <el-form-item label="签收时间">
-                <el-date-picker v-model="form.pickTime" placeholder="" value-format="yyyy-MM-dd"></el-date-picker>
+                <el-date-picker v-model="form.pickTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
             </el-form-item>
           </template>