Skip to content

C
confucius
Commit 497ba59f authored by Mac's avatar Mac
Browse files
Options

修改接口

parent 750c32a1
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 35 deletions
src/api/administration/administration.js
View file @ 497ba59f
...@@ -288,6 +288,17 @@ export function myAudit(data) { ...@@ -288,6 +288,17 @@ export function myAudit(data) {
data data
}); });
} }
/**
*获取审批统计列表
*/
export function getOAPageList(data) {
return request({
url: '/workflow/GetOAPageList',
method: 'post',
data
});
}
......
src/pages/administration/ApprovalProcess.vue
View file @ 497ba59f
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
ref="treeRole" ref="treeRole"
show-checkbox show-checkbox
:filter-node-method="filterNode1" :filter-node-method="filterNode1"
node-key="PostId" node-key="DeptId"
:props="defaultProps1" :props="defaultProps1"
@check-change="checkedRole" @check-change="checkedRole"
> >
...@@ -584,7 +584,6 @@ ...@@ -584,7 +584,6 @@
}, },
checkedRole(data,checked){ checkedRole(data,checked){
console.log(data,checked)
data.IsCheck = checked; data.IsCheck = checked;
// if(data.Disabled==false&&data.IsCheck){ // if(data.Disabled==false&&data.IsCheck){
if(data.IsCheck){ if(data.IsCheck){
......
src/pages/administration/ApprovalStatistical.vue
View file @ 497ba59f
...@@ -5,28 +5,28 @@ ...@@ -5,28 +5,28 @@
<li> <li>
<span><em>公司</em><el-select filterable @change='getUser' v-model='msg.RB_BranchId'> <span><em>公司</em><el-select filterable @change='getUser' v-model='msg.RB_BranchId'>
<el-option label='不限' value='-1'></el-option> <el-option label='不限' value='-1'></el-option>
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key='item.Id'></el-option> <el-option v-for='item in companyList' :label='item.SName' :value='item.SId' :key='item.Id'></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span><em>申请人</em><el-select filterable v-model='msg.CreateBy'> <span><em>申请人</em><el-select filterable v-model='msg.CreateBy'>
<el-option label='不限' value='0'></el-option> <el-option label='不限' value='0'></el-option>
<el-option v-for='item in userList' :label='item.name' :value='item.empId' :key='item.empId'></el-option> <el-option v-for='item in userList' :label='item.EmployeeName' :value='item.Id' :key='item.Id'></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span><em>待审核人</em><el-select filterable v-model='msg.ToAuditId'> <span><em>待审核人</em><el-select filterable v-model='msg.ToAuditId'>
<el-option label='不限' value='0'></el-option> <el-option label='不限' value='0'></el-option>
<el-option v-for='item in userList' :label='item.name' :value='item.empId' :key='item.empId'></el-option> <el-option v-for='item in userList' :label='item.EmployeeName' :value='item.Id' :key='item.Id'></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span><em>已审核人</em><el-select filterable v-model='msg.AuditedId'> <span><em>已审核人</em><el-select filterable v-model='msg.AuditedId'>
<el-option label='不限' value='0'></el-option> <el-option label='不限' value='0'></el-option>
<el-option v-for='item in userList' :label='item.name' :value='item.empId' :key='item.empId'></el-option> <el-option v-for='item in userList' :label='item.EmployeeName' :value='item.Id' :key='item.Id'></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
...@@ -203,6 +203,18 @@ ...@@ -203,6 +203,18 @@
</template> </template>
<script> <script>
import {
queryEmployee
} from '../../api/users/user'
import {
gettemplatetype,
getMyInitiateAuditStatus,
getOAPageList,
getAuditInfo
} from '../../api/administration/administration';
import {
getSchoolDropdown,
} from '../../api/school/index'
export default { export default {
data() { data() {
return { return {
...@@ -262,18 +274,27 @@ ...@@ -262,18 +274,27 @@
return arr; return arr;
}, },
getDetail(id,type){ getDetail(id,type){
this.apipost('app_user_workflow_GetAuditInfo',{WorkFlowId:id,TemplateType:type},res=>{ getAuditInfo({WorkFlowId:id,TemplateType:type}).then(res => {
if(res.data.resultCode == 1) { if(res.Code == 1) {
this.outerVisible=true; this.outerVisible=true;
this.dialogTitle='审批详情' this.dialogTitle='审批详情'
this.detailList=res.data.data this.detailList=res.Data
} }
},err=>{}) }).catch(() => {
})
// this.apipost('app_user_workflow_GetAuditInfo',{WorkFlowId:id,TemplateType:type},res=>{
// if(res.data.resultCode == 1) {
// this.outerVisible=true;
// this.dialogTitle='审批详情'
// this.detailList=res.data.data
// }
// },err=>{})
}, },
getAppAuditStatus(){ getAppAuditStatus(){
this.apipost('app_user_workflow_get_myinitiate_auditstatus',{},res=>{ getMyInitiateAuditStatus({}).then(res => {
if(res.data.resultCode == 1) { if(res.Code == 1) {
res.data.data.forEach(item=>{ res.Data.forEach(item=>{
for(let key in item){ for(let key in item){
if (item.hasOwnProperty(key)){ if (item.hasOwnProperty(key)){
this.appAuditStatusList.push({label:key,value:item[key]}) this.appAuditStatusList.push({label:key,value:item[key]})
...@@ -281,12 +302,14 @@ ...@@ -281,12 +302,14 @@
} }
}) })
} }
},err=>{}) }).catch(() => {
})
}, },
getApplyType(){ //模板类型 getApplyType(){ //模板类型
this.apipost('app_user_workflow_get_templatetype',{},res=>{ gettemplatetype({}).then(res => {
if(res.data.resultCode == 1) { if(res.Code == 1) {
res.data.data.forEach(item=>{ res.Data.forEach(item=>{
for(let key in item){ for(let key in item){
if (item.hasOwnProperty(key)){ if (item.hasOwnProperty(key)){
this.ApplyTypeList.push({label:key,value:item[key]}) this.ApplyTypeList.push({label:key,value:item[key]})
...@@ -294,28 +317,44 @@ ...@@ -294,28 +317,44 @@
} }
}) })
} }
},err=>{}) }).catch(() => {
})
}, },
getCompany(){ getCompany(){
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){ getSchoolDropdown({}).then(res => {
this.companyList=res.data.data; this.companyList = res.Data;
}else{} })
},err=>{})
}, },
getUser(){ getUser(){
this.msg.CreateBy='0' this.msg.CreateBy='0'
this.msg.ToAuditId='0' this.msg.ToAuditId='0'
this.msg.AuditedId='0' this.msg.AuditedId='0'
this.getUserMsg.RB_Branch_id=this.msg.RB_BranchId; this.getUserMsg.RB_Branch_id=this.msg.RB_BranchId;
this.apipost('app_get_company_employee',this.getUserMsg,res=>{ var qMsg = {
if(res.data.resultCode==1){ EmployeeName: ""
this.userList=res.data.data; }
}else{}
},err=>{}) queryEmployee(qMsg).then(res => {
if (res.Code == 1) {
this.userList = res.Data;
}
})
}, },
getList(){ getList(){
this.loading=true; this.loading=true;
// getOAPageList(this.msg).then(res => {
// if(res.Code == 1) {
// this.list=res.Data.pageData;
// this.total=res.Data.count;
// this.loading=false
// }
// }).catch(() => {
//
// })
this.apipost('WorkFlow_get_GetOAPageList',this.msg,res=>{ this.apipost('WorkFlow_get_GetOAPageList',this.msg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.list=res.data.data.pageData; this.list=res.data.data.pageData;
......
src/pages/administration/processDesign.vue
View file @ 497ba59f
...@@ -216,6 +216,9 @@ ...@@ -216,6 +216,9 @@
import { import {
getEmployeeAddrBook getEmployeeAddrBook
} from '../../api/users/user' } from '../../api/users/user'
import {
getDeptPostTree,
} from '../../api/system/post'
export default { export default {
data() { data() {
return { return {
...@@ -425,9 +428,12 @@ ...@@ -425,9 +428,12 @@
getRole() { getRole() {
this.outerVisible1 = true; this.outerVisible1 = true;
this.dialogTitle = '选择岗位'; this.dialogTitle = '选择岗位';
this.apipost('WorkFlow_get_GetDepartMentPost', {}, res => { getDeptPostTree({}).then(res => {
this.roleList = res.data.data this.roleList = res.Data
}, err => {}) }).catch(() => {
})
}, },
handleNodeChange1(data, checked) { handleNodeChange1(data, checked) {
data.IsCheck = checked; data.IsCheck = checked;
...@@ -524,7 +530,7 @@ ...@@ -524,7 +530,7 @@
}, },
checkedRole(data, checked) { checkedRole(data, checked) {
data.IsCheck = checked; data.IsCheck = checked;
if(data.Disabled == false && data.IsCheck) { if(data.IsCheck) {
this.showRole = []; this.showRole = [];
this.showRole.push({ this.showRole.push({
DeptName: data.DeptName, DeptName: data.DeptName,
......
src/pages/administration/updateProcessDesign.vue
View file @ 497ba59f
...@@ -216,6 +216,9 @@ ...@@ -216,6 +216,9 @@
import { import {
getEmployeeAddrBook getEmployeeAddrBook
} from '../../api/users/user' } from '../../api/users/user'
import {
getDeptPostTree,
} from '../../api/system/post'
export default { export default {
data() { data() {
return { return {
...@@ -459,9 +462,11 @@ ...@@ -459,9 +462,11 @@
getRole() { getRole() {
this.outerVisible1 = true; this.outerVisible1 = true;
this.dialogTitle = '选择岗位'; this.dialogTitle = '选择岗位';
this.apipost('WorkFlow_get_GetDepartMentPost', {}, res => { getDeptPostTree({}).then(res => {
this.roleList = res.Data this.roleList = res.Data
}, err => {}) }).catch(() => {
})
}, },
handleNodeChange1(data, checked) { handleNodeChange1(data, checked) {
data.IsCheck = checked; data.IsCheck = checked;
...@@ -558,7 +563,7 @@ ...@@ -558,7 +563,7 @@
}, },
checkedRole(data, checked) { checkedRole(data, checked) {
data.IsCheck = checked; data.IsCheck = checked;
if(data.Disabled == false && data.IsCheck) { if( data.IsCheck) {
this.showRole = []; this.showRole = [];
this.showRole.push({ this.showRole.push({
DeptName: data.DeptName, DeptName: data.DeptName,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment