Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qr-consistency-vue3
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘怀志
qr-consistency-vue3
Commits
1967200a
Commit
1967200a
authored
May 12, 2025
by
qiyaxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(CCAP控制计划管理):主列表调整编制负责人
parent
945e6842
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
81 additions
and
18 deletions
+81
-18
CCAPControlPlanManagement.js
...pi/CCAPControlPlanManagement/CCAPControlPlanManagement.js
+16
-0
index.vue
...lPlan/CCAPControlPlan/CCAPControlPlanManagement/index.vue
+65
-18
No files found.
src/api/CCAPControlPlanManagement/CCAPControlPlanManagement.js
View file @
1967200a
...
@@ -59,3 +59,19 @@ export function getALLUserList() {
...
@@ -59,3 +59,19 @@ export function getALLUserList() {
method
:
'get'
method
:
'get'
})
})
}
}
// 获取编制负责人信息
export
function
getChargeUserName
(
planId
)
{
return
request
({
url
:
'/control//compilationTask/getCompilationTTaskListByPlanId/'
+
planId
,
method
:
'get'
,
})
}
// 提交调整编制负责人修改
export
function
submitChangeChargeUser
(
data
)
{
return
request
({
url
:
'/control/compilationTask/chargeUser'
,
method
:
'put'
,
data
:
data
})
}
src/views/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/index.vue
View file @
1967200a
...
@@ -590,9 +590,9 @@
...
@@ -590,9 +590,9 @@
<div
class=
"tab-components"
style=
"margin-bottom: 10px"
>
<div
class=
"tab-components"
style=
"margin-bottom: 10px"
>
<span
class=
"components-span"
>
01.
{{
cn
.
keyPartsList
}}{{
en
.
keyPartsList
}}
</span>
<span
class=
"components-span"
>
01.
{{
cn
.
keyPartsList
}}{{
en
.
keyPartsList
}}
</span>
</div>
</div>
<el-checkbox
v-model=
"isChecked1"
>
<el-checkbox
v-model=
"isChecked1"
:disabled=
"isKeyPartsDisabled"
>
{{
cn
.
keyPartsList
}}{{
en
.
keyPartsList
}}
:
{{
cn
.
keyPartsList
}}{{
en
.
keyPartsList
}}
:
<el-input
v-model=
"personInCharge1"
:disabled=
"!isChecked1"
style=
"width: 200px;margin-right: 10px"
/>
<el-input
v-model=
"personInCharge1"
:disabled=
"!isChecked1
|| isKeyPartsDisabled
"
style=
"width: 200px;margin-right: 10px"
/>
<el-button
type=
"primary"
plain
icon=
"user"
:disabled=
"!isChecked1"
@
click=
"openSelectPersonnelDialog(1)"
>
{{
cn
.
selectPersonnel
}}{{
en
.
selectPersonnel
}}
</el-button>
<el-button
type=
"primary"
plain
icon=
"user"
:disabled=
"!isChecked1"
@
click=
"openSelectPersonnelDialog(1)"
>
{{
cn
.
selectPersonnel
}}{{
en
.
selectPersonnel
}}
</el-button>
</el-checkbox>
</el-checkbox>
</div>
</div>
...
@@ -601,9 +601,9 @@
...
@@ -601,9 +601,9 @@
<div
class=
"tab-components"
style=
"margin-bottom: 10px"
>
<div
class=
"tab-components"
style=
"margin-bottom: 10px"
>
<span
class=
"components-span"
>
02.
{{
cn
.
keyProcessAssemblyInspectionList
}}{{
en
.
keyProcessAssemblyInspectionList
}}
</span>
<span
class=
"components-span"
>
02.
{{
cn
.
keyProcessAssemblyInspectionList
}}{{
en
.
keyProcessAssemblyInspectionList
}}
</span>
</div>
</div>
<el-checkbox
v-model=
"isChecked2"
>
<el-checkbox
v-model=
"isChecked2"
:disabled=
"isKeyProcessDisabled"
>
{{
cn
.
keyProcessAssemblyInspectionList
}}{{
en
.
keyProcessAssemblyInspectionList
}}
:
{{
cn
.
keyProcessAssemblyInspectionList
}}{{
en
.
keyProcessAssemblyInspectionList
}}
:
<el-input
v-model=
"personInCharge2"
:disabled=
"!isChecked2"
style=
"width: 200px;margin-right: 10px"
/>
<el-input
v-model=
"personInCharge2"
:disabled=
"!isChecked2
|| isKeyProcessDisabled
"
style=
"width: 200px;margin-right: 10px"
/>
<el-button
type=
"primary"
plain
icon=
"user"
:disabled=
"!isChecked2"
@
click=
"openSelectPersonnelDialog(2)"
>
{{
cn
.
selectPersonnel
}}{{
en
.
selectPersonnel
}}
</el-button>
<el-button
type=
"primary"
plain
icon=
"user"
:disabled=
"!isChecked2"
@
click=
"openSelectPersonnelDialog(2)"
>
{{
cn
.
selectPersonnel
}}{{
en
.
selectPersonnel
}}
</el-button>
</el-checkbox>
</el-checkbox>
</div>
</div>
...
@@ -612,14 +612,14 @@
...
@@ -612,14 +612,14 @@
<div
class=
"tab-components"
style=
"margin-bottom: 10px"
>
<div
class=
"tab-components"
style=
"margin-bottom: 10px"
>
<span
class=
"components-span"
>
03.
{{
cn
.
copTestAndChecklist
}}{{
en
.
copTestAndChecklist
}}
</span>
<span
class=
"components-span"
>
03.
{{
cn
.
copTestAndChecklist
}}{{
en
.
copTestAndChecklist
}}
</span>
</div>
</div>
<el-checkbox
v-model=
"isChecked3"
>
<el-checkbox
v-model=
"isChecked3"
:disabled=
"isCopMakeDisabled"
>
{{
cn
.
manufacturingCompilationResponsiblePerson
}}{{
en
.
manufacturingCompilationResponsiblePerson
}}
:
{{
cn
.
manufacturingCompilationResponsiblePerson
}}{{
en
.
manufacturingCompilationResponsiblePerson
}}
:
<el-input
v-model=
"personInCharge3"
:disabled=
"!isChecked3"
style=
"width: 200px;margin-right: 10px"
/>
<el-input
v-model=
"personInCharge3"
:disabled=
"!isChecked3
|| isCopMakeDisabled
"
style=
"width: 200px;margin-right: 10px"
/>
<el-button
type=
"primary"
plain
icon=
"user"
:disabled=
"!isChecked3"
@
click=
"openSelectPersonnelDialog(3)"
>
{{
cn
.
selectPersonnel
}}{{
en
.
selectPersonnel
}}
</el-button>
<el-button
type=
"primary"
plain
icon=
"user"
:disabled=
"!isChecked3"
@
click=
"openSelectPersonnelDialog(3)"
>
{{
cn
.
selectPersonnel
}}{{
en
.
selectPersonnel
}}
</el-button>
</el-checkbox>
</el-checkbox>
<el-checkbox
v-model=
"isChecked4"
style=
"margin-top: 15px"
>
<el-checkbox
v-model=
"isChecked4"
:disabled=
"isCopQualityDisabled"
style=
"margin-top: 15px"
>
{{
cn
.
qualityControlCompilationResponsiblePerson
}}{{
en
.
qualityControlCompilationResponsiblePerson
}}
:
{{
cn
.
qualityControlCompilationResponsiblePerson
}}{{
en
.
qualityControlCompilationResponsiblePerson
}}
:
<el-input
v-model=
"personInCharge4"
:disabled=
"!isChecked4"
style=
"width: 200px;margin-right: 10px;"
/>
<el-input
v-model=
"personInCharge4"
:disabled=
"!isChecked4
|| isCopQualityDisabled
"
style=
"width: 200px;margin-right: 10px;"
/>
<el-button
type=
"primary"
plain
icon=
"user"
:disabled=
"!isChecked4"
@
click=
"openSelectPersonnelDialog(4)"
>
{{
cn
.
selectPersonnel
}}{{
en
.
selectPersonnel
}}
</el-button>
<el-button
type=
"primary"
plain
icon=
"user"
:disabled=
"!isChecked4"
@
click=
"openSelectPersonnelDialog(4)"
>
{{
cn
.
selectPersonnel
}}{{
en
.
selectPersonnel
}}
</el-button>
</el-checkbox>
</el-checkbox>
</div>
</div>
...
@@ -719,7 +719,7 @@ import SelectRole from "@/components/SelectRole/index.vue"
...
@@ -719,7 +719,7 @@ import SelectRole from "@/components/SelectRole/index.vue"
import
{
import
{
getAllBusinessUnitName
,
getAllBusinessUnitName
,
getCCAPPlanList
,
getCCAPPlanList
,
deletePlan
,
undoPlan
,
getAllvehicleModelCode
,
genFile
,
getALLUserList
deletePlan
,
undoPlan
,
getAllvehicleModelCode
,
genFile
,
getALLUserList
,
getChargeUserName
,
submitChangeChargeUser
,
}
from
'@/api/CCAPControlPlanManagement/CCAPControlPlanManagement.js'
}
from
'@/api/CCAPControlPlanManagement/CCAPControlPlanManagement.js'
import
{
ref
}
from
'vue'
import
{
ref
}
from
'vue'
import
cn
from
'@/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/index/cn.json'
;
import
cn
from
'@/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/index/cn.json'
;
...
@@ -778,6 +778,10 @@ const personInCharge1 = ref('');
...
@@ -778,6 +778,10 @@ const personInCharge1 = ref('');
const
personInCharge2
=
ref
(
''
);
const
personInCharge2
=
ref
(
''
);
const
personInCharge3
=
ref
(
''
);
const
personInCharge3
=
ref
(
''
);
const
personInCharge4
=
ref
(
''
);
const
personInCharge4
=
ref
(
''
);
const
isKeyPartsDisabled
=
ref
(
false
)
const
isKeyProcessDisabled
=
ref
(
false
)
const
isCopMakeDisabled
=
ref
(
false
)
const
isCopQualityDisabled
=
ref
(
false
)
const
manufacturingPersonInCharge
=
ref
(
''
);
const
manufacturingPersonInCharge
=
ref
(
''
);
const
qualityControlPersonInCharge
=
ref
(
''
);
const
qualityControlPersonInCharge
=
ref
(
''
);
const
changeDialogVisible
=
ref
(
false
)
const
changeDialogVisible
=
ref
(
false
)
...
@@ -991,6 +995,17 @@ function confirmDelete() {
...
@@ -991,6 +995,17 @@ function confirmDelete() {
function
adjustCompilationResponsiblePerson
(
row
)
{
function
adjustCompilationResponsiblePerson
(
row
)
{
adjustCompilationResponsiblePersonDialogVisible
.
value
=
true
adjustCompilationResponsiblePersonDialogVisible
.
value
=
true
currentRow
.
value
=
row
;
currentRow
.
value
=
row
;
//根据控制计划id获取编制负责人
getChargeUserName
(
row
.
id
).
then
(
res
=>
{
personInCharge1
.
value
=
res
.
data
[
0
].
chargeUserName
;
//关键零部件清单负责人
isKeyPartsDisabled
.
value
=
res
.
data
[
0
].
taskStatus
===
'plan_compilation_completed'
//编制状态为编制完成时选择框禁用
personInCharge2
.
value
=
res
.
data
[
1
].
chargeUserName
;
//关键工序、装配、检验清单负责人
isKeyProcessDisabled
.
value
=
res
.
data
[
1
].
taskStatus
===
'plan_compilation_completed'
personInCharge3
.
value
=
res
.
data
[
2
].
chargeUserName
;
//COP制造负责人
isCopMakeDisabled
.
value
=
res
.
data
[
2
].
taskStatus
===
'plan_compilation_completed'
personInCharge4
.
value
=
res
.
data
[
3
].
chargeUserName
;
//COP质管负责人
isCopQualityDisabled
.
value
=
res
.
data
[
3
].
taskStatus
===
'plan_compilation_completed'
})
}
}
function
openSelectPersonnelDialog
(
field
)
{
function
openSelectPersonnelDialog
(
field
)
{
selectRole
.
value
=
true
;
// 打开选择人员对话框
selectRole
.
value
=
true
;
// 打开选择人员对话框
...
@@ -1022,17 +1037,50 @@ const handleSelectionSubmit = (selectedItems) => {
...
@@ -1022,17 +1037,50 @@ const handleSelectionSubmit = (selectedItems) => {
};
};
/** 提交调整编制负责人更改 */
/** 提交调整编制负责人更改 */
function
adjustCompilationResponsiblePersonSubmitForm
(
row
)
{
function
adjustCompilationResponsiblePersonSubmitForm
(
row
)
{
const
formData
=
{
const
formData
=
[
keyPartsListPersonInCharge
:
personInCharge1
.
value
,
{
keyProcessListPersonInCharge
:
personInCharge2
.
value
,
planId
:
currentRow
.
value
.
id
,
manufacturingPersonInCharge
:
manufacturingPersonInCharge
.
value
,
// dataType: 'CCAP_KEY_PARTS_TASK',
qualityControlPersonInCharge
:
qualityControlPersonInCharge
.
value
,
// chargeUserId: allUserList.value.find(user => user.nickName === personInCharge1.value)?.userId || 0,
controlPlanId
:
row
.
id
// chargeUserPhone: allUserList.value.find(user => user.nickName === personInCharge1.value)?.phone || '',
};
// chargeDeptName: allUserList.value.find(user => user.nickName === personInCharge1.value)?.deptName || '',
chargeUserName
:
personInCharge1
.
value
,
// chargeDeptId: allUserList.value.find(user => user.nickName === personInCharge1.value)?.deptId || 0
},
{
planId
:
currentRow
.
value
.
id
,
// dataType: 'CCAP_PORCESS_TASK',
// chargeUserId: allUserList.value.find(user => user.nickName === personInCharge2.value)?.userId || 0,
// chargeUserPhone: allUserList.value.find(user => user.nickName === personInCharge2.value)?.phone || '',
// chargeDeptName: allUserList.value.find(user => user.nickName === personInCharge2.value)?.deptName || '',
chargeUserName
:
personInCharge2
.
value
,
// chargeDeptId: allUserList.value.find(user => user.nickName === personInCharge2.value)?.deptId || 0
},
{
planId
:
currentRow
.
value
.
id
,
// dataType: 'CCAP_COP_MAKE_TASK',
// chargeUserId: allUserList.value.find(user => user.nickName === personInCharge3.value)?.userId || 0,
// chargeUserPhone: allUserList.value.find(user => user.nickName === personInCharge3.value)?.phone || '',
// chargeDeptName: allUserList.value.find(user => user.nickName === personInCharge3.value)?.deptName || '',
chargeUserName
:
personInCharge3
.
value
,
// chargeDeptId: allUserList.value.find(user => user.nickName === personInCharge3.value)?.deptId || 0
},
{
planId
:
currentRow
.
value
.
id
,
// dataType: 'CCAP_COP_QULITY_TASK',
// chargeUserId: allUserList.value.find(user => user.nickName === personInCharge4.value)?.userId || 0,
// chargeUserPhone: allUserList.value.find(user => user.nickName === personInCharge4.value)?.phone || '',
// chargeDeptName: allUserList.value.find(user => user.nickName === personInCharge4.value)?.deptName || '',
chargeUserName
:
personInCharge4
.
value
,
// chargeDeptId: allUserList.value.find(user => user.nickName === personInCharge4.value)?.deptId || 0
}
]
console
.
log
(
"提交的数据"
,
formData
)
async
function
submitData
()
{
async
function
submitData
()
{
try
{
try
{
// 调用提交接口传formData
// 调用提交接口传formData
await
submitChangeChargeUser
(
formData
);
getList
();
adjustCompilationResponsiblePersonDialogVisible
.
value
=
false
;
adjustCompilationResponsiblePersonDialogVisible
.
value
=
false
;
ElMessage
.
success
(
'数据提交成功'
);
ElMessage
.
success
(
'数据提交成功'
);
}
catch
(
error
)
{
}
catch
(
error
)
{
...
@@ -1040,7 +1088,6 @@ function adjustCompilationResponsiblePersonSubmitForm(row) {
...
@@ -1040,7 +1088,6 @@ function adjustCompilationResponsiblePersonSubmitForm(row) {
ElMessage
.
error
(
'数据提交失败,请稍后重试'
);
ElMessage
.
error
(
'数据提交失败,请稍后重试'
);
}
}
}
}
submitData
();
submitData
();
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment