优惠更新时间字段待完善

src/views/ecw/coupon/index.vue

@@ -169,6 +169,12 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column-->
+      <el-table-column :label="$t('更新人') + '/' + $t('更新时间')" align="center" width="180">
+        <template slot-scope="scope">
+          <div>{{ scope.row.updaterName }}</div>
+          <div>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</div>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('状态')" align="center" prop="createTime" width="180">
         <template slot-scope="{row}">
           <dict-tag :type="DICT_TYPE.ECW_IS_DRAFT" :value="row.status" />

src/views/ecw/order/index.vue

@@ -295,7 +295,7 @@
                       include(scope.row.inWarehouseState, [202, 207, 202, 209, 210, 202, 211, 212, 202, 213, 214, 215, 216, 204, 205]) &&
                       scope.row.status != 11 && exclude(scope.row.shipmentState, [314,315,317,318])
                     ">
-                    <el-dropdown-item @click.native="$router.push('/order/warehousing-update?id=' + scope.row.orderId)"  v-hasPermi="['ecw:order:update']">{{$t('入仓修改')}}</el-dropdown-item>
+                    <el-dropdown-item @click.native="$router.push('/order/warehousing-update?id=' + scope.row.orderId)"  v-hasPermi="['ecw:order:update']" :disabled="scope.row.parentOrderId">{{$t('入仓修改')}}</el-dropdown-item>
                   </template>
 
                   <!-- 退仓 -->

src/views/ecw/productPrice/edit.vue

@@ -336,7 +336,7 @@ export default {
       checkList: [],
       selectedRoutes: [], // 勾选的路线渠道
       form: {
-        minWeightUnit: undefined,
+        minWeightUnit: 0,
         priceStepList: [], // 阶梯价格
         specialList: []
       },
@@ -451,7 +451,7 @@ export default {
       this.syncSpecialUnit({allPriceUnit})
     },
     'form.allVolumeUnit'(allVolumeUnit){
-      // 最小其计量
+      // 最小起计量
       this.$set(this.form, 'minWeightUnit', allVolumeUnit)
       this.syncSpecialUnit({allVolumeUnit})
     },
@@ -557,6 +557,7 @@ export default {
         validateStartDate: undefined,
         clearancePrice: 0,
         transportPrice: 0,
+        minWeight: 0,
         minWeightUnit: null
       }
       // 默认体积单位（立方米）