diff --git a/src/views/modules/auth/authMachineProject.vue b/src/views/modules/auth/authMachineProject.vue index c8e839d..6ae95dc 100644 --- a/src/views/modules/auth/authMachineProject.vue +++ b/src/views/modules/auth/authMachineProject.vue @@ -23,7 +23,6 @@ - @@ -378,6 +377,7 @@ export default { requiredCompletionStartDate: '', requiredCompletionEndDate: '', status: '', + sstatus:'审核中', quoterName: '', requesterName: '', priorityLevel: '', diff --git a/src/views/modules/machine/machineProjectDetail.vue b/src/views/modules/machine/machineProjectDetail.vue index fb12ca5..3db6669 100644 --- a/src/views/modules/machine/machineProjectDetail.vue +++ b/src/views/modules/machine/machineProjectDetail.vue @@ -343,7 +343,7 @@ export default { created() {}, methods: { projectDetailInit(record) { - this.saveVisible = true + this.saveVisible = true this.model = record this.getTabs() }, diff --git a/src/views/modules/machine/modules/machineProjectPlanDetailForm.vue b/src/views/modules/machine/modules/machineProjectPlanDetailForm.vue index 3b2c6c9..04392f1 100644 --- a/src/views/modules/machine/modules/machineProjectPlanDetailForm.vue +++ b/src/views/modules/machine/modules/machineProjectPlanDetailForm.vue @@ -79,17 +79,24 @@ export default { buId: [ { required: true, message: '请选择BU', trigger: ['blur', 'change'] }, ], - projectName: [ + planDescribe: [ { required: true, - message: '请输入项目名称', + message: '请输入计划描述', trigger: ['blur', 'change'], }, ], - responsibleNo: [ + startDate: [ { required: true, - message: '请选择项目负责人', + message: '请选择计划开始日期', + trigger: ['blur', 'change'], + }, + ], + endDate: [ + { + required: true, + message: '请选择计划完成日期', trigger: ['blur', 'change'], }, ], @@ -118,8 +125,6 @@ export default { }, methods: { add(record) { - console.log(record) - this.saveVisible = true this.model = JSON.parse(JSON.stringify({})) @@ -129,8 +134,6 @@ export default { this.model.projectName = record.projectName }, edit(record) { - console.log('????') - this.saveVisible = true this.model = JSON.parse(JSON.stringify(record)) }, diff --git a/src/views/modules/machine/modules/machineProjectTaskDetailForm.vue b/src/views/modules/machine/modules/machineProjectTaskDetailForm.vue index 49052df..945e93c 100644 --- a/src/views/modules/machine/modules/machineProjectTaskDetailForm.vue +++ b/src/views/modules/machine/modules/machineProjectTaskDetailForm.vue @@ -63,10 +63,10 @@ buId: [ { required: true, message: '请选择BU', trigger: ['blur', 'change'] }, ], - projectName: [ + taskDescribe: [ { required: true, - message: '请输入项目名称', + message: '请输入任务描述', trigger: ['blur', 'change'], }, ], diff --git a/src/views/modules/oss/ossProjectComponents.vue b/src/views/modules/oss/ossProjectComponents.vue index 23a8ceb..51d6110 100644 --- a/src/views/modules/oss/ossProjectComponents.vue +++ b/src/views/modules/oss/ossProjectComponents.vue @@ -110,7 +110,7 @@ export default { onChangeFile(file, fileList){ this.fileList = fileList }, - handleUploadFiles(){ + handleUploadFiles(){ if (this.fileList.length === 0){ this.$message.error('请选择文件'); return; @@ -128,7 +128,7 @@ export default { formData.append('createdBy', this.$store.state.user.name); formData.append('cAdditionalInfo', this.ossForm.remark); - this.uploadLoading = true; + /* this.uploadLoading = true; projectIncomeUpload(formData).then(({data})=>{ if (data && data.code === 0){ this.$message.success(data.msg); @@ -141,7 +141,7 @@ export default { }).catch((error)=>{ this.$message.error(error); this.uploadLoading = false; - }) + }) */ }, handleRemove(row){ this.$confirm('确认删除吗?', '提示').then(() => {