1230

components/dialog-lotReporting/dialog-lotReporting.vue

@@ -53,7 +53,7 @@
 					@change="handleDeptChange"></uni-data-select>
 			</view>
 			<view v-if="!isWx" class="item-info uni-row" style="margin-top: 12rpx;">
-				<text class="label" style="width: 250rpx;">下序是否包装</text><text style="margin-left: 24rpx;"
+				<text class="label" style="width: 250rpx;">是否包装签票</text><text style="margin-left: 24rpx;"
 					class="label right">否</text>
 				<switch class="switch" @change="switchChange" :checked="normalStatus"
 					style="transform: scale(0.8);align-items: center;font-size:32rpx ;"

components/dialog-turnoverApplication/dialog-turnoverApplication.vue

@@ -23,7 +23,7 @@
 				</uni-section>
 			</view>
 			<view v-if="curDayworkItem.turnoverType != '3'" class="list-title uni-row">
-				<text class="label">下序是否包装</text><text style="margin-left: 56rpx;" class="label">否</text>
+				<text class="label">是否包装签票</text><text style="margin-left: 56rpx;" class="label">否</text>
 				<switch class="switch" @change="switchChange" :checked="normalStatus"
 					style="transform: scale(0.8);align-items: center;font-size:32rpx ;"
 					color="rgba(103, 195, 55, 1.0)" />

pages.json

@@ -120,7 +120,7 @@
 		{
 			"path": "pages/sorting/technicianOptions",
 			"style": {
-				"navigationBarTitleText": "分选报工"
+				"navigationBarTitleText": "技术负责人"
 			}
 		},
 		{
@@ -207,7 +207,7 @@
 		{
 			"path": "pages/outsourcedInspection/technicianOptions",
 			"style": {
-				"navigationBarTitleText": "外协检查"
+				"navigationBarTitleText": "技术负责人"
 			}
 		},
 		{
@@ -470,6 +470,36 @@
 				"navigationBarTitleText": "检查项"
 			}
 		},
+		{
+			"path": "pages/factoryInspection/technicianOptions",
+			"style": {
+				"navigationBarTitleText": "技术负责人"
+			}
+		},
+		{
+			"path": "pages/onSiteInspection/technicianOptions",
+			"style": {
+				"navigationBarTitleText": "技术负责人"
+			}
+		},
+		{
+			"path": "pages/firstInspection/technicianOptions",
+			"style": {
+				"navigationBarTitleText": "技术负责人"
+			}
+		},
+		{
+			"path": "pages/instrumentRoomInspection/technicianOptions",
+			"style": {
+				"navigationBarTitleText": "技术负责人"
+			}
+		},
+		{
+			"path": "pages/deliveryInspection/technicianOptions",
+			"style": {
+				"navigationBarTitleText": "技术负责人"
+			}
+		},
 		{
 			"path": "pages/factoryInspection/form",
 			"style": {

pages/deliveryInspection/consultation.vue

@@ -248,7 +248,7 @@
 		})
 		console.log("777")
 		uni.navigateTo({
-			url: "/pages/sorting/technicianOptions"
+			url: "/pages/deliveryInspection/technicianOptions"
 		})
 	}
 </script>

pages/deliveryInspection/technicianOptions.vue

@@ -2,20 +2,23 @@
 	<view class="page-container uni-column" style="position: absolute;left: 0;right: 0;top: 0;bottom: 0">
 		<view class="option-container uni-column" style="display: flex;">
 			<!-- tab-bar -->
-			<view class="tab-bars uni-row">
-				<view>
+			<view class="tab-bars">
+				<!-- 				<view style="text-align: center;">
 					<text style="font-weight: bold;">技术负责人</text>
 					<view class="line"></view>
+				</view> -->
+				<view class="search-container uni-row">
+					<input type="text" v-model="keywords" placeholder="请输入关键字" />
+					<view class="btn" @click="handleSearch()">搜索</view>
 				</view>
 			</view>
 			<!-- 搜索框 -->
-			<view class="search-container uni-row">
-				<input type="text" v-model="keywords" placeholder="请输入关键字" />
-				<view class="btn" @click="handleSearch()">搜索</view>
-			</view>
+
 
 		</view>
-		<view class="uni-row" style="background-color:#ffffff;height: 85%;padding-bottom: 12px;margin-top: 8px;">
+		<view class="uni-row" style=" background-color: rgb(255, 255, 255);
+    padding-bottom: 12px;
+    margin-top: 88px;overflow: auto;">
 			<view style="width: 100%;height: 100%;overflow: auto;">
 				<view v-if="optionList&& optionList.length == 0" style="align-items: center;margin-top: 30px">暂无技术员
 				</view>
@@ -118,10 +121,19 @@
 	}
 
 	.option-container {
-		height: 13%;
-		background-color: #ffffff;
-		padding: 24rpx;
-		border-radius: 12rpx;
+		// height: 13%;
+		// background-color: #ffffff;
+		// padding: 24rpx;
+		// border-radius: 12rpx;
+		background-color: #fff;
+		padding: .75rem;
+		border-radius: .375rem;
+		position: fixed;
+		top: 52px;
+		left: 12px;
+		right: 12px;
+		padding-bottom: 39px;
+		z-index: 5;
 	}
 
 	.tab-bars {
@@ -129,7 +141,7 @@
 
 		>view {
 			flex: 1;
-			text-align: center;
+			// text-align: center;
 
 			.line {
 				width: 50%;

pages/factoryInspection/consultation.vue

@@ -249,7 +249,7 @@
 		})
 		console.log("777")
 		uni.navigateTo({
-			url: "/pages/sorting/technicianOptions"
+			url: "/pages/factoryInspection/technicianOptions"
 		})
 	}
 </script>

pages/factoryInspection/technicianOptions.vue

@@ -2,20 +2,23 @@
 	<view class="page-container uni-column" style="position: absolute;left: 0;right: 0;top: 0;bottom: 0">
 		<view class="option-container uni-column" style="display: flex;">
 			<!-- tab-bar -->
-			<view class="tab-bars uni-row">
-				<view>
+			<view class="tab-bars">
+				<!-- 				<view style="text-align: center;">
 					<text style="font-weight: bold;">技术负责人</text>
 					<view class="line"></view>
+				</view> -->
+				<view class="search-container uni-row">
+					<input type="text" v-model="keywords" placeholder="请输入关键字" />
+					<view class="btn" @click="handleSearch()">搜索</view>
 				</view>
 			</view>
 			<!-- 搜索框 -->
-			<view class="search-container uni-row">
-				<input type="text" v-model="keywords" placeholder="请输入关键字" />
-				<view class="btn" @click="handleSearch()">搜索</view>
-			</view>
+
 
 		</view>
-		<view class="uni-row" style="background-color:#ffffff;height: 85%;padding-bottom: 12px;margin-top: 8px;">
+		<view class="uni-row" style=" background-color: rgb(255, 255, 255);
+    padding-bottom: 12px;
+    margin-top: 88px;overflow: auto;">
 			<view style="width: 100%;height: 100%;overflow: auto;">
 				<view v-if="optionList&& optionList.length == 0" style="align-items: center;margin-top: 30px">暂无技术员
 				</view>
@@ -118,10 +121,19 @@
 	}
 
 	.option-container {
-		height: 13%;
-		background-color: #ffffff;
-		padding: 24rpx;
-		border-radius: 12rpx;
+		// height: 13%;
+		// background-color: #ffffff;
+		// padding: 24rpx;
+		// border-radius: 12rpx;
+		background-color: #fff;
+		padding: .75rem;
+		border-radius: .375rem;
+		position: fixed;
+		top: 52px;
+		left: 12px;
+		right: 12px;
+		padding-bottom: 39px;
+		z-index: 5;
 	}
 
 	.tab-bars {
@@ -129,7 +141,7 @@
 
 		>view {
 			flex: 1;
-			text-align: center;
+			// text-align: center;
 
 			.line {
 				width: 50%;

pages/firstInspection/consultation.vue

@@ -249,7 +249,7 @@
 		})
 		console.log("777")
 		uni.navigateTo({
-			url: "/pages/sorting/technicianOptions"
+			url: "/pages/firstInspection/technicianOptions"
 		})
 	}
 </script>

pages/firstInspection/technicianOptions.vue

@@ -2,20 +2,23 @@
 	<view class="page-container uni-column" style="position: absolute;left: 0;right: 0;top: 0;bottom: 0">
 		<view class="option-container uni-column" style="display: flex;">
 			<!-- tab-bar -->
-			<view class="tab-bars uni-row">
-				<view>
+			<view class="tab-bars">
+				<!-- 				<view style="text-align: center;">
 					<text style="font-weight: bold;">技术负责人</text>
 					<view class="line"></view>
+				</view> -->
+				<view class="search-container uni-row">
+					<input type="text" v-model="keywords" placeholder="请输入关键字" />
+					<view class="btn" @click="handleSearch()">搜索</view>
 				</view>
 			</view>
 			<!-- 搜索框 -->
-			<view class="search-container uni-row">
-				<input type="text" v-model="keywords" placeholder="请输入关键字" />
-				<view class="btn" @click="handleSearch()">搜索</view>
-			</view>
+
 
 		</view>
-		<view class="uni-row" style="background-color:#ffffff;height: 85%;padding-bottom: 12px;margin-top: 8px;">
+		<view class="uni-row" style=" background-color: rgb(255, 255, 255);
+    padding-bottom: 12px;
+    margin-top: 88px;overflow: auto;">
 			<view style="width: 100%;height: 100%;overflow: auto;">
 				<view v-if="optionList&& optionList.length == 0" style="align-items: center;margin-top: 30px">暂无技术员
 				</view>
@@ -118,10 +121,19 @@
 	}
 
 	.option-container {
-		height: 13%;
-		background-color: #ffffff;
-		padding: 24rpx;
-		border-radius: 12rpx;
+		// height: 13%;
+		// background-color: #ffffff;
+		// padding: 24rpx;
+		// border-radius: 12rpx;
+		background-color: #fff;
+		padding: .75rem;
+		border-radius: .375rem;
+		position: fixed;
+		top: 52px;
+		left: 12px;
+		right: 12px;
+		padding-bottom: 39px;
+		z-index: 5;
 	}
 
 	.tab-bars {
@@ -129,7 +141,7 @@
 
 		>view {
 			flex: 1;
-			text-align: center;
+			// text-align: center;
 
 			.line {
 				width: 50%;

pages/instrumentRoomInspection/consultation.vue

@@ -249,7 +249,7 @@
 		})
 		console.log("777")
 		uni.navigateTo({
-			url: "/pages/sorting/technicianOptions"
+			url: "/pages/instrumentRoomInspection/technicianOptions"
 		})
 	}
 </script>

pages/instrumentRoomInspection/technicianOptions.vue

@@ -2,20 +2,23 @@
 	<view class="page-container uni-column" style="position: absolute;left: 0;right: 0;top: 0;bottom: 0">
 		<view class="option-container uni-column" style="display: flex;">
 			<!-- tab-bar -->
-			<view class="tab-bars uni-row">
-				<view>
+			<view class="tab-bars">
+				<!-- 				<view style="text-align: center;">
 					<text style="font-weight: bold;">技术负责人</text>
 					<view class="line"></view>
+				</view> -->
+				<view class="search-container uni-row">
+					<input type="text" v-model="keywords" placeholder="请输入关键字" />
+					<view class="btn" @click="handleSearch()">搜索</view>
 				</view>
 			</view>
 			<!-- 搜索框 -->
-			<view class="search-container uni-row">
-				<input type="text" v-model="keywords" placeholder="请输入关键字" />
-				<view class="btn" @click="handleSearch()">搜索</view>
-			</view>
+
 
 		</view>
-		<view class="uni-row" style="background-color:#ffffff;height: 85%;padding-bottom: 12px;margin-top: 8px;">
+		<view class="uni-row" style=" background-color: rgb(255, 255, 255);
+    padding-bottom: 12px;
+    margin-top: 88px;overflow: auto;">
 			<view style="width: 100%;height: 100%;overflow: auto;">
 				<view v-if="optionList&& optionList.length == 0" style="align-items: center;margin-top: 30px">暂无技术员
 				</view>
@@ -118,10 +121,19 @@
 	}
 
 	.option-container {
-		height: 13%;
-		background-color: #ffffff;
-		padding: 24rpx;
-		border-radius: 12rpx;
+		// height: 13%;
+		// background-color: #ffffff;
+		// padding: 24rpx;
+		// border-radius: 12rpx;
+		background-color: #fff;
+		padding: .75rem;
+		border-radius: .375rem;
+		position: fixed;
+		top: 52px;
+		left: 12px;
+		right: 12px;
+		padding-bottom: 39px;
+		z-index: 5;
 	}
 
 	.tab-bars {
@@ -129,7 +141,7 @@
 
 		>view {
 			flex: 1;
-			text-align: center;
+			// text-align: center;
 
 			.line {
 				width: 50%;

pages/onSiteInspection/consultation.vue

@@ -250,7 +250,7 @@
 		})
 		console.log("777")
 		uni.navigateTo({
-			url: "/pages/sorting/technicianOptions"
+			url: "/pages/onSiteInspection/technicianOptions"
 		})
 	}
 </script>

pages/onSiteInspection/technicianOptions.vue

@@ -2,20 +2,23 @@
 	<view class="page-container uni-column" style="position: absolute;left: 0;right: 0;top: 0;bottom: 0">
 		<view class="option-container uni-column" style="display: flex;">
 			<!-- tab-bar -->
-			<view class="tab-bars uni-row">
-				<view>
+			<view class="tab-bars">
+				<!-- 				<view style="text-align: center;">
 					<text style="font-weight: bold;">技术负责人</text>
 					<view class="line"></view>
+				</view> -->
+				<view class="search-container uni-row">
+					<input type="text" v-model="keywords" placeholder="请输入关键字" />
+					<view class="btn" @click="handleSearch()">搜索</view>
 				</view>
 			</view>
 			<!-- 搜索框 -->
-			<view class="search-container uni-row">
-				<input type="text" v-model="keywords" placeholder="请输入关键字" />
-				<view class="btn" @click="handleSearch()">搜索</view>
-			</view>
+
 
 		</view>
-		<view class="uni-row" style="background-color:#ffffff;height: 85%;padding-bottom: 12px;margin-top: 8px;">
+		<view class="uni-row" style=" background-color: rgb(255, 255, 255);
+    padding-bottom: 12px;
+    margin-top: 88px;overflow: auto;">
 			<view style="width: 100%;height: 100%;overflow: auto;">
 				<view v-if="optionList&& optionList.length == 0" style="align-items: center;margin-top: 30px">暂无技术员
 				</view>
@@ -118,10 +121,19 @@
 	}
 
 	.option-container {
-		height: 13%;
-		background-color: #ffffff;
-		padding: 24rpx;
-		border-radius: 12rpx;
+		// height: 13%;
+		// background-color: #ffffff;
+		// padding: 24rpx;
+		// border-radius: 12rpx;
+		background-color: #fff;
+		padding: .75rem;
+		border-radius: .375rem;
+		position: fixed;
+		top: 52px;
+		left: 12px;
+		right: 12px;
+		padding-bottom: 39px;
+		z-index: 5;
 	}
 
 	.tab-bars {
@@ -129,7 +141,7 @@
 
 		>view {
 			flex: 1;
-			text-align: center;
+			// text-align: center;
 
 			.line {
 				width: 50%;

pages/outsourcedInspection/consultation.vue

@@ -249,7 +249,7 @@
 		})
 		console.log("777")
 		uni.navigateTo({
-			url: "/pages/sorting/technicianOptions"
+			url: "/pages/outsourcedInspection/technicianOptions"
 		})
 	}
 </script>

pages/outsourcedInspection/technicianOptions.vue

@@ -2,20 +2,23 @@
 	<view class="page-container uni-column" style="position: absolute;left: 0;right: 0;top: 0;bottom: 0">
 		<view class="option-container uni-column" style="display: flex;">
 			<!-- tab-bar -->
-			<view class="tab-bars uni-row">
-				<view>
+			<view class="tab-bars">
+				<!-- 				<view style="text-align: center;">
 					<text style="font-weight: bold;">技术负责人</text>
 					<view class="line"></view>
+				</view> -->
+				<view class="search-container uni-row">
+					<input type="text" v-model="keywords" placeholder="请输入关键字" />
+					<view class="btn" @click="handleSearch()">搜索</view>
 				</view>
 			</view>
 			<!-- 搜索框 -->
-			<view class="search-container uni-row">
-				<input type="text" v-model="keywords" placeholder="请输入关键字" />
-				<view class="btn" @click="handleSearch()">搜索</view>
-			</view>
+
 
 		</view>
-		<view class="uni-row" style="background-color:#ffffff;height: 85%;padding-bottom: 12px;margin-top: 8px;">
+		<view class="uni-row" style=" background-color: rgb(255, 255, 255);
+    padding-bottom: 12px;
+    margin-top: 88px;overflow: auto;">
 			<view style="width: 100%;height: 100%;overflow: auto;">
 				<view v-if="optionList&& optionList.length == 0" style="align-items: center;margin-top: 30px">暂无技术员
 				</view>
@@ -118,10 +121,19 @@
 	}
 
 	.option-container {
-		height: 13%;
-		background-color: #ffffff;
-		padding: 24rpx;
-		border-radius: 12rpx;
+		// height: 13%;
+		// background-color: #ffffff;
+		// padding: 24rpx;
+		// border-radius: 12rpx;
+		background-color: #fff;
+		padding: .75rem;
+		border-radius: .375rem;
+		position: fixed;
+		top: 52px;
+		left: 12px;
+		right: 12px;
+		padding-bottom: 39px;
+		z-index: 5;
 	}
 
 	.tab-bars {
@@ -129,7 +141,7 @@
 
 		>view {
 			flex: 1;
-			text-align: center;
+			// text-align: center;
 
 			.line {
 				width: 50%;

pages/sorting/technicianOptions.vue

@@ -2,20 +2,23 @@
 	<view class="page-container uni-column" style="position: absolute;left: 0;right: 0;top: 0;bottom: 0">
 		<view class="option-container uni-column" style="display: flex;">
 			<!-- tab-bar -->
-			<view class="tab-bars uni-row">
-				<view>
+			<view class="tab-bars">
+				<!-- 				<view style="text-align: center;">
 					<text style="font-weight: bold;">技术负责人</text>
 					<view class="line"></view>
+				</view> -->
+				<view class="search-container uni-row">
+					<input type="text" v-model="keywords" placeholder="请输入关键字" />
+					<view class="btn" @click="handleSearch()">搜索</view>
 				</view>
 			</view>
 			<!-- 搜索框 -->
-			<view class="search-container uni-row">
-				<input type="text" v-model="keywords" placeholder="请输入关键字" />
-				<view class="btn" @click="handleSearch()">搜索</view>
-			</view>
+
 
 		</view>
-		<view class="uni-row" style="background-color:#ffffff;height: 85%;padding-bottom: 12px;margin-top: 8px;">
+		<view class="uni-row" style=" background-color: rgb(255, 255, 255);
+    padding-bottom: 12px;
+    margin-top: 88px;overflow: auto;">
 			<view style="width: 100%;height: 100%;overflow: auto;">
 				<view v-if="optionList&& optionList.length == 0" style="align-items: center;margin-top: 30px">暂无技术员
 				</view>
@@ -99,6 +102,7 @@
 	}
 
 	const handleOptionChecked = (data) => {
+		console.log(data)
 		uni.$emit('addTechnicianEvent', {
 			technicianId: data.userId,
 			technicianName: data.nickName
@@ -117,10 +121,19 @@
 	}
 
 	.option-container {
-		height: 13%;
-		background-color: #ffffff;
-		padding: 24rpx;
-		border-radius: 12rpx;
+		// height: 13%;
+		// background-color: #ffffff;
+		// padding: 24rpx;
+		// border-radius: 12rpx;
+		background-color: #fff;
+		padding: .75rem;
+		border-radius: .375rem;
+		position: fixed;
+		top: 52px;
+		left: 12px;
+		right: 12px;
+		padding-bottom: 39px;
+		z-index: 5;
 	}
 
 	.tab-bars {
@@ -128,7 +141,7 @@
 
 		>view {
 			flex: 1;
-			text-align: center;
+			// text-align: center;
 
 			.line {
 				width: 50%;