-
-
-
+ 保存
关闭
-
- {
+ if (data.code !== 0) {
+ this.$message.warning(data.msg)
+ }
+ })
+ }
this.getDataList()
+ this.basicInformationFlag = false
this.$message({
message: '操作成功',
type: 'success',
@@ -1166,6 +1725,7 @@
}
costImpactSave(this.costImpactData).then(({data}) => {
if (data && data.code === 0) {
+ this.InventoryCostImpactFlag = false
this.getDataList()
this.$message({
message: '操作成功',
@@ -1181,25 +1741,37 @@
})
},
- //
+ // 新增执行信息
executionInformationSave () {
+ if (this.chooseItemList.length === 0) {
+ this.$message.warning('请选择模板属性!')
+ return;
+ } else {
+ this.executionInfoData.chooseItemList = this.chooseItemList
+ }
if (this.executionInfoData.originalDieCuttingRuleNo == null || this.executionInfoData.originalDieCuttingRuleNo === '') {
this.$message.warning('请填写原啤刀编号!')
+ return;
}
if (this.executionInfoData.newDieCuttingRuleNo == null || this.executionInfoData.newDieCuttingRuleNo === '') {
this.$message.warning('请填写新啤刀编号!')
+ return;
}
if (this.executionInfoData.originalStencilNo == null || this.executionInfoData.originalStencilNo === '') {
this.$message.warning('请填写原网板/印版编号!')
+ return;
}
if (this.executionInfoData.newStencilNo == null || this.executionInfoData.newStencilNo === '') {
this.$message.warning('请填写新网板/印版编号!')
+ return;
}
if (this.executionInfoData.executionDate == null || this.executionInfoData.executionDate === '') {
this.$message.warning('请选择ECN执行日期!')
+ return;
}
executionSave(this.executionInfoData).then(({data}) => {
if (data && data.code === 0) {
+ this.actionInformationFlag = false
this.getDataList()
this.$message({
message: '操作成功',
@@ -1267,7 +1839,234 @@
}
//打开组件 去做新增业务
this.$nextTick(() => {
- this.$refs.changeUploadFile.init(currentData);
+ this.$refs.changeUploadFile.init(currentData)
+ })
+ },
+
+ // 得到保存的文件对象
+ getFileData (fData) {
+ const formData = new FormData()
+ // 片接文件
+ formData.append("file", fData.file)
+ formData.append("orderRef1", fData.site)
+ formData.append("orderRef2", fData.dataNo)
+ formData.append("fileRemark", fData.fileRemark)
+ formData.append("folder", fData.folder)
+ this.fileList.push(formData)
+ },
+
+ // 选择ECN种类模态框
+ chooseEcnTypeModal () {
+ this.EcnTypeModalFlag = true
+ },
+
+ // 查询ECN种类数据
+ getEcnTypeData () {
+ let tempData = {
+ site: this.$store.state.user.site
+ }
+ getEcnTypeData(tempData).then(({data}) => {
+ if (data.code === 0) {
+ this.form = data.rows
+ }
+ })
+ },
+
+ // 保存ECN种类
+ saveEcnTypeData () {
+ this.$message({
+ message: '操作成功',
+ type: 'success',
+ duration: 1500,
+ onClose: () => {}
+ })
+ this.EcnTypeModalFlag = false
+ },
+
+ // 选择模板属性
+ chooseModel () {
+ this.chooseModelData = {
+ site: this.$store.state.user.site,
+ itemNo: '',
+ itemDesc: '',
+ functionType: 'ECN',
+ codeNo: this.modelList.length > 0 ? this.modelList[0].codeNo : ''
+ }
+ // 先清空缓存选中
+ this.$nextTick(() => this.$refs.itemTable.clearSelection())
+ // 查询所有部门
+ getItemList(this.chooseModelData).then(({data}) => {
+ if (data && data.code === 0) {
+ this.itemList = data.rows
+ this.itemList.forEach(val => {
+ // 回显选中的部门
+ if (this.chooseItemList.map(val => val.itemNo).includes(val.itemNo)) {
+ this.$nextTick(() => this.$refs.itemTable.toggleRowSelection(val, true))
+ }
+ })
+ } else {
+ this.$alert(data.msg, '错误', {
+ confirmButtonText: '确定'
+ })
+ }
+ })
+ this.chooseModelFlag = true
+ },
+
+ // 查询属性
+ searchItemList () {
+ getItemList(this.chooseModelData).then(({data}) => {
+ if (data.code === 0) {
+ this.itemList = data.rows
+ }
+ })
+ },
+
+ // 单机选择
+ itemClickRow (row) {
+ this.$refs.itemTable.toggleRowSelection(row)
+ },
+
+ // 复选属性
+ selectionItem (val) {
+ this.itemSelections = val
+ },
+
+ // 确认多选属性
+ confirmItem () {
+ if (this.itemSelections.length === 0) {
+ this.$message.warning("请勾选属性!")
+ return
+ }
+ this.chooseItemList = this.itemSelections
+ this.chooseModelFlag = false
+ },
+
+ // 执行所选属性
+ executeModal (row) {
+ row.executeFlag = 'Y'
+ row.itemExecutionDate = new Date(+ new Date() + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '')
+ row.executor = this.$store.state.user.name
+ },
+
+ // 查询ECN的模板
+ getEcnModel () {
+ let tempData = {
+ site: this.$store.state.user.site,
+ functionType: 'ECN'
+ }
+ getEcnModel(tempData).then(({data}) => {
+ if (data.code === 0) {
+ this.modelList = data.rows
+ }
+ })
+ },
+
+
+ // ===================================
+
+ // 查询会签的模板
+ getEcnCSModel () {
+ let tempData = {
+ site: this.$store.state.user.site,
+ functionType: 'ECN'
+ }
+ getEcnModel(tempData).then(({data}) => {
+ if (data.code === 0) {
+ this.modelCSList = data.rows
+ }
+ })
+ },
+
+ // 选择会签模板属性
+ chooseCSModel () {
+ this.chooseCSModelData = {
+ site: this.$store.state.user.site,
+ itemNo: '',
+ itemDesc: '',
+ functionType: 'ECN',
+ codeNo: this.modelCSList.length > 0 ? this.modelCSList[0].codeNo : ''
+ }
+ // 先清空缓存选中
+ this.$nextTick(() => this.$refs.itemCSTable.clearSelection())
+ // 查询所有属性
+ getItemList(this.chooseCSModelData).then(({data}) => {
+ if (data && data.code === 0) {
+ this.itemCSList = data.rows
+ this.itemCSList.forEach(val => {
+ // 回显选中的部门
+ if (this.chooseCSItemList.map(val => val.itemNo).includes(val.itemNo)) {
+ this.$nextTick(() => this.$refs.itemCSTable.toggleRowSelection(val, true))
+ }
+ })
+ } else {
+ this.$alert(data.msg, '错误', {
+ confirmButtonText: '确定'
+ })
+ }
+ })
+ this.chooseCSModelFlag = true
+ },
+
+ // 查询CS属性
+ searchCSItemList () {
+ getItemList(this.chooseCSModelData).then(({data}) => {
+ if (data.code === 0) {
+ this.itemCSList = data.rows
+ }
+ })
+ },
+
+ // 单击选择
+ itemCSClickRow (row) {
+ this.$refs.itemCSTable.toggleRowSelection(row)
+ },
+
+ // 复选CS属性
+ selectionCSItem (val) {
+ this.itemCSSelections = val
+ },
+
+ // 确认多选CS属性
+ confirmCSItem () {
+ if (this.itemCSSelections.length === 0) {
+ this.$message.warning("请勾选属性!")
+ return
+ }
+ this.chooseCSItemList = this.itemCSSelections
+ this.chooseCSModelFlag = false
+ },
+
+ // 执行所选属性
+ executeCSModal (row) {
+ row.executeFlag = 'Y'
+ row.itemExecutionDate = new Date(+ new Date() + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '')
+ row.executor = this.$store.state.user.name
+ },
+
+ // 新增会签信息
+ countersignatureSave () {
+ if (this.chooseCSItemList.length === 0) {
+ this.$message.warning('请选择模板属性!')
+ return;
+ } else {
+ this.countersignatureData.chooseCSItemList = this.chooseCSItemList
+ }
+ countersignatureSave(this.countersignatureData).then(({data}) => {
+ if (data && data.code === 0) {
+ this.CountersignatureFlag = false
+ this.getDataList()
+ this.$message({
+ message: '操作成功',
+ type: 'success',
+ duration: 1500,
+ onClose: () => {}
+ })
+ } else {
+ this.$alert(data.msg, '错误', {
+ confirmButtonText: '确定'
+ })
+ }
})
},
diff --git a/src/views/modules/customer/customerInformationManagement.vue b/src/views/modules/customer/customerInformationManagement.vue
index bc3544f..03a9317 100644
--- a/src/views/modules/customer/customerInformationManagement.vue
+++ b/src/views/modules/customer/customerInformationManagement.vue
@@ -222,12 +222,12 @@
-
+
-
+
@@ -1686,63 +1686,63 @@
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
customerDesc: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
customerIndustry: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
customerCurrency: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
contactName: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
contactPhoneNumber1: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
importantCustomer: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
customerStatus: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
customerType: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
},
@@ -1751,35 +1751,35 @@
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
position: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
primaryContact: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
contactStatus: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
contactPhoneNumber1: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
]
},
@@ -1788,28 +1788,28 @@
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
defaultAddress: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
addressStatus: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
addressType: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
]
},
@@ -1818,56 +1818,56 @@
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
projectName: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
projectSourceDesc: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
priorityDesc: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
needDate: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
projectManagerName: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
projectOwnerName: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
],
userRoleName: [
{
required: true,
message: ' ',
- trigger: 'change'
+ trigger: ['blur','change']
}
]
},
@@ -2097,7 +2097,7 @@
departmentName:'',
mailbox: '',
primaryContact: 'N',
- contactStatus: '',
+ contactStatus: '启用',
remark: '',
createDate: '',
createBy: this.$store.state.user.name,
@@ -2708,14 +2708,14 @@
this.$message.warning('请输入联系人电话(1)！')
return
}
- if (this.contactModalData.position === '' || this.contactModalData.position == null) {
- this.$message.warning('请输入公司职务！')
- return
- }
- if(this.contactModalData.departmentName === '' || this.contactModalData.departmentName == null){
- this.$message.warning('请输入部门名称')
- return
- }
+ // if (this.contactModalData.position === '' || this.contactModalData.position == null) {
+ // this.$message.warning('请输入公司职务！')
+ // return
+ // }
+ // if(this.contactModalData.departmentName === '' || this.contactModalData.departmentName == null){
+ // this.$message.warning('请输入部门名称')
+ // return
+ // }
if (this.contactModalData.primaryContact === '' || this.contactModalData.primaryContact == null) {
this.$message.warning('请选择是否为默认联系人！')
return
diff --git a/src/views/modules/sys/dict-data-select.vue b/src/views/modules/sys/dict-data-select.vue
index c099735..763a01c 100644
--- a/src/views/modules/sys/dict-data-select.vue
+++ b/src/views/modules/sys/dict-data-select.vue
@@ -36,7 +36,7 @@ export default {
},
disabledOptionsValue:{
type:Array,
- default:[],
+ default:()=>[],
}
},
data () {
+
+
+ 申请人
+
-
+
-
-
+
+
-
-
+
-
-
-
-
+
-
-
-
+
+
-
-
+
-
-
+ TP工程师
+
-
-
+
+
-
-
+
-
-
+
-
-
+
-
-
-
+
+
-
-
+ ECN种类
-
-
-
+
+
-
-
+
-
-
-
+
+
-
-
+
+
+
+
+
+
+ {{scope.row[item.columnProp]}}
+ ![]()
+
+
+
+
+ ;width:98%">
+
+
+
+
+ ;width:98%">
+
+
+
+
+ ;width:98%">
+
+
+
+
+ 删除
+
+
+
+
+
+
+
在生产品
@@ -189,7 +253,7 @@
- 执行人
+ 执行人
@@ -207,7 +271,7 @@
- 执行人
+ 执行人
@@ -233,7 +297,7 @@
- 执行人
+ 执行人
@@ -253,7 +317,7 @@
-
- 保存
+ 保存
关闭
-
+
@@ -319,7 +317,7 @@
- 保存
+ 保存
关闭
@@ -351,19 +349,265 @@
选择执行模板
+
+
+ 保存
+ 关闭
+
+
+
+
+
- 保存
+ 保存
关闭
+
+
+
+
+
+
+ {{item.value}}
+
+
+
+
+
+
+
+ 保存
+ 关闭
+
+
+
+
+
+
+ 确认
+ 关闭
+
+
+
+
+
+
+ 确认
+ 关闭
+
+
+
@@ -376,10 +620,18 @@
deleteChangeFiles, // 根据变更单号删除文件,
costImpactSave, // 新增库存成本影响
executionSave, // 新增执行信息
+ getEcnTypeData, // 查询ECN种类数据
+ getEcnModel, // 查询ECN的模板
+ getItemList, // 查询模板属性
+ countersignatureSave, // 新增会签信息
} from "@/api/changeManagement/changeManagement.js"
import ChooseList from '@/views/modules/common/Chooselist'
+ import {
+ uploadFile // 文件上传
+ } from '@/api/oss/oss.js'
import DictDataSelect from '../sys/dict-data-select.vue'
import changeUploadFile from "../base/upload_file.vue"
+ import dayjs from "dayjs";
export default {
components: {
changeUploadFile,
@@ -388,6 +640,7 @@
},
data() {
return {
+ form: [],
// 导出
exportData: [],
exportName: '工程变更申请' + this.dayjs().format('YYYYMMDDHHmmss'),
@@ -419,7 +672,6 @@
applicationDepartmentId: '',
applicationDepartmentName: '',
applyDate: '',
- ecnType: '',
changeImpact: '',
changeImpactDesc: '',
ecnStage: '',
@@ -437,7 +689,8 @@
gpCertificationRequirements: '',
gpContinueToMeetDemand: '',
createBy: '',
- detailList: []
+ detailList: [],
+ ecnTypeData: []
},
costImpactData: {
site: this.$store.state.user.site,
@@ -478,11 +731,40 @@
newStencilNo: '',
executionDate: '',
createBy: '',
- updateBy: ''
+ updateBy: '',
+ chooseItemList: []
+ },
+ countersignatureData: {
+ site: this.$store.state.user.site,
+ changeNo: '',
+ createBy: '',
+ updateBy: '',
+ chooseCSItemList: []
+ },
+ chooseModelData: {
+ site: this.$store.state.user.site,
+ functionType: 'ECN',
+ itemNo: '',
+ itemDesc: '',
+ codeNo: ''
+ },
+ chooseCSModelData: {
+ site: this.$store.state.user.site,
+ functionType: 'ECN',
+ itemNo: '',
+ itemDesc: '',
+ codeNo: ''
},
// ======== 数据列表 ========
dataList: [],
chooseDataList: [],
+ fileList: [],
+ modelList: [],
+ modelCSList: [],
+ itemList: [],
+ itemCSList: [],
+ chooseItemList: [],
+ chooseCSItemList: [],
// ======== 列表表头 ========
columnList: [
{
@@ -696,6 +978,238 @@
columnWidth: 90
},
],
+ columnChooseItemList: [
+ {
+ userId: this.$store.state.user.name,
+ functionId: 108001,
+ serialNumber: '108001Table3ItemNo',
+ tableId: '108001Table3',
+ tableName: '执行属性表',
+ columnProp: 'itemNo',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '属性编码',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 80
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 108001,
+ serialNumber: '108001Table3ItemDesc',
+ tableId: '108001Table3',
+ tableName: '执行属性表',
+ columnProp: 'itemDesc',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '属性名称',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ 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: '108001Table3ExecuteDate',
+ tableId: '108001Table3',
+ tableName: '执行属性表',
+ columnProp: 'itemExecutionDate',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '执行时间',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 150
+ },
+
+ ],
+ columnChooseCSItemList: [
+ {
+ userId: this.$store.state.user.name,
+ functionId: 108001,
+ serialNumber: '108001Table6ItemNo',
+ tableId: '108001Table6',
+ tableName: '执行属性表',
+ columnProp: 'itemNo',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '属性编码',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 80
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 108001,
+ serialNumber: '108001Table6ItemDesc',
+ tableId: '108001Table6',
+ tableName: '执行属性表',
+ columnProp: 'itemDesc',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '属性名称',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 150
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 108001,
+ serialNumber: '108001Table6ExecuteFlag',
+ tableId: '108001Table6',
+ 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: '108001Table6Executor',
+ tableId: '108001Table6',
+ 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: '108001Table6ExecuteDate',
+ tableId: '108001Table6',
+ tableName: '执行属性表',
+ columnProp: 'itemExecutionDate',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '执行时间',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 150
+ },
+
+ ],
+ columnItemList: [
+ {
+ userId: this.$store.state.user.name,
+ functionId: 108001,
+ serialNumber: '108001Table4ItemNo',
+ tableId: '108001Table4',
+ tableName: '执行属性表',
+ columnProp: 'itemNo',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '属性编码',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 80
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 108001,
+ serialNumber: '108001Table4ItemDesc',
+ tableId: '108001Table4',
+ tableName: '执行属性表',
+ columnProp: 'itemDesc',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '属性名称',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 150
+ },
+ ],
+ columnCSItemList: [
+ {
+ userId: this.$store.state.user.name,
+ functionId: 108001,
+ serialNumber: '108001Table5ItemNo',
+ tableId: '108001Table5',
+ tableName: '执行属性表',
+ columnProp: 'itemNo',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '属性编码',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 80
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 108001,
+ serialNumber: '108001Table5ItemDesc',
+ tableId: '108001Table5',
+ tableName: '执行属性表',
+ columnProp: 'itemDesc',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '属性名称',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: '',
+ columnWidth: 150
+ },
+ ],
// ======== 必填规则 ========
rules: {
applicantId: [
@@ -712,13 +1226,6 @@
trigger: ['blur','change']
}
],
- ecnType: [
- {
- required: true,
- message: ' ',
- trigger: ['blur','change']
- }
- ],
changeImpact: [
{
required: true,
@@ -827,14 +1334,25 @@
},
// ======== 复选数据集 ========
dataSelections: [],
+ itemSelections: [],
+ itemCSSelections: [],
// ======== 模态框开关控制 ========
modalFlag: false,
modalDisableFlag: false,
+ EcnTypeModalFlag: false,
+ basicInformationFlag: false,
+ InventoryCostImpactFlag: false,
+ actionInformationFlag: false,
+ chooseModelFlag: false,
+ chooseCSModelFlag: false,
+ CountersignatureFlag: false,
}
},
created () {
this.getDataList()
+ this.getEcnModel()
+ this.getEcnCSModel()
},
mounted() {
@@ -842,8 +1360,31 @@
this.height = window.innerHeight - 180
})
},
+ computed:{
+ },
methods: {
+
+ ecnTypeHeaderChange (val,index) {
+ if (val === 'Y') {
+ for (let i = 0; i < this.form[index].list.length; i++) {
+ this.form[index].list[i].flag = 'Y'
+ }
+ } else {
+ for (let i = 0; i < this.form[index].list.length; i++) {
+ this.form[index].list[i].flag = 'N'
+ }
+ }
+ },
+
+ ecnTypeDetailChange (val,index) {
+ if (this.form[index].list.every(x => x.flag === 'Y')) {
+ this.form[index].flag = 'Y'
+ }else {
+ this.form[index].flag = 'N'
+ }
+ },
+
selectFlag (row) {
if (row.ecnFlag === '变更中') {
return false
@@ -912,7 +1453,6 @@
applicationDepartmentId: '',
applicationDepartmentName: '',
applyDate: new Date(+ new Date() + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, ''),
- ecnType: '',
changeImpact: 'N',
changeImpactDesc: '',
ecnStage: '',
@@ -930,7 +1470,8 @@
gpCertificationRequirements: '',
gpContinueToMeetDemand: '',
createBy: this.$store.state.user.name,
- detailList: []
+ detailList: [],
+ ecnTypeData: []
}
this.costImpactData = {
site: this.$store.state.user.site,
@@ -969,13 +1510,25 @@
originalStencilNo: '',
newStencilNo: '',
executionDate: new Date(+ new Date() + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, ''),
- createBy: this.$store.state.user.name
+ createBy: this.$store.state.user.name,
+ chooseItemList: []
+ }
+ this.countersignatureData = {
+ site: this.$store.state.user.site,
+ changeNo: data.changeNo,
+ createBy: this.$store.state.user.name,
+ chooseCSItemList: []
}
this.getDepartmentByUserName()
+ this.getEcnTypeData() // 获取ECN种类
this.chooseDataList = this.dataSelections
- this.activeName === 'basicInformation'
+ this.activeName = 'basicInformation'
this.modalFlag = true
this.modalDisableFlag = false
+ this.basicInformationFlag = true
+ this.InventoryCostImpactFlag = true
+ this.actionInformationFlag = true
+ this.CountersignatureFlag = true
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
@@ -986,21 +1539,23 @@
// 删除变更申请模态框
closeModalFlag () {
- deleteChangeFiles(this.modalData).then(({data}) => {
- if (data && data.code === 0) {
- this.getDataList()
- this.modalFlag = false
- } else {
- this.$alert(data.msg, '错误', {
- confirmButtonText: '确定'
- })
- }
- })
+ // deleteChangeFiles(this.modalData).then(({data}) => {
+ // if (data && data.code === 0) {
+ // this.getDataList()
+ // this.modalFlag = false
+ // } else {
+ // this.$alert(data.msg, '错误', {
+ // confirmButtonText: '确定'
+ // })
+ // }
+ // })
+ this.modalFlag = false
},
// 新增变更申请
saveData () {
this.modalData.detailList = this.chooseDataList
+ this.modalData.ecnTypeData = this.form
if (this.modalData.applicantId === '' || this.modalData.applicantId == null) {
this.$message.warning('请选择申请人员！')
return
@@ -1009,10 +1564,6 @@
this.$message.warning('请选择申请日期！')
return
}
- if (this.modalData.ecnType === '' || this.modalData.ecnType == null) {
- this.$message.warning('请选择ECN种类！')
- return
- }
if (this.modalData.changeImpact === '' || this.modalData.changeImpact == null) {
this.$message.warning('请选择ECN变更影响！')
return
@@ -1075,7 +1626,15 @@
}
changeRequestSave(this.modalData).then(({data}) => {
if (data && data.code === 0) {
+ for (let i = 0; i
+
+
-
+
+ 保存
+ 关闭
+
+
+
+
+
+ 保存
关闭
@@ -366,10 +530,163 @@
-
+
+
+
+
+
+
+
+ {{item.value}}
+
+
+
+
+
+
+
+ 保存
+ 关闭
+
+
+
+
+
+
+ 确认
+ 关闭
+
+
+
-
-
-
-
+
@@ -154,7 +151,8 @@
文件上传
+ ECN种类
+ 文件上传
@@ -240,12 +238,12 @@
+ ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+
+
+
+
+ {{scope.row[item.columnProp]}}
+ ![]()
+
+
+
+
+ ;width:98%">
+
+
+
+
+ 执行
+
+
+
+
+
+
+
+
+
+ {{scope.row[item.columnProp]}}
+ ![]()
+
+
+
+
+ ;width:98%">
+
+
+
+
+ 执行
+
+
+
+
+
+
+
+ 在生产品
+
+
+
+
+
+
+
+
+
+
+
+
+ 成品库存
+
+
+
+
+
+
+
+
+
+
+
+
+ 新订单
+
+
+
+
+
+
+ 影响的原材料及其库存量
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{i.value}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+
+ ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+
+
+
+ {{scope.row[item.columnProp]}}
+ ![]()
+
+
+
+
+ ;width:98%">
+
+
+
+
+ 执行
+
+
+
+
+
+ 选择会签模板
+
+
+
+
+ {{scope.row[item.columnProp]}}
+ ![]()
+
+
+
+
+ ;width:98%">
+
+
+
+
+ 执行
+
+
+
+
+
+ {{i.value}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+