uu
This commit is contained in:
aihe
parent
42bf55023d
commit
7adbdcb034
@ -9,7 +9,7 @@ export default {
|
|||||||
getDicDataJson: `/common/getDicDataJson`, // 获取枚举字段
|
getDicDataJson: `/common/getDicDataJson`, // 获取枚举字段
|
||||||
|
|
||||||
getTransLineList: `/emis/emisTransLine/listSimple`, // 获取路线列表
|
getTransLineList: `/emis/emisTransLine/listSimple`, // 获取路线列表
|
||||||
getTransProductList: `/emis/emisTransLine/listSimple`, // 获取产品列表
|
getTransProductList: `/emis/emisTransProduct/listSimple`, // 获取产品列表
|
||||||
|
|
||||||
createOrderNo: `/emis/common/realMatchWaybill`, // 创建运单号
|
createOrderNo: `/emis/common/realMatchWaybill`, // 创建运单号
|
||||||
submitOrder: `/emis/emisWaybill/realSubmitOrder`, // 提交订单
|
submitOrder: `/emis/emisWaybill/realSubmitOrder`, // 提交订单
|
||||||
|
|||||||
@ -32,7 +32,6 @@
|
|||||||
watch: {
|
watch: {
|
||||||
searchParam: {
|
searchParam: {
|
||||||
handler: debounce(function(cval, oval) {
|
handler: debounce(function(cval, oval) {
|
||||||
console.log("========qqqqqqqqqq")
|
|
||||||
this.getDataList(true)
|
this.getDataList(true)
|
||||||
}),
|
}),
|
||||||
deep: true
|
deep: true
|
||||||
|
|||||||
@ -7,11 +7,13 @@
|
|||||||
|
|
||||||
<view v-if="mode == modeEnum.sheet">
|
<view v-if="mode == modeEnum.sheet">
|
||||||
<tpx-dialog :show="show" :title="placeholder" @onClose="handleSelectSwitch">
|
<tpx-dialog :show="show" :title="placeholder" @onClose="handleSelectSwitch">
|
||||||
<tpx-scroll-view :resObject="filResObject" :searchParam="searchParam" :getListFun="getListFun" size="sm" :showLoadedAll="false" @onListChange="onListChange">
|
<view style="height: calc(60vh);">
|
||||||
<content-items :value="value" :list="filDataList" :minChecked="minChecked" :type="type"
|
<tpx-scroll-view :resObject="filResObject" :searchParam="searchParam" :getListFun="getListFun" size="sm" :showLoadedAll="false" @onListChange="onListChange">
|
||||||
@onChange="handleDataItemChange"
|
<content-items :value="value" :list="filDataList" :minChecked="minChecked" :type="type"
|
||||||
></content-items>
|
@onChange="handleDataItemChange"
|
||||||
</tpx-scroll-view>
|
></content-items>
|
||||||
|
</tpx-scroll-view>
|
||||||
|
</view>
|
||||||
</tpx-dialog>
|
</tpx-dialog>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@ -2,89 +2,89 @@
|
|||||||
export const getOrderModels = ()=> {
|
export const getOrderModels = ()=> {
|
||||||
return {
|
return {
|
||||||
"reciever": { // 收件人信息
|
"reciever": { // 收件人信息
|
||||||
"country": null,
|
"country": undefined,
|
||||||
"name": "",
|
"name": "",
|
||||||
"phone": null,
|
"phone": undefined,
|
||||||
"province": null,
|
"province": undefined,
|
||||||
"city": null,
|
"city": undefined,
|
||||||
"district": null,
|
"district": undefined,
|
||||||
"town": null,
|
"town": undefined,
|
||||||
"address": null,
|
"address": undefined,
|
||||||
"postCode": null,
|
"postCode": undefined,
|
||||||
"email": null,
|
"email": undefined,
|
||||||
"company": null
|
"company": undefined
|
||||||
},
|
},
|
||||||
"sender": { // 发件人信息
|
"sender": { // 发件人信息
|
||||||
"country": null,
|
"country": undefined,
|
||||||
"name": "",
|
"name": "",
|
||||||
"phone": null,
|
"phone": undefined,
|
||||||
"province": null,
|
"province": undefined,
|
||||||
"city": null,
|
"city": undefined,
|
||||||
"district": null,
|
"district": undefined,
|
||||||
"town": null,
|
"town": undefined,
|
||||||
"address": null,
|
"address": undefined,
|
||||||
"postCode": null,
|
"postCode": undefined,
|
||||||
"email": null,
|
"email": undefined,
|
||||||
"company": null
|
"company": undefined
|
||||||
},
|
},
|
||||||
"custOrderId": null, // 客户单号
|
"custOrderId": undefined, // 客户单号
|
||||||
"billCode": "", // 运单号
|
"billCode": "", // 运单号
|
||||||
"billCodeSub": null, // 子单号
|
"billCodeSub": undefined, // 子单号
|
||||||
"orderDate": null,
|
"orderDate": undefined,
|
||||||
"userId": '', // 客户id
|
"userId": '', // 客户id
|
||||||
"openId": null,
|
"openId": undefined,
|
||||||
"paymentType": null,
|
"paymentType": undefined,
|
||||||
"calcFeeType": null,
|
"calcFeeType": undefined,
|
||||||
"custNo": null,
|
"custNo": undefined,
|
||||||
"transLine": null,
|
"transLine": '', // 路线
|
||||||
"productType": null,
|
"productType": undefined,
|
||||||
"customsClear": null,
|
"customsClear": undefined,
|
||||||
"customsEclaration": null,
|
"customsEclaration": undefined,
|
||||||
"packType": null,
|
"packType": undefined,
|
||||||
"dispatchMethod": null,
|
"dispatchMethod": undefined,
|
||||||
"pickupMethod": null,
|
"pickupMethod": undefined,
|
||||||
"pickStartDate": null,
|
"pickStartDate": undefined,
|
||||||
"pickFinishDate": null,
|
"pickFinishDate": undefined,
|
||||||
"intoWarehouseCode": null,
|
"intoWarehouseCode": undefined,
|
||||||
"intoWarehouseName": null,
|
"intoWarehouseName": undefined,
|
||||||
"intoWarehouseAddress": null,
|
"intoWarehouseAddress": undefined,
|
||||||
"intoWarehouseContact": null,
|
"intoWarehouseContact": undefined,
|
||||||
"intoWarehousePhone": null,
|
"intoWarehousePhone": undefined,
|
||||||
"intoWarehouseBillCode": null,
|
"intoWarehouseBillCode": undefined,
|
||||||
"customerDeliveryBeginTime": null,
|
"customerDeliveryBeginTime": undefined,
|
||||||
"goodsType": null,
|
"goodsType": undefined,
|
||||||
"goodsInfo": null,
|
"goodsInfo": undefined,
|
||||||
"totalWeight": null,
|
"totalWeight": undefined,
|
||||||
"totalVolume": null,
|
"totalVolume": undefined,
|
||||||
"parcelQty": null,
|
"parcelQty": undefined,
|
||||||
"billWeight": null,
|
"billWeight": undefined,
|
||||||
"volumeWeight": null,
|
"volumeWeight": undefined,
|
||||||
"currency": null,
|
"currency": undefined,
|
||||||
"settlementWeight": null,
|
"settlementWeight": undefined,
|
||||||
"feeWeight": null,
|
"feeWeight": undefined,
|
||||||
"freight": null,
|
"freight": undefined,
|
||||||
"blOverLong": null,
|
"blOverLong": undefined,
|
||||||
"blOverWeight": null,
|
"blOverWeight": undefined,
|
||||||
"overWeightNumber": null,
|
"overWeightNumber": undefined,
|
||||||
"feeRemaker": null,
|
"feeRemaker": undefined,
|
||||||
"realValue": null,
|
"realValue": undefined,
|
||||||
"blDispFd": null,
|
"blDispFd": undefined,
|
||||||
"transferCode": null,
|
"transferCode": undefined,
|
||||||
"transferBillcode": null,
|
"transferBillcode": undefined,
|
||||||
"dispFdDate": null,
|
"dispFdDate": undefined,
|
||||||
"takePieceEmployeeCode": null,
|
"takePieceEmployeeCode": undefined,
|
||||||
"sendSiteCode": null,
|
"sendSiteCode": undefined,
|
||||||
"destinationCode": null,
|
"destinationCode": undefined,
|
||||||
"destinationProvince": null,
|
"destinationProvince": undefined,
|
||||||
"destinationCity": null,
|
"destinationCity": undefined,
|
||||||
"destinationCounty": null,
|
"destinationCounty": undefined,
|
||||||
"dispatchUnderlingSiteCode": null,
|
"dispatchUnderlingSiteCode": undefined,
|
||||||
"destinationCenterCode": null,
|
"destinationCenterCode": undefined,
|
||||||
"marketManCode": null,
|
"marketManCode": undefined,
|
||||||
"payee": null,
|
"payee": undefined,
|
||||||
"salesmen": null,
|
"salesmen": undefined,
|
||||||
"operateEmployeeCode": null,
|
"operateEmployeeCode": undefined,
|
||||||
"blMessage": null,
|
"blMessage": undefined,
|
||||||
"blAcceptMessage": null
|
"blAcceptMessage": undefined
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -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" 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>
|
</view>
|
||||||
</u-row>
|
</u-row>
|
||||||
</view>
|
</view>
|
||||||
@ -34,31 +34,38 @@
|
|||||||
|
|
||||||
<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 @click="handleDialogClick(wayModal)" class="yunf-input-item">
|
<view class="yunf-input-item">
|
||||||
<u-row>
|
<tpx-select v-model:value="submitParam.transLine" v-model:resObject="wayRes" :getListFun="getTransLineList" :transKeyVal="{valKey: 'id',titleKey: 'lineName'}" :customInput="true"
|
||||||
<view>
|
:searchParam="waySearchParam"
|
||||||
<u-text text="线路" size="28" :bold="true"></u-text>
|
>
|
||||||
</view>
|
<u-row>
|
||||||
<u-row custom-style="flex: 1;" justify="end" align="center">
|
<view>
|
||||||
<u-text align="right" margin="0 12rpx 0 0" size="26"
|
<u-text text="线路" size="28" :bold="true"></u-text>
|
||||||
text="请选择"></u-text>
|
</view>
|
||||||
<u-icon size="26" name="arrow-right" color="#333"></u-icon>
|
<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>
|
||||||
</u-row>
|
</tpx-select>
|
||||||
</view>
|
</view>
|
||||||
<view @click="handleDialogClick(wayModal)" class="yunf-input-item">
|
<view class="yunf-input-item">
|
||||||
<u-row>
|
<tpx-select v-model:value="submitParam.proidTODO" v-model:resObject="productRes" :getListFun="getTransProductList" :transKeyVal="{valKey: 'id',titleKey: 'prodName'}" :isWhite="true" :customInput="true"
|
||||||
<view>
|
:searchParam="productSearchParam"
|
||||||
<u-text text="产品类型" size="28" :bold="true"></u-text>
|
>
|
||||||
</view>
|
<u-row>
|
||||||
<u-row custom-style="flex: 1;" justify="end" align="center">
|
<view>
|
||||||
<u-text align="right" margin="0 12rpx 0 0" size="26"
|
<u-text text="产品类型" size="28" :bold="true"></u-text>
|
||||||
text="请选择"></u-text>
|
</view>
|
||||||
<u-icon size="26" name="arrow-right" color="#333"></u-icon>
|
<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>
|
||||||
</u-row>
|
</tpx-select>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="yunf-input-item">
|
<view class="yunf-input-item">
|
||||||
@ -281,9 +288,6 @@
|
|||||||
</template>
|
</template>
|
||||||
</tpx-layout>
|
</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">
|
<buns-edit-sheet percentHeight="70" title="商品信息" v-model:show="goodChooseModal.show" v-model:value="submitParam" v-slot="tempObject">
|
||||||
<view class="mb-20">托寄货物描述</view>
|
<view class="mb-20">托寄货物描述</view>
|
||||||
<bpe-gooditem-edit-tmp :value="tempObject.value"></bpe-gooditem-edit-tmp>
|
<bpe-gooditem-edit-tmp :value="tempObject.value"></bpe-gooditem-edit-tmp>
|
||||||
@ -319,18 +323,22 @@
|
|||||||
// }
|
// }
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
waySearchParam() {
|
||||||
|
return { country: this.submitParam.reciever.country, fromCountry: this.submitParam.sender.country }
|
||||||
|
},
|
||||||
|
productSearchParam() {
|
||||||
|
return { transLineCode: this.submitParam.transLine }
|
||||||
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
...(JSON.parse(JSON.stringify({ qingguanList, baoguanList, sendTypeEnum, sendTypeList }))),
|
...(JSON.parse(JSON.stringify({ qingguanList, baoguanList, sendTypeEnum, sendTypeList }))),
|
||||||
kehuRes: { list: [] },
|
kehuRes: { list: [] },
|
||||||
|
wayRes: { list: [] },
|
||||||
|
productRes: { list: [] },
|
||||||
tipsList: [
|
tipsList: [
|
||||||
|
|
||||||
],
|
],
|
||||||
wayModal: {
|
|
||||||
show: false,
|
|
||||||
},
|
|
||||||
goodChooseModal: {
|
goodChooseModal: {
|
||||||
show: false,
|
show: false,
|
||||||
},
|
},
|
||||||
@ -365,6 +373,8 @@
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
getCustomerUserList: apiService.getCustomerUserList,
|
getCustomerUserList: apiService.getCustomerUserList,
|
||||||
|
getTransLineList: apiService.getTransLineList,
|
||||||
|
getTransProductList: apiService.getTransProductList,
|
||||||
async initData() {
|
async initData() {
|
||||||
// uni.showLoading({
|
// uni.showLoading({
|
||||||
// title: '加载中'
|
// title: '加载中'
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user