aike/emis-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uu

Browse Source
This commit is contained in:
aihe 2024-05-22 02:19:58 +08:00
parent aba270864f
commit ffbb397cc6
6 changed files with 85 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/api/order.js
View File

@ -29,6 +29,26 @@ export const getRSDStaffList = (data = {})=> {
return coreRequest(url.getPickStaffList, { ...data, postCode: 'RSD' }, {}, "GET")
}
// 回款人联系列表
export const getPayeeList = (data = {})=> {
return coreRequest(url.getPayeeList, { ...data, postCode: 'RSD' }, {}, "GET")
}
// 销售人联系列表
export const getSalemanList = (data = {})=> {
return coreRequest(url.getSalemanList, { ...data, postCode: 'RSD' }, {}, "GET")
}
// 报价试算
export const preCalcWaybillFee = (data = {})=> {
return coreRequest(url.preCalcWaybillFee, { ...data, postCode: 'RSD' }, {}, "GET")
}
// 物流轨迹
export const queryWaybillTraceInfo = (data = {})=> {
return coreRequest(url.queryWaybillTraceInfo, { ...data, postCode: 'RSD' }, {}, "GET")
}
// 历史-货物列表
export const getGoodsList = (data = {})=> {

5
common/api/url.js
View File

@ -47,7 +47,10 @@ export default {
getNextStationList: `/emis/emisTmsScanRecord/getNextStationList`, // 获取-扫描下一网点
getPayeeList: `/emis/emisStaff/getPayeeList`, // 回款人联系列表
getSalemanList: `/emis/emisStaff/getSalemanList`, // 销售人联系列表
preCalcWaybillFee: `/emis/emisWaybill/preCalcWaybillFee`, // 报价试算
queryWaybillTraceInfo: `/emis/emisTmsScanRecord/queryWaybillTraceInfo`, // 物流轨迹
}

4
components/tpx-scroll-view/tpx-scroll-view.vue
View File

@ -37,9 +37,9 @@
export default {
watch: {
searchParam: {
handler: debounce(function(cval, oval) {
handler: function(cval, oval) {
this.getDataList(true)
}),
},
deep: true
}
},

8
components/tpx-select/tpx-select.vue
View File

@ -145,6 +145,11 @@
// // titleKey: ''
// }
}
},
disabled: {
default () {
return false
}
}
},
data() {
@ -175,6 +180,9 @@
}
},
handleSelectSwitch() {
if(this.disabled) {
return
}
// this.$emit('update:show', !this.show)
this.show = !this.show
},

12
components/tpx-text-item/tpx-text-item.vue
View File

@ -10,7 +10,10 @@
<template v-if="!$slots.right">
<u-text align="right" margin="0 12rpx 0 0" size="26"
:text="title"></u-text>
<u-icon v-if="list || checkedList" size="26" name="arrow-right" color="#333"></u-icon>
<template v-if="!$slots.rightRcon">
<u-icon v-if="list || checkedList" size="26" name="arrow-right" color="#333"></u-icon>
</template>
<slot name="rightRcon"></slot>
</template>
<slot name="right"></slot>
</u-row>
@ -33,7 +36,7 @@
title = this.checkedList.map(t=> t.title).join(',')
}
if((!title || title?.length == 0) && (this.list || this.checkedList?.length == 0)) {
title = '请选择'
title = this.placeholder
}
return title
}
@ -49,6 +52,11 @@
return ''
}
},
placeholder: {
default () {
return '请选择'
}
},
value: {
},
list: {

58
pages/post/openorder.vue
View File

@ -101,26 +101,40 @@
<tpx-text-item label="付款方式" :value="submitParam.paymentType" :list="dicData.emis_payment_type"></tpx-text-item>
</tpx-select>
</view>
<view v-if="submitParam.paymentType == 2 || submitParam.paymentType == 4 || submitParam.paymentType == 5" class="yunf-input-item">
<tpx-select v-model:value="submitParam.custNo" v-model:resObject="yuejieRes" :getListFun="getMonthpayAccountList" :transKeyVal="{valKey: 'custNo',titleKey: 'custName'}"
@onChange="handleYueJieSelect" placeholder="请选择月结账户"
>
<tpx-text-item label="月结账户" :checkedList="yuejieRes.checkedList"></tpx-text-item>
</tpx-select>
</view>
<template v-if="submitParam.custNo">
<template v-if="isShowYueJie">
<view class="yunf-input-item">
<tpx-text-item label="月结编号" :value="submitParam.custNo"></tpx-text-item>
<tpx-select v-model:value="submitParam.custNo" v-model:resObject="yuejieRes" :getListFun="getMonthpayAccountList" :transKeyVal="{valKey: 'custNo',titleKey: 'custName'}"
@onChange="handleYueJieSelect" placeholder="请选择月结账户"
>
<tpx-text-item label="月结账户" :checkedList="yuejieRes.checkedList"></tpx-text-item>
</tpx-select>
</view>
<template v-if="submitParam.custNo">
<view class="yunf-input-item">
<tpx-text-item label="月结编号" :value="submitParam.custNo"></tpx-text-item>
</view>
</template>
</template>
<template v-if="submitParam.paymentType">
<view class="yunf-input-item">
<tpx-select v-model:value="submitParam.salesmen" v-model:resObject="salemanRes" :getListFun="getSalemanList" :transKeyVal="{valKey: 'empName',titleKey: 'empName'}"
placeholder="请选择销售联系人" :disabled="isShowYueJie"
>
<tpx-text-item label="销售联系人" :checkedList="salemanRes.checkedList">
<template v-if="isShowYueJie" v-slot:rightRcon></template>
</tpx-text-item>
</tpx-select>
</view>
<view class="yunf-input-item">
<tpx-text-item label="销售联系人" :value="submitParam.salesmenName"></tpx-text-item>
</view>
<view class="yunf-input-item">
<tpx-text-item label="回款联系人" :value="submitParam.payeeName"></tpx-text-item>
<tpx-select v-model:value="submitParam.payee" v-model:resObject="paybeeRes" :getListFun="getPayeeList" :transKeyVal="{valKey: 'empName',titleKey: 'empName'}"
placeholder="请选择回款联系人" :disabled="isShowYueJie"
>
<tpx-text-item label="回款联系人" :checkedList="paybeeRes.checkedList">
<template v-if="isShowYueJie" v-slot:rightRcon></template>
</tpx-text-item>
</tpx-select>
</view>
</template>
@ -285,7 +299,11 @@
isShowJifei(){
let vals = Object.values(this.jifeiParam)
return vals.length == vals.filter(v => !!v).length
}
},
isShowYueJie(){
let { submitParam } = this
return submitParam.paymentType == 2 || submitParam.paymentType == 4 || submitParam.paymentType == 5
},
},
data() {
return this.getDefaultData()
@ -321,6 +339,8 @@
yuejieRes: { list: [], checkedList: [] },
destPostRes: { list: [], checkedList: [] },
wareRes: { list: [], checkedList: [] },
paybeeRes: { list: [], checkedList: [] },
salemanRes: { list: [], checkedList: [] },
goodChooseModal: {
show: false,
},
@ -338,6 +358,8 @@
getMonthpayAccountList: apiService.getMonthpayAccountList,
getDestPositionList: apiService.getDestPositionList,
getWarehouseInList: apiService.warehouseInList,
getPayeeList: apiService.getPayeeList,
getSalemanList: apiService.getSalemanList,
async initData() { // 初始化
this.isEdit = Boolean(this.queryOption.billCode || this.queryOption.orderSn)
if(this.isEdit) {
@ -377,6 +399,8 @@
this.submitParam.salesmen = item.salesmen
this.submitParam.salesmenName = item.salesmenName
this.submitParam.payee = item.payeeName
this.salemanRes.checkedList = [{ title: item.salesmen, val: item.salesmen }]
this.paybeeRes.checkedList = [{ title: item.payee, val: item.payee }]
},
handleWayChange(val) { // 线路切换
let { productRes, submitParam } = this.getDefaultData()