@@ -17,7 +17,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
// 'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
let devModules = ['all']
-// let devModules = ['index', 'ADMINISTRATORS']
+// let devModules = ['index', 'statisticalReport', 'inward']
// let devModules = ['all']/
// let devModules = ['index', 'sale']
@@ -112,6 +112,14 @@
column-key="orderTime"
>
</el-table-column>
+ <el-table-column
+ prop="makeOrderDate"
+ label="制单日期"
+ width="140px"
+ align="center"
+ column-key="makeOrderDate"
+ >
+ </el-table-column>
<el-table-column
prop="sendStation"
label="发站"
@@ -883,15 +891,17 @@ export default {
data[i].group = data[i - 1].group
this.spanArr.push(0)
- if(data[i].weightBatchId && data[i].weightBatchId ===data[i - 1].weightBatchId){
+ if (
+ data[i].weightBatchId &&
+ data[i].weightBatchId === data[i - 1].weightBatchId
+ ) {
//批次合并
this.spanArr1[this.pos1] += 1
this.spanArr1.push(0)
- }else{
+ } else {
this.spanArr1.push(1)
this.pos1 = i
}
-
} else {
this.spanArr.push(1)
this.pos = i
@@ -911,7 +921,7 @@ export default {
rowspan: _row,
colspan: _col
- }else if('materialWeight' == column.property){
+ } else if ('materialWeight' == column.property) {
const _row = this.spanArr1[rowIndex]
const _col = _row > 0 ? 1 : 0
return {