Merge branch 'main' of https://www.sanduolantoyoga.com/xiezuo001/palletApp

pages/pallet/ck.vue

@@ -387,7 +387,7 @@
 						this.depts=data.depts;
 						this.address=data.address;
 						this.dicts.forEach(cell=>{
-							if("PJCD"==cell.bmlb){
+							if("PJCD"==cell.bmlb&&cell.zfbz!=='1'){
 								// 工程
 								this.gcs.push(cell);
 							}

pages/pallet/fb.vue

@@ -295,7 +295,7 @@
 						this.depts=data.depts;
 						this.address=data.address;
 						this.dicts.forEach(cell=>{
-							if("PJCD"==cell.bmlb){
+							if("PJCD"==cell.bmlb&&cell.zfbz!=='1'){
 								// 工程
 								this.gcs.push(cell);
 							}

pages/pallet/js.vue

@@ -698,7 +698,7 @@ export default {
 					this.depts=data.depts;
 					// this.address=data.address;
 					this.dicts.forEach(cell=>{
-						if("PJCD"==cell.bmlb){
+						if("PJCD"==cell.bmlb&&cell.zfbz!=='1'){
 							// 工程
 							this.gcs.push(cell);
 						}

pages/pallet/lbcx.vue

@@ -882,7 +882,7 @@
 						this.depts=data.depts;
 						this.address=data.address;
 						this.dicts.forEach(cell=>{
-							if("PJCD"==cell.bmlb){
+							if("PJCD"==cell.bmlb&&cell.zfbz!=='1'){
 								// 工程
 								this.gcs.push(cell);
 							}

pages/pallet/ps.vue

@@ -141,7 +141,7 @@
     <view class="section">
 		
 		<view class="section-header">
-		  <text class="section-title">已添加工装托盘</text>
+		  <text class="section-title">工装托盘</text>
 		  <text class="section-count">({{ getcount() }})</text>
 		</view>
 		
@@ -1397,7 +1397,7 @@ export default {
 					this.depts=data.depts;
 					// this.address=data.address;
 					this.dicts.forEach(cell=>{
-						if("PJCD"==cell.bmlb){
+						if("PJCD"==cell.bmlb&&cell.zfbz!=='1'){
 							// 工程
 							this.gcs.push(cell);
 						}

pages/pallet/tpcxtk.vue

@@ -482,7 +482,7 @@
 						this.depts=data.depts;
 						this.address=data.address;
 						this.dicts.forEach(cell=>{
-							if("PJCD"==cell.bmlb){
+							if("PJCD"==cell.bmlb&&cell.zfbz!=='1'){
 								// 工程
 								this.gcs.push(cell);
 							}

pages/pallet/xp.vue

@@ -738,7 +738,7 @@ export default {
 					// }
 					 
 					this.dicts.forEach(cell=>{
-						if("PJCD"==cell.bmlb){
+						if("PJCD"==cell.bmlb&&cell.zfbz!=='1'){
 							// 工程
 							this.gcs.push(cell);
 						}

pages/pallet/yz.vue

@@ -891,7 +891,7 @@ export default {
 					this.address=data.address;
 					
 					this.dicts.forEach(cell=>{
-						if("PJCD"==cell.bmlb){
+						if("PJCD"==cell.bmlb&&cell.zfbz!=='1'){
 							// 工程
 							this.gcs.push(cell);
 						}