DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
Joshi
2026-02-07 16:59:41 +08:00
parent 64b4d6e5e4 3551f31537
commit 353f26f1d5
6 changed files with 80 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
klp-ui/src/views/wms/coil/panels/base.vue
View File

@@ -178,8 +178,8 @@
@click="handleAbnormal(scope.row)">查看异常</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleCheck(scope.row)"
v-if="showControl">修正</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-if="showControl">删除</el-button>
<!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-if="showControl">删除</el-button> -->
<el-button size="mini" type="text" icon="el-icon-search" @click="handleTrace(scope.row)">追溯</el-button>
</template>
</el-table-column>
@@ -287,7 +287,8 @@
<label-render :forceSpecialTag="forceSpecialTag" :content="labelRender.data" :labelType="labelRender.type" />
</el-dialog>
<label-render :forceSpecialTag="forceSpecialTag" ref="labelRender" v-show="false" :content="labelRender.data" :labelType="labelRender.type" />
<label-render :forceSpecialTag="forceSpecialTag" ref="labelRender" v-show="false" :content="labelRender.data"
:labelType="labelRender.type" />
<!-- 批量导出标签PDF弹窗 -->
<el-dialog title="批量导出标签PDF" :visible.sync="batchPrint.visible" width="520px" append-to-body>

18
klp-ui/src/views/wms/coil/views/jishu.vue
View File

@@ -1,5 +1,14 @@
<template>
<BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery" :hideType="hideType" />
<el-tabs class="app-container" v-model="activeTab">
<el-tab-pane label="待收卷" name="second">
<BasePage :qrcode="qrcode" :querys="querys2" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
:hideType="hideType" />
</el-tab-pane>
<el-tab-pane label="已收卷" name="first">
<BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
:hideType="hideType" />
</el-tab-pane>
</el-tabs>
</template>
<script>
@@ -12,12 +21,19 @@ export default {
data() {
return {
qrcode: false,
activeTab: 'second',
querys: {
dataType: 1,
status: 0,
warehouseId: '2019583656787259393', // 技术部逻辑库
// materialType: '废品'
},
querys2: {
dataType: 1,
status: 0,
nextWarehouseId: '2019583656787259393', // 技术部逻辑库
// materialType: '废品'
},
hideWarehouseQuery: true,
showAbnormal: true,
labelType: '2',

20
klp-ui/src/views/wms/coil/views/mini.vue
View File

@@ -1,5 +1,14 @@
<template>
<BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery" :hideType="hideType" />
<el-tabs class="app-container" v-model="activeTab">
<el-tab-pane label="待收卷" name="second">
<BasePage :qrcode="qrcode" :querys="querys2" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
:hideType="hideType" />
</el-tab-pane>
<el-tab-pane label="已收卷" name="first">
<BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
:hideType="hideType" />
</el-tab-pane>
</el-tabs>
</template>
<script>
@@ -12,10 +21,17 @@ export default {
data() {
return {
qrcode: false,
activeTab: 'second',
querys: {
dataType: 1,
status: 0,
warehouseId: '2019583325311414274', // 小钢卷仓
warehouseId: '2019583325311414274', // 小钢卷库
// materialType: '废品'
},
querys2: {
dataType: 1,
status: 0,
nextWarehouseId: '2019583325311414274', // 小钢卷库
// materialType: '废品'
},
hideWarehouseQuery: true,

23
klp-ui/src/views/wms/coil/views/return.vue
View File

@@ -1,5 +1,14 @@
<template>
<BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery" :hideType="hideType" />
<el-tabs class="app-container" v-model="activeTab">
<el-tab-pane label="待收卷" name="second">
<BasePage :qrcode="qrcode" :querys="querys2" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
:hideType="hideType" />
</el-tab-pane>
<el-tab-pane label="已收卷" name="first">
<BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
:hideType="hideType" />
</el-tab-pane>
</el-tabs>
</template>
<script>
@@ -12,10 +21,17 @@ export default {
data() {
return {
qrcode: false,
activeTab: 'second',
querys: {
dataType: 1,
status: 0,
warehouseId: '2019583137616310273', // 退货仓
warehouseId: '2019583137616310273', // 退货库
// materialType: '废品'
},
querys2: {
dataType: 1,
status: 0,
nextWarehouseId: '2019583137616310273', // 退货库
// materialType: '废品'
},
hideWarehouseQuery: true,
@@ -25,4 +41,5 @@ export default {
}
}
}
</script>
</script>

23
klp-ui/src/views/wms/coil/views/scrap.vue
View File

@@ -1,5 +1,14 @@
<template>
<BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery" :hideType="hideType" />
<el-tabs class="app-container" v-model="activeTab">
<el-tab-pane label="待收卷" name="second">
<BasePage :qrcode="qrcode" :querys="querys2" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
:hideType="hideType" />
</el-tab-pane>
<el-tab-pane label="已收卷" name="first">
<BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
:hideType="hideType" />
</el-tab-pane>
</el-tabs>
</template>
<script>
@@ -12,12 +21,19 @@ export default {
data() {
return {
qrcode: false,
activeTab: 'second',
querys: {
dataType: 1,
status: 0,
warehouseId: '2019583429955104769', // 废品仓
// materialType: '废品'
},
querys2: {
dataType: 1,
status: 0,
nextWarehouseId: '2019583429955104769', // 废品仓
// materialType: '废品'
},
hideWarehouseQuery: true,
showAbnormal: true,
labelType: '2',
@@ -25,4 +41,7 @@ export default {
}
}
}
</script>
</script>

41
klp-ui/src/views/wms/report/zha.vue
View File

@@ -214,47 +214,6 @@ export default {
...params
})
})
// [
// // 酸连轧成品库
// listCoilWithIds({
// ...this.queryParams,
// pageSize: 9999,
// pageNum: 1,
// // dataType: 1,
// createBy: 'suanzhakuguan',
// warehouseId: '1988150099140866050'
// }),
// // 镀锌原料库
// listCoilWithIds({
// ...this.queryParams,
// pageSize: 9999,
// pageNum: 1,
// // dataType: 1,
// selectType: 'raw_material',
// createBy: 'suanzhakuguan',
// warehouseId: '1988150263284953089'
// }),
// // 脱脂原料库
// listCoilWithIds({
// ...this.queryParams,
// pageSize: 9999,
// pageNum: 1,
// // dataType: 1,
// selectType: 'raw_material',
// createBy: 'suanzhakuguan',
// warehouseId: '1988150545175736322'
// }),
// // 酸连轧纵剪分条原料库1988150150521090049
// listCoilWithIds({
// ...this.queryParams,
// pageSize: 9999,
// pageNum: 1,
// // dataType: 1,
// selectType: 'raw_material',
// createBy: 'suanzhakuguan',
// warehouseId: '1988150150521090049'
// }),
// ]
).then((resList) => {
console.log(resList)
const list = resList.flatMap(res => res.rows)