add母卷重量维护\烘烤区域母卷详情,修改烘烤工序、生箔工序

2025-06-26 19:44:08 +08:00
parent 23403350e5
commit 244fcbbaae
15 changed files with 779 additions and 195 deletions
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -133,7 +133,7 @@ uni-button:after {
 	box-shadow: 0px 3px 3px 0px rgba(160,160,160,0.20);
 }
 .zd_wrapper-1 {
-	padding: 0 14rpx;
+	padding: 0 14rpx 14rpx 14rpx;
 	border-radius: 0;
 }
 .zd_wrapper-2 {
@@ -160,7 +160,7 @@ uni-button:after {
 .filter_label {
 	// display: block;
 	// width: 140rpx;
-	line-height: 80rpx;
+	line-height: 54rpx;
 	font-size: 28rpx;
 	color: #323232;
 	// text-align:justify;
--- a/pages.json
+++ b/pages.json
@@ -393,6 +393,22 @@
            }
            
        }
+        ,{
+            "path" : "pages/SecondPhase/production/BakeDetail",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/production/MjWeight",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
    ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
--- a/pages/SecondPhase/production/BakeDetail.vue
+++ b/pages/SecondPhase/production/BakeDetail.vue
@@ -0,0 +1,248 @@
+<template>
+	<view class="zd_container">
+		<!-- <nav-bar title="烘烤区域母卷详情"></nav-bar> -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label">{{$t('filter.area')}}</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('grid.point-code')}}</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val1" />
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('grid.mother-roll-number')}}</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val2" />
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>{{$t('grid.point-code')}}</th>
+								<th>{{$t('grid.mother-roll-number')}}</th>
+								<th>{{$t('filter.area')}}</th>
+								<th>{{$t('grid.mother-roll-status')}}</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.container_name === pkId}">
+								<td>{{e.point_code}}</td>
+								<td>{{e.container_name}}</td>
+								<td>{{e.product_area}}</td>
+								<td>{{e.roll_status}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-7 btn-submit btn-success" @tap="searchList">{{$t('button.search')}}</button>
+			<button class="zd-col-7 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled1" @tap="_inCoolIvt">{{$t('button.quality-approved')}}</button>
+			<button class="zd-col-7 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled2" @tap="_inCoolOrOven">质检不合格</button>
+		</view>
+		<view class="msg_wrapper" :class="active ? 'popshow' : 'pophide'" style="height: auto">
+			<view class="pop-line"></view>
+			<view class="msg_content">
+				<view class="zd_wrapper zd_wrapper-1">
+					<view class="filter_item">
+						<view class="filter_label">{{$t('filter.temperature')}}</view>
+						<view class="filter_input_wraper">
+							<NumberInput
+							v-model="val3"
+							input-class="filter_input"
+							mode="mixed"
+							:decimalLength="3"
+							/>
+						</view>
+					</view>
+					<view class="filter_item">
+						<view class="filter_label">{{$t('filter.time')}}({{$t('unit.minute')}})</view>
+						<view class="filter_input_wraper">
+							<NumberInput
+							v-model="val4"
+							input-class="filter_input"
+							mode="integer"
+							/>
+						</view>
+					</view>
+					<view class="filter_item">
+						<view class="filter_label">去向</view>
+						<view class="filter_input_wraper">
+							<uni-data-select v-model="index1" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options1" placement="top"></uni-data-select>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="zd-row submitbar">
+				<button class="zd-col-11 btn-submit btn-default letter-30" @tap="cancleModal">{{$t('button.cancel')}}</button>
+				<button class="zd-col-11 btn-submit btn-success letter-30" @tap="modalToSure">{{$t('button.confirm')}}</button>
+			</view>
+		</view>
+		<view v-if="active" class="msg_mask"></view>
+		<up-top ref="UT" :scrollTop="top"></up-top>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import NumberInput from '@/components/NumberInput.vue'
+	import UpTop from '@/components/upTop.vue'
+	import {queryProductArea, inCoolIvt, inCoolOrOven} from '@/utils/getData1.js'
+	import {queryHotPoints} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox,
+			NumberInput,
+			UpTop
+		},
+		data() {
+			return {
+				title: '',
+				top: 0,
+				val1: '',
+				val2: '',
+				options: [],
+				index: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10,
+				disabled1: false,
+				disabled2: false,
+				active: false,
+				val3: '',
+				val4: '',
+				index1: '',
+				options1: [{value: '1', text: '入冷却'}, {value: '2', text: '入烘箱'}]
+			};
+		},
+		onPageScroll(e) {
+			this.$refs.UT.topData(e.scrollTop)
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._queryHotPoints()
+			this._queryProductArea()
+		},
+		methods: {
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._queryHotPoints()
+			},
+			/** 生产区域下拉框查询 */
+			async _queryProductArea () {
+				let res = await queryProductArea()
+				this.options = [...res.data]
+			},
+			/** 初始化查询 */
+			async _queryHotPoints () {
+				let res = await queryHotPoints(this.val1, this.val2, this.index, this.pageNum + '', this.pageSize + '')
+				this.totalCount = res.size
+				if (res.size > 0) {
+					const dataMap = res.data
+					this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+					this.reload = false
+				} else {
+					this.dataList = []
+				}
+				if (this.totalCount == this.dataList.length) {
+					this.reload = false
+					this.status = 'noMore'
+				}
+				
+			},
+			onReachBottom () {
+				if (this.totalCount > this.dataList.length) {
+					this.status = 'loading'
+					setTimeout(() => {
+						this.pageNum++
+						this._queryHotPoints()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.container_name ? '' : e.container_name
+				this.pkObj = this.pkId === e.container_name ? e : {}
+			},
+			async _inCoolIvt () {
+				this.disabled1 = true
+				if (!this.pkId) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await inCoolIvt(this.pkObj.point_code, this.pkObj.container_name)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.searchList()
+					this.disabled1 = false
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			_inCoolOrOven () {
+				if (this.pkId) {
+					this.active = true
+					this.disabled2 = true
+				}
+			},
+			cancleModal () {
+				this.val3 = ''
+				this.val4 = ''
+				this.index1 = ''
+				this.active = false
+				this.disabled2 = false
+			},
+			async modalToSure () {
+				try {
+					let res = await inCoolOrOven(this.pkObj.point_code, this.pkObj.container_name, this.val3, this.val4, this.index1)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.cancleModal()
+					this.searchList()
+				} catch (e) {
+					this.disabled2 = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+</style>
--- a/pages/SecondPhase/production/BakeProcess.vue
+++ b/pages/SecondPhase/production/BakeProcess.vue
@@ -43,28 +43,79 @@
 						/>
 					</view>
 				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-4 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
+			<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !val1 || !val2 || !val3 || !val4}" :disabled="disabled" @tap="_ovenInAndOut1('1')">{{$t('button.enter-box')}}</button>
+			<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="_ovenInAndOut2('2')">{{$t('button.out-box')}}</button>
+			<button class="zd-col-6 btn-submit btn-success" :disabled="disabled" @click="_inHotByPoint">定点入箱</button>
+		</view>
+		<view class="msg_wrapper" :class="active ? 'popshow' : 'pophide'" style="height: auto">
+			<view class="pop-line"></view>
+			<view class="msg_content">
+				<view class="zd_wrapper zd_wrapper-1">
 					<view class="filter_item">
-					<view class="filter_label">{{$t('filter.type')}}</view>
+						<view class="filter_label_wraper">
+							<span class="filter_label">{{$t('filter.starting-point')}}</span>
+						</view>
 						<view class="filter_input_wraper">
-						<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options"></uni-data-select>
+							<search-box v-model="val5"/>
+						</view>
+					</view>
+					<view class="filter_item">
+						<view class="filter_label_wraper">
+							<span class="filter_label">{{$t('grid.mother-roll-number')}}</span>
+						</view>
+						<view class="filter_input_wraper">
+							<search-box v-model="val6" />
+						</view>
+					</view>
+					<view class="filter_item">
+						<view class="filter_label">{{$t('filter.temperature')}}</view>
+						<view class="filter_input_wraper">
+							<NumberInput
+							v-model="val7"
+							input-class="filter_input"
+							mode="mixed"
+							:decimalLength="3"
+							/>
+						</view>
+					</view>
+					<view class="filter_item">
+						<view class="filter_label">{{$t('filter.time')}}({{$t('unit.minute')}})</view>
+						<view class="filter_input_wraper">
+							<NumberInput
+							v-model="val8"
+							input-class="filter_input"
+							mode="integer"
+							/>
+						</view>
+					</view>
+					<view class="filter_item">
+						<view class="filter_label_wraper">
+							<span class="filter_label">{{$t('filter.end')}}</span>
+						</view>
+						<view class="filter_input_wraper">
+							<search-box v-model="val9"/>
 						</view>
 					</view>
 				</view>
 			</view>
 			<view class="zd-row submitbar">
-			<button class="zd-col-5 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2 || !val3 || !val4}" :disabled="disabled" @tap="_ovenInAndOut1('1')">{{$t('button.enter-box')}}</button>
-			<button class="zd-col-5 btn-submit btn-success letter-30" :class="{'btn-info': !val1}" :disabled="disabled" @tap="_ovenInAndOut2('2')">{{$t('button.out-box')}}</button>
-			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled3" @tap="_inCoolIvt">{{$t('button.quality-approved')}}</button>
-			<button class="zd-col-5 btn-submit btn-success letter-30" :class="{'btn-info': !((val1 && val2 && index === '1') || (val1 && val2 && val3 && val4 && index === '2'))}" :disabled="disabled4" @tap="_inCoolOrOven">质检不合格</button>
+				<button class="zd-col-11 btn-submit btn-default letter-30" @tap="cancleModal">{{$t('button.cancel')}}</button>
+				<button class="zd-col-11 btn-submit btn-success letter-30" @tap="modalToSure">{{$t('button.confirm')}}</button>
 			</view>
 		</view>
+		<view v-if="active" class="msg_mask"></view>
+	</view>
 </template>

 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import NumberInput from '@/components/NumberInput.vue'
-	import {ovenInAndOut, inCoolIvt, bakingquery, inCoolOrOven} from '@/utils/getData1.js'
+	import {ovenInAndOut, bakingquery, inHotByPoint} from '@/utils/getData1.js'
 	export default {
 		components: {
 			NavBar,
@@ -78,11 +129,13 @@
 				val2: '',
 				val3: '',
 				val4: '',
-				index: '',
-				options: [{value: '1', text: '入冷却'}, {value: '2', text: '入烘箱'}],
 				disabled: false,
-				disabled3: false,
-				disabled4: false
+				active: false,
+				val5: '',
+				val6: '',
+				val7: '',
+				val8: '',
+				val9: ''
 			};
 		},
 		onLoad (options) {
@@ -112,11 +165,7 @@
 						title: res.message,
 						icon: 'none'
 					})
-					this.val1 = ''
-					this.val2 = ''
-					this.val3 = ''
-					this.val4 = ''
-					this.disabled = false
+					this.clearUp()
 				} catch (e) {
 					this.disabled = false
 				}
@@ -133,57 +182,42 @@
 						title: res.message,
 						icon: 'none'
 					})
+					this.clearUp()
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
 				this.val1 = ''
 				this.val2 = ''
 				this.val3 = ''
 				this.val4 = ''
 				this.disabled = false
+			},
+			_inHotByPoint () {
+				this.active = true
+				this.disabled = true
+			},
+			cancleModal () {
+				this.val5 = ''
+				this.val6 = ''
+				this.val7 = ''
+				this.val8 = ''
+				this.val9 = ''
+				this.active = false
+				this.disabled = false
+			},
+			async modalToSure () {
+				try {
+					let res = await inHotByPoint(this.val5, this.val6, this.val7, this.val8, this.val9)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.cancleModal()
 				} catch (e) {
 					this.disabled = false
 				}
-			},
-			async _inCoolIvt () {
-				this.disabled3 = true
-				if (!this.val1 || !this.val2) {
-					this.disabled3 = false
-					return
-				}
-				try {
-					let res = await inCoolIvt(this.val1, this.val2)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-					this.val1 = ''
-					this.val2 = ''
-					this.val3 = ''
-					this.val4 = ''
-					this.disabled3 = false
-				} catch (e) {
-					this.disabled3 = false
-				}
-			},
-			// 质检不合格
-			async _inCoolOrOven () {
-				this.disabled4 = true
-				if (!((this.val1 && this.val2 && this.index === '1') || (this.val1 && this.val2 && this.val3 && this.val4 && this.index === '2'))) {
-					this.disabled4 = false
-					return
-				}
-				try {
-					let res = await inCoolOrOven(this.val1, this.val2, this.val3, this.val4, this.index)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-					this.val1 = ''
-					this.val2 = ''
-					this.val3 = ''
-					this.val4 = ''
-					this.disabled4 = false
-				} catch (e) {
-					this.disabled4 = false
-				}
 			}
 		}
 	}
--- a/pages/SecondPhase/production/MjWeight.vue
+++ b/pages/SecondPhase/production/MjWeight.vue
@@ -0,0 +1,82 @@
+<template>
+	<view class="zd_container">
+		<!-- <nav-bar title="母卷重量维护"></nav-bar> -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('filter.mother-roll')}}</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val1" />
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">{{$t('grid.weight')}}</view>
+					<view class="filter_input_wraper">
+						<NumberInput
+						v-model="val2"
+						input-class="filter_input"
+						mode="integer"
+						/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
+			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1 && !val2}" :disabled="disabled" @tap="_confirmWeight">{{$t('button.confirm')}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import NumberInput from '@/components/NumberInput.vue'
+	import {confirmWeight} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox,
+			NumberInput
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			async _confirmWeight () {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await confirmWeight(this.val1, this.val2)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.clearUp()
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			
+			clearUp () {
+				this.val1 = ''
+				this.val2 = ''
+				this.disabled = false
+			}
+		}
+	}
+</script>
--- a/pages/SecondPhase/production/SboProcess.vue
+++ b/pages/SecondPhase/production/SboProcess.vue
@@ -17,6 +17,12 @@
 				</view>
 			</view>
 			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label">{{$t('filter.area')}}</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options"></uni-data-select>
+					</view>
+				</view>
 				<view class="filter_item">
 					<view class="filter_label">{{$t('filter.mother-roll')}}</view>
 					<view class="zd-row">
@@ -80,7 +86,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import UpTop from '@/components/upTop.vue'
-	import {queryRawFoilList, createOrder, confirmBlanking, rawScrollDowm} from '@/utils/getData1.js'
+	import {queryProductArea, queryRawFoilList, createOrder, confirmBlanking, rawScrollDowm} from '@/utils/getData1.js'
 	export default {
 		components: {
 			NavBar,
@@ -93,6 +99,8 @@
 				top: 0,
 				val1: '',
 				val2: '',
+				options: [],
+				index: '',
 				dataList: [],
 				pkId: '',
 				pkObj: {},
@@ -116,11 +124,17 @@
 		},
 		onLoad (options) {
 			this.title = options.title
+			this._queryProductArea()
 		},
 		onPageScroll(e) {
 			this.$refs.UT.topData(e.scrollTop)
 		},
 		methods: {
+			/** 生产区域下拉框查询 */
+			async _queryProductArea () {
+				let res = await queryProductArea()
+				this.options = [...res.data]
+			},
 			searchList () {
 				this.pkId = ''
 				this.pkObj = {}
@@ -131,7 +145,7 @@
 			},
 			// 查询列表
 			async _queryRawFoilList () {
-				let res = await queryRawFoilList(this.val1, this.val2, this.pageNum + '', this.pageSize + '')
+				let res = await queryRawFoilList(this.val1, this.index, this.val2, this.pageNum + '', this.pageSize + '')
 				this.totalCount = res.size
 				if (res.size > 0) {
 					const dataMap = res.data
--- a/uni_modules/uni-data-select/changelog.md
+++ b/uni_modules/uni-data-select/changelog.md
@@ -1,3 +1,30 @@
+## 1.0.10（2025-04-14）
+- 修复 清除按钮不展示问题
+## 1.0.9（2025-03-26）
+- 优化 默认背景为白色与整体组件保持风格统一
+## 1.0.8（2024-03-28）
+- 修复 在vue2下:style动态绑定导致编译失败的bug
+## 1.0.7（2024-01-20）
+- 修复 长文本回显超过容器的bug，超过容器部分显示省略号
+## 1.0.6（2023-04-12）
+- 修复 微信小程序点击时会改变背景颜色的 bug
+## 1.0.5（2023-02-03）
+- 修复 禁用时会显示清空按钮
+## 1.0.4（2023-02-02）
+- 优化 查询条件短期内多次变更只查询最后一次变更后的结果
+- 调整 内部缓存键名调整为 uni-data-select-lastSelectedValue
+## 1.0.3（2023-01-16）
+- 修复 不关联服务空间报错的问题
+## 1.0.2（2023-01-14）
+- 新增  属性 `format` 可用于格式化显示选项内容
+## 1.0.1（2022-12-06）
+- 修复  当where变化时，数据不会自动更新的问题
+## 0.1.9（2022-09-05）
+- 修复 微信小程序下拉框出现后选择会点击到蒙板后面的输入框
+## 0.1.8（2022-08-29）
+- 修复 点击的位置不准确
+## 0.1.7（2022-08-12）
+- 新增 支持 disabled 属性
 ## 0.1.6（2022-07-06）
 - 修复 pc端宽度异常的bug
 ## 0.1.5
--- a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
+++ b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -2,25 +2,27 @@
 	<view class="uni-stat__select">
 		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
 		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
-			<view class="uni-select">
+			<view class="uni-select" :class="{'uni-select--disabled':disabled}">
 				<view class="uni-select__input-box" @click="toggleSelector">
-					<view v-if="current" class="uni-select__input-text">{{current}}</view>
+					<view v-if="current" class="uni-select__input-text">{{textShow}}</view>
 					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
-					<uni-icons class="zd_icon_wraper" v-if="current && clear" type="clear" color="#c0c4cc" size="24" @click="clearVal" />
-					<uni-icons class="zd_icon_wraper" v-else :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
+					<view key="clear-button" v-if="current && clear && !disabled" @click.stop="clearVal">
+						<uni-icons type="clear" color="#c0c4cc" size="24" />
+					</view>
+					<view key="arrow-button" v-else>
+						<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
+					</view>
 				</view>
 				<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
-				<view class="uni-select__selector" v-if="showSelector">
-					<view class="uni-popper__arrow"></view>
-					<input v-if="searchInput === true" type="text" class="filter_input filter_input_s" :value="svalue" @input="handleInput($event)">
+				<view class="uni-select__selector" :style="getOffsetByPlacement" v-if="showSelector">
+					<view :class="placement=='bottom'?'uni-popper__arrow_bottom':'uni-popper__arrow_top'"></view>
 					<scroll-view scroll-y="true" class="uni-select__selector-scroll">
 						<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
 							<text>{{emptyTips}}</text>
 						</view>
-						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData"
-							:key="index" @click="change(item)">
-							<text
-								:class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData" :key="index"
+							@click="change(item)">
+							<text :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
 						</view>
 					</scroll-view>
 				</view>
@@ -40,21 +42,16 @@
 	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
 	 * @property {String} label 左侧标题
 	 * @property {String} placeholder 输入框的提示文字
+	 * @property {Boolean} disabled 是否禁用
+	 * @property {String} placement 弹出位置
+	 * 	@value top   		顶部弹出
+	 * 	@value bottom		底部弹出（default)
 	 * @event {Function} change  选中发生变化触发
 	 */

 	export default {
-		name: "uni-stat-select",
+		name: "uni-data-select",
 		mixins: [uniCloud.mixinDatacom || {}],
-		data() {
-			return {
-				showSelector: false,
-				current: '',
-				mixinDatacomResData: [],
-				apps: [],
-				channels: []
-			};
-		},
 		props: {
 			localdata: {
 				type: Array,
@@ -62,14 +59,6 @@
 					return []
 				}
 			},
-			searchInput: {
-				type: Boolean,
-				default: false
-			},
-			svalue: {
-				type: [String, Number],
-				default: ''
-			},
 			value: {
 				type: [String, Number],
 				default: ''
@@ -97,12 +86,37 @@
 			defItem: {
 				type: Number,
 				default: 0
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 格式化输出 用法 field="_id as value, version as text, uni_platform as label" format="{label} - {text}"
+			format: {
+				type: String,
+				default: ''
+			},
+			placement: {
+				type: String,
+				default: 'bottom'
 			}
 		},
+		data() {
+			return {
+				showSelector: false,
+				current: '',
+				mixinDatacomResData: [],
+				apps: [],
+				channels: [],
+				cacheKey: "uni-data-select-lastSelectedValue",
+			};
+		},
 		created() {
-			this.last = `${this.collection}_last_selected_option_value`
+			this.debounceGet = this.debounce(() => {
+				this.query();
+			}, 300);
 			if (this.collection && !this.localdata.length) {
-				this.mixinDatacomEasyGet()
+				this.debounceGet();
 			}
 		},
 		computed: {
@@ -117,8 +131,30 @@
 				return placeholder ?
 					common + placeholder :
 					common
+			},
+			valueCom() {
+				// #ifdef VUE3
+				return this.modelValue;
+				// #endif
+				// #ifndef VUE3
+				return this.value;
+				// #endif
+			},
+			textShow() {
+				// 长文本显示
+				let text = this.current;
+				return text;
+			},
+			getOffsetByPlacement() {
+				switch (this.placement) {
+					case 'top':
+						return "bottom:calc(100% + 12px);";
+					case 'bottom':
+						return "top:calc(100% + 12px);";
+				}
 			}
 		},
+
 		watch: {
 			localdata: {
 				immediate: true,
@@ -128,16 +164,9 @@
 					}
 				}
 			},
-			// #ifndef VUE3
-			value() {
+			valueCom(val, old) {
 				this.initDefVal()
 			},
-			// #endif
-			// #ifdef VUE3
-			modelValue() {
-				this.initDefVal()
-			},
-			// #endif
 			mixinDatacomResData: {
 				immediate: true,
 				handler(val) {
@@ -145,35 +174,51 @@
 						this.initDefVal()
 					}
 				}
-			}
+			},
+
 		},
 		methods: {
-			handleInput($event) {
-				this.$emit('input', $event.target.value)
-				this.$emit('handleChange', $event.target.value)
+			debounce(fn, time = 100) {
+				let timer = null
+				return function(...args) {
+					if (timer) clearTimeout(timer)
+					timer = setTimeout(() => {
+						fn.apply(this, args)
+					}, time)
+				}
+			},
+			// 执行数据库查询
+			query() {
+				this.mixinDatacomEasyGet();
+			},
+			// 监听查询条件变更事件
+			onMixinDatacomPropsChange() {
+				if (this.collection) {
+					this.debounceGet();
+				}
 			},
 			initDefVal() {
 				let defValue = ''
-				if ((this.value || this.value === 0) && !this.isDisabled(this.value)) {
-					defValue = this.value
-				} else if ((this.modelValue || this.modelValue === 0) && !this.isDisabled(this.modelValue)) {
-					defValue = this.modelValue
+				if ((this.valueCom || this.valueCom === 0) && !this.isDisabled(this.valueCom)) {
+					defValue = this.valueCom
 				} else {
 					let strogeValue
 					if (this.collection) {
-						strogeValue = uni.getStorageSync(this.last)
+						strogeValue = this.getCache()
 					}
 					if (strogeValue || strogeValue === 0) {
 						defValue = strogeValue
 					} else {
 						let defItem = ''
-						if (this.defItem > 0 && this.defItem < this.mixinDatacomResData.length) {
+						if (this.defItem > 0 && this.defItem <= this.mixinDatacomResData.length) {
 							defItem = this.mixinDatacomResData[this.defItem - 1].value
 						}
 						defValue = defItem
 					}
+					if (defValue || defValue === 0) {
 						this.emit(defValue)
 					}
+				}
 				const def = this.mixinDatacomResData.find(item => item.value === defValue)
 				this.current = def ? this.formatItemName(def) : ''
 			},
@@ -196,8 +241,9 @@

 			clearVal() {
 				this.emit('')
+				this.current = ''
 				if (this.collection) {
-					uni.removeStorageSync(this.last)
+					this.removeCache()
 				}
 			},
 			change(item) {
@@ -208,17 +254,19 @@
 				}
 			},
 			emit(val) {
-				this.$emit('change', val)
 				this.$emit('input', val)
 				this.$emit('update:modelValue', val)
+				this.$emit('change', val)
 				if (this.collection) {
-					uni.setStorageSync(this.last, val)
+					this.setCache(val);
 				}
 			},
-
 			toggleSelector() {
+				if (this.disabled) {
+					return
+				}
+
 				this.showSelector = !this.showSelector
-				this.$emit('showSelector', this.showSelector)
 			},
 			formatItemName(item) {
 				let {
@@ -227,6 +275,16 @@
 					channel_code
 				} = item
 				channel_code = channel_code ? `(${channel_code})` : ''
+
+				if (this.format) {
+					// 格式化输出
+					let str = "";
+					str = this.format;
+					for (let key in item) {
+						str = str.replace(new RegExp(`{${key}}`, "g"), item[key]);
+					}
+					return str;
+				} else {
 					return this.collection.indexOf('app-list') > 0 ?
 						`${text}(${value})` :
 						(
@@ -235,6 +293,32 @@
 							`未命名${channel_code}`
 						)
 				}
+			},
+			// 获取当前加载的数据
+			getLoadData() {
+				return this.mixinDatacomResData;
+			},
+			// 获取当前缓存key
+			getCurrentCacheKey() {
+				return this.collection;
+			},
+			// 获取缓存
+			getCache(name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				return cacheData[name];
+			},
+			// 设置缓存
+			setCache(value, name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				cacheData[name] = value;
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+			// 删除缓存
+			removeCache(name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				delete cacheData[name];
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
 		}
 	}
 </script>
@@ -245,7 +329,6 @@
 	$uni-secondary-color: #909399 !default;
 	$uni-border-3: #e5e5e5;

-
 	/* #ifndef APP-NVUE */
 	@media screen and (max-width: 500px) {
 		.hide-on-phone {
@@ -258,13 +341,16 @@
 		display: flex;
 		align-items: center;
 		// padding: 15px;
+		/* #ifdef H5 */
 		cursor: pointer;
+		/* #endif */
 		width: 100%;
 		flex: 1;
 		box-sizing: border-box;
 	}

 	.uni-stat-box {
+		background-color: #fff;
 		width: 100%;
 		flex: 1;
 	}
@@ -301,6 +387,11 @@
 		width: 100%;
 		flex: 1;
 		height: 35px;
+
+		&--disabled {
+			background-color: #f5f7fa;
+			cursor: not-allowed;
+		}
 	}

 	.uni-select__label {
@@ -312,7 +403,8 @@
 	}

 	.uni-select__input-box {
-		// height: 35px;
+		height: 35px;
+		width: 0px;
 		position: relative;
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -320,8 +412,6 @@
 		flex: 1;
 		flex-direction: row;
 		align-items: center;
-		justify-content: space-between;
-		overflow: hidden;
 	}

 	.uni-select__input {
@@ -341,14 +431,13 @@
 		box-sizing: border-box;
 		/* #endif */
 		position: absolute;
-		top: calc(100% + 12px);
 		left: 0;
 		width: 100%;
 		background-color: #FFFFFF;
 		border: 1px solid #EBEEF5;
 		border-radius: 6px;
 		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-		z-index: 2;
+		z-index: 3;
 		padding: 4px 0;
 	}

@@ -359,17 +448,24 @@
 		/* #endif */
 	}

+	/* #ifdef H5 */
+	@media (min-width: 768px) {
+		.uni-select__selector-scroll {
+			max-height: 600px;
+		}
+	}
+
+	/* #endif */
+
 	.uni-select__selector-empty,
 	.uni-select__selector-item {
 		/* #ifndef APP-NVUE */
 		display: flex;
-		align-items: center;
 		cursor: pointer;
 		/* #endif */
-		line-height: 15px;
-		height: 35px;
-		font-size: 12px;
-		text-align: left;
+		line-height: 35px;
+		font-size: 14px;
+		text-align: center;
 		/* border-bottom: solid 1px $uni-border-3; */
 		padding: 0px 10px;
 	}
@@ -391,8 +487,11 @@
 	}

 	/* picker 弹出层通用的指示小三角 */
-	.uni-popper__arrow,
-	.uni-popper__arrow::after {
+	.uni-popper__arrow_bottom,
+	.uni-popper__arrow_bottom::after,
+	.uni-popper__arrow_top,
+	.uni-popper__arrow_top::after,
+	{
 	position: absolute;
 	display: block;
 	width: 0;
@@ -402,7 +501,7 @@
 	border-width: 6px;
 	}

-	.uni-popper__arrow {
+	.uni-popper__arrow_bottom {
 		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
 		top: -6px;
 		left: 10%;
@@ -411,7 +510,7 @@
 		border-bottom-color: #EBEEF5;
 	}

-	.uni-popper__arrow::after {
+	.uni-popper__arrow_bottom::after {
 		content: " ";
 		top: 1px;
 		margin-left: -6px;
@@ -419,9 +518,27 @@
 		border-bottom-color: #fff;
 	}

+	.uni-popper__arrow_top {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		bottom: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-bottom-width: 0;
+		border-top-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow_top::after {
+		content: " ";
+		bottom: 1px;
+		margin-left: -6px;
+		border-bottom-width: 0;
+		border-top-color: #fff;
+	}
+
+
 	.uni-select__input-text {
 		// width: 280px;
-		width: calc(100% - 50px);
+		width: 100%;
 		color: $uni-main-color;
 		white-space: nowrap;
 		text-overflow: ellipsis;
@@ -429,11 +546,6 @@
 		overflow: hidden;
 	}

-	.zd_icon_wraper {
-		width: 50px;
-		text-align: right;
-	}
-
 	.uni-select__input-placeholder {
 		color: $uni-base-color;
 		font-size: 12px;
@@ -445,9 +557,6 @@
 		bottom: 0;
 		right: 0;
 		left: 0;
-	}
-	.filter_input_s {
-		width: calc(100% - 30rpx);
-		margin:  0 20rpx 0 10rpx;
+		z-index: 2;
 	}
 </style>
--- a/uni_modules/uni-data-select/package.json
+++ b/uni_modules/uni-data-select/package.json
@@ -1,7 +1,7 @@
 {
  "id": "uni-data-select",
  "displayName": "uni-data-select 下拉框选择器",
-  "version": "0.1.6",
+  "version": "1.0.10",
  "description": "通过数据驱动的下拉框选择器",
  "keywords": [
    "uni-ui",
@@ -17,11 +17,7 @@
  "directories": {
    "example": "../../temps/example_temps"
  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
+"dcloudext": {
    "sale": {
      "regular": {
        "price": "0.00"
@@ -38,7 +34,8 @@
      "data": "无",
      "permissions": "无"
    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
  },
  "uni_modules": {
    "dependencies": ["uni-load-more"],
@@ -46,12 +43,15 @@
    "platforms": {
      "cloud": {
        "tcb": "y",
-        "aliyun": "y"
+        "aliyun": "y",
+        "alipay": "n"
      },
      "client": {
        "App": {
-          "app-vue": "u",
-          "app-nvue": "n"
+            "app-vue": "y",
+            "app-nvue": "n",
+            "app-harmony": "u",
+            "app-uvue": "u"
        },
        "H5-mobile": {
          "Safari": "y",
--- a/uni_modules/uni-load-more/changelog.md
+++ b/uni_modules/uni-load-more/changelog.md
@@ -1,3 +1,9 @@
+## 1.3.6（2024-10-15）
+- 修复 微信小程序中的getSystemInfo警告
+## 1.3.5（2024-10-12）
+- 修复 微信小程序中的getSystemInfo警告
+## 1.3.4（2024-10-12）
+- 修复 微信小程序中的getSystemInfo警告
 ## 1.3.3（2022-01-20）
 - 新增 showText属性 ，是否显示文本
 ## 1.3.2（2022-01-19）
--- a/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
+++ b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
@@ -37,7 +37,12 @@
 <script>
 	let platform
 	setTimeout(() => {
+		// #ifdef MP-WEIXIN
+		platform = uni.getDeviceInfo().platform
+		// #endif
+		// #ifndef MP-WEIXIN
 		platform = uni.getSystemInfoSync().platform
+		// #endif
 	}, 16)

 	import {
--- a/uni_modules/uni-load-more/package.json
+++ b/uni_modules/uni-load-more/package.json
@@ -1,7 +1,7 @@
 {
  "id": "uni-load-more",
  "displayName": "uni-load-more 加载更多",
-  "version": "1.3.3",
+  "version": "1.3.6",
  "description": "LoadMore 组件，常用在列表里面，做滚动加载使用。",
  "keywords": [
    "uni-ui",
@@ -16,11 +16,7 @@
  "directories": {
    "example": "../../temps/example_temps"
  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
+"dcloudext": {
    "sale": {
      "regular": {
        "price": "0.00"
@@ -37,7 +33,8 @@
      "data": "无",
      "permissions": "无"
    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
  },
  "uni_modules": {
    "dependencies": ["uni-scss"],
@@ -45,7 +42,8 @@
    "platforms": {
      "cloud": {
        "tcb": "y",
-        "aliyun": "y"
+        "aliyun": "y",
+        "alipay": "n"
      },
      "client": {
        "App": {
--- a/utils/getData1.js
+++ b/utils/getData1.js
@@ -25,10 +25,11 @@ export const queryRawFoil = (pcode, cname, parea, page, size) => request({
 * 生箔工序
 */
 // 生箔工序初始化查询
-export const queryRawFoilList = (pcode, cname, page, size) => request({
+export const queryRawFoilList = (pcode, parea, cname, page, size) => request({
 	url: 'api/pda/raw/queryRawFoilList',
 	data: {
 		point_code: pcode,
+		product_area: parea,
 		container_name: cname,
 		page: page,
 		size: size
@@ -151,7 +152,18 @@ export const inCoolOrOven = (pcode, cname, temp, hours, type) => request({
 		container_name: cname,
 		temperature: temp,
 		hours: hours,
-		type: type,
+		type: type
+	}
+})
+// 定点入箱
+export const inHotByPoint = (code, cn, temp, hours, ncode) => request({
+	url: 'api/pda/baking/inHotByPoint',
+	data: {
+		point_code: code,
+		container_name: cn,
+		temperature: temp,
+		hours: hours,
+		next_point_code: ncode
 	}
 })

--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -588,3 +588,26 @@ export const rawQuery = (pcode, cname, parea, page, size) => request({
 		size: size
 	}
 })
+/**
+ * 烘烤区域母卷详情
+ */
+export const queryHotPoints = (pcode, cname, parea, page, size) => request({
+	url:'api/pda/baking/queryHotPoints',
+	data: {
+		point_code: pcode,
+		container_name: cname,
+		product_area: parea,
+		page: page,
+		size: size
+	}
+})
+/**
+ * 母卷重量维护
+ */
+export const confirmWeight = (cname, weight) => request({
+	url:'api/pda/raw/confirmWeight',
+	data: {
+		container_name: cname,
+		weight: weight
+	}
+})
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -18,6 +18,7 @@ export const allAuthority = () => {
 				{menu_id: '1', title: '生箔生产进度', path: '/pages/SecondPhase/production/SboProdProgress'},
 				{menu_id: '2', title: '生箔工序', path: '/pages/SecondPhase/production/SboProcess'},
 				{menu_id: '3', title: '烘烤工序', path: '/pages/SecondPhase/production/BakeProcess'},
+				{menu_id: '3', title: '烘烤区域母卷详情', path: '/pages/SecondPhase/production/BakeDetail'},
 				// {menu_id: '4', title: '表处工序', path: '/pages/SecondPhase/production/SurfaceProcess'},
 				{menu_id: '5', title: '人工烘烤', path: '/pages/SecondPhase/production/ManmadeBake'},
 				{menu_id: '6', title: '子卷质检', path: '/pages/SecondPhase/production/ZjCheck'},
@@ -27,7 +28,8 @@ export const allAuthority = () => {
 				{menu_id: '8', title: '子卷入库', path: '/pages/SecondPhase/production/ZjInStore'},
 				{menu_id: '8', title: '标签打印', path: '/pages/SecondPhase/production/PrintTable'},
 				{menu_id: '8', title: '母卷决策', path: '/pages/SecondPhase/production/MjMake'},
-				{menu_id: '8', title: '冷却区生箔详情', path: '/pages/SecondPhase/production/SboCool'}
+				{menu_id: '8', title: '冷却区生箔详情', path: '/pages/SecondPhase/production/SboCool'},
+				{menu_id: '8', title: '母卷重量维护', path: '/pages/SecondPhase/production/MjWeight'},
 			]},
 			{menu_id: '5', path: 'RF03', title: '分切管理', sonTree: [
 				{menu_id: '1', title: '分切上料', path: '/pages/SecondPhase/slitting/SlittingFeeding'},
@@ -221,3 +223,11 @@ export const showManualView = (code) => {
 	let res = [{resource_name: 'B60FQ00003', up_or_down: '1', qzz_size: '6', status: '01', qzz_generation: '5', start_time: '2025-03-11 15:24:26'}]
 	return res
 }
+export const queryHotPoints = () => {
+	let res = {
+		"data":[{"container_name":"2222222","product_area":"A4","point_code":"A4_HK_01_3","roll_status":"未烘烤"}],
+		"size":"1",
+		"message":"查询成功!",
+		}
+	return res
+}