后台订单入仓时修改商品品牌；然后再查看该订单详情时，商品的品牌会回显成id值（若选择的是有品牌的则展示有品牌，否则展示无品牌）

http://zentao.jdshangmen.com/bug-view-317.html

src/views/ecw/order/edit.vue

@@ -125,7 +125,7 @@
 
               <el-table-column label="品牌" width="100px">
                 <template slot-scope="{row}">
-                    <dict-selector v-model="row.brand" :type="DICT_TYPE.ECW_IS_BRAND" defaultable @input="calculationPrice(row)" :disabled="!form.lineId || !productEditable" />
+                    <dict-selector v-model="row.brandType" :type="DICT_TYPE.ECW_IS_BRAND" defaultable @input="calculationPrice(row)" :disabled="!form.lineId || !productEditable" />
                 </template>
               </el-table-column>
               <el-table-column label="件数" width="90px">
@@ -726,7 +726,7 @@ export default {
         this.importList.forEach(item => {
             this.productList.push({
                 prodId: item.prodId,
-                brand: item.brandType,
+                brandType: item.brandType,
                 num: item.num,
                 quantity: item.quantity,
                 volume: item.volume,
@@ -875,7 +875,6 @@ export default {
         
         this.productList.map(item => {
             item.prodAttrIds = item.prodAttrArr.join(',')
-            item.brandType = item.brand === '1' ? 1 : 0
         })
         this.transportList.map(item => {
             if(item._enabled){

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

@@ -37,7 +37,7 @@
           <dict-selector :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" v-model="form.material"></dict-selector>
         </el-form-item>
         <el-form-item label="入仓时间">
-          <el-date-picker v-model="form.inTime" type="datetime" placeholder="请选择入仓时间"></el-date-picker>
+          <el-date-picker v-model="form.inTime" type="datetime" placeholder="请选择入仓时间" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
         </el-form-item>
       </el-form>