xinyilu/NurseStationUI
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:
纪寒 2023-03-07 16:12:58 +08:00
commit e672e0fee2
3 changed files with 243 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/views/system/goodsInfo/goodsInfojs.js
View File

@ -59,10 +59,10 @@ export default {
value: "BUSINESS", value: "BUSINESS",
label: "买卖", label: "买卖",
}, },
{ // {
value: "LEASE", // value: "LEASE",
label: "租赁", // label: "租赁",
}, // },
], ],
options: [{ options: [{
value: 0, value: 0,
@ -73,6 +73,17 @@ export default {
label: "是", label: "是",
}, },
], ],
integraloption: [
{
value: 0,
label: "否",
},
{
value: 1,
label: "是",
},
],
value:"",
// goodAttributeDetailsLists:[], // goodAttributeDetailsLists:[],
goodDetailsLists: [], goodDetailsLists: [],
ids: [], ids: [],
@ -162,6 +173,12 @@ export default {
this.infos(); this.infos();
}, },
methods: { methods: {
changeExchangeFlag(item) {
if (item.integralExchangeFlag == 0) {
item.integralExchangeCount = ''
item.integralExchangeSill = ''
}
},
imgs(item) { imgs(item) {
this.imgsurl.pictureUrlList.push(item); this.imgsurl.pictureUrlList.push(item);
}, },
@ -217,6 +234,9 @@ export default {
goodsPrice: "", goodsPrice: "",
goodsStock: "", goodsStock: "",
sort: null, sort: null,
integralExchangeCount:null,
integralExchangeFlag:null,
integralExchangeSill:null,
idd: this.idd, idd: this.idd,
}; };
this.goodDetailsLists.push(obj); this.goodDetailsLists.push(obj);
@ -317,6 +337,9 @@ export default {
attributePitureUrl: "", attributePitureUrl: "",
goodsPrice: "", goodsPrice: "",
goodsStock: "", goodsStock: "",
integralExchangeCount:null,
integralExchangeFlag:null,
integralExchangeSill:null,
sort: null, sort: null,
idd: 9999999, idd: 9999999,
}, ]; }, ];
@ -360,6 +383,9 @@ export default {
attributePitureUrl: "", attributePitureUrl: "",
goodsPrice: "", goodsPrice: "",
goodsStock: "", goodsStock: "",
integralExchangeCount:null,
integralExchangeFlag:null,
integralExchangeSill:null,
sort: null, sort: null,
idd: 9999999, idd: 9999999,
}, ]; }, ];
@ -387,6 +413,16 @@ export default {
console.log(this.goodDetailsLists); console.log(this.goodDetailsLists);
this.form.goodAttributeDetailsLists = []; this.form.goodAttributeDetailsLists = [];
this.form.goodDetailsLists = this.goodDetailsLists; this.form.goodDetailsLists = this.goodDetailsLists;
if (!this.form.goodDetailsLists.integralExchangeFlag) {
this.form.goodDetailsLists.integralExchangeFlag = null
}
if (this.form.goodDetailsLists.integralExchangeSill=="") {
this.form.goodDetailsLists.integralExchangeSill = null
}
if (this.form.goodDetailsLists.integralExchangeCount == "") {
this.form.goodDetailsLists.integralExchangeCount = null
}
console.log(this.form); console.log(this.form);
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {

41
src/views/system/goodsInfo/index.vue
View File

@ -260,7 +260,46 @@
></el-input> ></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="商品属性图片" align="center" width="300"> <el-table-column label="积分兑换标识" align="center">
<template slot-scope="scope">
<el-select
v-model.number="scope.row.integralExchangeFlag"
placeholder="请选择积分兑换标识"
clearable
@change="changeExchangeFlag(scope.row)"
>
<el-option
v-for="item in integraloption"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="使用积分数量" align="center">
<template slot-scope="scope">
<el-input
:disabled="!scope.row.integralExchangeFlag?true:false"
v-model.number="scope.row.integralExchangeSill"
oninput="value=value.replace(/[^\d]/g,'')"
placeholder="使用积分数量"
maxLength="10"
></el-input>
</template>
</el-table-column>
<el-table-column label="积分兑换商品数量" align="center">
<template slot-scope="scope">
<el-input
:disabled="!scope.row.integralExchangeFlag?true:false"
v-model.number="scope.row.integralExchangeCount"
oninput="value=value.replace(/[^\d]/g,'')"
placeholder="积分兑换商品数量"
maxLength="10"
></el-input>
</template>
</el-table-column>
<el-table-column label="商品属性图片" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<stationAcatar <stationAcatar
@imgUrl="attributePitureUrl" @imgUrl="attributePitureUrl"

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

@ -9,18 +9,13 @@
label-width="90px" label-width="90px"
> >
<el-form-item label="所属护理站" prop="nurseStationName"> <el-form-item label="所属护理站" prop="nurseStationName">
<el-select <el-select v-model="queryParams.nurseStationId" placeholder="请选择护理站" @change="handleQuery">
v-model="queryParams.nurseStationId"
placeholder="请选择护理站"
@change="handleQuery"
>
<el-option <el-option
v-for="item in handstationlist" v-for="item in handstationlist"
:key="item.id" :key="item.id"
:label="item.nurseStationName" :label="item.nurseStationName"
:value="item.id" :value="item.id"
> ></el-option>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="订单编号" prop="orderNo"> <el-form-item label="订单编号" prop="orderNo">
@ -32,17 +27,13 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="订单状态" prop="orderStatus"> <el-form-item label="订单状态" prop="orderStatus">
<el-select <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态">
v-model="queryParams.orderStatus"
placeholder="请选择订单状态"
>
<el-option <el-option
v-for="item in orderStatuslist" v-for="item in orderStatuslist"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
> ></el-option>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="联系电话" prop="phone"> <el-form-item label="联系电话" prop="phone">
@ -54,96 +45,42 @@
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
type="primary" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table v-loading="loading" :data="goodsOrderList" @selection-change="handleSelectionChange">
v-loading="loading"
:data="goodsOrderList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column label="所属护理站" align="center" prop="nurseStationName" />
label="所属护理站" <el-table-column label="订单编号" align="center" prop="orderNo" width="190" />
align="center"
prop="nurseStationName"
/>
<el-table-column
label="订单编号"
align="center"
prop="orderNo"
width="190"
/>
<el-table-column label="商品名称" align="center" prop="goodsName" /> <el-table-column label="商品名称" align="center" prop="goodsName" />
<el-table-column label="订单总金额" align="center" prop="totalPrice" /> <el-table-column label="订单总金额" align="center" prop="totalPrice" />
<el-table-column label="订单状态" align="center" prop="orderStatus"> <el-table-column label="订单状态" align="center" prop="orderStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- {{ orderStatus(scope.row.orderStatus) }} --> <!-- {{ orderStatus(scope.row.orderStatus) }} -->
<el-button v-if="scope.row.orderStatus == 'WAIT_PAY'" <el-button v-if="scope.row.orderStatus == 'WAIT_PAY'">待付款</el-button>
>待付款</el-button <el-button type="primary" v-if="scope.row.orderStatus == 'PAY'">待发货</el-button>
> <el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'">已取消</el-button>
<el-button type="primary" v-if="scope.row.orderStatus == 'PAY'" <el-button type="primary" v-if="scope.row.orderStatus == 'WAIT_RECEIVED_GOODS'">待收货</el-button>
>待发货</el-button <el-button type="primary" v-if="scope.row.orderStatus == 'RECEIVED_GOODS'">待评价</el-button>
> <el-button type="success" v-if="scope.row.orderStatus == 'EVALUATED'">交易完成</el-button>
<el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'" <el-button type="warning" v-if="scope.row.orderStatus == 'WAIT_REFUND'">退款中</el-button>
>已取消</el-button <el-button type="warning" v-if="scope.row.orderStatus == 'WAIT_RETURNED_GOODS'">待退货</el-button>
> <el-button type="danger" v-if="scope.row.orderStatus == 'REFUNDED'">已退款</el-button>
<el-button <el-button type="danger" v-if="scope.row.orderStatus == 'RETURNED_GOODS'">已退货</el-button>
type="primary"
v-if="scope.row.orderStatus == 'WAIT_RECEIVED_GOODS'"
>待收货</el-button
>
<el-button
type="primary"
v-if="scope.row.orderStatus == 'RECEIVED_GOODS'"
>待评价</el-button
>
<el-button type="success" v-if="scope.row.orderStatus == 'EVALUATED'"
>交易完成</el-button
>
<el-button
type="warning"
v-if="scope.row.orderStatus == 'WAIT_REFUND'"
>退款中</el-button
>
<el-button
type="warning"
v-if="scope.row.orderStatus == 'WAIT_RETURNED_GOODS'"
>待退货</el-button
>
<el-button type="danger" v-if="scope.row.orderStatus == 'REFUNDED'"
>退款成功</el-button
>
<el-button
type="danger"
v-if="scope.row.orderStatus == 'RETURNED_GOODS'"
>已退货</el-button
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="订单类型" align="center" prop="orderType">
label="联系电话" <template slot-scope="scope">
align="center" {{ scope.row.orderType == "INTEGRAL_EXCHANGE" ? "积分兑换" : "" }}
prop="phone" {{ scope.row.orderType == "DIRECT_BUY" ? "直接购买" : "" }}
width="180" {{ scope.row.orderType == "HEALTH_CONSULTATION" ? "健康咨询" : "" }}
/> </template>
<el-table-column </el-table-column>
label="下单时间" <el-table-column label="联系电话" align="center" prop="phone" width="180" />
align="center" <el-table-column label="下单时间" align="center" prop="orderTime" width="180" />
prop="orderTime"
width="180"
/>
<el-table-column label="下单方式" align="center" prop="orderChannel"> <el-table-column label="下单方式" align="center" prop="orderChannel">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.orderChannel == "MOBILE_APP" ? "手机APP" : "" }} {{ scope.row.orderChannel == "MOBILE_APP" ? "手机APP" : "" }}
@ -164,8 +101,7 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="seelogistics(scope.row)" @click="seelogistics(scope.row)"
v-hasPermi="['system:goodsOrder:editExpressNo']" v-hasPermi="['system:goodsOrder:editExpressNo']"
>修改物流单号</el-button >修改物流单号</el-button>
>
<el-button <el-button
v-if=" v-if="
scope.row.orderStatus == 'WAIT_RECEIVED_GOODS' && scope.row.orderStatus == 'WAIT_RECEIVED_GOODS' &&
@ -176,8 +112,7 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="seelogistics(scope.row)" @click="seelogistics(scope.row)"
v-hasPermi="['system:goodsOrder:editExpressNo']" v-hasPermi="['system:goodsOrder:editExpressNo']"
>录入物流单号</el-button >录入物流单号</el-button>
>
<el-button <el-button
v-if=" v-if="
scope.row.orderStatus == 'WAIT_RECEIVED_GOODS' && scope.row.orderStatus == 'WAIT_RECEIVED_GOODS' &&
@ -188,15 +123,10 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="seelogistics(scope.row)" @click="seelogistics(scope.row)"
v-hasPermi="['system:goodsOrder:editExpressNo']" v-hasPermi="['system:goodsOrder:editExpressNo']"
>录入物流单号</el-button >录入物流单号</el-button>
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -204,8 +134,7 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="seeOrder(scope.row)" @click="seeOrder(scope.row)"
v-hasPermi="['system:goodsOrder:goodsOrderByOrder']" v-hasPermi="['system:goodsOrder:goodsOrderByOrder']"
>订单详情</el-button >订单详情</el-button>
>
<el-button <el-button
v-if="scope.row.orderStatus == 'WAIT_REFUND'" v-if="scope.row.orderStatus == 'WAIT_REFUND'"
@ -214,8 +143,7 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="refund(scope.row.id)" @click="refund(scope.row.id)"
v-hasPermi="['system:goodsOrder:goodsOrderRefund']" v-hasPermi="['system:goodsOrder:goodsOrderRefund']"
>确认退款</el-button >确认退款</el-button>
>
<!-- <el-button <!-- <el-button
v-else v-else
size="mini" size="mini"
@ -224,7 +152,7 @@
disabled disabled
v-hasPermi="['system:goodsOrder:goodsOrderRefund']" v-hasPermi="['system:goodsOrder:goodsOrderRefund']"
>确认退款</el-button >确认退款</el-button
> --> >-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -236,25 +164,10 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 查看商品信息弹框 --> <!-- 查看商品信息弹框 -->
<el-dialog <el-dialog title="订单详情" :visible.sync="innerorder" append-to-body width="1200px">
title="订单详情" <el-form :inline="true" ref="orderList" :model="orderList" :rules="rules" label-width="120px">
:visible.sync="innerorder"
append-to-body
width="1200px"
>
<el-form
:inline="true"
ref="orderList"
:model="orderList"
:rules="rules"
label-width="120px"
>
<el-form-item label="订单编号" prop="orderNo"> <el-form-item label="订单编号" prop="orderNo">
<el-input <el-input v-model="orderList.orderNo" :disabled="true" style="width: 240px" />
v-model="orderList.orderNo"
:disabled="true"
style="width: 240px"
/>
</el-form-item> </el-form-item>
<el-form-item label="商品名称" prop="goodsName"> <el-form-item label="商品名称" prop="goodsName">
<el-input <el-input
@ -265,14 +178,49 @@
style="width: 240px" style="width: 240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="订单金额" prop="totalPrice"> <el-form-item label="订单类型" prop="orderType">
<el-input <el-select
v-model="orderList.totalPrice" v-model="orderList.orderType"
clearable placeholder="请选择订单类型"
@keyup.enter.native="handleQuery" disabled
:disabled="true"
style="width: 240px" style="width: 240px"
/> >
<el-option
v-for="item in orderTypelist"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label="兑换商品数量"
prop="integralExchangeCount"
v-if="orderList.orderType == 'INTEGRAL_EXCHANGE'"
>
<el-input v-model="orderList.integralExchangeCount" disabled style="width: 240px" />
</el-form-item>
<el-form-item
label="兑换积分数"
prop="integralExchangeSill"
v-if="orderList.orderType == 'INTEGRAL_EXCHANGE'"
>
<el-input v-model="orderList.integralExchangeSill" disabled style="width: 240px" />
</el-form-item>
<el-form-item label="商品数量" prop="goodsCount" v-if="orderList.orderType == 'DIRECT_BUY'">
<el-input v-model="orderList.goodsCount" disabled style="width: 240px" />
</el-form-item>
<el-form-item label="订单原始总金额" prop="originalTotalPrice">
<el-input v-model="orderList.originalTotalPrice" disabled style="width: 240px" />
</el-form-item>
<el-form-item label="优惠券名称" prop="couponTitle">
<el-input v-model="orderList.couponTitle" disabled style="width: 240px" />
</el-form-item>
<el-form-item label="优惠金额" prop="discountPrice">
<el-input v-model="orderList.discountPrice" disabled style="width: 240px" />
</el-form-item>
<el-form-item label="订单应付总金额" prop="totalPrice">
<el-input v-model="orderList.totalPrice" disabled style="width: 240px" />
</el-form-item> </el-form-item>
<el-form-item label="收货人" prop="receiveAddress"> <el-form-item label="收货人" prop="receiveAddress">
<el-input <el-input
@ -318,11 +266,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="购买来源" prop="orderChannel"> <el-form-item label="购买来源" prop="orderChannel">
<el-input <el-input :value="buySourceinfo(orderList.buySource)" disabled style="width: 240px" />
:value="buySourceinfo(orderList.buySource)"
disabled
style="width: 240px"
/>
</el-form-item> </el-form-item>
<el-form-item label="综合评分" v-if="orderList.compositeScore"> <el-form-item label="综合评分" v-if="orderList.compositeScore">
<div style="width: 240px"> <div style="width: 240px">
@ -334,15 +278,8 @@
show-score show-score
text-color="#ff9900" text-color="#ff9900"
score-template="{value}" score-template="{value}"
> ></el-rate>
</el-rate> <el-input v-else type="text" disabled style="width: 240px" placeholder="未评分"></el-input>
<el-input
v-else
type="text"
disabled
style="width: 240px"
placeholder="未评分"
></el-input>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="评价内容" v-if="orderList.evaluateContent"> <el-form-item label="评价内容" v-if="orderList.evaluateContent">
@ -365,7 +302,7 @@
style="width: 23%; height: 100%; margin: 1%" style="width: 23%; height: 100%; margin: 1%"
v-for="(item, index) in ratelist" v-for="(item, index) in ratelist"
:src="baseurl + item.evaluatePictureUrl" :src="baseurl + item.evaluatePictureUrl"
alt="" alt
:key="index" :key="index"
/> />
</div> </div>
@ -373,12 +310,7 @@
</el-form> </el-form>
</el-dialog> </el-dialog>
<!-- 查看物流信息弹框 --> <!-- 查看物流信息弹框 -->
<el-dialog <el-dialog title="录入物流单号" :visible.sync="innerlogistics" append-to-body width="500px">
title="录入物流单号"
:visible.sync="innerlogistics"
append-to-body
width="500px"
>
<el-form <el-form
:model="queryexpressNo" :model="queryexpressNo"
ref="queryForm" ref="queryForm"
@ -391,7 +323,7 @@
<el-input <el-input
style="width: 230px" style="width: 230px"
v-model="queryexpressNo.receiver" v-model="queryexpressNo.receiver"
placeholder="" placeholder
clearable clearable
disabled disabled
/> />
@ -400,7 +332,7 @@
<el-input <el-input
style="width: 230px" style="width: 230px"
v-model="queryexpressNo.phone" v-model="queryexpressNo.phone"
placeholder="" placeholder
clearable clearable
disabled disabled
/> />
@ -411,7 +343,7 @@
style="width: 230px" style="width: 230px"
type="textarea" type="textarea"
:rows="5" :rows="5"
placeholder="" placeholder
disabled disabled
clearable clearable
/> />
@ -431,12 +363,7 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 退款弹框 --> <!-- 退款弹框 -->
<el-dialog <el-dialog title="退款信息" :visible.sync="innerrefund" append-to-body width="700px">
title="退款信息"
:visible.sync="innerrefund"
append-to-body
width="700px"
>
<el-form <el-form
:model="refundlist" :model="refundlist"
ref="queryForm" ref="queryForm"
@ -446,48 +373,46 @@
label-width="110px" label-width="110px"
> >
<el-form-item label="商品名称" prop="goodsName"> <el-form-item label="商品名称" prop="goodsName">
<el-input <el-input v-model="refundlist.goodsName" placeholder clearable disabled />
v-model="refundlist.goodsName"
placeholder=""
clearable
disabled
/>
</el-form-item> </el-form-item>
<el-form-item label="退款类型" prop="refundType"> <el-form-item label="退款类型" prop="refundType">
<el-input <el-input :value="refundTypeStatus(refundlist.refundType)" disabled style="width: 205px" />
:value="refundTypeStatus(refundlist.refundType)" </el-form-item>
disabled <el-form-item label="订单类型" prop="orderType">
style="width: 205px" <el-select v-model="refundlist.orderType" placeholder="请选择订单类型" disabled>
/> <el-option
v-for="item in orderTypelist"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="退款原因" prop="dictLabel"> <el-form-item label="退款原因" prop="dictLabel">
<el-input <el-input v-model="refundlist.dictLabel" placeholder clearable disabled />
v-model="refundlist.dictLabel"
placeholder=""
clearable
disabled
/>
</el-form-item> </el-form-item>
<el-form-item label="退款金额" prop="godTotalPrice"> <el-form-item label="退款金额" prop="godTotalPrice">
<el-input <el-input v-model="refundlist.godTotalPrice" placeholder clearable disabled />
v-model="refundlist.godTotalPrice" </el-form-item>
placeholder="" <el-form-item
clearable label="退款积分"
disabled prop="godTotalPrice"
/> v-if="refundlist.orderType =='INTEGRAL_EXCHANGE'"
>
<el-input v-model="refundlist.integralExchangeSill" placeholder clearable disabled />
</el-form-item> </el-form-item>
<el-form-item label="补充描述和凭证" prop="refundReasonRemark"> <el-form-item label="补充描述和凭证" prop="refundReasonRemark">
<el-input <el-input
style="width: 300px" style="width: 300px"
v-model="refundlist.refundReasonRemark" v-model="refundlist.refundReasonRemark"
placeholder="" placeholder
clearable clearable
type="textarea" type="textarea"
:rows="5" :rows="5"
disabled disabled
/> />
</el-form-item> </el-form-item>
<el-form-item> </el-form-item> <el-form-item></el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="refundcancel">取 消</el-button> <el-button @click="refundcancel">取 消</el-button>
@ -545,7 +470,7 @@
> >
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-dialog> --> </el-dialog>-->
</div> </div>
</template> </template>
@ -561,7 +486,7 @@ import {
editExpressNo, editExpressNo,
goodsOrderrefund, goodsOrderrefund,
weChatRefundOrderApply, weChatRefundOrderApply,
selectOrderEvaluate, 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";
@ -584,44 +509,58 @@ export default {
orderStatuslist: [ orderStatuslist: [
{ {
value: "WAIT_PAY", value: "WAIT_PAY",
label: "待付款", label: "待付款"
}, },
{ {
value: "PAY", value: "PAY",
label: "待发货", label: "待发货"
}, },
{ {
value: "WAIT_RECEIVED_GOODS", value: "WAIT_RECEIVED_GOODS",
label: "待收货", label: "待收货"
}, },
{ {
value: "RECEIVED_GOODS", value: "RECEIVED_GOODS",
label: "待评价", label: "待评价"
}, },
{ {
value: "EVALUATED", value: "EVALUATED",
label: "交易完成", label: "交易完成"
}, },
{ {
value: "CANCEL", value: "CANCEL",
label: "已取消", label: "已取消"
}, },
{ {
value: "WAIT_RETURNED_GOODS", value: "WAIT_RETURNED_GOODS",
label: "待退货", label: "待退货"
}, },
{ {
value: "RETURNED_GOODS", value: "RETURNED_GOODS",
label: "已退货", label: "已退货"
}, },
{ {
value: "WAIT_REFUND", value: "WAIT_REFUND",
label: "退款中", label: "退款中"
}, },
{ {
value: "REFUNDED", value: "REFUNDED",
label: "退款成功", label: "退款成功"
}
],
orderTypelist: [
{
value: "INTEGRAL_EXCHANGE",
label: "积分兑换"
}, },
{
value: "DIRECT_BUY",
label: "直接购买"
},
{
value: "HEALTH_CONSULTATION",
label: "健康咨询"
}
], ],
// 遮罩层 // 遮罩层
loading: true, loading: true,
@ -655,24 +594,24 @@ export default {
receiveAddress: null, receiveAddress: null,
phone: null, phone: null,
orderTime: null, orderTime: null,
orderChannel: null, orderChannel: null
}, },
queryexpressNo: { queryexpressNo: {
id: "", id: "",
expressNo: null, expressNo: null
}, },
//权限查询 //权限查询
getListByUserquery: { getListByUserquery: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10
}, },
refundinfo: { refundinfo: {
id: "", id: ""
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: {}, rules: {}
}; };
}, },
created() { created() {
@ -747,7 +686,7 @@ export default {
/** 查询商品订单列表 */ /** 查询商品订单列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listGoodsOrder(this.queryParams).then((response) => { listGoodsOrder(this.queryParams).then(response => {
this.goodsOrderList = response.rows; this.goodsOrderList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -756,7 +695,7 @@ export default {
// 查看商品信息 // 查看商品信息
seeOrder(row) { seeOrder(row) {
const id = row.orderNo; const id = row.orderNo;
getGoodsOrderlist(id).then((res) => { getGoodsOrderlist(id).then(res => {
this.orderList = res.data; this.orderList = res.data;
this.innerorder = true; this.innerorder = true;
this.ratelist = {}; this.ratelist = {};
@ -776,7 +715,7 @@ export default {
// 确定按钮 // 确定按钮
searchlogistics() { searchlogistics() {
console.log(this.queryexpressNo); console.log(this.queryexpressNo);
editExpressNo(this.queryexpressNo).then((res) => { editExpressNo(this.queryexpressNo).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.$modal.msgSuccess("录入成功"); this.$modal.msgSuccess("录入成功");
} }
@ -793,7 +732,7 @@ export default {
// 确认退款 // 确认退款
refund(id) { refund(id) {
console.log(id); console.log(id);
goodsOrderRefundinfo(id).then((res) => { goodsOrderRefundinfo(id).then(res => {
this.refundlist = res.data; this.refundlist = res.data;
console.log(this.refundlist); console.log(this.refundlist);
this.innerrefund = true; this.innerrefund = true;
@ -803,12 +742,13 @@ export default {
//确认退款 确定按钮 //确认退款 确定按钮
submitRefundOrder() { submitRefundOrder() {
var obj = {}; var obj = {};
obj.orderType = this.refundlist.orderType;
obj.orderNo = this.refundlist.goOrderNo; obj.orderNo = this.refundlist.goOrderNo;
obj.refundReason = this.refundlist.dictLabel; obj.refundReason = this.refundlist.dictLabel;
obj.refundPrice = this.refundlist.godTotalPrice; obj.refundPrice = this.refundlist.godTotalPrice;
obj.remark = this.refundlist.refundReasonRemark; obj.remark = this.refundlist.refundReasonRemark;
obj.goodsStatus = this.refundlist.orderStatus; obj.goodsStatus = this.refundlist.orderStatus;
weChatRefundOrderApply(obj).then((res) => { weChatRefundOrderApply(obj).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.$modal.msgSuccess("退款有延迟，请耐心等待"); this.$modal.msgSuccess("退款有延迟，请耐心等待");
} }
@ -863,7 +803,7 @@ export default {
receiveAddress: null, receiveAddress: null,
phone: null, phone: null,
orderTime: null, orderTime: null,
orderChannel: null, orderChannel: null
}; };
this.form = { this.form = {
pageNum: 1, pageNum: 1,
@ -884,7 +824,7 @@ export default {
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
orderStatus: "", orderStatus: ""
}; };
this.resetForm("queryParams"); this.resetForm("queryParams");
}, },
@ -916,7 +856,7 @@ export default {
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map((item) => item.id); this.ids = selection.map(item => item.id);
this.single = selection.length !== 1; this.single = selection.length !== 1;
this.multiple = !selection.length; this.multiple = !selection.length;
}, },
@ -930,7 +870,7 @@ export default {
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids; const id = row.id || this.ids;
getGoodsOrder(id).then((response) => { getGoodsOrder(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改商品订单"; this.title = "修改商品订单";
@ -938,16 +878,16 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate((valid) => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
updateGoodsOrder(this.form).then((response) => { updateGoodsOrder(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addGoodsOrder(this.form).then((response) => { addGoodsOrder(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
@ -961,7 +901,7 @@ export default {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal this.$modal
.confirm('是否确认删除商品订单编号为"' + ids + '"的数据项？') .confirm('是否确认删除商品订单编号为"' + ids + '"的数据项？')
.then(function () { .then(function() {
return delGoodsOrder(ids); return delGoodsOrder(ids);
}) })
.then(() => { .then(() => {
@ -975,14 +915,14 @@ export default {
this.download( this.download(
"system/goodsOrder/export", "system/goodsOrder/export",
{ {
...this.getListByUserquery, ...this.getListByUserquery
}, },
`goodsOrder_${new Date().getTime()}.xlsx` `goodsOrder_${new Date().getTime()}.xlsx`
); );
}, },
//权限列表 //权限列表
info() { info() {
getListByUser(this.getListByUserquery).then((res) => { getListByUser(this.getListByUserquery).then(res => {
this.total2 = res.total; this.total2 = res.total;
this.nurseStationlist = res.rows; this.nurseStationlist = res.rows;
this.queryParams.nurseStationId = res.rows[0].id; this.queryParams.nurseStationId = res.rows[0].id;
@ -993,13 +933,13 @@ export default {
infos() { infos() {
var queryFor = { var queryFor = {
pageNum: 1, pageNum: 1,
pageSize: 9999, pageSize: 9999
}; };
getListByUser(queryFor).then((res) => { getListByUser(queryFor).then(res => {
console.log(res); console.log(res);
this.handstationlist = res.rows; this.handstationlist = res.rows;
}); });
}, }
}, }
}; };
</script> </script>