+ min-width="80"
+ label="可选值">
- ;width:98%">
+
+
+
+ min-width="100"
+ label="备注">
- 执行
+
+
+
+
+
+
+
+
+
+
+
@@ -449,7 +473,18 @@
prop=""
header-align="center"
align="center"
- min-width="100"
+ min-width="130"
+ label="执行人">
+
+
+ · · ·
+
+
+
;width:98%">
@@ -788,6 +823,7 @@
totalPage: 0,
activeName: 'basicInformation',
tempPartRow: {},
+ tempExecutorRow: {},
changeTitle: '',
// 条件查询
searchData: {
@@ -829,7 +865,11 @@
gpContinueToMeetDemand: '',
createBy: '',
detailList: [],
- ecnTypeData: []
+ ecnTypeData: [],
+ industrialEngineerId: '',
+ industrialEngineerName: '',
+ changeStatus: '',
+ ecnType: ''
},
costImpactData: {
site: this.$store.state.user.site,
@@ -1195,38 +1235,39 @@
fixed: '',
columnWidth: 150
},
+ // {
+ // userId: this.$store.state.user.name,
+ // functionId: 108001,
+ // serialNumber: '108001Table3ExecuteFlag',
+ // tableId: '108001Table3',
+ // tableName: '执行属性表',
+ // columnProp: 'executeFlag',
+ // headerAlign: 'center',
+ // align: 'center',
+ // columnLabel: '是否执行',
+ // columnHidden: false,
+ // columnImage: false,
+ // status: true,
+ // fixed: '',
+ // columnWidth: 80
+ // },
+ // {
+ // userId: this.$store.state.user.name,
+ // functionId: 108001,
+ // serialNumber: '108001Table3Executor',
+ // tableId: '108001Table3',
+ // tableName: '执行属性表',
+ // columnProp: 'executor',
+ // headerAlign: 'center',
+ // align: 'center',
+ // columnLabel: '执行人',
+ // columnHidden: false,
+ // columnImage: false,
+ // status: true,
+ // fixed: '',
+ // columnWidth: 100
+ // },
{
- userId: this.$store.state.user.name,
- functionId: 108001,
- serialNumber: '108001Table3ExecuteFlag',
- tableId: '108001Table3',
- tableName: '执行属性表',
- columnProp: 'executeFlag',
- headerAlign: 'center',
- align: 'center',
- columnLabel: '是否执行',
- columnHidden: false,
- columnImage: false,
- status: true,
- fixed: '',
- columnWidth: 80
- },
- {
- userId: this.$store.state.user.name,
- functionId: 108001,
- serialNumber: '108001Table3Executor',
- tableId: '108001Table3',
- tableName: '执行属性表',
- columnProp: 'executor',
- headerAlign: 'center',
- align: 'center',
- columnLabel: '执行人',
- columnHidden: false,
- columnImage: false,
- status: true,
- fixed: '',
- columnWidth: 100
- },{
userId: this.$store.state.user.name,
functionId: 108001,
serialNumber: '108001Table3ExecuteDate',
@@ -1240,9 +1281,8 @@
columnImage: false,
status: true,
fixed: '',
- columnWidth: 150
- },
-
+ columnWidth: 130
+ }
],
columnChooseItemList2: [
{
@@ -1277,53 +1317,53 @@
fixed: '',
columnWidth: 150
},
- {
- userId: this.$store.state.user.name,
- functionId: 108001,
- serialNumber: '108001Table7ExecuteFlag',
- tableId: '108001Table7',
- tableName: '可行性评估属性表',
- columnProp: 'executeFlag',
- headerAlign: 'center',
- align: 'center',
- columnLabel: '是否执行',
- columnHidden: false,
- columnImage: false,
- status: true,
- fixed: '',
- columnWidth: 80
- },
- {
- userId: this.$store.state.user.name,
- functionId: 108001,
- serialNumber: '108001Table7Executor',
- tableId: '108001Table7',
- tableName: '可行性评估属性表',
- columnProp: 'executor',
- headerAlign: 'center',
- align: 'center',
- columnLabel: '执行人',
- columnHidden: false,
- columnImage: false,
- status: true,
- fixed: '',
- columnWidth: 100
- },{
- userId: this.$store.state.user.name,
- functionId: 108001,
- serialNumber: '108001Table7ExecuteDate',
- tableId: '108001Table7',
- tableName: '可行性评估属性表',
- columnProp: 'itemExecutionDate',
- headerAlign: 'center',
- align: 'center',
- columnLabel: '执行时间',
- columnHidden: false,
- columnImage: false,
- status: true,
- fixed: '',
- columnWidth: 150
- },
+ // {
+ // userId: this.$store.state.user.name,
+ // functionId: 108001,
+ // serialNumber: '108001Table7ExecuteFlag',
+ // tableId: '108001Table7',
+ // tableName: '可行性评估属性表',
+ // columnProp: 'executeFlag',
+ // headerAlign: 'center',
+ // align: 'center',
+ // columnLabel: '是否执行',
+ // columnHidden: false,
+ // columnImage: false,
+ // status: true,
+ // fixed: '',
+ // columnWidth: 80
+ // },
+ // {
+ // userId: this.$store.state.user.name,
+ // functionId: 108001,
+ // serialNumber: '108001Table7Executor',
+ // tableId: '108001Table7',
+ // tableName: '可行性评估属性表',
+ // columnProp: 'executor',
+ // headerAlign: 'center',
+ // align: 'center',
+ // columnLabel: '执行人',
+ // columnHidden: false,
+ // columnImage: false,
+ // status: true,
+ // fixed: '',
+ // columnWidth: 100
+ // },{
+ // userId: this.$store.state.user.name,
+ // functionId: 108001,
+ // serialNumber: '108001Table7ExecuteDate',
+ // tableId: '108001Table7',
+ // tableName: '可行性评估属性表',
+ // columnProp: 'itemExecutionDate',
+ // headerAlign: 'center',
+ // align: 'center',
+ // columnLabel: '执行时间',
+ // columnHidden: false,
+ // columnImage: false,
+ // status: true,
+ // fixed: '',
+ // columnWidth: 150
+ // },
],
columnChooseCSItemList: [
@@ -1611,6 +1651,13 @@
trigger: ['blur','change']
}
],
+ ecnType: [
+ {
+ required: true,
+ message: ' ',
+ trigger: ['blur','change']
+ }
+ ],
},
// ======== 复选数据集 ========
dataSelections: [],
@@ -1681,11 +1728,26 @@
row.newPartNo = val.toUpperCase()
},
+ executorInput (row, val) {
+ row.executor = val.toUpperCase()
+ },
+
choosePartNo (row) {
this.tempPartRow = row
+ if (this.tempPartRow.newPartNo == null) {
+ this.tempPartRow.newPartNo = ''
+ }
this.getBaseList(133)
},
+ chooseExecutor (row) {
+ this.tempExecutorRow = row
+ if (this.tempExecutorRow.executor == null) {
+ this.tempExecutorRow.executor = ''
+ }
+ this.getBaseList(103, 7)
+ },
+
ecnTypeHeaderChange (val,index) {
if (val === 'Y') {
for (let i = 0; i < this.form[index].list.length; i++) {
@@ -1792,7 +1854,11 @@
gpContinueToMeetDemand: '',
createBy: this.$store.state.user.name,
detailList: [],
- ecnTypeData: []
+ ecnTypeData: [],
+ industrialEngineerId: '',
+ industrialEngineerName: '',
+ changeStatus: '草稿',
+ ecnType: ''
}
this.changeTitle = '变更申请-' + this.modalData.changeNo
this.costImpactData = {
@@ -1845,6 +1911,8 @@
createBy: this.$store.state.user.name,
chooseCSItemList: []
}
+ this.chooseItemList = []
+ this.chooseItemList2 = []
this.getDepartmentByUserName()
this.getEcnTypeData() // 获取ECN种类
this.chooseDataList = this.dataSelections
@@ -1880,8 +1948,6 @@
// 新增变更申请
saveData () {
- this.modalData.detailList = this.chooseDataList
- this.modalData.ecnTypeData = this.form
if (this.modalData.applicantId === '' || this.modalData.applicantId == null) {
this.$message.warning('请选择申请人员！')
return
@@ -1906,6 +1972,14 @@
this.$message.warning('请选择变更类别！')
return
}
+ if (this.modalData.ecnType === '' || this.modalData.ecnType == null) {
+ this.$message.warning('请选择ECN种类！')
+ return
+ }
+ if (this.form.length === 0) {
+ this.$message.warning('请选择ECN种类！')
+ return
+ }
if (this.modalData.tpEngineerId === '' || this.modalData.tpEngineerId == null) {
this.$message.warning('请选择审批人员！')
return
@@ -1918,38 +1992,20 @@
this.$message.warning('请选择是否DF产品！')
return
}
- if (this.modalData.printing === '' || this.modalData.printing == null) {
- this.$message.warning('请选择印刷方式！')
- return
- }
- if (this.modalData.manufacturingCostIsChange === '' || this.modalData.manufacturingCostIsChange == null) {
- this.$message.warning('请选择制造成本是否变更！')
+ if ((this.modalData.industrialEngineerId === '' || this.modalData.industrialEngineerId == null) && this.modalData.dfIsProduct === 'Y') {
+ this.$message.warning('请选择I/E！')
return
}
if (this.modalData.changeRequestDesc === '' || this.modalData.changeRequestDesc == null) {
this.$message.warning('请填写变更要求描述！')
return
}
- if (this.modalData.isReQuote === '' || this.modalData.isReQuote == null) {
- this.$message.warning('请选择是否重新报价！')
- return
- }
- if (this.modalData.ulCertificationRequirements === '' || this.modalData.ulCertificationRequirements == null) {
- this.$message.warning('请选择原产品是否UL认证要求！')
- return
- }
- if (this.modalData.ulContinueToMeetDemand === '' || this.modalData.ulContinueToMeetDemand == null) {
- this.$message.warning('请选择变更后能否继续满足此需求(UL)！')
- return
- }
- if (this.modalData.gpCertificationRequirements === '' || this.modalData.gpCertificationRequirements == null) {
- this.$message.warning('请选择原产品是否GP要求！')
- return
- }
- if (this.modalData.gpContinueToMeetDemand === '' || this.modalData.gpContinueToMeetDemand == null) {
- this.$message.warning('请选择变更后能否继续满足此需求(GP)！')
+ if (this.modalData.printing === '' || this.modalData.printing == null) {
+ this.$message.warning('请选择印刷方式！')
return
}
+ this.modalData.detailList = this.chooseDataList
+ this.modalData.ecnTypeData = this.form
changeRequestSave(this.modalData).then(({data}) => {
if (data && data.code === 0) {
for (let i = 0; i