xinyilu/NurseStationUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

商品订单 部分前端界面修改

Browse Source
This commit is contained in:
shidongli 2022-11-02 18:11:38 +08:00
parent 285e492f5d
commit 62a7dd9bec
7 changed files with 115 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/system/goodsOrder.js
View File

@ -40,6 +40,16 @@ export function editExpressNo(data) {
})
}
// 退款确定按钮
export function weChatRefundOrderApply(data) {
return request({
url: '/nurseApp/weChatPayment/weChatRefundOrderApply',
method: 'post',
data: data
})
}
// 新增商品订单
export function addGoodsOrder(data) {
return request({

69
src/views/login.vue
View File

@ -1,15 +1,25 @@
<template>
<div class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">全医通管理系统</h3>
<el-form
ref="loginForm"
:model="loginForm"
:rules="loginRules"
class="login-form"
>
<h3 class="title">泉医到家护理站管理平台</h3>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"
type="text"
auto-complete="off"
placeholder="账号"
style="width: 300px;"
>
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
<svg-icon
slot="prefix"
icon-class="user"
class="el-input__icon input-icon"
/>
</el-input>
</el-form-item>
<el-form-item prop="password">
@ -19,8 +29,13 @@
auto-complete="off"
placeholder="密码"
@keyup.enter.native="handleLogin"
style="width: 300px"
>
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
<svg-icon
slot="prefix"
icon-class="password"
class="el-input__icon input-icon"
/>
</el-input>
</el-form-item>
<el-form-item prop="code" v-if="captchaOnOff">
@ -28,35 +43,52 @@
v-model="loginForm.code"
auto-complete="off"
placeholder="验证码"
style="width: 63%"
style="width: 200px"
@keyup.enter.native="handleLogin"
>
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
<svg-icon
slot="prefix"
icon-class="validCode"
class="el-input__icon input-icon"
/>
</el-input>
<div class="login-code">
<img :src="codeUrl" @click="getCode" class="login-code-img"/>
<img :src="codeUrl" @click="getCode" class="login-code-img" />
</div>
</el-form-item>
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
<el-form-item style="width:100%;">
<el-checkbox
v-model="loginForm.rememberMe"
style="margin: 0px 0px 25px 0px"
>记住密码</el-checkbox
>
<el-form-item style="width: 100%">
<el-button
:loading="loading"
size="medium"
type="primary"
style="width:100%;"
style="
width: 300px;
height: 50px;
background-image: linear-gradient(to right, #90c8df, #4ca8cd);
border-radius: -33px;
border: none;
color: #ffffff;
border-radius: 20px;
"
@click.native.prevent="handleLogin"
>
<span v-if="!loading">登 录</span>
<span v-else>登 录 中...</span>
</el-button>
<div style="float: right;" v-if="register">
<router-link class="link-type" :to="'/register'">立即注册</router-link>
<div style="float: right" v-if="register">
<router-link class="link-type" :to="'/register'"
>立即注册</router-link
>
</div>
</el-form-item>
</el-form>
<!-- 底部 -->
<div class="el-login-footer">
<span>Copyright © 2018-2022 xinyilu.vip All Rights Reserved.</span>
<!-- <span>Copyright © 2018-2022 xinyilu.vip All Rights Reserved.</span> -->
</div>
</div>
</template>
@ -97,7 +129,7 @@ export default {
},
watch: {
$route: {
handler: function(route) {
handler: function (route) {
this.redirect = route.query && route.query.redirect;
},
immediate: true
@ -141,7 +173,7 @@ export default {
Cookies.remove('rememberMe');
}
this.$store.dispatch("Login", this.loginForm).then(() => {
this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
this.$router.push({ path: this.redirect || "/" }).catch(() => { });
}).catch(() => {
this.loading = false;
if (this.captchaOnOff) {
@ -161,16 +193,17 @@ export default {
justify-content: center;
align-items: center;
height: 100%;
background-image: url("../assets/images/login-background.jpg");
background-image: url("../assets/images/bg.png");
background-size: cover;
}
.title {
margin: 0px auto 30px auto;
margin: 0px 40px 30px auto;
text-align: center;
color: #707070;
}
.login-form {
margin-left: 20%;
border-radius: 6px;
background: #ffffff;
width: 400px;

26
src/views/system/StationDepartment/index.vue
View File

@ -124,17 +124,6 @@
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:StationDepartment:export']"
>导出</el-button
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
@ -161,6 +150,16 @@
prop="departmentPerson"
/> -->
<el-table-column label="联系电话" align="center" prop="phone" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
/>
<el-table-column
label="创建人"
align="center"
prop="createBy"
/>
<el-table-column
label="操作"
align="center"
@ -215,7 +214,7 @@
style="margin-top: 20px; border-bottom: 1px solid #f3f3f3"
>
<el-form-item
label="护理站"
label="所属护理站"
:rules="rules.nurseStationDepartmentList.nurseStationId"
:prop="`nurseStationDepartmentList.${index}.nurseStationId`"
>
@ -301,7 +300,7 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item
label="护理站"
label="所属护理站"
prop="nurseStationId"
>
<el-select
@ -311,6 +310,7 @@
v-loadmore="loadMore"
style="width: 250px"
@click="nurseinfo"
disabled
>
<el-option
v-for="item in nurseStationlist"

53
src/views/system/goodsOrder/index.vue
View File

@ -61,15 +61,8 @@
<el-table-column label="订单编号" align="center" prop="orderNo" />
<el-table-column label="订单状态" align="center" prop="orderStatus">
<template slot-scope="scope">
{{ scope.row.orderStatus == "WAIT_PAY" ? "待付款" : "" }}
{{ scope.row.orderStatus == "PAY" ? "已付款" : "" }}
{{ scope.row.orderStatus == "CANCEL" ? "已取消" : "" }}
{{ scope.row.orderStatus == "WAIT_RECEIVED_GOODS" ? "待收货" : "" }}
{{ scope.row.orderStatus == "RECEIVED_GOODS" ? "已收货" : "" }}
{{ scope.row.orderStatus == "WAIT_REFUND" ? "退款中" : "" }}
{{ scope.row.orderStatus == "REFUNDED" ? "已退款" : "" }}
{{ scope.row.orderStatus == "WAIT_RETURNED_GOODS" ? "待退货" : "" }}
{{ scope.row.orderStatus == "RETURNED_GOODS" ? "已退货" : "" }}
<!-- <el-button type="primary" v-if="scope.row.orderStatus=='WAIT_PAY'">待付款</el-button> -->
{{ orderStatus(scope.row.orderStatus) }}
</template>
</el-table-column>
<el-table-column label="订单总金额" align="center" prop="totalPrice" />
@ -299,12 +292,6 @@
disabled
style="width: 205px"
/>
<!-- <el-input
v-model="refundlist.refundType"
placeholder=""
clearable
@keyup.enter.native="handleQuery"
/> -->
</el-form-item>
<el-form-item label="退款原因" prop="dictLabel">
<el-input
@ -368,7 +355,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="refundcancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button type="primary" @click="submitRefundOrder">确 定</el-button>
</div>
</el-dialog>
<!-- 查看物流详细信息弹框 -->
@ -427,7 +414,7 @@
</template>
<script>
import { listGoodsOrder, getGoodsOrder, delGoodsOrder, addGoodsOrder, updateGoodsOrder, getGoodsOrderlist, goodsOrderRefundinfo, editExpressNo, goodsOrderrefund } from "@/api/system/goodsOrder";
import { listGoodsOrder, getGoodsOrder, delGoodsOrder, addGoodsOrder, updateGoodsOrder, getGoodsOrderlist, goodsOrderRefundinfo, editExpressNo, goodsOrderrefund, weChatRefundOrderApply } from "@/api/system/goodsOrder";
export default {
name: "GoodsOrder",
@ -588,12 +575,25 @@ export default {
// 确认退款
refund(id) {
console.log(id);
this.innerrefund = true
goodsOrderRefundinfo(id).then(res => {
this.refundlist = res.data;
console.log(this.refundlist)
// console.log(this.refundlist)
this.innerrefund = true
})
},
//确认退款 确定按钮
submitRefundOrder() {
console.log(this.refundlist)
var obj = {}
obj.orderNo = this.refundlist.goOrderNo
obj.refundPrice = this.refundlist.godTotalPrice
weChatRefundOrderApply(obj).then(res => {
// console.log(obj)
})
},
// refund(id){
// console.log(id);
// this.$confirm('是否确认退款?', '提示', {
@ -660,6 +660,7 @@ export default {
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
// this.getList();
},
// 多选框选中数据
handleSelectionChange(selection) {
@ -718,6 +719,20 @@ export default {
this.download('system/goodsOrder/export', {
...this.queryParams
}, `goodsOrder_${new Date().getTime()}.xlsx`)
},
orderStatus(code) {
var obj = {
WAIT_PAY: '待付款',
PAY: '已付款',
CANCEL: '已取消',
WAIT_RECEIVED_GOODS: '待收货',
RECEIVED_GOODS: '已收货',
WAIT_REFUND: '退款中',
REFUNDED: '已退款',
WAIT_RETURNED_GOODS: '待退货',
RETURNED_GOODS: '已退货',
}
return obj[code]
}
}
};

5
src/views/system/nurseType/index.vue
View File

@ -115,6 +115,11 @@
label="创建时间"
align="center"
prop="createTime"
/>
<el-table-column
label="创建人"
align="center"
prop="createBy"
/>
<el-table-column
label="操作"

2
src/views/system/station/index.vue
View File

@ -1163,7 +1163,7 @@
},
/** 导入按钮操作 */
handledata() {
this.upload.title = "用户导入";
this.upload.title = "护理站信息导入";
this.upload.open = true;
},
/** 下载模板操作 */

2
src/views/system/stationItem/index.vue
View File

@ -1223,7 +1223,7 @@ export default {
},
/** 导入按钮操作 */
handleExport() {
this.upload.title = "用户导入";
this.upload.title = "护理站护理项目导入";
this.upload.open = true;
},