Merge branch 'dev0.4' into dev

src/views/ecw/customer/edit.vue

@@ -152,6 +152,7 @@
                   v-model="form.createTime"
                   type="datetime"
                   value-format="timestamp"
+                  disabled
                   :placeholder="$t('选择创建时间')">
                 </el-date-picker>
               </el-form-item>

src/views/ecw/offer/edit.vue

@@ -223,7 +223,7 @@
                     <el-form-item label=""
                         :prop="`prodCreateReqVOList.${scope.$index}.worth`"
                         :rules="{
-                            required: true, message: $t('货值不能为空'), trigger: 'blur'
+                            // required: true, message: $t('货值不能为空'), trigger: 'blur'
                         }"
                         class="mb-0 mr-0"
                     >
@@ -1095,6 +1095,7 @@ export default {
             if(!tmp.weight)tmp.weight = 1
             if(!tmp.quantity)tmp.quantity = 1
             if(!tmp.num)tmp.num = 1
+            if(!tmp.worth)tmp.worth = 1
             arr.push(tmp)
         })
         return arr

src/views/ecw/order/detail.vue

@@ -121,7 +121,7 @@
             <el-table-column prop="sumNum" :label="$t('入仓件数')"  width="90px">
               <template slot-scope="{row}">
                 <el-link type="primary" @click.native="showWarehouseLogs(row)">{{row.warehouseInInfoVO ? row.warehouseInInfoVO.cartonsNum : 0}}</el-link>
-                <div v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.isMultiSpecification">(多规格)</div>
+                <div v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.isMultiSpecification">({{$t('多规格')}})</div>
               </template>
             </el-table-column>
             <el-table-column prop="unit" :label="$t('单位')" width="90px">

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

@@ -30,9 +30,8 @@
           prop="address"
           :label="$t('入库货物属性')">
           <template v-slot="{row}">
-            <!-- // TODO 缺少入库品牌信息 -->
             <template v-if="row.warehouseInInfoVO">
-              {{$t('品牌')}}：<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" /><br>
+              {{$t('品牌')}}：<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" /><br>
               {{$t('箱数')}}：{{ row.warehouseInInfoVO.cartonsNum }}<br>
               {{$t('体积')}}：{{ row.warehouseInInfoVO.volume }}m³<br>
               {{$t('重量')}}：{{ row.warehouseInInfoVO.weight }}Kg