Skip to content

phsl / client

Go to a project
Commit 823aee2e by 赵月辉
Options

控制台接口对接完成

parent e16bc30c
Showing with 178 additions and 68 deletions
src/api/computility/order.js
import request from '@/utils/request' import request from '@/utils/request'
// 查询订单管理-需求单管理列表 // 查询订单管理-需求单管理列表
export function listOrder(query) { export function listOrder (query) {
return request({ return request({
url: '/computility/order/list', url: '/computility/order/list',
method: 'get', method: 'get',
...@@ -10,7 +10,7 @@ export function listOrder(query) { ...@@ -10,7 +10,7 @@ export function listOrder(query) {
} }
// 查询订单管理-需求单管理详细 // 查询订单管理-需求单管理详细
export function getOrder(id) { export function getOrder (id) {
return request({ return request({
url: '/computility/order/' + id, url: '/computility/order/' + id,
method: 'get' method: 'get'
...@@ -18,7 +18,7 @@ export function getOrder(id) { ...@@ -18,7 +18,7 @@ export function getOrder(id) {
} }
// 新增订单管理-需求单管理 // 新增订单管理-需求单管理
export function addOrder(data) { export function addOrder (data) {
return request({ return request({
url: '/computility/order', url: '/computility/order',
method: 'post', method: 'post',
...@@ -27,7 +27,7 @@ export function addOrder(data) { ...@@ -27,7 +27,7 @@ export function addOrder(data) {
} }
// 修改订单管理-需求单管理 // 修改订单管理-需求单管理
export function updateOrder(data) { export function updateOrder (data) {
return request({ return request({
url: '/computility/order', url: '/computility/order',
method: 'put', method: 'put',
...@@ -36,9 +36,27 @@ export function updateOrder(data) { ...@@ -36,9 +36,27 @@ export function updateOrder(data) {
} }
// 删除订单管理-需求单管理 // 删除订单管理-需求单管理
export function delOrder(id) { export function delOrder (id) {
return request({ return request({
url: '/computility/order/' + id, url: '/computility/order/' + id,
method: 'delete' method: 'delete'
}) })
} }
// 取消订单-订单管理
export function cancelOrder (data) {
return request({
url: '/api/v1/orderCancel',
method: 'post',
data: data
})
}
// 查看驳回理由-订单管理
export function orderReason (id) {
return request({
url: `/api/v1/orderReason/${id}`,
method: 'get'
})
}
src/api/console.js
// 控制台相关接口 // 控制台相关接口
import request from '@/utils/request' import request from '@/utils/request'
// 获取首页banner // 提交企业认证审核
export function enterpriseAudit (query) { export function enterpriseAudit (query) {
return request({ return request({
url: '/api/v1/enterpriseAudit', url: '/api/v1/enterpriseAudit',
...@@ -9,3 +9,12 @@ export function enterpriseAudit (query) { ...@@ -9,3 +9,12 @@ export function enterpriseAudit (query) {
data: query data: query
}) })
} }
// 根据用户查询企业认证信息和用户信息
export function auditInfo (query) {
return request({
url: '/api/v1/enterpriseAudit',
method: 'get',
data: query
})
}
src/router/index.js
...@@ -161,7 +161,7 @@ export const constantRoutes = [ ...@@ -161,7 +161,7 @@ export const constantRoutes = [
}, },
{ {
path: '/user', path: '/user',
component: Layout, component: ManageLayout,
hidden: true, hidden: true,
redirect: 'noredirect', redirect: 'noredirect',
children: [ children: [
......
src/views/console/authentication.vue
...@@ -77,14 +77,13 @@ export default { ...@@ -77,14 +77,13 @@ export default {
} }
}, },
next () { next () {
// this.$refs[`step${this.stepActive}Ref`].$refs.formRef.validate().then(res => { this.$refs[`step${this.stepActive}Ref`].$refs.formRef.validate().then(res => {
this.stepActive += 1 this.stepActive += 1
if (this.stepActive === 3) { if (this.stepActive === 3) {
this.formData = {...this.$refs.step0Ref.ruleForm, ...this.$refs.step1Ref.ruleForm, ...this.$refs.step2Ref.ruleForm} this.formData = {...this.$refs.step0Ref.ruleForm, ...this.$refs.step1Ref.ruleForm, ...this.$refs.step2Ref.ruleForm}
} }
// }).catch(err => { }).catch(err => {
// console.log(err) })
// })
}, },
submit () { submit () {
enterpriseAudit(this.formData).then(res => { enterpriseAudit(this.formData).then(res => {
......
src/views/console/myOrder.vue
...@@ -284,30 +284,48 @@ ...@@ -284,30 +284,48 @@
fixed="right" fixed="right"
class-name="small-padding fixed-width"> class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<!-- <el-button--> <el-button
<!-- link--> v-if="scope.row.orderStatus === 2"
<!-- type="primary"--> link
<!-- icon="Edit"--> type="primary"
<!-- @click="handleUpdate(scope.row)"--> @click="handleViewReason(scope.row)"
<!-- v-hasPermi="['computility:order:edit']">--> >
<!-- 详情--> 查看驳回理由
<!-- </el-button>--> </el-button>
<!-- <el-button-->
<!-- link--> <el-button
<!-- type="primary"--> v-if="scope.row.orderStatus === 1"
<!-- icon="Delete"--> link
<!-- @click="handleDelete(scope.row)"--> type="primary"
<!-- v-hasPermi="['computility:order:remove']">--> @click="handleCancel(scope.row)"
<!-- 删除--> >
<!-- </el-button>--> 取消
<!-- <el-button--> </el-button>
<!-- link-->
<!-- type="primary"--> <!-- <el-button-->
<!-- icon="Edit"--> <!-- link-->
<!-- @click="handleUpdate(scope.row)"--> <!-- type="primary"-->
<!-- v-hasPermi="['computility:order:edit']">--> <!-- icon="Edit"-->
<!-- 修改--> <!-- @click="handleUpdate(scope.row)"-->
<!-- </el-button>--> <!-- v-hasPermi="['computility:order:edit']">-->
<!-- 详情-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- link-->
<!-- type="primary"-->
<!-- icon="Delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['computility:order:remove']">-->
<!-- 删除-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- link-->
<!-- type="primary"-->
<!-- icon="Edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['computility:order:edit']">-->
<!-- 修改-->
<!-- </el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -563,8 +581,11 @@ import { ...@@ -563,8 +581,11 @@ import {
getOrder, getOrder,
delOrder, delOrder,
addOrder, addOrder,
updateOrder updateOrder,
cancelOrder,
orderReason
} from '@/api/computility/order' } from '@/api/computility/order'
import { ElMessageBox } from 'element-plus'
const {proxy} = getCurrentInstance() const {proxy} = getCurrentInstance()
const { const {
...@@ -766,6 +787,33 @@ function handleDelete (row) { ...@@ -766,6 +787,33 @@ function handleDelete (row) {
}) })
} }
/** 取消按钮操作 */
function handleCancel (row) {
proxy.$modal
.confirm('是否取消该订单申请')
.then(function () {
return cancelOrder({id: row.id})
})
.then(() => {
getList()
proxy.$modal.msgSuccess('取消成功')
})
.catch(() => {
})
}
/** 查看驳回理由按钮操作 */
function handleViewReason (row) {
orderReason(row.id).then(res => {
console.log(res)
ElMessageBox.alert(res.data, '驳回理由', {
confirmButtonText: '关闭',
callback: (action) => {
}
})
})
}
/** 导出按钮操作 */ /** 导出按钮操作 */
function handleExport () { function handleExport () {
proxy.download( proxy.download(
......
src/views/console/naturalResources.vue
...@@ -622,4 +622,8 @@ getList() ...@@ -622,4 +622,8 @@ getList()
background-color: #FFFFFF; background-color: #FFFFFF;
margin-bottom: 20px; margin-bottom: 20px;
} }
.pagination-container {
background-color: transparent;
}
</style> </style>
src/views/console/overview.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="remind flex-align-center"> <div v-if="infoData.status === '驳回'" class="remind flex-align-center">
<el-icon> <el-icon>
<Bell/> <Bell/>
</el-icon> </el-icon>
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
<el-button type="primary" @click="$router.push('/console/authentication')">申请认证</el-button> <el-button type="primary" @click="$router.push('/console/authentication')">申请认证</el-button>
</div> </div>
<el-alert v-if="infoData.status === '待审核'" style="width: 300px" class="mb20" show-icon title="您的企业认证已提交，请等待审核" type="info" effect="dark"/>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-card shadow="never"> <el-card shadow="never">
...@@ -19,20 +21,21 @@ ...@@ -19,20 +21,21 @@
<div class="flex base-info"> <div class="flex base-info">
<div class="left"> <div class="left">
<el-image src="" fit="cover"></el-image> <el-image src="" fit="cover"></el-image>
<el-tag type="warning">未认证</el-tag> <el-tag v-if="infoData.status === '审核通过'" type="success">已认证</el-tag>
<el-tag v-else type="warning">未认证</el-tag>
</div> </div>
<el-form> <el-form label-width="110px" label-position="left">
<el-form-item label="账号昵称："> <el-form-item label="账号昵称：">
<div>周树人</div> <div>{{ infoData.userName }}</div>
<el-icon> <el-icon @click="$router.push('/user/profile')">
<Edit/> <Edit/>
</el-icon> </el-icon>
</el-form-item> </el-form-item>
<el-form-item label="注册时间："> <el-form-item label="注册时间：">
<div>2024/04/14</div> <div>{{ infoData.createUserTime }}</div>
</el-form-item> </el-form-item>
<el-form-item label="注册时间："> <el-form-item label="最后登录时间：">
<div>2024/04/14</div> <div>{{ infoData.endLoginUserTime }}</div>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -48,14 +51,14 @@ ...@@ -48,14 +51,14 @@
<div> <div>
<el-form label-width="96px" label-position="left"> <el-form label-width="96px" label-position="left">
<el-form-item label="我的手机号："> <el-form-item label="我的手机号：">
<div>139****7879</div> <div>{{ infoData.mobile }}</div>
<el-icon> <el-icon @click="$router.push('/user/profile')">
<Edit/> <Edit/>
</el-icon> </el-icon>
</el-form-item> </el-form-item>
<el-form-item label="我的密码："> <el-form-item label="我的密码：">
<div>********</div> <div>********</div>
<el-icon> <el-icon @click="$router.push('/user/profile')">
<Edit/> <Edit/>
</el-icon> </el-icon>
</el-form-item> </el-form-item>
...@@ -73,16 +76,21 @@ ...@@ -73,16 +76,21 @@
<div> <div>
<el-form label-width="110px" label-position="left"> <el-form label-width="110px" label-position="left">
<el-form-item label="企业认证："> <el-form-item label="企业认证：">
<el-tag type="warning" class="mr5">未认证</el-tag> <el-tag v-if="infoData.status === '审核通过'" type="success">已认证</el-tag>
<el-button type="primary" link>去申请</el-button> <el-tag v-else class="mr5" type="warning">未认证</el-tag>
<el-button v-if="!infoData.status || infoData.status === '驳回'" type="primary" link>去申请</el-button>
</el-form-item> </el-form-item>
<el-form-item label="最后提交时间："> <el-form-item label="最后提交时间：">
2024/04/14 12:12 {{ infoData.submitTime }}
</el-form-item> </el-form-item>
<el-form-item label="最后审核结果："> <el-form-item label="最后审核结果：">
<el-tag type="danger" class="mr5">未通过</el-tag> <el-tag v-if="infoData.status === '驳回'" type="danger" class="mr5">未通过</el-tag>
<el-button type="primary" link>查看驳回理由</el-button> <el-tag v-if="infoData.status === '待审核'" type="primary" class="mr5">待审核</el-tag>
<el-tag v-if="infoData.status === '审核通过'" type="primary" class="mr5">审核通过</el-tag>
<el-button v-if="infoData.status === '驳回'" type="primary" link @click="handleViewReason">查看驳回理由</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -111,7 +119,29 @@ ...@@ -111,7 +119,29 @@
</template> </template>
<script setup name="Overview"> <script setup name="Overview">
import { auditInfo } from '@/api/console.js'
import { ref } from 'vue'
import { ElMessageBox } from 'element-plus'
const infoData = ref({})
function getAuditInfo () {
auditInfo().then(res => {
console.log(res)
infoData.value = res.data
})
}
/** 查看驳回理由按钮操作 */
function handleViewReason () {
ElMessageBox.alert(infoData.value.remark, '驳回理由', {
confirmButtonText: '关闭',
callback: (action) => {
}
})
}
getAuditInfo()
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.remind { .remind {
...@@ -136,7 +166,8 @@ ...@@ -136,7 +166,8 @@
padding-top: 10px !important; padding-top: 10px !important;
padding-bottom: 8px !important; padding-bottom: 8px !important;
} }
:deep(.el-card__body){
:deep(.el-card__body) {
min-height: 134px; min-height: 134px;
} }
} }
...@@ -171,7 +202,8 @@ ...@@ -171,7 +202,8 @@
font-size: 14px; font-size: 14px;
color: #626566; color: #626566;
} }
:deep(.el-form-item__content){
:deep(.el-form-item__content) {
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
color: #303233; color: #303233;
......
src/views/system/user/profile/index.vue
...@@ -25,18 +25,18 @@ ...@@ -25,18 +25,18 @@
<svg-icon icon-class="email" />用户邮箱 <svg-icon icon-class="email" />用户邮箱
<div class="pull-right">{{ state.user.email }}</div> <div class="pull-right">{{ state.user.email }}</div>
</li> </li>
<li class="list-group-item"> <!-- <li class="list-group-item">-->
<svg-icon icon-class="tree" />所属部门 <!-- <svg-icon icon-class="tree" />所属部门-->
<div class="pull-right" v-if="state.user.dept">{{ state.user.dept.deptName }} / {{ state.postGroup }}</div> <!-- <div class="pull-right" v-if="state.user.dept">{{ state.user.dept.deptName }} / {{ state.postGroup }}</div>-->
</li> <!-- </li>-->
<li class="list-group-item"> <!-- <li class="list-group-item">-->
<svg-icon icon-class="peoples" />所属角色 <!-- <svg-icon icon-class="peoples" />所属角色-->
<div class="pull-right">{{ state.roleGroup }}</div> <!-- <div class="pull-right">{{ state.roleGroup }}</div>-->
</li> <!-- </li>-->
<li class="list-group-item"> <!-- <li class="list-group-item">-->
<svg-icon icon-class="date" />创建日期 <!-- <svg-icon icon-class="date" />创建日期-->
<div class="pull-right">{{ state.user.createTime }}</div> <!-- <div class="pull-right">{{ state.user.createTime }}</div>-->
</li> <!-- </li>-->
</ul> </ul>
</div> </div>
</el-card> </el-card>
......
src/views/system/user/profile/resetPwd.vue
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="submit">保存</el-button> <el-button type="primary" @click="submit">保存</el-button>
<el-button type="danger" @click="close">关闭</el-button> <!-- <el-button type="danger" @click="close">关闭</el-button>-->
</el-form-item> </el-form-item>
</el-form> </el-form>
</template> </template>
......
src/views/system/user/profile/userInfo.vue
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="submit">保存</el-button> <el-button type="primary" @click="submit">保存</el-button>
<el-button type="danger" @click="close">关闭</el-button> <!-- <el-button type="danger" @click="close">关闭</el-button>-->
</el-form-item> </el-form-item>
</el-form> </el-form>
</template> </template>
......
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 sign in to comment