wilson
/
xujiecloud-vue
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

QMS负责人修改

master
shenzhouyu 1 week ago
parent
d7fb423141
commit
7bebf4e9b4
5 changed files with 98 additions and 106 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 50
      src/views/modules/qc/FAIResultEntry.vue
  2. 50
      src/views/modules/qc/FQCResultEntry.vue
  3. 36
      src/views/modules/qc/IPQCResultEntry.vue
  4. 45
      src/views/modules/qc/IQCResultEntry.vue
  5. 23
      src/views/modules/qc/PQCResultEntry.vue

50
src/views/modules/qc/FAIResultEntry.vue
View File

@ -734,8 +734,8 @@
<el-dialog title="人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px"> <el-dialog title="人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
<div class="rq"> <div class="rq">
<el-form :inline="true" label-position="top" :model="operatorData"> <el-form :inline="true" label-position="top" :model="operatorData">
<el-form-item v-if="operatorData.flag !== '2'" :label="'所属角色'">
<el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px">
<el-form-item :label="'所属角色'">
<el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px" @change="getOperatorList2">
<el-option v-for="i in roleList" :key="i.roleId" :label="i.roleName" :value="i.roleId"> <el-option v-for="i in roleList" :key="i.roleId" :label="i.roleName" :value="i.roleId">
</el-option> </el-option>
</el-select> </el-select>
@ -852,7 +852,6 @@ import {
searchSeqInfo, // 派工单号查询 searchSeqInfo, // 派工单号查询
actionFAIInspection, // 开始检验 actionFAIInspection, // 开始检验
dataAcquisition, // 数据采集 dataAcquisition, // 数据采集
getResponsibleOperatorList, // 获取责任人列表
getFAIItemObjectList, // 查询项目设备 getFAIItemObjectList, // 查询项目设备
dataAcquisitionByItem, // 根据项目数据采集 dataAcquisitionByItem, // 根据项目数据采集
cancelApproval2, // 取消审核 cancelApproval2, // 取消审核
@ -2572,7 +2571,18 @@ export default {
getResponsiblePersonList() { getResponsiblePersonList() {
this.operatorData.flag = '2' this.operatorData.flag = '2'
this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo
if (this.roleList.length > 0) {
let filterList = this.roleList.filter(
(item) => item.roleName === '机修人员'
)
if (filterList.length > 0) {
this.operatorData.roleId = filterList[0].roleId
} else {
this.operatorData.roleId = this.roleList[0].roleId
}
} else {
this.operatorData.roleId = ''
}
// 先清空缓存选中 // 先清空缓存选中
this.$nextTick(() => this.$refs.operatorTable.clearSelection()) this.$nextTick(() => this.$refs.operatorTable.clearSelection())
// 拿到选中的人员编号 // 拿到选中的人员编号
@ -2581,7 +2591,7 @@ export default {
? '' ? ''
: this.detailData.responsiblePerson : this.detailData.responsiblePerson
).split(';') ).split(';')
getResponsibleOperatorList(this.operatorData).then(({ data }) => {
getOperatorList(this.operatorData).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.operatorList = data.rows this.operatorList = data.rows
this.operatorList.forEach((val) => { this.operatorList.forEach((val) => {
@ -2630,7 +2640,7 @@ export default {
? '' ? ''
: this.detailData.responsiblePerson : this.detailData.responsiblePerson
).split(';') ).split(';')
getResponsibleOperatorList(this.operatorData).then(({ data }) => {
getOperatorList(this.operatorData).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.operatorList = data.rows this.operatorList = data.rows
this.operatorList.forEach((val) => { this.operatorList.forEach((val) => {
@ -2660,7 +2670,7 @@ export default {
// 确认多选协同人员 // 确认多选协同人员
confirmOperator() { confirmOperator() {
if (this.dataListSelections2.length === 0) {
if (this.dataListSelections2.length === 0 && this.operatorData.flag === '1') {
this.$message.warning('请勾选人员！') this.$message.warning('请勾选人员！')
return return
} }
@ -2687,28 +2697,14 @@ export default {
this.detailData.operatorName.substring(1) this.detailData.operatorName.substring(1)
} }
} else { } else {
const adminIds = []
const adminNames = []
for (let i = 0; i < this.dataListSelections2.length; i++) { for (let i = 0; i < this.dataListSelections2.length; i++) {
if (
!this.detailData.responsiblePerson
.split(';')
.includes(this.dataListSelections2[i].adminID)
) {
this.detailData.responsiblePersonName =
this.detailData.responsiblePersonName +
';' +
this.dataListSelections2[i].adminName
this.detailData.responsiblePerson =
this.detailData.responsiblePerson +
';' +
this.dataListSelections2[i].adminID
}
}
if (this.detailData.responsiblePerson.charAt(0) === ';') {
this.detailData.responsiblePerson =
this.detailData.responsiblePerson.substring(1)
this.detailData.responsiblePersonName =
this.detailData.responsiblePersonName.substring(1)
adminIds.push(this.dataListSelections2[i].adminID)
adminNames.push(this.dataListSelections2[i].adminName)
} }
this.detailData.responsiblePerson = adminIds.join(';')
this.detailData.responsiblePersonName = adminNames.join(';')
} }
this.operatorData = { this.operatorData = {
flag: '', flag: '',

50
src/views/modules/qc/FQCResultEntry.vue
View File

@ -716,8 +716,8 @@
<el-dialog title="人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px"> <el-dialog title="人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
<div class="rq"> <div class="rq">
<el-form :inline="true" label-position="top" :model="operatorData"> <el-form :inline="true" label-position="top" :model="operatorData">
<el-form-item v-if="operatorData.flag !== '2'" :label="'所属角色'">
<el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px">
<el-form-item :label="'所属角色'">
<el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px" @change="getOperatorList2">
<el-option v-for="i in roleList" :key="i.roleId" :label="i.roleName" :value="i.roleId"> <el-option v-for="i in roleList" :key="i.roleId" :label="i.roleName" :value="i.roleId">
</el-option> </el-option>
</el-select> </el-select>
@ -836,7 +836,6 @@ import {
searchSeqInfo, // 查询派工单号 searchSeqInfo, // 查询派工单号
actionFQCInspection, // 开始检验 actionFQCInspection, // 开始检验
dataAcquisition, // 数据采集 dataAcquisition, // 数据采集
getResponsibleOperatorList, // 获取责任人列表
getFQCItemObjectList, // 查询项目设备 getFQCItemObjectList, // 查询项目设备
dataAcquisitionByItem, // 根据项目数据采集 dataAcquisitionByItem, // 根据项目数据采集
cancelApproval2, // 取消审核 cancelApproval2, // 取消审核
@ -2554,7 +2553,18 @@ export default {
getResponsiblePersonList() { getResponsiblePersonList() {
this.operatorData.flag = '2' this.operatorData.flag = '2'
this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo
if (this.roleList.length > 0) {
let filterList = this.roleList.filter(
(item) => item.roleName === '机修人员'
)
if (filterList.length > 0) {
this.operatorData.roleId = filterList[0].roleId
} else {
this.operatorData.roleId = this.roleList[0].roleId
}
} else {
this.operatorData.roleId = ''
}
// 先清空缓存选中 // 先清空缓存选中
this.$nextTick(() => this.$refs.operatorTable.clearSelection()) this.$nextTick(() => this.$refs.operatorTable.clearSelection())
// 拿到选中的人员编号 // 拿到选中的人员编号
@ -2563,7 +2573,7 @@ export default {
? '' ? ''
: this.detailData.responsiblePerson : this.detailData.responsiblePerson
).split(';') ).split(';')
getResponsibleOperatorList(this.operatorData).then(({ data }) => {
getOperatorList(this.operatorData).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.operatorList = data.rows this.operatorList = data.rows
this.operatorList.forEach((val) => { this.operatorList.forEach((val) => {
@ -2612,7 +2622,7 @@ export default {
? '' ? ''
: this.detailData.responsiblePerson : this.detailData.responsiblePerson
).split(';') ).split(';')
getResponsibleOperatorList(this.operatorData).then(({ data }) => {
getOperatorList(this.operatorData).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.operatorList = data.rows this.operatorList = data.rows
this.operatorList.forEach((val) => { this.operatorList.forEach((val) => {
@ -2642,7 +2652,7 @@ export default {
// 确认多选协同人员 // 确认多选协同人员
confirmOperator() { confirmOperator() {
if (this.dataListSelections2.length === 0) {
if (this.dataListSelections2.length === 0 && this.operatorData.flag === '1') {
this.$message.warning('请勾选人员！') this.$message.warning('请勾选人员！')
return return
} }
@ -2669,28 +2679,14 @@ export default {
this.detailData.operatorName.substring(1) this.detailData.operatorName.substring(1)
} }
} else { } else {
const adminIds = []
const adminNames = []
for (let i = 0; i < this.dataListSelections2.length; i++) { for (let i = 0; i < this.dataListSelections2.length; i++) {
if (
!this.detailData.responsiblePerson
.split(';')
.includes(this.dataListSelections2[i].adminID)
) {
this.detailData.responsiblePersonName =
this.detailData.responsiblePersonName +
';' +
this.dataListSelections2[i].adminName
this.detailData.responsiblePerson =
this.detailData.responsiblePerson +
';' +
this.dataListSelections2[i].adminID
}
}
if (this.detailData.responsiblePerson.charAt(0) === ';') {
this.detailData.responsiblePerson =
this.detailData.responsiblePerson.substring(1)
this.detailData.responsiblePersonName =
this.detailData.responsiblePersonName.substring(1)
adminIds.push(this.dataListSelections2[i].adminID)
adminNames.push(this.dataListSelections2[i].adminName)
} }
this.detailData.responsiblePerson = adminIds.join(';')
this.detailData.responsiblePersonName = adminNames.join(';')
} }
this.operatorData = { this.operatorData = {
flag: '', flag: '',

36
src/views/modules/qc/IPQCResultEntry.vue
View File

@ -794,8 +794,8 @@
<el-dialog title="人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px"> <el-dialog title="人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
<div class="rq"> <div class="rq">
<el-form :inline="true" label-position="top" :model="operatorData"> <el-form :inline="true" label-position="top" :model="operatorData">
<el-form-item v-if="operatorData.flag !== '2'" :label="'所属角色'">
<el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px">
<el-form-item :label="'所属角色'">
<el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px" @change="getOperatorList2">
<el-option <el-option
v-for = "i in roleList" v-for = "i in roleList"
:key = "i.roleId" :key = "i.roleId"
@ -944,7 +944,6 @@
searchSeqInfo, // 派工单号查询 searchSeqInfo, // 派工单号查询
actionIPQCInspection, // 开始检验 actionIPQCInspection, // 开始检验
dataAcquisition, // 数据采集 dataAcquisition, // 数据采集
getResponsibleOperatorList, // 获取责任人列表
getIPQCItemObjectList, // 查询项目设备 getIPQCItemObjectList, // 查询项目设备
dataAcquisitionByItem, // 根据项目数据采集 dataAcquisitionByItem, // 根据项目数据采集
cancelApproval2, // 取消审核 cancelApproval2, // 取消审核
@ -2730,12 +2729,21 @@
getResponsiblePersonList () { getResponsiblePersonList () {
this.operatorData.flag = '2' this.operatorData.flag = '2'
this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo
if (this.roleList.length > 0) {
let filterList = this.roleList.filter(item => item.roleName === '机修人员')
if (filterList.length > 0) {
this.operatorData.roleId = filterList[0].roleId
} else {
this.operatorData.roleId = this.roleList[0].roleId
}
} else {
this.operatorData.roleId = ''
}
// 先清空缓存选中 // 先清空缓存选中
this.$nextTick(() => this.$refs.operatorTable.clearSelection()) this.$nextTick(() => this.$refs.operatorTable.clearSelection())
// 拿到选中的人员编号 // 拿到选中的人员编号
let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';') let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';')
getResponsibleOperatorList(this.operatorData).then(({data}) => {
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.operatorList = data.rows this.operatorList = data.rows
this.operatorList.forEach(val => { this.operatorList.forEach(val => {
@ -2774,7 +2782,7 @@
} else { } else {
// 拿到选中的人员编号 // 拿到选中的人员编号
let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';') let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';')
getResponsibleOperatorList(this.operatorData).then(({data}) => {
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.operatorList = data.rows this.operatorList = data.rows
this.operatorList.forEach(val => { this.operatorList.forEach(val => {
@ -2802,7 +2810,7 @@
// 确认多选协同人员 // 确认多选协同人员
confirmOperator () { confirmOperator () {
if (this.dataListSelections2.length === 0) {
if (this.dataListSelections2.length === 0 && this.operatorData.flag === '1') {
this.$message.warning('请勾选人员！') this.$message.warning('请勾选人员！')
return return
} }
@ -2818,16 +2826,14 @@
this.detailData.operatorName = this.detailData.operatorName.substring(1) this.detailData.operatorName = this.detailData.operatorName.substring(1)
} }
} else { } else {
const adminIds = []
const adminNames = []
for (let i = 0; i < this.dataListSelections2.length; i++) { for (let i = 0; i < this.dataListSelections2.length; i++) {
if (!this.detailData.responsiblePerson.split(';').includes(this.dataListSelections2[i].adminID)) {
this.detailData.responsiblePersonName = this.detailData.responsiblePersonName + ";" + this.dataListSelections2[i].adminName
this.detailData.responsiblePerson = this.detailData.responsiblePerson + ";" + this.dataListSelections2[i].adminID
}
}
if (this.detailData.responsiblePerson.charAt(0) === ';') {
this.detailData.responsiblePerson = this.detailData.responsiblePerson.substring(1)
this.detailData.responsiblePersonName = this.detailData.responsiblePersonName.substring(1)
adminIds.push(this.dataListSelections2[i].adminID)
adminNames.push(this.dataListSelections2[i].adminName)
} }
this.detailData.responsiblePerson = adminIds.join(';')
this.detailData.responsiblePersonName = adminNames.join(';')
} }
this.operatorData = { this.operatorData = {
flag: '', flag: '',

45
src/views/modules/qc/IQCResultEntry.vue
View File

@ -655,8 +655,8 @@
<el-dialog title="人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px"> <el-dialog title="人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
<div class="rq"> <div class="rq">
<el-form :inline="true" label-position="top" :model="operatorData"> <el-form :inline="true" label-position="top" :model="operatorData">
<el-form-item v-if="operatorData.flag !== '2'" :label="'所属角色'">
<el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px">
<el-form-item :label="'所属角色'">
<el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px" @change="getOperatorList2">
<el-option <el-option
v-for = "i in roleList" v-for = "i in roleList"
:key = "i.roleId" :key = "i.roleId"
@ -793,7 +793,6 @@
orderTypeSearch, // 获取采购类型 orderTypeSearch, // 获取采购类型
actionIQCInspection, // 开始检验 actionIQCInspection, // 开始检验
dataAcquisition, // 数据采集 dataAcquisition, // 数据采集
getResponsibleOperatorList, // 获取责任人列表
getIQCItemObjectList, // 查询项目设备 getIQCItemObjectList, // 查询项目设备
dataAcquisitionByItem, // 根据项目数据采集 dataAcquisitionByItem, // 根据项目数据采集
cancelApproval, // 取消审核 cancelApproval, // 取消审核
@ -2225,21 +2224,21 @@
getResponsiblePersonList () { getResponsiblePersonList () {
this.operatorData.flag = '2' this.operatorData.flag = '2'
this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo
// if (this.roleList.length > 0) {
// let filterList = this.roleList.filter(item => item.roleName === '系统管理员')
// if (filterList.length > 0) {
// this.operatorData.roleId = filterList[0].roleId
// } else {
// this.operatorData.roleId = this.roleList[0].roleId
// }
// } else {
// this.operatorData.roleId = ''
// }
if (this.roleList.length > 0) {
let filterList = this.roleList.filter(item => item.roleName === '机修人员')
if (filterList.length > 0) {
this.operatorData.roleId = filterList[0].roleId
} else {
this.operatorData.roleId = this.roleList[0].roleId
}
} else {
this.operatorData.roleId = ''
}
// 先清空缓存选中 // 先清空缓存选中
this.$nextTick(() => this.$refs.operatorTable.clearSelection()) this.$nextTick(() => this.$refs.operatorTable.clearSelection())
// 拿到选中的人员编号 // 拿到选中的人员编号
let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';') let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';')
getResponsibleOperatorList(this.operatorData).then(({data}) => {
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.operatorList = data.rows this.operatorList = data.rows
this.operatorList.forEach(val => { this.operatorList.forEach(val => {
@ -2278,7 +2277,7 @@
} else { } else {
// 拿到选中的人员编号 // 拿到选中的人员编号
let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';') let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';')
getResponsibleOperatorList(this.operatorData).then(({data}) => {
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.operatorList = data.rows this.operatorList = data.rows
this.operatorList.forEach(val => { this.operatorList.forEach(val => {
@ -2306,7 +2305,7 @@
// 确认多选协同人员 // 确认多选协同人员
confirmOperator () { confirmOperator () {
if (this.dataListSelections2.length === 0) {
if (this.dataListSelections2.length === 0 && this.operatorData.flag === '1') {
this.$message.warning('请勾选人员！') this.$message.warning('请勾选人员！')
return return
} }
@ -2322,16 +2321,14 @@
this.detailData.operatorName = this.detailData.operatorName.substring(1) this.detailData.operatorName = this.detailData.operatorName.substring(1)
} }
} else { } else {
const adminIds = []
const adminNames = []
for (let i = 0; i < this.dataListSelections2.length; i++) { for (let i = 0; i < this.dataListSelections2.length; i++) {
if (!this.detailData.responsiblePerson.split(';').includes(this.dataListSelections2[i].adminID)) {
this.detailData.responsiblePersonName = this.detailData.responsiblePersonName + ";" + this.dataListSelections2[i].adminName
this.detailData.responsiblePerson = this.detailData.responsiblePerson + ";" + this.dataListSelections2[i].adminID
}
}
if (this.detailData.responsiblePerson.charAt(0) === ';') {
this.detailData.responsiblePerson = this.detailData.responsiblePerson.substring(1)
this.detailData.responsiblePersonName = this.detailData.responsiblePersonName.substring(1)
adminIds.push(this.dataListSelections2[i].adminID)
adminNames.push(this.dataListSelections2[i].adminName)
} }
this.detailData.responsiblePerson = adminIds.join(';')
this.detailData.responsiblePersonName = adminNames.join(';')
} }
this.operatorData = { this.operatorData = {
flag: '', flag: '',

23
src/views/modules/qc/PQCResultEntry.vue
View File

@ -892,7 +892,7 @@
<div class="rq"> <div class="rq">
<el-form :inline="true" label-position="top" :model="operatorData"> <el-form :inline="true" label-position="top" :model="operatorData">
<el-form-item :label="'所属角色'"> <el-form-item :label="'所属角色'">
<el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px">
<el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px" @change="getOperatorList2">
<el-option <el-option
v-for = "i in roleList" v-for = "i in roleList"
:key = "i.roleId" :key = "i.roleId"
@ -1041,7 +1041,6 @@ import {
searchSeqInfo, // 查询派工单号 searchSeqInfo, // 查询派工单号
actionPQCInspection, // 开始检验 actionPQCInspection, // 开始检验
dataAcquisition, // 数据采集 dataAcquisition, // 数据采集
getResponsibleOperatorList, // 获取责任人列表
getPQCItemObjectList, // 查询项目设备 getPQCItemObjectList, // 查询项目设备
dataAcquisitionByItem, // 根据项目数据采集 dataAcquisitionByItem, // 根据项目数据采集
cancelApproval2, // 取消审核 cancelApproval2, // 取消审核
@ -2821,7 +2820,7 @@ export default {
this.$nextTick(() => this.$refs.operatorTable.clearSelection()) this.$nextTick(() => this.$refs.operatorTable.clearSelection())
// 拿到选中的人员编号 // 拿到选中的人员编号
let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';') let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';')
getResponsibleOperatorList(this.operatorData).then(({data}) => {
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.operatorList = data.rows this.operatorList = data.rows
this.operatorList.forEach(val => { this.operatorList.forEach(val => {
@ -2860,7 +2859,7 @@ export default {
} else { } else {
// 拿到选中的人员编号 // 拿到选中的人员编号
let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';') let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';')
getResponsibleOperatorList(this.operatorData).then(({data}) => {
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.operatorList = data.rows this.operatorList = data.rows
this.operatorList.forEach(val => { this.operatorList.forEach(val => {
@ -2888,7 +2887,7 @@ export default {
// 确认多选协同人员 // 确认多选协同人员
confirmOperator () { confirmOperator () {
if (this.dataListSelections2.length === 0) {
if (this.dataListSelections2.length === 0 && this.operatorData.flag === '1') {
this.$message.warning('请勾选人员！') this.$message.warning('请勾选人员！')
return return
} }
@ -2904,16 +2903,14 @@ export default {
this.detailData.operatorName = this.detailData.operatorName.substring(1) this.detailData.operatorName = this.detailData.operatorName.substring(1)
} }
} else { } else {
const adminIds = []
const adminNames = []
for (let i = 0; i < this.dataListSelections2.length; i++) { for (let i = 0; i < this.dataListSelections2.length; i++) {
if (!this.detailData.responsiblePerson.split(';').includes(this.dataListSelections2[i].adminID)) {
this.detailData.responsiblePersonName = this.detailData.responsiblePersonName + ";" + this.dataListSelections2[i].adminName
this.detailData.responsiblePerson = this.detailData.responsiblePerson + ";" + this.dataListSelections2[i].adminID
}
}
if (this.detailData.responsiblePerson.charAt(0) === ';') {
this.detailData.responsiblePerson = this.detailData.responsiblePerson.substring(1)
this.detailData.responsiblePersonName = this.detailData.responsiblePersonName.substring(1)
adminIds.push(this.dataListSelections2[i].adminID)
adminNames.push(this.dataListSelections2[i].adminName)
} }
this.detailData.responsiblePerson = adminIds.join(';')
this.detailData.responsiblePersonName = adminNames.join(';')
} }
this.operatorData = { this.operatorData = {
flag: '', flag: '',

Write Preview
Loading…
Cancel
Save