@@ -16,9 +16,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
// 统计报表 组织机构/系统管理 采购 仓储
// 'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
-// let devModules = ['all']
-// let devModules = ['index', 'OYE', 'queue']
let devModules = ['all']
+// let devModules = ['index', 'OYE', 'sale']
+// let devModules = ['all']
// let devModules = ['index', 'OYE']
if (pathSrc.indexOf('node_modules') > -1) {
@@ -2026,6 +2026,7 @@ export default {
salerExportExcelList: [
'出库库房',
'出库理重',
+ '出库日期',
'订单日期',
'客户',
'收货单位',
@@ -2033,7 +2034,7 @@ export default {
'物资规格',
'物资件数',
'理重',
- '净重',
+ '出库净重',
'收货地址',
'收货客户电话',
'摘要',
@@ -2345,6 +2346,11 @@ export default {
)
.then(res => {
this.steelMap = res.data.data
+ if (this.steelMap.queueStartTime == null) {
+ this.$message.error('未放行无法出库')
+ return
+ }
+ console.log(this.steelMap, 'this.steelMap')
if (getCookie('orgCode') == 'ouyechangwaiku') {
let inboundWarehouse = getCookie('loginName')
this.steelMap.mapList = this.steelMap.mapList.filter(item => {