Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
979e4adcca
@ -25,7 +25,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<!-- <el-table class="info-table" border v-loading="loading" :data="state.MATERIALRECEIVEACT" highlight-current-row row-key="id" @row-click="handle">-->
|
<!-- <el-table class="info-table" border v-loading="loading" :data="state.MATERIALRECEIVEACT" highlight-current-row row-key="id" @row-click="handle">-->
|
||||||
<el-table class="info-table" border v-loading="loading" :data="state.MATERIALRECEIVEACT"
|
<el-table class="info-table" border v-loading="loading" :data="state.MATERIALRECEIVEACT"
|
||||||
highlight-current-row row-key="id">
|
highlight-current-row row-key="id" @row-click="handle">
|
||||||
<el-table-column prop="MATERIALSPECNAME" fixed="left" label="料号" width="100" />
|
<el-table-column prop="MATERIALSPECNAME" fixed="left" label="料号" width="100" />
|
||||||
<el-table-column prop="ERPFACTORY" label="组织" width="100" />
|
<el-table-column prop="ERPFACTORY" label="组织" width="100" />
|
||||||
<el-table-column prop="ERPLOCATION" label="库位" width="180">
|
<el-table-column prop="ERPLOCATION" label="库位" width="180">
|
||||||
@ -744,7 +744,7 @@ async function sendToERP() {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/*function handle(row: any, event: any, column: any) {
|
function handle(row: any, event: any, column: any) {
|
||||||
if (areAllNotEmpty(row.ERPFACTORY)) {
|
if (areAllNotEmpty(row.ERPFACTORY)) {
|
||||||
getERPLocation(row.ERPFACTORY)
|
getERPLocation(row.ERPFACTORY)
|
||||||
} else {
|
} else {
|
||||||
@ -773,7 +773,7 @@ async function sendToERP() {
|
|||||||
confirmButtonText: 'OK'
|
confirmButtonText: 'OK'
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
}*/
|
}
|
||||||
|
|
||||||
/**************************************************公共方法************************************************/
|
/**************************************************公共方法************************************************/
|
||||||
function getStorageSpec(value: any) {
|
function getStorageSpec(value: any) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user