Merge branch '17025' of http://119.23.210.103:3000/wy/lh_firm_former into 17025

src/views/platform/examination/questionBank/test.vue

@@ -406,7 +406,7 @@ export default {
             const finished = []
             this.questionList.forEach(item => {
                 if (item.questionType === '填空题') {
-                    finished.push(item.answer && !item.answer.some(i => i === '' || i === null))
+                    finished.push(item.options && !item.options.some((i) => i.answer === '' || i.answer === null))
                 } else if (item.questionType === '多选题') {
                     finished.push(item.answer.some(i => i) && true)
                 } else {
@@ -496,7 +496,7 @@ export default {
                 let incompleteList = []
                 this.questionList.forEach((item, index) => {
                     if (item.questionType === '填空题') {
-                        const t = item.answer && !item.answer.some(i => i === '' || i === null)
+                        const t = item.options && !item.options.some((i) => i.answer === '' || i.answer === null)
                         incompleteList.push(!t ? index + 1 : '')
                     } else if (item.questionType === '多选题') {
                         const t = item.answer && item.answer.length

src/views/platform/office/bpmInitiatedProcess/myDraft.vue

@@ -78,7 +78,7 @@ export default {
         },
         // 表格字段配置
         columns: [
-          { prop: 'subject', label: '请求标题', link: 'dialog' },
+          { prop: 'taskSubjectName', label: '请求标题', link: 'dialog' },
           { prop: 'procDefName', label: '流程名称', width: 250 },
           { prop: 'createTime', label: '创建时间', width: 200 }
         ]
@@ -98,6 +98,10 @@ export default {
     loadData() {
       this.loading = true
       myDraft(this.getFormatParams()).then(response => {
+        response.data.dataResult.forEach((item) => {
+                  const taskSubject = item.subject.split('#')
+                  this.$set(item, 'taskSubjectName', taskSubject[0] +'#'+ taskSubject[1]+'#')
+        })
         ActionUtils.handleListData(this, response.data)
         this.loading = false
       }).catch(() => {

src/views/platform/office/bpmInitiatedProcess/myRequest.vue

@@ -179,7 +179,7 @@ export default {
         },
         // 表格字段配置
         columns: [
-          { prop: 'subject', label: '事务名称', link: 'dialog' },
+          { prop: 'taskSubjectName', label: '事务名称', link: 'dialog' },
           { prop: 'procDefName', label: '事务类型', width: 120 },
            { prop: 'createTime', label: '创建时间', width: 140 },
           // { prop: 'status', label: '状态', slotName: 'statusCloum', width: 150 }
@@ -217,6 +217,10 @@ export default {
     loadData() {
       this.loading = true
       myRequested(this.getFormatParams()).then(response => {
+        response.data.dataResult.forEach((item) => {
+                  const taskSubject = item.subject.split('#')
+                  this.$set(item, 'taskSubjectName', taskSubject[0] +'#'+ taskSubject[1]+'#')
+        })
         ActionUtils.handleListData(this, response.data)
         this.loading = false
       }).catch(() => {

src/views/platform/office/bpmReceivedProcess/completed.vue

@@ -169,7 +169,7 @@ export default {
         },
         // 表格字段配置
         columns: [
-          { prop: 'subject', label: '请求标题', link: 'dialog' },
+          { prop: 'taskSubjectName', label: '请求标题', link: 'dialog' },
           { prop: 'procDefName', label: '流程名称', width: 200 },
           { prop: 'createTime', label: '创建时间', width: 150 },
           { prop: 'status', label: '状态', tags: statusOptions, width: 140 }
@@ -189,6 +189,10 @@ export default {
     loadData() {
       this.loading = true
       handled(this.getFormatParams()).then(response => {
+        response.data.dataResult.forEach((item) => {
+                  const taskSubject = item.subject.split('#')
+                  this.$set(item, 'taskSubjectName', taskSubject[0] +'#'+ taskSubject[1]+'#')
+        })
         ActionUtils.handleListData(this, response.data)
         this.loading = false
       }).catch(() => {

src/views/platform/office/bpmReceivedProcess/handled.vue

@@ -87,7 +87,7 @@ export default {
         },
         // 表格字段配置
         columns: [
-          { prop: 'subject', label: '事项标题', link: 'dialog' },
+          { prop: 'taskSubjectName', label: '事项标题', link: 'dialog' },
           { prop: 'procDefName', label: '任务名称', width: 150 },
           { prop: 'curNode', label: '当前待办', width: 150 },
           { prop: 'createTime', label: '创建时间', width: 150 },
@@ -108,6 +108,10 @@ export default {
     loadData() {
       this.loading = true
       handled(this.getFormatParams()).then(response => {
+        response.data.dataResult.forEach((item) => {
+                    const taskSubject = item.subject.split('#')
+                    this.$set(item, 'taskSubjectName', taskSubject[0] +'#'+ taskSubject[1]+'#')
+        })
         ActionUtils.handleListData(this, response.data)
         this.loading = false
       }).catch(() => {

src/views/platform/office/bpmReceivedProcess/pending.vue

@@ -154,7 +154,7 @@ export default {
         },
         // 表格字段配置
         columns: [
-          { prop: 'subject', label: '请求标题', link: 'dialog' },
+          { prop: 'taskSubjectName', label: '请求标题', link: 'dialog' },
           { prop: 'procDefName', label: '流程名称', width: 120 },
           { prop: 'name', label: '当前节点', width: 120 },
           { prop: 'createTime', label: '创建时间', width: 140 },
@@ -195,6 +195,10 @@ export default {
     loadData() {
       this.loading = true
       pending(this.getFormatParams()).then(response => {
+        response.data.dataResult.forEach((item) => {
+                  const taskSubject = item.subject.split('#')
+                  this.$set(item, 'taskSubjectName', taskSubject[0] +'#'+ taskSubject[1]+'#')
+        })
         ActionUtils.handleListData(this, response.data)
         this.loading = false
       }).catch(() => {

src/views/platform/office/bpmReceivedProcess/revoke.vue

@@ -96,7 +96,7 @@ export default {
         },
         // 表格字段配置
         columns: [
-          { prop: 'subject', label: '请求标题', link: 'dialog' },
+          { prop: 'taskSubjectName', label: '请求标题', link: 'dialog' },
           { prop: 'procDefName', label: '流程名称', width: 120 },
           { prop: 'myNode', label: '我审批得节点', width: 120 },
           { prop: 'taskEndTime', label: '审批时间', width: 140, dateFormat: 'yyyy-MM-dd HH:mm:ss' },
@@ -127,6 +127,10 @@ export default {
     loadData() {
       this.loading = true
       revokable(this.getFormatParams()).then(response => {
+        response.data.dataResult.forEach((item) => {
+                  const taskSubject = item.subject.split('#')
+                  this.$set(item, 'taskSubjectName', taskSubject[0] +'#'+ taskSubject[1]+'#')
+        })
         ActionUtils.handleListData(this, response.data)
         this.loading = false
       }).catch(() => {