Merge branch 'release' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

 Conflicts:
	src/api/system/operatelog.js

src/api/system/operatelog.js

@@ -5,8 +5,8 @@ export function listOperateLog(query) {
   return request({
     url: '/system/operate-log/page',
     method: 'get',
-    params: query,
     timeout: 5*6000,
+    params: query
   })
 }
 
@@ -17,7 +17,6 @@ export function exportOperateLog(query) {
     method: 'get',
     params: query,
     timeout: 5*6000,
-
     responseType: 'blob'
   })
 }

src/views/ecw/order/index.vue

@@ -352,13 +352,12 @@
                 <el-button type="text">{{$t('仓库')}}</el-button>
                 <el-dropdown-menu slot="dropdown">
                   <!-- 入仓操作 -->
-                  <template v-if="include(scope.row.status, [0,2]) || include(scope.row.abnormalState, [1]) || scope.row.inWarehouseState == 208">
+                  <template v-if="include(scope.row.status, [0,2]) || scope.row.inWarehouseState == 208">
                     <el-dropdown-item @click.native="$router.push('/order/warehousing?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:warehouse_add']">{{$t('入仓操作')}}</el-dropdown-item>
                   </template>
                   <!-- 入仓补充 -->
                   <template v-if="
                     include(scope.row.inWarehouseState, [201,202, 202, 210, 202, 211, 202, 214, 215, 216]) &&
-                    scope.row.abnormalState != 1 &&
                     include(scope.row.status, [2,3,5,10,9,8])
                     ">
                     <el-dropdown-item @click.native="$router.push('/order/warehousing-add?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:warehouse_replenish']">{{$t('入仓补充')}}</el-dropdown-item>