Skip to content

A
apaas-ui
Commit ed7f48a1 authored by 张俊's avatar 张俊
Browse files
Options

Merge branch 'zj' into dev

parents 3fb94260 72f149a0
Show whitespace changes
Inline Side-by-side
Showing with 218 additions and 118 deletions
src/pages/workbench/yygl/apply_app_detail.vue
View file @ ed7f48a1
......@@ -24,8 +24,7 @@
<div class="type_box_select">
<mavon-editor v-model="list_arr" :boxShadow="false" :toolbarsFlag="false" :subfield="false" defaultOpen="preview" :editable="false" v-if="now_service == 0"/>
<info-list
v-if=" now_service == 1"
@download="download"
v-if=" now_service !== 0"
:list_arr="servicead_arr
"
>
......@@ -171,12 +170,7 @@ export default {
],
},
],
approval_arr3:[
{
title: "一级审批",
result: "审批中",
},
],
approval_arr3:[],
service_arr: ["基本信息", "申请审批信息"],
service_header_arr: {
id:"",
......@@ -280,7 +274,7 @@ export default {
created() {
this.getServiceInfo();
this.getreadme();
// this.getServiceBaseInfo();
this.getServiceBaseInfo();
this.getServiceapplyInfo();
},
mounted() {},
......@@ -294,36 +288,57 @@ export default {
})
.catch(function(response) {});
},
download(val){
console.log(val);
},
getServiceapplyInfo() {
this.$http
.get("./static/applyappdetail.json")
.get(`/apaas/hubApi/market/approvalInfo/${this.$route.params.id}`)
.then((response) => {
let data = response.data.data;
if(!(data&&data.length)){
this.approval_arr3.push({
title: "一级审批",
result: "待审批"
})
return
}
data.forEach(e => {
this.approval_arr3.push({
title: e.level==1?"一级审批":'二级审批',
result: e.apply_type_name,
arr: [
{
title: "审批时间：",
info: e.created,
},
{
title: "审批单位：",
info: e.department_name,
},
{
title: "审批人：",
info: e.user_name,
},
{
title: "审批意见：",
info: e.comments,
}
]
})
});
})
.catch(function(response) {});
},
getServiceBaseInfo() {
this.$http
.get("/apaas/hubApi/market/applyDetailInfo/"+this.$route.params.id)
.then((response) => {
let data = response.data.data;
this.$set(this.servicead_arr[1], "info", data.appapplyinfo.scene);
this.$set(this.servicead_arr[2], "info", data.appapplyinfo.filename);
this.$set(this.servicead_arr[2], "url", data.appapplyinfo.fileurl);
this.$set(this.servicead_arr[3], "info", data.appapplyinfo.size);
this.$set(this.servicead_arr[1], "info", data.scene);
this.$set(this.servicead_arr[2], "info", data.apply_file);
this.$set(this.servicead_arr[2], "url", data.apply_file);
this.$set(this.servicead_arr[3], "info", data.apply_type_name);
})
.catch(function(response) {});
},
// getServiceBaseInfo() {
// this.$http
// .get("/apaas/hubApi/market/applyDetailInfo/"+this.$route.params.id)
// .then((response) => {
// let data = response.data.data;
// this.$set(this.list_arr[0], "info", data.appbaseinfo.intorduce);
// this.$set(this.list_arr[1], "info", data.appbaseinfo.action);
// this.$set(this.list_arr[2], "info", data.scene);
// this.$set(this.list_arr[4], "info", data.contact_person);
// this.$set(this.list_arr[5], "info", data.contact_number);
// this.appcode = data.appbaseinfo.appcode;
// })
// .catch(function(response) {});
// },
deploy(val){
console.log(val);
},
......
src/pages/workbench/yygl/approval_app_detail.vue
View file @ ed7f48a1
......@@ -17,9 +17,9 @@
>{{item}}</div>
</div>
<div class="type_box_select">
<info-list @download="download" :list_arr="now_service==0?list_arr:servicead_arr[now_user]">
<table-um :headers="header_arr" url="params_arr" slot="zd_table"></table-um>
<process-card type="approval" :data="approval_arr[now_user]" slot="sp_card"></process-card>
<mavon-editor v-model="list_arr" :boxShadow="false" :toolbarsFlag="false" :subfield="false" defaultOpen="preview" :editable="false" v-if="now_service == 0"/>
<info-list v-if="now_service!==0" :list_arr="servicead_arr[now_user]">
<process-card type="approval" :data="approval_arr" slot="sp_card"></process-card>
<div class="info_contain1" slot="sp_result">
<el-form ref="form" :rules="rules" :model="form" label-width="0px">
<el-form-item prop="result">
......@@ -39,7 +39,7 @@
</el-form-item>
<el-form-item class="btnsty">
<el-button @click="onSubmit('form')" class="right">提交</el-button>
<el-button class="right">取消</el-button>
<el-button class="right" @click="back_page">取消</el-button>
</el-form-item>
</el-form>
</div>
......@@ -57,6 +57,7 @@ import infoList from "@/components/infoList";
import tableUm from "@/components/table/table-um";
import processCard from "@/components/process-card";
import {getRole} from "@/utils/common"
import { mapGetters,mapState } from 'vuex'
export default {
props: {},
components: {
......@@ -79,7 +80,7 @@ export default {
option:[
{ required: true, message: '请输入意见', trigger: 'blur' },
{
min: 10, message: '长度大于10个字符', trigger: 'blur'
min: 10, message: '长度应大于10个字符', trigger: 'blur'
}
]
},
......@@ -91,36 +92,32 @@ export default {
},
{
label: "不通过",
value: 0
value: -1
}
],
approval_arr:[
[],
[],
[
{
title:'一级审批',
result:'审批通过',
arr:[
{
title:'审批时间：',
info:'2020-02-28 15:23:45'
},
{
title:'审批单位：',
info:'某某某城管局'
},
{
title:'审批人：',
info:'张先生'
},
{
title:'审批意见：',
info:'同意'
},
]
},
],
// {
// title:'一级审批',
// result:'审批通过',
// arr:[
// {
// title:'审批时间：',
// info:'2020-02-28 15:23:45'
// },
// {
// title:'审批单位：',
// info:'某某某城管局'
// },
// {
// title:'审批人：',
// info:'张先生'
// },
// {
// title:'审批意见：',
// info:'同意'
// },
// ]
// },
],
header_arr: [
{
......@@ -157,15 +154,48 @@ export default {
service_header_arr: {
name: "",
pic:"",
first: [],
second: [],
url:"",
first: [
{
"name": "应用类型",
"text": ""
},
{
"name": "业务领域",
"text": ""
},
{
"name": "审批状态",
"text": "",
"color":"#ef9433"
}
],
second: [
{
"name": "在线区域",
"text": ""
},
{
"name": "申请类型",
"text": ""
},
{
"name":"所属组织",
"text":""
}
],
},
service_arr: ["应用申请信息", "应用审批"],
now_service: 0,
servicead_arr: [
[],
[
{
title: "审批信息：",
prop: "title",
type: "solt",
solt_name: "sp_card"
},
{
title: "一级审批：",
prop: "title",
......@@ -188,83 +218,138 @@ export default {
},
],
],
list_arr: [
{
title: "申请单位：",
info: ""
list_arr: "",
};
},
{
title: "申请人：",
info: ""
watch: {},
computed: {
...mapGetters([
'level',
]),
...mapState(['userInfo']),
},
created() {
console.log(this.level);
if(this.userInfo){
this.now_user = this.level
this.getheaderinfo();
this.getapplyinfo();
this.get_approval_info();
}else{
this.getCurrentUser()
}
},
mounted() {},
methods: {
getCurrentUser() {
this.$api.user.getNowUser().then(({ data }) => {
if (data.success == 1) {
console.log("--- user info ---");
console.log(data.data);
console.log("--- user info ---");
this.$store.commit("userInfofun", data.data);
this.now_user = this.level
this.getheaderinfo();
this.getapplyinfo();
this.get_approval_info();
console.log(this.level);
} else {
console.log(data.errMsg);
}
});
},
get_approval_info(){
this.$http
.get(`/apaas/hubApi/market/approvalInfo/${this.$route.params.id}`)
.then((response) => {
let data = response.data.data;
if(!(data&&data.length)){
if(this.now_user==2){
this.approval_arr.push({
title: "一级审批",
result: "待审批"
})
}else{
this.servicead_arr[1].splice(0,1)
}
return
}
data.forEach(e => {
this.approval_arr.push({
title: e.level==1?"一级审批":'二级审批',
result: e.apply_type_name,
arr: [
{
title: "申请人联系电话：",
info: ""
title: "审批时间：",
info: e.created,
},
{
title: "场景描述：",
info: ""
title: "审批单位：",
info: e.department_name,
},
{
title: "申请文件：",
info: "",
url:"",
type: "down"
title: "审批人：",
info: e.user_name,
},
{
title: "申请时间：",
info: ""
title: "审批意见：",
info: e.comments,
}
]
};
},
watch: {},
computed: {},
created() {
this.now_user = this.$store.state.role;
getRole().then((data) => {
this.now_user = data;
console.log(data);
this.$store.commit("rolefun", data);
this.getheaderinfo();
this.getapplyinfo();
})
});
},
mounted() {},
methods: {
download(val){
console.log(val);
}).catch(function(response) {});
},
getapplyinfo(){
this.$http
.get("./static/approvalappdetail.json")
.get("/apaas/hubApi/market/readme/"+this.$route.params.app_id)
.then((response) => {
let data = response.data.data;
this.$set(this.list_arr[0], "info", data.appbaseinfo.company);
this.$set(this.list_arr[1], "info", data.appbaseinfo.person);
this.$set(this.list_arr[2], "info", data.appbaseinfo.phone);
this.$set(this.list_arr[3], "info", data.appbaseinfo.desc);
this.$set(this.list_arr[4], "info", data.appbaseinfo.filename);
this.$set(this.list_arr[4], "url", data.appbaseinfo.fileurl);
this.$set(this.list_arr[5], "info", data.appbaseinfo.time);
this.list_arr = data
})
.catch(function(response) {});
},
getheaderinfo(){
this.$http
.get("./static/approvalappdetail.json")
.get("/apaas/hubApi/market/applyInfo/"+this.$route.params.id)
.then((response) => {
let data = response.data.data;
this.$set(this.service_header_arr, "name", data.appInfo.name);
this.$set(this.service_header_arr, "first", data.appInfo.first);
this.$set(this.service_header_arr, "second", data.appInfo.second);
this.$set(this.service_header_arr, "name", data.app_name+' ');
this.$set(this.service_header_arr, "url", data.logo);
this.$set(this.service_header_arr.first[0], "text", data.type_name);
this.$set(this.service_header_arr.first[1], "text", data.ywly_name);
this.$set(this.service_header_arr.first[2], "text", data.apply_status);
this.$set(this.service_header_arr.first[2], "color", data.apply_status=="审批中"||data.apply_status=="待审批"?'#ef9433':data.apply_status=="审批通过"||data.apply_status=="已审批"?'#515fe7':'#e15260');
this.$set(this.service_header_arr.second[0], "text", data.online_state_name);
this.$set(this.service_header_arr.second[1], "text", data.apply_type_name);
this.$set(this.service_header_arr.second[2], "text", data.department_name);
})
.catch(function(response) {});
},
back_page(){
this.$router.back(-1)
},
post_result(){
var temp = {
"app_id":this.$route.params.app_id, // 申请的应用的id
"apply_id":this.$route.params.id, // 申请id
"status": this.form.result, // 是否通过，-1 不通过 1 通过
"comments":this.form.option // 审批意见
}
this.$http
.post("/apaas/hubApi/market/approval/"+this.$route.params.id,temp)
.then((response) => {
if(response.data.success){
this.$message.success('审批成功')
}else{
this.$message.error(errMsg)
}
}).catch(function(response) {});
},
onSubmit(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
alert('submit!');
this.post_result()
} else {
console.log('error submit!!');
return false;
......
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