Skip to content

B
biz-trina5-app
Commit 8ad515e3 authored by 刘威龙's avatar 刘威龙
Browse files
Options

司机车辆添加承运商条件、回单运单页面字段调整

parent b2f971f9
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 36 deletions
components/orderPodItem/orderPodItem.vue
View file @ 8ad515e3
......@@ -29,7 +29,7 @@
</view>
<bs-customCell label="订舱/托书号 :" :value="propData.sp__booking_no" labelCol="3.5" wrapCol="6" />
<bs-customCell label="运单号 :" :value="propData.shipment_no" labelCol="2" wrapCol="6" />
<bs-customCell label="车牌号 :" :value="propData.truck_no" labelCol="2" wrapCol="6" />
<bs-customCell label="车牌号 :" :value="propData.sp__truck_no" labelCol="2" wrapCol="6" />
<!-- <bs-customCell label="回单数量 :" :value="propData.pod_count" labelCol="2.5" wrapCol="6" /> -->
</view>
<view class="flex_cen flex_center orderItemButtonGroup" >
......
components/shipmentItem/shipmentItem.vue
View file @ 8ad515e3
......@@ -33,13 +33,20 @@
</view>
<view class=" flex_sb">
<view style="width: 50%;float: left;">
<bs-customCell label="承运商 :" :value="propData.carrier" labelCol="4" wrapCol="6" />
<bs-customCell label="运单类型 :" :value="propData.shipment_type_label" labelCol="5" wrapCol="8" />
</view>
<view style="width: 50%;float: left;">
<bs-customCell label="司机电话 :" :value="propData.driver_tel" labelCol="5" wrapCol="8" />
</view>
</view>
<view class=" flex_sb">
<view style="width: 50%;float: left;">
<bs-customCell label="当前节点 :" :value="propData.current_node_label" labelCol="5" wrapCol="8" />
</view>
<view style="width: 50%;float: left;">
<bs-customCell label="订单类型 :" :value="propData.order_type" labelCol="5" wrapCol="8" />
</view>
</view>
<!-- <bs-customCell label="货量 :" labelCol="2" wrapCol="10" :value="`${propData.shipOrders}单 / ${propData.shipQty}件 / ${propData.shipWeight}千克 / ${propData.shipVolume}方`" /> -->
</view>
</view>
......
subpkg/shipment/shipment.vue
View file @ 8ad515e3
......@@ -117,7 +117,7 @@
mixins: [getUserLocation],
data() {
return {
shipmentOrders: [], //运输订单
shipmentOrders: [], //运单
pageNum: 1, //页码
pageSize: 10, //每页条数
loadMore: true, //加载更多
......@@ -209,7 +209,7 @@
this.choose = this.message
getApp().globalData.choose = this.choose
uni.navigateTo({
url: `/subpkg/shipmentDispatch/shipmentDispatch`,
url: `/subpkg/shipmentDispatch/shipmentDispatch?carrier=`+this.shipmentOrders[0].carrier,
})
} else {
uni.showToast({
......
subpkg/shipmentDispatch/shipmentDispatch.vue
View file @ 8ad515e3
......@@ -140,11 +140,14 @@
currentChecked1:'',
placeholder: "请输入搜索车牌号", //默认提示
placeholder1: "请输入搜索司机", //默认提示
carrier:''
}
},
onLoad(options) {
const data = getApp().globalData.choose;//勾选的数据
const isEmpty = !Object.keys(data).length
console.log("进来的承运商为"+options.carrier)
this.carrier=options.carrier
},
methods: {
......@@ -224,11 +227,11 @@
},
//查询车辆回调
onAreaSuccess() {
const { pageNum, pageSize } = this
const { pageNum, pageSize ,carrier } = this
let optionEnums = []
var searchValue = this.searchValue
let reqData = {
"args": { pageNum, pageSize }
"args": { pageNum, pageSize ,carrier }
}
if(this.searchValue){
reqData.args.restrictions = [{
......@@ -248,11 +251,11 @@
},
//查询司机回调
onAreaSuccess1() {
const { pageNum, pageSize } = this
const { pageNum, pageSize,carrier } = this
let optionEnums = []
var searchValue1 = this.searchValue1
let reqData = {
"args": { pageNum, pageSize }
"args": { pageNum, pageSize,carrier }
}
if(this.searchValue1){
reqData.args.restrictions = [{
......
yarn.lock
View file @ 8ad515e3
......@@ -4,55 +4,48 @@
"@amap/amap-jsapi-loader@^1.0.1":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz#9ec4b4d5d2467eac451f6c852e35db69e9f9f0c0"
resolved "https://registry.npmjs.org/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz"
integrity sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==
"@babel/runtime@^7.17.2":
version "7.20.7"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.7.tgz#fcb41a5a70550e04a7b708037c7c32f7f356d8fd"
integrity sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==
dependencies:
regenerator-runtime "^0.13.11"
version "7.27.6"
resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.6.tgz"
integrity sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==
copy-text-to-clipboard@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c"
integrity sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q==
version "3.2.0"
resolved "https://registry.npmjs.org/copy-text-to-clipboard/-/copy-text-to-clipboard-3.2.0.tgz"
integrity sha512-RnJFp1XR/LOBDckxTib5Qjr/PMfkatD0MUCQgdpqS8MdKiNUzBjAQBEN6oUy+jW7LI93BBG3DtMB2KOOKpGs2Q==
core-js@^3.11.0:
version "3.27.1"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.27.1.tgz#23cc909b315a6bb4e418bf40a52758af2103ba46"
integrity sha512-GutwJLBChfGCpwwhbYoqfv03LAfmiz7e7D/BNxzeMxwQf10GRSzqiOjx7AmtEk+heiD/JWmBuyBPgFtx0Sg1ww==
version "3.43.0"
resolved "https://registry.npmjs.org/core-js/-/core-js-3.43.0.tgz"
integrity sha512-N6wEbTTZSYOY2rYAn85CuvWWkCK6QweMn7/4Nr3w+gDBeBhk/x4EJeY6FPo4QzDoJZxVTv8U7CMvgWk6pOHHqA==
image-tools@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/image-tools/-/image-tools-1.4.0.tgz#66aacbafad677af7f3fd7f32f8fa1e0881b83783"
resolved "https://registry.npmjs.org/image-tools/-/image-tools-1.4.0.tgz"
integrity sha512-TKtvJ6iUwM0mfaD4keMnk1ENHFC470QEjBfA3IlvKdEOufzvWbjbaoNcoyYq6HlViF8+d5tOS1ooE6j7CHf1lQ==
jweixin-module@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/jweixin-module/-/jweixin-module-1.6.0.tgz#4a7ea614083e3c9c3f49e2fdc2bb882cfa58dfcd"
resolved "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz"
integrity sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==
mutation-observer@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/mutation-observer/-/mutation-observer-1.0.3.tgz#42e9222b101bca82e5ba9d5a7acf4a14c0f263d0"
resolved "https://registry.npmjs.org/mutation-observer/-/mutation-observer-1.0.3.tgz"
integrity sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA==
regenerator-runtime@^0.13.11:
version "0.13.11"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
uview-ui@^2.0.31:
version "2.0.33"
resolved "https://registry.yarnpkg.com/uview-ui/-/uview-ui-2.0.33.tgz#229c222b60846190f45e935c3661b9c8affb84a1"
integrity sha512-M3NsLFAY0z95NGMnTCDUR/TvJb6a/UYZzi1km5Gi6TkBCaoHdbmtQymkc1C4eszeoQOrpEIhit/2V47UglzHRw==
uview-ui@^2.0.38:
version "2.0.38"
resolved "https://registry.npmjs.org/uview-ui/-/uview-ui-2.0.38.tgz"
integrity sha512-6egHDf9lXHKpG3hEjRE0vMx4+VWwKk/ReTf5x18KrIKqdvdPRqO3+B8Unh7vYYwrIxzAWIlmhZ9RJpKI/4UqPQ==
vconsole@^3.15.0:
version "3.15.0"
resolved "https://registry.yarnpkg.com/vconsole/-/vconsole-3.15.0.tgz#2383482b0a4106204090046ec128071284e04a90"
integrity sha512-8hq7wabPcRucSWQyN7/1tthMawP9JPvM95zgtMHpPknMMMCKj+abpoK7P7oKK4B0qw58C24Mdvo9+raUdpHyVQ==
version "3.15.1"
resolved "https://registry.npmjs.org/vconsole/-/vconsole-3.15.1.tgz"
integrity sha512-KH8XLdrq9T5YHJO/ixrjivHfmF2PC2CdVoK6RWZB4yftMykYIaXY1mxZYAic70vADM54kpMQF+dYmvl5NRNy1g==
dependencies:
"@babel/runtime" "^7.17.2"
copy-text-to-clipboard "^3.0.1"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment