Browse Source

是否在立库

master
常熟吴彦祖 3 months ago
parent
commit
8aa9300f6c
  1. 51
      src/views/modules/orderIssure/newSoIssueNotify.vue
  2. 34
      src/views/modules/orderIssure/searchIssureNotify.vue
  3. 4
      src/views/modules/productionInbound/productionInboundRequest.vue
  4. 18
      src/views/modules/shipment/shipmentNotification.vue

51
src/views/modules/orderIssure/newSoIssueNotify.vue

@ -426,7 +426,6 @@ export default {
dataList2: [], dataList2: [],
dataList3: [], dataList3: [],
materialDetailList: [], materialDetailList: [],
materialDetailColumnList: [],
currentRow: '', currentRow: '',
dataListLoading: false, dataListLoading: false,
// //
@ -835,6 +834,24 @@ export default {
fixed: false, fixed: false,
columnWidth: 120, columnWidth: 120,
}, },
{
userId: this.$store.state.user.name,
functionId: 555001,
serialNumber: '555001Table2IsInWh',
tableId: '555001Table2',
tableName: '查询工单及物料',
columnProp: 'isInWh',
headerAlign: 'center',
align: 'left',
columnLabel: '是否在立库',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 100,
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 555001, functionId: 555001,
@ -872,7 +889,7 @@ export default {
fixed: false, fixed: false,
columnWidth: 100, columnWidth: 100,
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 555001, functionId: 555001,
@ -1056,6 +1073,24 @@ export default {
fixed: false, fixed: false,
columnWidth: 80, columnWidth: 80,
}, },
{
userId: this.$store.state.user.name,
functionId: 555001,
serialNumber: '555001Table3IsInWh',
tableId: '555001Table3',
tableName: '查询工单及物料',
columnProp: 'isInWh',
headerAlign: 'center',
align: 'left',
columnLabel: '是否在立库',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 100,
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 555001, functionId: 555001,
@ -1357,7 +1392,7 @@ export default {
}, },
mounted() { mounted() {
this.$nextTick(() => {
this.$nextTick(() => {
this.height = window.innerHeight - 220 this.height = window.innerHeight - 220
}) })
}, },
@ -1803,7 +1838,7 @@ export default {
this.$message.warning('该OrderNo的数据已存在,请先删除再添加!') this.$message.warning('该OrderNo的数据已存在,请先删除再添加!')
return false return false
} }
const dataListExists = this.dataList.some(row => row.soorderNo === this.seqNoData.orderNo) const dataListExists = this.dataList.some(row => row.soorderNo === this.seqNoData.orderNo)
if (dataListExists) { if (dataListExists) {
this.$message.warning('该OrderNo的数据已添加过,请先删除再添加!') this.$message.warning('该OrderNo的数据已添加过,请先删除再添加!')
@ -1811,7 +1846,7 @@ export default {
} }
this.seqNoModalLoading = true this.seqNoModalLoading = true
getShopOrderAndMaterialByShoporder(this.seqNoData) getShopOrderAndMaterialByShoporder(this.seqNoData)
.then(({ data }) => {
.then(({ data }) => {
if (data.code === 0) { if (data.code === 0) {
if (!data.rows || data.rows.length === 0) { if (!data.rows || data.rows.length === 0) {
this.$message.warning('未查询到数据!') this.$message.warning('未查询到数据!')
@ -1991,7 +2026,7 @@ export default {
xiadaNotify() { xiadaNotify() {
// //
if ( if (
this.dataList.length == 0
this.dataList.length == 0
) { ) {
this.$alert('没有明细记录无法下达!!', '提示', { this.$alert('没有明细记录无法下达!!', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
@ -2008,7 +2043,7 @@ export default {
}, },
confirmXiadaNotify() { confirmXiadaNotify() {
if ( if (
this.dataList.length == 0
this.dataList.length == 0
) { ) {
this.$alert('没有明细记录无法下达!!', '提示', { this.$alert('没有明细记录无法下达!!', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
@ -2203,7 +2238,7 @@ export default {
this.columnList4 = data.rows this.columnList4 = data.rows
break; break;
} }
}
}
}) })
}, },

34
src/views/modules/orderIssure/searchIssureNotify.vue

@ -852,6 +852,23 @@
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100 columnWidth: 100
},{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table3IsInWh',
tableId: "701002Table3",
tableName: "申请单材料明细表",
columnProp: "isInWh",
headerAlign: "center",
align: "center",
columnLabel: "是否进立库",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{ },{
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 701002, functionId: 701002,
@ -1010,6 +1027,23 @@
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100 columnWidth: 100
},{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table4IsInWh',
tableId: "701002Table4",
tableName: "申请单材料明细表",
columnProp: "isInWh",
headerAlign: "center",
align: "center",
columnLabel: "是否进立库",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{ },{
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 701002, functionId: 701002,

4
src/views/modules/productionInbound/productionInboundRequest.vue

@ -1874,7 +1874,7 @@ export default {
}, },
saveNewUnissueMaterial() { saveNewUnissueMaterial() {
for (let i = 0; i < this.seqNoList.length; i++) { for (let i = 0; i < this.seqNoList.length; i++) {
const v = parseFloat(this.seqNoList[i].applyQty) const v = parseFloat(this.seqNoList[i].applyQty)
if ( if (
v && v &&
@ -2104,7 +2104,7 @@ export default {
}, },
xiadaNotifyModel() { xiadaNotifyModel() {
if ( if (
this.dataList.length == 0
this.dataList.length == 0
) { ) {
this.$alert('没有明细记录无法下达!!', '提示', { this.$alert('没有明细记录无法下达!!', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',

18
src/views/modules/shipment/shipmentNotification.vue

@ -1094,6 +1094,24 @@ export default {
fixed: '', fixed: '',
columnWidth: 80, columnWidth: 80,
}, },
{
userId: this.$store.state.user.name,
functionId: 701001,
serialNumber: '701001Table3IsInWh',
tableId: '701001Table3',
tableName: '领料申请BOM子表',
columnProp: 'isInWh',
headerAlign: 'center',
align: 'center',
columnLabel: '是否在立库',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 701001, functionId: 701001,

Loading…
Cancel
Save