添加功能

2025-12-01 13:13:30 +08:00
parent a6e2ba107f
commit 702f6e6534
3 changed files with 47 additions and 10 deletions
--- a/pages/manage/bake-process.vue
+++ b/pages/manage/bake-process.vue
@@ -42,6 +42,17 @@
 					</view>
 					<uni-icons type="right" size="14" color="#999"></uni-icons>
 				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">幅宽</span>
+					</view>
+					<view class="zd-col-17 filter_picker">
+						<picker @change="pickerChange2" :value="index2" :range="options2" range-key="text">
+							<view class="uni-input">{{index2 !== '' ? options2[index2].text : ''}}</view>
+						</picker>
+					</view>
+					<uni-icons type="right" size="14" color="#999"></uni-icons>
+				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-5">
 						<span class="filter_label">是否烘烤</span>
@@ -93,7 +104,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-4 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !val5 || index1 === '' || !val3 || !val4 || !val2}" :disabled="disabled" @tap="_doModifyRawInfos">修改信息</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !val5 || index1 === '' || index2 === '' || !val3 || !val4 || !val2}" :disabled="disabled" @tap="_doModifyRawInfos">修改信息</button>
 			<button class="zd-col-6 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_bakingQuality('1')">质检合格</button>
 			<button class="zd-col-6 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_bakingQuality('0')">再次烘烤</button>
 		</view>
@@ -116,6 +127,8 @@
 				val2: '',
 				options1: [{value: '1', text: '大卷'}, {value: '2', text: '小卷'}],
 				index1: '',
+				options2: [{value: '1', text: '幅宽大于1550'}, {value: '0', text: '幅宽小于1550'}],
+				index2: '',
 				isChecked: false,
 				val3: '',
 				val4: '',
@@ -148,6 +161,9 @@
 			pickerChange (e) {
 				this.index1 = e.detail.value
 			},
+			pickerChange2 (e) {
+				this.index2 = e.detail.value
+			},
 			setWStatus () {
 				this.isChecked = !this.isChecked
 			},
@@ -155,6 +171,7 @@
 				this.val1 = ''
 				this.val2 = ''
 				this.index1 = ''
+				this.index2 = ''
 				this.isChecked = false
 				this.val3 = ''
 				this.val4 = ''
@@ -181,13 +198,13 @@
 			},
 			async _doModifyRawInfos () {
 				this.disabled = true
-				if (!this.val1 || !this.val5 || this.index1 === '' || !this.val3 || !this.val4 || !this.val2) {
+				if (!this.val1 || !this.val5 || this.index1 === '' || this.index2 === '' || !this.val3 || !this.val4 || !this.val2) {
 					this.disabled = false
 					return
 				}
 				try {
 					let checked = this.isChecked ? '1' : '0'
-					let res = await doModifyRawInfos(this.val1, this.val2, this.options1[this.index1].value, checked, this.val3, this.val4, this.val5)
+					let res = await doModifyRawInfos(this.val1, this.val2, this.options1[this.index1].value, checked, this.val3, this.val4, this.val5, this.options2[this.index2].value)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,
--- a/pages/manage/raw-foil-progess.vue
+++ b/pages/manage/raw-foil-progess.vue
@@ -53,6 +53,17 @@
 					</view>
 					<uni-icons type="right" size="14" color="#999"></uni-icons>
 				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">幅宽</span>
+					</view>
+					<view class="zd-col-17 filter_picker">
+						<picker @change="pickerChange2" :value="index2" :range="options2" range-key="text">
+							<view class="uni-input">{{index2 !== '' ? options2[index2].text : ''}}</view>
+						</picker>
+					</view>
+					<uni-icons type="right" size="14" color="#999"></uni-icons>
+				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
 						<span class="filter_label">温度</span>
@@ -91,7 +102,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-8 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_needEmptyAxisv2">生箔下料</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !val2 || index2 === ''}" :disabled="disabled" @tap="_needEmptyAxisv2">生箔下料</button>
 		</view>
 	</view>
 </template>
@@ -114,6 +125,8 @@
 				val5: '',
 				options1: [{value: '1', text: '大卷'}, {value: '2', text: '小卷'}],
 				index1: '',
+				options2: [{value: '1', text: '幅宽大于1550'}, {value: '0', text: '幅宽小于1550'}],
+				index2: '',
 				temperature: null,
 				time: null,
 				isChecked: false,
@@ -130,6 +143,9 @@
 			pickerChange (e) {
 				this.index1 = e.detail.value
 			},
+			pickerChange2 (e) {
+				this.index2 = e.detail.value
+			},
 			clearUp () {
 				this.val1 = ''
 				this.val2 = ''
@@ -140,6 +156,7 @@
 				this.index1 = ''
 				this.temperature = null
 				this.time = null
+				this.index2 = ''
 			},
 			async _needEmptyVehicle () {
 				this.disabled = true
@@ -177,13 +194,14 @@
 			},
 			async _needEmptyAxisv2 () {
 				this.disabled = true
-				if (!this.val1 || !this.val2) {
+				if (!this.val1 || !this.val2 || this.index2 === '') {
 					this.disabled = false
 					return
 				}
 				try {
 					let checked = this.isChecked ? '1' : '0'
-					let res = await needEmptyAxisv2(this.val1, this.val2, checked, this.val4, this.val5, this.options1[this.index1].value, this.temperature, this.time)
+					let index1 = this.index1 === '' ? '' : this.options1[this.index1].value
+					let res = await needEmptyAxisv2(this.val1, this.val2, checked, this.val4, this.val5, index1, this.temperature, this.time, this.options2[this.index2].value)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -170,7 +170,7 @@ export const necessaryEmptyVehicle = (code) => request({
 	url:'api/pda/raw/necessaryEmptyVehicle',
 	data: {point_code: code}
 })
-export const needEmptyAxisv2 = (code, order, is, height, qty, type, temperature, time) => request({
+export const needEmptyAxisv2 = (code, order, is, height, qty, type, temperature, time, isW) => request({
 	url:'api/pda/raw/needEmptyAxis/v2',
 	data: {
 		point_code: code,
@@ -180,7 +180,8 @@ export const needEmptyAxisv2 = (code, order, is, height, qty, type, temperature,
 		productin_qty: qty,
 		roll_type: type,
 		temperature: temperature,
-		time: time
+		time: time,
+		is_width: isW
 	}
 })
 export const confirmBlanking = (code, option) => request({
@@ -192,7 +193,7 @@ export const getHotTempPointInfo = (code, order) => request({
 	url:'api/pda/baking/getHotTempPointInfo',
 	data: {point_code: code, order_code: order}
 })
-export const doModifyRawInfos = (code, order, type, is, temperature, time, roll) => request({
+export const doModifyRawInfos = (code, order, type, is, temperature, time, roll, isW) => request({
 	url:'api/pda/baking/doModifyRawInfos',
 	data: {
 		point_code: code,
@@ -201,7 +202,8 @@ export const doModifyRawInfos = (code, order, type, is, temperature, time, roll)
 		is_baking: is,
 		temperature: temperature,
 		time: time,
-		roll_code: roll
+		roll_code: roll,
+		is_width: isW
 	}
 })
 export const bakingQuality = (code, quality) => request({