Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/aiot-app

pages/pda/components/bottomOperate.vue

@@ -564,7 +564,7 @@
 
 
 
-				this.outsourceForm.requireDeliveryTime = '2025-03-18'
+				// this.outsourceForm.requireDeliveryTime = '2025-03-18'
 				if (!this.outsourceForm.requireDeliveryTime) {
 					uni.showToast({
 						title: '请选择委外完成时间',

pages/pda/components/workCard.vue

@@ -1,7 +1,7 @@
 <template>
 
 	<view class="card_box" @click="handleDetail">
-		<view class="item_box rx-sc" v-if="item.workOrderType == 1">
+		<view class="item_box rx-sc" v-if="item.workOrderType != 2">
 			<view class="round" v-if='item.index'>{{item.index}}</view>
 			<view class="orderId">{{item.code}}  </view>
 		</view>

pages/pda/workOrder/index/index.vue

@@ -85,6 +85,7 @@
 		
 
 				this.dataList.push(...res.list)
+				console.log(this.dataList, 'dataList')
 				isEnd = this.dataList.length >= res.count
 
 			},