diff --git a/src/api/part/partInformation.js b/src/api/part/partInformation.js
index 1a87c67..a2a7913 100644
--- a/src/api/part/partInformation.js
+++ b/src/api/part/partInformation.js
@@ -273,6 +273,12 @@ export const addProjectPart2 = data => createAPI(`/plm/partInformation/addProjec
*/
export const getChangeRecordByPartNo = data => createAPI(`/plm/partInformation/getChangeRecordByPartNo`,'post',data)
+
+/**
+ * 查询变更记录
+ */
+export const getChangeRecordByPartNo2 = data => createAPI(`/plm/partInformation/getChangeRecordByPartNo2`,'post',data)
+
/**
* 查询变更记录
*/
diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue
index a08cce5..cea2a6b 100644
--- a/src/views/modules/changeManagement/changeRecord.vue
+++ b/src/views/modules/changeManagement/changeRecord.vue
@@ -278,10 +278,10 @@
- 保存
+ 保存
关闭
- 同意
- 驳回
+ 同意
+ 驳回
@@ -377,10 +377,10 @@
- 保存
+ 保存
关闭
- 同意
- 驳回
+ 同意
+ 驳回
@@ -527,10 +527,10 @@
- 保存
+ 保存
关闭
- 同意
- 驳回
+ 同意
+ 驳回
@@ -581,10 +581,10 @@
- 保存
+ 保存
关闭
- 同意
- 驳回
+ 同意
+ 驳回
@@ -2479,7 +2479,9 @@
chooseCSModelFlag: false,
uploadDialog: false,
submitModalFlag: false,
- addDetailModal: false
+ addDetailModal: false,
+ saveLoading: false,
+ submitLoading: false
}
},
@@ -3301,6 +3303,7 @@
this.modalData.costImpactData = this.costImpactData
this.modalData.executionInfoData = this.executionInfoData
this.modalData.countersignatureData = this.countersignatureData
+ this.submitLoading = true
submitChange(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
@@ -3312,6 +3315,9 @@
confirmButtonText: '确定'
})
}
+ this.submitLoading = false
+ }).catch(()=>{
+ this.submitLoading = false
})
},
@@ -3635,6 +3641,7 @@
this.modalData.costImpactData = this.costImpactData
this.modalData.executionInfoData = this.executionInfoData
this.modalData.countersignatureData = this.countersignatureData
+ this.saveLoading = true
changeRequestUpdate(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.modalData = data.rows.modalData
@@ -3660,6 +3667,9 @@
confirmButtonText: '确定'
})
}
+ this.saveLoading = false
+ }).catch(()=>{
+ this.saveLoading = false
})
},
diff --git a/src/views/modules/processManagement/processBindingInfo.vue b/src/views/modules/processManagement/processBindingInfo.vue
index ebcc9cb..6ba1511 100644
--- a/src/views/modules/processManagement/processBindingInfo.vue
+++ b/src/views/modules/processManagement/processBindingInfo.vue
@@ -1486,7 +1486,7 @@
this.$message.warning('序号' + (i+1) +'未选择PLM字段类型,字段类型为必填项！')
return
}
- if(this.tableData[i].fieldType != null && this.tableData[i].fieldType !== '' && (this.tableData[i].review == null || this.tableData[i].review === '')){
+ if(this.tableData[i].fieldType === 'A' && (this.tableData[i].review == null || this.tableData[i].review === '')){
this.$message.warning('序号' + (i+1) +'未选择审阅！')
return
}
@@ -1498,11 +1498,11 @@
type: 'warning'
}).then(() => {
let obj = {}
- obj.site = this.$store.state.user.site,
- obj.classificationNo = this.nodeCurrentRow.classificationNo,
- obj.workflowId = this.nodeCurrentRow.workflowId,
- obj.nodeId = this.nodeCurrentRow.nodeId,
- obj.createBy = this.$store.state.user.name,
+ obj.site = this.$store.state.user.site
+ obj.classificationNo = this.nodeCurrentRow.classificationNo
+ obj.workflowId = this.nodeCurrentRow.workflowId
+ obj.nodeId = this.nodeCurrentRow.nodeId
+ obj.createBy = this.$store.state.user.name
deleteRequestNodeDetailByLine(obj).then(({data}) => {
if (data && data.code === 0) {
//清空手动添加的
diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue
index b6de691..f365f32 100644
--- a/src/views/modules/project/projectInfo/projectInfo.vue
+++ b/src/views/modules/project/projectInfo/projectInfo.vue
@@ -327,7 +327,6 @@
-
diff --git a/src/views/modules/project/projectPart/searchProjectPart.vue b/src/views/modules/project/projectPart/searchProjectPart.vue
index 0988ffb..730b2ae 100644
--- a/src/views/modules/project/projectPart/searchProjectPart.vue
+++ b/src/views/modules/project/projectPart/searchProjectPart.vue
@@ -188,6 +188,9 @@
+
+
+
@@ -202,6 +205,9 @@
import {
customerInformationSearchForCheck, // 客户信息列表查询`
} from '@/api/customer/customerInformation.js'
+ import {
+ getChangeRecordByPartNo2, // 查询变更记录
+ } from '@/api/part/partInformation.js'
import {getBuBySite} from "@/api/changeManagement/changeManagement.js"
import Chooselist from '@/views/modules/common/Chooselist'
import projectQuotation from "../projectInfo/com_project_puotation.vue";/*組件*/
@@ -212,8 +218,10 @@
import ProjectPartQuote from "./projectPartQuote.vue";
import toolApply from "../projectInfo/com_project_toolApplyCation.vue";
import CustomerInfo from "../../quotation/sellForQuotation/customerInfo.vue";
+ import ChangeRecord from "../projectInfo/com_project_change_record.vue";
export default {
components: {
+ ChangeRecord,
CustomerInfo,
toolApply,
ProjectPartQuote,
@@ -587,6 +595,119 @@
contactStatus: '',
addressName: ''
},
+ changeRecordList: [],
+ columnChangeRecord: [
+ {
+ columnProp: 'changeNo',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '申请编号',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 120
+ },
+ {
+ columnProp: 'applicantName',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '申请人',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 120
+ },
+ {
+ columnProp: 'applicationDepartmentName',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '申请部门',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 120
+ },
+ {
+ columnProp: 'changeStatus',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '变更单状态',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 100
+ },
+ {
+ columnProp: 'ecnStage',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: 'ECN阶段',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 100
+ },
+ {
+ columnProp: 'changeType',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '变更类别',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 100
+ },
+ {
+ columnProp: 'ecnType',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: 'ECN种类',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 100
+ },
+ {
+ columnProp: 'applyDate',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '申请日期',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 100
+ },
+ {
+ columnProp: 'changePhaseInDate',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '变更生效日期',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 100
+ },
+ {
+ columnProp: 'xxx',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: 'ECN执行日期',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 100
+ }
+ ],
}
},
@@ -799,6 +920,9 @@
if (this.activeName === 'toolApply') {
this.refreshTable('toolApply');
}
+ if (this.activeName === 'changeRecord') {
+ this.getChangeRecordList()
+ }
},
refreshTable (type) {
let inData = {
@@ -834,6 +958,22 @@
}
},
+ // 获取变更记录
+ getChangeRecordList () {
+ let tempData = {
+ site: this.$store.state.user.site,
+ projectId: this.currentRow.projectId,
+ finalPartNo: this.currentRow.finalPartNo
+ }
+ getChangeRecordByPartNo2(tempData).then(({data}) => {
+ if (data && data.code === 0) {
+ this.changeRecordList = data.rows
+ } else {
+ this.changeRecordList = []
+ }
+ })
+ },
+
//单击切换订单
searchCustomer (row) {