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

Compare commits

base: dianliang:57780afa847cfe66789ba9e6dccb082d70d9926e
Branches Tags
dianliang:master
dianliang:driver
dianliang:insp
dianliang:repair
dianliang:dev
..
compare: dianliang:7f941264f9e724753147a7951bc5145ab81d825f
Branches Tags
dianliang:driver
dianliang:insp
dianliang:master
dianliang:repair
dianliang:dev

No commits in common. "57780afa847cfe66789ba9e6dccb082d70d9926e" and "7f941264f9e724753147a7951bc5145ab81d825f" have entirely different histories.
57780afa84 ... 7f941264f9

3 changed files with 122 additions and 356 deletions
Show Stats Expand all files Collapse all files

7
src/views/repair/Components/StaffChoose.vue
View File

@ -13,11 +13,6 @@ export default {
props: { props: {
value: { value: {
type: Object, type: Object,
},
isGet:{
type: String,
default: '',
required: false
} }
}, },
data() { data() {
@ -46,7 +41,7 @@ export default {
methods: { methods: {
async listStaff() { async listStaff() {
try { try {
if (!this.isGet) return; if (this.hasRequest) return;
const res = await getStaffList() const res = await getStaffList()
this.staffList = res.data this.staffList = res.data
this.hasRequest = true this.hasRequest = true

32
src/views/repair/tickets/Components/TicketItem.vue
View File

@ -21,14 +21,6 @@
<span class="item__txt">{{ scope.row.name ? scope.row.name : scope.row.goods }}</span> <span class="item__txt">{{ scope.row.name ? scope.row.name : scope.row.goods }}</span>
</div> </div>
</el-table-column> </el-table-column>
<!-- <el-table-column align="center" label="使用权益" width="200" prop="coupon">-->
<!-- <div class="item" slot-scope="scope">-->
<!-- <el-select class="item__input" v-model="scope.row.coupon.id" clearable filterable @blur="save(scope.row)">-->
<!-- <el-option v-for="coupon in couponList" :key="coupon.id" :label="coupon.couponName" :value="coupon.id" />-->
<!-- </el-select>-->
<!-- <span class="item__txt">{{ get }}</span>-->
<!-- </div>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="规格" width="180" prop="model"/> <el-table-column align="center" label="规格" width="180" prop="model"/>
<el-table-column align="center" label="编码" width="180" prop="code"/> <el-table-column align="center" label="编码" width="180" prop="code"/>
<el-table-column align="center" label="数量" width="180" prop="count"> <el-table-column align="center" label="数量" width="180" prop="count">
@ -63,14 +55,14 @@
<el-table-column align="center" label="施工人员" width="180" prop="repair"> <el-table-column align="center" label="施工人员" width="180" prop="repair">
<div v-if="scope.row.id" class="item" slot-scope="scope"> <div v-if="scope.row.id" class="item" slot-scope="scope">
<StaffChoose @input-blur="save(scope.row)" class="item__input" v-model="scope.row.repair" <StaffChoose @input-blur="save(scope.row)" class="item__input" v-model="scope.row.repair"
:select-width="'15rem'" :is-get="scope.row.id"/> :select-width="'15rem'"/>
<span class="item__txt">{{ scope.row.repair ? scope.row.repair.name : scope.row.repair }}</span> <span class="item__txt">{{ scope.row.repair ? scope.row.repair.name : scope.row.repair }}</span>
</div> </div>
</el-table-column> </el-table-column>
<el-table-column align="center" label="销售人员" width="180" prop="sale"> <el-table-column align="center" label="销售人员" width="180" prop="sale">
<div v-if="scope.row.id" class="item" slot-scope="scope"> <div v-if="scope.row.id" class="item" slot-scope="scope">
<StaffChoose @input-blur="save(scope.row)" class="item__input" v-model="scope.row.sale" <StaffChoose @input-blur="save(scope.row)" class="item__input" v-model="scope.row.sale"
:select-width="'15rem'" :is-get="scope.row.id"/> :select-width="'15rem'"/>
<span class="item__txt">{{ scope.row.sale ? scope.row.sale.name : scope.row.sale }}</span> <span class="item__txt">{{ scope.row.sale ? scope.row.sale.name : scope.row.sale }}</span>
</div> </div>
</el-table-column> </el-table-column>
@ -145,23 +137,14 @@ export default {
type:Array, type:Array,
default: () => {return []}, default: () => {return []},
required: false required: false
},
couponList: {
type: Array,
default: () => {return []},
required: false
} }
}, },
data() { data() {
return { return {
loading: false, loading: false,
list: [{ list: [{}],
coupon:{
id: null
}
}],
// 需要编辑的属性 // 需要编辑的属性
editProp: ["goods", 'count', 'price', 'discount', 'repair', 'sale', 'remark', 'type', 'accountType', 'coupon'], editProp: ["goods", 'count', 'price', 'discount', 'repair', 'sale', 'remark', 'type', 'accountType'],
// 保存进入编辑的cell // 保存进入编辑的cell
clickCellMap: {}, clickCellMap: {},
selectRepair: {}, selectRepair: {},
@ -176,10 +159,6 @@ export default {
list: { list: {
handler(val) { handler(val) {
this.$emit("tableData", val) this.$emit("tableData", val)
const coupons = val.filter(item => item.coupon).map(item => item.coupon)
if (coupons && coupons.length > 0){
this.$emit("changeCoupon", coupons)
}
}, },
deep: true deep: true
}, },
@ -341,9 +320,6 @@ export default {
}, },
returnOther() { returnOther() {
},
getCouponName(id){
// this.
} }
} }
} }

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

@ -1,294 +1,118 @@
<template> <template>
<div> <div>
<!-- <el-descriptions class="margin-top" :column="3" :size="'mini'" border style="margin-bottom: 1rem">--> <el-descriptions class="margin-top" :column="4" :size="'medium'" border style="margin-bottom: 1rem">
<!-- &lt;!&ndash; <template slot="extra">&ndash;&gt;--> <!-- <template slot="extra">-->
<!-- &lt;!&ndash; <el-button v-if="createTicketType" type="success" size="small">新增客户信息</el-button>&ndash;&gt;--> <!-- <el-button v-if="createTicketType" type="success" size="small">新增客户信息</el-button>-->
<!-- &lt;!&ndash; <el-button v-if="createTicketType" type="primary" size="small" :disabled="!selectUser.id">完善更多客户信息</el-button>&ndash;&gt;--> <!-- <el-button v-if="createTicketType" type="primary" size="small" :disabled="!selectUser.id">完善更多客户信息</el-button>-->
<!-- &lt;!&ndash; <el-button type="primary" size="small">选择业务</el-button>&ndash;&gt;--> <!-- <el-button type="primary" size="small">选择业务</el-button>-->
<!-- &lt;!&ndash; </template>&ndash;&gt;--> <!-- </template>-->
<!-- <el-descriptions-item>--> <el-descriptions-item>
<!-- <template slot="label">--> <template slot="label">
<!-- 用户选择--> 用户选择
<!-- </template>--> </template>
<!-- <UserChoose v-model="selectUser"/>--> <UserChoose v-model="selectUser"/>
<!-- </el-descriptions-item>--> </el-descriptions-item>
<!-- <el-descriptions-item>--> <el-descriptions-item>
<!-- <template slot="label">--> <template slot="label">
<!-- 车辆选择--> 车辆选择
<!-- </template>--> </template>
<!-- <CarChoose v-model="selectCar" :cus-name="selectUser.cusName"/>--> <CarChoose v-model="selectCar" :cus-name="selectUser.cusName"/>
<!-- </el-descriptions-item>--> </el-descriptions-item>
<!-- <el-descriptions-item>--> <el-descriptions-item>
<!-- <template slot="label">--> <template slot="label">
<!-- 手机--> 手机
<!-- </template>--> </template>
<!-- <el-input disabled v-model="selectUser.phoneNumber"/>--> <el-input disabled v-model="selectUser.phoneNumber"/>
<!-- </el-descriptions-item>--> </el-descriptions-item>
<!-- <el-descriptions-item>--> <el-descriptions-item>
<!-- <template slot="label">--> <template slot="label">
<!-- 车架号--> 车架号
<!-- </template>--> </template>
<!-- <el-input disabled v-model="selectCar.vin"/>--> <el-input disabled v-model="selectCar.vin"/>
<!-- </el-descriptions-item>--> </el-descriptions-item>
<!-- &lt;!&ndash; <el-descriptions-item>&ndash;&gt;--> <!-- <el-descriptions-item>-->
<!-- &lt;!&ndash; <template slot="label">&ndash;&gt;--> <!-- <template slot="label">-->
<!-- &lt;!&ndash; 车牌&ndash;&gt;--> <!-- 车牌-->
<!-- &lt;!&ndash; </template>&ndash;&gt;--> <!-- </template>-->
<!-- &lt;!&ndash; <el-input disabled v-model="selectCar.licenseNumber"/>&ndash;&gt;--> <!-- <el-input disabled v-model="selectCar.licenseNumber"/>-->
<!-- &lt;!&ndash; </el-descriptions-item>&ndash;&gt;--> <!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>--> <el-descriptions-item>
<!-- <template slot="label">--> <template slot="label">
<!-- 品牌车系--> 品牌车系
<!-- </template>--> </template>
<!-- <el-input disabled v-model="selectCar.modelStr"/>--> <el-input disabled v-model="selectCar.modelStr"/>
<!-- </el-descriptions-item>--> </el-descriptions-item>
<!-- <el-descriptions-item>--> <el-descriptions-item>
<!-- <template slot="label">--> <template slot="label">
<!-- 保险到期--> 保险到期
<!-- </template>--> </template>
<!-- <el-date-picker disabled--> <el-date-picker disabled
<!-- v-model="selectCar.insuranceExpiryDate"--> v-model="selectCar.insuranceExpiryDate"
<!-- type="date">--> type="date">
<!-- </el-date-picker>--> </el-date-picker>
<!-- </el-descriptions-item>--> </el-descriptions-item>
<!-- <el-descriptions-item>--> <el-descriptions-item>
<!-- <template slot="label">--> <template slot="label">
<!-- 年检到期--> 年检到期
<!-- </template>--> </template>
<!-- <el-date-picker disabled--> <el-date-picker disabled
<!-- v-model="selectCar.nextInspectionDate"--> v-model="selectCar.nextInspectionDate"
<!-- type="date">--> type="date">
<!-- </el-date-picker>--> </el-date-picker>
<!-- </el-descriptions-item>--> </el-descriptions-item>
<!-- <el-descriptions-item>--> <el-descriptions-item>
<!-- <template slot="label">--> <template slot="label">
<!-- 进厂时间--> 进厂时间
<!-- </template>--> </template>
<!-- <el-date-picker--> <el-date-picker
<!-- v-model="formData.inTime"--> v-model="formData.inTime"
<!-- type="date"--> type="date"
<!-- placeholder="选择日期">--> placeholder="选择日期">
<!-- </el-date-picker>--> </el-date-picker>
<!-- </el-descriptions-item>--> </el-descriptions-item>
<!-- <el-descriptions-item>--> <el-descriptions-item>
<!-- <template slot="label">--> <template slot="label">
<!-- 预计完工--> 预计完工
<!-- </template>--> </template>
<!-- <el-date-picker--> <el-date-picker
<!-- v-model="formData.outTime"--> v-model="formData.outTime"
<!-- type="date"--> type="date"
<!-- placeholder="选择日期">--> placeholder="选择日期">
<!-- </el-date-picker>--> </el-date-picker>
<!-- </el-descriptions-item>--> </el-descriptions-item>
<!-- <el-descriptions-item>--> <el-descriptions-item>
<!-- <template slot="label">--> <template slot="label">
<!-- 上次里程--> 上次里程
<!-- </template>--> </template>
<!-- <el-input v-model="selectCar.maintenanceMileage"/>--> <el-input v-model="selectCar.maintenanceMileage"/>
<!-- </el-descriptions-item>--> </el-descriptions-item>
<!-- <el-descriptions-item>--> <el-descriptions-item>
<!-- <template slot="label">--> <template slot="label">
<!-- 本次里程--> 本次里程
<!-- </template>--> </template>
<!-- <el-input v-model="selectCar.newMaintenanceMileage"/>--> <el-input v-model="selectCar.newMaintenanceMileage"/>
<!-- </el-descriptions-item>--> </el-descriptions-item>
<!-- <el-descriptions-item>--> <el-descriptions-item>
<!-- <template slot="label">--> <template slot="label">
<!-- 预约订单选择--> 预约订单选择
<!-- </template>--> </template>
<!-- <el-select v-model="formData.bookingId" size="small">--> <el-select v-model="formData.bookingId" size="small">
<!-- <el-option v-for="item in bookingList" :key="item.id" :value="item.id" :label="item.bookingTime" />--> <el-option v-for="item in bookingList" :key="item.id" :value="item.id" :label="item.bookingTime" />
<!-- </el-select>--> </el-select>
<!-- </el-descriptions-item>--> </el-descriptions-item>
<!-- &lt;!&ndash; <el-descriptions-item :span="3">&ndash;&gt;--> <!-- <el-descriptions-item :span="3">-->
<!-- &lt;!&ndash; <template slot="label">&ndash;&gt;--> <!-- <template slot="label">-->
<!-- &lt;!&ndash; 备注&ndash;&gt;--> <!-- 备注-->
<!-- &lt;!&ndash; </template>&ndash;&gt;--> <!-- </template>-->
<!-- &lt;!&ndash; <el-input v-model="formData.remark"/>&ndash;&gt;--> <!-- <el-input v-model="formData.remark"/>-->
<!-- &lt;!&ndash; </el-descriptions-item>&ndash;&gt;--> <!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>--> <el-descriptions-item>
<!-- <template slot="label">--> <template slot="label">
<!-- 服务顾问--> 服务顾问
<!-- </template>--> </template>
<!-- <StaffChoose v-model="selectStaff"/>--> <StaffChoose v-model="selectStaff"/>
<!-- </el-descriptions-item>--> </el-descriptions-item>
<!-- </el-descriptions>--> </el-descriptions>
<el-row :gutter="24">
<el-col :span="17" style="padding-right: 0">
<el-card class="top-left">
<el-descriptions class="margin-top" :column="3" :size="'mini'" border>
<!-- <template slot="extra">-->
<!-- <el-button v-if="createTicketType" type="success" size="small">新增客户信息</el-button>-->
<!-- <el-button v-if="createTicketType" type="primary" size="small" :disabled="!selectUser.id">完善更多客户信息</el-button>-->
<!-- <el-button type="primary" size="small">选择业务</el-button>-->
<!-- </template>-->
<el-descriptions-item>
<template slot="label">
用户选择
</template>
<UserChoose v-model="selectUser"/>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
车辆选择
</template>
<CarChoose v-model="selectCar" :cus-name="selectUser.cusName"/>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
手机
</template>
<el-input disabled v-model="selectUser.phoneNumber"/>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
车架号
</template>
<el-input disabled v-model="selectCar.vin"/>
</el-descriptions-item>
<!-- <el-descriptions-item>-->
<!-- <template slot="label">-->
<!-- 车牌-->
<!-- </template>-->
<!-- <el-input disabled v-model="selectCar.licenseNumber"/>-->
<!-- </el-descriptions-item>-->
<el-descriptions-item>
<template slot="label">
品牌车系
</template>
<el-input disabled v-model="selectCar.modelStr"/>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
保险到期
</template>
<el-date-picker disabled
v-model="selectCar.insuranceExpiryDate"
type="date">
</el-date-picker>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
年检到期
</template>
<el-date-picker disabled
v-model="selectCar.nextInspectionDate"
type="date">
</el-date-picker>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
进厂时间
</template>
<el-date-picker
v-model="formData.inTime"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
预计完工
</template>
<el-date-picker
v-model="formData.outTime"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
上次里程
</template>
<el-input v-model="selectCar.maintenanceMileage"/>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
本次里程
</template>
<el-input v-model="selectCar.newMaintenanceMileage"/>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
预约订单选择
</template>
<el-select v-model="formData.bookingId" size="small">
<el-option v-for="item in bookingList" :key="item.id" :value="item.id" :label="item.bookingTime" />
</el-select>
</el-descriptions-item>
<!-- <el-descriptions-item :span="3">-->
<!-- <template slot="label">-->
<!-- 备注-->
<!-- </template>-->
<!-- <el-input v-model="formData.remark"/>-->
<!-- </el-descriptions-item>-->
<el-descriptions-item>
<template slot="label">
服务顾问
</template>
<StaffChoose v-model="selectStaff"/>
</el-descriptions-item>
</el-descriptions>
</el-card>
</el-col>
<el-col :span="7" style="padding-left: 0">
<el-card style="margin-left: 0" >
<div slot="header" class="clearfix">
<span style="font-weight: bold; font-size: 16px;"> 会员卡券</span>
</div>
<el-table
:data="couponList"
border
size="mini"
height="200"
style="width: 100%">
<!-- @selection-change="handleSelectionChange"-->
<!-- <el-table-column-->
<!-- type="selection"-->
<!-- width="55">-->
<!-- </el-table-column>-->
<el-table-column prop="couponName" label="卡券名称" />
<el-table-column label="卡券类型" width="80" align="center" prop="couponType">
<template v-slot="scope">
<dict-tag :type="DICT_TYPE.MEMBER_COUPON_TYPE" :value="scope.row.couponType"/>
</template>
</el-table-column>
<el-table-column label="剩余金额/次数" width="120" align="right" prop="balance">
<template v-slot="scope">
{{scope.row.balance}}{{scope.row.outRule == 'mehx'?'元':'次'}}
</template>
</el-table-column>
<el-table-column label="适用车型" width="80" align="center" prop="carModel">
<template v-slot="scope">
<span v-if="scope.row.carModel == null">不限</span>
<dict-tag :type="DICT_TYPE.MEMBER_CAR" :value="scope.row.carModel"/>
</template>
</el-table-column>
<el-table-column label="核销规则" width="100" align="center" prop="outRule">
<template v-slot="scope">
<dict-tag :type="DICT_TYPE.MEMBER_COUPON_OUT_RULE" :value="scope.row.outRule"/>
</template>
</el-table-column>
<el-table-column label="开始有效期" align="center" prop="beginTime" width="150">
<template v-slot="scope">
<span>{{ parseTime(scope.row.beginTime) }}</span>
</template>
</el-table-column>
<el-table-column label="结束有效期" align="center" prop="endTime" width="150">
<template v-slot="scope">
<span>{{ parseTime(scope.row.endTime) }}</span>
</template>
</el-table-column>
<!-- <el-table-column fixed="right" label="操作" width="130" align="center" class-name="small-padding fixed-width">-->
<!-- <template v-slot="scope">-->
<!-- <el-button size="mini" type="text" icon="el-icon-goods" @click="couponVerification(scope.row)">核销</el-button>-->
<!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</el-card>
</el-col>
</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">
<el-button size="small" @click="$refs['repairAdvice'].open()">维修建议</el-button> <el-button size="small" @click="$refs['repairAdvice'].open()">维修建议</el-button>
@ -319,10 +143,10 @@
<el-button size="small" v-if="formData.ticketType === '02'" @click="formData.ticketType = '01'">B单</el-button> <el-button size="small" v-if="formData.ticketType === '02'" @click="formData.ticketType = '01'">B单</el-button>
</el-col> </el-col>
</el-row> </el-row>
<TicketItem item-type="project" :in-list-data="projectList" @tableData="projectData" ref="projectTable" :coupon-list="couponList" @changeCoupon="changeCoupon"/> <TicketItem item-type="project" :in-list-data="projectList" @tableData="projectData" ref="projectTable"/>
<TicketItem v-if="createTicketType" :in-list-data="partList" item-type="part" @tableData="partData" :coupon-list="couponList" @changeCoupon="changeCoupon" <TicketItem v-if="createTicketType" :in-list-data="partList" item-type="part" @tableData="partData"
ref="partTable"/> ref="partTable"/>
<TicketItem v-if="createTicketType" :in-list-data="otherList" item-type="other" @tableData="otherData" :coupon-list="couponList" @changeCoupon="changeCoupon" <TicketItem v-if="createTicketType" :in-list-data="otherList" item-type="other" @tableData="otherData"
ref="otherTable"/> ref="otherTable"/>
<el-row :gutter="createTicketType ? 2 : 3" style="margin-top: 1rem"> <el-row :gutter="createTicketType ? 2 : 3" style="margin-top: 1rem">
<el-col :span="createTicketType ? 12 : 16"> <el-col :span="createTicketType ? 12 : 16">
@ -403,7 +227,6 @@ import RepairAdvice from "@/views/repair/tickets/form/RepairAdvice.vue";
import QualityExplain from "@/views/repair/tickets/form/QualityExplain.vue"; import QualityExplain from "@/views/repair/tickets/form/QualityExplain.vue";
import TicketChoose from "@/views/repair/tickets/Components/TicketChoose.vue"; import TicketChoose from "@/views/repair/tickets/Components/TicketChoose.vue";
import request from "@/utils/request"; import request from "@/utils/request";
import * as CustomerMainApi from "@/api/base/customer";
export default { export default {
name: "UserInfo", name: "UserInfo",
@ -418,11 +241,8 @@ export default {
selectUser(val) { selectUser(val) {
if (!val) { if (!val) {
this.selectUser = {} this.selectUser = {}
this.bookingList = []
this.couponList = []
}else { }else {
this.getBooking(val.userId) this.getBooking(val.userId)
this.getCouponList(val.id)
} }
}, },
selectCar(val) { selectCar(val) {
@ -478,19 +298,9 @@ export default {
partList: [], partList: [],
otherList: [], otherList: [],
bookingList: [], bookingList: [],
couponList: [],
finaCouponList: []
} }
}, },
methods: { methods: {
async getCouponList(id){
const res = await CustomerMainApi.getCustomerMain(id);
this.couponList = res.data.couponList
this.finaCouponList = [
...this.couponList,
]
this.finaCouponList.map(item => item["isChoose"] = false)
},
projectData(data) { projectData(data) {
// 去掉最后一行 // 去掉最后一行
this.projectList = [...data] this.projectList = [...data]
@ -720,25 +530,10 @@ export default {
method: "get" method: "get"
}) })
this.bookingList = res.data this.bookingList = res.data
}, }
// 权益更改
changeCoupon(data){
this.finaCouponList.map(item => {
item.isChoose = data.includes(item)
})
this.finaCouponList.forEach(item => console.log(item.isChoose))
this.couponList = this.finaCouponList.filter(item => !item.isChoose)
},
// // 权益选择
// handleSelectionChange(val){
//
// }
} }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.top-left{
margin-bottom: 1rem;
}
</style> </style>