33

pages/pda/components/bottomOperate.vue

@@ -17,24 +17,29 @@
 
 			<view v-if='btnControlReportMethod == 2' class="list rx-bc">
 				<view class="round">{{btnList[btnState].length + 1}}</view>
-				<view class="name" @click="operate('skip', {})" skip>跳过(不报工)</view>
+				<view class="name" @click="operate('skip', {})" >跳过(不报工)</view>
 				<image class="arrow_right" src="~@/static/pda/arrow_right.svg"></image>
 			</view>
 
 
-			<view class="list rx-bc" v-if="btnState == 1">
-				<view class="list_item_btn" @click="operate('jobBooking', {})">报工</view>
-				<view class="list_item_btn" @click="operate('',item)">多工单报工</view>
-			</view>
+		
+		
+		<view  v-if="newTaskObj.existOutsource == 1" class="list rx-bc">
+			<view class="round">{{btnList[btnState].length + 1}}</view>
+			<view class="name" @click="operate('outPicking', {})" >委外领料</view>
+			<image class="arrow_right" src="~@/static/pda/arrow_right.svg"></image>
+		</view>
+		
+		<view  v-if="newTaskObj.existOutsource == 1" class="list rx-bc">
+			<view class="round">{{btnList[btnState].length + 2}}</view>
+			<view class="name" @click="operate('jobBooking', {})" >委外报工</view>
+			<image class="arrow_right" src="~@/static/pda/arrow_right.svg"></image>
+		</view>
+		
 
 
 
 
-			<view class="list rx-bc" v-if="newTaskObj.existOutsource == 1">
-				<view class="list_item_btn" @click="operate('outPicking', {})">委外领料</view>
-				<view class="list_item_btn" @click="operate('jobBooking', {})">委外报工</view>
-			</view>
-
 
 		</view>
 
@@ -43,7 +48,7 @@
 			<view class="btn" @click="handPause()">{{ GDStatus == 9 ?  '取消暂停' : '暂停' }}</view>
 			<view class="btn" @click="handTerminate()">终止</view>
 			<view class="btn">转派</view>
-			<view class="btn" @click="handOutsource()">委外</view>
+			<view class="btn" :style="newTaskObj.existOutsource == 1 ? 'color: #FFA929' : ''" @click="handOutsource()">委外</view>
 		</view>
 
 		<SearchPopup mode="center" v-if="outsourceShow">
@@ -265,6 +270,15 @@
 							name: '更换周转车',
 							type: 'turnover'
 						},
+						{
+							name: '报工',
+							type: 'jobBooking'
+						},
+						{
+							name: '多工单报工',
+							type: ''
+						}
+						
 
 
 					],
@@ -542,7 +556,7 @@
 
 
 
-				// this.outsourceForm.requireDeliveryTime = '2025-03-18'
+				this.outsourceForm.requireDeliveryTime = '2025-03-18'
 				if (!this.outsourceForm.requireDeliveryTime) {
 					uni.showToast({
 						title: '请选择委外完成时间',

pages/pda/components/outsourceList.vue

@@ -229,6 +229,11 @@
 											class="items" v-if="!itm.formatter">
 											<text>{{ itm.label }}</text>{{ item[itm.prop] }}
 										</view>
+										
+										<view class="items content_num">
+											<text>数量</text> <input style="8rpx !important"
+												v-model="item.demandQuantity"></input>
+										</view>
 
 
 

pages/pda/components/workCard.vue

@@ -1,10 +1,33 @@
 <template>
 
 	<view class="card_box" @click="handleDetail">
-		<view class="item_box rx-sc">
+		<view class="item_box rx-sc" v-if="item.workOrderType == 1">
 			<view class="round" v-if='item.index'>{{item.index}}</view>
 			<view class="orderId">{{item.code}}  </view>
 		</view>
+		
+		<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.outsourceCode}}  </view>
+		</view>
+		
+		<view class="item_box rx-bc"  v-if="item.workOrderType == 2">
+			<view class="item_one  rx-sc">
+				<view class="lable">委外名称：</view>
+				<view>{{item.outsourceName}}</view>
+			</view>
+		
+		</view>
+		
+		<view class="item_box rx-bc"  v-if="item.workOrderType == 2">
+			<view class="item_one  rx-sc">
+				<view>工单来源：</view>
+				<view>{{item.code}}</view>
+			</view>
+		</view>
+		
+		
+		
 
 		<view class="item_box rx-bc">
 			<view class="item_one perce50 rx-sc">

pages/pda/workOrder/index/index.vue

@@ -19,7 +19,7 @@
 
 		<view class="list_box">
 
-			<u-list @scrolltolower="scrolltolower" key="list" :preLoadScreen="page * 10">
+			<u-list @scrolltolower="scrolltolower" key="list"  lowerThreshold="100" preLoadScreen="1.5">
 				<u-list-item v-for="(item, index) in dataList" :key="index">
 					<workCard :item="item" @handleDetail="handleDetail"></workCard>
 				</u-list-item>