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 
# Conflicts:
#	src/views/system/goodsOrder/indexjs.js
#	src/views/system/order/indexjs.js
This commit is contained in:
曹辉 2022-11-21 09:41:48 +08:00
commit 5293c91ab3
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,6 +108,9 @@
<el-button type="danger" v-if="scope.row.orderStatus == 'REFUNDED'"
>退款成功</el-button
>
<el-button type="warning" v-if="scope.row.orderStatus == 'EVALUATED'"
>已评价</el-button
>
<el-button
type="danger"
v-if="scope.row.orderStatus == 'RETURNED_GOODS'"

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

@ -429,4 +429,4 @@ export default {
);
},
},
};
};

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

@ -105,6 +105,9 @@
<el-button type="warning" v-if="scope.row.orderStatus == 'REFUNDED'"
>退款成功</el-button
>
<el-button type="warning" v-if="scope.row.orderStatus == 'EVALUATED'"
>已评价</el-button
>
<el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'"
>已取消</el-button
>

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

@ -365,4 +365,4 @@ export default {
);
},
},
};
};