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

Merge remote-tracking branch 'origin/dev'

Browse Source
This commit is contained in:
纪寒 2022-12-07 10:35:46 +08:00
commit bfccbed146
16 changed files with 435 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

361
public/index.html
View File

@ -1,208 +1,213 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head>
<head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit"> <meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= webpackConfig.name %></title> <title>
<%= webpackConfig.name %>
</title>
<script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=6b427d1f3e633c70e11ca6e304444a63"></script>
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]--> <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
<style> <style>
html, html,
body, body,
#app { #app {
height: 100%; height: 100%;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
} }
.chromeframe {
margin: 0.2em 0;
background: #ccc;
color: #000;
padding: 0.2em 0;
}
#loader-wrapper { .chromeframe {
position: fixed; margin: 0.2em 0;
top: 0; background: #ccc;
left: 0; color: #000;
width: 100%; padding: 0.2em 0;
height: 100%; }
z-index: 999999;
}
#loader { #loader-wrapper {
display: block; position: fixed;
position: relative; top: 0;
left: 50%; left: 0;
top: 50%; width: 100%;
width: 150px; height: 100%;
height: 150px; z-index: 999999;
margin: -75px 0 0 -75px; }
border-radius: 50%;
border: 3px solid transparent;
border-top-color: #FFF;
-webkit-animation: spin 2s linear infinite;
-ms-animation: spin 2s linear infinite;
-moz-animation: spin 2s linear infinite;
-o-animation: spin 2s linear infinite;
animation: spin 2s linear infinite;
z-index: 1001;
}
#loader:before { #loader {
content: ""; display: block;
position: absolute; position: relative;
top: 5px; left: 50%;
left: 5px; top: 50%;
right: 5px; width: 150px;
bottom: 5px; height: 150px;
border-radius: 50%; margin: -75px 0 0 -75px;
border: 3px solid transparent; border-radius: 50%;
border-top-color: #FFF; border: 3px solid transparent;
-webkit-animation: spin 3s linear infinite; border-top-color: #FFF;
-moz-animation: spin 3s linear infinite; -webkit-animation: spin 2s linear infinite;
-o-animation: spin 3s linear infinite; -ms-animation: spin 2s linear infinite;
-ms-animation: spin 3s linear infinite; -moz-animation: spin 2s linear infinite;
animation: spin 3s linear infinite; -o-animation: spin 2s linear infinite;
} animation: spin 2s linear infinite;
z-index: 1001;
}
#loader:after { #loader:before {
content: ""; content: "";
position: absolute; position: absolute;
top: 15px; top: 5px;
left: 15px; left: 5px;
right: 15px; right: 5px;
bottom: 15px; bottom: 5px;
border-radius: 50%; border-radius: 50%;
border: 3px solid transparent; border: 3px solid transparent;
border-top-color: #FFF; border-top-color: #FFF;
-moz-animation: spin 1.5s linear infinite; -webkit-animation: spin 3s linear infinite;
-o-animation: spin 1.5s linear infinite; -moz-animation: spin 3s linear infinite;
-ms-animation: spin 1.5s linear infinite; -o-animation: spin 3s linear infinite;
-webkit-animation: spin 1.5s linear infinite; -ms-animation: spin 3s linear infinite;
animation: spin 1.5s linear infinite; animation: spin 3s linear infinite;
} }
#loader:after {
content: "";
position: absolute;
top: 15px;
left: 15px;
right: 15px;
bottom: 15px;
border-radius: 50%;
border: 3px solid transparent;
border-top-color: #FFF;
-moz-animation: spin 1.5s linear infinite;
-o-animation: spin 1.5s linear infinite;
-ms-animation: spin 1.5s linear infinite;
-webkit-animation: spin 1.5s linear infinite;
animation: spin 1.5s linear infinite;
}
@-webkit-keyframes spin { @-webkit-keyframes spin {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
-ms-transform: rotate(0deg); -ms-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);
} }
100% { 100% {
-webkit-transform: rotate(360deg); -webkit-transform: rotate(360deg);
-ms-transform: rotate(360deg); -ms-transform: rotate(360deg);
transform: rotate(360deg); transform: rotate(360deg);
} }
} }
@keyframes spin { @keyframes spin {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
-ms-transform: rotate(0deg); -ms-transform: rotate(0deg);
transform: rotate(0deg); transform: rotate(0deg);
} }
100% { 100% {
-webkit-transform: rotate(360deg); -webkit-transform: rotate(360deg);
-ms-transform: rotate(360deg); -ms-transform: rotate(360deg);
transform: rotate(360deg); transform: rotate(360deg);
} }
} }
#loader-wrapper .loader-section {
position: fixed;
top: 0;
width: 51%;
height: 100%;
background: #7171C6;
z-index: 1000;
-webkit-transform: translateX(0);
-ms-transform: translateX(0);
transform: translateX(0);
}
#loader-wrapper .loader-section { #loader-wrapper .loader-section.section-left {
position: fixed; left: 0;
top: 0; }
width: 51%;
height: 100%;
background: #7171C6;
z-index: 1000;
-webkit-transform: translateX(0);
-ms-transform: translateX(0);
transform: translateX(0);
}
#loader-wrapper .loader-section.section-left { #loader-wrapper .loader-section.section-right {
left: 0; right: 0;
} }
#loader-wrapper .loader-section.section-right { .loaded #loader-wrapper .loader-section.section-left {
right: 0; -webkit-transform: translateX(-100%);
} -ms-transform: translateX(-100%);
transform: translateX(-100%);
-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
}
.loaded #loader-wrapper .loader-section.section-right {
-webkit-transform: translateX(100%);
-ms-transform: translateX(100%);
transform: translateX(100%);
-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
}
.loaded #loader-wrapper .loader-section.section-left { .loaded #loader {
-webkit-transform: translateX(-100%); opacity: 0;
-ms-transform: translateX(-100%); -webkit-transition: all 0.3s ease-out;
transform: translateX(-100%); transition: all 0.3s ease-out;
-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); }
transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
}
.loaded #loader-wrapper .loader-section.section-right { .loaded #loader-wrapper {
-webkit-transform: translateX(100%); visibility: hidden;
-ms-transform: translateX(100%); -webkit-transform: translateY(-100%);
transform: translateX(100%); -ms-transform: translateY(-100%);
-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); transform: translateY(-100%);
transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000); -webkit-transition: all 0.3s 1s ease-out;
} transition: all 0.3s 1s ease-out;
}
.loaded #loader { .no-js #loader-wrapper {
opacity: 0; display: none;
-webkit-transition: all 0.3s ease-out; }
transition: all 0.3s ease-out;
}
.loaded #loader-wrapper { .no-js h1 {
visibility: hidden; color: #222222;
-webkit-transform: translateY(-100%); }
-ms-transform: translateY(-100%);
transform: translateY(-100%);
-webkit-transition: all 0.3s 1s ease-out;
transition: all 0.3s 1s ease-out;
}
.no-js #loader-wrapper { #loader-wrapper .load_title {
display: none; font-family: 'Open Sans';
} color: #FFF;
font-size: 19px;
width: 100%;
text-align: center;
z-index: 9999999999999;
position: absolute;
top: 60%;
opacity: 1;
line-height: 30px;
}
.no-js h1 { #loader-wrapper .load_title span {
color: #222222; font-weight: normal;
} font-style: italic;
font-size: 13px;
color: #FFF;
opacity: 0.5;
}
</style>
</head>
#loader-wrapper .load_title { <body>
font-family: 'Open Sans';
color: #FFF;
font-size: 19px;
width: 100%;
text-align: center;
z-index: 9999999999999;
position: absolute;
top: 60%;
opacity: 1;
line-height: 30px;
}
#loader-wrapper .load_title span {
font-weight: normal;
font-style: italic;
font-size: 13px;
color: #FFF;
opacity: 0.5;
}
</style>
</head>
<body>
<div id="app"> <div id="app">
<div id="loader-wrapper"> <div id="loader-wrapper">
<div id="loader"></div> <div id="loader"></div>
<div class="loader-section section-left"></div> <div class="loader-section section-left"></div>
<div class="loader-section section-right"></div> <div class="loader-section section-right"></div>
<div class="load_title">正在加载系统资源，请耐心等待</div> <div class="load_title">正在加载系统资源，请耐心等待</div>
</div> </div>
</div> </div>
</body> </body>
</html> </html>

7
src/components/Editor/index.vue
View File

@ -60,7 +60,7 @@ export default {
}, },
data() { data() {
return { return {
uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 uploadUrl: process.env.VUE_APP_BASE_API + "/common/richTextPictureUrl", // 上传的图片服务器地址
headers: { headers: {
Authorization: "Bearer " + getToken() Authorization: "Bearer " + getToken()
}, },
@ -82,7 +82,7 @@ export default {
[{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色 [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
[{ align: [] }], // 对齐方式 [{ align: [] }], // 对齐方式
["clean"], // 清除文本格式 ["clean"], // 清除文本格式
["link", "image", "video"] // 链接、图片、视频 ["link", "image"] // 链接、图片、视频
], ],
}, },
placeholder: "请输入内容", placeholder: "请输入内容",
@ -177,6 +177,9 @@ export default {
let length = quill.getSelection().index; let length = quill.getSelection().index;
// 插入图片 res.url为服务器返回的图片地址 // 插入图片 res.url为服务器返回的图片地址
quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName); quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName);
this.$emit("imgs", res.fileName);
// 调整光标到最后 // 调整光标到最后
quill.setSelection(length + 1); quill.setSelection(length + 1);
} else { } else {

74
src/permission.js
View File

@ -11,46 +11,46 @@ NProgress.configure({ showSpinner: false })
const whiteList = ['/login', '/auth-redirect', '/bind', '/register'] const whiteList = ['/login', '/auth-redirect', '/bind', '/register']
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
NProgress.start() NProgress.start()
if (getToken()) { if (getToken()) {
to.meta.title && store.dispatch('settings/setTitle', to.meta.title) to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
/* has token*/ /* has token*/
if (to.path === '/login') { if (to.path === '/login') {
next({ path: '/' }) next({ path: '/' })
NProgress.done() NProgress.done()
} else {
if (store.getters.roles.length === 0) {
isRelogin.show = true
// 判断当前用户是否已拉取完user_info信息
store.dispatch('GetInfo').then(() => {
isRelogin.show = false
store.dispatch('GenerateRoutes').then(accessRoutes => {
// 根据roles权限生成可访问的路由表
router.addRoutes(accessRoutes) // 动态添加可访问路由表
next({...to, replace: true }) // hack方法 确保addRoutes已完成
})
}).catch(err => {
store.dispatch('LogOut').then(() => {
Message.error(err)
next({ path: '/' })
})
})
} else {
next()
}
}
} else { } else {
if (store.getters.roles.length === 0) { // 没有token
isRelogin.show = true if (whiteList.indexOf(to.path) !== -1) {
// 判断当前用户是否已拉取完user_info信息 // 在免登录白名单，直接进入
store.dispatch('GetInfo').then(() => { next()
isRelogin.show = false } else {
store.dispatch('GenerateRoutes').then(accessRoutes => { next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
// 根据roles权限生成可访问的路由表 NProgress.done()
router.addRoutes(accessRoutes) // 动态添加可访问路由表 }
next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
})
}).catch(err => {
store.dispatch('LogOut').then(() => {
Message.error(err)
next({ path: '/' })
})
})
} else {
next()
}
} }
} else {
// 没有token
if (whiteList.indexOf(to.path) !== -1) {
// 在免登录白名单，直接进入
next()
} else {
next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
NProgress.done()
}
}
}) })
router.afterEach(() => { router.afterEach(() => {
NProgress.done() NProgress.done()
}) })

1
src/views/system/OperateGoodsInfo/index.vue
View File

@ -356,6 +356,7 @@
style="margin-top: 20px" style="margin-top: 20px"
> >
<editor <editor
@imgs="imgs"
:min-height="100" :min-height="100"
style="width: 90%; margin: 0 auto" style="width: 90%; margin: 0 auto"
v-model="form.goodsRemark" v-model="form.goodsRemark"

9
src/views/system/OperateGoodsInfo/indexjs.js
View File

@ -18,6 +18,7 @@ export default {
name: "OperateGoodsInfo", name: "OperateGoodsInfo",
data() { data() {
return { return {
imgsurl: { pictureUrlList: [] },
imgone: "", imgone: "",
imageUrl: "", //商品图片 imageUrl: "", //商品图片
@ -134,6 +135,10 @@ export default {
this.goodsCategoryinfo(); this.goodsCategoryinfo();
}, },
methods: { methods: {
imgs(item) {
this.imgsurl.pictureUrlList.push(item);
// console.log(this.imgsurl)
},
upwhetherShelf(row) { upwhetherShelf(row) {
console.log(row); console.log(row);
if (row.whetherShelf == false) { if (row.whetherShelf == false) {
@ -224,6 +229,10 @@ export default {
console.log(res); console.log(res);
}); });
} }
if (this.imgsurl.pictureUrlList.length > 0) {
updatePicture(this.imgsurl).then((res) => {});
}
this.imgsurl={pictureUrlList:[]};
this.open = false; this.open = false;
this.reset(); this.reset();
this.StationName = "请选择所属护理站"; this.StationName = "请选择所属护理站";

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

@ -298,23 +298,24 @@
</el-form-item> </el-form-item>
<el-form-item label="下单方式" prop="buySource"> <el-form-item label="下单方式" prop="buySource">
<el-input <el-input
:value="buySourceinfo(orderList.buySource)" :value="orderChannelinfo(orderList.orderChannel)"
disabled disabled
style="width: 240px" style="width: 240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="购买来源" prop="orderChannel"> <el-form-item label="购买来源" prop="orderChannel">
<el-input <el-input
:value="orderChannelinfo(orderList.orderChannel)" :value="buySourceinfo(orderList.buySource)"
disabled disabled
style="width: 240px" style="width: 240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="综合评分" v-if="ratelist.compositeScore">
<el-form-item label="综合评分" v-if="orderList.compositeScore">
<div style="width: 240px"> <div style="width: 240px">
<el-rate <el-rate
v-if="ratelist.compositeScore" v-if="orderList.compositeScore"
v-model="ratelist.compositeScore" v-model="orderList.compositeScore"
style="padding-top: 7px" style="padding-top: 7px"
disabled disabled
show-score show-score
@ -331,18 +332,15 @@
></el-input> ></el-input>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="评价内容" v-if="ratelist.evaluateContent"> <el-form-item label="评价内容" v-if="orderList.evaluateContent">
<el-input <el-input
type="textarea" type="textarea"
disabled disabled
style="width: 240px" style="width: 610px"
v-model="ratelist.evaluateContent" v-model="orderList.evaluateContent"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="评价图片" v-if="ratelist">
label="评价图片"
v-if="ratelist.orderEvaluatePictureInfoList"
>
<div <div
style=" style="
display: flex; display: flex;
@ -351,8 +349,8 @@
" "
> >
<img <img
style="width: 240px" style="width: 23%; height: 100%; margin: 1%"
v-for="(item, index) in ratelist.orderEvaluatePictureInfoList" v-for="(item, index) in ratelist"
:src="baseurl + item.evaluatePictureUrl" :src="baseurl + item.evaluatePictureUrl"
alt="" alt=""
:key="index" :key="index"

13
src/views/system/goodsOrder/indexjs.js
View File

@ -9,7 +9,6 @@ import {
editExpressNo, editExpressNo,
goodsOrderrefund, goodsOrderrefund,
weChatRefundOrderApply, weChatRefundOrderApply,
selectOrderEvaluate
} from "@/api/system/goodsOrder"; } from "@/api/system/goodsOrder";
import { getListByUser } from "@/api/system/userlist.js"; import { getListByUser } from "@/api/system/userlist.js";
import baseurl from '@/api/baseurl.js' import baseurl from '@/api/baseurl.js'
@ -243,16 +242,10 @@ export default {
getGoodsOrderlist(id).then((res) => { getGoodsOrderlist(id).then((res) => {
this.orderList = res.data; this.orderList = res.data;
this.innerorder = true; this.innerorder = true;
this.ratelist = {}
if (row.orderStatus == 'EVALUATED') { if (row.orderStatus == 'EVALUATED') {
this.ratelist = {} this.ratelist = res.data.orderEvaluatePictureInfoList
selectOrderEvaluate(id).then(res => { } else {}
if (res.data) {
this.ratelist = res.data
}
})
} else {
this.ratelist = {}
}
}); });
}, },
// 查看录入物流单号弹框 // 查看录入物流单号弹框

24
src/views/system/order/index.vue
View File

@ -56,6 +56,7 @@
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="OrderDetailsList" :data="OrderDetailsList"
@ -289,7 +290,26 @@
> >
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-form-item
label="预约服务位置"
v-if="
query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
"
>
<el-input
v-model="query.serviceLocationName"
disabled
style="width: 250px"
/>
</el-form-item>
</el-form> </el-form>
<div
id="container"
v-if="
this.query.orderStatus == 'COMPLETE' ||
this.query.orderStatus == 'EVALUATED'
"
></div>
</el-dialog> </el-dialog>
<!-- 派单弹框 --> <!-- 派单弹框 -->
<el-dialog <el-dialog
@ -600,5 +620,9 @@ export default indexjs;
width: 250px; width: 250px;
height: 250px; height: 250px;
} }
#container {
width: 100%;
height: 600px;
}
</style> </style>

94
src/views/system/order/indexjs.js
View File

@ -7,15 +7,13 @@ import {
xylWeChatRefundNotify, xylWeChatRefundNotify,
appointmentOrderDetails, appointmentOrderDetails,
} from "@/api/system/order"; } from "@/api/system/order";
import {
selectOrderEvaluate
} from "@/api/system/goodsOrder";
import { getListByUser } from "@/api/system/userlist.js"; import { getListByUser } from "@/api/system/userlist.js";
import baseurl from '@/api/baseurl.js' import baseurl from '@/api/baseurl.js'
export default { export default {
name: "order", name: "order",
data() { data() {
return { return {
map: null,
baseurl: null, baseurl: null,
orderStatuslist: [{ orderStatuslist: [{
value: "WAIT_PAY", value: "WAIT_PAY",
@ -127,7 +125,52 @@ export default {
this.getList(); this.getList();
this.baseurl = baseurl this.baseurl = baseurl
}, },
mounted() {},
methods: { methods: {
init(query) {
this.map = new AMap.Map("container", {
resizeEnable: true, //设置地图可缩放
zoom: 18, //设置地图的层级
center: [query.serveLocationLongitude, query.serveLocationLatitude], //设置地图中心点 更多配置项参照高德官网的配置
});
var layer = new AMap.LabelsLayer({
zooms: [3, 20],
zIndex: 1000,
// 开启标注避让，默认为开启，v1.4.15 新增属性
collision: true,
// 开启标注淡入动画，默认为开启，v1.4.15 新增属性
animation: true,
});
this.map.add(layer);
var labelMarker = new AMap.LabelMarker({
name: query.serviceLocationName,
position: [query.serveLocationLongitude, query.serveLocationLatitude],
icon: {
type: "image",
image: "https://a.amap.com/jsapi_demos/static/images/poi-marker.png",
clipOrigin: [280, 8],
clipSize: [50, 68],
size: [25, 34],
anchor: "bottom-center",
angel: 0,
retina: true,
},
text: {
content: query.serviceLocationName,
direction: "top",
offset: [0, 0],
style: {
fontSize: 13,
fontWeight: "normal",
fillColor: "black",
padding: "2, 5",
backgroundColor: "",
},
},
});
layer.add(labelMarker);
},
//取消预约确定按钮 //取消预约确定按钮
ordercacenl() { ordercacenl() {
var obj = { var obj = {
@ -176,6 +219,7 @@ export default {
seeLook(row) { seeLook(row) {
this.loading = true this.loading = true
const id = row.orderNo; const id = row.orderNo;
this.map = null
appointmentOrderDetails(id).then((res) => { appointmentOrderDetails(id).then((res) => {
res.data.forEach((e) => { res.data.forEach((e) => {
if (e.serviceDate) { if (e.serviceDate) {
@ -184,25 +228,33 @@ export default {
} }
}); });
this.query = res.data[0]; this.query = res.data[0];
this.query.evaluateSatisfaction = null
if (row.orderStatus == 'EVALUATED') { if (row.orderStatus == 'EVALUATED') {
selectOrderEvaluate(id).then(res => { if (res.data) {
if (res.data) { if (res.data[0].evaluateSatisfaction == 'COMMONLY') {
if (res.data.evaluateSatisfaction == 'COMMONLY') { this.query.evaluateSatisfaction = '一般'
this.query.evaluateSatisfaction = '一般' } else if (res.data[0].evaluateSatisfaction == 'SATISFIED') {
} else if (res.data.evaluateSatisfaction == 'SATISFIED') { this.query.evaluateSatisfaction = '满意'
this.query.evaluateSatisfaction = '满意' } else if (res.data[0].evaluateSatisfaction == 'DISSATISFIED') {
} else if (res.data.evaluateSatisfaction == 'DISSATISFIED') { this.query.evaluateSatisfaction = '不满意'
this.query.evaluateSatisfaction = '不满意'
}
this.loading = false
this.innerVisible4 = true;
} else {
this.loading = false
this.innerVisible4 = true;
} }
}) this.loading = false
this.innerVisible4 = true;
setTimeout(() => {
this.init(this.query)
}, 500);
} else {
this.loading = false
this.innerVisible4 = true;
setTimeout(() => {
this.init(this.query)
}, 500);
}
} else if (row.orderStatus == 'COMPLETE') {
this.loading = false
this.innerVisible4 = true;
setTimeout(() => {
this.init(this.query)
}, 500);
} else { } else {
this.loading = false this.loading = false
this.innerVisible4 = true; this.innerVisible4 = true;
@ -363,4 +415,4 @@ export default {
); );
}, },
}, },
}; };

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

@ -298,6 +298,7 @@
</el-form-item> </el-form-item>
<el-form-item label="护理站简介" prop="agencyIntroduce"> <el-form-item label="护理站简介" prop="agencyIntroduce">
<editor <editor
@imgs="imgs"
:min-height="62" :min-height="62"
style="width: 90%; margin: 0 auto" style="width: 90%; margin: 0 auto"
v-model="form.agencyIntroduce" v-model="form.agencyIntroduce"

8
src/views/system/station/stationjs.js
View File

@ -42,6 +42,7 @@ export default {
} }
}; };
return { return {
imgsurl: { pictureUrlList: [] },
imageUrl: "", imageUrl: "",
imageUrl2: "", imageUrl2: "",
imgtwo: "", imgtwo: "",
@ -159,6 +160,9 @@ export default {
this.info(); this.info();
}, },
methods: { methods: {
imgs(item) {
this.imgsurl.pictureUrlList.push(item);
},
imgUrl(imgUrl) { imgUrl(imgUrl) {
this.form.stationPictureUrl = imgUrl; this.form.stationPictureUrl = imgUrl;
}, },
@ -248,6 +252,10 @@ export default {
if (obj.pictureUrlList.length > 0) { if (obj.pictureUrlList.length > 0) {
updatePicture(obj).then((res) => {}); updatePicture(obj).then((res) => {});
} }
if (this.imgsurl.pictureUrlList.length > 0) {
updatePicture(this.imgsurl).then((res) => {});
}
this.imgsurl={pictureUrlList:[]};
this.open = false; this.open = false;
this.reset(); this.reset();
}, },

9
src/views/system/stationAvatar/index.vue
View File

@ -54,6 +54,7 @@
/> />
<div v-else></div> <div v-else></div>
</div> </div>
<div class="title">请上传图片为800x800px的正方形</div>
</el-col> </el-col>
</el-row> </el-row>
<br /> <br />
@ -244,6 +245,12 @@ export default {
}; };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.title {
position: absolute;
bottom: 5%;
left: 50%;
transform: translate(-50%, 0%);
}
.avatar-upload-preview { .avatar-upload-preview {
position: absolute; position: absolute;
top: 0%; top: 0%;
@ -279,4 +286,4 @@ export default {
line-height: 110px; line-height: 110px;
border-radius: 50%; border-radius: 50%;
} }
</style> </style>

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

@ -144,11 +144,11 @@
align="center" align="center"
prop="nurseItemName" prop="nurseItemName"
/> />
<el-table-column <!-- <el-table-column
label="提前预约时长(h)" label="提前预约时长(h)"
align="center" align="center"
prop="advanceAppointDuration" prop="advanceAppointDuration"
/> /> -->
<el-table-column label="创建时间" align="center" prop="createTime" /> <el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="创建人" align="center" prop="createBy" /> <el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column <el-table-column
@ -260,7 +260,7 @@
maxlength="50" maxlength="50"
/> />
</el-form-item> </el-form-item>
<el-form-item <!-- <el-form-item
label="提前预约时长" label="提前预约时长"
prop="nurseStationItem.advanceAppointDuration" prop="nurseStationItem.advanceAppointDuration"
> >
@ -271,6 +271,14 @@
type="number" type="number"
min="0" min="0"
/> />
</el-form-item> -->
<el-form-item label="排序" prop="nurseStationItem.sort">
<el-input
placeholder="请输入排序"
v-model="form.nurseStationItem.sort"
oninput="value=value.replace(/[^\d]/g,'')"
maxLength="9"
/>
</el-form-item> </el-form-item>
<el-form-item label="项目头像" prop="nurseStationItem.itemPictureUrl"> <el-form-item label="项目头像" prop="nurseStationItem.itemPictureUrl">
<stationAcatar <stationAcatar
@ -280,19 +288,11 @@
:type="'itemPictureUrl'" :type="'itemPictureUrl'"
/> />
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="nurseStationItem.sort">
<el-input
placeholder="请输入排序"
v-model="form.nurseStationItem.sort"
oninput="value=value.replace(/[^\d]/g,'')"
maxLength="9"
/>
</el-form-item>
<el-form-item <el-form-item
label="项目内容简介" label="项目内容简介"
prop="nurseStationItem.nurseItemContent" prop="nurseStationItem.nurseItemContent"
> >
<el-input <!-- <el-input
maxlength="300" maxlength="300"
type="textarea" type="textarea"
:autosize="{ minRows: 2, maxRows: 4 }" :autosize="{ minRows: 2, maxRows: 4 }"
@ -300,7 +300,15 @@
style="width: 208px" style="width: 208px"
v-model="form.nurseStationItem.nurseItemContent" v-model="form.nurseStationItem.nurseItemContent"
> >
</el-input> </el-input> -->
<editor
@imgs="imgs"
maxlength="300"
:min-height="82"
placeholder="请输入内容"
style="width: 90%"
v-model="form.nurseStationItem.nurseItemContent"
></editor>
</el-form-item> </el-form-item>
<el-form-item label="项目时长和价格" required> <el-form-item label="项目时长和价格" required>
<el-table <el-table

17
src/views/system/stationItem/stationItemjs.js
View File

@ -17,6 +17,7 @@ export default {
name: "NurseItem", name: "NurseItem",
data() { data() {
return { return {
imgsurl: { pictureUrlList: [] },
imageUrl: "", imageUrl: "",
imgone: "", imgone: "",
// 用户导入参数 // 用户导入参数
@ -111,9 +112,9 @@ export default {
"nurseStationItem.sort": [ "nurseStationItem.sort": [
{ required: true, message: "排序不能为空", trigger: "blur" }, { required: true, message: "排序不能为空", trigger: "blur" },
], ],
"nurseStationItem.advanceAppointDuration": [ // "nurseStationItem.advanceAppointDuration": [
{ required: true, message: "提前预约时长不能为空", trigger: "blur" }, // { required: true, message: "提前预约时长不能为空", trigger: "blur" },
], // ],
"nurseStationItem.itemPictureUrl": [{ "nurseStationItem.itemPictureUrl": [{
required: true, required: true,
trigger: "blur", trigger: "blur",
@ -135,7 +136,11 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
imgs(item) {
this.imgsurl.pictureUrlList.push(item);
},
imgUrl(imgUrl) { imgUrl(imgUrl) {
this.form.nurseStationItem.itemPictureUrl = imgUrl; this.form.nurseStationItem.itemPictureUrl = imgUrl;
}, },
handleAvatarSuccess(res, file) { handleAvatarSuccess(res, file) {
@ -292,6 +297,10 @@ export default {
if (obj.pictureUrlList.length > 0) { if (obj.pictureUrlList.length > 0) {
updatePicture(obj).then((res) => { }); updatePicture(obj).then((res) => { });
} }
if (this.imgsurl.pictureUrlList.length > 0) {
updatePicture(this.imgsurl).then((res) => {});
}
this.imgsurl={pictureUrlList:[]};
this.open = false; this.open = false;
this.reset(); this.reset();
@ -467,6 +476,7 @@ export default {
this.form.nurseStationItemPrices.forEach(e => { this.form.nurseStationItemPrices.forEach(e => {
e.price = Number(e.price) e.price = Number(e.price)
}) })
this.form.nurseStationItem.advanceAppointDuration=0
updateNurseItem(this.form).then((response) => { updateNurseItem(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
@ -476,6 +486,7 @@ export default {
this.form.nurseStationItemPrices.forEach(e => { this.form.nurseStationItemPrices.forEach(e => {
e.price = Number(e.price) e.price = Number(e.price)
}) })
this.form.nurseStationItem.advanceAppointDuration=0
addNurseItem(this.form).then((response) => { addNurseItem(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.$forceUpdate(); this.$forceUpdate();

46
src/views/system/user/index.vue
View File

@ -797,19 +797,23 @@ export default {
const userId = row.userId || this.ids; const userId = row.userId || this.ids;
getUser(userId).then((response) => { getUser(userId).then((response) => {
this.form = response.data; this.form = response.data;
this.form.nurseStationIds = Number(this.form.nurseStationIds); if (!this.form.nurseStationIds) {
this.form.nurseStationIds = ''
} else {
this.form.nurseStationIds = Number(this.form.nurseStationIds);
}
// if ( // if (
// !this.form.nurseStationIds || // !this.form.nurseStationIds ||
// this.form.nurseStationIds == null || // this.form.nurseStationIds == null ||
// this.form.nurseStationIds.length == 0 // this.form.nurseStationIds.length == 0
// ) { // ) {getList
// } else { // } else {
// this.form.nurseStationIds = this.form.nurseStationIds.split(","); // this.form.nurseStationIds = this.form.nurseStationIds.split(",");
// this.form.nurseStationIds = this.form.nurseStationIds.map((e) => { // this.form.nurseStationIds = this.form.nurseStationIds.map((e) => {
// return (e = Number(e)); // return (e = Number(e));
// }); // });
// } // }
console.log(this.form); console.log(this.form);
this.postOptions = response.posts; this.postOptions = response.posts;
this.roleOptions = response.roles; this.roleOptions = response.roles;
@ -835,7 +839,7 @@ export default {
this.$modal.msgSuccess("修改成功，新密码是：" + value); this.$modal.msgSuccess("修改成功，新密码是：" + value);
}); });
}) })
.catch(() => {}); .catch(() => { });
}, },
/** 分配角色操作 */ /** 分配角色操作 */
handleAuthRole: function (row) { handleAuthRole: function (row) {
@ -844,7 +848,6 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function () {
console.log(this.form);
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
// this.form.nurseStationIds = this.form.nurseStationIds.join(","); // this.form.nurseStationIds = this.form.nurseStationIds.join(",");
@ -853,13 +856,28 @@ export default {
// obj.push(this.form.nurseStationIds); // obj.push(this.form.nurseStationIds);
// console.log(obj) // console.log(obj)
// this.form.nurseStationIds = obj; // this.form.nurseStationIds = obj;
console.log(this.form);
if (this.form.userId != undefined) { if (this.form.userId != undefined) {
updateUser(this.form).then((response) => { if (!this.form.nurseStationIds) {
this.$modal.msgSuccess("修改成功"); this.form.nurseStationIds = null
this.open = false; updateUser(this.form).then((response) => {
this.getList(); this.$modal.msgSuccess("修改成功");
}); this.open = false;
this.getList();
// console.log('bbb',this.form)
});
} else {
this.form.nurseStationIds = Number(this.form.nurseStationIds);
updateUser(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
// console.log('bbb',this.form)
});
}
} else { } else {
addUser(this.form).then((response) => { addUser(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
@ -882,7 +900,7 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}) })
.catch(() => {}); .catch(() => { });
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
@ -918,8 +936,8 @@ export default {
this.$refs.upload.clearFiles(); this.$refs.upload.clearFiles();
this.$alert( this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg + response.msg +
"</div>", "</div>",
"导入结果", "导入结果",
{ dangerouslyUseHTMLString: true } { dangerouslyUseHTMLString: true }
); );

5
vue.config.js
View File

@ -52,6 +52,9 @@ module.exports = {
} }
}, },
configureWebpack: { configureWebpack: {
externals: {
'AMap': 'AMap'
},
name: name, name: name,
resolve: { resolve: {
alias: { alias: {
@ -132,4 +135,4 @@ module.exports = {
} }
) )
} }
} }