xh/kehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.项目立项时去掉项目编码字段

Browse Source 
2.项目详情编辑时去掉项目编码字段
3.项目立项列表增加项目编号字段
This commit is contained in:
zty 2024-07-26 14:27:40 +08:00
parent 8d4f05c2e0
commit be5105b809
3 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue
View File

@ -139,7 +139,7 @@ export default {
value: 6 value: 6
}, },
{ {
label: '自主研发类', label: '自主研发类(ZY)',
value: 7 value: 7
}, },
], ],
@ -389,14 +389,14 @@ export default {
} }
}, },
{ // {
type: 'custom-input', // type: 'custom-input',
title: '项目编码', // title: '项目编码',
model: 'projectNo', // model: 'projectNo',
externalValue: { // externalValue: {
disabled: false // disabled: false
} // }
}, // },
{ {
type: 'custom-input', type: 'custom-input',
title: '项目名称', title: '项目名称',
@ -958,7 +958,7 @@ export default {
projectCategory: 'init', projectCategory: 'init',
projectStep: 'init', projectStep: 'init',
projectName: this.formModel.projectName, projectName: this.formModel.projectName,
projectNo: this.formModel.projectNo, // projectNo: this.formModel.projectNo,
projectParentId: projectParentId, projectParentId: projectParentId,
description: this.formModel.description, description: this.formModel.description,
ext: ext, ext: ext,
@ -978,7 +978,7 @@ export default {
console.log('param', param) console.log('param', param)
param.membersList = membersList param.membersList = membersList
param['ext'] = { param['ext'] = {
formProjectNo: param.formProjectNo, // formProjectNo: param.formProjectNo,
membersList: param.membersList, membersList: param.membersList,
// projectManagerData: this.formModel.projectManagerData, // projectManagerData: this.formModel.projectManagerData,
draftMan: param.draftMan, draftMan: param.draftMan,

23
kehui-oa-front/src/pages/projectManagement/ProjectDetail.vue
View File

@ -716,14 +716,14 @@ export default {
disabled: !this.judgeFormEditable('apply') disabled: !this.judgeFormEditable('apply')
} }
}, },
{ // {
type: 'custom-input', // type: 'custom-input',
title: '项目编码', // title: '项目编码',
model: 'projectNo', // model: 'projectNo',
externalValue: { // externalValue: {
disabled: !this.judgeFormEditable('apply'), // disabled: !this.judgeFormEditable('apply'),
} // }
}, // },
{ {
type: 'custom-input', type: 'custom-input',
title: '项目名称', title: '项目名称',
@ -1518,7 +1518,8 @@ export default {
if (project.hasOwnProperty('fileData')) { if (project.hasOwnProperty('fileData')) {
this.formFileData = project.fileData; this.formFileData = project.fileData;
this.formModel.fileData = project.fileData; this.formModel.fileData = project.fileData;
// this.logOperationData.fileData = JSON.parse(JSON.stringify(ext.fileData)); console.log("this.formFileData",this.formFileData)
console.log("this.formModel.fileData",this.formModel.fileData)
} }
let getNameParams = { let getNameParams = {
list: this.OrgIds list: this.OrgIds
@ -1763,7 +1764,7 @@ export default {
projectCategory: 'init', projectCategory: 'init',
projectStep: 'init', projectStep: 'init',
projectName: this.formModel.projectName, projectName: this.formModel.projectName,
projectNo: this.formModel.projectNo, // projectNo: this.formModel.projectNo,
description: this.formModel.description, description: this.formModel.description,
ext: ext ext: ext
}, },
@ -1852,7 +1853,7 @@ export default {
projectCategory: projectCategory, projectCategory: projectCategory,
projectStep: projectStep, projectStep: projectStep,
projectName: this.formModel.projectName, projectName: this.formModel.projectName,
projectNo: this.formModel.projectNo, // projectNo: this.formModel.projectNo,
projectParentId: this.formModel.projectParentId, projectParentId: this.formModel.projectParentId,
description: this.formModel.description, description: this.formModel.description,
ext: ext ext: ext

15
kehui-oa-front/src/pages/projectManagement/ProjectManagement.vue
View File

@ -190,21 +190,26 @@ export default {
//初始化table column //初始化table column
initTableColumn () { initTableColumn () {
this.tableColumnsData = [ this.tableColumnsData = [
// {
// label: '项目编号',
// prop: 'projectNo',
// show: true
// },
{ {
label: '所属年份', label: '所属年份',
prop: 'applyDate', prop: 'applyDate',
show: true show: true
}, },
{
label: '项目编号',
prop: 'projectNo',
show: true
},
{ {
label: '项目名称', label: '项目名称',
prop: 'projectName', prop: 'projectName',
show: true show: true
}, },
{
label: '立项人',
prop: 'ext.draftMan',
show: true
},
{ {
label: '项目负责人', label: '项目负责人',
prop: 'projectManagerData', prop: 'projectManagerData',