diff --git a/src/api/systemaccredit/systemapi.js b/src/api/systemaccredit/systemapi.js index b5b962f..48ed1a4 100644 --- a/src/api/systemaccredit/systemapi.js +++ b/src/api/systemaccredit/systemapi.js @@ -468,4 +468,21 @@ export function GetQualityTasks(data) { method: 'post', data }) +} + +// 相关提报人定性考核细则列表 +export function getQualityBylawsTasks(data) { + return request({ + url: '/department_pc/get_qualbylaws_tasks', + method: 'post', + data + }) +} +// 获取流程图 +export function getWorkflowFullView(data) { + return request({ + url: '/workflowapi/get_work_flow_fullview', + method: 'post', + data + }) } \ No newline at end of file diff --git a/src/api/workflowapi/workflowaip.js b/src/api/workflowapi/workflowaip.js index 63402d1..bbf0933 100644 --- a/src/api/workflowapi/workflowaip.js +++ b/src/api/workflowapi/workflowaip.js @@ -166,4 +166,14 @@ export const publishWorkFlow = (data) => { method: 'post', data: data }) +} +/** + * 编辑流程主体 + */ + export const EditWorkFlowCont = (data) => { + return request({ + url: '/workflowapi/edit_workflow_cont', + method: 'post', + data: data + }) } \ No newline at end of file diff --git a/src/customworkflow/addNode.vue b/src/customworkflow/addNode.vue index 8f5a53a..262de1e 100644 --- a/src/customworkflow/addNode.vue +++ b/src/customworkflow/addNode.vue @@ -81,7 +81,7 @@ export default { "nodeName": "审核人", "error": true, "type": 1, - "attribute":1, + "attribute":"1", "settype": 1, "selectMode": 0, "selectRange": 0, @@ -112,7 +112,7 @@ export default { "nodeName": "执行人", "error": true, "type": 3, - "attribute":1, + "attribute":"1", "settype": 1, "selectMode": 0, "selectRange": 0, diff --git a/src/customworkflow/dialog/employeesRoleDialog.vue b/src/customworkflow/dialog/employeesRoleDialog.vue index 8ea8b12..bd7fc90 100644 --- a/src/customworkflow/dialog/employeesRoleDialog.vue +++ b/src/customworkflow/dialog/employeesRoleDialog.vue @@ -53,24 +53,25 @@ export default { this.getDepartmentList(); this.searchVal = ""; if(this.data){ - this.checkedEmployessList = this.data.filter(item => item.type === 1).map(({ name, targetId ,icon ,iconToBase64 }) => ({ + this.checkedEmployessList = this.data.filter(item => item.type === "1").map(({ name, targetId ,icon ,iconToBase64 }) => ({ employeeName: name, id: targetId.toString(), icon: icon, iconToBase64: iconToBase64 })); - this.checkedRoleList = this.data.filter(item => item.type === 2).map(({ name, targetId }) => ({ + this.checkedRoleList = this.data.filter(item => item.type === "2").map(({ name, targetId }) => ({ roleName: name, roleId: targetId })); - this.checkedDepartmentList = this.data.filter(item => item.type === 3).map(({ name, targetId }) => ({ + this.checkedDepartmentList = this.data.filter(item => item.type === "3").map(({ name, targetId }) => ({ departmentName: name, id: targetId.toString() })); } - // console.log("visible--1->",this.checkedEmployessList) - // console.log("visible--2->",this.checkedRoleList) - // console.log("visible--3->",this.checkedDepartmentList) + console.log("visible--1->",this.checkedEmployessList) + console.log("visible--2->",this.checkedRoleList) + console.log("visible--3->",this.checkedDepartmentList) + console.log("visible--4->",this.data) } }, visibleDialog(val) { diff --git a/src/customworkflow/drawer/conditionDrawer.vue b/src/customworkflow/drawer/conditionDrawer.vue index 6148de1..911d3d1 100644 --- a/src/customworkflow/drawer/conditionDrawer.vue +++ b/src/customworkflow/drawer/conditionDrawer.vue @@ -363,7 +363,7 @@ export default { if (columnId == 0) { this.conditionConfig.nodeUserList == []; this.conditionConfig.conditionList.push({ - "type": "1", + "type": 1, columnId, "showName": '发起人' }); @@ -372,7 +372,7 @@ export default { this.conditionConfig.conditionList.push({ showType, columnId, - "type": "2", + "type": 2, showName, "optType": "1", "zdy1": "2", @@ -386,7 +386,7 @@ export default { this.conditionConfig.conditionList.push({ showType, columnId, - "type": "2", + "type": 2, showName, "zdy1": "", "columnDbname": columnName, @@ -397,7 +397,7 @@ export default { this.conditionConfig.conditionList.push({ showType, columnId, - "type": "3", + "type": 3, showName, "columnDbname": columnName, columnType, @@ -407,7 +407,7 @@ export default { }else if(columnType == "custom"){ this.conditionConfig.conditionList.push({ showType, - "type": "4", + "type": 4, columnId, showName, columnType, @@ -429,7 +429,7 @@ export default { this.conditionConfig.conditionList.push({ showType, columnId, - "type": "5", + "type": 5, showName, "zdy1": "", "columnDbname": columnName, diff --git a/src/images/bookfile.png b/src/images/bookfile.png new file mode 100644 index 0000000..9a0adde Binary files /dev/null and b/src/images/bookfile.png differ diff --git a/src/images/bumen.png b/src/images/bumen.png new file mode 100644 index 0000000..3bbccba Binary files /dev/null and b/src/images/bumen.png differ diff --git a/src/images/quzheng.png b/src/images/quzheng.png new file mode 100644 index 0000000..dbcc4a1 Binary files /dev/null and b/src/images/quzheng.png differ diff --git a/src/views/qualitative/qualitativecont/bylaws.vue b/src/views/qualitative/qualitativecont/bylaws.vue new file mode 100644 index 0000000..de30a6f --- /dev/null +++ b/src/views/qualitative/qualitativecont/bylaws.vue @@ -0,0 +1,195 @@ + + + + \ No newline at end of file diff --git a/src/views/qualitative/qualitativecont/plus_minus_score.vue b/src/views/qualitative/qualitativecont/plus_minus_score.vue new file mode 100644 index 0000000..c037176 --- /dev/null +++ b/src/views/qualitative/qualitativecont/plus_minus_score.vue @@ -0,0 +1,455 @@ + + + + \ No newline at end of file diff --git a/src/views/qualitative/qualitativecont/plus_minus_score_20230403.vue b/src/views/qualitative/qualitativecont/plus_minus_score_20230403.vue new file mode 100644 index 0000000..a9969c5 --- /dev/null +++ b/src/views/qualitative/qualitativecont/plus_minus_score_20230403.vue @@ -0,0 +1,124 @@ + + + + \ No newline at end of file diff --git a/src/views/qualitative/qualitativecont/xuanren/peopleTransfer.vue b/src/views/qualitative/qualitativecont/xuanren/peopleTransfer.vue new file mode 100644 index 0000000..78377be --- /dev/null +++ b/src/views/qualitative/qualitativecont/xuanren/peopleTransfer.vue @@ -0,0 +1,215 @@ + + + + \ No newline at end of file diff --git a/src/views/qualitative/qualpage.vue b/src/views/qualitative/qualpage.vue index 225da43..bd9f812 100644 --- a/src/views/qualitative/qualpage.vue +++ b/src/views/qualitative/qualpage.vue @@ -66,6 +66,7 @@ +
@@ -84,7 +85,12 @@ import { tableMergeTrade } from "@/api/people/peopledata"; import { govthree } from "@/api/personnel/post"; import { GetQualityTasks } from "@/api/systemaccredit/systemapi" +import bylaws from "@/views/qualitative/qualitativecont/bylaws" export default { + name:"targetcont", + components: { + bylaws + }, data() { return { mergeObj: {}, //合并处理后的数据 @@ -183,6 +189,7 @@ export default { }, //查询指标 searckClick(){ + this.searchInfo.page = 1 this.dingXingList(); }, @@ -213,6 +220,14 @@ export default { this.bylawsBox=true; }, + //关闭考核细则弹窗 + closeBylawsBox(){ + this.bylawsBox=false; + this.orgTarget={ + orgid:"", //行政组织 + targetid:"", //指标 + } + } } } diff --git a/src/views/workflow/editflowcont.vue b/src/views/workflow/editflowcont.vue index 4852e00..2a64d0b 100644 --- a/src/views/workflow/editflowcont.vue +++ b/src/views/workflow/editflowcont.vue @@ -7,7 +7,7 @@ - + 名称: @@ -17,7 +17,7 @@ clearable> - + 描述: @@ -27,6 +27,16 @@ clearable> + + 关联企业微信 + + + + 无需关联 + 仅通知 + 通知和审批 + + 版本:{{ item.version }} @@ -66,7 +76,7 @@