运单界面增加字段展示-提单号/装箱单号，并增加这两个字段的查询条件

components/shipmentItem/shipmentItem.vue

@@ -47,6 +47,14 @@
 					<bs-customCell label="订单类型 :" :value="propData.order_type" labelCol="5" wrapCol="8" />
 				</view>
 			</view>
+			<view class=" flex_sb">
+				<view style="width: 50%;float: left;">
+					<bs-customCell label="提单号 :" :value="propData.bl_no" labelCol="5" wrapCol="8" />
+				</view>
+				<view style="width: 50%;float: left;">
+					<bs-customCell label="装箱单号 :" :value="propData.srm_box_no" labelCol="5" wrapCol="8" />
+				</view>
+			</view>
 <!-- 			<bs-customCell label="货量 :" labelCol="2" wrapCol="10" :value="`${propData.shipOrders}单 / ${propData.shipQty}件 / ${propData.shipWeight}千克 / ${propData.shipVolume}方`" /> -->
 		</view>
 	</view>

manifest.json

@@ -6,6 +6,7 @@
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
+	"sassImplementationName": "node-sass",
     "app-plus" : {
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",

publicConfig/config.js

@@ -4,9 +4,9 @@
   2. 打包生产模式： 小程序切换url； H5切换ENV_MODEL
  */
 let BASEURL = {
-	url: "http://127.0.0.1:8080", //开发
-	//url: "https://otmuat.trinasolar.com", //UAT
-	//url: "https://otms.trinasolar.com", //正式
+	// url: "http://127.0.0.1:8080", //开发
+	// url: "https://otmuat.trinasolar.com", //UAT
+	url: "https://otms.trinasolar.com", //正式
 }
 
 //当使用多域名代理服务时生效，用于统一添加API前缀以区分服务代理地址。本地开发H5注意修改manifest.json中Proxy代理规则

subpkg/shipment/shipment.vue

@@ -2,7 +2,7 @@
 	<view class="shipment-order-list content_box">
 		<view class="search-input flex_center">
 			<u-search searchIconSize="50" searchIconColor="#FFFFFF" placeholderColor='#FFFFFF' color="#FFFFFF"
-				:showAction="false" :placeholder="'请输入运单号'" v-model="searchValue"
+				:showAction="false" :placeholder="'请输入运单号/提单号/装箱单号'" v-model="searchValue"
 				 @clickIcon="onSearch" @search="onSearch" @clear="onSearch" />
 		</view>
 		<u-checkbox-group @change="change" placement="column">
@@ -420,6 +420,14 @@
 						"field": 'shipment_no',
 						"type": "like", //EQ精准匹配，LK模糊匹配
 						"value": this.searchValue
+					},{
+						"field": 'bl_no',
+						"type": "like", //EQ精准匹配，LK模糊匹配
+						"value": this.searchValue
+					},{
+						"field": 'srm_box_no',
+						"type": "like", //EQ精准匹配，LK模糊匹配
+						"value": this.searchValue
 					}]
 				}
 				getShipmentOrders(reqData).then(res => {
@@ -433,7 +441,9 @@
 						})
 						this.shipmentOrders = this.shipmentOrders.concat(data)
 						this.pageNum += 1
-						this.loadMore = true
+						this.loadMore = data.length >= this.pageSize
+					} else {
+						this.loadMore = false
 					}
 				})
 			},