Merge remote-tracking branch 'origin/0.8.X' into 0.8.X
This commit is contained in:
@@ -62,10 +62,10 @@
|
||||
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
|
||||
@click="handleCheck">修正</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<!-- <el-col :span="1.5">
|
||||
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
|
||||
@click="handleDelete">删除</el-button>
|
||||
</el-col>
|
||||
</el-col> -->
|
||||
<el-col :span="1.5">
|
||||
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportAll">导出</el-button>
|
||||
</el-col>
|
||||
|
||||
@@ -154,7 +154,7 @@ export default {
|
||||
warehouseIds: [
|
||||
'1988150323162836993',
|
||||
'1988150487185289217',
|
||||
'2019583656787259393',
|
||||
'2019583656787259393',
|
||||
'2019583325311414274',
|
||||
'2019583429955104769',
|
||||
'2019583137616310273',
|
||||
@@ -170,32 +170,32 @@ export default {
|
||||
warehouseQueryMap: {
|
||||
'1988150323162836993': {
|
||||
selectType: 'product',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '1988150323162836993'
|
||||
},
|
||||
'1988150487185289217': {
|
||||
selectType: 'raw_material',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '1988150487185289217'
|
||||
},
|
||||
'2019583656787259393': {
|
||||
selectType: 'product',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '2019583656787259393'
|
||||
},
|
||||
'2019583325311414274': {
|
||||
selectType: 'product',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '2019583325311414274'
|
||||
},
|
||||
'2019583429955104769': {
|
||||
selectType: 'product',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '2019583429955104769'
|
||||
},
|
||||
'2019583137616310273': {
|
||||
selectType: 'product',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '2019583137616310273'
|
||||
},
|
||||
},
|
||||
|
||||
@@ -219,32 +219,32 @@ export default {
|
||||
warehouseQueryMap: {
|
||||
'1988150323162836993': {
|
||||
selectType: 'product',
|
||||
createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '1988150323162836993'
|
||||
},
|
||||
'1988150487185289217': {
|
||||
selectType: 'raw_material',
|
||||
createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '1988150487185289217'
|
||||
},
|
||||
'2019583656787259393': {
|
||||
selectType: 'product',
|
||||
createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '2019583656787259393'
|
||||
},
|
||||
'2019583325311414274': {
|
||||
selectType: 'product',
|
||||
createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '2019583325311414274'
|
||||
},
|
||||
'2019583429955104769': {
|
||||
selectType: 'product',
|
||||
createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '2019583429955104769'
|
||||
},
|
||||
'2019583137616310273': {
|
||||
selectType: 'product',
|
||||
createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '2019583137616310273'
|
||||
},
|
||||
},
|
||||
|
||||
@@ -243,32 +243,32 @@ export default {
|
||||
warehouseQueryMap: {
|
||||
'1988150323162836993': {
|
||||
selectType: 'product',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '1988150323162836993'
|
||||
},
|
||||
'1988150487185289217': {
|
||||
selectType: 'raw_material',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '1988150487185289217'
|
||||
},
|
||||
'2019583656787259393': {
|
||||
selectType: 'product',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '2019583656787259393'
|
||||
},
|
||||
'2019583325311414274': {
|
||||
selectType: 'product',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '2019583325311414274'
|
||||
},
|
||||
'2019583429955104769': {
|
||||
selectType: 'product',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '2019583429955104769'
|
||||
},
|
||||
'2019583137616310273': {
|
||||
selectType: 'product',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '2019583137616310273'
|
||||
},
|
||||
},
|
||||
|
||||
@@ -265,32 +265,32 @@ export default {
|
||||
warehouseQueryMap: {
|
||||
'1988150323162836993': {
|
||||
selectType: 'product',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '1988150323162836993'
|
||||
},
|
||||
'1988150487185289217': {
|
||||
selectType: 'raw_material',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '1988150487185289217'
|
||||
},
|
||||
'2019583656787259393': {
|
||||
selectType: 'product',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '2019583656787259393'
|
||||
},
|
||||
'2019583325311414274': {
|
||||
selectType: 'product',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '2019583325311414274'
|
||||
},
|
||||
'2019583429955104769': {
|
||||
selectType: 'product',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '2019583429955104769'
|
||||
},
|
||||
'2019583137616310273': {
|
||||
selectType: 'product',
|
||||
// createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '2019583137616310273'
|
||||
},
|
||||
},
|
||||
|
||||
@@ -225,32 +225,32 @@ export default {
|
||||
warehouseQueryMap: {
|
||||
'1988150323162836993': {
|
||||
selectType: 'product',
|
||||
createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '1988150323162836993'
|
||||
},
|
||||
'1988150487185289217': {
|
||||
selectType: 'raw_material',
|
||||
createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '1988150487185289217'
|
||||
},
|
||||
'2019583656787259393': {
|
||||
selectType: 'product',
|
||||
createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '2019583656787259393'
|
||||
},
|
||||
'2019583325311414274': {
|
||||
selectType: 'product',
|
||||
createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '2019583325311414274'
|
||||
},
|
||||
'2019583429955104769': {
|
||||
selectType: 'product',
|
||||
createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '2019583429955104769'
|
||||
},
|
||||
'2019583137616310273': {
|
||||
selectType: 'product',
|
||||
createBy: 'suanzhakuguan',
|
||||
createBy: 'duxinkuguan',
|
||||
warehouseId: '2019583137616310273'
|
||||
},
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user