修改问题

master
sunzehua 5 months ago
parent 111cf0da26
commit 995b903d34

12
.env

@ -1,9 +1,9 @@
NODE_ENV=production
VUE_APP_PREVIEW=true
# VUE_APP_TYPE = 'customer'
# VUE_APP_TYPE = 'hechuan'
VUE_APP_TYPE = 'hechuan'
# VUE_APP_TYPE = 'yunyingduan'
VUE_APP_TYPE = 'gangjie'
# VUE_APP_TYPE = 'gangjie'
# 打包部署的三个端 客户端customer 和川端hechuan 运营端djy
# 和川大简云正式
@ -11,8 +11,8 @@ VUE_APP_TYPE = 'gangjie'
# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345
# 和川大简云测试
# VUE_APP_API_BASE_URL=http://60.209.125.238:35100
# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
VUE_APP_API_BASE_URL=http://60.209.125.238:35100
VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
# 客户端测试
# VUE_APP_API_BASE_URL=http://60.209.125.238:30813
@ -23,8 +23,8 @@ VUE_APP_TYPE = 'gangjie'
# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814
# 港捷
VUE_APP_API_BASE_URL=http://118.190.144.189:5001
VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001
# VUE_APP_API_BASE_URL=http://118.190.144.189:5001
# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001
# 客户端正式
# VUE_APP_API_BASE_URL=http://118.190.144.189:6001

@ -1,7 +1,7 @@
NODE_ENV=development
VUE_APP_PREVIEW=true
VUE_APP_TYPE = 'customer'
# VUE_APP_TYPE = 'hechuan'
# VUE_APP_TYPE = 'customer'
VUE_APP_TYPE = 'hechuan'
# VUE_APP_TYPE = 'yunyingduan'
# VUE_APP_TYPE = 'gangjie'
# 打包部署的三个端 客户端customer 和川端hechuan 运营端yunyingduan
@ -11,8 +11,8 @@ VUE_APP_TYPE = 'customer'
# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345
# 和川大简云测试
# VUE_APP_API_BASE_URL=http://60.209.125.238:35100
# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
VUE_APP_API_BASE_URL=http://60.209.125.238:35100
VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
# 客户端测试
# VUE_APP_API_BASE_URL=http://60.209.125.238:30813
@ -34,5 +34,5 @@ VUE_APP_TYPE = 'customer'
# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002
# 客户端正式
VUE_APP_API_BASE_URL=http://118.190.144.189:6001
VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001
# VUE_APP_API_BASE_URL=http://118.190.144.189:6001
# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001

@ -141,30 +141,6 @@
</a-form-item>
</a-col>
</a-row>
<a-row v-if="type==='B'">
<a-col :span="8">
<a-form-item label="SHIPPER" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
<a-input v-model="CreateData.SHIPPER"></a-input>
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="品名" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
<a-input v-model="CreateData.GOODSNAME"></a-input>
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="卖价" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
<a-input-number style="width: 100%;" :precision="2" v-model="CreateData.sellinG_PRICE"></a-input-number>
</a-form-item>
</a-col>
</a-row>
<a-row v-if="type==='B'">
<a-col :span="8">
<a-form-item label="销售日期" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
<a-date-picker style="width: 100%;" v-model="CreateData.SALE_TIME" />
</a-form-item>
</a-col>
</a-row>
<a-row>
<a-col :span="8">
<a-form-item label="客服:" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
@ -187,6 +163,53 @@
</a-select>
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="商务:" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
<a-select
show-search
v-model="CreateData.businessid"
:default-active-first-option="false"
:show-arrow="false"
:filter-option="false"
:not-found-content="null"
allowClear
@search="SearchUser($event, 6)"
@change="e => {
ChangeUser(e, 'business', 6)
}
">
<a-select-option v-for="item in UserList3" :key="item.id" :value="item.id">
{{ item.name }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
</a-row>
<a-row v-if="type==='B'">
<a-col :span="8">
<a-form-item label="SHIPPER" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
<a-input v-model="CreateData.SHIPPER"></a-input>
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="品名" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
<a-input v-model="CreateData.GOODSNAME"></a-input>
</a-form-item>
</a-col>
</a-row>
<a-row >
<a-col :span="8" v-if="type==='B'">
<a-form-item label="销售日期" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
<a-date-picker style="width: 100%;" v-model="CreateData.SALE_TIME" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="卖价" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
<a-input-number style="width: 100%;" :precision="2" v-model="CreateData.sellinG_PRICE"></a-input-number>
</a-form-item>
</a-col>
</a-row>
<a-row>
<a-col :span="8">
<a-form-item label="航线操作:" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
<a-select
@ -362,6 +385,7 @@ export default {
UserList3: [],
UserList4: [],
UserList5: [],
UserList6: [],
fetching: false,
spinning: false,
customerByList: [],
@ -393,6 +417,8 @@ export default {
this.UserList2 = JSON.parse(JSON.stringify(res.data))
this.UserList3 = JSON.parse(JSON.stringify(res.data))
this.UserList4 = JSON.parse(JSON.stringify(res.data))
this.UserList5 = JSON.parse(JSON.stringify(res.data))
this.UserList6 = JSON.parse(JSON.stringify(res.data))
this.UserListAll = JSON.parse(JSON.stringify(res.data))
})
},
@ -606,6 +632,9 @@ export default {
if (type === 5) {
this.UserList5 = res.data
}
if (type === 6) {
this.UserList6 = res.data
}
})
}
},
@ -653,6 +682,13 @@ export default {
}
})
}
if (type === 6) {
this.UserList6.forEach(item => {
if (item.id == e) {
this.CreateData[Tname] = item.name
}
})
}
} else {
if (type === 0) {
this.UserList = JSON.parse(JSON.stringify(this.UserListAll))
@ -672,6 +708,9 @@ export default {
if (type === 5) {
this.UserList5 = JSON.parse(JSON.stringify(this.UserListAll))
}
if (type === 6) {
this.UserList6 = JSON.parse(JSON.stringify(this.UserListAll))
}
}
this.$forceUpdate()
},
@ -684,14 +723,6 @@ export default {
}
})
this.fetching = true
// DjyCustomerContacts({ customerId: e }).then(res => {
// if (res.success) {
// this.customerByList = res.data
// } else {
// this.$message.error(res.message)
// }
// this.fetching = false
// })
DjyCustomerdetail({ id: e }).then(res => {
if (res.success) {
this.customerByList = res.data.contacts
@ -723,6 +754,13 @@ export default {
this.$set(this.CreateData, 'saleId', '')
this.$set(this.CreateData, 'saleName', '')
}
if (res.data.businessid) {
this.CreateData.businessid = Number(res.data.businessid)
this.CreateData.business = res.data.business
} else {
this.$set(this.CreateData, 'businessid', '')
this.$set(this.CreateData, 'business', '')
}
this.$forceUpdate()
} else {
this.$message.error(res.message)

@ -212,7 +212,7 @@
:defaultVal="details.placereceipt"
searchApi="GetPortloadlist"
:searchQuery="{ KeyWord: '' }"
:showLabel="['ediCode', 'enName']"
:showLabel="['enName', 'ediCode']"
:openSearch="true"
:isCopy="true"
@change="getSelectViewRes"></selectView>
@ -231,7 +231,7 @@
:defaultVal="details.portload"
searchApi="GetPortloadlist"
:searchQuery="{ KeyWord: '' }"
:showLabel="['ediCode', 'enName']"
:showLabel="['enName', 'ediCode']"
:openSearch="true"
:isCopy="true"
@change="getSelectViewRes"></selectView>
@ -250,7 +250,7 @@
:defaultVal="details.portdischarge"
searchApi="GetPortlist"
:searchQuery="{ KeyWord: '' }"
:showLabel="['ediCode', 'enName']"
:showLabel="['enName', 'ediCode']"
:openSearch="true"
@change="getSelectViewRes"></selectView>
</a-form-model-item>
@ -268,7 +268,7 @@
:defaultVal="details.destination"
searchApi="GetPortlist"
:searchQuery="{ KeyWord: '' }"
:showLabel="['ediCode', 'enName']"
:showLabel="['enName', 'ediCode']"
:openSearch="true"
@change="getSelectViewRes"></selectView>
</a-form-model-item>
@ -419,16 +419,36 @@
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="提单数量"
label="付款方式"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="billCount">
<a-input size="small" v-model="details.billCount" />
prop="blfrt">
<a-select size="small" v-model="details.blfrt" style="width: 100%">
<a-select-option value="P">PP</a-select-option>
<a-select-option value="C">CC</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="签约方"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="signType">
<a-select size="small" v-model="details.signType" style="width: 100%">
<a-select-option value="Shipper">Shipper</a-select-option>
<a-select-option value="Forwarder">Forwarder</a-select-option>
<a-select-option value="Consignee">Consignee</a-select-option>
<a-select-option value="Notify">Notify</a-select-option>
<a-select-option value="Party">Party</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
@ -451,6 +471,17 @@
<a-checkbox v-model="details.acceptNotify"></a-checkbox>
</a-form-model-item>
</a-col>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="提单数量"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="billCount">
<a-input size="small" v-model="details.billCount" />
</a-form-model-item>
</a-col>
</a-row>
</div>
<a-row>
@ -670,8 +701,8 @@
</div>
<div style="margin-top:10px">
<a-select size="small" v-model="details.shipperSex" style="width: 13%">
<a-select-option value="Mr.">MS</a-select-option>
<a-select-option value="Ms.">MR</a-select-option>
<a-select-option value="MS">MS</a-select-option>
<a-select-option value="MR">MR</a-select-option>
</a-select>
<a-input
size="small"
@ -713,8 +744,8 @@
</div>
<div style="margin-top:10px">
<a-select size="small" v-model="details.bookingSex" style="width: 13%">
<a-select-option value="Mr.">MS</a-select-option>
<a-select-option value="Ms.">MR</a-select-option>
<a-select-option value="MS">MS</a-select-option>
<a-select-option value="MR">MR</a-select-option>
</a-select>
<a-input
size="small"
@ -1319,6 +1350,21 @@ export default {
computed: {
...mapGetters(['packageList', 'ctnallList', 'lineList'])
},
watch: {
'details.ctnList': {
deep: true,
handler(val) {
console.log(val)
let kgsTotal = 0
val.forEach(item => {
if (item.kgs && item.ctnnum) {
kgsTotal += item.kgs * item.ctnnum
}
})
this.details.kgs = kgsTotal.toFixed(2)
}
}
},
mounted() {
this.id = this.$route.query.id
this.getDictList()
@ -1536,9 +1582,11 @@ export default {
lanecode: [{ required: true, message: '请选择航线', trigger: 'blur' }],
voyno: [{ required: true, message: '请输入航次', trigger: 'blur' }],
vessel: [{ required: true, message: '请输入船名', trigger: 'blur' }],
blfrt: [{ required: true, message: '请选择付款方式', trigger: 'blur' }],
bookingAccount: [{ required: true, message: '请选择订舱账号', trigger: 'blur' }],
billCount: [{ required: true, message: '请输入提单数量', trigger: 'blur' }],
billSignLoc: [{ required: true, message: '请选择提单签发地', trigger: 'blur' }],
signType: [{ required: true, message: '请选择签约方', trigger: 'blur' }],
bookingAddr: [{ required: true, message: '请选择订舱网点', trigger: 'blur' }],
serviceMode: [{ required: true, message: '请选择运输形态', trigger: 'blur' }],
serviceType: [{ required: true, message: '请选择运送方式', trigger: 'blur' }],
@ -1655,8 +1703,6 @@ export default {
bookingName: $data.bookingDetails.bookingName,
bookingSex: $data.bookingDetails.bookingSex,
destinationid: $data.bookingDetails.destinationid,
destination: $data.bookingDetails.destination,
destinationcode: $data.bookingDetails.destinationcode,
@ -1998,16 +2044,24 @@ export default {
const arr3 = []
res.data.items.forEach(item => {
if (item.shipperName) {
arr.push(item.shipperName)
if (!arr.includes(item.shipperName)) {
arr.push(item.shipperName)
}
}
if (item.bookingName) {
arr1.push(item.bookingName)
if (!arr1.includes(item.bookingName)) {
arr1.push(item.bookingName)
}
}
if (item.notifypartName) {
arr2.push(item.notifypartName)
if (!arr2.includes(item.notifypartName)) {
arr2.push(item.notifypartName)
}
}
if (item.consigneeName) {
arr3.push(item.consigneeName)
if (!arr3.includes(item.consigneeName)) {
arr3.push(item.consigneeName)
}
}
})
this.shipperList = arr
@ -2028,7 +2082,9 @@ export default {
const arr = []
res.data.items.forEach(item => {
if (item.shipperName) {
arr.push(item.shipperName)
if (!arr.includes(item.shipperName)) {
arr.push(item.shipperName)
}
}
})
this.shipperList = arr
@ -2046,7 +2102,9 @@ export default {
const arr = []
res.data.items.forEach(item => {
if (item.bookingName) {
arr.push(item.bookingName)
if (!arr.includes(item.bookingName)) {
arr.push(item.bookingName)
}
}
})
this.bookingList = arr
@ -2063,7 +2121,9 @@ export default {
const arr = []
res.data.items.forEach(item => {
if (item.notifypartName) {
arr.push(item.notifypartName)
if (!arr.includes(item.notifypartName)) {
arr.push(item.notifypartName)
}
}
})
this.notifypartList = arr
@ -2080,7 +2140,9 @@ export default {
const arr = []
res.data.items.forEach(item => {
if (item.consigneeName) {
arr.push(item.consigneeName)
if (!arr.includes(item.consigneeName)) {
arr.push(item.consigneeName)
}
}
})
this.consigneeList = arr
@ -2119,13 +2181,15 @@ export default {
this.$set(this.details, 'carrierid', this.$route.query.carrierid)
this.$set(this.details, 'carrier', this.$route.query.carrierid)
if (this.$route.query.carrierid === 'EMC') {
this.$set(this.details, 'shipperSex', 'Mr.')
this.$set(this.details, 'bookingSex', 'Mr.')
this.$set(this.details, 'shipperSex', 'MS')
this.$set(this.details, 'bookingSex', 'MR')
this.$set(this.details, 'signType', 'Forwarder')
this.$set(this.details, 'blfrt', '')
this.$set(this.details, 'service', '')
this.$set(this.details, 'portload', '')
this.$set(this.details, 'portloadid', '')
this.$set(this.details, 'billCount', 1)
this.$refs.basicFrom.resetFields()
}
}
}
@ -2545,7 +2609,7 @@ export default {
this.$message.success('保存成功')
setTimeout(() => {
this.saveFlag = false
}, 5000);
}, 3000);
this.loading = false
this.id = res.data.id
if (res.data.cargoid) {
@ -2832,6 +2896,10 @@ export default {
this.details.destinationcode = res['code'] || ''
this.$forceUpdate()
}
if (type === 'destinationid') {
this.details.destinationcode = res['code']
this.$forceUpdate()
}
} else if (['shippername', 'consigneename', 'notifypartyname', 'notifypartY2name', 'foreignAgentname', 'descriptionname'].includes(type)) {
this[type] = res['title'] || ''
this.details[type.replace('name', '')] = res['content'] || ''

@ -149,6 +149,28 @@
<a-date-picker size="small" v-model="item.salE_TIME" />
</a-form-model-item>
</a-col>
<a-col :span="6">
<a-form-item label="商务">
<a-select
show-search
v-model="item.businessid"
size="small"
allowClear
:default-active-first-option="false"
:show-arrow="false"
:filter-option="false"
:not-found-content="null"
@search="SearchUser($event, 4)"
@change="e => {
ChangeUser(e, 'business', 4,index)
}
">
<a-select-option v-for="item in UserList4" :key="item.id" :value="item.id">
{{ item.name }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
</a-row>
</div>
</div>
@ -596,6 +618,7 @@ export default {
UserList1: [],
UserList: [],
UserList2: [],
UserList4: [],
UserListAll: [],
UserList3: [],
id: 0,
@ -796,6 +819,7 @@ export default {
this.UserList1 = JSON.parse(JSON.stringify(res.data))
this.UserList2 = JSON.parse(JSON.stringify(res.data))
this.UserList3 = JSON.parse(JSON.stringify(res.data))
this.UserList4 = JSON.parse(JSON.stringify(res.data))
this.UserListAll = JSON.parse(JSON.stringify(res.data))
})
if (this.type === 'Edit') {
@ -876,6 +900,9 @@ export default {
if (type === 3) {
this.UserList3 = res.data
}
if (type === 4) {
this.UserList4 = res.data
}
})
}
},
@ -898,6 +925,9 @@ export default {
if (item.saleid) {
item.saleid = Number(item.saleid)
}
if (item.businessid) {
item.businessid = Number(item.businessid)
}
})
this.oldBook = JSON.parse(JSON.stringify(this.form.bookingSlotSaleInfoList))
}
@ -968,6 +998,13 @@ export default {
}
})
}
if (type === 4) {
this.UserList3.forEach(item => {
if (item.id == e) {
this.form.bookingSlotSaleInfoList[index][Tname] = item.name
}
})
}
} else {
if (type === 0) {
this.UserList = JSON.parse(JSON.stringify(this.UserListAll))
@ -981,6 +1018,9 @@ export default {
if (type === 3) {
this.UserList3 = JSON.parse(JSON.stringify(this.UserListAll))
}
if (type === 4) {
this.UserList4 = JSON.parse(JSON.stringify(this.UserListAll))
}
}
this.$forceUpdate()
},
@ -1035,6 +1075,23 @@ export default {
this.type = 'Edit'
this.id = res.data.id
this.form = res.data
this.form.bookingSlotSaleInfoList.forEach(item => {
if (item.custserviceid) {
item.custserviceid = Number(item.custserviceid)
}
if (item.docid) {
item.docid = Number(item.docid)
}
if (item.opid) {
item.opid = Number(item.opid)
}
if (item.saleid) {
item.saleid = Number(item.saleid)
}
if (item.businessid) {
item.businessid = Number(item.businessid)
}
})
this.loading = false
// this.getDetail()
} else {

@ -212,6 +212,7 @@
:loading="loading"
@cell-dblclick="handledbclick"
@sort-change="tableSortChange"
@cell-click="cellClickEvent"
@resizable-change="resizableChange"
@checkbox-change="checkboxChangeEvent"
:height="tableHeight"
@ -271,7 +272,9 @@
<span>{{ row.etd ? row.etd.substring(0, 10) : '' }}</span>
</template>
<template #labelList="{ row }">
<a-tag :color="item.color" v-for="(item, index) in row.labelList" :key="index">{{ item.name }}</a-tag>
<div>
<a-tag :color="item.color" v-for="(item, index) in row.labelList" :key="index">{{ item.name }}</a-tag>
</div>
</template>
<template #pager>
@ -480,6 +483,12 @@ export default {
width: '80',
field: 'doc'
},
{
title: '商务',
align: 'center',
width: '80',
field: 'business'
},
{
title: '销售',
align: 'center',
@ -796,6 +805,12 @@ export default {
width: '80',
field: 'doc'
},
{
title: '商务',
align: 'center',
width: '80',
field: 'business'
},
{
title: '销售',
align: 'center',
@ -1049,15 +1064,15 @@ export default {
}
this.loadingExport = true
PrintOrder(this.form).then(res => {
if (res.success) {
window.open(
` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/downloadPrint?filename=${res.data}`,
'_blank'
)
} else {
this.$message.error(res.message)
}
this.loadingExport = false
if (res.success) {
window.open(
` ${process.env.VUE_APP_API_BASE_URL}/BookingOrder/downloadPrint?filename=${res.data}`,
'_blank'
)
} else {
this.$message.error(res.message)
}
this.loadingExport = false
})
},
expandVisibleMethod({ row }) {
@ -1094,27 +1109,40 @@ export default {
this.loading = true
ImportSlotFromFile(formData, (percent) => this.setUploadProcess(percent)).then((res) => {
this.$notification.open({
message: '批量导入',
description: (
<div>
{res.data.ext.map((item) => {
if (item.isSuccess) {
return <div>{item.slotBookingNo} 成功 </div>
} else {
return (
<div style={{ color: 'red' }} >
{item.slotBookingNo} 失败 {item.failReason}
</div>
)
}
})}
</div>
),
duration: 5
})
this.getList()
message: '批量导入',
description: (
<div>
{res.data.ext.map((item) => {
if (item.isSuccess) {
return <div>{item.slotBookingNo} 成功 </div>
} else {
return (
<div style={{ color: 'red' }} >
{item.slotBookingNo} 失败 {item.failReason}
</div>
)
}
})}
</div>
),
duration: 5
})
this.getList()
})
},
cellClickEvent({ rowIndex, column }) {
if (column.field === 'labelList') {
this.$refs.table.clearCheckboxRow()
this.$refs.table.toggleCheckboxRow(this.loadData[rowIndex])
this.visible = true
this.labelIdArray = []
this.labelLoad = true
BookingLabelList({ scope: 1 }).then(res => {
this.labelList = res.data
this.labelLoad = false
})
}
},
checkboxChangeEvent() {
console.log('== 选中,取消选中 ==', this.$refs.table.getCheckboxRecords())
},
@ -1160,7 +1188,7 @@ export default {
})
},
spanMethod({ row, _rowIndex, column, visibleData }) {
const arr = ['salE_TIME', 'sellinG_PRICE', 'goodsname', 'shipper', 'sale', 'op', 'doc', 'custservice', 'customername']
const arr = ['salE_TIME', 'sellinG_PRICE', 'goodsname', 'shipper', 'sale', 'business', 'op', 'doc', 'custservice', 'customername']
if ((!arr.includes(column.property)) || column.type === 'checkbox' || column.field === 'caozuo') {
const prevRow = visibleData[_rowIndex - 1];
let nextRow = visibleData[_rowIndex + 1];

@ -61,6 +61,9 @@
<template #scope="{ row }">
<span v-if="row.scope == 1"></span>
</template>
<template #color="{ row }">
<div style="width: 100px;height: 20px;margin: 0 auto;" :style="{background:row.color}" ></div>
</template>
<template #pager>
<vxe-pager
:current-page="queryParam.PageNo"
@ -147,6 +150,7 @@ export default {
fetching: false,
queryParam: {
PageNo: 1,
pageNo:1,
pageSize: 10,
totalCount: 1
},
@ -182,6 +186,12 @@ export default {
field: 'scope',
slots: { default: 'scope' }
},
{
title: '标签颜色',
align: 'center',
field: 'color',
slots: { default: 'color' }
},
{
title: '操作',
align: 'center',
@ -307,8 +317,6 @@ export default {
BookingLabelPageList(this.form).then(res => {
if (res.success) {
this.loadData = res.data.items
this.queryParam.PageNo = res.data.pageNo
this.queryParam.pageSize = res.data.pageSize
this.queryParam.totalCount = res.data.totalCount
} else {
this.$message.error(res.message)
@ -387,6 +395,9 @@ export default {
const data = {
...this.labelData
}
if (!data.color) {
data.color = '#000000'
}
BookingLabelSave(data).then(res => {
if (res.success) {
this.$message.success('操作成功')

@ -172,6 +172,18 @@
</a-form-item>
</a-col>
</a-row>
<a-row class="from-box3">
<a-col :span="6">
<a-form-item class="from-label" label="商务人员" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-select :showSearch="true" :filterOption="filterOption" v-decorator="['businessid']" @focus="getUserList">
<a-select-option v-for="item in saleUserList" :key="item.id" :value="item.id">
{{ item.name }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
</a-row>
<p class="CsFormTitle">
<span><i class="iconfont icon-tuandui"></i>联系人信息</span>
</p>
@ -507,7 +519,7 @@ export default {
serviceItem == '' ? (serviceItem = `[${item2}]`) : (serviceItem = `${serviceItem}[${item2}]`)
})
}
const Arr = ['sale', 'op', 'doc', 'custservice']
const Arr = ['sale', 'op', 'doc', 'custservice', 'business']
GetSysUserPage()
.then(res => {
if (res.success) {

@ -171,6 +171,17 @@
</a-form-item>
</a-col>
</a-row>
<a-row class="from-box3">
<a-col :span="6">
<a-form-item class="from-label" label="商务人员" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-select :showSearch="true" :filterOption="filterOption" v-decorator="['businessid']" @focus="getUserList">
<a-select-option v-for="item in saleUserList" :key="item.id" :value="item.id">
{{ item.name }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
</a-row>
<p class="CsFormTitle">
<span><i class="iconfont icon-tuandui"></i>联系人信息</span>
</p>
@ -416,7 +427,7 @@ export default {
item.WebKey = index + 1
})
// ID
const UserArr = ['saleid', 'opid', 'docid', 'custserviceid']
const UserArr = ['saleid', 'opid', 'docid', 'custserviceid', 'businessid']
UserArr.forEach(item => {
if (res.data[item]) {
res.data[item] = parseInt(res.data[item])
@ -573,7 +584,7 @@ export default {
serviceItem == '' ? (serviceItem = `[${item2}]`) : (serviceItem = `${serviceItem}[${item2}]`)
})
}
const Arr = ['sale', 'op', 'doc', 'custservice']
const Arr = ['sale', 'op', 'doc', 'custservice', 'business']
GetSysUserPage()
.then(res => {
this.SaveLoading = false

@ -168,7 +168,7 @@
@search="SearchUser($event, 2)"
size="small"
@change="e => {
ChangeUser(e, 'sale', 3)
ChangeUser(e, 'sale', 2)
}
">
<a-select-option v-for="item1 in UserList2" :key="item1.id" :value="item1.id">
@ -234,6 +234,34 @@
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="12">
<a-form-model-item label="商务">
<a-select
show-search
v-model="editform.businessid"
:default-active-first-option="false"
:show-arrow="false"
:disabled="businessidFlag"
style="width: 70%;"
:filter-option="false"
:not-found-content="null"
allowClear
@search="SearchUser($event, 5)"
size="small"
@change="e => {
ChangeUser(e, 'business', 5)
}
">
<a-select-option v-for="item1 in UserList4" :key="item1.id" :value="item1.id">
{{ item1.name }}
</a-select-option>
</a-select>
<span style="margin: 0 10px;" >修改:</span>
<a-checkbox @change="businessidFlag=!businessidFlag" v-model="editform.isSetBUSINESS"></a-checkbox>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</a-spin>
</a-modal>
@ -415,6 +443,7 @@ export default {
saleidFlag: true,
docidFlag: true,
opidFlag: true,
businessidFlag: true,
editform: {},
setVisible: false,
setVisible1: false,
@ -453,6 +482,7 @@ export default {
this.UserList2 = JSON.parse(JSON.stringify(res.data))
this.UserList3 = JSON.parse(JSON.stringify(res.data))
this.UserList4 = JSON.parse(JSON.stringify(res.data))
this.UserList5 = JSON.parse(JSON.stringify(res.data))
this.UserListAll = JSON.parse(JSON.stringify(res.data))
})
},
@ -480,6 +510,11 @@ export default {
return false
}
this.editFlag = true
this.custserviceidFlag = true
this.saleidFlag = true
this.docidFlag = true
this.opidFlag = true
this.businessidFlag = true
this.editform = {}
},
handleAdd(row) {
@ -678,9 +713,6 @@ export default {
SearchUser(e, type) {
if (e) {
GetSysUserPage({ name: e }).then(res => {
if (type === 0) {
this.UserList = res.data
}
if (type === 1) {
this.UserList1 = res.data
}
@ -690,6 +722,12 @@ export default {
if (type === 3) {
this.UserList3 = res.data
}
if (type === 4) {
this.UserList4 = res.data
}
if (type === 5) {
this.UserList5 = res.data
}
})
}
},
@ -740,6 +778,13 @@ export default {
}
})
}
if (type === 5) {
this.UserList5.forEach(item => {
if (item.id == e) {
this.editform[Tname] = item.name
}
})
}
} else {
if (type === 1) {
this.UserList1 = JSON.parse(JSON.stringify(this.UserListAll))
@ -753,6 +798,9 @@ export default {
if (type === 4) {
this.UserList4 = JSON.parse(JSON.stringify(this.UserListAll))
}
if (type === 5) {
this.UserList5 = JSON.parse(JSON.stringify(this.UserListAll))
}
}
this.$forceUpdate()
},

Loading…
Cancel
Save