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 13:55:14 +08:00
parent 273232f9fa
commit 39d3c3a386
5 changed files with 124 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/api/order.js
View File

@ -12,6 +12,7 @@ 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, {}, "GET") return coreRequest(url.getCustomerUserAddressList, data, {}, "GET")
@ -38,3 +39,9 @@ export const getMonthpayAccountList = (data = {})=> {
return coreRequest(url.getMonthpayAccountList, data, {}, "GET") return coreRequest(url.getMonthpayAccountList, data, {}, "GET")
} }
// 月结账户列表
export const getDestSiteList = (data = {})=> {
return coreRequest(url.getDestSiteList, data, {}, "GET")
}

2
common/api/url.js
View File

@ -16,7 +16,7 @@ export default {
getPickStaffList: `/emis/emisStaff/getStaffList`, // 获取操作、收派 员用户列表 getPickStaffList: `/emis/emisStaff/getStaffList`, // 获取操作、收派 员用户列表
getGoodsList: `/emis/emisGoods/listSimple`, // 获取货物列表 getGoodsList: `/emis/emisGoods/listSimple`, // 获取货物列表
getMonthpayAccountList: `/emis/emisMonthpayAccount/listSimple`, // 月结账号列表 getMonthpayAccountList: `/emis/emisMonthpayAccount/listSimple`, // 月结账号列表
getDestSiteList: `/emis/emisDestination/getDestSite`, // 目的网点列表
} }

93
components/buns-post-edit-templates/bpe-cost-tmp.vue
View File

@ -4,64 +4,78 @@
<u-row> <u-row>
<view class="lft1 font-28">计费方式</view> <view class="lft1 font-28">计费方式</view>
<view style="flex: 1;"> <view style="flex: 1;">
<u-radio-group v-model="submitInfo.costType" <u-radio-group v-model="modelInfo.calcFeeType"
@change="groupChange" @change="groupChange"
> >
<u-radio v-for="(item, index) in costTypeList" :label="item.title" :name="item.val" <u-radio v-for="(item, index) in dicData.emis_calc_fee_type" :label="item.title" :name="item.val"
activeColor="#B12D29" size="30" labelSize="26" :custom-style="`margin-right: ${index+1<costTypeList.length?30:0}rpx;`" activeColor="#B12D29" size="30" labelSize="26" :custom-style="`margin-right: ${index+1<dicData.emis_calc_fee_type.length?30:0}rpx;`"
> >
</u-radio> </u-radio>
</u-radio-group> </u-radio-group>
</view> </view>
</u-row> </u-row>
</view> </view>
<view class="jsfm-item">
<u-row>
<view class="lft1 font-28">
<tpx-select :list="[]" v-model:value="submitInfo.kehuid" placeholder="清关费" mode="drop" :isWhite="true"></tpx-select>
</view>
<u-row custom-style="flex:1;">
<tpx-input v-model:value="submitInfo.ke1" :isWhite="true" custom-style="width: 120rpx;"></tpx-input>
<text class="font-26 pl-20 pr-10">续重</text>
<tpx-input v-model:value="submitInfo.xuzh" :isWhite="true" custom-style="width: 120rpx;" suffix="KG"></tpx-input>
</u-row>
<view class="delicon">
<u-icon name="minus-circle" size="30"></u-icon>
</view>
</u-row>
<view class="mt-10">运输费计算公式: </view>
</view>
<view class="jsfm-item"> <template v-if="modelInfo.calcFeeType == 1 || modelInfo.calcFeeType == 2">
<u-row> <view class="jsfm-item">
<view class="lft1 font-28"> <u-row custom-style="gap: 20rpx;">
<tpx-select :list="[]" v-model:value="submitInfo.kehuid" placeholder="清关费" mode="drop" :isWhite="true"></tpx-select> <u-row>
</view> <text class="font-26 pr-10">运输费</text>
<u-row custom-style="flex:1;"> <tpx-input v-model:value="modelInfo.ke1" :isWhite="true" custom-style="width: 120rpx;" suffix="元"></tpx-input>
<tpx-input v-model:value="submitInfo.fei" :isWhite="true" custom-style="" suffix="CNY"></tpx-input> </u-row>
<u-row>
<text class="font-26 pr-10">续重</text>
<tpx-input v-model:value="modelInfo.xuzh" :isWhite="true" custom-style="width: 120rpx;" suffix="KG"></tpx-input>
</u-row>
</u-row> </u-row>
<view class="delicon"> <view class="mt-10">运输费计算公式: </view>
<u-icon name="minus-circle" size="30"></u-icon> </view>
</view>
<view class="jsfm-item">
<u-row>
<view class="lft1 font-28">
<tpx-select :list="[]" v-model:value="modelInfo.kehuid" placeholder="清关费" mode="drop" :isWhite="true"></tpx-select>
</view>
<u-row custom-style="flex:1;">
<tpx-input v-model:value="modelInfo.fei" :isWhite="true" custom-style="" suffix="CNY"></tpx-input>
</u-row>
<view class="delicon">
<u-icon name="minus-circle" size="30"></u-icon>
</view>
</u-row>
</view>
<u-row justify="center">
<u-button custom-style="border-radius: 16rpx;height:60rpx;font-size: 30rpx;margin-top: 20rpx;" :plain="true" type="primary">
<u-icon name="plus" size="30" color="#B12D29"></u-icon>
<text class="pl-10">增加收费项</text>
</u-button>
</u-row> </u-row>
</view> </template>
<u-row justify="center"> <template v-if="modelInfo.calcFeeType == 3">
<u-button custom-style="border-radius: 16rpx;height:60rpx;font-size: 30rpx;margin-top: 20rpx;" :plain="true" type="primary">
<u-icon name="plus" size="30" color="#B12D29"></u-icon> </template>
<text class="pl-10">增加收费项</text>
</u-button>
</u-row>
<view class="mt-30">
<u-textarea v-model="modelInfo.feeRemaker" border="surround" height="120" placeholder="备注"
maxlength="50" count></u-textarea>
</view>
</view> </view>
</template> </template>
<script> <script>
export default { export default {
computed: { computed: {
submitInfo: { modelInfo: {
get(){ get(){
return this.value return this.value
} }
},
dicData() {
return this.$store.getters.dicData
} }
}, },
props: { props: {
@ -73,11 +87,6 @@
}, },
data() { data() {
return { return {
costTypeList: [
{ title: '按重量', val: 1 },
{ title: '按体积', val: 2 },
{ title: '一口价', val: 3 },
]
} }
}, },
created() { created() {

16
pages/post/model.js
View File

@ -34,14 +34,14 @@ export const getOrderModels = ()=> {
"userId": '', // 客户id "userId": '', // 客户id
"openId": undefined, "openId": undefined,
"paymentType": undefined, // 付款方式 "paymentType": undefined, // 付款方式
"calcFeeType": undefined, "calcFeeType": "1", // 计费方式
"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,
@ -66,14 +66,14 @@ export const getOrderModels = ()=> {
"blOverLong": undefined, "blOverLong": undefined,
"blOverWeight": undefined, "blOverWeight": undefined,
"overWeightNumber": undefined, "overWeightNumber": undefined,
"feeRemaker": undefined, "feeRemaker": undefined, // 费用备注
"realValue": undefined, "realValue": undefined,
"blDispFd": undefined, "blDispFd": undefined,
"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,
"destinationCity": undefined, "destinationCity": undefined,
@ -81,10 +81,10 @@ export const getOrderModels = ()=> {
"dispatchUnderlingSiteCode": undefined, "dispatchUnderlingSiteCode": undefined,
"destinationCenterCode": undefined, "destinationCenterCode": undefined,
"marketManCode": undefined, "marketManCode": undefined,
"payee": undefined, "payee": undefined, // 回款联系人
"salesmen": undefined, "salesmen": undefined, // 销售员
"operateEmployeeCode": undefined, // 操作员 "operateEmployeeCode": undefined, // 操作员
"blMessage": undefined, "blMessage": undefined, // 寄件 短信开关
"blAcceptMessage": undefined "blAcceptMessage": undefined, // 签收 短信开关
} }
} }

134
pages/post/openorder.vue
View File

@ -36,20 +36,25 @@
<view class="com-section mt-30">路线信息</view> <view class="com-section mt-30">路线信息</view>
<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"> <template v-if="submitParam.reciever.country && submitParam.sender.country">
<tpx-select v-model:value="submitParam.transLine" v-model:resObject="wayRes" :getListFun="getTransLineList" :transKeyVal="{valKey: 'lineCode',titleKey: 'lineName'}" :customInput="true" <view class="yunf-input-item">
:searchParam="waySearchParam" <tpx-select v-model:value="submitParam.transLine" v-model:resObject="wayRes" :getListFun="getTransLineList" :transKeyVal="{valKey: 'lineCode',titleKey: 'lineName'}" :customInput="true"
> :searchParam="waySearchParam"
<tpx-text-item label="线路" :value="submitParam.transLine" :list="wayRes.list"></tpx-text-item> >
</tpx-select> <tpx-text-item label="线路" :value="submitParam.transLine" :list="wayRes.list"></tpx-text-item>
</view> </tpx-select>
<view class="yunf-input-item"> </view>
<tpx-select v-model:value="submitParam.productType" v-model:resObject="productRes" :getListFun="getTransProductList" :transKeyVal="{valKey: 'prodCode',titleKey: 'prodName'}" :isWhite="true" :customInput="true" </template>
:searchParam="productSearchParam"
> <template v-if="submitParam.transLine">
<tpx-text-item label="产品类型" :value="submitParam.productType" :list="productRes.list"></tpx-text-item> <view class="yunf-input-item">
</tpx-select> <tpx-select v-model:value="submitParam.productType" v-model:resObject="productRes" :getListFun="getTransProductList" :transKeyVal="{valKey: 'prodCode',titleKey: 'prodName'}" :isWhite="true" :customInput="true"
</view> :searchParam="productSearchParam"
>
<tpx-text-item label="产品类型" :value="submitParam.productType" :list="productRes.list"></tpx-text-item>
</tpx-select>
</view>
</template>
<view class="yunf-input-item"> <view class="yunf-input-item">
<tpx-select v-model:value="submitParam.customsEclaration" :list="dicData.emis_declare_mode" <tpx-select v-model:value="submitParam.customsEclaration" :list="dicData.emis_declare_mode"
@ -96,40 +101,25 @@
</view> </view>
<view class="yunf-input-item"> <view class="yunf-input-item">
<tpx-select v-model:value="submitParam.custNo" v-model:resObject="yuejieRes" :getListFun="getMonthpayAccountList" :transKeyVal="{valKey: 'custNo',titleKey: 'custName'}" :customInput="true"> <tpx-select v-model:value="submitParam.custNo" v-model:resObject="yuejieRes" :getListFun="getMonthpayAccountList" :transKeyVal="{valKey: 'custNo',titleKey: 'custName'}" :customInput="true"
@onChange="handleYueJieSelect"
>
<tpx-text-item label="月结账户" :value="submitParam.custNo" :list="yuejieRes.list"></tpx-text-item> <tpx-text-item label="月结账户" :value="submitParam.custNo" :list="yuejieRes.list"></tpx-text-item>
</tpx-select> </tpx-select>
</view> </view>
<view class="yunf-input-item"> <template v-if="submitParam.custNo">
<tpx-select v-model:value="submitParam.type2" :list="[]" <view class="yunf-input-item">
mode="drop" customInput="true" <tpx-text-item label="销售联系人" :value="submitParam.salesmenName"></tpx-text-item>
> </view>
<u-row justify="between">
<text class="font-26 font-weight">销售联系人</text> <view class="yunf-input-item">
<u-row justify="end" align="center"> <tpx-text-item label="回款联系人" :value="submitParam.payeeName"></tpx-text-item>
<u-text align="right" margin="0 12rpx 0 0" size="26" text="请选择"></u-text> </view>
<u-icon size="26" name="arrow-right" color="#333"></u-icon> </template>
</u-row>
</u-row>
</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>
</view>
<view class="yunf-input-item"> <view class="yunf-input-item">
<!-- siteRes getDestSiteList -->
<tpx-select v-model:value="submitParam.type2" :list="[]" <tpx-select v-model:value="submitParam.type2" :list="[]"
mode="drop" customInput="true" mode="drop" customInput="true"
> >
@ -158,28 +148,29 @@
</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.dispatchMethod" :list="dicData.emis_tab_dispatch_mode"
mode="drop" customInput="true" mode="drop" customInput="true"
> >
<u-row justify="between"> <tpx-text-item label="派送方式" :value="submitParam.dispatchMethod" :list="dicData.emis_tab_dispatch_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">
<tpx-text-item label="寄件">
<template v-slot:right>
<text class="pr-20 clr-sub">是否短信</text>
<u-switch v-model="submitParam.blMessage" active-color="#B12D29" size="34"></u-switch>
</template>
</tpx-text-item>
</view>
<view class="yunf-input-item"> <view class="yunf-input-item">
<u-row justify="between"> <tpx-text-item label="签收">
<text class="font-26 font-weight">寄件/签收</text> <template v-slot:right>
<u-row justify="end" align="center">
<text class="pr-20 clr-sub">是否短信</text> <text class="pr-20 clr-sub">是否短信</text>
<u-switch v-model="submitParam.morenTODO" active-color="#B12D29" size="34"></u-switch> <u-switch v-model="submitParam.blAcceptMessage" active-color="#B12D29" size="34"></u-switch>
</u-row> </template>
</u-row> </tpx-text-item>
</view> </view>
</view> </view>
@ -202,10 +193,6 @@
</view> </view>
<view class="blcok-white"> <view class="blcok-white">
<bpe-cost-tmp v-model:value="submitParam"></bpe-cost-tmp> <bpe-cost-tmp v-model:value="submitParam"></bpe-cost-tmp>
<view class="mt-30">
<u-textarea v-model="submitParam.otherDes" border="surround" height="120" placeholder="备注"
maxlength="50" count></u-textarea>
</view>
</view> </view>
</view> </view>
@ -238,8 +225,7 @@
<script> <script>
import { transListKeyTitle } from "@/common/util" // import { sendTypeEnum } from "@/common/enum"
import { sendTypeEnum, sendTypeList, qingguanList, baoguanList, } from "@/common/enum"
import BpeAddressinfoTmp from "@/components/buns-post-edit-templates/bpe-addressinfo-tmp" import BpeAddressinfoTmp from "@/components/buns-post-edit-templates/bpe-addressinfo-tmp"
import BpeGoodstaticTmp from "@/components/buns-post-edit-templates/bpe-goodstatic-tmp" import BpeGoodstaticTmp from "@/components/buns-post-edit-templates/bpe-goodstatic-tmp"
import BpeCostTmp from "@/components/buns-post-edit-templates/bpe-cost-tmp" import BpeCostTmp from "@/components/buns-post-edit-templates/bpe-cost-tmp"
@ -270,31 +256,18 @@
}, },
data() { data() {
return { return {
...(JSON.parse(JSON.stringify({ qingguanList, baoguanList, sendTypeEnum, sendTypeList }))),
kehuRes: { list: [] }, kehuRes: { list: [] },
wayRes: { list: [] }, wayRes: { list: [] },
productRes: { list: [] }, productRes: { list: [] },
caozuoRes: { list: [] }, caozuoRes: { list: [] },
shoupaiRes: { list: [] }, shoupaiRes: { list: [] },
yuejieRes: { list: [] }, yuejieRes: { list: [] },
tipsList: [ siteRes: { list: [] },
],
goodChooseModal: { goodChooseModal: {
show: false, show: false,
}, },
submitParam: { submitParam: {
...getOrderModels(), ...getOrderModels(),
yundanhao: '',
stockRoomId: '',
countryId: '',
wayId: '',
type: sendTypeList[0].val,
paytype: '',
otherDes: '',
prodId: 1,
tips: [],
revtime: '',
gdList: [{},{}]
} }
} }
}, },
@ -318,6 +291,7 @@
getOpStaffList: apiService.getOpStaffList, getOpStaffList: apiService.getOpStaffList,
getRSDStaffList: apiService.getRSDStaffList, getRSDStaffList: apiService.getRSDStaffList,
getMonthpayAccountList: apiService.getMonthpayAccountList, getMonthpayAccountList: apiService.getMonthpayAccountList,
getDestSiteList: apiService.getDestSiteList,
async initData() { async initData() {
// uni.showLoading({ // uni.showLoading({
// title: '加载中' // title: '加载中'
@ -335,6 +309,13 @@
const res = await apiService.createOrderNo() const res = await apiService.createOrderNo()
this.submitParam.billCode = res.data this.submitParam.billCode = res.data
}, },
handleYueJieSelect(val) {
const item = this.yuejieRes.list.filter(t=> t.val == val)[0]
this.submitParam.payee = item.payee
this.submitParam.salesmen = item.salesmen
this.submitParam.salesmenName = item.salesmenName
this.submitParam.payeeName = item.payeeName
},
handleDialogClick(curModal){ handleDialogClick(curModal){
curModal.show = true curModal.show = true
} }
@ -361,7 +342,6 @@
border-color: $uni-color-primary; border-color: $uni-color-primary;
} }
} }
.yunf-input-item{ .yunf-input-item{
padding: 26rpx 0; padding: 26rpx 0;
border-bottom: 2rpx solid #F6F6F6; border-bottom: 2rpx solid #F6F6F6;