uu
This commit is contained in:
aihe
parent
7adbdcb034
commit
273232f9fa
@ -12,16 +12,29 @@ export const submitOrder = (data = {})=> {
|
||||
export const getCustomerUserList = (data = {})=> {
|
||||
return coreRequest(url.getCustomerUserList, data, {})
|
||||
}
|
||||
|
||||
// 地址列表
|
||||
export const getCustomerUserAddressList = (data = {})=> {
|
||||
return coreRequest(url.getCustomerUserAddressList, data, {})
|
||||
return coreRequest(url.getCustomerUserAddressList, data, {}, "GET")
|
||||
}
|
||||
|
||||
export const getPickStaffList = (data = {})=> {
|
||||
return coreRequest(url.getPickStaffList, data, {})
|
||||
// 操作员列表
|
||||
export const getOpStaffList = (data = {})=> {
|
||||
return coreRequest(url.getPickStaffList, { ...data, postCode: 'OP' }, {}, "GET")
|
||||
}
|
||||
|
||||
// 收派员列表
|
||||
export const getRSDStaffList = (data = {})=> {
|
||||
return coreRequest(url.getPickStaffList, { ...data, postCode: 'RSD' }, {}, "GET")
|
||||
}
|
||||
|
||||
|
||||
// 货物列表
|
||||
export const getGoodsList = (data = {})=> {
|
||||
return coreRequest(url.getGoodsList, data, {})
|
||||
}
|
||||
|
||||
// 月结账户列表
|
||||
export const getMonthpayAccountList = (data = {})=> {
|
||||
return coreRequest(url.getMonthpayAccountList, data, {}, "GET")
|
||||
}
|
||||
|
||||
|
||||
@ -7,16 +7,16 @@ export default {
|
||||
getEmisCountry: `/emis/emisCountry/list`, // 获取国家列表
|
||||
getEmisRegion: `/emis/emisRegion/list`,// 获取省市区列表
|
||||
getDicDataJson: `/common/getDicDataJson`, // 获取枚举字段
|
||||
|
||||
getTransLineList: `/emis/emisTransLine/listSimple`, // 获取路线列表
|
||||
getTransProductList: `/emis/emisTransProduct/listSimple`, // 获取产品列表
|
||||
|
||||
createOrderNo: `/emis/common/realMatchWaybill`, // 创建运单号
|
||||
submitOrder: `/emis/emisWaybill/realSubmitOrder`, // 提交订单
|
||||
getCustomerUserList: `/emis/emisCustomerUser/listSimple`, // 获取网点客户列表
|
||||
getCustomerUserAddressList: `/emis/emisCustomerAddress/listSimple`, // 获取客户地址列表
|
||||
getPickStaffList: `/emis/emisStaff/getPickStaffList`, // 获取取件员用户列表
|
||||
getPickStaffList: `/emis/emisStaff/getStaffList`, // 获取操作、收派 员用户列表
|
||||
getGoodsList: `/emis/emisGoods/listSimple`, // 获取货物列表
|
||||
getMonthpayAccountList: `/emis/emisMonthpayAccount/listSimple`, // 月结账号列表
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
63
components/tpx-text-item/tpx-text-item.vue
Normal file
63
components/tpx-text-item/tpx-text-item.vue
Normal file
@ -0,0 +1,63 @@
|
||||
<template>
|
||||
<u-row>
|
||||
<view>
|
||||
<template v-if="!$slots.left">
|
||||
<u-text :text="label" size="28" :bold="true"></u-text>
|
||||
</template>
|
||||
<slot name="left"></slot>
|
||||
</view>
|
||||
<u-row custom-style="flex: 1;" justify="end" align="center">
|
||||
|
||||
<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" size="26" name="arrow-right" color="#333"></u-icon>
|
||||
</template>
|
||||
<slot name="right"></slot>
|
||||
</u-row>
|
||||
</u-row>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
computed: {
|
||||
title() {
|
||||
let title = this.value
|
||||
!this.value && this.list && (title = '请选择');
|
||||
this.value && this.list && (title = this.list.filter(t=> t.val == this.value)[0].title);
|
||||
return title
|
||||
}
|
||||
},
|
||||
props: {
|
||||
label: {
|
||||
default () {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
value: {
|
||||
},
|
||||
list: {
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
||||
},
|
||||
onHide() {
|
||||
|
||||
},
|
||||
unmounted() {},
|
||||
|
||||
methods: {
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
|
||||
</style>
|
||||
@ -7,7 +7,7 @@
|
||||
<view class="pgb-header">
|
||||
<view class="com-jianju">
|
||||
<!-- 关键字搜索框 -->
|
||||
<tpx-search placeholder="请输入姓名/电话/地址关键字" v-model:value="searchParam.keyword"></tpx-search>
|
||||
<tpx-search placeholder="请输入姓名/电话/地址关键字" v-model:value="searchParam.searchValue"></tpx-search>
|
||||
</view>
|
||||
|
||||
<view class="com-jianju" style="padding-top: 40rpx;">
|
||||
@ -102,7 +102,7 @@
|
||||
return {
|
||||
tabList ,
|
||||
searchParam: {
|
||||
keyword: '',
|
||||
searchValue: '',
|
||||
addressType: tabList[0].val
|
||||
},
|
||||
queryOption: {
|
||||
|
||||
@ -33,16 +33,16 @@ export const getOrderModels = ()=> {
|
||||
"orderDate": undefined,
|
||||
"userId": '', // 客户id
|
||||
"openId": undefined,
|
||||
"paymentType": undefined,
|
||||
"paymentType": undefined, // 付款方式
|
||||
"calcFeeType": undefined,
|
||||
"custNo": undefined,
|
||||
"transLine": '', // 路线
|
||||
"productType": undefined,
|
||||
"customsClear": undefined,
|
||||
"customsEclaration": undefined,
|
||||
"productType": undefined, // 产品
|
||||
"customsClear": undefined, // 清关方式
|
||||
"customsEclaration": undefined, // 报关方式
|
||||
"packType": undefined,
|
||||
"dispatchMethod": undefined,
|
||||
"pickupMethod": undefined,
|
||||
"pickupMethod": undefined, // 取件方式
|
||||
"pickStartDate": undefined,
|
||||
"pickFinishDate": undefined,
|
||||
"intoWarehouseCode": undefined,
|
||||
@ -72,7 +72,7 @@ export const getOrderModels = ()=> {
|
||||
"transferCode": undefined,
|
||||
"transferBillcode": undefined,
|
||||
"dispFdDate": undefined,
|
||||
"takePieceEmployeeCode": undefined,
|
||||
"takePieceEmployeeCode": undefined, // 收派员
|
||||
"sendSiteCode": undefined,
|
||||
"destinationCode": undefined,
|
||||
"destinationProvince": undefined,
|
||||
@ -83,7 +83,7 @@ export const getOrderModels = ()=> {
|
||||
"marketManCode": undefined,
|
||||
"payee": undefined,
|
||||
"salesmen": undefined,
|
||||
"operateEmployeeCode": undefined,
|
||||
"operateEmployeeCode": undefined, // 操作员
|
||||
"blMessage": undefined,
|
||||
"blAcceptMessage": undefined
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
<u-row justify="between" custom-style="margin-top:20rpx;">
|
||||
<view style="width: 130rpx;">客户</view>
|
||||
<view style="flex:1;">
|
||||
<tpx-select v-model:resObject="kehuRes" :getListFun="getCustomerUserList" :transKeyVal="{valKey: 'id',titleKey: 'customerFullName'}" v-model:value="submitParam.userId" :isWhite="true"></tpx-select>
|
||||
<tpx-select v-model:resObject="kehuRes" :getListFun="getCustomerUserList" :transKeyVal="{valKey: 'customerCode',titleKey: 'customerFullName'}" v-model:value="submitParam.userId" :isWhite="true"></tpx-select>
|
||||
</view>
|
||||
</u-row>
|
||||
</view>
|
||||
@ -29,6 +29,7 @@
|
||||
</u-row>
|
||||
</view>
|
||||
<view class="blcok-white">
|
||||
<!-- 地址选择 -->
|
||||
<bpe-addressinfo-tmp v-model:value="submitParam"></bpe-addressinfo-tmp>
|
||||
</view>
|
||||
|
||||
@ -36,133 +37,67 @@
|
||||
<view class="blcok-white" style="padding-top: 0;padding-bottom: 0;">
|
||||
<view>
|
||||
<view class="yunf-input-item">
|
||||
<tpx-select v-model:value="submitParam.transLine" v-model:resObject="wayRes" :getListFun="getTransLineList" :transKeyVal="{valKey: 'id',titleKey: 'lineName'}" :customInput="true"
|
||||
<tpx-select v-model:value="submitParam.transLine" v-model:resObject="wayRes" :getListFun="getTransLineList" :transKeyVal="{valKey: 'lineCode',titleKey: 'lineName'}" :customInput="true"
|
||||
:searchParam="waySearchParam"
|
||||
>
|
||||
<u-row>
|
||||
<view>
|
||||
<u-text text="线路" size="28" :bold="true"></u-text>
|
||||
</view>
|
||||
<u-row custom-style="flex: 1;" justify="end" align="center">
|
||||
<u-text align="right" margin="0 12rpx 0 0" size="26"
|
||||
text="请选择"></u-text>
|
||||
<u-icon size="26" name="arrow-right" color="#333"></u-icon>
|
||||
</u-row>
|
||||
</u-row>
|
||||
<tpx-text-item label="线路" :value="submitParam.transLine" :list="wayRes.list"></tpx-text-item>
|
||||
</tpx-select>
|
||||
</view>
|
||||
<view class="yunf-input-item">
|
||||
<tpx-select v-model:value="submitParam.proidTODO" v-model:resObject="productRes" :getListFun="getTransProductList" :transKeyVal="{valKey: 'id',titleKey: 'prodName'}" :isWhite="true" :customInput="true"
|
||||
<tpx-select v-model:value="submitParam.productType" v-model:resObject="productRes" :getListFun="getTransProductList" :transKeyVal="{valKey: 'prodCode',titleKey: 'prodName'}" :isWhite="true" :customInput="true"
|
||||
:searchParam="productSearchParam"
|
||||
>
|
||||
<u-row>
|
||||
<view>
|
||||
<u-text text="产品类型" size="28" :bold="true"></u-text>
|
||||
</view>
|
||||
<u-row custom-style="flex: 1;" justify="end" align="center">
|
||||
<u-text align="right" margin="0 12rpx 0 0" size="26"
|
||||
text="请选择"></u-text>
|
||||
<u-icon size="26" name="arrow-right" color="#333"></u-icon>
|
||||
</u-row>
|
||||
</u-row>
|
||||
<tpx-text-item label="产品类型" :value="submitParam.productType" :list="productRes.list"></tpx-text-item>
|
||||
</tpx-select>
|
||||
</view>
|
||||
|
||||
<view class="yunf-input-item">
|
||||
<tpx-select v-model:value="submitParam.type1" :list="baoguanList"
|
||||
<tpx-select v-model:value="submitParam.customsEclaration" :list="dicData.emis_declare_mode"
|
||||
mode="drop" customInput="true"
|
||||
>
|
||||
<u-row justify="between">
|
||||
<text class="font-26 font-weight">报关方式</text>
|
||||
<u-row justify="end" align="center">
|
||||
<u-text align="right" margin="0 12rpx 0 0" size="26" text="请选择"></u-text>
|
||||
<u-icon size="26" name="arrow-right" color="#333"></u-icon>
|
||||
</u-row>
|
||||
</u-row>
|
||||
<tpx-text-item label="报关方式" :value="submitParam.customsEclaration" :list="dicData.emis_declare_mode"></tpx-text-item>
|
||||
</tpx-select>
|
||||
</view>
|
||||
|
||||
<view class="yunf-input-item">
|
||||
<tpx-select v-model:value="submitParam.type2" :list="qingguanList"
|
||||
<tpx-select v-model:value="submitParam.customsClear" :list="dicData.emis_customs_clear"
|
||||
mode="drop" customInput="true"
|
||||
>
|
||||
<u-row justify="between">
|
||||
<text class="font-26 font-weight">清关方式</text>
|
||||
<u-row justify="end" align="center">
|
||||
<u-text align="right" margin="0 12rpx 0 0" size="26" text="请选择"></u-text>
|
||||
<u-icon size="26" name="arrow-right" color="#333"></u-icon>
|
||||
</u-row>
|
||||
</u-row>
|
||||
<tpx-text-item label="清关方式" :value="submitParam.customsClear" :list="dicData.emis_customs_clear"></tpx-text-item>
|
||||
</tpx-select>
|
||||
</view>
|
||||
|
||||
<view class="yunf-input-item">
|
||||
<tpx-select v-model:value="submitParam.type2" :list="[]"
|
||||
<tpx-select v-model:value="submitParam.pickupMethod" :list="dicData.emis_qujian_fangshi"
|
||||
mode="drop" customInput="true"
|
||||
>
|
||||
<u-row justify="between">
|
||||
<text class="font-26 font-weight">取件方式</text>
|
||||
<u-row justify="end" align="center">
|
||||
<u-text align="right" margin="0 12rpx 0 0" size="26" text="请选择"></u-text>
|
||||
<u-icon size="26" name="arrow-right" color="#333"></u-icon>
|
||||
</u-row>
|
||||
</u-row>
|
||||
<tpx-text-item label="取件方式" :value="submitParam.pickupMethod" :list="dicData.emis_qujian_fangshi"></tpx-text-item>
|
||||
</tpx-select>
|
||||
</view>
|
||||
|
||||
<view class="yunf-input-item">
|
||||
<tpx-select v-model:value="submitParam.type2" :list="[]"
|
||||
mode="drop" customInput="true"
|
||||
>
|
||||
<u-row justify="between">
|
||||
<text class="font-26 font-weight">操作员</text>
|
||||
<u-row justify="end" align="center">
|
||||
<u-text align="right" margin="0 12rpx 0 0" size="26" text="请选择"></u-text>
|
||||
<u-icon size="26" name="arrow-right" color="#333"></u-icon>
|
||||
</u-row>
|
||||
</u-row>
|
||||
<tpx-select v-model:value="submitParam.operateEmployeeCode" v-model:resObject="caozuoRes" :getListFun="getOpStaffList" :transKeyVal="{valKey: 'empCode',titleKey: 'empName'}" :customInput="true">
|
||||
<tpx-text-item label="操作员" :value="submitParam.operateEmployeeCode" :list="caozuoRes.list"></tpx-text-item>
|
||||
</tpx-select>
|
||||
</view>
|
||||
|
||||
<view class="yunf-input-item">
|
||||
<tpx-select v-model:value="submitParam.type2" :list="[]"
|
||||
mode="drop" customInput="true"
|
||||
>
|
||||
<u-row justify="between">
|
||||
<text class="font-26 font-weight">收派员</text>
|
||||
<u-row justify="end" align="center">
|
||||
<u-text align="right" margin="0 12rpx 0 0" size="26" text="请选择"></u-text>
|
||||
<u-icon size="26" name="arrow-right" color="#333"></u-icon>
|
||||
</u-row>
|
||||
</u-row>
|
||||
<tpx-select v-model:value="submitParam.takePieceEmployeeCode" v-model:resObject="shoupaiRes" :getListFun="getRSDStaffList" :transKeyVal="{valKey: 'empCode',titleKey: 'empName'}" :customInput="true">
|
||||
<tpx-text-item label="收派员" :value="submitParam.takePieceEmployeeCode" :list="shoupaiRes.list"></tpx-text-item>
|
||||
</tpx-select>
|
||||
</view>
|
||||
|
||||
<view class="yunf-input-item">
|
||||
<tpx-select v-model:value="submitParam.type2" :list="[]"
|
||||
<tpx-select v-model:value="submitParam.paymentType" :list="dicData.emis_payment_type"
|
||||
mode="drop" customInput="true"
|
||||
>
|
||||
<u-row justify="between">
|
||||
<text class="font-26 font-weight">付款方式</text>
|
||||
<u-row justify="end" align="center">
|
||||
<u-text align="right" margin="0 12rpx 0 0" size="26" text="请选择"></u-text>
|
||||
<u-icon size="26" name="arrow-right" color="#333"></u-icon>
|
||||
</u-row>
|
||||
</u-row>
|
||||
<tpx-text-item label="付款方式" :value="submitParam.paymentType" :list="dicData.emis_payment_type"></tpx-text-item>
|
||||
</tpx-select>
|
||||
</view>
|
||||
|
||||
<view class="yunf-input-item">
|
||||
<tpx-select v-model:value="submitParam.type2" :list="[]"
|
||||
mode="drop" customInput="true"
|
||||
>
|
||||
<u-row justify="between">
|
||||
<text class="font-26 font-weight">月结账户</text>
|
||||
<u-row justify="end" align="center">
|
||||
<u-text align="right" margin="0 12rpx 0 0" size="26" text="请选择"></u-text>
|
||||
<u-icon size="26" name="arrow-right" color="#333"></u-icon>
|
||||
</u-row>
|
||||
</u-row>
|
||||
<tpx-select v-model:value="submitParam.custNo" v-model:resObject="yuejieRes" :getListFun="getMonthpayAccountList" :transKeyVal="{valKey: 'custNo',titleKey: 'custName'}" :customInput="true">
|
||||
<tpx-text-item label="月结账户" :value="submitParam.custNo" :list="yuejieRes.list"></tpx-text-item>
|
||||
</tpx-select>
|
||||
</view>
|
||||
|
||||
@ -328,6 +263,9 @@
|
||||
},
|
||||
productSearchParam() {
|
||||
return { transLineCode: this.submitParam.transLine }
|
||||
},
|
||||
dicData() {
|
||||
return this.$store.getters.dicData
|
||||
}
|
||||
},
|
||||
data() {
|
||||
@ -336,8 +274,10 @@
|
||||
kehuRes: { list: [] },
|
||||
wayRes: { list: [] },
|
||||
productRes: { list: [] },
|
||||
caozuoRes: { list: [] },
|
||||
shoupaiRes: { list: [] },
|
||||
yuejieRes: { list: [] },
|
||||
tipsList: [
|
||||
|
||||
],
|
||||
goodChooseModal: {
|
||||
show: false,
|
||||
@ -375,6 +315,9 @@
|
||||
getCustomerUserList: apiService.getCustomerUserList,
|
||||
getTransLineList: apiService.getTransLineList,
|
||||
getTransProductList: apiService.getTransProductList,
|
||||
getOpStaffList: apiService.getOpStaffList,
|
||||
getRSDStaffList: apiService.getRSDStaffList,
|
||||
getMonthpayAccountList: apiService.getMonthpayAccountList,
|
||||
async initData() {
|
||||
// uni.showLoading({
|
||||
// title: '加载中'
|
||||
|
||||
@ -7,6 +7,7 @@ import {
|
||||
} from "@/session"
|
||||
import * as apiService from "@/common/api"
|
||||
import { goto } from "@/common/untool"
|
||||
import { transListKeyTitle } from "@/common/util"
|
||||
|
||||
export default {
|
||||
state: {
|
||||
@ -16,7 +17,6 @@ export default {
|
||||
[COMMONKEY.GETDIC](state, provider) {
|
||||
state.dicData = provider
|
||||
},
|
||||
|
||||
},
|
||||
getters: {
|
||||
// packInfo(state) {
|
||||
@ -24,7 +24,7 @@ export default {
|
||||
// }
|
||||
},
|
||||
actions: {
|
||||
async [COMMONKEY.GETDIST]({
|
||||
async [COMMONKEY.GETDIC]({
|
||||
dispatch,
|
||||
commit,
|
||||
state,
|
||||
@ -36,17 +36,12 @@ export default {
|
||||
resInfo?.data?.map?.((item)=> {
|
||||
let key = Object.keys(item).filter(i=> i != 'desc')[0]
|
||||
if(key) {
|
||||
item[key]?.map?.(tmp=> {
|
||||
tmp.title = tmp.label
|
||||
tmp.val = tmp.value
|
||||
})
|
||||
data[key] = {
|
||||
desc: item.desc || '',
|
||||
list: item[key] || []
|
||||
}
|
||||
let list = transListKeyTitle({ valKey:'value', titleKey: 'label', list: item[key] })
|
||||
data[key] = list
|
||||
}
|
||||
})
|
||||
commit(COMMONKEY.GETDIC, data)
|
||||
},
|
||||
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user