Skip to content

A
apaas-ui
"src/components/service-box.vue" did not exist on "6f2c9d80e009d69b7cd97e60ff68996f24dd7597"
Commit e03e0b37 authored by 刘殿昕's avatar 刘殿昕
Browse files
Options

订单详情，云资源部分，个人档案

parent 11aeea0d
Hide whitespace changes
Inline Side-by-side
Showing with 296 additions and 171 deletions
src/App.vue
View file @ e03e0b37
...@@ -19,7 +19,6 @@ export default { ...@@ -19,7 +19,6 @@ export default {
console.log("--- --- ---"); console.log("--- --- ---");
console.log(data.data); console.log(data.data);
console.log("--- --- ---"); console.log("--- --- ---");
this.$store.commit("userInfofun", data.data); this.$store.commit("userInfofun", data.data);
} else { } else {
console.log(data.errMsg); console.log(data.errMsg);
......
src/components/menu.vue
View file @ e03e0b37
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<el-button @click="settlement" size="small" class="shop_settlement">去购物车申请结算</el-button> <el-button @click="settlement" size="small" class="shop_settlement">去购物车申请结算</el-button>
</div> </div>
</div> </div>
<div class="shop_sj"></div> <div v-if="userInfo.user_name && userInfo.user_name !=''" class="shop_sj"></div>
</div> </div>
<div style="float:right"> <div style="float:right">
......
src/components/order-list/order-list-cell.vue
View file @ e03e0b37
...@@ -7,10 +7,7 @@ ...@@ -7,10 +7,7 @@
</div> </div>
<el-row class="cell_row"> <el-row class="cell_row">
<el-col :span="10" class="cell_msg"> <el-col :span="10" class="cell_msg">
<img <img :src="cellItem.cover" class="cell_msg_img" />
:src="cellItem.cover"
class="cell_msg_img"
/>
<div class="cell_msg_right"> <div class="cell_msg_right">
<div class="cell_name"> <div class="cell_name">
<span>{{ cellItem.name }}</span> <span>{{ cellItem.name }}</span>
...@@ -51,12 +48,7 @@ ...@@ -51,12 +48,7 @@
> >
<p>服务评价：</p> <p>服务评价：</p>
<div class="pop_rate"> <div class="pop_rate">
<el-rate <el-rate v-model="serviceRate" :colors="colors" show-score score-template="{value}"></el-rate>
v-model="serviceRate"
:colors="colors"
show-score
score-template="{value}"
></el-rate>
</div> </div>
<p>填写评价：</p> <p>填写评价：</p>
<div class="evaluation_text"> <div class="evaluation_text">
...@@ -132,7 +124,7 @@ export default { ...@@ -132,7 +124,7 @@ export default {
data: () => ({ data: () => ({
visible: false, visible: false,
colors: ["#99A9BF", "#F7BA2A", "#FF9900"], colors: ["#99A9BF", "#F7BA2A", "#FF9900"],
serviceRate: 0, serviceRate: null,
textarea: "", textarea: "",
showMsgBox: false, showMsgBox: false,
helper: helper, helper: helper,
...@@ -140,50 +132,57 @@ export default { ...@@ -140,50 +132,57 @@ export default {
}), }),
methods: { methods: {
addEvaluation() { addEvaluation() {
if (this.cellItem.order_type == 1) { if (this.textarea == "" && this.serviceRate == null) {
let query = { this.$message({
service_id: this.cellItem.service_id, message: "请先完善评价内容",
content: this.textarea, type: "error"
score: this.serviceRate,
apply_id: this.cellItem.apply_id
};
this.$api.user.addServiceEvaluation(query).then(response => {
if (response.data.success == 1) {
this.$message({
message: "评价订单成功",
type: "success"
});
this.visible = false;
this.$emit("updateList");
} else {
this.$message({
message: "评价订单失败",
type: "error"
});
}
});
} else if (this.cellItem.order_type == 2) {
let query = {
app: this.cellItem.app_id,
content: this.textarea,
score: this.serviceRate,
apply_id: this.cellItem.apply_id
};
this.$api.user.addServiceEvaluation(query).then(response => {
if (response.data.success == 1) {
this.$message({
message: "评价订单成功",
type: "success"
});
this.visible = false;
this.$emit("updateList");
} else {
this.$message({
message: "评价订单失败",
type: "error"
});
}
}); });
} else {
if (this.cellItem.order_type == 1) {
let query = {
service_id: this.cellItem.service_id,
content: this.textarea,
score: this.serviceRate,
apply_id: this.cellItem.apply_id
};
this.$api.user.addServiceEvaluation(query).then(response => {
if (response.data.success == 1) {
this.$message({
message: "评价订单成功",
type: "success"
});
this.visible = false;
this.$emit("updateList");
} else {
this.$message({
message: "评价订单失败",
type: "error"
});
}
});
} else if (this.cellItem.order_type == 2) {
let query = {
app: this.cellItem.app_id,
content: this.textarea,
score: this.serviceRate,
apply_id: this.cellItem.apply_id
};
this.$api.user.addServiceEvaluation(query).then(response => {
if (response.data.success == 1) {
this.$message({
message: "评价订单成功",
type: "success"
});
this.visible = false;
this.$emit("updateList");
} else {
this.$message({
message: "评价订单失败",
type: "error"
});
}
});
}
} }
}, },
viewDetail(val) { viewDetail(val) {
......
src/components/order-list/order-list-list.vue
View file @ e03e0b37
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<el-col :span="4">操作</el-col> <el-col :span="4">操作</el-col>
</el-row> </el-row>
</div> </div>
<order-cell v-for="item in datas" :key="item.id" :cellItem="item"></order-cell> <order-cell v-for="item in datas" :key="item.id" :cellItem="item" @updateList="updateList"></order-cell>
</div> </div>
</template> </template>
...@@ -28,7 +28,11 @@ export default { ...@@ -28,7 +28,11 @@ export default {
}, },
data: () => ({}), data: () => ({}),
mounted() {}, mounted() {},
methods: {} methods: {
updateList() {
this.emit("updateList");
}
}
}; };
</script> </script>
<style scoped> <style scoped>
......
src/components/process-card.vue
View file @ e03e0b37
<template> <template>
<div class="out"> <div class="out">
<div class="box" v-for="(item,index) in data" :key="index+3000" :style="!(item.arr&&item.arr.length!==0)||item.result==='审批未通过'?{border:'none'}:(type&&type=='approval'&&index==data.length-1)?{borderLeft:'2px dashed #e3e5ef',paddingBottom:'0px',}:{}" :class="data[index+1]&&data[index+1].result==='审批中'?'dashedbd':''"> <div class="box" v-for="(item,index) in data" :key="index+3000" :style="!(item.arr&&item.arr.length!==0)||item.result==='审批未通过'||item.result==='审批不通过'?{border:'none'}:(type&&type=='approval'&&index==data.length-1)?{borderLeft:'2px dashed #e3e5ef',paddingBottom:'0px',}:{}" :class="data[index+1]&&data[index+1].result==='审批中'?'dashedbd':''">
<div class="circle" :style="!(item.arr&&item.arr.length!==0)?{borderColor:'#ffc95c'}:item.result==='审批未通过'?{borderColor:'#de3b4b'}:{}"></div> <div class="circle" :style="!(item.arr&&item.arr.length!==0)?{borderColor:'#ffc95c'}:item.result==='审批未通过'||item.result==='审批不通过'?{borderColor:'#de3b4b'}:{}"></div>
<div class="card" :style="item.result==='审批未通过'?{backgroundColor:'#fcfafa'}:{}"> <div class="card" :style="item.result==='审批未通过'||item.result==='审批不通过'?{backgroundColor:'#fcfafa'}:{}">
<p class="card_title" :style="!(item.arr&&item.arr.length!==0)?{backgroundColor:'#fcefd6'}:item.result==='审批未通过'?{backgroundColor:'#f7d5d5'}:{}"> <p class="card_title" :style="!(item.arr&&item.arr.length!==0)?{backgroundColor:'#fcefd6'}:item.result==='审批未通过'||item.result==='审批不通过'?{backgroundColor:'#f7d5d5'}:{}">
<span>{{item.title}}</span> <span>{{item.title}}</span>
<span :style="!(item.arr&&item.arr.length!==0)?{color:'#ef9433'}:item.result==='审批未通过'?{color:'#e15260'}:{}">{{item.result}}</span> <span :style="!(item.arr&&item.arr.length!==0)?{color:'#ef9433'}:item.result==='审批未通过'||item.result==='审批不通过'?{color:'#e15260'}:{}">{{item.result}}</span>
</p> </p>
<div class="card_contain" v-if="item.arr&&item.arr.length!==0"> <div class="card_contain" v-if="item.arr&&item.arr.length!==0">
<info-list :list_arr="item.arr"></info-list> <info-list :list_arr="item.arr"></info-list>
......
src/components/shop-cloud/shop-cloud.vue
View file @ e03e0b37
...@@ -10,19 +10,19 @@ ...@@ -10,19 +10,19 @@
<el-col :span="11"> <el-col :span="11">
<el-form-item class="form_item"> <el-form-item class="form_item">
<div class="form_item_title">申请部门：</div> <div class="form_item_title">申请部门：</div>
<el-input v-model="form.department" placeholder="请输入申请部门"></el-input> <el-input v-model="form.department_name" :disabled="true" placeholder="请输入申请部门"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" :offset="1"> <el-col :span="11" :offset="1">
<el-form-item class="form_item"> <el-form-item class="form_item">
<div class="form_item_title">部门联系人：</div> <div class="form_item_title">部门联系人：</div>
<el-input v-model="form.name" placeholder="请输入联系人姓名"></el-input> <el-input v-model="form.link_man" placeholder="请输入联系人姓名"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item class="form_item"> <el-form-item class="form_item">
<div class="form_item_title">联系电话：</div> <div class="form_item_title">联系电话：</div>
<el-input v-model="form.tel" placeholder="请输入联系人电话"></el-input> <el-input v-model="form.phone" placeholder="请输入联系人电话"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -33,29 +33,29 @@ ...@@ -33,29 +33,29 @@
<el-tab-pane label="申请新的工作区域" name="0"> <el-tab-pane label="申请新的工作区域" name="0">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form ref="formNew" :model="formNew"> <el-form ref="formNew" :model="formNew" :rules="ruleNew">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="form_title">基本信息</div> <div class="form_title">基本信息</div>
</el-col> </el-col>
<el-col :span="22"> <el-col :span="22">
<el-form-item class="form_item"> <el-form-item prop="namespace" class="form_item">
<div class="form_item_title">工作区域名称：</div> <div class="form_item_title">工作区域名称：</div>
<el-input v-model="formNew.workAreaName" placeholder="请输入工作区域英文名称"></el-input> <el-input v-model="formNew.namespace" placeholder="请输入工作区域英文名称"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="22"> <el-col :span="22">
<el-form-item class="form_item"> <el-form-item prop="workplace" class="form_item">
<div class="form_item_title">中文名称：</div> <div class="form_item_title">中文名称：</div>
<el-input v-model="formNew.cnName" placeholder="请输入工作区域中文名称"></el-input> <el-input v-model="formNew.workplace" placeholder="请输入工作区域中文名称"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="22"> <el-col :span="22">
<el-form-item class="form_item"> <el-form-item prop="workplacedesc" class="form_item">
<div class="form_item_title">描述信息：</div> <div class="form_item_title">描述信息：</div>
<el-input <el-input
type="textarea" type="textarea"
v-model="formNew.description" v-model="formNew.workplacedesc"
placeholder="请输入工作区域描述信息" placeholder="请输入工作区域描述信息"
></el-input> ></el-input>
</el-form-item> </el-form-item>
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<el-col :span="22"> <el-col :span="22">
<el-form-item class="form_item input_has_right"> <el-form-item class="form_item input_has_right">
<div class="form_item_title">CPU：</div> <div class="form_item_title">CPU：</div>
<el-select v-model="formNew.CPUs" placeholder="请选择CPU使用量"> <el-select v-model="formNew.cpu" placeholder="请选择CPU使用量">
<el-option <el-option
v-for="item in optionsCPU" v-for="item in optionsCPU"
:key="item.value" :key="item.value"
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<el-col :span="22"> <el-col :span="22">
<el-form-item class="form_item input_has_right"> <el-form-item class="form_item input_has_right">
<div class="form_item_title">内存：</div> <div class="form_item_title">内存：</div>
<el-select v-model="formNew.RAMs" placeholder="请选择内存使用量"> <el-select v-model="formNew.memory" placeholder="请选择内存使用量">
<el-option <el-option
v-for="item in optionsRAM" v-for="item in optionsRAM"
:key="item.value" :key="item.value"
...@@ -95,10 +95,10 @@ ...@@ -95,10 +95,10 @@
<el-form-item class="form_item input_has_right"> <el-form-item class="form_item input_has_right">
<div class="form_item_title">容器组：</div> <div class="form_item_title">容器组：</div>
<el-input-number <el-input-number
v-model="formNew.containerGroup" v-model="formNew.containers"
controls-position="right" controls-position="right"
:min="0" :min="0"
:max="10" :max="24"
placeholder="取值范围[0，24]" placeholder="取值范围[0，24]"
></el-input-number> ></el-input-number>
<div class="input_right">个</div> <div class="input_right">个</div>
...@@ -242,10 +242,10 @@ ...@@ -242,10 +242,10 @@
<div class="form_item"> <div class="form_item">
<el-select v-model="workSpace" @change="getForm" placeholder="请选择"> <el-select v-model="workSpace" @change="getForm" placeholder="请选择">
<el-option <el-option
v-for="item in workSpaceOptions" v-for="(item, index) in workSpaceOptions"
:key="item.value" :key="index"
:label="item.label" :label="item.namespace"
:value="item.value" :value="index"
></el-option> ></el-option>
</el-select> </el-select>
</div> </div>
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
<el-col :span="22"> <el-col :span="22">
<el-form-item class="form_item input_has_right"> <el-form-item class="form_item input_has_right">
<div class="form_item_title">申请CPU升级至：</div> <div class="form_item_title">申请CPU升级至：</div>
<el-select v-model="formOld.CPUs" placeholder="请选择CPU使用量"> <el-select v-model="formOld.cpu" placeholder="请选择CPU使用量">
<el-option <el-option
v-for="item in optionsCPU" v-for="item in optionsCPU"
:key="item.value" :key="item.value"
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
<el-col :span="22"> <el-col :span="22">
<el-form-item class="form_item input_has_right"> <el-form-item class="form_item input_has_right">
<div class="form_item_title">申请内存升级至：</div> <div class="form_item_title">申请内存升级至：</div>
<el-select v-model="formOld.RAMs" placeholder="请选择内存使用量"> <el-select v-model="formOld.memory" placeholder="请选择内存使用量">
<el-option <el-option
v-for="item in optionsRAM" v-for="item in optionsRAM"
:key="item.value" :key="item.value"
...@@ -313,7 +313,7 @@ ...@@ -313,7 +313,7 @@
v-model="formOld.containerGroup" v-model="formOld.containerGroup"
controls-position="right" controls-position="right"
:min="0" :min="0"
:max="10" :max="24"
placeholder="取值范围[0，24]" placeholder="取值范围[0，24]"
></el-input-number> ></el-input-number>
<div class="input_right">个</div> <div class="input_right">个</div>
...@@ -496,23 +496,23 @@ ...@@ -496,23 +496,23 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<span class="dia_item_title">申请组织：</span> <span class="dia_item_title">申请组织：</span>
<span class="dia_item_val">贵州省交通运输厅运输厅贵州省交通运输厅运输厅</span> <span class="dia_item_val">{{ diaForm.department_name }}</span>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<span class="dia_item_title">组织联系人：</span> <span class="dia_item_title">组织联系人：</span>
<span class="dia_item_val">张三</span> <span class="dia_item_val">{{ diaForm.link_man }}</span>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<span class="dia_item_title">联系电话：</span> <span class="dia_item_title">联系电话：</span>
<span class="dia_item_val">13523232333</span> <span class="dia_item_val">{{ diaForm.phone }}</span>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<span class="dia_item_title">申请类型：</span> <span class="dia_item_title">申请类型：</span>
<span class="dia_item_val">新资源申请</span> <span class="dia_item_val">{{ diaForm.phone }}</span>
</el-col> </el-col>
<el-col :span="10" v-if="activeName == '1'"> <el-col :span="10" v-if="activeName == '1'">
<span class="dia_item_title">工作区域名称：</span> <span class="dia_item_title">工作区域名称：</span>
<span class="dia_item_val">BD-aPaaSaPaaSaSaPV4.0.html</span> <span class="dia_item_val">{{ diaForm.namespace }}</span>
</el-col> </el-col>
<el-col :span="14" v-if="activeName == '0'"> <el-col :span="14" v-if="activeName == '0'">
<span class="dia_item_title">上传申请文件：</span> <span class="dia_item_title">上传申请文件：</span>
...@@ -529,18 +529,15 @@ ...@@ -529,18 +529,15 @@
<div class="dia_block_item"> <div class="dia_block_item">
<div class="dia_block_item_in"> <div class="dia_block_item_in">
<span class="dia_block_item_title">工作区域名称：</span> <span class="dia_block_item_title">工作区域名称：</span>
<span class="dia_block_item_val">BD-aPaaSaPaaSaSaPV4.0.html</span> <span class="dia_block_item_val">{{ diaForm.namespace }}</span>
</div> </div>
<div class="dia_block_item_in"> <div class="dia_block_item_in">
<span class="dia_block_item_title">中文名称：</span> <span class="dia_block_item_title">中文名称：</span>
<span class="dia_block_item_val">aPaaS平台V3.0</span> <span class="dia_block_item_val">{{ diaForm.workplace }}</span>
</div> </div>
<div class="dia_block_item_in"> <div class="dia_block_item_in">
<span class="dia_block_item_title">描述信息：</span> <span class="dia_block_item_title">描述信息：</span>
<span class="dia_block_item_val"> <span class="dia_block_item_val">{{ diaForm.workplacedesc }}</span>
用于部署运行aPaaS平台V3.0用于部署运行aPaaS平台V3.0用于
部署运行aPaaS平台V3.0
</span>
</div> </div>
</div> </div>
<span class="dia_item_all_title">工作区域申请规格：</span> <span class="dia_item_all_title">工作区域申请规格：</span>
...@@ -551,7 +548,7 @@ ...@@ -551,7 +548,7 @@
</div> </div>
<div class="dia_block_item_in"> <div class="dia_block_item_in">
<span class="dia_block_item_title">内存：</span> <span class="dia_block_item_title">内存：</span>
<span class="dia_block_item_val">aPaaS平台V3.0</span> <span class="dia_block_item_val">{{ diaForm.memory }}</span>
</div> </div>
<div class="dia_block_item_in"> <div class="dia_block_item_in">
<span class="dia_block_item_title">容器组：</span> <span class="dia_block_item_title">容器组：</span>
...@@ -616,17 +613,17 @@ export default { ...@@ -616,17 +613,17 @@ export default {
}, },
data: () => ({ data: () => ({
form: { form: {
department: "", department_name: "",
name: "", phone: "",
tel: "" link_man: ""
}, },
activeName: "0", activeName: "0",
formNew: { formNew: {
workAreaName: "", namespace: "",
cnName: "", workplace: "",
description: "", workplacedesc: "",
CPUs: "", cpu: "",
RAMs: "", memory: "",
containerGroup: undefined, containerGroup: undefined,
dataDisk: undefined, dataDisk: undefined,
perDataDisk: undefined, perDataDisk: undefined,
...@@ -635,17 +632,24 @@ export default { ...@@ -635,17 +632,24 @@ export default {
perRAMs: undefined, perRAMs: undefined,
perRAM: undefined, perRAM: undefined,
appDuration: undefined, appDuration: undefined,
durType: "" durType: "",
apply_file: "",
apply_file_name: ""
},
ruleNew: {
namespace: [
{ required: true, message: "请输入联系电话", trigger: "blur" }
],
workplace: [
{ required: true, message: "请输入联系电话", trigger: "blur" }
]
}, },
durationOptions: [ durationOptions: [
{ value: "月", label: "月" }, { value: "月", label: "月" },
{ value: "年", label: "年" } { value: "年", label: "年" }
], ],
workSpace: "", workSpace: "",
workSpaceOptions: [ workSpaceOptions: [],
{ value: "aaaaaaaaaa工作空间", label: "aaaaaaaaaa工作空间" },
{ value: "wwwwwwwwww工作空间", label: "wwwwwwwwww工作空间" }
],
optionsCPU: [ optionsCPU: [
{ value: "8", label: "8" }, { value: "8", label: "8" },
{ value: "16", label: "16" } { value: "16", label: "16" }
...@@ -666,11 +670,11 @@ export default { ...@@ -666,11 +670,11 @@ export default {
{ title: "内存", max: "4", default: "2", src: "ic_neicun" } { title: "内存", max: "4", default: "2", src: "ic_neicun" }
], ],
formOld: { formOld: {
workAreaName: "", namespace: "",
cnName: "", workplace: "",
description: "", workplacedesc: "",
CPUs: "", cpu: "",
RAMs: "", memory: "",
containerGroup: undefined, containerGroup: undefined,
dataDisk: undefined, dataDisk: undefined,
perDataDisk: undefined, perDataDisk: undefined,
...@@ -679,21 +683,33 @@ export default { ...@@ -679,21 +683,33 @@ export default {
perRAMs: undefined, perRAMs: undefined,
perRAM: undefined, perRAM: undefined,
appDuration: undefined, appDuration: undefined,
durType: "" durType: "",
apply_file: "",
apply_file_name: ""
}, },
dialogVisible: false ruleOld: [],
dialogVisible: false,
diaForm: {}
}), }),
mounted() {
this.getUser();
this.getNameSpaceList();
},
methods: { methods: {
tabClick() {}, tabClick() {},
getNewList() {}, getNewList(val) {
getNewListOld() {}, this.formNew.apply_file_name = val.name;
this.formNew.apply_file = val.url;
},
getNewListOld() {
this.formOld.apply_file_name = val.name;
this.formOld.apply_file = val.url;
},
handleChange() {}, handleChange() {},
getForm(val) { getForm(val) {
if (val != "") { if (val != "") {
this.formOld = this.workSpaceOptions[val];
this.formShow = true; this.formShow = true;
Object.keys(this.formOld).forEach(item => {
this.formOld[item] = undefined;
});
} else { } else {
this.formShow = false; this.formShow = false;
} }
...@@ -706,7 +722,8 @@ export default { ...@@ -706,7 +722,8 @@ export default {
formParams = this.formOld; formParams = this.formOld;
} }
this.dialogVisible = true; this.dialogVisible = true;
console.log(formParams, this.form); this.diaForm = Object.assign(formParams, this.form);
console.log(this.diaForm);
}, },
determineSubmit() { determineSubmit() {
console.log(formParams, this.form); console.log(formParams, this.form);
...@@ -714,6 +731,24 @@ export default { ...@@ -714,6 +731,24 @@ export default {
}, },
cancel() { cancel() {
this.dialogVisible = false; this.dialogVisible = false;
},
getUser() {
this.$api.user.getNowUser().then(response => {
if (response.data.success == 1) {
this.form.department_name = response.data.data.department_name;
this.form.phone = response.data.data.phone;
this.form.link_man = response.data.data.link_man;
} else {
console.log(response.data.console.errMsg);
}
});
},
getNameSpaceList() {
this.$api.serviceShop.getCloudList().then(response => {
if (response.data.success == 1) {
this.workSpaceOptions = response.data.data;
}
});
} }
} }
}; };
...@@ -1036,7 +1071,8 @@ export default { ...@@ -1036,7 +1071,8 @@ export default {
text-align: left; text-align: left;
font-size: 14px; font-size: 14px;
} }
.cloud_form .el-input__prefix, .el-input__suffix { .cloud_form .el-input__prefix,
.el-input__suffix {
text-align: right; text-align: right;
} }
</style> </style>
\ No newline at end of file
src/pages/user/order/order_detail.vue
View file @ e03e0b37
...@@ -69,29 +69,34 @@ ...@@ -69,29 +69,34 @@
class="approval_status_btn" class="approval_status_btn"
@click="getMessage" @click="getMessage"
>查看评价</el-button> >查看评价</el-button>
<el-button class="approval_status_btn" @click="showMsgBox = false">收起评价</el-button> <el-button
<el-button class="again" @click="goto('/user/order_list')">再次申请</el-button> v-else-if="orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1 && orderDetail.is_estimated == 1 && showMsgBox"
class="approval_status_btn"
@click="showMsgBox = false"
>收起评价</el-button>
<el-button
v-if=" orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1"
class="again"
@click="nextApply"
>再次申请</el-button>
</div> </div>
</div> </div>
<div class="detail_title">服务信息</div> <div class="detail_title">{{ orderDetail.order_type == 1 ? "服务" : "应用"}}信息</div>
<div class="detail_service"> <div class="detail_service">
<el-row class="detail_service_row"> <el-row class="detail_service_row">
<el-col :span="10" class="detail_service_msg"> <el-col :span="10" class="detail_service_msg">
<img <img :src="orderDetail.cover" class="detail_service_msg_img" />
src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
class="detail_service_msg_img"
/>
<div class="detail_service_msg_right"> <div class="detail_service_msg_right">
<div class="detail_service_name"> <div class="detail_service_name">
<span>水路货物周转量情况</span> <span>{{ orderDetail.name }}</span>
<!-- <span v-if="cellItem.mapService" class="tags map_service">mapService</span> <span v-if="orderDetail.mapService" class="tags map_service">mapService</span>
<span v-if="cellItem.state == 1" class="tags shared">共享</span> <span v-if="orderDetail.openness == 1" class="tags shared">共享</span>
<span v-else-if="cellItem.state == 2" class="tags restricted">受限</span> <span v-else-if="orderDetail.openness == 2" class="tags restricted">受限</span>
<span v-else class="tags sensitive">敏感</span>--> <span v-else class="tags sensitive">敏感</span>
</div> </div>
<div class="detail_service_msg_other"> <div class="detail_service_msg_other">
<div class="detail_service_type">基础数据服务</div> <div class="detail_service_type">{{ orderDetail.sector }}</div>
<div class="detail_service_creator">贵州省交通运输厅</div> <div class="detail_service_creator">{{ orderDetail.src_organization }}</div>
</div> </div>
</div> </div>
</el-col> </el-col>
...@@ -99,26 +104,30 @@ ...@@ -99,26 +104,30 @@
<div> <div>
<div> <div>
<span class="detail_service_specification_gg">规格：</span> <span class="detail_service_specification_gg">规格：</span>
<span class="detail_service_specification_val">访问次数：200/日，访问量：10000/日</span> <span
class="detail_service_specification_val"
>访问次数：{{ orderDetail.spec_svc_count }}/日，访问量：{{ orderDetail.spec_svc_pv }}/日</span>
</div> </div>
<div> <div>
<span class="detail_service_specification_type">申请方式：</span> <span class="detail_service_specification_type">申请方式：</span>
<span class="detail_service_specification_val">按月</span> <span
class="detail_service_specification_val"
>{{orderDetail.duration_unit == 1 ? "按月" : "按年"}}</span>
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="detail_service_time"> <el-col :span="6" class="detail_service_time">
<div> <div>
<span class="detail_service_time_title">申请时长：</span> <span class="detail_service_time_title">申请时长：</span>
<span class="detail_service_specification_val">5年</span> <span
class="detail_service_specification_val"
>{{ orderDetail.duration + (orderDetail.duration_unit == 1 ? "个月" : "年") }}</span>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div class="detail_s_title">应用场景：</div> <div class="detail_s_title">应用场景：</div>
<div <div class="detail_app_scence">{{ orderDetail.scene }}</div>
class="detail_app_scence"
>用于展示车辆位置，用于展示车辆位置，用于展示车辆位置，用于展示车辆位置，用于展示车辆位置，用于展示车辆位置，用于展示车辆位置，用于展示车辆位置，用于展示车辆位置。</div>
<div class="detail_s_title">申请内容：</div> <div class="detail_s_title">申请内容：</div>
<table-um :headers="header_arr" :datas="data"></table-um> <table-um :headers="header_arr" :datas="data"></table-um>
<div class="detail_title">申请人信息</div> <div class="detail_title">申请人信息</div>
...@@ -148,96 +157,97 @@ export default { ...@@ -148,96 +157,97 @@ export default {
serviceRate: 0, serviceRate: 0,
textarea: "", textarea: "",
orderDetail: {}, orderDetail: {},
orderUser: {},
showMsgBox: false, showMsgBox: false,
approval_arr1: [ approval_arr1: [
{ {
title: "一级审批", title: "一级审批",
result: "审批通过", result: "",
arr: [ arr: [
{ {
title: "审批时间：", title: "审批时间：",
info: "2020-02-28 15:23:45" info: ""
}, },
{ {
title: "审批单位：", title: "审批单位：",
info: "某某某城管局" info: ""
}, },
{ {
title: "审批人：", title: "审批人：",
info: "张先生" info: ""
}, },
{ {
title: "审批意见：", title: "审批意见：",
info: "同意" info: ""
} }
] ]
}, },
{ {
title: "二级审批", title: "二级审批",
result: "审批通过", result: "",
arr: [ arr: [
{ {
title: "审批时间：", title: "审批时间：",
info: "2020-02-28 15:23:45" info: ""
}, },
{ {
title: "审批单位：", title: "审批单位：",
info: "某某某城管局" info: ""
}, },
{ {
title: "审批人：", title: "审批人：",
info: "张先生" info: ""
}, },
{ {
title: "审批意见：", title: "审批意见：",
info: "同意" info: ""
} }
] ]
}, },
{ {
title: "三级审批", title: "三级审批",
result: "审批未通过", result: "",
arr: [ arr: [
{ {
title: "审批时间：", title: "审批时间：",
info: "2020-02-28 15:23:45" info: ""
}, },
{ {
title: "审批单位：", title: "审批单位：",
info: "某某某城管局" info: ""
}, },
{ {
title: "审批人：", title: "审批人：",
info: "张先生" info: ""
}, },
{ {
title: "审批意见：", title: "审批意见：",
info: "不同意，驳回。" info: ""
} }
] ]
} }
], ],
header_arr: [ header_arr: [
{ {
prop: "wfwmc", prop: "name",
label: "微服务名称", label: "微服务名称",
minWidth: "20%", minWidth: "20%",
align: "left" align: "left"
}, },
{ {
prop: "jkzt", prop: "is_sensituve",
label: "健康状态", label: "健康状态",
width: "120px", width: "120px",
align: "center" align: "center"
}, },
{ {
prop: "jklj", prop: "is_must",
label: "接口链接", label: "接口链接",
minWidth: "40%", minWidth: "40%",
align: "center" align: "center"
}, },
{ {
prop: "wfwms", prop: "descript",
label: "微服务描述", label: "微服务描述",
minWidth: "40%", minWidth: "40%",
align: "left" align: "left"
...@@ -246,20 +256,20 @@ export default { ...@@ -246,20 +256,20 @@ export default {
list_arr: [ list_arr: [
{ {
title: "申请人：", title: "申请人：",
info: "李子维" info: ""
}, },
{ {
title: "联系方式：", title: "联系方式：",
info: "18342803360" info: ""
}, },
{ {
title: "申请单位：", title: "申请单位：",
info: "北京比格大数据有限公司" info: ""
}, },
{ {
title: "申请文件：", title: "申请文件：",
info: "xxxx文件名称.txt", info: "",
url: "www.baidu.com", url: "",
type: "down" type: "down"
} }
], ],
...@@ -280,10 +290,69 @@ export default { ...@@ -280,10 +290,69 @@ export default {
.then(response => { .then(response => {
if (response.data.success == 1) { if (response.data.success == 1) {
this.orderDetail = response.data.data; this.orderDetail = response.data.data;
this.data = JSON.parse(this.orderDetail.res_fields);
this.getOrderUser();
this.getOrderApproval();
} else {
console.log(response.data.errMsg);
}
});
},
getOrderUser() {
this.$api.user
.getOrderUser({ order_id: this.$route.params.id })
.then(response => {
if (response.data.success == 1) {
this.list_arr[0].info = response.data.data.name;
this.list_arr[1].info = response.data.data.phone_number;
this.list_arr[2].info = response.data.data.organization;
this.list_arr[3].info = response.data.data.apply_file;
this.list_arr[3].url = response.data.data.apply_file;
} else { } else {
console.log(response.data.errMsg); console.log(response.data.errMsg);
} }
}); });
},
getOrderApproval() {
this.$api.user
.getOrderApproval({ apply_id: this.orderDetail.apply_id })
.then(response => {
if (response.data.success == 1) {
let data = response.data.data;
for (let i = 0; i < data.length; i++) {
this.approval_arr1[i].result = data[i].apply_type_name;
this.approval_arr1[i].arr[0].info = data[i].created;
this.approval_arr1[i].arr[1].info = data[i].department_name;
this.approval_arr1[i].arr[2].info = data[i].user_name;
this.approval_arr1[i].arr[3].info = data[i].comments;
}
this.approval_arr1.splice(data.length);
} else {
console.log(response.data.errMsg);
}
});
},
nextApply() {
let query = {};
if (this.cellItem.order_type == 1) {
query = {
service_id: parseFloat(this.cellItem.service_id),
spec_id: this.cellItem.svc_spec_id,
duration: this.cellItem.duration,
duration_unit: this.cellItem.duration_unit
};
} else if (this.cellItem.order_type == 2) {
query = {
app_id: parseFloat(this.cellItem.app_id),
spec_id: this.cellItem.spec_app,
duration: this.cellItem.duration,
duration_unit: this.cellItem.duration_unit
};
}
this.$router.push({
path: "/shop/shop_car_apply",
query: query
});
} }
} }
}; };
...@@ -307,10 +376,10 @@ export default { ...@@ -307,10 +376,10 @@ export default {
text-align: center; text-align: center;
} }
.detail_head_status { .detail_head_status {
width: 180px; width: 160px;
} }
.detail_head_no { .detail_head_no {
width: 240px; width: 360px;
} }
.detail_head_time { .detail_head_time {
width: 240px; width: 240px;
......
src/request/api/authority.js
View file @ e03e0b37
...@@ -29,7 +29,7 @@ const authority = { ...@@ -29,7 +29,7 @@ const authority = {
// User // User
setUserInfo(params) { setUserInfo(params) {
return axios.put(`/apaas/backmgt/user/put`, params); return axios.put(`/apaas/backmgt/user/put?pageType=${params.pageType}`, params);
}, },
} }
......
src/request/api/service_shop.js
View file @ e03e0b37
...@@ -32,7 +32,18 @@ Page=${params.Page}&Size=${params.Size}`); ...@@ -32,7 +32,18 @@ Page=${params.Page}&Size=${params.Size}`);
return axios.get(`/apaas/hubApi/market/list?online_state=${params.online_state}&appTypes=${params.appTypes}& return axios.get(`/apaas/hubApi/market/list?online_state=${params.online_state}&appTypes=${params.appTypes}&
businessArea=${params.businessArea}&developable=${params.developable}&orgSource=${params.orgSource}&order=${params.order}&page=${params.page}&limit=${params.limit}&search=${params.search}`); businessArea=${params.businessArea}&developable=${params.developable}&orgSource=${params.orgSource}&order=${params.order}&page=${params.page}&limit=${params.limit}&search=${params.search}`);
}, },
// cloud
getCloudList() {
return axios.get(`/apaas/serviceapp/v3/resource/list`)
},
applicationCloud(params) {
return axios.post(`/apaas/serviceapp/v3/resource/apply/new`, params)
},
updateCloud(params) {
return axios.post(`/apaas/serviceapp/v3/resource/apply/up`, params)
},
// shopping cart // shopping cart
addShoppingCart(params) { addShoppingCart(params) {
return axios.post(`/apaas/serviceapp/v3/shopcart/add`, params); return axios.post(`/apaas/serviceapp/v3/shopcart/add`, params);
......
src/request/api/user.js
View file @ e03e0b37
...@@ -28,6 +28,13 @@ const user = { ...@@ -28,6 +28,13 @@ const user = {
getOrderDetail(params) { getOrderDetail(params) {
return axios.get(`/apaas/serviceapp/v3/order/orderInfo?order_id=${params.order_id}`); return axios.get(`/apaas/serviceapp/v3/order/orderInfo?order_id=${params.order_id}`);
}, },
getOrderUser(params) {
return axios.get(`/apaas/serviceapp/v3/order/applyInfo?order_id=${params.order_id}`);
},
getOrderApproval(params) {
return axios.get(`/apaas/serviceapp/v3/order/approval?apply_id=${params.apply_id}`);
},
// user info // user info
getNowUser() { getNowUser() {
......
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