diff --git a/public/config/config.json b/public/config/config.json index 25b16c6..442726a 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,6 +1,6 @@ { "title":"计量业务管理系统", - "baseUrl": "http://http://111.198.10.15:21606//", + "baseUrl": "http://111.198.10.15:21606", "nbjlgl": "nbjlgl", "nbjszy": "nbjszy", "zlmbpc": "zlmbpc", diff --git a/public/config/config.json b/public/config/config.json index 25b16c6..442726a 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,6 +1,6 @@ { "title":"计量业务管理系统", - "baseUrl": "http://http://111.198.10.15:21606//", + "baseUrl": "http://111.198.10.15:21606", "nbjlgl": "nbjlgl", "nbjszy": "nbjszy", "zlmbpc": "zlmbpc", diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue index a5df195..9870b50 100644 --- a/src/components/ApprovalRecord/ApprovalRecordTable.vue +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -60,10 +60,10 @@ loadingTable.value = true fetchApproval(listQuery.value.processId).then((response) => { response.data.forEach((item: Array, index: number) => { - console.log(item) + console.log(item, item.length, item[0].countersignOrSign === 2) if (item.length > 1 && item[0].countersignOrSign === 2) { // 或签 - // console.log(item.length, ); + console.log('或签数据处理', item) let name = ''// 姓名 let approvalStatus = ''// 审批类型 @@ -71,9 +71,9 @@ let duration = ''// 用时 let comment = ''// 审批意见 let type = '-'// 审批意见 - item.forEach((i: any) => { - name = name + i.assigneeName // 姓名 - approvalStatus = i[0].approvalStatus // 审批类型 + item.forEach((i: any, index) => { + name = name + (index > 0 ? `, ${i.assigneeName}` : `${i.assigneeName}`) // 姓名 + approvalStatus = i.approvalStatus // 审批类型 finishTime = i.finishTime ? i.finishTime : finishTime // 完成时间 duration = i.duration ? i.duration : duration // 用时 finishTime = finishTime + i.finishTime @@ -89,6 +89,7 @@ comment, // 审批意见 type, // 意见类别 }) + console.log('list.v*******alue', list.value) } else { item.forEach((i: any) => { @@ -180,7 +181,6 @@ border stripe style="width: 100%;" - :span-method="objectSpanMethod" >