Compare commits

..

No commits in common. "2a0c04175da929dffb1319e8261d6181f4f8e52a" and "0466a707393bbb2e0253e511fda8955de6cbba3f" have entirely different histories.

3 changed files with 17 additions and 35 deletions

View File

@ -1,6 +1,6 @@
<template>
<el-select v-model="userSelected" clearable filterable :filter-method="handleQuery">
<el-option v-for="user in userList" :key="user.id" :label="user.cusName + ' ' + user.phoneNumber" :value="user.id"/>
<el-select v-model="userSelected" clearable filterable >
<el-option v-for="user in userList" :key="user.id" :label="user.cusName + ' ' + user.phoneNumber" :value="user.id" />
</el-select>
</template>
@ -10,11 +10,11 @@ import {getCustomerMainPage} from "@/api/base/customer";
export default {
name: "UserChoose",
props: {
value: {
props:{
value:{
type: Object,
},
inList: {
inList:{
type: Object,
default: null,
required: false
@ -24,30 +24,28 @@ export default {
return {
userList: [],
userSelected: undefined,
queryParams: {
queryParams:{
pageNo: 1,
pageSize: 10,
cusName: null,
phoneNumber: null,
pageSize: 10
},
total: 0
}
},
watch: {
userSelected(val) {
if (val) {
watch:{
userSelected(val){
if (val){
const user = this.userList.find(item => item.id === val)
this.$emit("input", user)
}
},
value(val) {
value(val){
this.userSelected = val ? val.id : null
},
inList(val) {
if (val) {
inList(val){
if (val){
//
const flag = this.userList.findIndex(item => item.id === val.id)
if (flag > 0) {
if (flag > 0){
this.userList.splice(flag, 1)
}
this.userList.unshift(val)
@ -59,18 +57,10 @@ export default {
this.listCustomer()
},
methods: {
async listCustomer() {
async listCustomer(){
const res = await getCustomerMainPage(this.queryParams)
this.userList = res.data.records
this.total = res.data.total
},
handleQuery(data) {
if (/^\d+$/.test(data)) {
this.queryParams.phoneNumber = data
} else {
this.queryParams.cusName = data
}
this.listCustomer()
}
}
}

View File

@ -77,9 +77,6 @@
v-if="(userRole === 'repair_staff' ? (leader ? !isFinish : false) : false) && !(scope.row.ticketsWorkStatus !== '01' && userRole === 'repair_staff' && !isFinish)">
重新指派
</el-button>
<el-button v-if="userRole === 'repair_staff' && !isFinish && scope.row.ticketsWorkStatus === '01' && !(nowUser.id === scope.row.nowRepairId)" @click="handleGet(scope.row)" size="mini" type="text" icon="el-icon-document-add">
申请配件
</el-button>
<el-dropdown
v-if="(scope.row.ticketsWorkStatus !== '01' && ((userRole === 'service_advisor' || userRole === 'general_inspection') && !isFinish)) || (userRole === 'repair_staff' && !isFinish && scope.row.ticketsWorkStatus !== '01')"
@command="(command) => handleCommand(command, scope.$index, scope.row)">

View File

@ -308,10 +308,7 @@ export default {
formRules: {
'userInfo.cusName':[{required: true, message: "客户名称不能为空", trigger: 'blur'}],
'userInfo.phoneNumber': [{required: true, message: "联系方式不能为空", trigger: 'blur'}],
'carInfo.licenseNumber': [{required: true, message: "车牌号不能为空", trigger: 'blur'}],
'carInfo.brandAndModel': [{required: true, message: "品牌型号不能为空", trigger: 'blur'}],
'carInfo.carCategory': [{required: true, message: '车辆类别不能为空', trigger: 'blur'}],
'carInfo.carNature': [{required: true, message: '车辆性质不能为空', trigger: 'blur'}]
'carInfo.licenseNumber': [{required: true, message: "车牌号不能为空", trigger: 'blur'}]
},
formLoading: false,
//
@ -372,11 +369,9 @@ export default {
await updateCustomerAndCar(this.formData)
this.$modal.msgSuccess(this.formData?.userInfo?.id ? "修改成功" : "新增成功")
this.$emit("success", this.formData)
}finally {
this.formLoading = false
this.dialogVisible = false
}catch {}
finally {
this.formLoading = false
}
},
reset(){