fengyuan_yang
/
boying-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2025-08-28 pc生产领料优化

master
fengyuan_yang 5 months ago
parent
63b479acbf
commit
c721cdcf0a
2 changed files with 186 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 206
      src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
  2. 12
      src/views/modules/qc/inboundNotification.vue

206
src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
View File

@ -122,7 +122,7 @@
</el-pagination>
<el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="申请单明细" name="detail">
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -10px;">
<el-button
@ -228,8 +228,17 @@
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
<el-table-column
fixed="right"
header-align="center"
align="center"
width="90"
label="操作">
<template slot-scope="scope">
<el-link style="cursor: pointer" @click="outboundDetailModal(scope.row)">出库明细</el-link>
</template>
</el-table-column>
</el-table>
@ -865,7 +874,29 @@
</el-footer>
</el-dialog>
<!-- 出库明细 -->
<el-dialog title="出库明细" :close-on-click-modal="false" v-drag :visible.sync="detailModal2" width="900px">
<el-table
height="400px"
:data="detailList2"
border
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnDetailList2" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed===''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
</el-table-column>
</el-table>
<el-footer style="height:35px;margin-top: 15px;text-align:center">
<el-button type="primary" @click="detailModal2 = false">关闭</el-button>
</el-footer>
</el-dialog>
</div>
</template>
@ -902,7 +933,9 @@
getTableUserListLanguage,
} from "@/api/table.js"
import {saveIssueNoOrderDetail} from "../../../../api/orderIssure/soIssueNotify";
import {
getOutboundDetail2, // 获取出库明细
} from "@/api/qc/outbound_notification.js"
export default {
@ -1376,7 +1409,7 @@
serialNumber: '701002Table3OutboundWarehouseId',
tableId: "701002Table3",
tableName: "申请单材料明细表",
columnProp: "outboundWarehouseId",
columnProp: "warehouseName",
headerAlign: "center",
align: "left",
columnLabel: "领料仓库",
@ -1421,24 +1454,26 @@
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table3QtyToIssueOriginal',
tableId: "701002Table3",
tableName: "申请单材料明细表",
columnProp: "qtyToIssueOriginal",
headerAlign: "center",
align: "right",
columnLabel: "已发数量",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
},
// {
// userId: this.$store.state.user.name,
// functionId: 701002,
// serialNumber: '701002Table3QtyToIssueOriginal',
// tableId: "701002Table3",
// tableName: "申请单材料明细表",
// columnProp: "qtyToIssueOriginal",
// headerAlign: "center",
// align: "right",
// columnLabel: "已发数量",
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 80
// },
{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table3IssueType',
@ -1613,7 +1648,26 @@
status: true,
fixed: '',
columnWidth: 130
},{
},
{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table4PartDesc',
tableId: "701002Table4",
tableName: "申请单材料明细表",
columnProp: "warehouseName",
headerAlign: "center",
align: "left",
columnLabel: "领料仓库",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table4QtyToIssue',
@ -2255,6 +2309,88 @@
columnWidth: 150,
},
],
detailModal2: false,
detailList2: [],
columnDetailList2: [
{
columnProp: 'subNo',
headerAlign: "center",
align: "left",
columnLabel: '标签条码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
columnProp: 'subQty',
headerAlign: "center",
align: "right",
columnLabel: '出库数量',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
columnProp: 'orderRef4',
headerAlign: "center",
align: "left",
columnLabel: '出库仓库',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150,
},
{
columnProp: 'orderRef5',
headerAlign: "center",
align: "left",
columnLabel: '出库库位',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150,
},
{
columnProp: 'userName',
headerAlign: "center",
align: "left",
columnLabel: '操作员',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
columnProp: 'transDate',
headerAlign: "center",
align: "center",
columnLabel: '操作时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 170,
},
],
}
},
computed: {
@ -2291,6 +2427,25 @@
},
methods: {
// 出库明细
outboundDetailModal (row) {
console.log(row)
let tempData = {
site: row.site,
buNo: row.bu,
orderNo: row.notifyNo,
partNo: row.componentPartNo
}
getOutboundDetail2(tempData).then(({data}) => {
if (data && data.code === 0) {
this.detailList2 = data.rows
} else {
this.detailList2 = []
}
})
this.detailModal2 = true
},
// 动态列开始 获取 用户保存的 格式列
async getTableUserColumn(tableId, columnId) {
let queryTableUser = {
@ -2433,7 +2588,6 @@
//区分请求成功和失败的状况
if (data && data.code == 0) {
this.dataList4 = data.rows
} else {
this.dataList4 = [];
}

12
src/views/modules/qc/inboundNotification.vue
View File

@ -1177,7 +1177,7 @@
},
updateModal (row) {
if (this.currentRow.orderType === '采购入库' || '销售退货') {
if (this.currentRow.orderType === '采购入库' || this.currentRow.orderType === '销售退货') {
this.$message.warning('该类型单据不能编辑！')
return
}
@ -1272,7 +1272,7 @@
// 关闭
closeModal (row) {
if (this.currentRow.orderType === '采购入库' || '销售退货') {
if (this.currentRow.orderType === '采购入库' || this.currentRow.orderType === '销售退货') {
this.$message.warning('该类型单据不能编辑！')
return
}
@ -1288,7 +1288,7 @@
// 下达
issueModal (row) {
if (this.currentRow.orderType === '采购入库' || '销售退货') {
if (this.currentRow.orderType === '采购入库' || this.currentRow.orderType === '销售退货') {
this.$message.warning('该类型单据不能编辑！')
return
}
@ -1360,7 +1360,7 @@
// 新增明细
addInboundDetailModal () {
if (this.currentRow.orderType === '采购入库' || '销售退货') {
if (this.currentRow.orderType === '采购入库' || this.currentRow.orderType === '销售退货') {
this.$message.warning('该类型单据不能编辑！')
return
}
@ -1479,7 +1479,7 @@
// 删除入库明细
deleteInboundDetail () {
if (this.currentRow.orderType === '采购入库' || '销售退货') {
if (this.currentRow.orderType === '采购入库' || this.currentRow.orderType === '销售退货') {
this.$message.warning('该类型单据不能编辑！')
return
}
@ -1509,7 +1509,7 @@
// 批量编辑模态框
editBatchModel() {
if (this.currentRow.orderType === '采购入库' || '销售退货') {
if (this.currentRow.orderType === '采购入库' || this.currentRow.orderType === '销售退货') {
this.$message.warning('该类型单据不能编辑！')
return
}

Write Preview
Loading…
Cancel
Save