diff --git a/public/data.json b/public/data.json index 632c75c..46563c4 100644 --- a/public/data.json +++ b/public/data.json @@ -22,117 +22,7 @@ "ccSelfSelectFlag": "", "conditionList": [], "nodeUserList": [], - "childNode": { - "nodeName": "审核人", - "error": false, - "type": 1, - "settype": 2, - "selectMode": 0, - "selectRange": 0, - "directorLevel": 1, - "examineMode": 1, - "noHanderAction": 2, - "examineEndDirectorLevel": 0, - "childNode": { - "nodeName": "路由", - "type": 4, - "priorityLevel": 1, - "settype": 1, - "selectMode": 0, - "selectRange": 0, - "directorLevel": 1, - "examineMode": 1, - "noHanderAction": 2, - "examineEndDirectorLevel": 1, - "ccSelfSelectFlag": 1, - "conditionList": [], - "nodeUserList": [], - "childNode": { - "nodeName": "抄送人", - "type": 2, - "ccSelfSelectFlag": 1, - "childNode": null, - "nodeUserList": [], - "error": false - }, - "conditionNodes": [{ - "nodeName": "条件1", - "type": 3, - "priorityLevel": 1, - "settype": 1, - "selectMode": 0, - "selectRange": 0, - "directorLevel": 1, - "examineMode": 1, - "noHanderAction": 2, - "examineEndDirectorLevel": 1, - "ccSelfSelectFlag": 1, - "conditionList": [{ - "columnId": 0, - "type": 1, - "conditionEn": "", - "conditionCn": "", - "optType": "", - "zdy1": "", - "zdy2": "", - "opt1": "", - "opt2": "", - "columnDbname": "", - "columnType": "", - "showType": "", - "showName": "", - "fixedDownBoxValue": "" - }], - "nodeUserList": [{ - "targetId": 85, - "type": 1, - "name": "天旭" - }], - "childNode": { - "nodeName": "审核人", - "type": 1, - "priorityLevel": 1, - "settype": 1, - "selectMode": 0, - "selectRange": 0, - "directorLevel": 1, - "examineMode": 1, - "noHanderAction": 2, - "examineEndDirectorLevel": 1, - "ccSelfSelectFlag": 1, - "conditionList": [], - "nodeUserList": [{ - "targetId": 2515744, - "type": 1, - "name": "哈哈哈哈" - }], - "childNode": null, - "conditionNodes": [], - "error": false - }, - "conditionNodes": [], - "error": false - }, { - "nodeName": "条件2", - "type": 3, - "priorityLevel": 2, - "settype": 1, - "selectMode": 0, - "selectRange": 0, - "directorLevel": 1, - "examineMode": 1, - "noHanderAction": 2, - "examineEndDirectorLevel": 1, - "ccSelfSelectFlag": 1, - "conditionList": [], - "nodeUserList": [], - "childNode": null, - "conditionNodes": [], - "error": false - }] - }, - "nodeUserList": [] - }, + "conditionNodes": [] } } diff --git a/public/data.json b/public/data.json index 632c75c..46563c4 100644 --- a/public/data.json +++ b/public/data.json @@ -22,117 +22,7 @@ "ccSelfSelectFlag": "", "conditionList": [], "nodeUserList": [], - "childNode": { - "nodeName": "审核人", - "error": false, - "type": 1, - "settype": 2, - "selectMode": 0, - "selectRange": 0, - "directorLevel": 1, - "examineMode": 1, - "noHanderAction": 2, - "examineEndDirectorLevel": 0, - "childNode": { - "nodeName": "路由", - "type": 4, - "priorityLevel": 1, - "settype": 1, - "selectMode": 0, - "selectRange": 0, - "directorLevel": 1, - "examineMode": 1, - "noHanderAction": 2, - "examineEndDirectorLevel": 1, - "ccSelfSelectFlag": 1, - "conditionList": [], - "nodeUserList": [], - "childNode": { - "nodeName": "抄送人", - "type": 2, - "ccSelfSelectFlag": 1, - "childNode": null, - "nodeUserList": [], - "error": false - }, - "conditionNodes": [{ - "nodeName": "条件1", - "type": 3, - "priorityLevel": 1, - "settype": 1, - "selectMode": 0, - "selectRange": 0, - "directorLevel": 1, - "examineMode": 1, - "noHanderAction": 2, - "examineEndDirectorLevel": 1, - "ccSelfSelectFlag": 1, - "conditionList": [{ - "columnId": 0, - "type": 1, - "conditionEn": "", - "conditionCn": "", - "optType": "", - "zdy1": "", - "zdy2": "", - "opt1": "", - "opt2": "", - "columnDbname": "", - "columnType": "", - "showType": "", - "showName": "", - "fixedDownBoxValue": "" - }], - "nodeUserList": [{ - "targetId": 85, - "type": 1, - "name": "天旭" - }], - "childNode": { - "nodeName": "审核人", - "type": 1, - "priorityLevel": 1, - "settype": 1, - "selectMode": 0, - "selectRange": 0, - "directorLevel": 1, - "examineMode": 1, - "noHanderAction": 2, - "examineEndDirectorLevel": 1, - "ccSelfSelectFlag": 1, - "conditionList": [], - "nodeUserList": [{ - "targetId": 2515744, - "type": 1, - "name": "哈哈哈哈" - }], - "childNode": null, - "conditionNodes": [], - "error": false - }, - "conditionNodes": [], - "error": false - }, { - "nodeName": "条件2", - "type": 3, - "priorityLevel": 2, - "settype": 1, - "selectMode": 0, - "selectRange": 0, - "directorLevel": 1, - "examineMode": 1, - "noHanderAction": 2, - "examineEndDirectorLevel": 1, - "ccSelfSelectFlag": 1, - "conditionList": [], - "nodeUserList": [], - "childNode": null, - "conditionNodes": [], - "error": false - }] - }, - "nodeUserList": [] - }, + "conditionNodes": [] } } diff --git a/src/plugins/preload.js b/src/plugins/preload.js index 458c53e..09288a9 100644 --- a/src/plugins/preload.js +++ b/src/plugins/preload.js @@ -61,27 +61,26 @@ }, // 设置审批节点的文字 setApproverStr(nodeConfig) { - console.log(nodeConfig) let tempValue = '会签' let strPeople = ' ' if (nodeConfig.selectCustomApprovalType === 'huoqian') { tempValue = '或签' } if (nodeConfig.selectCustomApprovalMethod === 'normal') { - if (nodeConfig.nodeUserList.length === 1) { + if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) { strPeople = `由${nodeConfig.nodeUserList[0].name}人负责` } - else if (nodeConfig.nodeUserList.length > 1) { + else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) { strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责(${tempValue})` } return strPeople } else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') { let strPeople = ' ' - if (nodeConfig.nodeUserList.length === 1) { + if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) { strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)` } - else if (nodeConfig.nodeUserList.length > 1) { + else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) { strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责(逐级审批-${tempValue})` } return strPeople @@ -180,9 +179,7 @@ }, // 设置抄送人节点文字 copyerStr(nodeConfig) { - console.log('44444444') - console.log(nodeConfig.nodeUserList) - if (nodeConfig.nodeUserList.length != 0) { + if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) { console.log(this.arrToStr(nodeConfig.nodeUserList)) return this.arrToStr(nodeConfig.nodeUserList) } diff --git a/public/data.json b/public/data.json index 632c75c..46563c4 100644 --- a/public/data.json +++ b/public/data.json @@ -22,117 +22,7 @@ "ccSelfSelectFlag": "", "conditionList": [], "nodeUserList": [], - "childNode": { - "nodeName": "审核人", - "error": false, - "type": 1, - "settype": 2, - "selectMode": 0, - "selectRange": 0, - "directorLevel": 1, - "examineMode": 1, - "noHanderAction": 2, - "examineEndDirectorLevel": 0, - "childNode": { - "nodeName": "路由", - "type": 4, - "priorityLevel": 1, - "settype": 1, - "selectMode": 0, - "selectRange": 0, - "directorLevel": 1, - "examineMode": 1, - "noHanderAction": 2, - "examineEndDirectorLevel": 1, - "ccSelfSelectFlag": 1, - "conditionList": [], - "nodeUserList": [], - "childNode": { - "nodeName": "抄送人", - "type": 2, - "ccSelfSelectFlag": 1, - "childNode": null, - "nodeUserList": [], - "error": false - }, - "conditionNodes": [{ - "nodeName": "条件1", - "type": 3, - "priorityLevel": 1, - "settype": 1, - "selectMode": 0, - "selectRange": 0, - "directorLevel": 1, - "examineMode": 1, - "noHanderAction": 2, - "examineEndDirectorLevel": 1, - "ccSelfSelectFlag": 1, - "conditionList": [{ - "columnId": 0, - "type": 1, - "conditionEn": "", - "conditionCn": "", - "optType": "", - "zdy1": "", - "zdy2": "", - "opt1": "", - "opt2": "", - "columnDbname": "", - "columnType": "", - "showType": "", - "showName": "", - "fixedDownBoxValue": "" - }], - "nodeUserList": [{ - "targetId": 85, - "type": 1, - "name": "天旭" - }], - "childNode": { - "nodeName": "审核人", - "type": 1, - "priorityLevel": 1, - "settype": 1, - "selectMode": 0, - "selectRange": 0, - "directorLevel": 1, - "examineMode": 1, - "noHanderAction": 2, - "examineEndDirectorLevel": 1, - "ccSelfSelectFlag": 1, - "conditionList": [], - "nodeUserList": [{ - "targetId": 2515744, - "type": 1, - "name": "哈哈哈哈" - }], - "childNode": null, - "conditionNodes": [], - "error": false - }, - "conditionNodes": [], - "error": false - }, { - "nodeName": "条件2", - "type": 3, - "priorityLevel": 2, - "settype": 1, - "selectMode": 0, - "selectRange": 0, - "directorLevel": 1, - "examineMode": 1, - "noHanderAction": 2, - "examineEndDirectorLevel": 1, - "ccSelfSelectFlag": 1, - "conditionList": [], - "nodeUserList": [], - "childNode": null, - "conditionNodes": [], - "error": false - }] - }, - "nodeUserList": [] - }, + "conditionNodes": [] } } diff --git a/src/plugins/preload.js b/src/plugins/preload.js index 458c53e..09288a9 100644 --- a/src/plugins/preload.js +++ b/src/plugins/preload.js @@ -61,27 +61,26 @@ }, // 设置审批节点的文字 setApproverStr(nodeConfig) { - console.log(nodeConfig) let tempValue = '会签' let strPeople = ' ' if (nodeConfig.selectCustomApprovalType === 'huoqian') { tempValue = '或签' } if (nodeConfig.selectCustomApprovalMethod === 'normal') { - if (nodeConfig.nodeUserList.length === 1) { + if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) { strPeople = `由${nodeConfig.nodeUserList[0].name}人负责` } - else if (nodeConfig.nodeUserList.length > 1) { + else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) { strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责(${tempValue})` } return strPeople } else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') { let strPeople = ' ' - if (nodeConfig.nodeUserList.length === 1) { + if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) { strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)` } - else if (nodeConfig.nodeUserList.length > 1) { + else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) { strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责(逐级审批-${tempValue})` } return strPeople @@ -180,9 +179,7 @@ }, // 设置抄送人节点文字 copyerStr(nodeConfig) { - console.log('44444444') - console.log(nodeConfig.nodeUserList) - if (nodeConfig.nodeUserList.length != 0) { + if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) { console.log(this.arrToStr(nodeConfig.nodeUserList)) return this.arrToStr(nodeConfig.nodeUserList) } diff --git a/src/views/setting.vue b/src/views/setting.vue index 1376467..9910a0d 100644 --- a/src/views/setting.vue +++ b/src/views/setting.vue @@ -135,7 +135,7 @@ 关 闭 --> - + 保存
- + 保存
-
- - - -
+ + + +
+ + + + +
+