From b522ebed2e3fbd4ef2b55eb9f6a8f618684e1935 Mon Sep 17 00:00:00 2001
From: wuwx <1960575076@qq.com>
Date: Tue, 18 Jun 2024 16:16:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json            |  2 +-
 package-lock.json        | 15 ++++++--
 pages/index/instruct.vue | 79 ++++++++++++++++++++--------------------
 3 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/manifest.json b/manifest.json
index f1efce4..b29cf67 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "海通Pad",
     "appid" : "__UNI__F864E80",
     "description" : "",
-    "versionName" : "1.1.1",
+    "versionName" : "1.1.2",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
diff --git a/package-lock.json b/package-lock.json
index 696f039..389c2ce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,7 +1,7 @@
 {
     "name": "下拉多选，单选，搜索",
     "version": "1.0.2",
-    "lockfileVersion": 3,
+    "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
@@ -12,9 +12,16 @@
             }
         },
         "node_modules/crypto-js": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
-            "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
+            "version": "4.2.0",
+            "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
+            "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
+        }
+    },
+    "dependencies": {
+        "crypto-js": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
+            "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
         }
     }
 }
diff --git a/pages/index/instruct.vue b/pages/index/instruct.vue
index e6b7edf..06ed815 100644
--- a/pages/index/instruct.vue
+++ b/pages/index/instruct.vue
@@ -53,8 +53,8 @@
                               <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')" v-if="ZLFlag">
+							<template v-if="zzlFlag && ZLFlag">
+							 <view class="tjHead" @click="clickTjHead('zzl')">
 								<view class="title">
 									<p>总指令进度</p>
 									<text>{{zTjList.totalSentCount}}/{{zTjList.totalSum}}</text>
@@ -72,7 +72,7 @@
 								</view>
 							 </view>
 							 <view class="tjInfo" v-for="(item,index) in zTjList.instructionStatisticsList" :key="index" :class="{active:zTjActive == index}"
-							 	@click="clickTjList(item,index,'zzl')" v-if="ZLFlag">
+							 	@click="clickTjList(item,index,'zzl')">
 							 	<view class="title">
 							 		<p>{{item.titleBar}}</p>
 							 		<text>{{item.totalSentCount}}/{{item.zsum}}</text>
@@ -106,7 +106,7 @@
 							  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="tjInfo" v-for="(item,index) in jobProgressList" :key="index" @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"
@@ -126,8 +126,8 @@
 								<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">
+										<template v-for="(item,index) in itemList">
+											<view class="exp" :key="index">
 												<view class="item">
 													<view class="row">
 														<view class="title">
@@ -313,8 +313,8 @@
 							  <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')" v-if="ZLFlag">
+							<template v-if="fzlFlag && ZLFlag">
+							 <view class="tjHead" @click="clickTjHead('fzl')">
 								<view class="title">
 									<p>分指令进度</p>
 									<text>{{zTjList.branchSentCount}}/{{zTjList.branchSum}}</text>
@@ -332,7 +332,7 @@
 								</view>
 							 </view>
 							 <view class="tjInfo" v-for="(item,index) in zTjList.instructionStatisticsList" :key="index" :class="{active:zTjActive == index}"
-							 	@click="clickTjList(item,index,'fzl')" v-if="ZLFlag">
+							 	@click="clickTjList(item,index,'fzl')">
 							 	<view class="title">
 							 		<p>{{item.titleBar}}</p>
 							 		<text>{{item.branchSentCount}}/{{item.fsum}}</text>
@@ -366,7 +366,7 @@
 							  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="tjInfo" v-for="(item,index) in jobProgressList" :key="index" @click="jobProgress(item,index,'fzl')" :class="{active:jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label}">
                               <view class="label">{{ item.label }}{{filterType == 'CABIN_LEVEL_TYPE' ? '层' : ''}}</view>
 							  <lx-progress-bar title="" :total="item.totalProgress" :firstValue="item.progress"
 							  contentColor="#0067CF"
@@ -387,7 +387,7 @@
 									<view class="itemList">
 										<!-- <custom-waterfalls-flow :value="itemList" :column="2" :columnSpace="1"> -->
 											<!-- <template v-slot:default="item"> -->
-												<view v-for="item in itemList" :key="item.lwpId" class="exp" @click="clickItem(item)" :class="{actives:item.flag}">
+												<view v-for="(item,index) in itemList" :key="index" class="exp" @click="clickItem(item)" :class="{actives:item.flag}">
 													<view class="item">
 														<view class="row">
 															<view class="title">
@@ -566,7 +566,7 @@
 							  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="tjInfo" v-for="(item,index) in jobProgressList" :key="index" @click="jobProgress(item,index,'bzz')" :class="{active:jobActive == index || brdName == item.label || potName == item.label || mnfBl == item.label}">
                               <view class="label">{{ item.label }}{{filterType == 'CABIN_LEVEL_TYPE' ? '层' : ''}}</view>
 							  <lx-progress-bar title="" :total="item.totalProgress" :firstValue="item.progress"
 							  contentColor="#0067CF"
@@ -586,8 +586,8 @@
 								<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" @click="openPOP(item)">
+											<template v-for="(item,index) in itemList">
+											<view class="exp" @click="openPOP(item)" :key="index">
 												<view class="item">
 													<view class="row">
 														<view class="title">
@@ -736,7 +736,7 @@
 								<view class="imgLi">
 									<view class="maskBox">
 										<view class="line">
-											<view class="testLine" v-for="item2 in item.shipSpace" :key="item2"
+											<view class="testLine" v-for="(item2,index2) in item.shipSpace" :key="index2"
 												:style="{height:item.maxHeight+'px'}">
 											</view>
 											<template v-if="goodsInfo.length && goodsInfo.length > 0">
@@ -1043,8 +1043,8 @@
 			</uni-popup>
 			<uni-popup ref="bzzPOP" type="dialog">
 				<view class="bzzBox">
-					<template v-for="item in bzzPOPList">
-						<view class="exp">
+					<template v-for="(item,index) in bzzPOPList">
+						<view class="exp" :key="index">
 							<view class="item">
 								<view class="row">
 									<view class="title">
@@ -1324,6 +1324,7 @@
 			this.getTotalProgress() //获取装船总进度
 			this.getRoleId() // 获取角色ID
 		},
+        
 		components: {
 			HeadView,
 			HeadInfo,
@@ -1332,7 +1333,10 @@
 		methods: {
 			// 点击tabs
 			changeTabs(e) {
-				this.getQueryCheckRecord(0) // 获取勾选
+				this.itemList = []
+				this.jobProgressList = []
+				this.tabsValue = e.value
+				this.tabsName = e.label
 				this.mnfBl = ''
 				this.brdId = ''
 				this.brdName = ''
@@ -1340,16 +1344,18 @@
 				this.bvmName = ''
 				this.potId = ''
 				this.potName = ''
-				this.itemList = []
 				this.sendValue = ''
-				this.tabsValue = e.value
-				this.tabsName = e.label
 				this.zTjActive = -1
 				this.shipDeck = ""
 				this.current = 1
 				this.zTjType = true
 				this.activeIndex = 0
-				this.jobProgressList = []
+				this.zzlFlag = true
+				this.fzlFlag = true
+				this.directorList = []
+				if(e.label == '总指令' || e.label == '分指令') {
+			        this.getStatistics() // 获取统计列表
+				}
 				if (e.label == '分指令' || e.label == '班组长分指令') {
 					this.loadOtherOrder()
 					this.askDisabled = true
@@ -1367,13 +1373,8 @@
 					this.getDc()
 					this.askDisabled = true
 				}
-				if(e.label == '总指令' || e.label == '分指令') {
-			        this.getStatistics() // 获取统计列表
-				}
-				this.directorList = []
+				this.getQueryCheckRecord(0) // 获取勾选
 				this.getRoleId()
-				this.zzlFlag = true
-				this.fzlFlag = true
 			},
 			// 刷新
 			refresh() {
@@ -1498,8 +1499,8 @@
 					method: 'GET', //请求方式，必须为大写
 					success: (res) => {
 						this.ZLFlag = res.data.data.length > 0 ? true : false
-						if(!this.ZLFlag) return
 						this.zTjList = {}
+						if(!this.ZLFlag) return
 						this.zTjList = res.data.data[0]
 						this.zTjList["totalSum"] = this.zTjList.totalSentCount + this.zTjList.totalNotSentCount
 						this.zTjList["branchSum"] = this.zTjList.branchSentCount + this.zTjList
@@ -1519,7 +1520,7 @@
 				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/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}`,
+					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=999&current=${this.current}&goodsClassifySelected=${this.goodsClassifySelected}`,
 					header: {
 						'Content-Type': 'application/json', //自定义请求头信息
 						'Authorization': `Bearer ${this.loginObj.access_token}`
@@ -1527,10 +1528,10 @@
 					method: 'GET', //请求方式，必须为大写
 					success: (res) => {
 						this.itemList.push(...res.data.data.records)
-						if (res.data.data.records.length == 10) {
-							this.current++
-							this.loadSumOrder()
-						}
+						// if (res.data.data.records.length == 10) {
+						// 	this.current++
+						// 	this.loadSumOrder()
+						// }
 						this.itemList.forEach((v, index) => {
 							v.image = '../../static/images/theme/car1.png'
 							v.index = index
@@ -1552,7 +1553,7 @@
 				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/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}`,
+					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=999&current=${this.current}&goodsClassifySelected=${this.goodsClassifySelected}`,
 					header: {
 						'Content-Type': 'application/json', //自定义请求头信息
 						'Authorization': `Bearer ${this.loginObj.access_token}`
@@ -1560,10 +1561,10 @@
 					method: 'GET', //请求方式，必须为大写
 					success: (res) => {
 						this.itemList.push(...res.data.data.records)
-						if (res.data.data.records.length == 10) {
-							this.current++
-							this.loadOtherOrder()
-						}
+						// if (res.data.data.records.length == 10) {
+						// 	this.current++
+						// 	this.loadOtherOrder()
+						// }
 						this.itemList.forEach((v, index) => {
 							v.image = '../../static/images/theme/car1.png'
 							v.index = index