diff --git a/src/views/modules/srmPart/com_part_Approval.vue b/src/views/modules/srmPart/com_part_Approval.vue
index 95f2455..8df6e97 100644
--- a/src/views/modules/srmPart/com_part_Approval.vue
+++ b/src/views/modules/srmPart/com_part_Approval.vue
@@ -21,11 +21,11 @@
style="width: 100%;">
-
- {{ scope.row.departmentName || '-' }}
-
+
+
+
-
+
-
+
-
+
diff --git a/src/views/modules/srmPart/partApprovalList.vue b/src/views/modules/srmPart/partApprovalList.vue
index e8d3faf..a32f159 100644
--- a/src/views/modules/srmPart/partApprovalList.vue
+++ b/src/views/modules/srmPart/partApprovalList.vue
@@ -89,7 +89,7 @@
重新审批
审批
-
+
@@ -158,7 +158,7 @@
-->
-
+
@@ -498,7 +498,7 @@ export default {
// }
],
exportName: '产品信息' + this.dayjs().format('YYYYMMDDHHmmss')
-
+
}
},
/* 组件 */
@@ -520,7 +520,7 @@ export default {
this.height = (window.innerHeight - 280) / 2
})
},
-
+
methods: {
getBaseList (val, type) {
@@ -539,9 +539,9 @@ export default {
// if (this.tagNo === 1100) {
// this.searchData.partNo = val.part_no
// }
-
+
},
-
+
getMainData () {
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
@@ -563,11 +563,11 @@ export default {
this.dataListLoading = false
})
},
-
+
tabClick (tab, event) {
this.refreshCurrentTabTable()
},
-
+
// 每页数
sizeChangeHandle (val) {
this.pageSize = val
@@ -580,12 +580,12 @@ export default {
this.pageIndex = val
this.getMainData()
},
-
+
changeData (row) {
this.currentRow = JSON.parse(JSON.stringify(row))
this.refreshCurrentTabTable()
},
-
+
refreshCurrentTabTable () {
if (this.currentRow === '' || this.currentRow === null) {
this.currentRow = {site: '', partNo: ''}
@@ -606,7 +606,7 @@ export default {
this.refreshAttachments()
}
},
-
+
async exportExcel () {
this.searchData.limit = -1
this.searchData.page = 1
@@ -621,7 +621,7 @@ export default {
dropColumns: []
})
},
-
+
refreshBasicInfo () {
let inData = {
site: this.currentRow.site,
@@ -631,7 +631,7 @@ export default {
}
this.$refs.basicInfo.init(inData)
},
-
+
refreshSpecParams () {
let inData = {
site: this.currentRow.site,
@@ -642,7 +642,7 @@ export default {
}
this.$refs.specParams.init(inData)
},
-
+
refreshSuppliers () {
let inData = {
site: this.currentRow.site,
@@ -651,7 +651,7 @@ export default {
}
this.$refs.suppliers.init(inData)
},
-
+
refreshApproval () {
let inData = {
site: this.currentRow.site,
@@ -661,7 +661,7 @@ export default {
}
this.$refs.approval.init(inData)
},
-
+
refreshAttachments () {
let inData = {
orderRef1: this.currentRow.site,
@@ -671,8 +671,8 @@ export default {
}
this.$refs.attachments.init(inData)
},
-
-
+
+
// 打开审批对话框
openApproveDialog(row) {
this.approveData = {
@@ -682,8 +682,9 @@ export default {
flowCode: row.flowCode,
flowVersion: row.flowVersion,
nodeCode: row.nodeCode,
+ specialRelease :'N',
comment: ''
-
+
}
this.approveDialogVisible = true
},
@@ -737,7 +738,7 @@ export default {
})
}).catch(() => {})
}
-
+
}
}
@@ -860,4 +861,4 @@ export default {
height: 28px;
}
}
-
\ No newline at end of file
+
diff --git a/src/views/modules/srmPart/partInfoList.vue b/src/views/modules/srmPart/partInfoList.vue
index f9cb810..69feed1 100644
--- a/src/views/modules/srmPart/partInfoList.vue
+++ b/src/views/modules/srmPart/partInfoList.vue
@@ -42,7 +42,11 @@
:min-width="item.columnWidth"
:label="item.columnLabel">
- {{scope.row[item.columnProp]}}
+ {{
+ item.columnProp === 'partStage'
+ ? formatPartStageDesc(scope.row.partStage)
+ : scope.row[item.columnProp]
+ }}
@@ -457,6 +461,24 @@ export default {
status: true,
fixed: false
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: this.functionId,
+ serialNumber: 'partTablePartStage',
+ tableId: 'partTable',
+ tableName: '产品信息',
+ columnProp: 'partStage',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '物料阶段',
+ columnWidth: '100',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: false
+ },
{
userId: this.$store.state.user.name,
functionId: this.functionId,
@@ -625,6 +647,9 @@ export default {
methods: {
+ formatPartStageDesc (partStage) {
+ return partStage === 'Approved' ? '正式物料' : '新增物料'
+ },
getBaseList (val, type) {
this.tagNo = val
this.$nextTick(() => {
@@ -769,7 +794,9 @@ export default {
params: this.searchData,
fileName: this.exportName + '.xlsx',
rowFetcher: res => res.data,
- columnFormatter: [],
+ columnFormatter: [
+ { columnProp: 'partStage', formatter: (val) => this.formatPartStageDesc(val) }
+ ],
dropColumns: []
})
},