优化

pages.json

@@ -1519,6 +1519,14 @@
 			"navigationStyle" : "custom",
 			"navigationBarTextStyle" : "white"
 			}
+		},
+		{
+			"path" : "pages/pda/outsourcing/index/index",
+			"style" : 
+			{
+				"navigationStyle" : "custom",
+				"navigationBarTextStyle" : "white"
+			}
 		}
 
 

pages/pda/components/bottomOperate.vue

@@ -40,8 +40,7 @@
 						</u-form-item>
 
 						<u-form-item label="委外数量:" borderBottom prop="num">
-							<input class="uni-input" v-model="outsourceForm.formedNumLast" type='number'
-								disabled></input>
+							<input class="uni-input" v-model="outsourceForm.formedNumLast" type='number'></input>
 						</u-form-item>
 
 						<u-form-item label="完成时间:" borderBottom prop="expectReceiveDate">
@@ -52,12 +51,8 @@
 
 						</u-form-item>
 
-						<u-form-item label="是否入库:" borderBottom prop="status">
-							<zxz-uni-data-select :localdata="statusList" v-model="outsourceForm.status" dataValue='type'
-								format='{value}' dataKey="value" filterable></zxz-uni-data-select>
 
-						</u-form-item>
-						</u-form-item>
+
 
 
 
@@ -74,7 +69,12 @@
 
 
 					<u-button type="success" size="small" class="u-reset-button" @click="outsourceOk">
-						确定
+						提交
+					</u-button>
+
+
+					<u-button type="success" size="small" class="u-reset-button" @click="outsourceOk">
+						提交并发布
 					</u-button>
 
 				</view>
@@ -88,7 +88,8 @@
 	import {
 		getTwoTreeByPid,
 		checkOutsource,
-		applyoutsourceSave
+		applyoutsourceSave,
+
 	} from '@/api/pda/workOrder.js'
 
 	import SearchPopup from './searchPopup.vue'
@@ -207,21 +208,14 @@
 
 				},
 
-				statusList: [{
-						type: 1,
-						value: '入库'
-					},
-					{
-						type: 0,
-						value: '不入库'
-					}
-				]
+
+
 			}
 		},
 
 
 		created() {
-			this.getTwoTree()
+
 		},
 
 		methods: {
@@ -246,6 +240,8 @@
 				})
 			},
 
+
+
 			open() {
 				this.isOperate = !this.isOperate
 			},
@@ -264,7 +260,7 @@
 
 					this.outsourceForm = {
 						...res,
-						status: 1,
+
 						expectReceiveDate: '2024-05-20'
 					}
 
@@ -413,7 +409,7 @@
 
 
 	.operate_box {
-		padding: 10rpx 60rpx;
+		padding: 10rpx 20rpx;
 
 		/deep/ .u-button {
 			width: 160rpx;
@@ -421,7 +417,7 @@
 	}
 
 	.popup_list {
-		width: 65vw;
+		width: 78vw;
 		min-height: 360rpx;
 		padding: 0 32rpx;
 

pages/pda/feeding/bill/index.vue

@@ -82,8 +82,6 @@
 			async getList() {
 				const res = await feedByOrderIds(this.ids)
 				this.dataList = res
-				
-				console.log(22, saaathis.dataList)
 
 			},
 

pages/pda/jobBooking/components/packingTgBom.vue

@@ -68,7 +68,7 @@
 						<view class="lable lable150 rx-cc ">刻码</view>
 						<view class="content content_num ">
 							<view v-if='isDetails'>{{it.extInfo.engrave }}</view>
-							<input class="uni-input" v-else v-model="it.extInfo.engrave"></input>
+							<input class="uni-input" v-else v-model="it.extInfo.engrave" ></input>
 
 						</view>
 					</view>
@@ -111,7 +111,7 @@
 
 
 						<view class="item  ww50">
-							<input class="uni-input content_num" v-model="it.sendCode"></input>
+							<input class="uni-input content_num" v-model="it.sendCode" :disabled="isDetails"></input>
 						</view>
 
 
@@ -162,7 +162,15 @@
 			isWarehousing: {
 				type: Boolean,
 				default: false
-			}
+			},
+			
+			isDetails: {
+				type: Boolean,
+				default: false
+			},
+			
+			
+			
 
 
 
@@ -177,7 +185,7 @@
 					if (this.isWarehousing == false) {
 						this.item['packInfo'] = {}
 						this.item['packInfo'].pickOutInList = newVal
-					}
+					} 
 
 
 

pages/pda/jobBooking/index/index.vue

@@ -49,7 +49,7 @@
 
 					<packingTgBom
 						v-if='objData.pickOutInList &&  objData.pickOutInList.length != 0 && taskType == 4 && clientEnvironmentId == 3'
-						:item='objData' :list='objData.pickOutInList'></packingTgBom>
+					 :list='objData.pickOutInList'></packingTgBom>
 
 
 

pages/pda/outsourcing/index/index.vue

@@ -0,0 +1,172 @@
+<template>
+	<view class="content-box">
+		<uni-nav-bar fixed="true" statusBar="true" left-icon="back" title="委外单" background-color="#157A2C" color="#fff"
+			@clickLeft="back"></uni-nav-bar>
+
+		<view class="top-wrapper">
+			<uni-section>
+				<uni-easyinput prefixIcon="search" style="width: 460rpx" v-model="searchFrom.keyWord" placeholder="请输入">
+				</uni-easyinput>
+			</uni-section>
+
+			<button class="search_btn" @click="doSearch">搜索</button>
+
+			<image class="menu_icon" src="~@/static/pda/menu.svg"></image>
+
+
+
+		</view>
+
+		<view class="list_box">
+
+			<u-list @scrolltolower="scrolltolower" key="list" :preLoadScreen="page * 10">
+				<u-list-item v-for="(item, index) in dataList" :key="index">
+					<workCard :item="item" @handleDetail="handleDetail"></workCard>
+				</u-list-item>
+
+
+				<u-list-item v-if="dataList.length === 0">
+			          <view style='margin-top: 20vh;'>
+						  <u-empty iconSize='150'  textSize='32' text='暂无工单'>
+						  </u-empty>
+					  </view>
+				</u-list-item>
+
+			</u-list>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import workCard from '../../components/workCard.vue'
+
+	import {
+		workorderPage
+	} from '@/api/pda/workOrder.js'
+	let [isEnd] = [false]
+	export default {
+		components: {
+			workCard
+		},
+		data() {
+			return {
+				page: 1,
+				size: 10,
+				dataList: [],
+
+				searchFrom: {
+					keyWord: null
+				},
+
+
+			}
+		},
+		onShow() {
+			this.getList()
+		},
+		methods: {
+			async getList() {
+				let params = {
+					pageNum: this.page,
+					size: this.size,
+					status: [4, 5, 6, 7],
+					...this.searchFrom
+				}
+
+				isEnd = false
+				const res = await workorderPage(params)
+				console.log(res)
+
+				if (params.pageNum === 1) {
+					this.dataList = []
+				}
+
+				this.dataList.push(...res.list)
+				isEnd = this.dataList.length >= res.count
+
+			},
+
+
+			doSearch() {},
+
+
+			scrolltolower() {
+				if (isEnd) return
+				this.page++
+				this.getList()
+			},
+
+
+
+			handleDetail(item) {
+				let url = '/pages/pda/workOrder/extrusionMolding/index'
+				url += `?id=${item.id}&title=${item.taskName}`
+		
+				uni.navigateTo({
+					url
+				})
+			},
+
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content-box {
+		height: 100vh;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
+		background-color: $page-bg;
+	}
+
+	.top-wrapper {
+		background-color: #fff;
+		display: flex;
+		width: 750rpx;
+		height: 88rpx;
+		padding: 16rpx 32rpx;
+		align-items: center;
+		gap: 16rpx;
+
+		/deep/.uni-section {
+			margin-top: 0px;
+		}
+
+		/deep/.uni-section-header {
+			padding: 0px;
+
+		}
+
+		.search_btn {
+			width: 120rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+			padding: 0 24rpx;
+			background: $theme-color;
+			font-size: 32rpx;
+			color: #fff;
+			margin: 0;
+			margin-left: 26rpx;
+		}
+
+		.menu_icon {
+			width: 44rpx;
+			height: 44rpx;
+			margin-left: 14rpx;
+		}
+	}
+
+
+	.list_box {
+		flex: 1;
+		overflow: hidden;
+		padding: 16rpx 0;
+
+		.u-list {
+			height: 100% !important;
+		}
+	}
+</style>

pages/pda/sample/components/sampleBom.vue

@@ -230,6 +230,10 @@
 					{
 						value: 2,
 						text: "入库"
+					},
+					{
+					value: 3,
+					text: "损耗"	
 					}
 				],
 

pages/pda/workOrder/index/details.vue

@@ -31,7 +31,7 @@
 					<palletBom v-if="objData.palletList.length != 0" :palletList='objData.palletList' :isDetails='true'>
 					</palletBom>
 
-<!-- 					<revolvingDiskBom v-if="objData.revolvingDiskList.length > 0"
+					<!-- <revolvingDiskBom v-if="objData.revolvingDiskList.length > 0"
 						:revolvingDiskList="objData.revolvingDiskList"></revolvingDiskBom> -->
 
 					<oneJobBom v-if='objData.instanceList &&  objData.instanceList.length != 0'
@@ -54,6 +54,11 @@
 
 
 
+					<packingTgBom
+						v-if='objData.packInfo && objData.packInfo.pickOutInList &&   objData.packInfo.pickOutInList != 0 && taskType == 4 '
+						:list='objData.packInfo.pickOutInList'   :isWarehousing='true' :isDetails="true"></packingTgBom>
+
+
 
 
 				</view>
@@ -87,6 +92,8 @@
 	import sampleBom from '../../sample/components/sampleBom.vue'
 	import palletBom from '../../feeding/components/palletBom.vue'
 	import revolvingDiskBom from '../../feeding/components/revolvingDiskBom.vue'
+	import packingTgBom from '../../jobBooking/components/packingTgBom.vue'
+
 	export default {
 		components: {
 			workOrderBom,
@@ -102,7 +109,8 @@
 			qualityStat,
 			sampleBom,
 			palletBom,
-			revolvingDiskBom
+			revolvingDiskBom,
+			packingTgBom
 		},
 		data() {
 			return {
@@ -128,6 +136,7 @@
 				}
 				listWorkReport(param).then(res => {
 					this.list = res
+					
 				})
 			},