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-04-27 11:19:18 +08:00
parent 7adbdcb034
commit 273232f9fa
7 changed files with 126 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/api/order.js
View File

@ -12,16 +12,29 @@ export const submitOrder = (data = {})=> {
export const getCustomerUserList = (data = {})=> { export const getCustomerUserList = (data = {})=> {
return coreRequest(url.getCustomerUserList, data, {}) return coreRequest(url.getCustomerUserList, data, {})
} }
// 地址列表
export const getCustomerUserAddressList = (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 = {})=> { export const getGoodsList = (data = {})=> {
return coreRequest(url.getGoodsList, data, {}) return coreRequest(url.getGoodsList, data, {})
} }
// 月结账户列表
export const getMonthpayAccountList = (data = {})=> {
return coreRequest(url.getMonthpayAccountList, data, {}, "GET")
}

6
common/api/url.js
View File

@ -7,16 +7,16 @@ export default {
getEmisCountry: `/emis/emisCountry/list`, // 获取国家列表 getEmisCountry: `/emis/emisCountry/list`, // 获取国家列表
getEmisRegion: `/emis/emisRegion/list`,// 获取省市区列表 getEmisRegion: `/emis/emisRegion/list`,// 获取省市区列表
getDicDataJson: `/common/getDicDataJson`, // 获取枚举字段 getDicDataJson: `/common/getDicDataJson`, // 获取枚举字段
getTransLineList: `/emis/emisTransLine/listSimple`, // 获取路线列表 getTransLineList: `/emis/emisTransLine/listSimple`, // 获取路线列表
getTransProductList: `/emis/emisTransProduct/listSimple`, // 获取产品列表 getTransProductList: `/emis/emisTransProduct/listSimple`, // 获取产品列表
createOrderNo: `/emis/common/realMatchWaybill`, // 创建运单号 createOrderNo: `/emis/common/realMatchWaybill`, // 创建运单号
submitOrder: `/emis/emisWaybill/realSubmitOrder`, // 提交订单 submitOrder: `/emis/emisWaybill/realSubmitOrder`, // 提交订单
getCustomerUserList: `/emis/emisCustomerUser/listSimple`, // 获取网点客户列表 getCustomerUserList: `/emis/emisCustomerUser/listSimple`, // 获取网点客户列表
getCustomerUserAddressList: `/emis/emisCustomerAddress/listSimple`, // 获取客户地址列表 getCustomerUserAddressList: `/emis/emisCustomerAddress/listSimple`, // 获取客户地址列表
getPickStaffList: `/emis/emisStaff/getPickStaffList`, // 获取取件员用户列表 getPickStaffList: `/emis/emisStaff/getStaffList`, // 获取操作、收派 员用户列表
getGoodsList: `/emis/emisGoods/listSimple`, // 获取货物列表 getGoodsList: `/emis/emisGoods/listSimple`, // 获取货物列表
getMonthpayAccountList: `/emis/emisMonthpayAccount/listSimple`, // 月结账号列表
} }

63
components/tpx-text-item/tpx-text-item.vue Normal file
View 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>

4
pages/address/list.vue
View File

@ -7,7 +7,7 @@
<view class="pgb-header"> <view class="pgb-header">
<view class="com-jianju"> <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>
<view class="com-jianju" style="padding-top: 40rpx;"> <view class="com-jianju" style="padding-top: 40rpx;">
@ -102,7 +102,7 @@
return { return {
tabList , tabList ,
searchParam: { searchParam: {
keyword: '', searchValue: '',
addressType: tabList[0].val addressType: tabList[0].val
}, },
queryOption: { queryOption: {

14
pages/post/model.js
View File

@ -33,16 +33,16 @@ export const getOrderModels = ()=> {
"orderDate": undefined, "orderDate": undefined,
"userId": '', // 客户id "userId": '', // 客户id
"openId": undefined, "openId": undefined,
"paymentType": undefined, "paymentType": undefined, // 付款方式
"calcFeeType": undefined, "calcFeeType": undefined,
"custNo": undefined, "custNo": undefined,
"transLine": '', // 路线 "transLine": '', // 路线
"productType": undefined, "productType": undefined, // 产品
"customsClear": undefined, "customsClear": undefined, // 清关方式
"customsEclaration": undefined, "customsEclaration": undefined, // 报关方式
"packType": undefined, "packType": undefined,
"dispatchMethod": undefined, "dispatchMethod": undefined,
"pickupMethod": undefined, "pickupMethod": undefined, // 取件方式
"pickStartDate": undefined, "pickStartDate": undefined,
"pickFinishDate": undefined, "pickFinishDate": undefined,
"intoWarehouseCode": undefined, "intoWarehouseCode": undefined,
@ -72,7 +72,7 @@ export const getOrderModels = ()=> {
"transferCode": undefined, "transferCode": undefined,
"transferBillcode": undefined, "transferBillcode": undefined,
"dispFdDate": undefined, "dispFdDate": undefined,
"takePieceEmployeeCode": undefined, "takePieceEmployeeCode": undefined, // 收派员
"sendSiteCode": undefined, "sendSiteCode": undefined,
"destinationCode": undefined, "destinationCode": undefined,
"destinationProvince": undefined, "destinationProvince": undefined,
@ -83,7 +83,7 @@ export const getOrderModels = ()=> {
"marketManCode": undefined, "marketManCode": undefined,
"payee": undefined, "payee": undefined,
"salesmen": undefined, "salesmen": undefined,
"operateEmployeeCode": undefined, "operateEmployeeCode": undefined, // 操作员
"blMessage": undefined, "blMessage": undefined,
"blAcceptMessage": undefined "blAcceptMessage": undefined
} }

115
pages/post/openorder.vue
View File

@ -17,7 +17,7 @@
<u-row justify="between" custom-style="margin-top:20rpx;"> <u-row justify="between" custom-style="margin-top:20rpx;">
<view style="width: 130rpx;">客户</view> <view style="width: 130rpx;">客户</view>
<view style="flex:1;"> <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> </view>
</u-row> </u-row>
</view> </view>
@ -29,6 +29,7 @@
</u-row> </u-row>
</view> </view>
<view class="blcok-white"> <view class="blcok-white">
<!-- 地址选择 -->
<bpe-addressinfo-tmp v-model:value="submitParam"></bpe-addressinfo-tmp> <bpe-addressinfo-tmp v-model:value="submitParam"></bpe-addressinfo-tmp>
</view> </view>
@ -36,133 +37,67 @@
<view class="blcok-white" style="padding-top: 0;padding-bottom: 0;"> <view class="blcok-white" style="padding-top: 0;padding-bottom: 0;">
<view> <view>
<view class="yunf-input-item"> <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" :searchParam="waySearchParam"
> >
<u-row> <tpx-text-item label="线路" :value="submitParam.transLine" :list="wayRes.list"></tpx-text-item>
<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-select> </tpx-select>
</view> </view>
<view class="yunf-input-item"> <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" :searchParam="productSearchParam"
> >
<u-row> <tpx-text-item label="产品类型" :value="submitParam.productType" :list="productRes.list"></tpx-text-item>
<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-select> </tpx-select>
</view> </view>
<view class="yunf-input-item"> <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" mode="drop" customInput="true"
> >
<u-row justify="between"> <tpx-text-item label="报关方式" :value="submitParam.customsEclaration" :list="dicData.emis_declare_mode"></tpx-text-item>
<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> </tpx-select>
</view> </view>
<view class="yunf-input-item"> <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" mode="drop" customInput="true"
> >
<u-row justify="between"> <tpx-text-item label="清关方式" :value="submitParam.customsClear" :list="dicData.emis_customs_clear"></tpx-text-item>
<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> </tpx-select>
</view> </view>
<view class="yunf-input-item"> <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" mode="drop" customInput="true"
> >
<u-row justify="between"> <tpx-text-item label="取件方式" :value="submitParam.pickupMethod" :list="dicData.emis_qujian_fangshi"></tpx-text-item>
<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> </tpx-select>
</view> </view>
<view class="yunf-input-item"> <view class="yunf-input-item">
<tpx-select v-model:value="submitParam.type2" :list="[]" <tpx-select v-model:value="submitParam.operateEmployeeCode" v-model:resObject="caozuoRes" :getListFun="getOpStaffList" :transKeyVal="{valKey: 'empCode',titleKey: 'empName'}" :customInput="true">
mode="drop" customInput="true" <tpx-text-item label="操作员" :value="submitParam.operateEmployeeCode" :list="caozuoRes.list"></tpx-text-item>
>
<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> </tpx-select>
</view> </view>
<view class="yunf-input-item"> <view class="yunf-input-item">
<tpx-select v-model:value="submitParam.type2" :list="[]" <tpx-select v-model:value="submitParam.takePieceEmployeeCode" v-model:resObject="shoupaiRes" :getListFun="getRSDStaffList" :transKeyVal="{valKey: 'empCode',titleKey: 'empName'}" :customInput="true">
mode="drop" customInput="true" <tpx-text-item label="收派员" :value="submitParam.takePieceEmployeeCode" :list="shoupaiRes.list"></tpx-text-item>
>
<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> </tpx-select>
</view> </view>
<view class="yunf-input-item"> <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" mode="drop" customInput="true"
> >
<u-row justify="between"> <tpx-text-item label="付款方式" :value="submitParam.paymentType" :list="dicData.emis_payment_type"></tpx-text-item>
<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> </tpx-select>
</view> </view>
<view class="yunf-input-item"> <view class="yunf-input-item">
<tpx-select v-model:value="submitParam.type2" :list="[]" <tpx-select v-model:value="submitParam.custNo" v-model:resObject="yuejieRes" :getListFun="getMonthpayAccountList" :transKeyVal="{valKey: 'custNo',titleKey: 'custName'}" :customInput="true">
mode="drop" customInput="true" <tpx-text-item label="月结账户" :value="submitParam.custNo" :list="yuejieRes.list"></tpx-text-item>
>
<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> </tpx-select>
</view> </view>
@ -328,6 +263,9 @@
}, },
productSearchParam() { productSearchParam() {
return { transLineCode: this.submitParam.transLine } return { transLineCode: this.submitParam.transLine }
},
dicData() {
return this.$store.getters.dicData
} }
}, },
data() { data() {
@ -336,8 +274,10 @@
kehuRes: { list: [] }, kehuRes: { list: [] },
wayRes: { list: [] }, wayRes: { list: [] },
productRes: { list: [] }, productRes: { list: [] },
caozuoRes: { list: [] },
shoupaiRes: { list: [] },
yuejieRes: { list: [] },
tipsList: [ tipsList: [
], ],
goodChooseModal: { goodChooseModal: {
show: false, show: false,
@ -375,6 +315,9 @@
getCustomerUserList: apiService.getCustomerUserList, getCustomerUserList: apiService.getCustomerUserList,
getTransLineList: apiService.getTransLineList, getTransLineList: apiService.getTransLineList,
getTransProductList: apiService.getTransProductList, getTransProductList: apiService.getTransProductList,
getOpStaffList: apiService.getOpStaffList,
getRSDStaffList: apiService.getRSDStaffList,
getMonthpayAccountList: apiService.getMonthpayAccountList,
async initData() { async initData() {
// uni.showLoading({ // uni.showLoading({
// title: '加载中' // title: '加载中'

15
store/modules/common.js
View File

@ -7,6 +7,7 @@ import {
} from "@/session" } from "@/session"
import * as apiService from "@/common/api" import * as apiService from "@/common/api"
import { goto } from "@/common/untool" import { goto } from "@/common/untool"
import { transListKeyTitle } from "@/common/util"
export default { export default {
state: { state: {
@ -16,7 +17,6 @@ export default {
[COMMONKEY.GETDIC](state, provider) { [COMMONKEY.GETDIC](state, provider) {
state.dicData = provider state.dicData = provider
}, },
}, },
getters: { getters: {
// packInfo(state) { // packInfo(state) {
@ -24,7 +24,7 @@ export default {
// } // }
}, },
actions: { actions: {
async [COMMONKEY.GETDIST]({ async [COMMONKEY.GETDIC]({
dispatch, dispatch,
commit, commit,
state, state,
@ -36,17 +36,12 @@ export default {
resInfo?.data?.map?.((item)=> { resInfo?.data?.map?.((item)=> {
let key = Object.keys(item).filter(i=> i != 'desc')[0] let key = Object.keys(item).filter(i=> i != 'desc')[0]
if(key) { if(key) {
item[key]?.map?.(tmp=> { let list = transListKeyTitle({ valKey:'value', titleKey: 'label', list: item[key] })
tmp.title = tmp.label data[key] = list
tmp.val = tmp.value
})
data[key] = {
desc: item.desc || '',
list: item[key] || []
}
} }
}) })
commit(COMMONKEY.GETDIC, data) commit(COMMONKEY.GETDIC, data)
}, },
} }
} }