dianliang/lanan-system-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:1d54429c82cad2e22b19145fe63dfab6245db604
Branches Tags
dianliang:master
dianliang:driver
dianliang:insp
dianliang:repair
dianliang:dev
..
compare: dianliang:c9b026d3270f19f16817fdd74a7d50b323d009d9
Branches Tags
dianliang:driver
dianliang:insp
dianliang:master
dianliang:repair
dianliang:dev

No commits in common. "1d54429c82cad2e22b19145fe63dfab6245db604" and "c9b026d3270f19f16817fdd74a7d50b323d009d9" have entirely different histories.
1d54429c82 ... c9b026d327

1 changed files with 47 additions and 47 deletions
Show Stats Expand all files Collapse all files

94
src/views/repair/tickets/Components/UserInfo.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24" style="padding-right: 0"> <el-col :span="17" style="padding-right: 0">
<el-card class="top-left"> <el-card class="top-left">
<el-descriptions class="margin-top" :column="3" :size="'mini'" border> <el-descriptions class="margin-top" :column="3" :size="'mini'" border>
<template slot="extra"> <template slot="extra">
@ -111,52 +111,52 @@
</el-descriptions> </el-descriptions>
</el-card> </el-card>
</el-col> </el-col>
<!-- <el-col :span="7" style="padding-left: 0">--> <el-col :span="7" style="padding-left: 0">
<!-- <el-card style="margin-left: 0">--> <el-card style="margin-left: 0">
<!-- <div slot="header" class="clearfix">--> <div slot="header" class="clearfix">
<!-- <span style="font-weight: bold; font-size: 16px;"> 会员卡券</span>--> <span style="font-weight: bold; font-size: 16px;"> 会员卡券</span>
<!-- </div>--> </div>
<!-- <el-table--> <el-table
<!-- :data="couponList"--> :data="couponList"
<!-- border--> border
<!-- size="mini"--> size="mini"
<!-- height="270"--> height="270"
<!-- style="width: 100%">--> style="width: 100%">
<!-- <el-table-column prop="couponName" label="卡券名称"/>--> <el-table-column prop="couponName" label="卡券名称"/>
<!-- <el-table-column label="卡券类型" width="80" align="center" prop="couponType">--> <el-table-column label="卡券类型" width="80" align="center" prop="couponType">
<!-- <template v-slot="scope">--> <template v-slot="scope">
<!-- <dict-tag :type="DICT_TYPE.MEMBER_COUPON_TYPE" :value="scope.row.couponType"/>--> <dict-tag :type="DICT_TYPE.MEMBER_COUPON_TYPE" :value="scope.row.couponType"/>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<!-- <el-table-column label="剩余金额/次数" width="120" align="right" prop="balance">--> <el-table-column label="剩余金额/次数" width="120" align="right" prop="balance">
<!-- <template v-slot="scope">--> <template v-slot="scope">
<!-- {{ scope.row.balance }}{{ scope.row.outRule == 'mehx' ? '元' : '次' }}--> {{ scope.row.balance }}{{ scope.row.outRule == 'mehx' ? '元' : '次' }}
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<!-- <el-table-column label="适用车型" width="80" align="center" prop="carModel">--> <el-table-column label="适用车型" width="80" align="center" prop="carModel">
<!-- <template v-slot="scope">--> <template v-slot="scope">
<!-- <span v-if="scope.row.carModel == null">不限</span>--> <span v-if="scope.row.carModel == null">不限</span>
<!-- <dict-tag :type="DICT_TYPE.MEMBER_CAR" :value="scope.row.carModel"/>--> <dict-tag :type="DICT_TYPE.MEMBER_CAR" :value="scope.row.carModel"/>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<!-- <el-table-column label="核销规则" width="100" align="center" prop="outRule">--> <el-table-column label="核销规则" width="100" align="center" prop="outRule">
<!-- <template v-slot="scope">--> <template v-slot="scope">
<!-- <dict-tag :type="DICT_TYPE.MEMBER_COUPON_OUT_RULE" :value="scope.row.outRule"/>--> <dict-tag :type="DICT_TYPE.MEMBER_COUPON_OUT_RULE" :value="scope.row.outRule"/>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<!-- <el-table-column label="开始有效期" align="center" prop="beginTime" width="150">--> <el-table-column label="开始有效期" align="center" prop="beginTime" width="150">
<!-- <template v-slot="scope">--> <template v-slot="scope">
<!-- <span>{{ parseTime(scope.row.beginTime) }}</span>--> <span>{{ parseTime(scope.row.beginTime) }}</span>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<!-- <el-table-column label="结束有效期" align="center" prop="endTime" width="150">--> <el-table-column label="结束有效期" align="center" prop="endTime" width="150">
<!-- <template v-slot="scope">--> <template v-slot="scope">
<!-- <span>{{ parseTime(scope.row.endTime) }}</span>--> <span>{{ parseTime(scope.row.endTime) }}</span>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<!-- </el-table>--> </el-table>
<!-- </el-card>--> </el-card>
<!-- </el-col>--> </el-col>
</el-row> </el-row>
<el-row :gutter="5" style="margin-bottom: 1rem"> <el-row :gutter="5" style="margin-bottom: 1rem">
<el-col v-if="createTicketType" :span="4.8"> <el-col v-if="createTicketType" :span="4.8">