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

修改

Browse Source
This commit is contained in:
曹辉 2022-11-16 10:00:42 +08:00
parent db76651c5b
commit 14096572f3
4 changed files with 57 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,6 @@
/>
</el-form-item>
<el-form-item label="订单状态" prop="orderStatus">
<el-select
v-model="queryParams.orderStatus"
@ -59,7 +58,7 @@
>重置</el-button
>
<el-button type="success" icon="el-icon-refresh-right" size="mini" @click="resetQuery"
>刷新</el-button
>刷新商品订单</el-button
>
</el-form-item>
</el-form>
@ -79,7 +78,7 @@
label="订单编号"
align="center"
prop="orderNo"
width="190"
width="190"
/>
<el-table-column
label="商品名称"
@ -174,7 +173,7 @@
v-hasPermi="['system:goodsOrder:editExpressNo']"
>录入物流单号</el-button
>
<!-- <el-button
<el-button
v-if="scope.row.orderStatus != 'WAIT_RECEIVED_GOODS'"
size="mini"
type="text"
@ -182,7 +181,7 @@
disabled
v-hasPermi="['system:goodsOrder:editExpressNo']"
>不可录入物流单号</el-button
> -->
>
</template>
</el-table-column>
<el-table-column
@ -525,7 +524,6 @@
:rows="5"
disabled
/>
</el-form-item>
<el-form-item> </el-form-item>
</el-form>
@ -618,27 +616,33 @@ export default {
refundlist: [],
nurseStationlist: [],
orderStatuslist: [
{
{
value: "WAIT_PAY",
label: "待付款",
},
{
value: "PAY",
label: "已付款",
label: "待发货",
},
{
value: "WAIT_RECEIVED_GOODS",
label: "待收货",
},
{
value: "RECEIVED_GOODS",
label: "交易完成",
},
{
value: "CANCEL",
label: "已取消",
},
{
value: "WAIT_RECEIVED_GOODS",
label: "待收货",
value: "WAIT_RETURNED_GOODS",
label: "待退货",
},
{
value: "RECEIVED_GOODS",
label: "已收货",
value: "RETURNED_GOODS",
label: "已退货",
},
{
value: "WAIT_REFUND",
@ -648,15 +652,6 @@ export default {
value: "REFUNDED",
label: "退款成功",
},
{
value: "WAIT_RETURNED_GOODS",
label: "待退货",
},
{
value: "RETURNED_GOODS",
label: "已退货",
},
],
// 遮罩层
loading: true,
@ -695,7 +690,7 @@ export default {
id: "",
expressNo: null,
},
//权限查询
//权限查询
getListByUserquery: {
pageNum: 1,
pageSize: 10,
@ -808,9 +803,8 @@ export default {
this.$modal.msgSuccess("录入成功");
}
this.queryexpressNo.expressNo = "";
this.getList();
this.getList();
this.innerlogistics = false;
});
},
// 取消按钮
@ -842,7 +836,6 @@ export default {
}
this.getList();
this.innerrefund = false;
});
},
// refund(id){
@ -922,19 +915,17 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
if (this.nurseStationlist[0].isAdmin == '1') {
if (this.nurseStationlist[0].isAdmin == "1") {
this.resetForm("queryForm");
this.queryParams = {
pageNum: 1,
pageSize: 10
}
pageSize: 10,
};
} else {
this.queryParams.pageNum = 1;
this.queryParams.pageSize = 10
this.queryParams.orderNo = null
this.queryParams.orderStatus = null
this.queryParams.pageSize = 10;
this.queryParams.orderNo = null;
this.queryParams.orderStatus = null;
}
this.handleQuery();
},
@ -1005,7 +996,7 @@ export default {
`goodsOrder_${new Date().getTime()}.xlsx`
);
},
//权限列表
//权限列表
info() {
// goodsCategory().then((res) => {
// console.log(this.form);
@ -1039,7 +1030,6 @@ export default {
}
}
},
},
};
</script>

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

@ -6,7 +6,7 @@
size="small"
:inline="true"
v-show="showSearch"
label-width="100px"
label-width="90px"
>
<el-form-item label="所属护理站" prop="nurseStationName">
<el-select
@ -23,14 +23,6 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="会员名称" prop="patientName">
<el-input
v-model="queryParams.patientName"
placeholder="请输入会员名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单编号" prop="orderNo">
<el-input
v-model="queryParams.orderNo"
@ -39,7 +31,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单状态" prop="orderStatus">
<el-select
v-model="queryParams.orderStatus"
@ -54,7 +45,14 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="会员名称" prop="patientName">
<el-input
v-model="queryParams.patientName"
placeholder="请输入会员名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
@ -71,7 +69,7 @@
icon="el-icon-refresh-right"
size="mini"
@click="resetQuery"
>刷新</el-button
>刷新预约订单</el-button
>
</el-form-item>
</el-form>
@ -85,7 +83,6 @@
align="center"
prop="nurseStationName"
/>
<el-table-column label="会员名称" align="center" prop="patientName" />
<el-table-column label="订单编号" align="center" prop="orderNo" />
<el-table-column
label="护理项目名称"
@ -93,6 +90,8 @@
prop="nurseItemName"
/>
<el-table-column label="订单总金额" align="center" prop="totalPrice" />
<el-table-column label="下单时间" align="center" prop="createTime" />
<el-table-column label="订单状态" align="center" prop="orderStatus">
<template slot-scope="scope">
<el-button v-if="scope.row.orderStatus == 'WAIT_PAY'"
@ -118,7 +117,7 @@
>退款中</el-button
>
<el-button type="warning" v-if="scope.row.orderStatus == 'REFUNDED'"
>已退款</el-button
>退款成功</el-button
>
<el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'"
@ -127,7 +126,8 @@
</template>
</el-table-column>
<el-table-column label="下单时间" align="center" prop="createTime" />
<el-table-column label="会员名称" align="center" prop="patientName" />
<el-table-column
label="操作"
align="center"
@ -234,7 +234,6 @@
style="width: 240px"
/>
</el-form-item>
<el-form-item label="订单数量" prop="orderCount">
<el-input
v-model="query.orderCount"
@ -243,7 +242,6 @@
style="width: 190px"
/>
</el-form-item>
<el-form-item label="护理项目名称" prop="nurseItemName">
<el-input
v-model="query.nurseItemName"
@ -674,7 +672,6 @@ export default {
// 查看
seeLook(row) {
const id = row.orderNo;
// console.log(row);
appointmentOrderDetails(id).then((res) => {
res.data.forEach((e) => {
if (e.serviceDate) {
@ -691,8 +688,6 @@ export default {
dispatch(row) {
console.log(row);
this.querynursePersonname.orderNo = row.orderNo;
console.log(this.querynursePersonname.orderNo);
// console.log(row)
this.nurseName = "请选择护理员";
this.innerdispatch = true;
this.nursePersonid = "";
@ -702,7 +697,6 @@ export default {
getPerson(this.querynursePersonname).then((res) => {
this.dispatchlist = res.rows;
this.total2 = res.total;
console.log(this.dispatchlist);
this.nursePersonNameinfo = true;
});
},

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

@ -8,7 +8,6 @@
v-show="showSearch"
label-width="100px"
>
<el-form-item
label="护理站名称"
prop="nurseStationName"
@ -279,7 +278,7 @@
</el-option>
</el-select>
<el-select
v-model="form.areaCode"
v-model="form.streetCode"
clearable
placeholder="请选择街道"
style="width: 129px; margin-left: 10px"
@ -294,7 +293,6 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="护理站名称" prop="nurseStationName">
<el-input
v-model="form.nurseStationName"
@ -302,7 +300,7 @@
maxlength="40"
/>
</el-form-item>
<el-form-item label="护理站地址" prop="address">
<el-form-item label="护理站地址" prop="address">
<el-input
v-model="form.address"
placeholder="请输入护理站地址"
@ -325,7 +323,6 @@
oninput=" if(value.length>10){value=value.slice(0,20)}"
/>
</el-form-item>
<el-form-item label="联系电话" prop="phone">
<el-input
v-model="form.phone"
@ -356,10 +353,9 @@
maxlength="11"
/>
</el-form-item>
<el-form-item label="护理站总概述" prop="nurseStationDescription">
<el-input
style="width:540px"
style="width: 540px"
v-model="form.nurseStationDescription"
placeholder="请输入护理站信息总概述"
type="textarea"
@ -450,7 +446,6 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- //导入 -->
<el-dialog
:title="upload.title"
@ -502,7 +497,6 @@ import {
getSecondaryLevelInfo,
getInfoLists,
updatePicture,
} from "@/api/system/station";
import { getInfoList } from "@/api/system/nurseItem";
import stationAcatar from "../stationAvatar/index.vue";
@ -541,8 +535,8 @@ export default {
return {
imageUrl: "",
imageUrl2: "",
imgtwo:"",
imgone:"",
imgtwo: "",
imgone: "",
// 用户导入参数
upload: {
// 是否显示弹出层（用户导入）
@ -562,11 +556,6 @@ export default {
nurseTypeCode: "nurse_type_code",
nurseStationTypelist: [],
nurseStationType2: null,
//shengshiqu
value3: "",
value2: "",
value1: "",
value: "",
// 遮罩层
loading: true,
// 选中数组
@ -739,7 +728,6 @@ export default {
}
console.log(this.looknurseStationLabel);
},
//查看类型
looktype(item) {
// console.log(item);
@ -752,15 +740,15 @@ export default {
},
//点击街道
clickstreet(item) {
this.form.streetCode = item.areaCode;
this.form.areaCode = item.areaCode;
console.log(this.form);
console.log(item, this.form);
},
//点击区县城
clickarea(item) {
this.form.areaCode = "";
console.log(item);
this.form.streetName = "";
getSecondaryLevelInfo(item.id).then((res) => {
console.log(res);
this.streetlist = res.data;
});
},
@ -768,9 +756,8 @@ export default {
clickcity(item) {
this.form.regionName = "";
this.form.areaCode = "";
console.log(item);
this.form.streetName = "";
getSecondaryLevelInfo(item.id).then((res) => {
console.log(res);
this.arealist = res.data;
});
},
@ -779,6 +766,7 @@ export default {
this.form.cityName = "";
this.form.regionName = "";
this.form.areaCode = "";
this.form.streetName = "";
getSecondaryLevelInfo(item.id).then((res) => {
this.citylist = res.data;
});
@ -796,25 +784,18 @@ export default {
},
// 取消按钮
cancel() {
console.log(this.form);
var obj = { pictureUrlList: [] };
if(this.imgone!=this.form.stationIntroducePcitureUrl ){
if (this.imgone != this.form.stationIntroducePcitureUrl) {
obj.pictureUrlList.push(this.form.stationIntroducePcitureUrl);
}
if(this.imgtwo!=this.form.stationPictureUrl ){
if (this.imgtwo != this.form.stationPictureUrl) {
obj.pictureUrlList.push(this.form.stationPictureUrl);
}
if (obj.pictureUrlList.length > 0) {
updatePicture(obj).then((res) => {
console.log(res);
});
updatePicture(obj).then((res) => {});
}
this.open = false;
this.reset();
this.value3 = "";
this.value2 = "";
this.value1 = "";
this.value = "";
},
// 表单重置
reset() {
@ -895,10 +876,6 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.value3 = "";
this.value2 = "";
this.value1 = "";
this.value = "";
this.open = true;
this.looknurseStationLabel = [
{
@ -911,20 +888,18 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
console.log(row, "看一当前行数据");
this.reset();
this.loading = true;
const id = row.id || this.ids;
getStation(id).then((response) => {
console.log(response);
this.form = response.data;
this.form.streetCode = this.form.streetName;
this.imgone = this.form.stationIntroducePcitureUrl;
this.imgtwo = this.form.stationPictureUrl;
this.looknurseStationLabel = response.data.nurseStationLabel;
console.log(this.list);
this.open = true;
this.loading = false;
console.log(this.form);
console.log(this.form)
});
},
/** 提交按钮 */

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

@ -762,7 +762,6 @@ export default {
pageNum: 1,
pageSize: 10,
},
// 查询参数
queryParams: {
pageNum: 1,