bug

src/views/ecw/order/index.vue

@@ -292,8 +292,10 @@
                   </template>
                   <!-- 入仓修改 -->
                   <template v-if="
-                      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])
+                      (
+                        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']" :disabled2="scope.row.parentOrderId">{{$t('入仓修改')}}</el-dropdown-item>
                   </template>

src/views/ecw/productPrice/edit.vue

@@ -244,7 +244,7 @@
     <el-dialog :title="$t('查看价格日志')" :visible="showLogsDialog" :before-close="closeLogsDialog" width="1000px">
       <el-table :data="logs">
         <el-table-column :label="$t('序号')" type="index"></el-table-column>
-        <el-table-column :label="$t('修改人')" prop="creatorName"></el-table-column>
+        <el-table-column :label="$t('修改人')" prop="creatorName" width="200px"></el-table-column>
         <el-table-column :label="$t('修改时间')">
           <template slot-scope="{row}">{{row.createTime|parseTime}}</template>
         </el-table-column>
@@ -309,6 +309,8 @@
                 </div>
               </template>
             </template>
+
+            <div v-if="row.detail.validateStartDate || row.detail.validateStartDate">有效期:{{ row.detail.validateStartDate|parseTime }}-{{ row.detail.validateEndDate|parseTime }}</div>
           </template>
         </el-table-column>