|
@@ -75,7 +75,7 @@
|
|
|
<el-table-column label="编号" align="center" prop="id" v-if="true" />
|
|
<el-table-column label="编号" align="center" prop="id" v-if="true" />
|
|
|
<el-table-column label="用户昵称" align="center" prop="userNickname" />
|
|
<el-table-column label="用户昵称" align="center" prop="userNickname" />
|
|
|
<el-table-column label="用户姓名" align="center" prop="userRealName" />
|
|
<el-table-column label="用户姓名" align="center" prop="userRealName" />
|
|
|
- <el-table-column label="用户身份证" align="center" prop="userIdCard" width="110"/>
|
|
|
|
|
|
|
+ <el-table-column label="用户身份证" align="center" prop="userIdCard" width="110" />
|
|
|
<el-table-column label="账号ID" align="center" prop="userId" />
|
|
<el-table-column label="账号ID" align="center" prop="userId" />
|
|
|
<el-table-column label="服务类型" align="center" prop="serviceName" />
|
|
<el-table-column label="服务类型" align="center" prop="serviceName" />
|
|
|
<el-table-column label="服务门店" align="center" prop="storeName" />
|
|
<el-table-column label="服务门店" align="center" prop="storeName" />
|
|
@@ -101,7 +101,7 @@
|
|
|
<span v-else>-</span>
|
|
<span v-else>-</span>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column label="过期时间" align="center" prop="expireTime" width="180">
|
|
|
|
|
|
|
+ <el-table-column label="截止核销时间" align="center" prop="expireTime" width="180">
|
|
|
<template #default="scope">
|
|
<template #default="scope">
|
|
|
<span>{{ parseTime(scope.row.expireTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
<span>{{ parseTime(scope.row.expireTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
|
</template>
|
|
</template>
|
|
@@ -182,7 +182,14 @@
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
|
<script setup name="ServiceOrder" lang="ts">
|
|
<script setup name="ServiceOrder" lang="ts">
|
|
|
-import { listServiceOrder, getServiceOrder, delServiceOrder, addServiceOrder, updateServiceOrder } from '@/api/system/physical/serviceOrder';
|
|
|
|
|
|
|
+import {
|
|
|
|
|
+ listServiceOrder,
|
|
|
|
|
+ getServiceOrder,
|
|
|
|
|
+ delServiceOrder,
|
|
|
|
|
+ addServiceOrder,
|
|
|
|
|
+ updateServiceOrder,
|
|
|
|
|
+ verifyOrder
|
|
|
|
|
+} from '@/api/system/physical/serviceOrder';
|
|
|
import { ServiceOrderVO, ServiceOrderQuery, ServiceOrderForm } from '@/api/system/physical/serviceOrder/types';
|
|
import { ServiceOrderVO, ServiceOrderQuery, ServiceOrderForm } from '@/api/system/physical/serviceOrder/types';
|
|
|
import { parseTime } from '@/utils/dateUtils';
|
|
import { parseTime } from '@/utils/dateUtils';
|
|
|
import { ElSelect } from 'element-plus';
|
|
import { ElSelect } from 'element-plus';
|
|
@@ -397,7 +404,7 @@ const handleVerify = async (row: ServiceOrderVO) => {
|
|
|
verifyTime: new Date().toISOString()
|
|
verifyTime: new Date().toISOString()
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- await updateServiceOrder(updateData);
|
|
|
|
|
|
|
+ await verifyOrder(updateData);
|
|
|
proxy?.$modal.msgSuccess('核销成功');
|
|
proxy?.$modal.msgSuccess('核销成功');
|
|
|
await getList();
|
|
await getList();
|
|
|
};
|
|
};
|