From 3440bde45793406c6e16b17dad7b00702da00649 Mon Sep 17 00:00:00 2001
From: wuwx <1960@qq.com>
Date: Mon, 20 May 2024 17:44:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E8=88=B9=E5=A4=96=E8=B4=B8=E6=96=B0?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/head-info/head-info.vue            |   17 +-
 manifest.json                                 |    2 +-
 pages.json                                    |    6 +
 pages/discharge/instruct.vue                  |    2 +-
 pages/index/domesticTrade.vue                 |   14 +-
 pages/index/index.vue                         |   77 +-
 pages/index/instruct.vue                      | 1245 +++++++++++++----
 pages/index/instructDetails.vue               |   13 +-
 pages/index/ladingNumber.vue                  |  111 ++
 pages/shipWork/mixWork.vue                    |   25 +-
 .../components/custom-tabs/custom-tabs.vue    |   14 +-
 .../superwei-combox/superwei-combox.vue       |   14 +-
 12 files changed, 1165 insertions(+), 375 deletions(-)
 create mode 100644 pages/index/ladingNumber.vue

diff --git a/components/head-info/head-info.vue b/components/head-info/head-info.vue
index e0957f6..9b110a5 100644
--- a/components/head-info/head-info.vue
+++ b/components/head-info/head-info.vue
@@ -9,8 +9,8 @@
 				</view>
 				<view class="navList">
 					<template v-for="(item,index) in navList">
-						<navigator :key="index" :url="item.path" open-type="redirect" class="item" @click="changeNav(index)">
-							<view class="itemInfo" :class="item.type?'navActive':''">
+						<navigator :key="index" :url="item.path" open-type="redirect" class="item">
+							<view class="itemInfo" :class="item.type?'navActive':''" @click="changeNav(index)">
 								<image :src="item.icon" mode="widthFix" v-if="item.type"></image>
 								<image :src="item.smpId" mode="widthFix" v-if="!item.type"></image>
 								<text>{{item.name}}</text>
@@ -145,21 +145,12 @@
 				required: true,
 			},
 		},
-		mounted() {
+		created() {
 			this.navList = uni.getStorageSync('qxList')
-			this.navList.map(item => {
-				item.type = false
-				if(item.name == '装船指令') {
-					item.path = '/pages/index/index'
-					item.icon = '../../static/images/theme/zcIcon1-1.png'
-					item.smpId = '../../static/images/theme/zcIcon1-2.png'
-				}
-				return item
-			})
+			this.navList[uni.getStorageSync("navIndex")].type = true
 			this.loginObj = uni.getStorageSync('loginObj')
 			this.initData()
 			this.activeIndex = uni.getStorageSync("selectPortIndex")
-			this.navList[uni.getStorageSync("navIndex")].type = true
 			this.getUser()
 		},
 		methods: {
diff --git a/manifest.json b/manifest.json
index 66de4ca..c561d22 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "海通Pad",
     "appid" : "__UNI__F864E80",
     "description" : "",
-    "versionName" : "1.0.0",
+    "versionName" : "1.0.4",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
diff --git a/pages.json b/pages.json
index 7e74487..7067344 100644
--- a/pages.json
+++ b/pages.json
@@ -43,6 +43,12 @@
 				"navigationBarTitleText": "指令"
 			}
 		},
+		{
+			"path": "pages/index/ladingNumber",
+			"style": {
+				"navigationBarTitleText": "提单号"
+			}
+		},
 		{
 			"path": "pages/index/instructDetails",
 			"style": {
diff --git a/pages/discharge/instruct.vue b/pages/discharge/instruct.vue
index 6cef91a..5f644a7 100644
--- a/pages/discharge/instruct.vue
+++ b/pages/discharge/instruct.vue
@@ -1682,7 +1682,7 @@
 			// 获取卸船进度数据
 			getJobProgress() {
 				uni.request({
-					url: `${this.$local}/api/instruction/statistics/JobProgress?filterType=BRD_TYPE&target=UN_L&vvyId=${this.shipInfo.vvyId}`,
+					url: `${this.$local}/api/instruction/statistics/JobProgress?filterType=BRD_TYPE&target=UN_L&vvyId=${this.shipInfo.vvyId}&size=5000&current=1`,
 					header: {
 						'Content-Type': 'application/x-www-form-urlencoded', //自定义请求头信息
 						'Authorization': `Bearer ${this.loginObj.access_token}`
diff --git a/pages/index/domesticTrade.vue b/pages/index/domesticTrade.vue
index b1fd3e1..c261984 100644
--- a/pages/index/domesticTrade.vue
+++ b/pages/index/domesticTrade.vue
@@ -759,20 +759,20 @@
 			this.qxList = uni.getStorageSync('qxList')
 			this.qxList.forEach(v => {
 				if (v.code == "shipmentDirectives") {
-					v.operates.forEach(e => {
-						if (e.code == "B1") {
+					v.subMenus.forEach(e => {
+						if (e.code == "shipmentDirectivesGeneral") {
 							this.zzlIsShwo = true
 							this.zzlName = e.name
-						} else if (e.code == "B2") {
+						} else if (e.code == "shipmentDirectivesStowage") {
 							this.pztIsShow = true
 							this.pztName = e.name
-						} else if (e.code == "B3") {
+						} else if (e.code == "shipmentDirectivesSub") {
 							this.fzlIsShow = true
 							this.fzlName = e.name
-						} else if (e.code == "B4") {
+						} else if (e.code == "shipmentDirectivesSubGroup") {
 							this.bzzIsShow = true
 							this.bzzName = e.name
-						} else if (e.code == "B5") {
+						} else if (e.code == "shipmentDirectivesSite") {
 							this.cwtIsShow = true
 							this.cwtName = e.name
 						} else if (e.code == "B6") {
@@ -1447,7 +1447,7 @@
 			// 获取卸船进度数据
 			getJobProgress() {
 				uni.request({
-					url: `${this.$local}/api/instruction/statistics/JobProgress?filterType=${this.filterType}&target=N_L&vvyId=${this.shipInfo.vvyId}`,
+					url: `${this.$local}/api/instruction/statistics/JobProgress?filterType=${this.filterType}&target=N_L&vvyId=${this.shipInfo.vvyId}&size=5000&current=1`,
 					header: {
 						'Content-Type': 'application/x-www-form-urlencoded', //自定义请求头信息
 						'Authorization': `Bearer ${this.loginObj.access_token}`
diff --git a/pages/index/index.vue b/pages/index/index.vue
index cda4502..3e192ad 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -9,7 +9,7 @@
 							placeholder="请选择贸易类型" v-model="tradeName" @select="tradeSelect"></superwei-combox> -->
 						<superwei-combox class="input" :candidates="shipList" :isJSON="true" keyName="vvyShip"
 							placeholder="请选择船名/航次" v-model="vvyShip" @select="shipSelect"
-							@input="shipInput"></superwei-combox>
+							@input="shipInput" clears @clearValue="clearValue"></superwei-combox>
 						<button class="btn" @click="onSearch">搜索</button>
 					</view>
 					<view class="rightInput" @click="screen">
@@ -33,6 +33,7 @@
 										<p v-if="item.vvyStatus==0" class="dfs">{{item.vvyStatusName}}</p>
 										<p v-if="item.vvyStatus==1" class="zyz">{{item.vvyStatusName}}</p>
 										<p v-if="item.vvyStatus==2" class="ywc">{{item.vvyStatusName}}</p>
+										<p v-if="item.vvyStatus==3" class="yks">{{item.vvyStatusName}}</p>
 									</view>
 								</view>
 								<view class="row">
@@ -122,10 +123,10 @@
 						value: "1",
 						name: "外贸"
 					},
-					{
-						value: "2",
-						name: "内贸"
-					}
+					// {
+					// 	value: "2",
+					// 	name: "内贸"
+					// }
 				],
 				vvyShip: "",
 				vvyId: "",
@@ -143,21 +144,8 @@
 				portObj: {},
 
 				isMore: false,
-				dcList:[
-					{
-						value: "0",
-						name: "未开始"
-					},
-					{
-						value: "1",
-						name: "作业中"
-					},
-					{
-						value: "2",
-						name: "已完成"
-					},
-				],
-				vvyStatus:'未开始',
+				dcList:[],
+				vvyStatus:'',
 				operationDate:'',
 				startDate:'',
 				endDate:'',
@@ -189,7 +177,7 @@
 		},
 		mounted() {
 			downloadPackage()
-			this.initData()
+			this.getDcList()
 		},
 		methods: {
 			// 切换贸易类型
@@ -221,6 +209,15 @@
 				}
 				this.getShip()
 			},
+			// 清空选择值
+			clearValue() {
+				this.shipValue = ""
+				this.vvyId = ""
+				this.vvyShip = ""
+				this.shipId = ""
+				this.shipName = ""
+				this.getShip()
+			},
 			// 获取船舶
 			getShip() {
 				if (this.tradeName == '外贸') {
@@ -376,6 +373,28 @@
               var d = dd.getDate() < 10 ? "0" + dd.getDate() : dd.getDate();
               return y + "-" + m + "-" + d + ' 00:00:00';
             },
+			// 获取计划状态基础数据
+			getDcList() {
+				uni.request({
+					url: this.$local + '/api/miniapp/typeRef/domain/VVY_STATUS',
+					header: {
+						'Content-Type': 'application/json', //自定义请求头信息
+						'Authorization': `Bearer ${this.loginObj.access_token}`
+					},
+					method: 'GET', //请求方式，必须为大写
+					success: (res) => {
+						if (res.data.status == 200) {
+							res.data.data.forEach(item => {
+								this.dcList.push({
+									value:item.ptrCode,
+									name:item.ptrDesc
+								})
+							})
+							this.initData()
+						}
+					}
+				})
+			}
 		}
 	};
 </script>
@@ -508,18 +527,22 @@
 					}
 
 					.dfs {
-						color: #0067CF;
-						background: #F1F8FF;
+						color: white;
+						background: #d9001b;
 					}
 
 					.zyz {
-						color: #04B578;
-						background: #E8FFF7;
+						color: white;
+						background: #1181fb;
 					}
 
 					.ywc {
-						color: #666666;
-						background: #F7F7F7;
+						color: white;
+						background: #70b603;
+					}
+					.yks {
+						color: white;
+						background: #f59a23;
 					}
 				}
 			}
diff --git a/pages/index/instruct.vue b/pages/index/instruct.vue
index 88bf35f..0b4fdc6 100644
--- a/pages/index/instruct.vue
+++ b/pages/index/instruct.vue
@@ -8,7 +8,7 @@
 					<button class="button" type="default" @click="distribute('center','all')">指令下发</button>
 				</template>
 				<template v-if="tabsValue == 1">
-					<!-- <button class="button" type="default" @click="ask">装船要求</button> -->
+					<button class="button buttons" type="default" @click="ask">装船要求</button>
 					<button class="button" type="default" @click="distribute('center','solo')">指令下发</button>
 				</template>
 				<template v-if="tabsValue == 2 || tabsValue == 3 || tabsValue == 4">
@@ -21,16 +21,20 @@
 					<p>刷新</p>
 				</view>
 			</template>
-			<custom-tabs type="c1" :value="tabsValue" @change="changeTabs">
+			<custom-tabs type="c1" :value="tabsValue" @change="changeTabs" :flag1="zzlReaDots" :flag2="fzlReaDots">
 				<custom-tab-pane :label="zzlName" name="c1_1" v-if="zzlIsShwo">
 					<view></view>
 					<view class="main">
 						<view class="form">
 							<view class="inputBox">
 								<view class="leftInput">
-									<uni-easyinput class="uni-mt-5" suffixIcon="search" v-model="mnfBl"
+									<uni-easyinput class="uni-mt-5" suffixIcon="search" v-model="InputmnfBl"
 										placeholder="提单号" @iconClick="search" @input="inputChange"></uni-easyinput>
 								</view>
+								<view style="display: flex;">
+									<view style="line-height: 25px;">只看：</view>
+									<uni-data-checkbox multiple min="1" v-model="checkbox" :localdata="hobby" @change="changeValue"></uni-data-checkbox>
+								</view>
 								<view class="rightInput" @click="screen">
 									<p>品牌<uni-icons type="bottom" style="margin-left: 5px;" size="16"></uni-icons></p>
 									<p>车型<uni-icons type="bottom" style="margin-left: 5px;" size="16"></uni-icons></p>
@@ -43,13 +47,14 @@
                              <view @click="zzlFlag = !zzlFlag" :class="[zzlFlag ? 'bottom' : '']">指令发送进度</view>
                              <view @click="zzlFlag = !zzlFlag" :class="[zzlFlag ? '' : 'bottom']">装船进度</view>
 							 <view class="changBox" v-show="!zzlFlag">
-                              <view class="change" @click.stop="clickTab('td')" :class="[filterType == 'MNF_BL_TYPE' ? 'ava' : '']">按提单</view>
-                              <view class="change" @click.stop="clickTab('pp')" :class="[filterType == 'BRD_TYPE' ? 'ava' : '']">按品牌</view>
-                              <view class="change" @click.stop="clickTab('gk')" :class="[filterType == 'POT_TYPE' ? 'ava' : '']">按港口</view>
+                              <view class="change" @click.stop="clickTab('td')" :class="[filterType == 'MNF_BL_TYPE' ? 'ava' : '']">提单</view>
+                              <view class="change" @click.stop="clickTab('pp')" :class="[filterType == 'BRD_TYPE' ? 'ava' : '']">品牌</view>
+                              <view class="change" @click.stop="clickTab('gk')" :class="[filterType == 'POT_TYPE' ? 'ava' : '']">港口</view>
+                              <view class="change" @click.stop="clickTab('cc')" :class="[filterType == 'CABIN_LEVEL_TYPE' ? 'ava' : '']">舱层</view>
 							 </view>
 						    </view>
 							<template v-if="zzlFlag">
-							 <view class="tjHead" @click="clickTjHead('zzl')">
+							 <view class="tjHead" @click="clickTjHead('zzl')" v-if="ZLFlag">
 								<view class="title">
 									<p>总指令进度</p>
 									<text>{{zTjList.totalSentCount}}/{{zTjList.totalSum}}</text>
@@ -66,38 +71,51 @@
 									<image src="../../static/images/tjxz.png" mode=""></image>
 								</view>
 							 </view>
-							 <template v-for="(item,index) in zTjList.instructionStatisticsList">
-								<view class="tjInfo" :key="index" :class="{active:zTjActive == index}"
-									@click="clickTjList(item,index,'zzl')">
-									<view class="title">
-										<p>{{item.titleBar}}</p>
-										<text>{{item.totalSentCount}}/{{item.zsum}}</text>
-									</view>
-									<lx-progress-bar title="" :total="item.zsum" :firstValue="item.totalSentCount"
-										:secondValue="item.totalPausedSentCount" contentColor="#0067CF"
-										contentColor2="#FC4F00" backColor="#f2f2f2" />
-									<view class="bottomInfo">
-										<p>已发送<text>{{item.totalSentCount}}</text></p>
-										<p>(暂停<text>{{item.totalPausedSentCount}}</text>)</p>
-										<p>未发<text>{{item.totalNotSentCount}}</text></p>
-									</view>
-									<view class="imgBox" v-if="zTjActive == index">
-										<image src="../../static/images/tjxz2.png" mode=""></image>
-									</view>
-								</view>
-							 </template>
+							 <view class="tjInfo" v-for="(item,index) in zTjList.instructionStatisticsList" :key="index" :class="{active:zTjActive == index}"
+							 	@click="clickTjList(item,index,'zzl')" v-if="ZLFlag">
+							 	<view class="title">
+							 		<p>{{item.titleBar}}</p>
+							 		<text>{{item.totalSentCount}}/{{item.zsum}}</text>
+							 	</view>
+							 	<lx-progress-bar title="" :total="item.zsum" :firstValue="item.totalSentCount"
+							 		:secondValue="item.totalPausedSentCount" contentColor="#0067CF"
+							 		contentColor2="#FC4F00" backColor="#f2f2f2" />
+							 	<view class="bottomInfo">
+							 		<p>已发送<text>{{item.totalSentCount}}</text></p>
+							 		<p>(暂停<text>{{item.totalPausedSentCount}}</text>)</p>
+							 		<p>未发<text>{{item.totalNotSentCount}}</text></p>
+							 	</view>
+							 	<view class="imgBox" v-if="zTjActive == index">
+							 		<image src="../../static/images/tjxz2.png" mode=""></image>
+							 	</view>
+							 </view>
 							</template>
 							<template v-else>
-							<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index,'zzl')" :class="{active:jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label}">
-                              <view class="label">{{ item.label }}</view>
+							<view class="zjInfo" v-if="jobProgressList.length > 0">
+                              <text class="title">装船总进度</text>
+							  <view class="lie1">总数：{{totalProgress.progress}}/{{ totalProgress.totalProgress }}</view>
+							  <lx-progress-bar title="" :total="totalProgress.totalProgress" :firstValue="totalProgress.progress"
+							  contentColor="#0067CF"
+							  backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
+							  <view class="lie1">车辆：{{totalProgress.carProgress}}/{{ totalProgress.carTotalProgress }}</view>
+							  <lx-progress-bar title="" :total="totalProgress.carTotalProgress" :firstValue="totalProgress.carProgress"
+							  contentColor="#0067CF"
+							  backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
+							  <view class="lie1">备件：{{totalProgress.partProgress}}/{{ totalProgress.partTotalProgress }}</view>
+							  <lx-progress-bar title="" :total="totalProgress.partTotalProgress" :firstValue="totalProgress.partProgress"
+							  contentColor="#0067CF"
+							  backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
+							</view>
+							<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index,'zzl')" :class="{active:jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label || shipDeck == item.label}">
+                              <view class="label">{{ item.label }}{{filterType == 'CABIN_LEVEL_TYPE' ? '层' : ''}}</view>
 							  <lx-progress-bar title="" :total="item.totalProgress" :firstValue="item.progress"
 							  contentColor="#0067CF"
 							  backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
 							  <view class="bottomBox">
-								<p>已装船:<text>{{ item.progress }}</text></p>
-								<p style="margin-left: 16px;">待装船:<text>{{ item.totalProgress - item.progress }}</text></p>
+								<p>待装车辆:<text>{{ item.carWaitCount }}</text></p>
+								<p style="margin-left: 16px;">待装备件:<text>{{ item.partWaitCount }}</text></p>
 							  </view>
-							  <view class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label">
+							  <view class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label || shipDeck == item.label">
 								<image src="../../static/images/tjxz2.png" mode=""></image>
 							  </view>
 							</view>
@@ -120,7 +138,7 @@
 																船舱层数：{{item.shipDeck}}层{{item.cabinNo}}舱
 															</view>
 														</view>
-														<view class="schedule">
+														<!-- <view class="schedule">
 															<text class="text">装船进度</text>
 															<view class="progressBox">
 																<van-progress color="#0067CF" stroke-width="6px"
@@ -128,40 +146,62 @@
 																	:percentage="itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)" />
 															</view>
 															<text>{{itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)}}%</text>
+														</view> -->
+														<view class="schedule">装船进度：{{item.loadNum}} / {{item.loadTotalNum}}</view>
+														<view class="vehicle" :class="[item.goodsClassify == 1 ? 'vehicle1' : 'vehicle2']">
+															<text v-show="item.goodsClassify == 1" class="text1">{{item.goodsClassifyName}}</text>
+															<text v-show="item.goodsClassify == 3" class="text2">{{item.goodsClassifyName}}</text>
 														</view>
 														<view class="planStatus planStatus0"
-															v-if="item.totalPlanStatus == 0">
-															<text class="text">{{item.totalPlanStatusDesc}}</text>
-														</view>
-														<view class="planStatus planStatus3"
-															v-if="item.totalPlanStatus == 3">
-															<text class="text">{{item.totalPlanStatusDesc}}</text>
-														</view>
-														<view class="planStatus planStatus5"
-															v-if="item.totalPlanStatus == 5">
-															<text class="text">{{item.totalPlanStatusDesc}}</text>
+															v-if="item.jobStatus == 0">
+															<text class="text">{{item.jobStatusName}}</text>
 														</view>
 														<view class="planStatus planStatus1"
-															v-if="item.totalPlanStatus == 1 || item.totalPlanStatus == 2 || item.totalPlanStatus == 4">
-															<text class="text">{{item.totalPlanStatusDesc}}</text>
+															v-if="item.jobStatus == 1">
+															<text class="text">{{item.jobStatusName}}</text>
+														</view>
+														<view class="planStatus planStatus2"
+															v-if="item.jobStatus == 2">
+															<text class="text">{{item.jobStatusName}}</text>
+														</view>
+														<view class="planStatus planStatus3"
+															v-if="item.jobStatus == 3">
+															<text class="text">{{item.jobStatusName}}</text>
 														</view>
 													</view>
 													<view class="row">
+													 <view style="width:100%">
 														<view class="rowInfo">
-															<view class="col">
+															<!-- <view class="col">
 																<text>数量：</text>
 																<text>{{item.totalCount}}</text>
+															</view> -->
+															<view class="col">
+																<text>中转港：</text>
+																<text>{{ item.transitPotName }}</text>
 															</view>
+															<view class="col">
+																<text>品牌：</text>
+																<text>{{item.brdName}}</text>
+															</view>
+															<!-- <view class="col">
+																<text>发送人：</text>
+																<text>{{item.totalSendUser}}</text>
+															</view> -->
+														</view>
+														<view class="rowInfo">
 															<view class="col">
 																<text>港口：</text>
 																<text>{{item.potName}}</text>
 															</view>
-															<view class="col">
-																<text>发送人：</text>
-																<text>{{item.totalSendUser}}</text>
-															</view>
 														</view>
 														<view class="rowInfo">
+															<view>
+																<text>场位：</text>
+																<text>{{item.yardPos}}</text>
+															</view>
+														</view>
+														<!-- <view class="rowInfo">
 															<view class="col">
 																<text>负责人：</text>
 																<text>{{item.responsiblePerson}}</text>
@@ -170,19 +210,39 @@
 																<text>发送时间：</text>
 																<text>{{item.totalSendTime}}</text>
 															</view>
-														</view>
+														</view> -->
+													 </view>
 													</view>
-													<view class="expand" v-if="itemActive != item.index"
+													<view class="scroll">
+													 <uni-table stripe emptyText="暂无更多数据">
+					                                 	<!-- 表头行 -->
+					                                 	<uni-tr>
+					                                 		<uni-th width="22">品牌</uni-th>
+					                                 		<uni-th width="15">场位</uni-th>
+					                                 		<uni-th width="40">待装数量</uni-th>
+					                                 	</uni-tr>
+					                                 	<!-- 表格数据行 -->
+					                                 	<uni-tr v-for="(item1,index) in item.yardPosGoodsInfoList" :key="index">
+					                                 		<uni-td>{{item1.brdName}}</uni-td>
+					                                 		<uni-td>{{item1.yardPos}}</uni-td>
+					                                 		<uni-td>{{item1.readyLoadNum}}</uni-td>
+					                                 	</uni-tr>
+					                                 </uni-table>
+												    </view>
+													<!-- <view class="expand" v-if="itemActive != item.index"
 														@click="isActive(item.index)">
 														展开
 													</view>
 													<view class="expand" v-else @click="itemActive = '-1'">
 														收起
+													</view> -->
+													<view class="tdBtn">
+														<button type="primary" size="mini" @click="toLading(item)">查看提单</button>
 													</view>
 												</view>
 												<view class="details">
 													<view class="itemDetails" v-show="itemActive == item.index">
-													<!-- <view class="itemDetails" v-show="itemActive == item.index"> -->
+													<view class="itemDetails" v-show="itemActive == item.index">
 														<template v-for="(item2,index2) in item.infoList">
 															<view class="detailsBox" :key="index2">
 																<view class="title">
@@ -211,6 +271,7 @@
 														</template>
 													</view>
 												</view>
+											    </view>
 											</view>
 										</template>
 									<!-- </custom-waterfalls-flow> -->
@@ -226,9 +287,13 @@
 						<view class="form">
 							<view class="inputBox">
 								<view class="leftInput">
-									<uni-easyinput class="uni-mt-5" suffixIcon="search" v-model="mnfBl"
+									<uni-easyinput class="uni-mt-5" suffixIcon="search" v-model="InputmnfBl"
 										placeholder="提单号" @iconClick="search" @input="inputChange"></uni-easyinput>
 								</view>
+								<view style="display: flex;">
+									<view style="line-height: 25px;">只看：</view>
+									<uni-data-checkbox multiple min="1" v-model="checkbox" :localdata="hobby" @change="changeValue"></uni-data-checkbox>
+								</view>
 								<view class="rightInput" @click="screen">
 									<p>发送状态<uni-icons type="bottom" style="margin-left: 5px;" size="16"></uni-icons></p>
 									<p>品牌<uni-icons type="bottom" style="margin-left: 5px;" size="16"></uni-icons></p>
@@ -242,13 +307,14 @@
                              <view @click="fzlFlag = !fzlFlag" :class="[fzlFlag ? 'bottom' : '']">指令发送进度</view>
                              <view @click="fzlFlag = !fzlFlag" :class="[fzlFlag ? '' : 'bottom']">装船进度</view>
 							 <view class="changBox" v-show="!fzlFlag">
-                              <view class="change" @click.stop="clickTab('td')" :class="[filterType == 'MNF_BL_TYPE' ? 'ava' : '']">按提单</view>
-                              <view class="change" @click.stop="clickTab('pp')" :class="[filterType == 'BRD_TYPE' ? 'ava' : '']">按品牌</view>
-                              <view class="change" @click.stop="clickTab('gk')" :class="[filterType == 'POT_TYPE' ? 'ava' : '']">按港口</view>
+                              <view class="change" @click.stop="clickTab('td')" :class="[filterType == 'MNF_BL_TYPE' ? 'ava' : '']">提单</view>
+                              <view class="change" @click.stop="clickTab('pp')" :class="[filterType == 'BRD_TYPE' ? 'ava' : '']">品牌</view>
+                              <view class="change" @click.stop="clickTab('gk')" :class="[filterType == 'POT_TYPE' ? 'ava' : '']">港口</view>
+							  <view class="change" @click.stop="clickTab('cc')" :class="[filterType == 'CABIN_LEVEL_TYPE' ? 'ava' : '']">舱层</view>
 							 </view>
 						    </view>
 							<template v-if="fzlFlag">
-							 <view class="tjHead" @click="clickTjHead('fzl')">
+							 <view class="tjHead" @click="clickTjHead('fzl')" v-if="ZLFlag">
 								<view class="title">
 									<p>分指令进度</p>
 									<text>{{zTjList.branchSentCount}}/{{zTjList.branchSum}}</text>
@@ -265,57 +331,68 @@
 									<image src="../../static/images/tjxz.png" mode=""></image>
 								</view>
 							 </view>
-							 <template v-for="(item,index) in zTjList.instructionStatisticsList">
-								<view class="tjInfo" :key="index" :class="{active:zTjActive == index}"
-									@click="clickTjList(item,index,'fzl')">
-									<view class="title">
-										<p>{{item.titleBar}}</p>
-										<text>{{item.branchSentCount}}/{{item.fsum}}</text>
-									</view>
-									<lx-progress-bar title="" :total="item.fsum" :firstValue="item.branchSentCount"
-										:secondValue="item.branchPausedSentCount" contentColor="#0067CF"
-										contentColor2="#FC4F00" backColor="#f2f2f2" />
-									<view class="bottomInfo">
-										<p>已发送<text>{{item.branchSentCount}}</text></p>
-										<p>(暂停<text>{{item.branchPausedSentCount}}</text>)</p>
-										<p>未发<text>{{item.branchNotSentCount}}</text></p>
-									</view>
-									<view class="imgBox" v-if="zTjActive == index">
-										<image src="../../static/images/tjxz2.png" mode=""></image>
-									</view>
-								</view>
-							 </template>
+							 <view class="tjInfo" v-for="(item,index) in zTjList.instructionStatisticsList" :key="index" :class="{active:zTjActive == index}"
+							 	@click="clickTjList(item,index,'fzl')" v-if="ZLFlag">
+							 	<view class="title">
+							 		<p>{{item.titleBar}}</p>
+							 		<text>{{item.branchSentCount}}/{{item.fsum}}</text>
+							 	</view>
+							 	<lx-progress-bar title="" :total="item.fsum" :firstValue="item.branchSentCount"
+							 		:secondValue="item.branchPausedSentCount" contentColor="#0067CF"
+							 		contentColor2="#FC4F00" backColor="#f2f2f2" />
+							 	<view class="bottomInfo">
+							 		<p>已发送<text>{{item.branchSentCount}}</text></p>
+							 		<p>(暂停<text>{{item.branchPausedSentCount}}</text>)</p>
+							 		<p>未发<text>{{item.branchNotSentCount}}</text></p>
+							 	</view>
+							 	<view class="imgBox" v-if="zTjActive == index">
+							 		<image src="../../static/images/tjxz2.png" mode=""></image>
+							 	</view>
+							 </view>
 						    </template>
 							<template v-else>
+							<view class="zjInfo" v-if="jobProgressList.length > 0">
+                              <text class="title">装船总进度</text>
+							  <view class="lie1">总数：{{totalProgress.progress}}/{{ totalProgress.totalProgress }}</view>
+							  <lx-progress-bar title="" :total="totalProgress.totalProgress" :firstValue="totalProgress.progress"
+							  contentColor="#0067CF"
+							  backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
+							  <view class="lie1">车辆：{{totalProgress.carProgress}}/{{ totalProgress.carTotalProgress }}</view>
+							  <lx-progress-bar title="" :total="totalProgress.carTotalProgress" :firstValue="totalProgress.carProgress"
+							  contentColor="#0067CF"
+							  backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
+							  <view class="lie1">备件：{{totalProgress.partProgress}}/{{ totalProgress.partTotalProgress }}</view>
+							  <lx-progress-bar title="" :total="totalProgress.partTotalProgress" :firstValue="totalProgress.partProgress"
+							  contentColor="#0067CF"
+							  backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
+							</view>
 							<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index,'fzl')" :class="{active:jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label}">
-                              <view class="label">{{ item.label }}</view>
+                              <view class="label">{{ item.label }}{{filterType == 'CABIN_LEVEL_TYPE' ? '层' : ''}}</view>
 							  <lx-progress-bar title="" :total="item.totalProgress" :firstValue="item.progress"
 							  contentColor="#0067CF"
 							  backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
 							  <view class="bottomBox">
-								<p>已装船:<text>{{ item.progress }}</text></p>
-								<p style="margin-left: 16px;">待装船:<text>{{ item.totalProgress - item.progress }}</text></p>
+								<p>待装车辆:<text>{{ item.carWaitCount }}</text></p>
+								<p style="margin-left: 16px;">待装备件:<text>{{ item.partWaitCount }}</text></p>
 							  </view>
 							  <view class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label">
 								<image src="../../static/images/tjxz2.png" mode=""></image>
 							  </view>
 							</view>
 						    </template>
-							
 						</view>
 						<template v-if="itemList.length > 0">
-							<checkbox-group @change="checkChange">
+							<!-- <checkbox-group @change="checkChange"> -->
 								<view class="itemBox">
 									<view class="itemList">
 										<!-- <custom-waterfalls-flow :value="itemList" :column="2" :columnSpace="1"> -->
 											<!-- <template v-slot:default="item"> -->
-												<template v-for="item in itemList">
-												<view class="exp">
+												<view v-for="item in itemList" :key="item.lwpId" class="exp" @click="clickItem(item)" :class="{actives:item.flag}">
 													<view class="item">
 														<view class="row">
 															<view class="title">
 																<view class="rowHead">
-																	<checkbox :value="item.lwpId" :checked="false" />
+																	<!-- <checkbox :value="item.lwpId" :checked="false" /> -->
 																</view>
 																<image class="titleImg"
 																	src="../../static/images/zlIcon.png"
@@ -325,83 +402,80 @@
 																	船舱层数：{{item.shipDeck}}层{{item.cabinNo}}舱
 																</view>
 															</view>
-															<view class="schedule">
-																<text class="text">装船进度</text>
-																<view class="progressBox">
-																	<van-progress color="#0067CF" stroke-width="6px"
-																		:show-pivot="false" track-color="#DEE9F5"
-																		:percentage="itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)" />
-																</view>
-																<text>{{itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)}}%</text>
-															</view>
+															<view class="schedule">装船进度：{{item.loadNum}} / {{item.loadTotalNum}}</view>
+														    <view class="vehicle" :class="[item.goodsClassify == 1 ? 'vehicle1' : 'vehicle2']">
+														    	<text v-show="item.goodsClassify == 1" class="text1">{{item.goodsClassifyName}}</text>
+														    	<text v-show="item.goodsClassify == 3" class="text2">{{item.goodsClassifyName}}</text>
+														    </view>
 															<view class="planStatus planStatus0"
-																v-if="item.branchPlanStatus == '0'">
-																<text class="text">{{item.branchPlanStatusDesc}}</text>
+																v-if="item.jobStatus == 0">
+																<text class="text">{{item.jobStatusName}}</text>
 															</view>
 															<view class="planStatus planStatus1"
-																v-if="item.branchPlanStatus == '1'">
-																<text class="text">{{item.branchPlanStatusDesc}}</text>
+																v-if="item.jobStatus == 1">
+																<text class="text">{{item.jobStatusName}}</text>
+															</view>
+															<view class="planStatus planStatus2"
+																v-if="item.jobStatus == 2">
+																<text class="text">{{item.jobStatusName}}</text>
 															</view>
 															<view class="planStatus planStatus3"
-																v-if="item.branchPlanStatus == '2'">
-																<text class="text">{{item.branchPlanStatusDesc}}</text>
+																v-if="item.jobStatus == 3">
+																<text class="text">{{item.jobStatusName}}</text>
 															</view>
-															<view class="planStatus planStatus5"
-																v-if="item.branchPlanStatus == '4'">
-																<text class="text">{{item.branchPlanStatusDesc}}</text>
-															</view>
-															<view class="planStatus planStatus1"
+															<!-- <view class="planStatus planStatus1"
 																v-if="item.branchPlanStatus == '5'">
 																<text class="text">{{item.branchPlanStatusDesc}}</text>
-															</view>
+															</view> -->
 														</view>
 														<view class="row">
+														  <view style="width:100%">
 															<view class="rowInfo">
 																<view class="col">
-																	<text>数量：</text>
-																	<text>{{item.totalCount}}</text>
-																</view>
+																    <text>中转港：</text>
+																    <text>{{ item.transitPotName }}</text>
+															    </view>
+															    <view class="col">
+															    	<text>品牌：</text>
+															    	<text>{{item.brdName}}</text>
+															    </view>
+															</view>
+															<view class="rowInfo">
 																<view class="col">
 																	<text>港口：</text>
 																	<text>{{item.potName}}</text>
 																</view>
-																<view class="col">
-																	<text>分指令发送人：</text>
-																	<text>{{item.branchSendUser}}</text>
-																</view>
 															</view>
 															<view class="rowInfo">
-																<view class="col">
-																	<text>负责人：</text>
-																	<text>{{item.responsiblePerson}}</text>
-																</view>
-																<view class="col">
-																	<text>发送时间：</text>
-																	<text>{{item.totalSendTime}}</text>
-																</view>
+																<view>
+																  <text>场位：</text>
+																  <text>{{item.yardPos}}</text>
+															    </view>
 															</view>
+														  </view>
 														</view>
-														<view class="xfBtn">
-															<view class="btn" @click="distribute('center','solo',item)"
-																v-if="item.branchPlanStatusDesc == '待发送'">
-																指令下发
-															</view>
-															<view class="btn" @click="distribute('center','again',item)"
-																v-if="item.branchPlanStatusDesc == '暂停'">
-																重新发送
-															</view>
-															<view class="btn stopbtn" @click="suspend(item)"
-																v-if="item.branchPlanStatusDesc == '作业中' || item.branchPlanStatusDesc == '待作业'">
-																暂停
-															</view>
-														</view>
-														<view class="expand" v-if="itemActive != item.index"
-															@click="isActive(item.index)">
-															展开
-														</view>
-														<view class="expand" v-else @click="itemActive = '-1'">
-															收起
-														</view>
+														<view class="scroll">
+														 <uni-table stripe emptyText="暂无更多数据">
+					                                	  <!-- 表头行 -->
+					                                	  <uni-tr>
+					                                	  	<uni-th width="22">品牌</uni-th>
+					                                	  	<uni-th width="15">场位</uni-th>
+					                                	  	<uni-th width="40">待装数量</uni-th>
+					                                	  </uni-tr>
+					                                	  <!-- 表格数据行 -->
+					                                	  <uni-tr v-for="(item1,index) in item.yardPosGoodsInfoList" :key="index">
+					                                	  	<uni-td>{{item1.brdName}}</uni-td>
+					                                	  	<uni-td>{{item1.yardPos}}</uni-td>
+					                                	  	<uni-td>{{item1.readyLoadNum}}</uni-td>
+					                                	  </uni-tr>
+					                                     </uni-table>
+													    </view>
+														<view class="tdBtn">
+														  <view>
+														  <button type="primary" size="mini" style="margin-right: 10px" @click.stop="toLading(item)">查看提单</button>
+														  <button type="primary" size="mini" @click.stop="distribute('center','solo',item)">指令下发</button>
+														  </view>
+													    </view>
 													</view>
 													<view class="details">
 														<view class="itemDetails" v-show="itemActive == item.index">
@@ -434,12 +508,14 @@
 															</template>
 														</view>
 													</view>
+													<view class="imgBox" v-show="item.flag">
+							                       	 <image src="../../static/images/tjxz2.png" mode=""></image>
+							                        </view>
 												</view>
-											    </template>
 										<!-- </custom-waterfalls-flow> -->
 									</view>
 								</view>
-							</checkbox-group>
+							<!-- </checkbox-group> -->
 						</template>
 						<o-empty v-else height="70vh" bg="#f5f6fa" />
 					</view>
@@ -450,9 +526,13 @@
 						<view class="form">
 							<view class="inputBox">
 								<view class="leftInput">
-									<uni-easyinput class="uni-mt-5" suffixIcon="search" v-model="mnfBl"
+									<uni-easyinput class="uni-mt-5" suffixIcon="search" v-model="InputmnfBl"
 										placeholder="提单号" @iconClick="search" @input="inputChange"></uni-easyinput>
 								</view>
+								<view style="display: flex;">
+									<view style="line-height: 25px;">只看：</view>
+									<uni-data-checkbox multiple min="1" v-model="checkbox" :localdata="hobby" @change="changeValue"></uni-data-checkbox>
+								</view>
 								<view class="rightInput" @click="screen">
 									<p>品牌<uni-icons type="bottom" style="margin-left: 5px;" size="16"></uni-icons></p>
 									<p>车型<uni-icons type="bottom" style="margin-left: 5px;" size="16"></uni-icons></p>
@@ -464,26 +544,41 @@
 							<view class="tab">
                              <view class="bottom">装船进度</view>
 							 <view class="changBox">
-                              <view class="change" @click.stop="clickTab('td')" :class="[filterType == 'MNF_BL_TYPE' ? 'ava' : '']">按提单</view>
-                              <view class="change" @click.stop="clickTab('pp')" :class="[filterType == 'BRD_TYPE' ? 'ava' : '']">按品牌</view>
-                              <view class="change" @click.stop="clickTab('gk')" :class="[filterType == 'POT_TYPE' ? 'ava' : '']">按港口</view>
+                              <view class="change" @click.stop="clickTab('td')" :class="[filterType == 'MNF_BL_TYPE' ? 'ava' : '']">提单</view>
+                              <view class="change" @click.stop="clickTab('pp')" :class="[filterType == 'BRD_TYPE' ? 'ava' : '']">品牌</view>
+                              <view class="change" @click.stop="clickTab('gk')" :class="[filterType == 'POT_TYPE' ? 'ava' : '']">港口</view>
+							  <view class="change" @click.stop="clickTab('cc')" :class="[filterType == 'CABIN_LEVEL_TYPE' ? 'ava' : '']">舱层</view>
 							 </view>
 						    </view>
-							<template>
+
+							<view class="zjInfo" v-if="jobProgressList.length > 0">
+                              <text class="title">装船总进度</text>
+							  <view class="lie1">总数：{{totalProgress.progress}}/{{ totalProgress.totalProgress }}</view>
+							  <lx-progress-bar title="" :total="totalProgress.totalProgress" :firstValue="totalProgress.progress"
+							  contentColor="#0067CF"
+							  backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
+							  <view class="lie1">车辆：{{totalProgress.carProgress}}/{{ totalProgress.carTotalProgress }}</view>
+							  <lx-progress-bar title="" :total="totalProgress.carTotalProgress" :firstValue="totalProgress.carProgress"
+							  contentColor="#0067CF"
+							  backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
+							  <view class="lie1">备件：{{totalProgress.partProgress}}/{{ totalProgress.partTotalProgress }}</view>
+							  <lx-progress-bar title="" :total="totalProgress.partTotalProgress" :firstValue="totalProgress.partProgress"
+							  contentColor="#0067CF"
+							  backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
+							</view>
 							<view class="tjInfo" v-for="(item,index) in jobProgressList" :key="item.id" @click="jobProgress(item,index,'bzz')" :class="{active:jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label}">
-                              <view class="label">{{ item.label }}</view>
+                              <view class="label">{{ item.label }}{{filterType == 'CABIN_LEVEL_TYPE' ? '层' : ''}}</view>
 							  <lx-progress-bar title="" :total="item.totalProgress" :firstValue="item.progress"
 							  contentColor="#0067CF"
 							  backColor="#f2f2f2" textPosition="outside" percentum precision="0" />
 							  <view class="bottomBox">
-								<p>已装船:<text>{{ item.progress }}</text></p>
-								<p style="margin-left: 16px;">待装船:<text>{{ item.totalProgress - item.progress }}</text></p>
+								<p>待装车辆:<text>{{ item.carWaitCount }}</text></p>
+								<p style="margin-left: 16px;">待装备件:<text>{{ item.partWaitCount }}</text></p>
 							  </view>
 							  <view class="imgBox" v-if="jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label">
 								<image src="../../static/images/tjxz2.png" mode=""></image>
 							  </view>
 							</view>
-						    </template>
 							
 						</view>
 						<template v-if="itemList.length > 0">
@@ -492,7 +587,7 @@
 									<!-- <custom-waterfalls-flow :value="itemList" :column="2" :columnSpace="1"> -->
 										<!-- <template v-slot:default="item"> -->
 											<template v-for="item in itemList">
-											<view class="exp">
+											<view class="exp" @click="openPOP(item)">
 												<view class="item">
 													<view class="row">
 														<view class="title">
@@ -503,65 +598,79 @@
 																船舱层数：{{item.shipDeck}}层{{item.cabinNo}}舱
 															</view>
 														</view>
-														<view class="schedule">
-															<text class="text">装船进度</text>
-															<view class="progressBox">
-																<van-progress color="#0067CF" stroke-width="6px"
-																	:show-pivot="false" track-color="#DEE9F5"
-																	:percentage="itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)" />
-															</view>
-															<text>{{itemSum(item.loadingProgress.workProgress, item.loadingProgress.totalProgress)}}%</text>
+														<view class="schedule">装船进度：{{item.loadNum}} / {{item.loadTotalNum}}</view>
+														<view class="vehicle" :class="[item.goodsClassify == 1 ? 'vehicle1' : 'vehicle2']">
+															<text v-show="item.goodsClassify == 1" class="text1">{{item.goodsClassifyName}}</text>
+															<text v-show="item.goodsClassify == 3" class="text2">{{item.goodsClassifyName}}</text>
 														</view>
 														<view class="planStatus planStatus0"
-															v-if="item.branchPlanStatus == 0">
-															<text class="text">{{item.branchPlanStatusDesc}}</text>
+															v-if="item.jobStatus == 0">
+															<text class="text">{{item.jobStatusName}}</text>
+														</view>
+														<view class="planStatus planStatus1"
+															v-else-if="item.jobStatus == 1">
+															<text class="text">{{item.jobStatusName}}</text>
+														</view>
+														<view class="planStatus planStatus2"
+															v-else-if="item.jobStatus == 2">
+															<text class="text">{{item.jobStatusName}}</text>
 														</view>
 														<view class="planStatus planStatus3"
-															v-else-if="item.branchPlanStatus == 2">
-															<text class="text">{{item.branchPlanStatusDesc}}</text>
-														</view>
-														<view class="planStatus planStatus5"
-															v-else-if="item.branchPlanStatus == 4">
-															<text class="text">{{item.branchPlanStatusDesc}}</text>
-														</view>
-														<view class="planStatus planStatus1" v-else>
-															<text class="text">{{item.branchPlanStatusDesc}}</text>
+															v-else-if="item.jobStatus == 3">
+															<text class="text">{{item.jobStatusName}}</text>
 														</view>
 													</view>
 													<view class="row">
+													 <view style="width:100%">
 														<view class="rowInfo">
 															<view class="col">
-																<text>数量：</text>
-																<text>{{item.totalCount}}</text>
+																<text>中转港：</text>
+																<text>{{ item.transitPotName }}</text>
 															</view>
+															<view class="col">
+																<text>品牌：</text>
+																<text>{{item.brdName}}</text>
+															</view>
+														</view>
+														<view class="rowInfo">
 															<view class="col">
 																<text>港口：</text>
 																<text>{{item.potName}}</text>
 															</view>
 														</view>
 														<view class="rowInfo">
-															<view class="col">
-																<text>负责人：</text>
-																<text>{{item.responsiblePerson}}</text>
-															</view>
-															<view class="col">
-																<text>发送时间：</text>
-																<text>{{item.totalSendTime}}</text>
-															</view>
-														</view>
-														<view class="rowInfo">
-															<view class="col">
-																<text>分指令发送人：</text>
-																<text>{{item.branchSendUser}}</text>
+															<view>
+																<text>场位：</text>
+																<text>{{item.yardPos}}</text>
 															</view>
 														</view>
+													 </view>
 													</view>
-													<view class="expand" v-if="itemActive != item.index"
+													<view class="scroll">
+													 <uni-table stripe emptyText="暂无更多数据">
+					                                 	<!-- 表头行 -->
+					                                 	<uni-tr>
+					                                 		<uni-th width="22">品牌</uni-th>
+					                                 		<uni-th width="15">场位</uni-th>
+					                                 		<uni-th width="40">待装数量</uni-th>
+					                                 	</uni-tr>
+					                                 	<!-- 表格数据行 -->
+					                                 	<uni-tr v-for="(item1,index) in item.yardPosGoodsInfoList" :key="index">
+					                                 		<uni-td>{{item1.brdName}}</uni-td>
+					                                 		<uni-td>{{item1.yardPos}}</uni-td>
+					                                 		<uni-td>{{item1.readyLoadNum}}</uni-td>
+					                                 	</uni-tr>
+					                                 </uni-table>
+												    </view>
+													<!-- <view class="expand" v-if="itemActive != item.index"
 														@click="isActive(item.index)">
 														展开
 													</view>
 													<view class="expand" v-else @click="itemActive = '-1'">
 														收起
+													</view> -->
+													<view class="tdBtn">
+														<button type="primary" size="mini" @click.stop="toLading(item)">查看提单</button>
 													</view>
 												</view>
 												<view class="details">
@@ -743,7 +852,7 @@
 						<view class="form form2">
 							<view class="inputBox">
 								<view class="leftInput">
-									<uni-easyinput class="uni-mt-5" suffixIcon="search" v-model="mnfBl"
+									<uni-easyinput class="uni-mt-5" suffixIcon="search" v-model="InputmnfBl"
 										placeholder="提单号" @iconClick="search" @input="inputChange"></uni-easyinput>
 								</view>
 								<view class="rightInput" @click="screen">
@@ -763,7 +872,7 @@
 							<view class="cwRight">
 								<view class="rightBox" v-for="(item,index) in qyList" :key="index">
 									<view class="boxTop">
-										<p>{{item.pyaAreaCode}}（{{item.totalLaneAmout}}/{{item.totalSeatAmout}}）</p>
+										<p>{{item.pyaAreaCode}}（{{item.useSeatAmount}}/{{item.totalSeatAmount}}）</p>
 										<text @click="clickLine(item)">车道</text>
 									</view>
 									<view class="boxContent">
@@ -794,18 +903,17 @@
 												辆
 											</p>
 										</view> -->
-										<template v-if="item.stopGoodsAmout != 0">
+										<!-- <template v-if="item.stopGoodsAmout != 0"> -->
 											<!-- <view class="boxJd">
 												<lx-progress-bar title="" :total="item.totalSeatAmout"
 													:firstValue="item.stopGoodsAmout" contentColor="#0067CF" />
 												<text>{{item.stopGoodsAmout}}/{{item.totalSeatAmout}}</text>
 											</view> -->
 											<view class="carUl">
-												<view class="carLi" v-for="(v,index2) in item.carStatisticsList"
-													:key="index2" @click="clickCar(v)">
-													<zb-tooltip placement="bottom-start" color="white"
-														:visible.sync="v.isShow">
-														<view slot="content">
+												<view class="carLi" v-for="(v,index2) in item.goodsInfoList"
+													:key="index2">
+													<zb-tooltip placement="bottom-start" color="white">
+														<!-- <view slot="content">
 															<view class="tipBox">
 																<view class="li" v-for="(item2,idx) in v.carDetailList"
 																	:key="idx">
@@ -813,25 +921,25 @@
 																	<text>{{item2.storeSeatAmout}}车位</text>
 																</view>
 															</view>
-														</view>
+														</view> -->
 														<view style="width: 100%; height: 100%;">
 															<p class="carTitle">{{v.brdName}}
 																<template v-if="v.bvmName != ''">
 																	-
 																</template>
-																{{v.bvmName}}
+																{{v.bvmName}}-{{v.potName}}
 															</p>
-															<text>共{{v.carAmout}}辆({{v.carDetailList.length}}车道，{{v.carAmout}}车位)</text>
+															<text>共{{v.amount}}辆({{v.lane}}车道)</text>
 														</view>
 													</zb-tooltip>
 												</view>
 											</view>
-										</template>
-										<template v-else>
+										<!-- </template> -->
+										<!-- <template v-else>
 											<view class="notData">
 												未分配
 											</view>
-										</template>
+										</template> -->
 									</view>
 								</view>
 							</view>
@@ -928,6 +1036,89 @@
 					</view>
 				</view>
 			</uni-popup>
+			<uni-popup ref="bzzPOP" type="dialog">
+				<view class="bzzBox">
+					<template v-for="item in bzzPOPList">
+						<view class="exp">
+							<view class="item">
+								<view class="row">
+									<view class="title">
+										<image class="titleImg" src="../../static/images/zlIcon.png"
+											mode="widthFix">
+										</image>
+										<view class="text">
+											船舱层数：{{item.shipDeck}}层{{item.cabinNo}}舱
+										</view>
+									</view>
+									<view class="schedule">装船进度：{{item.loadNum}} / {{item.loadTotalNum}}</view>
+									<view class="vehicle" :class="[item.goodsClassify == 1 ? 'vehicle1' : 'vehicle2']">
+										<text v-show="item.goodsClassify == 1" class="text1">{{item.goodsClassifyName}}</text>
+										<text v-show="item.goodsClassify == 3" class="text2">{{item.goodsClassifyName}}</text>
+									</view>
+									<view class="planStatus planStatus0"
+										v-if="item.jobStatus == 0">
+										<text class="text">{{item.jobStatusName}}</text>
+									</view>
+									<view class="planStatus planStatus1"
+										v-if="item.jobStatus == 1">
+										<text class="text">{{item.jobStatusName}}</text>
+									</view>
+									<view class="planStatus planStatus2"
+										v-if="item.jobStatus == 2">
+										<text class="text">{{item.jobStatusName}}</text>
+									</view>
+									<view class="planStatus planStatus3"
+										v-if="item.jobStatus == 3">
+										<text class="text">{{item.jobStatusName}}</text>
+									</view>
+								</view>
+								<view class="row">
+								 <view style="width:100%">
+									<view class="rowInfo">
+										<view class="col">
+											<text>中转港：</text>
+											<text>{{ item.transitPotName }}</text>
+										</view>
+										<view class="col cols">
+											<text>品牌：</text>
+											<text>{{item.brdName}}</text>
+										</view>
+									</view>
+									<view class="rowInfo">
+										<view class="col">
+											<text>港口：</text>
+											<text>{{item.potName}}</text>
+										</view>
+									</view>
+									<view class="rowInfo">
+										<view class="col">
+											<text>场位：</text>
+											<text>{{item.yardPos}}</text>
+										</view>
+									</view>
+								 </view>
+								</view>
+								<view class="scroll">
+								 <uni-table stripe emptyText="暂无更多数据">
+					             	<!-- 表头行 -->
+					             	<uni-tr>
+					             		<uni-th width="22">品牌</uni-th>
+					             		<uni-th width="15">场位</uni-th>
+					             		<uni-th width="40">待装数量</uni-th>
+					             	</uni-tr>
+					             	<!-- 表格数据行 -->
+					             	<uni-tr v-for="(item1,index) in item.yardPosGoodsInfoList" :key="index">
+					             		<uni-td>{{item1.brdName}}</uni-td>
+					             		<uni-td>{{item1.yardPos}}</uni-td>
+					             		<uni-td>{{item1.readyLoadNum}}</uni-td>
+					             	</uni-tr>
+					             </uni-table>
+							    </view>
+							</view>			
+						</view>
+                      </template>
+				</view>
+			</uni-popup>
 		</view>
 	</view>
 </template>
@@ -1049,7 +1240,22 @@
 				jobProgressList:[],
 				jobActive:null,
 				fzlFlag:true,
-				filterType:'MNF_BL_TYPE'
+				filterType:'MNF_BL_TYPE',
+				hobby: [{
+					text: '车辆',
+					value: 1
+				}, {
+					text: '备件',
+					value: 2
+				}],
+				checkbox:[1,2],
+				zzlReaDots:false,
+				fzlReaDots:false,
+				goodsClassifySelected:null,
+				totalProgress:{},
+				ZLFlag: false, // 判断指令有没有数据，显示数据统计
+				InputmnfBl:'',
+				bzzPOPList:[]
 			}
 		},
 		computed: {
@@ -1068,40 +1274,50 @@
 			this.qxList = uni.getStorageSync('qxList')
 			this.qxList.forEach(v => {
 				if (v.code == "shipmentDirectives") {
-					v.operates.forEach(e => {
-						if (e.code == "B1") {
+					v.subMenus.forEach(e => {
+						if (e.code == "shipmentDirectivesGeneral") {
 							this.zzlIsShwo = true
 							this.zzlName = e.name
-						} else if (e.code == "B2") {
+						} else if (e.code == "shipmentDirectivesStowage") {
 							this.pztIsShow = true
 							this.pztName = e.name
-						} else if (e.code == "B3") {
+						} else if (e.code == "shipmentDirectivesSub") {
 							this.fzlIsShow = true
 							this.fzlName = e.name
-						} else if (e.code == "B4") {
+						} else if (e.code == "shipmentDirectivesSubGroup") {
 							this.bzzIsShow = true
 							this.bzzName = e.name
-						} else if (e.code == "B5") {
+						} else if (e.code == "shipmentDirectivesSite") {
 							this.cwtIsShow = true
 							this.cwtName = e.name
 						}
 					})
 				}
 			})
-			if (this.tabsValue == 0) {
-				this.loadSumOrder() // 总指令：分页查询
-				this.askDisabled = false
-			}
+			this.getQueryCheckRecord(0) // 获取勾选
+			// if (this.tabsValue == 0) {
+			// 	this.loadSumOrder() // 总指令：分页查询
+			// 	this.askDisabled = false
+			// }
 			this.getPot() // 获取港口
 			this.getBrand() // 获取品牌
 			this.getBvm() // 获取车型
 			this.getRoleId() // 获取角色ID
 			// this.initAsk() // 获取装船要求
-			this.getStatistics() // 获取统计数据
+			// this.getStatistics() // 获取统计数据
 			this.getPotList()
 			this.getImgInfo()
 			this.getGoodsInfo()
 			this.getJobProgress() //获取卸船进度数据
+			this.getCheckReaDots() //获取红点
+			this.getTotalProgress() //获取装船总进度
+		},
+		mounted () {
+			if (this.tabsValue == 0) {
+				this.loadSumOrder() // 总指令：分页查询
+				this.askDisabled = false
+			}
+			this.getStatistics() // 获取统计数据
 		},
 		components: {
 			HeadView,
@@ -1111,6 +1327,7 @@
 		methods: {
 			// 点击tabs
 			changeTabs(e) {
+				this.getQueryCheckRecord(0) // 获取勾选
 				this.mnfBl = ''
 				this.brdId = ''
 				this.brdName = ''
@@ -1126,18 +1343,26 @@
 				this.current = 1
 				this.zTjType = true
 				this.activeIndex = 0
+				this.jobProgressList = []
 				if (e.value == 1 || e.value == 2) {
 					this.loadOtherOrder()
 					this.askDisabled = true
+					this.getJobProgress() //获取卸船进度数据
 				} else if (e.value == 0) {
 					this.loadSumOrder()
 					this.askDisabled = false
+					this.getJobProgress() //获取卸船进度数据
 				} else if (e.value == 3) {
 					this.getPotList()
 					this.getImgInfo()
 					this.getGoodsInfo()
+					this.askDisabled = true
 				} else if (e.value == 4) {
 					this.getDc()
+					this.askDisabled = true
+				}
+				if(e.value == 0 || e.value == 1) {
+			        this.getStatistics() // 获取统计列表
 				}
 				this.directorList = []
 				this.getRoleId()
@@ -1153,6 +1378,7 @@
 				} else if (this.tabsValue == 0) {
 					this.loadSumOrder()
 				}
+				this.getCheckReaDots()
 			},
 			// 点击搜索
 			search() {
@@ -1192,6 +1418,8 @@
 				this.sendText = ""
 				this.sendValue = ""
 				this.jobActive = null
+				this.mnfBl = ''
+				this.shipDeck = ''
 			},
 			// 筛选确认
 			confirm() {
@@ -1249,19 +1477,26 @@
 				} else {
 					target = "N_L"
 				}
+				let tabFlag = false
+				if(this.tabsValue == 1) {
+					tabFlag = true
+				}
 				uni.request({
-					url: `${this.$local}/api/instruction/statistics?vvyIds=${this.shipInfo.vvyId}&target=${target}`,
+					url: `${this.$local}/api/instruction/statistics?vvyIds=${this.shipInfo.vvyId}&target=${target}&tabFlag=${tabFlag}`,
 					header: {
 						'Content-Type': 'application/json', //自定义请求头信息
 						'Authorization': `Bearer ${this.loginObj.access_token}`
 					},
 					method: 'GET', //请求方式，必须为大写
 					success: (res) => {
+						this.ZLFlag = res.data.data.length > 0 ? true : false
+						if(!this.ZLFlag) return
+						this.zTjList = {}
 						this.zTjList = res.data.data[0]
 						this.zTjList["totalSum"] = this.zTjList.totalSentCount + this.zTjList.totalNotSentCount
 						this.zTjList["branchSum"] = this.zTjList.branchSentCount + this.zTjList
 							.branchNotSentCount
-						this.zTjList.instructionStatisticsList.forEach(v => {
+						this.zTjList?.instructionStatisticsList.forEach(v => {
 							let zsum = v.totalSentCount + v.totalNotSentCount
 							this.$set(v, "zsum", zsum)
 							let fsum = v.branchSentCount + v.branchNotSentCount
@@ -1273,8 +1508,10 @@
 			},
 			// 获取总指令列表
 			loadSumOrder() {
+				if(this.goodsClassifySelected == null) this.goodsClassifySelected = 0
 				uni.request({
-					url: `${this.$local}/api/shipInstructions/page?vvyId=${this.shipInfo.vvyId}&brdId=${this.brdId}&mnfBl=${this.mnfBl}&potId=${this.potId}&bvmId=${this.bvmId}&shipDeck=${this.shipDeck}&size=${this.pageSize}&current=${this.current}`,
+					// url: `${this.$local}/api/shipInstructions/page?vvyId=${this.shipInfo.vvyId}&brdId=${this.brdId}&mnfBl=${this.mnfBl}&potId=${this.potId}&bvmId=${this.bvmId}&shipDeck=${this.shipDeck}&size=${this.pageSize}&current=${this.current}`,
+					url: `${this.$local}/api/loadShipCommand/queryCommandCardForTotal?vvyId=${this.shipInfo.vvyId}&brdId=${this.brdId}&mnfBl=${this.mnfBl}&potId=${this.potId}&bvmId=${this.bvmId}&shipDeck=${this.shipDeck}&size=${this.pageSize}&current=${this.current}&goodsClassifySelected=${this.goodsClassifySelected}`,
 					header: {
 						'Content-Type': 'application/json', //自定义请求头信息
 						'Authorization': `Bearer ${this.loginObj.access_token}`
@@ -1292,7 +1529,7 @@
 							// if (v.branchPlanStatus == 0) {
 							this.zzlLwpIdList.push(v.lwpId)
 							// }
-							this.getBottomInfo(v.lwpId, index)
+							// this.getBottomInfo(v.lwpId, index)
 						})
 					}
 				})
@@ -1304,8 +1541,10 @@
 					teamFlag = true
 					this.sendValue = 1
 				}
+				if(this.goodsClassifySelected == null) this.goodsClassifySelected = 0
 				uni.request({
-					url: `${this.$local}/api/shipInstructions/pageCommandForBranch?vvyId=${this.shipInfo.vvyId}&brdId=${this.brdId}&mnfBl=${this.mnfBl}&potId=${this.potId}&bvmId=${this.bvmId}&sendStatus=${this.sendValue}&shipDeck=${this.shipDeck}&teamFlag=${teamFlag}&size=${this.pageSize}&current=${this.current}`,
+					// url: `${this.$local}/api/shipInstructions/pageCommandForBranch?vvyId=${this.shipInfo.vvyId}&brdId=${this.brdId}&mnfBl=${this.mnfBl}&potId=${this.potId}&bvmId=${this.bvmId}&sendStatus=${this.sendValue}&shipDeck=${this.shipDeck}&teamFlag=${teamFlag}&size=${this.pageSize}&current=${this.current}`,
+					url: `${this.$local}/api/loadShipCommand/queryCommandCardForBranch?vvyId=${this.shipInfo.vvyId}&brdId=${this.brdId}&mnfBl=${this.mnfBl}&potId=${this.potId}&bvmId=${this.bvmId}&sendStatus=${this.sendValue}&shipDeck=${this.shipDeck}&teamFlag=${teamFlag}&size=${this.pageSize}&current=${this.current}&goodsClassifySelected=${this.goodsClassifySelected}`,
 					header: {
 						'Content-Type': 'application/json', //自定义请求头信息
 						'Authorization': `Bearer ${this.loginObj.access_token}`
@@ -1320,7 +1559,8 @@
 						this.itemList.forEach((v, index) => {
 							v.image = '../../static/images/theme/car1.png'
 							v.index = index
-							this.getBottomInfo(v.lwpId, index)
+							v.flag = false
+							// this.getBottomInfo(v.lwpId, index)
 						})
 						console.log(this.itemList)
 					}
@@ -1358,7 +1598,8 @@
 			},
 			// 点击指令下发
 			distribute(type, a, item) {
-				if(a == 'solo' && this.checkList.length == 0) {
+				let flag = item?.lwpId == undefined ? true : false
+				if(a == 'solo' && this.checkList.length == 0 && flag) {
 					uni.showModal({
 						title: '提示',
 						showCancel: false,
@@ -1371,6 +1612,8 @@
 				this.$refs.popup.open(type)
 				if (a == 'again' || a == 'solo') {
 					this.fzzRow = item
+					this.checkList = []
+					this.checkList.push(item.lwpId)
 				} else if (a == 'all') {
 					this.fzzRow = ""
 				}
@@ -1474,6 +1717,7 @@
 									this.delValue = true
 									this.loadSumOrder()
 									this.getStatistics()
+									this.getCheckReaDots()
 									this.checkList = []
 									uni.showToast({
 										title: `总指令下发成功`,
@@ -1505,6 +1749,7 @@
 									this.delValue = true
 									this.loadSumOrder()
 									this.getStatistics()
+									this.getCheckReaDots()
 									this.checkList = []
 									uni.showToast({
 										title: `分指令下发成功`,
@@ -1547,6 +1792,7 @@
 									this.loadOtherOrder()
 									this.getStatistics()
 									this.checkList = []
+									this.getCheckReaDots()
 									uni.showToast({
 										title: `重新发送指令成功`,
 										icon: 'success',
@@ -1682,7 +1928,8 @@
 			// 获取品牌
 			getBrand() {
 				uni.request({
-					url: `${this.$local}/api/miniapp/queryBrand`,
+					// url: `${this.$local}/api/miniapp/queryBrand`,
+					url: `${this.$local}/api/loadShipCommand/queryBrand?vvyId=${this.shipInfo.vvyId}`,
 					header: {
 						'Content-Type': 'application/json', //自定义请求头信息
 						'Authorization': `Bearer ${this.loginObj.access_token}`
@@ -1690,7 +1937,13 @@
 					method: 'GET', //请求方式，必须为大写
 					success: (res) => {
 						if (res.data.status == "200") {
-							this.brandList = res.data.data
+							this.brandList = []
+							res.data.data.forEach(item => {
+								this.brandList.push({
+									brdName:item.name,
+									brdId:item.id
+								})
+							})
 						}
 					}
 				})
@@ -1704,7 +1957,8 @@
 			// 获取港口
 			getPot() {
 				uni.request({
-					url: `${this.$local}/api/miniapp/port`,
+					// url: `${this.$local}/api/miniapp/port`,
+					url: `${this.$local}/api/loadShipCommand/queryPort?vvyId=${this.shipInfo.vvyId}`,
 					header: {
 						'Content-Type': 'application/json', //自定义请求头信息
 						'Authorization': `Bearer ${this.loginObj.access_token}`
@@ -1712,7 +1966,13 @@
 					method: 'GET', //请求方式，必须为大写
 					success: (res) => {
 						if (res.data.status == "200") {
-							this.potList = res.data.data
+							this.potList = []
+							res.data.data.forEach(item => {
+								this.potList.push({
+									potCnname:item.name,
+									potId:item.id
+								})
+							})
 						}
 					}
 				})
@@ -1726,7 +1986,8 @@
 			// 获取车型
 			getBvm() {
 				uni.request({
-					url: `${this.$local}/api/miniapp/getVehicleModel`,
+					// url: `${this.$local}/api/miniapp/getVehicleModel`,
+					url: `${this.$local}/api/loadShipCommand/queryVehicleType?vvyId=${this.shipInfo.vvyId}`,
 					header: {
 						'Content-Type': 'application/json', //自定义请求头信息
 						'Authorization': `Bearer ${this.loginObj.access_token}`
@@ -1734,7 +1995,13 @@
 					method: 'GET', //请求方式，必须为大写
 					success: (res) => {
 						if (res.data.status == "200") {
-							this.bvmList = res.data.data
+							this.bvmList = []
+							res.data.data.forEach(item => {
+								this.bvmList.push({
+									name:item.name,
+									id:item.id
+								})
+							})
 						}
 					}
 				})
@@ -1745,20 +2012,47 @@
 				this.bvmId = e.id
 				this.bvmName = e.name
 			},
-			toDetails(id) {
+			// toDetails(id) {
+			// 	let obj = {
+			// 		id: id,
+			// 		tradeName: "W",
+			// 		shipInfo: this.shipInfo
+			// 	}
+			// 	const params = encodeURIComponent(JSON.stringify(obj));
+			// 	uni.navigateTo({
+			// 		url: '/pages/index/instructDetails?params=' + params
+			// 	})
+			// },
+			// 跳转提单号页面
+			toLading(item) {
 				let obj = {
-					id: id,
+					id: item.lwpId,
+					CW:`${item.shipDeck}层${item.cabinNo}舱`,
 					tradeName: "W",
 					shipInfo: this.shipInfo
 				}
 				const params = encodeURIComponent(JSON.stringify(obj));
 				uni.navigateTo({
-					url: '/pages/index/instructDetails?params=' + params
+					url: '/pages/index/ladingNumber?params=' + params
 				})
 			},
 			// 分指令多选
-			checkChange(e) {
-				this.checkList = e.detail.value
+			// checkChange(e) {
+			// 	console.log(e.detail);
+			// 	this.checkList = e.detail.value
+			// },
+			// 点击分指令卡片
+			clickItem(item) {
+			  this.checkList = []
+			  let flags = !item.flag
+			  this.$set(item, "flag", flags)
+			//   console.log(item.flag);
+			  this.itemList.forEach(item => {
+				if(item.flag) {
+				 this.checkList.push(item.lwpId)
+				}
+			  })
+              this.$forceUpdate()
 			},
 			// 配载图相关
 			// 获取配载图港口及对应颜色
@@ -1929,7 +2223,8 @@
 			// 获取右侧区域数据
 			getQy() {
 				uni.request({
-					url: `${this.$local}/api/yardGoods/monitor/region/statistics?vvyId=${this.shipInfo.vvyId}&pymId=${this.dcId}&displayFlag=1&brdId=${this.brdId}&bvmId=${this.bvmId}&potId=${this.potId}&mnfBl=${this.mnfBl}&size=1000`,
+					// url: `${this.$local}/api/yardGoods/monitor/region/statistics?vvyId=${this.shipInfo.vvyId}&pymId=${this.dcId}&displayFlag=1&brdId=${this.brdId}&bvmId=${this.bvmId}&potId=${this.potId}&mnfBl=${this.mnfBl}&size=1000`,
+					url: `${this.$local}/api/yardGoods/monitor/v2/region/list?vvyId=${this.shipInfo.vvyId}&pymId=${this.dcId}&displayFlag=1&brdId=${this.brdId}&bvmId=${this.bvmId}&potId=${this.potId}&mnfBl=${this.mnfBl}&size=1000`,
 					header: {
 						'Content-Type': 'application/json', //自定义请求头信息
 						'Authorization': `Bearer ${this.loginObj.access_token}`
@@ -1938,32 +2233,34 @@
 					success: (res) => {
 						if (res.statusCode == 200) {
 							console.log(res)
-							this.qyList = res.data.data.records
-							this.qyList.forEach(v => {
-								if (v.remainSeatAmout == null) {
-									this.$set(v, "remainSeatAmout", 0)
-								}
-								if (v.stopGoodsAmout == null) {
-									this.$set(v, "stopGoodsAmout", 0)
-								}
-								if (v.totalLaneAmout == null) {
-									this.$set(v, "totalLaneAmout", 0)
-								}
-								if (v.totalSeatAmout == null) {
-									this.$set(v, "totalSeatAmout", 0)
-								}
-								if (v.unparkGoodsAmout == null) {
-									this.$set(v, "unparkGoodsAmout", 0)
-								}
-								if (v.useSeatAmout == null) {
-									this.$set(v, "useSeatAmout", 0)
-								}
-								if (v.carStatisticsList != null) {
-									v.carStatisticsList.forEach(e => {
-										this.$set(e, "isShow", false)
-									})
-								}
-							})
+							// this.qyList = res.data.data.records
+							// this.qyList.forEach(v => {
+							// 	if (v.remainSeatAmout == null) {
+							// 		this.$set(v, "remainSeatAmout", 0)
+							// 	}
+							// 	if (v.stopGoodsAmout == null) {
+							// 		this.$set(v, "stopGoodsAmout", 0)
+							// 	}
+							// 	if (v.totalLaneAmout == null) {
+							// 		this.$set(v, "totalLaneAmout", 0)
+							// 	}
+							// 	if (v.totalSeatAmout == null) {
+							// 		this.$set(v, "totalSeatAmout", 0)
+							// 	}
+							// 	if (v.unparkGoodsAmout == null) {
+							// 		this.$set(v, "unparkGoodsAmout", 0)
+							// 	}
+							// 	if (v.useSeatAmout == null) {
+							// 		this.$set(v, "useSeatAmout", 0)
+							// 	}
+							// 	if (v.carStatisticsList != null) {
+							// 		v.carStatisticsList.forEach(e => {
+							// 			this.$set(e, "isShow", false)
+							// 		})
+							// 	}
+							// })
+							this.qyList = res.data.data
+
 							console.log(this.qyList)
 						}
 					}
@@ -1982,10 +2279,16 @@
 			modifyPlaceTabs(data) {
 				this.isCwnum = data;
 			},
-			// 获取卸船进度数据
+			// 获取装船进度数据
 			getJobProgress() {
+				let tabFlag = null
+                if(this.tabsValue == 1) {
+					tabFlag = 1
+				} else if(this.tabsValue == 2) {
+					tabFlag = 2
+				}
 				uni.request({
-					url: `${this.$local}/api/instruction/statistics/JobProgress?filterType=${this.filterType}&target=W_L&vvyId=${this.shipInfo.vvyId}`,
+					url: `${this.$local}/api/instruction/statistics/JobProgress?filterType=${this.filterType}&target=W_L&vvyId=${this.shipInfo.vvyId}&size=5000&current=1&tabFlag=${tabFlag}`,
 					header: {
 						'Content-Type': 'application/x-www-form-urlencoded', //自定义请求头信息
 						'Authorization': `Bearer ${this.loginObj.access_token}`
@@ -1996,7 +2299,7 @@
 					}
 				})
 			},
-			//点击卸船计划
+			//点击装船计划
 			jobProgress(item,index,type) {
                this.jobActive = index
 			   if(this.filterType == 'BRD_TYPE') {
@@ -2007,6 +2310,8 @@
 				this.potId = item.id
 			   } else if(this.filterType == 'MNF_BL_TYPE') {
 				this.mnfBl = item.id
+			   } else if(this.filterType == 'CABIN_LEVEL_TYPE') {
+			    this.shipDeck = item.id
 			   }
 			   this.itemList = []
 			   if(type == 'zzl') {
@@ -2024,6 +2329,8 @@
 					this.filterType = 'MNF_BL_TYPE'
 				} else if(type == 'gk') {
 					this.filterType = 'POT_TYPE'
+				} else if(type == 'cc') {
+					this.filterType = 'CABIN_LEVEL_TYPE'
 				}
 				this.getJobProgress()
 			},
@@ -2034,12 +2341,113 @@
 				 this.mnfBl = e
 				 this.confirm()
 				},1000)
+			},
+			// 车辆备件选择框
+			changeValue(e) {
+			  this.current = 1
+			  this.itemList = []
+              if(e.detail.value.length == 2) {
+				this.goodsClassifySelected = 0
+			  } else if(e.detail.value.length == 1) {
+				this.goodsClassifySelected = e.detail.value[0]
+			  }
+			  let checkRecordReq = {
+				businessType:'W_L',
+				goodsClassifySelected:this.goodsClassifySelected,
+				tabFlag:0
+			  }
+			  uni.request({   //修改勾选状态
+					url: `${this.$local}/api/loadShipCommand/editCheckRecord`,
+					data: checkRecordReq,
+					header: {
+						'Content-Type': 'application/json', //自定义请求头信息
+						'Authorization': `Bearer ${this.loginObj.access_token}`
+					},
+					method: 'PUT', //请求方式，必须为大写
+					success: (res) => {
+					  if(res.data.data) {
+						if(this.tabsValue == 0) {
+			           	  this.loadSumOrder()
+			            } else if(this.tabsValue == 1 || this.tabsValue == 2) {
+			           	  this.loadOtherOrder()
+			            }
+					  }
+					}
+				})
+			},
+			// 总指令分指令是否有红点
+			getCheckReaDots() {
+				uni.request({
+					url: `${this.$local}/api/loadShipCommand/checkReaDots/${this.shipInfo.vvyId}/total`,
+					header: {
+						'Content-Type': 'application/x-www-form-urlencoded', //自定义请求头信息
+						'Authorization': `Bearer ${this.loginObj.access_token}`
+					},
+					method: 'GET', //请求方式，必须为大写
+					success: (res) => {
+					  this.zzlReaDots = res.data.data
+					}
+				})
+				uni.request({
+					url: `${this.$local}/api/loadShipCommand/checkReaDots/${this.shipInfo.vvyId}/branch`,
+					header: {
+						'Content-Type': 'application/x-www-form-urlencoded', //自定义请求头信息
+						'Authorization': `Bearer ${this.loginObj.access_token}`
+					},
+					method: 'GET', //请求方式，必须为大写
+					success: (res) => {
+					  this.fzlReaDots = res.data.data
+					}
+				})
+			},
+			//查看当前账号勾选分类记录
+			getQueryCheckRecord(tab) {
+				uni.request({
+					url: `${this.$local}/api/loadShipCommand/queryCheckRecord?businessType=W_L&tabFlag=${tab}`,
+					header: {
+						'Content-Type': 'application/x-www-form-urlencoded', //自定义请求头信息
+						'Authorization': `Bearer ${this.loginObj.access_token}`
+					},
+					method: 'GET', //请求方式，必须为大写
+					success: (res) => {
+					  this.goodsClassifySelected = res.data.data
+					  if(res.data.data == null) this.goodsClassifySelected = 0
+					  if(res.data.data == 0 || res.data.data == null) {
+						this.checkbox = [1,2]
+					  } else if(res.data.data == 1) {
+						this.checkbox = [1]
+					  } else if(res.data.data == 2) {
+						this.checkbox = [2]
+					  }
+					}
+				})
+			},
+			// 获取装船总进度
+			getTotalProgress() {
+				uni.request({
+					url: `${this.$local}/api/instruction/statistics/totalProgress?target=W_L&vvyId=${this.shipInfo.vvyId}`,
+					header: {
+						'Content-Type': 'application/x-www-form-urlencoded', //自定义请求头信息
+						'Authorization': `Bearer ${this.loginObj.access_token}`
+					},
+					method: 'GET', //请求方式，必须为大写
+					success: (res) => {
+					  this.totalProgress = res.data.data
+					}
+				})
+			},
+			// 班组长打开弹框
+			openPOP(item) {
+				console.log(item);
+				this.bzzPOPList = []
+				this.bzzPOPList.push(item)
+				this.$refs.bzzPOP.open()
 			}
 		}
 	};
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 	.blue {
 		color: #108ee9;
 	}
@@ -2113,6 +2521,7 @@
 				display: flex;
 				justify-content: space-between;
 				padding: 5px 10px;
+				align-items: center;
 
 				.leftInput {
 					width: 400px;
@@ -2165,7 +2574,7 @@
 			text-align: center;
 			background-color: #fff;
 			position: absolute;
-			bottom: 24px;
+			bottom: 64px;
 			right: 24px;
 			z-index: 999999999999999999;
 			display: flex;
@@ -2211,6 +2620,10 @@
 				color: #fff;
 				background: #0067CF;
 			}
+			.buttons {
+				color: #fff !important;
+				background: #0067CF !important;
+			}
 		}
 
 		.buttonlist2 {
@@ -2367,7 +2780,17 @@
 					bottom: 0;
 				}
 			}
-
+            .zjInfo {
+				width: 100%;
+				background: #F7F7F7;
+				box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.10);
+				padding: 10px 16px;
+				.title {
+					font-size: 18px;
+					font-weight: 500;
+					margin-bottom: 10px;
+				}
+			}
 			.tjInfo {
 				width: calc(100% - 32px);
 				background: #F7F7F7;
@@ -2415,7 +2838,7 @@
 			padding: 0 12px;
 
 			.item {
-				padding-bottom: 25px;
+				// padding-bottom: 25px;
 			}
 
 			.exp {
@@ -2423,9 +2846,24 @@
 				background: #FFFFFF;
 				border-radius: 8px;
 				padding: 16px;
-				padding-right: 0;
 				position: relative;
 				margin-top: 10px;
+				padding-right:0;
+				.scroll {
+				   height: 100px;
+				   overflow: scroll;
+				}
+				.imgBox {
+					width: 15px;
+					height: 15px;
+					position: absolute;
+					right: 0;
+					bottom: 0;
+				}
+			}
+			.actives {
+				// color: #1890ff;
+				border: 1px solid #1890ff;
 			}
 
 			/deep/.waterfalls-flow {
@@ -2446,7 +2884,8 @@
 			.row {
 				display: flex;
 				padding: 5px 0px;
-
+                justify-content: space-between;
+				align-items: center;
 				.title {
 					display: flex;
 					font-size: 16px;
@@ -2461,31 +2900,56 @@
 					}
 				}
 
+				// .schedule {
+				// 	padding: 5px 8px;
+				// 	background: #F7F7F7;
+				// 	margin-left: 8px;
+				// 	display: flex;
+
+				// 	.text {
+				// 		font-size: 12px;
+				// 		color: #999999;
+				// 	}
+
+				// 	.progressBox {
+				// 		width: 50px;
+				// 		margin-top: 5px;
+				// 		margin: 5px 8px;
+				// 	}
+				// }
 				.schedule {
-					padding: 5px 8px;
-					background: #F7F7F7;
-					margin-left: 8px;
-					display: flex;
-
-					.text {
-						font-size: 12px;
-						color: #999999;
+					// margin-left: 28px;
+					font-weight: 500;
+					line-height: 20px;
+				}
+				.vehicle {
+					padding: 0px 5px;
+					border-radius: 5px;
+					// margin-left: 18px;
+					// text {
+					// 	font-size: 18px;
+					// }
+					.text1 {
+                       color: #d9001b;
 					}
-
-					.progressBox {
-						width: 50px;
-						margin-top: 5px;
-						margin: 5px 8px;
+					.text2 {
+                       color: #70b603;
 					}
 				}
+				.vehicle1 {
+					border: 1px solid #d9001b;
+				}
+				.vehicle2 {
+					border: 1px solid #70b603;
+				}
 
 				.planStatus {
 					width: 68px;
 					height: 26px;
 					border-radius: 13px 0 0 13px;
-					position: absolute;
-					right: 0;
-					top: 16px;
+					// position: absolute;
+					// right: 0;
+					// top: 16px;
 					text-align: center;
 					line-height: 26px;
 
@@ -2496,47 +2960,47 @@
 				}
 
 				.planStatus0 {
-					background: #F1F8FF;
+					background: #d9001b;
 
 					.text {
-						color: #0067CF;
+						color: white;
 					}
 				}
 
 				.planStatus1 {
-					background: #F7F7F7;
+					background: #1181fb;
 
 					.text {
-						color: #666;
+						color: white;
+					}
+				}
+
+				.planStatus2 {
+					background: #70b603;
+
+					.text {
+						color: white;
 					}
 				}
 
 				.planStatus3 {
-					background: #E8FFF7;
+					background: #f59a23;
 
 					.text {
-						color: #04B578;
-					}
-				}
-
-				.planStatus5 {
-					background: #FFF5F0;
-
-					.text {
-						color: #fc4f00;
+						color: white;
 					}
 				}
 
 
 				.rowInfo {
 					display: flex;
-					flex-direction: column;
+					// flex-direction: column;
 					font-size: 14px;
-					width: 48%;
-					margin-top: 10px;
-					border-right: 1px solid #eee;
+					// width: 48%;
+					// border-right: 1px solid #eee;
 					gap: 12px;
-					margin-left: 10px;
+					margin: 10px 10px 0;
+					justify-content: space-between;
 
 					text:first-child {
 						color: #999999;
@@ -2545,6 +3009,9 @@
 					text:last-child {
 						color: #23262E;
 					}
+					.col {
+						width: 50%;
+					}
 				}
 
 				.rowInfo:last-child {
@@ -2588,6 +3055,13 @@
 				border-radius: 13px;
 				padding: 6px;
 			}
+		    .tdBtn {
+				display: flex;
+				justify-content:center;
+				width:100%;
+				margin-top:8px;
+				z-index:10;
+			}
 
 			.details {
 				padding-right: 16px;
@@ -3040,7 +3514,8 @@
 				font-size: 20px;
 				font-weight: bold;
 				border-bottom: 1px solid #ccc;
-				padding: 15px 0;
+				padding: 5px 0;
+				text-align: center;
 			}
 
 			.popupInfo {
@@ -3064,7 +3539,7 @@
 			}
 
 			/deep/.uni-easyinput {
-				margin-top: 20px;
+				// margin-top: 20px;
 				width: 460px;
 				margin-left: 20px;
 			}
@@ -3078,10 +3553,10 @@
 			}
 			/deep/.is-textarea {
 				width: 77vw;
-				height: 21vh;
+				height: 10vh;
 			}
 			/deep/.uni-easyinput__content-textarea {
-				height: 20vh;
+				height: 10vh;
 			}
 
 			.popupBtn {
@@ -3113,7 +3588,7 @@
 
 		.popupBox2 {
 			width: 80vw;
-			height: 38vh;
+			height: 30vh;
 		}
 
 		// 右侧抽屉筛选
@@ -3197,4 +3672,154 @@
 			}
 		}
 	}
+	.bzzBox {
+		height:70vh;
+		width:70vw;
+		background: white;
+		overflow: scroll;
+		padding:20px;
+		/deep/.uni-table-th {
+			font-size:20px;
+		}
+		/deep/.uni-table-td {
+			font-size:20px;
+		}
+		.exp {
+				width: 100%;
+				background: #FFFFFF;
+				border-radius: 8px;
+				padding: 16px;
+				position: relative;
+				margin-top: 10px;
+				padding-right:0;
+
+				.imgBox {
+					width: 15px;
+					height: 15px;
+					position: absolute;
+					right: 0;
+					bottom: 0;
+				}
+			}
+			.row {
+				display: flex;
+				padding: 5px 0px;
+                justify-content: space-between;
+				align-items: center;
+				.title {
+					display: flex;
+					font-size: 16px;
+					color: #23262E;
+					font-weight: bold;
+
+					.titleImg {
+						width: 18px;
+						height: 18px;
+						margin-right: 5px;
+						margin-top: 2px;
+					}
+				}
+				.schedule {
+					// margin-left: 28px;
+					font-weight: 500;
+					line-height: 20px;
+				}
+				.vehicle {
+					padding: 0px 5px;
+					border-radius: 5px;
+					// margin-left: 18px;
+					// text {
+					// 	font-size: 18px;
+					// }
+					.text1 {
+                       color: #d9001b;
+					}
+					.text2 {
+                       color: #70b603;
+					}
+				}
+				.vehicle1 {
+					border: 1px solid #d9001b;
+				}
+				.vehicle2 {
+					border: 1px solid #70b603;
+				}
+
+				.planStatus {
+					width: 68px;
+					height: 26px;
+					border-radius: 13px 0 0 13px;
+					// position: absolute;
+					// right: 0;
+					// top: 16px;
+					text-align: center;
+					line-height: 26px;
+
+					.text {
+						font-size: 16px;
+						font-weight: bold;
+					}
+				}
+
+				.planStatus0 {
+					background: #d9001b;
+
+					.text {
+						color: white;
+					}
+				}
+
+				.planStatus1 {
+					background: #1181fb;
+
+					.text {
+						color: white;
+					}
+				}
+
+				.planStatus2 {
+					background: #70b603;
+
+					.text {
+						color: white;
+					}
+				}
+
+				.planStatus3 {
+					background: #f59a23;
+
+					.text {
+						color: white;
+					}
+				}
+
+
+				.rowInfo {
+					display: flex;
+					// flex-direction: column;
+					font-size: 20px;
+					// width: 48%;
+					// border-right: 1px solid #eee;
+					gap: 12px;
+					margin: 10px 10px 0;
+					justify-content: space-between;
+
+					text:first-child {
+						color: #999999;
+					}
+
+					text:last-child {
+						color: #23262E;
+					}
+					.cols {
+						width: 50%;
+						text-align: left;
+					}
+				}
+
+				.rowInfo:last-child {
+					border: none;
+				}
+			}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/instructDetails.vue b/pages/index/instructDetails.vue
index a6f3118..8ac8276 100644
--- a/pages/index/instructDetails.vue
+++ b/pages/index/instructDetails.vue
@@ -159,6 +159,8 @@
 							</uni-td>
 						</uni-tr>
 					</uni-table>
+					<uni-pagination :show-icon="true" :total="total" :pageSize="10" :current="current"
+						@change="changePage" />
 				</view>
 			</view>
 			<!-- 弹出层 -->
@@ -262,6 +264,9 @@
 
 				// 内贸详情数据
 				objInfo: {},
+				//分页数据
+				total:20,
+                current:1
 			}
 		},
 		components: {
@@ -296,7 +301,7 @@
 			getTableInfo() {
 				let url = ""
 				if (this.objInfo.tradeName == 'W') {
-					url = `${this.$local}/api/shipInstructions/goodsDetail/page?spsId=${this.objInfo.id}`
+					url = `${this.$local}/api/shipInstructions/goodsDetail/page?spsId=${this.objInfo.id}&size=10&current=${this.current}`
 				} else if (this.objInfo.tradeName == 'N') {
 					url =
 						`${this.$local}/api/domestic/load/command/pageForCargoDetails?splId=${this.objInfo.xqInfo.splId}&dlcId=${this.objInfo.jcInfo.dlcId}`
@@ -310,6 +315,7 @@
 					method: 'GET', //请求方式，必须为大写
 					success: (res) => {
 						if (res.data.status == 200) {
+							this.total = res.data.data.total
 							this.tableList = res.data.data.records
 							console.log(this.tableList)
 						}
@@ -374,6 +380,11 @@
 			},
 			close() {
 				this.$refs.popup.close()
+			},
+			//切换分页
+			changePage(e) {
+              this.current = e.current
+			  this.getTableInfo()
 			}
 		}
 	}
diff --git a/pages/index/ladingNumber.vue b/pages/index/ladingNumber.vue
new file mode 100644
index 0000000..f21b159
--- /dev/null
+++ b/pages/index/ladingNumber.vue
@@ -0,0 +1,111 @@
+<<template>
+    <view>
+        <head-view :title="title"></head-view>
+        <view class="content contentFixed">
+			<view class="liBox">
+				<view class="title">
+					<text>提单信息</text>
+				</view>
+                <uni-table stripe emptyText="暂无更多数据">
+						<!-- 表头行 -->
+						<uni-tr>
+							<uni-th width="10">序号</uni-th>
+							<uni-th width="15">提单号</uni-th>
+							<uni-th width="15">品牌</uni-th>
+							<uni-th width="15">车型</uni-th>
+							<uni-th width="15">车型明细</uni-th>
+							<uni-th width="10">数量</uni-th>
+							<uni-th width="18">场位</uni-th>
+							<uni-th width="10">待装数量</uni-th>
+						</uni-tr>
+						<!-- 表格数据行 -->
+						<uni-tr v-for="(item,index) in tableList" :key="index">
+							<uni-td>{{index + 1}}</uni-td>
+							<uni-td><text class="operate" @click="toDetails(item.spsId)">{{item.mnfBl}}</text></uni-td>
+							<uni-td>{{item.brdName}}</uni-td>
+							<uni-td>{{item.goodsTypeName}}</uni-td>
+							<uni-td>{{item.bvdName}}</uni-td>
+							<uni-td>{{item.amount}}</uni-td>
+							<uni-td>{{item.yardPos}}</uni-td>
+							<uni-td>{{item.readyLoadNum}}</uni-td>
+						</uni-tr>
+					</uni-table>
+            </view>    
+        </view>
+    </view>
+</template>
+
+<script>
+	import HeadInfo from '@/components/head-info/head-info';
+    export default {
+		data() {
+			return {
+               loginObj: {},
+               title:'',
+               objInfo:{},
+               tableList:[]
+            }
+        },
+        components: {
+			HeadInfo
+		},
+        onLoad(options) {
+			this.objInfo = JSON.parse(decodeURIComponent(options.params))
+            this.loginObj = uni.getStorageSync('loginObj')
+            this.title = this.objInfo.shipInfo.spmIdDesc + ' / ' + this.objInfo.shipInfo.vvyName + ' ' + this.objInfo.CW
+			console.log(this.objInfo)
+            this.getQueryBillOfLading()
+		},
+        methods: {
+            // 获取提单号数据
+            getQueryBillOfLading() {
+                uni.request({
+					url: `${this.$local}/api/loadShipCommand/queryBillOfLading?lwpId=${this.objInfo.id}`,
+					header: {
+						'Content-Type': 'application/json', //自定义请求头信息
+						'Authorization': `Bearer ${this.loginObj.access_token}`
+					},
+					method: 'GET', //请求方式，必须为大写
+					success: (res) => {
+						if (res.data.status == 200) {
+							// console.log(res.data.data);
+                            this.tableList = res.data.data
+						}
+					}
+				})
+            },
+            toDetails(id) {
+				let obj = {
+					id: id,
+					tradeName: "W",
+					shipInfo: this.objInfo.shipInfo
+				}
+				const params = encodeURIComponent(JSON.stringify(obj));
+				uni.navigateTo({
+					url: '/pages/index/instructDetails?params=' + params
+				})
+			},
+
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+		.content {
+			padding: 16px;
+            .liBox {
+				width: 100%;
+				padding: 24px 16px 24px;
+				background-color: #fff;
+                .title {
+					display: flex;
+					margin-bottom: 20px;
+                    font-size: 20px;
+                    font-weight: 500;
+                }
+                .operate {
+					color: #2979ff;
+				}
+            }
+        }
+</style>
\ No newline at end of file
diff --git a/pages/shipWork/mixWork.vue b/pages/shipWork/mixWork.vue
index 06bb3aa..dfe40e5 100644
--- a/pages/shipWork/mixWork.vue
+++ b/pages/shipWork/mixWork.vue
@@ -56,33 +56,33 @@
 					</view>
 					<view class="ul shiftUl">
 						<template v-if="shiftInfo.length > 0">
-							<view class="li" v-for="(item,index) in shiftInfo" :key="index"
-								@click="lookShift(item,index)">
+							<view class="li" v-for="(item,index) in shiftInfo[0]" :key="index"
+								@click="lookShift(index)">
 								<view class="title">
 									<image src="../../static/images/shipWork/hc.png" mode="widthFix"></image>
-									<text>航次：{{item[0].vvyName}}</text>
+									<text>航次：{{item.vvyName}}</text>
 								</view>
-								<view class="shift" v-for="(item2,index2) in item[0].shiftArr" :key="index2">
+								<view class="shift" v-for="(item2,index2) in item.shiftArr" :key="index2">
 									<text>{{item2.pwcTypeName}}</text>
 									<text class="text">开始时间：</text><text class="time">{{item2.workStartTime}}</text>
 									<text class="text">结束时间：</text><text class="time">{{item2.workEndTime}}</text>
 								</view>
-								<view class="status didNot" v-if="item[0].status == 0 || item[0].status == 'null'">
+								<view class="status didNot" v-if="item.status == 0 || item.status == 'null'">
 									<p>待提交</p>
 								</view>
-								<view class="status didNot" v-if="item[0].status == 1">
+								<view class="status didNot" v-if="item.status == 1">
 									<p>待审核</p>
 								</view>
-								<view class="status didNot" v-if="item[0].status == 2">
+								<view class="status didNot" v-if="item.status == 2">
 									<p>审批中</p>
 								</view>
-								<view class="status success" v-if="item[0].status == 3">
+								<view class="status success" v-if="item.status == 3">
 									<p>审核通过</p>
 								</view>
-								<view class="status fail" v-if="item[0].status == 4">
+								<view class="status fail" v-if="item.status == 4">
 									<p>审核驳回</p>
 								</view>
-								<view class="status success" v-if="item[0].status == 5">
+								<view class="status success" v-if="item.status == 5">
 									<p>审核通过</p>
 								</view>
 							</view>
@@ -242,8 +242,9 @@
 					})
 				}
 			},
-			lookShift(item, index) {
-				uni.setStorageSync('shiftRow', item);
+			lookShift(index) {
+				let arr = this.shiftInfo[index]
+				uni.setStorageSync('shiftRow', arr);
 				uni.navigateTo({
 					url: `/pages/shipWork/shiftDetails`
 				})
diff --git a/uni_modules/custom-tabs/components/custom-tabs/custom-tabs.vue b/uni_modules/custom-tabs/components/custom-tabs/custom-tabs.vue
index 3cdc3e1..d8fe48c 100644
--- a/uni_modules/custom-tabs/components/custom-tabs/custom-tabs.vue
+++ b/uni_modules/custom-tabs/components/custom-tabs/custom-tabs.vue
@@ -2,7 +2,7 @@
 	<view :class="['tab',{'tab-fixed':fixed}]">
 		<scroll-view :class="['tab-bar',{'tab-bar-center':tabCenter}]" scroll-x="true" :scroll-into-view="scrollId" scroll-with-animation>
 			<view v-for="(item,index) in tabList" class="tab-bar-item" :class="{'active':tabIndex==index}" :id="`tab_${index}`" :style="[{'padding':`0 ${tabSpacing}rpx`},tabIndex==index?activeTextStyle:defaultTextStyle]" :key="index" @click="putChange(item.name,index);tabChange(index)">
-				<text class="txt">{{item.label}}</text>
+				<text :class="[(index == 0 && flag1) || (index == 1 && flag2) ? 'txt' :'']">{{item.label}}</text>
 				<text class="active-line" v-if="tabIndex==index" :style="[activeLineStyle]"></text>
 			</view>
 		</scroll-view>
@@ -51,6 +51,14 @@
 			},
 			activeLineStyle: { // 选中下划线的样式
 				type: [Object]
+			},
+			flag1:{
+				type: Boolean,
+				default: false
+			},
+			flag2:{
+				type: Boolean,
+				default: false
 			}
 		},
 		data() {
@@ -218,4 +226,8 @@
 			padding: 20rpx 0;
 		}
 	}
+	  .txt::after {
+		content: "*";
+		color: red;
+	  }
 </style>
diff --git a/uni_modules/superwei-combox/components/superwei-combox/superwei-combox.vue b/uni_modules/superwei-combox/components/superwei-combox/superwei-combox.vue
index 2dc5b0b..052ca3b 100644
--- a/uni_modules/superwei-combox/components/superwei-combox/superwei-combox.vue
+++ b/uni_modules/superwei-combox/components/superwei-combox/superwei-combox.vue
@@ -7,6 +7,8 @@
 			<input class="superwei-combox__input" type="text" :placeholder="placeholder"
 				placeholder-class="superwei-combox__input-plac" v-model="inputVal" @input="onInput" @focus="onFocus"
 				@blur="onBlur" />
+			<uni-icons v-if="clears" type="clear" size="14" color="#999" @click="clearValue">
+			</uni-icons>
 			<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" @click="toggleSelector">
 			</uni-icons>
 		</view>
@@ -50,7 +52,7 @@
 	 */
 	export default {
 		name: 'superweiCombox',
-		emits: ['input', 'update:modelValue', 'select'],
+		emits: ['input', 'update:modelValue', 'select','clearValue'],
 		props: {
 			isAllowCreate: {
 				type: Boolean,
@@ -102,6 +104,10 @@
 				type: String,
 				default: '无匹配项'
 			},
+			clears:{
+				type: Boolean,
+				default: false
+			},
 			// #ifndef VUE3
 			value: {
 				type: [String, Number],
@@ -241,6 +247,10 @@
 					this.$emit('input', this.inputVal)
 					this.$emit('update:modelValue', this.inputVal)
 				})
+			},
+			clearValue() {
+                this.inputVal = ''
+                this.$emit('clearValue')
 			}
 		}
 	}
@@ -376,4 +386,4 @@
 	.superwei-combox__no-border {
 		border: none;
 	}
-</style>
+</style>