增加需求

This commit is contained in:
2025-11-13 10:23:33 +08:00
parent 7c8b5758fd
commit 4818bf0146
3 changed files with 62 additions and 16 deletions

View File

@@ -47,7 +47,7 @@
<span class="filter_label">是否烘烤</span>
</view>
<view class="relative zd-col-19">
<switch :checked="isChecked" color="#6798ef" style="transform:scale(0.8)"/>
<switch :checked="isChecked" color="#6798ef"/>
<text @tap="setWStatus" style="position: absolute;display: inline-block;width: 52px; height: 32px;left: 0;"></text>
</view>
</view>

View File

@@ -35,20 +35,41 @@
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">收卷辊</span>
<span class="filter_label">呼叫收卷辊</span>
</view>
<view class="zd-col-17">
<input v-model="val3" type="text" class="filter_input">
<view class="relative zd-col-17">
<switch :checked="isChecked" color="#6798ef"/>
<text @tap="setWStatus" style="position: absolute;display: inline-block;width: 52px; height: 32px;left: 0;"></text>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">呼叫收卷辊</span>
<span class="filter_label">/小卷</span>
</view>
<view class="relative zd-col-17">
<switch :checked="isChecked" color="#6798ef" style="transform:scale(0.8)"/>
<text @tap="setWStatus" style="position: absolute;display: inline-block;width: 52px; height: 32px;left: 0;"></text>
<view class="zd-col-17 filter_picker">
<picker @change="pickerChange" :value="index1" :range="options1" range-key="text">
<view class="uni-input">{{index1 !== '' ? options1[index1].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>
</view>
<view class="zd-col-14">
<input v-model="temperature" type="number" class="filter_input">
</view>
<view class="zd-col-3 filter_label"></view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">时间</span>
</view>
<view class="zd-col-14">
<input v-model="time" type="number" class="filter_input">
</view>
<view class="zd-col-3 filter_label">小时</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
@@ -70,7 +91,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 || !val3 || !val2}" :disabled="disabled" @tap="_needEmptyAxisv2">生箔下料</button>
<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !val2 || index1 === '' || !temperature || !time}" :disabled="disabled" @tap="_needEmptyAxisv2">生箔下料</button>
</view>
</view>
</template>
@@ -89,9 +110,12 @@
title: '',
val1: '',
val2: '',
val3: '',
val4: '',
val5: '',
options1: [{value: '1', text: '大卷'}, {value: '2', text: '小卷'}],
index1: '',
temperature: null,
time: null,
isChecked: false,
disabled: false
};
@@ -103,14 +127,19 @@
setWStatus () {
this.isChecked = !this.isChecked
},
pickerChange (e) {
this.index1 = e.detail.value
},
clearUp () {
this.val1 = ''
this.val2 = ''
this.val3 = ''
this.isChecked = false
this.disabled = false
this.val4 = ''
this.val5 = ''
this.index1 = ''
this.temperature = null
this.time = null
},
async _needEmptyVehicle () {
this.disabled = true
@@ -148,13 +177,13 @@
},
async _needEmptyAxisv2 () {
this.disabled = true
if (!this.val1 || !this.val3 || !this.val2) {
if (!this.val1 || !this.val2 || this.index1 === '' || !this.temperature || !this.time) {
this.disabled = false
return
}
try {
let checked = this.isChecked ? '1' : '0'
let res = await needEmptyAxisv2(this.val1, this.val2, checked, this.val3, this.val4, this.val5)
let res = await needEmptyAxisv2(this.val1, this.val2, checked, this.val4, this.val5, this.options1[this.index1].value, this.temperature, this.time)
this.clearUp()
uni.showToast({
title: res.message,

View File

@@ -170,9 +170,18 @@ export const necessaryEmptyVehicle = (code) => request({
url:'api/pda/raw/necessaryEmptyVehicle',
data: {point_code: code}
})
export const needEmptyAxisv2 = (code, order, is, roll, height, qty) => request({
export const needEmptyAxisv2 = (code, order, is, height, qty, type, temperature, time) => request({
url:'api/pda/raw/needEmptyAxis/v2',
data: {point_code: code, order_code: order, is_call_empty: is, roll_code: roll, theory_height: height, productin_qty: qty}
data: {
point_code: code,
order_code: order,
is_call_empty: is,
theory_height: height,
productin_qty: qty,
roll_type: type,
temperature: temperature,
time: time
}
})
export const confirmBlanking = (code, option) => request({
url:'api/pda/raw/confirmBlanking',
@@ -185,7 +194,15 @@ export const getHotTempPointInfo = (code, order) => request({
})
export const doModifyRawInfos = (code, order, type, is, temperature, time, roll) => request({
url:'api/pda/baking/doModifyRawInfos',
data: {point_code: code, order_code: order, roll_type: type, is_baking: is, temperature: temperature, time: time, roll_code: roll}
data: {
point_code: code,
order_code: order,
roll_type: type,
is_baking: is,
temperature: temperature,
time: time,
roll_code: roll
}
})
export const bakingQuality = (code, quality) => request({
url:'api/pda/baking/bakingQuality',