修改盘点显示

fe/PDA/pages/task/countFgDetail.vue

@@ -22,7 +22,7 @@
 							</view>
 							<view class="desc_card uni-flex space-between">
 								<view class="desc_ljh">
-									<view class="font_xs text_lightblue"> {{ item.itemName }}</view>
+									<view class="font_xs text_lightblue"> {{ item.itemDesc2 }}</view>
 									<view class="font_xs text_lightblue">{{ item.itemDesc1 }}
 									</view>
 								</view>
@@ -138,7 +138,7 @@
 		<com-easy-input-count ref="countPopup" @confirm='closeEditCount'></com-easy-input-count>
 		<win-inventory-status ref="statusPopup"></win-inventory-status>
 		<!-- com-message必须放在最下层 -->
-		<wz-select-popup ref="wzSelectPopup" @select="selectCheckbox" />
+		<wz-select-popup ref="wzSelectPopup" @select="selectCheckbox" showType='countType' />
 		<com-message ref="comMessage" @afterCloseCommitMessage='closeCommitMessage()'></com-message>
 		<!-- <uni-load-more :status="loadingType" v-if="details.length>0"></uni-load-more> -->
 

fe/PDA/pages/task/countRawDetail.vue

@@ -18,7 +18,7 @@
 							</view>
 							<view class="desc_card uni-flex space-between">
 								<view class="desc_ljh">
-									<view class="font_xs text_lightblue"> {{ item.itemName }}</view>
+									<view class="font_xs text_lightblue"> {{ item.itemDesc2 }}</view>
 									<view class="font_xs text_lightblue">{{ item.itemDesc1 }}
 									</view>
 								</view>
@@ -143,7 +143,7 @@
 		<!-- com-message必须放在最下层 -->
 		<com-message ref="comMessage" @afterCloseCommitMessage='closeCommitMessage()'></com-message>
 		<!-- <uni-load-more :status="loadingType" v-if="details.length>0"></uni-load-more> -->
-		<wz-select-popup ref="wzSelectPopup" @select="selectCheckbox" />
+		<wz-select-popup ref="wzSelectPopup" @select="selectCheckbox" showType='countType'/>
 	</view>
 </template>
 

fe/PDA/uni_modules/wz-select-popup/components/wz-select-popup/wz-list.vue

@@ -10,7 +10,8 @@
 			({{index+1}})
 			<view v-if="isShowItem" class="uni-flex" style="flex-direction: column; font-size: 32rpx;">
 				<view class="list-item-text">ERP料号 : {{item.itemCode}}</view>
-				<view class="list-item-text">名称 : {{item.itemName}}</view>
+				<view v-if="showType=='countType'" class="list-item-text">正厂编码 : {{item.itemDesc2}}</view>
+				<view v-else class="list-item-text">名称 : {{item.itemName}}</view>
 				<view class="list-item-text">描述 : {{item.itemDesc1}}</view>
 			</view>
 			
@@ -46,6 +47,12 @@
 				type: Boolean,
 				default: true
 			},
+			showType: {
+				type: String,
+				default: ""
+			},
+			
+			
 			page: {
 				type: Object,
 				default: () => {

fe/PDA/uni_modules/wz-select-popup/components/wz-select-popup/wz-select-popup.vue

@@ -18,6 +18,7 @@
 					<wz-list :list="dataList" :fields="popConfig.fields" :page="pageStatus" @checkList="checkList"
 						@loadmore="scrolltolower" 
 						:isShowItem="isShowItem"
+						:showType="showType"
 						:isShowIcon="false" />
 				</scroll-view>
 				<view v-if="popConfig.mode =='checkbox'" class="footer-button">
@@ -74,6 +75,10 @@
 				type: Boolean,
 				default: true
 			},
+			showType: {
+				type: String,
+				default: ""
+			},
 			
 			
 
@@ -227,6 +232,7 @@
 						res.itemCode =  res.itemCode?res.itemCode:res.code
 						res.itemName = res.itemName?res.itemName:res.name
 						res.itemDesc1 =res.itemDesc1?res.itemDesc1:res.desc1
+						res.itemDesc2 =res.itemDesc2?res.itemDesc2:res.desc2
 					})
 
 					if (proxyConfig.localPaging) { //前端本地分页