Commit 34fa6c2d authored by dragondean@qq.com's avatar dragondean@qq.com

拆单订单允许入仓修改

parent c1764c03
...@@ -5,12 +5,7 @@ ENV = 'development' ...@@ -5,12 +5,7 @@ ENV = 'development'
VUE_APP_TITLE = 捷道管理系统 VUE_APP_TITLE = 捷道管理系统
# 捷道管理系统/开发环境 # 捷道管理系统/开发环境
#VUE_APP_BASE_API = 'https://jd.admtest.jdshangmen.com' VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
#VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
#VUE_APP_BASE_API = 'http://localhost:48080'
VUE_APP_BASE_API = 'https://api2.groupage.cn'
# VUE_APP_BASE_API = '/api'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true
......
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
include(scope.row.inWarehouseState, [202, 207, 202, 209, 210, 202, 211, 212, 202, 213, 214, 215, 216, 204, 205]) && 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]) 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']" :disabled="scope.row.parentOrderId">{{$t('入仓修改')}}</el-dropdown-item> <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> </template>
<!-- 退仓 --> <!-- 退仓 -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment