diff --git a/src/pages/workbench/yygl/apply_app_detail.vue b/src/pages/workbench/yygl/apply_app_detail.vue
index 40ec38d037ca4757d9fcf638dee1eeaaa4bf4311..b7b509bee6c5fa19e72651b04b09fafe7f6c224a 100644
--- a/src/pages/workbench/yygl/apply_app_detail.vue
+++ b/src/pages/workbench/yygl/apply_app_detail.vue
@@ -24,8 +24,7 @@
@@ -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);
},
diff --git a/src/pages/workbench/yygl/approval_app_detail.vue b/src/pages/workbench/yygl/approval_app_detail.vue
index cc2f5a464c2da61295d9b9c44fea871cebffaeb4..c2fca099aeeedba317dc6e92b8f3adf494ea6bf1 100644
--- a/src/pages/workbench/yygl/approval_app_detail.vue
+++ b/src/pages/workbench/yygl/approval_app_detail.vue
@@ -17,9 +17,9 @@
>{{item}}
-
-
-
+
+
+
@@ -39,7 +39,7 @@
提交
- 取消
+ 取消
@@ -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,37 +92,33 @@ 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: [
{
prop: "zdmc",
@@ -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: ""
- },
- {
- title: "申请人：",
- info: ""
- },
- {
- title: "申请人联系电话：",
- info: ""
- },
- {
- title: "场景描述：",
- info: ""
- },
- {
- title: "申请文件：",
- info: "",
- url:"",
- type: "down"
- },
- {
- title: "申请时间：",
- info: ""
- }
- ]
+ list_arr: "",
};
},
watch: {},
- computed: {},
+ computed: {
+ ...mapGetters([
+ 'level',
+ ]),
+ ...mapState(['userInfo']),
+ },
created() {
- this.now_user = this.$store.state.role;
- getRole().then((data) => {
- this.now_user = data;
- console.log(data);
- this.$store.commit("rolefun", data);
+ 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: {
- download(val){
- console.log(val);
+ 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: e.created,
+ },
+ {
+ title: "审批单位：",
+ info: e.department_name,
+ },
+ {
+ title: "审批人：",
+ info: e.user_name,
+ },
+ {
+ title: "审批意见：",
+ info: e.comments,
+ }
+ ]
+ })
+ });
+ }).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;