Skip to content

Y
yn-science-front
Commit 9be99741 authored by wangxl's avatar wangxl
Browse files
Options

3333

parent 1bd46384
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 157 deletions
src/views/audit/project/audit.vue
View file @ 9be99741
......@@ -64,52 +64,45 @@ export default {
],
formData: {
id: null,
organizationCode: null,
appPersonName: null,
sex: null,
birthday: null,
nationName: null,
degreeName: null,
titleName: null,
mobile: null,
email: null,
jobTime: null,
address: null,
registeredAddress: null,
postCode: null,
legalPerson: null,
workforce: null,
specializedPersonnel: null,
researchPersonnel: null,
depositBank: null,
bankAccount: null,
depositBankAddress: null,
interbankNumber: null,
researchTotal: null,
isResearchActive: null,
researchCount: null,
researchPersonCount: null,
appUnitName: null,
mainResearchAreas: null,
unitLinkName: null,
unitLinkMobile: null,
unitLinkEmail: null,
unitLinkFax: null,
projName: null,
leadUnit: null,
recommendUnit: null,
knowledgeId: null,
subjectScope: null,
projClass: null,
remark: null,
startDate: null,
endDate: null,
technologyInnovationBase: null,
knowledgeId: null,
totalFunding: null,
govFunding: null,
linkName: null,
linkMobile: null,
linkEmail: null,
projAbstract: null,
projKeywords: null,
researchContent: null,
memResume: null,
researchProgress: null,
researchContent: null,
technologyTarget: null,
economyTarget: null,
achievementTarget: null,
otherTarget: null,
yearTarget: null,
year1Goal: null,
year2Goal: null,
year3Goal: null,
projectKPI: projectKPI,
cooperativeUnits: [],
members: [],
budget: [],
equipments: [],
projectSubList: [],
managementRuleList: [],
fundPlan: [],
fileList: [],
auditList: [],
managerDept: "",
},
auditObj: { id: this.value, auditObjectId: this.objId, auditResult: null, auditType: 1, auditContent: '' },
rules: {
......
src/views/report/project/components/projectEdit.vue
View file @ 9be99741
......@@ -495,8 +495,6 @@ const ProjResearch = { projNo: null, projName: null, approveUnit: null, leader:
const ManagementRule = { policyName: null, releaseDate: null, documentNumber: null, validityPeriod: null, mainContent: null, fileId: null, downloadId: null, fileName: null, downloadUrl: null }
const ProjectSub = { projName: null, undertakingUnit: null, address: null, director: null, totalBudget: null, govBudget: null, selfBudget: null, cooperativeUnits: null, fileId: null, downloadId: null, fileName: null, downloadUrl: null }
const Cooperative = { id: null, unitName: null }
const ParticipateUnit = { id: null, unitName: null, unitCountry: null, unitAddress: null, organizationCode: null, projectWork: null }
const File = { fileName: '', downloadUrl: '', fileExplain: '', downloadId: '' }
const projectKPI = {
......@@ -556,103 +554,64 @@ export default {
overseasShow: false,
formData: {
id: null,
organizationCode: null,
address: null,
appPersonName: null,
sex: null,
birthday: null,
nationName: null,
degreeName: null,
titleName: null,
mobile: null,
email: null,
jobTime: null,
address: null,
appUnitName: null,
mainResearchAreas: null,
registeredAddress: null,
postCode: null,
legalPerson: null,
workforce: null,
specializedPersonnel: null,
researchPersonnel: null,
depositBank: null,
bankAccount: null,
depositBankAddress: null,
interbankNumber: null,
researchTotal: null,
isResearchActive: null,
researchCount: null,
researchPersonCount: null,
unitLinkName: null,
unitLinkMobile: null,
unitLinkEmail: null,
unitLinkFax: null,
projName: null,
leadUnit: null,
recommendUnit: null,
knowledgeId: null,
subjectScope: null,
projClass: null,
remark: null,
startDate: null,
endDate: null,
technologyInnovationBase: null,
knowledgeId: null,
totalFunding: null,
govFunding: null,
linkName: null,
linkMobile: null,
linkEmail: null,
projAbstract: null,
projKeywords: null,
projContent: null,
memResume: null,
researchProgress: null,
researchContent: null,
technologyTarget: null,
economyTarget: null,
achievementTarget: null,
otherTarget: null,
yearTarget: null,
year1Goal: null,
year2Goal: null,
year3Goal: null,
projectKPI: projectKPI,
unitPayment: [],
cooperativeUnits: [],
members: [],
budget: [],
fundPlan: [],
equipments: [],
projectResearchList: [],
projectSubList: [],
managementRuleList: [],
fileList: [],
auditList: [],
managerDept: "",
},
rules: {
jobTime :null,
mainResearchAreas: [{ required: true, message: '请填写主要研究领域', trigger: 'blur' },],
jobTime: [{ required: true, message: '请填写每年工作时间(月)', trigger: 'blur' },],
organizationCode: [{ required: true, message: '请填写组织机构代码/统一社会信用代码', trigger: 'blur' },],
registeredAddress: [{ required: true, message: '请填写注册所在地', trigger: 'blur' },],
postCode: [{ required: true, message: '请填写邮编', trigger: 'blur' },],
legalPerson: [{ required: true, message: '请填写法定代表人', trigger: 'blur' },],
workforce: [{ required: true, message: '请填写职工总数', trigger: 'blur' },],
specializedPersonnel: [{ required: true, message: '请填写其中专科以上人员', trigger: 'blur' },],
researchPersonnel: [{ required: true, message: '请填写研究开发人员', trigger: 'blur' },],
depositBank: [{ required: true, message: '请填写开户银行', trigger: 'blur' },],
bankAccount: [{ required: true, message: '请填写银行账号', trigger: 'blur' },],
depositBankAddress: [{ required: true, message: '请填写开户银行地址', trigger: 'blur' },],
interbankNumber: [{ required: true, message: '请填写开户银行地址', trigger: 'blur' },],
// researchTotal: [{ required: true, message: '请填写上年度研发经费支出总额', trigger: 'blur' },],
// isResearchActive: [{ required: true, message: '请选择上年度是否填报了研发活动情况', trigger: 'change' },],
// researchCount: [{ required: true, message: '请填写上一年度填报的研发投入总数', trigger: 'blur' },],
// researchPersonCount: [{ required: true, message: '请填写上一年度填报的研发人员数', trigger: 'blur' },],
unitLinkName: [{ required: true, message: '请填写单位联系人', trigger: 'blur' },],
unitLinkMobile: [{ required: true, message: '请填写联系人电话', trigger: 'blur' },],
unitLinkEmail: [{ required: true, message: '请填写电子邮箱', trigger: 'blur' },],
unitLinkFax: [{ required: true, message: '请填写传真', trigger: 'blur' },],
projName: [{ required: true, message: '请填写项目名称', trigger: 'blur' },],
// leadUnit: [{ required: true, message: '请填写项目所属二级学院/部门名称(牵头单位)', trigger: 'blur' },],
// recommendUnit: [{ required: false, message: '请填写推荐部门', trigger: 'blur' },],
knowledgeId: { required: true, message: '请选择>项目所属学科类别', trigger: 'change' },
subjectScope: [{ required: true, message: '请填写选题范围', trigger: 'blur' },],
projClass: [{ required: true, message: '请填写项目类别', trigger: 'blur' },],
remark: [{ required: true, message: '请填写附注说明', trigger: 'blur' },],
startDate: { required: true, message: '请选择项日开始时间', trigger: 'change' },
endDate: { required: true, message: '请选择项目结束时间', trigger: 'change' },
technologyInnovationBase: [{ required: true, message: '请填写项目依托的科技创新基地', trigger: 'blur' },],
knowledgeId: { required: true, message: '请选择>项目所属学科类别', trigger: 'change' },
totalFunding: [{ required: true, message: '请填写项目总经费', trigger: 'blur' },],
govFunding: [{ required: true, message: '请填写申请科技经费', trigger: 'blur' },],
linkName: [{ required: true, message: '请填写项目联系人姓名', trigger: 'blur' },],
linkMobile: [{ required: true, message: '请填写联系人手机', trigger: 'blur' },],
linkEmail: [{ required: true, message: '请填写电子邮箱', trigger: 'blur' },],
projAbstract: [{ required: true, message: '请填写项目摘要', trigger: 'blur' },],
projKeywords: [{ required: true, message: '请填写关键词', trigger: 'blur' },],
projContent: { required: true, message: '请填写项目的意义、必要性', trigger: 'blur' },
memResume: { required: true, message: '请填写项目现有工作基础和支撑条件', trigger: 'blur' },
researchProgress: { required: true, message: '请填写与项目相关的国内外技术发展现状', trigger: 'blur' },
researchContent: { required: true, message: '请填写项目实施目标', trigger: 'blur' },
technologyTarget: { required: true, message: '请填写主要技术指标', trigger: 'blur' },
economyTarget: { required: true, message: '请填写主要经济指标', trigger: 'blur' },
achievementTarget: [{ required: false, message: '请填写项目实施中形成的示范基地、中试线、生产线及其规模等', trigger: 'blur' },],
otherTarget: { required: false, message: '请填写其他应考核的指标', trigger: 'blur' },
},
}
},
......@@ -731,28 +690,29 @@ export default {
},
submit () {
this.processProjectYearTarget()
if (this.formData.members.length == 0) {
this.$message.error('至少添加一位项目组成员！')
return
}
this.$refs.form.validate(valid => {
if (valid) {
this.$emit('load', true)
let state = this.formData.projState
if (state != 30)
this.formData.projState = 10
let pars = isEmptyParams(this.formData)
let par = { ...pars }
this.$api.project.save(par).then(({ data = {} }) => {
if (data) {
this.formData.id = data
this.$message.success('成功！')
this.$emit('close', 'submit')
}
this.$emit('load', false)
}).catch(() => {
this.$emit('load', false)
})
if (this.formData.members.length == 0) {
this.$message.error('至少添加一位项目组成员！')
return false
} else {
this.$emit('load', true)
let state = this.formData.projState
if (state != 30)
this.formData.projState = 10
let pars = isEmptyParams(this.formData)
let par = { ...pars }
this.$api.project.save(par).then(({ data = {} }) => {
if (data) {
this.formData.id = data
this.$message.success('成功！')
this.$emit('close', 'submit')
}
this.$emit('load', false)
}).catch(() => {
this.$emit('load', false)
})
}
} else {
this.$message.warn('项目信息未填写完全！')
return false
......
src/views/report/project/components/projectView.vue
View file @ 9be99741
......@@ -77,58 +77,44 @@ export default {
],
formData: {
id: null,
organizationCode: null,
appPersonName: null,
sex: null,
birthday: null,
nationName: null,
degreeName: null,
titleName: null,
mobile: null,
email: null,
jobTime: null,
address: null,
registeredAddress: null,
postCode: null,
legalPerson: null,
workforce: null,
specializedPersonnel: null,
researchPersonnel: null,
depositBank: null,
bankAccount: null,
depositBankAddress: null,
interbankNumber: null,
researchTotal: null,
isResearchActive: null,
researchCount: null,
researchPersonCount: null,
appUnitName: null,
mainResearchAreas: null,
unitLinkName: null,
unitLinkMobile: null,
unitLinkEmail: null,
unitLinkFax: null,
projName: null,
leadUnit: null,
recommendUnit: null,
knowledgeId: null,
subjectScope: null,
projClass: null,
remark: null,
startDate: null,
endDate: null,
technologyInnovationBase: null,
knowledgeId: null,
totalFunding: null,
govFunding: null,
linkName: null,
linkMobile: null,
linkEmail: null,
projAbstract: null,
projKeywords: null,
researchContent: null,
memResume: null,
researchProgress: null,
researchContent: null,
technologyTarget: null,
economyTarget: null,
achievementTarget: null,
otherTarget: null,
yearTarget: null,
year1Goal: null,
year2Goal: null,
year3Goal: null,
projectKPI: projectKPI,
cooperativeUnits: [],
participateUnits: [],
members: [],
budget: [],
equipments: [],
projectResearchList: [],
projectSubList: [],
managementRuleList: [],
fundPlan: [],
fileList: [],
auditList: [],
managerDept: "",
},
loading: false,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment