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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
闫晓茹 2022-11-14 16:45:45 +08:00
commit 4281fc4891
1 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,25 +242,7 @@
style="width: 240px" style="width: 240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="地址" prop="receiveAddress"> <el-form-item label="商品名称" prop="goodsName">
<el-input
v-model="orderList.receiveAddress"
clearable
@keyup.enter.native="handleQuery"
:disabled="true"
style="width: 240px"
/>
</el-form-item>
<el-form-item label="收货人" prop="receiveAddress">
<el-input
v-model="orderList.receiver"
clearable
@keyup.enter.native="handleQuery"
:disabled="true"
style="width: 240px"
/>
</el-form-item>
<el-form-item label="商品名称" prop="goodsName">
<el-input <el-input
v-model="orderList.goodsName" v-model="orderList.goodsName"
clearable clearable
@ -269,25 +251,25 @@
style="width: 240px" style="width: 240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="商品属性" prop="goodsAttributeName"> <el-form-item label="订单金额" prop="totalPrice">
<el-input <el-input
v-model="orderList.goodsAttributeName" v-model="orderList.totalPrice"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
:disabled="true" :disabled="true"
style="width: 240px" style="width: 240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="商品价格" prop="goodsPrice"> <el-form-item label="收货人" prop="receiveAddress">
<el-input <el-input
v-model="orderList.goodsPrice" v-model="orderList.receiver"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
:disabled="true" :disabled="true"
style="width: 240px" 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
v-model="orderList.receiveAddress" v-model="orderList.receiveAddress"
clearable clearable
@ -296,7 +278,7 @@
style="width: 240px" style="width: 240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="phone"> <el-form-item label="手机号" prop="phone">
<el-input <el-input
v-model="orderList.phone" v-model="orderList.phone"
clearable clearable
@ -305,6 +287,36 @@
style="width: 240px" style="width: 240px"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="商品属性" prop="goodsAttributeName">
<el-input
v-model="orderList.goodsAttributeName"
clearable
@keyup.enter.native="handleQuery"
:disabled="true"
style="width: 240px"
/>
</el-form-item> -->
<!-- <el-form-item label="商品价格" prop="goodsPrice">
<el-input
v-model="orderList.goodsPrice"
clearable
@keyup.enter.native="handleQuery"
:disabled="true"
style="width: 240px"
/>
</el-form-item> -->
<!-- <el-form-item label="地址" prop="receiveAddress">
<el-input
v-model="orderList.receiveAddress"
clearable
@keyup.enter.native="handleQuery"
:disabled="true"
style="width: 240px"
/>
</el-form-item> -->
<el-form-item label="订单状态" prop="orderStatus"> <el-form-item label="订单状态" prop="orderStatus">
<!-- <el-form-item label="退款类型" prop="refundType"> <!-- <el-form-item label="退款类型" prop="refundType">
<el-input <el-input
@ -722,10 +734,10 @@ export default {
return "待收货"; return "待收货";
case "RECEIVED_GOODS": case "RECEIVED_GOODS":
return "已收货"; return "已收货";
case "REFUNDED": case "WAIT_REFUND":
return "退款中"; return "退款中";
case "REFUNDED": case "REFUNDED":
return "已退款"; return "退款成功";
case "WAIT_RETURNED_GOODS": case "WAIT_RETURNED_GOODS":
return "待退货"; return "待退货";
case "RETURNED_GOODS": case "RETURNED_GOODS":