diff --git a/src/views/repair/orderinfo/index.vue b/src/views/repair/orderinfo/index.vue
index 3acde1b..0b02bef 100644
--- a/src/views/repair/orderinfo/index.vue
+++ b/src/views/repair/orderinfo/index.vue
@@ -8,14 +8,23 @@
+
+
+
-
-
+
+
-
-
+
+
+
@@ -47,48 +56,30 @@
{{ parseTime(scope.row.orderTime) }}
-
-
{{ parseTime(scope.row.payTime) }}
-
-
-
-
-
-
-
-
+
- {{ parseTime(scope.row.commentTime) }}
+
-
-
+
- {{ parseTime(scope.row.validationTime) }}
+ 待支付
+ 已支付
-
-
-
-
-
+
- {{ parseTime(scope.row.createTime) }}
-
-
-
-
- 支付
- 修改
-
+
+
+
删除
@@ -125,6 +116,13 @@ export default {
title: '',
visible: false,
},
+ options:[{
+ value:'0',
+ label:'待支付'
+ },{
+ value:'1',
+ label:'已支付'
+ }],
// 遮罩层
loading: true,
// 导出遮罩层
@@ -148,35 +146,9 @@ export default {
orderNo: null,
goodsTitle: null,
goodsType: null,
- userId: null,
- cusId: null,
cusName: null,
- cusPhone: null,
- goodsPrice: null,
- payMoney: null,
- orderTime: [],
- reduceMoney: null,
- balance: null,
- payTime: [],
payType: null,
- payRemark: null,
- isOnline: null,
- receivablesAccount: null,
- orderStatus: null,
- commentDesc: null,
- commentStar: null,
- commentTime: [],
- accessCode: null,
- validationTime: [],
- validationRealName: null,
- validationUserId: null,
- isCoupon: null,
- couponId: null,
- couponCode: null,
- couponDiscount: null,
- deptId: null,
- createTime: [],
- goodsId: null,
+ orderStatus:null
},
};
},
@@ -205,16 +177,28 @@ export default {
this.resetForm("queryForm");
this.handleQuery();
},
- async toPay(orderId){
- let data = {
- orderId:orderId
- }
- const res = await OrderInfoApi.toPay(data);
- console.log(res,208)
- this.qrCode = {
- url: res.data.code_url,
- visible: true
+ async toPay(row){
+ if (row.payType == '01'){
+ const orderId = row.id
+ let data = {
+ orderId:orderId
+ }
+ const res = await OrderInfoApi.toPay(data);
+ console.log(res,208)
+ this.qrCode = {
+ url: res.data.code_url,
+ visible: true
+ }
+ } else{
+ await this.$modal.confirm('本订单为线下支付订单或挂账订单，点击确定前请确认客户是否已支付')
+ let data = {
+ orderNo:row.orderNo,
+ }
+ await OrderInfoApi.updateOrderInfo(data);
+ this.$modal.msgSuccess("支付成功");
+ this.getList()
}
+
},
/** 添加/修改操作 */
openForm(id) {
@@ -223,7 +207,7 @@ export default {
/** 删除按钮操作 */
async handleDelete(row) {
const id = row.id;
- await this.$modal.confirm('是否确认删除维修模块 订单编号为"' + id + '"的数据项?')
+ await this.$modal.confirm('是否确认删除维修模块 订单编号为"' + row.orderNo + '"的数据项?')
try {
await OrderInfoApi.deleteOrderInfo(id);
await this.getList();
diff --git a/src/views/repair/project/index.vue b/src/views/repair/project/index.vue
index d3dc655..8c7332a 100644
--- a/src/views/repair/project/index.vue
+++ b/src/views/repair/project/index.vue
@@ -6,12 +6,6 @@
-
-
-
-
-
-
搜索
重置