This commit is contained in:
aihe 2024-04-26 18:32:18 +08:00
parent 42bf55023d
commit 7adbdcb034
5 changed files with 124 additions and 113 deletions

View File

@ -9,7 +9,7 @@ export default {
getDicDataJson: `/common/getDicDataJson`, // 获取枚举字段
getTransLineList: `/emis/emisTransLine/listSimple`, // 获取路线列表
getTransProductList: `/emis/emisTransLine/listSimple`, // 获取产品列表
getTransProductList: `/emis/emisTransProduct/listSimple`, // 获取产品列表
createOrderNo: `/emis/common/realMatchWaybill`, // 创建运单号
submitOrder: `/emis/emisWaybill/realSubmitOrder`, // 提交订单

View File

@ -32,7 +32,6 @@
watch: {
searchParam: {
handler: debounce(function(cval, oval) {
console.log("========qqqqqqqqqq")
this.getDataList(true)
}),
deep: true

View File

@ -7,11 +7,13 @@
<view v-if="mode == modeEnum.sheet">
<tpx-dialog :show="show" :title="placeholder" @onClose="handleSelectSwitch">
<tpx-scroll-view :resObject="filResObject" :searchParam="searchParam" :getListFun="getListFun" size="sm" :showLoadedAll="false" @onListChange="onListChange">
<content-items :value="value" :list="filDataList" :minChecked="minChecked" :type="type"
@onChange="handleDataItemChange"
></content-items>
</tpx-scroll-view>
<view style="height: calc(60vh);">
<tpx-scroll-view :resObject="filResObject" :searchParam="searchParam" :getListFun="getListFun" size="sm" :showLoadedAll="false" @onListChange="onListChange">
<content-items :value="value" :list="filDataList" :minChecked="minChecked" :type="type"
@onChange="handleDataItemChange"
></content-items>
</tpx-scroll-view>
</view>
</tpx-dialog>
</view>

View File

@ -2,89 +2,89 @@
export const getOrderModels = ()=> {
return {
"reciever": { // 收件人信息
"country": null,
"country": undefined,
"name": "",
"phone": null,
"province": null,
"city": null,
"district": null,
"town": null,
"address": null,
"postCode": null,
"email": null,
"company": null
"phone": undefined,
"province": undefined,
"city": undefined,
"district": undefined,
"town": undefined,
"address": undefined,
"postCode": undefined,
"email": undefined,
"company": undefined
},
"sender": { // 发件人信息
"country": null,
"country": undefined,
"name": "",
"phone": null,
"province": null,
"city": null,
"district": null,
"town": null,
"address": null,
"postCode": null,
"email": null,
"company": null
"phone": undefined,
"province": undefined,
"city": undefined,
"district": undefined,
"town": undefined,
"address": undefined,
"postCode": undefined,
"email": undefined,
"company": undefined
},
"custOrderId": null, // 客户单号
"custOrderId": undefined, // 客户单号
"billCode": "", // 运单号
"billCodeSub": null, // 子单号
"orderDate": null,
"billCodeSub": undefined, // 子单号
"orderDate": undefined,
"userId": '', // 客户id
"openId": null,
"paymentType": null,
"calcFeeType": null,
"custNo": null,
"transLine": null,
"productType": null,
"customsClear": null,
"customsEclaration": null,
"packType": null,
"dispatchMethod": null,
"pickupMethod": null,
"pickStartDate": null,
"pickFinishDate": null,
"intoWarehouseCode": null,
"intoWarehouseName": null,
"intoWarehouseAddress": null,
"intoWarehouseContact": null,
"intoWarehousePhone": null,
"intoWarehouseBillCode": null,
"customerDeliveryBeginTime": null,
"goodsType": null,
"goodsInfo": null,
"totalWeight": null,
"totalVolume": null,
"parcelQty": null,
"billWeight": null,
"volumeWeight": null,
"currency": null,
"settlementWeight": null,
"feeWeight": null,
"freight": null,
"blOverLong": null,
"blOverWeight": null,
"overWeightNumber": null,
"feeRemaker": null,
"realValue": null,
"blDispFd": null,
"transferCode": null,
"transferBillcode": null,
"dispFdDate": null,
"takePieceEmployeeCode": null,
"sendSiteCode": null,
"destinationCode": null,
"destinationProvince": null,
"destinationCity": null,
"destinationCounty": null,
"dispatchUnderlingSiteCode": null,
"destinationCenterCode": null,
"marketManCode": null,
"payee": null,
"salesmen": null,
"operateEmployeeCode": null,
"blMessage": null,
"blAcceptMessage": null
"openId": undefined,
"paymentType": undefined,
"calcFeeType": undefined,
"custNo": undefined,
"transLine": '', // 路线
"productType": undefined,
"customsClear": undefined,
"customsEclaration": undefined,
"packType": undefined,
"dispatchMethod": undefined,
"pickupMethod": undefined,
"pickStartDate": undefined,
"pickFinishDate": undefined,
"intoWarehouseCode": undefined,
"intoWarehouseName": undefined,
"intoWarehouseAddress": undefined,
"intoWarehouseContact": undefined,
"intoWarehousePhone": undefined,
"intoWarehouseBillCode": undefined,
"customerDeliveryBeginTime": undefined,
"goodsType": undefined,
"goodsInfo": undefined,
"totalWeight": undefined,
"totalVolume": undefined,
"parcelQty": undefined,
"billWeight": undefined,
"volumeWeight": undefined,
"currency": undefined,
"settlementWeight": undefined,
"feeWeight": undefined,
"freight": undefined,
"blOverLong": undefined,
"blOverWeight": undefined,
"overWeightNumber": undefined,
"feeRemaker": undefined,
"realValue": undefined,
"blDispFd": undefined,
"transferCode": undefined,
"transferBillcode": undefined,
"dispFdDate": undefined,
"takePieceEmployeeCode": undefined,
"sendSiteCode": undefined,
"destinationCode": undefined,
"destinationProvince": undefined,
"destinationCity": undefined,
"destinationCounty": undefined,
"dispatchUnderlingSiteCode": undefined,
"destinationCenterCode": undefined,
"marketManCode": undefined,
"payee": undefined,
"salesmen": undefined,
"operateEmployeeCode": undefined,
"blMessage": undefined,
"blAcceptMessage": undefined
}
}

View File

@ -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" customStyle="" :isWhite="true"></tpx-select>
<tpx-select v-model:resObject="kehuRes" :getListFun="getCustomerUserList" :transKeyVal="{valKey: 'id',titleKey: 'customerFullName'}" v-model:value="submitParam.userId" :isWhite="true"></tpx-select>
</view>
</u-row>
</view>
@ -34,31 +34,38 @@
<view class="com-section mt-30">路线信息</view>
<view class="blcok-white" style="padding-top: 0;padding-bottom: 0;">
<view>
<view @click="handleDialogClick(wayModal)" class="yunf-input-item">
<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>
<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"
: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>
</u-row>
</tpx-select>
</view>
<view @click="handleDialogClick(wayModal)" class="yunf-input-item">
<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>
<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"
: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>
</u-row>
</tpx-select>
</view>
<view class="yunf-input-item">
@ -281,9 +288,6 @@
</template>
</tpx-layout>
<buns-way-sheet v-model:show="wayModal.show" v-model:value="submitParam.wayId"></buns-way-sheet>
<buns-edit-sheet percentHeight="70" title="商品信息" v-model:show="goodChooseModal.show" v-model:value="submitParam" v-slot="tempObject">
<view class="mb-20">托寄货物描述</view>
<bpe-gooditem-edit-tmp :value="tempObject.value"></bpe-gooditem-edit-tmp>
@ -319,18 +323,22 @@
// }
},
computed: {
waySearchParam() {
return { country: this.submitParam.reciever.country, fromCountry: this.submitParam.sender.country }
},
productSearchParam() {
return { transLineCode: this.submitParam.transLine }
}
},
data() {
return {
...(JSON.parse(JSON.stringify({ qingguanList, baoguanList, sendTypeEnum, sendTypeList }))),
kehuRes: { list: [] },
wayRes: { list: [] },
productRes: { list: [] },
tipsList: [
],
wayModal: {
show: false,
},
goodChooseModal: {
show: false,
},
@ -365,6 +373,8 @@
},
methods: {
getCustomerUserList: apiService.getCustomerUserList,
getTransLineList: apiService.getTransLineList,
getTransProductList: apiService.getTransProductList,
async initData() {
// uni.showLoading({
// title: '加载中'