This commit is contained in:
2025-06-24 16:51:48 +08:00
21 changed files with 87 additions and 42 deletions

View File

@@ -73,6 +73,7 @@
title: res.message,
icon: 'none'
})
this.clearUp()
this.disabled = false
} catch (e) {
this.disabled = false

View File

@@ -75,6 +75,7 @@
})
this.val1 = ''
this.disabled = false
this.clearUp()
} catch (e) {
this.disabled = false
}

View File

@@ -82,6 +82,7 @@
title: res.message,
icon: 'none'
})
this.clearUp()
this.disabled = false
} catch (e) {
this.disabled = false

View File

@@ -100,6 +100,7 @@
this.index = e
},
async _queryBoxIvt () {
this.dataList = []
try {
let res = await queryBoxIvt(this.val1, this.val2, this.val3)
this.dataList = [...res.data]

View File

@@ -65,6 +65,8 @@
}
try {
let res = await abnormalOut(this.val1, this.val2)
this.val1 = ''
this.val2 = ''
this.disabled1 = false
uni.showToast({
title: res.message,

View File

@@ -65,6 +65,7 @@
title: res.message,
icon: 'none'
})
this.clearUp()
this.disabled = false
} catch (e) {
this.disabled = false
@@ -81,6 +82,7 @@
title: res.message,
icon: 'none'
})
this.clearUp()
this.disabled = false
this.btn_active = false
} catch (e) {

View File

@@ -23,13 +23,24 @@
<view class="filter_item">
<view class="filter_label">{{$t('filter.temperature')}}</view>
<view class="filter_input_wraper">
<input type="number" class="filter_input" v-model="val3">
<!-- <input type="number" class="filter_input" v-model="val3"> -->
<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">
<input type="number" class="filter_input" v-model="val4">
<!-- <input type="number" class="filter_input" v-model="val4"> -->
<NumberInput
v-model="val4"
input-class="filter_input"
mode="integer"
/>
</view>
</view>
<view class="filter_item">
@@ -52,11 +63,13 @@
<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'
export default {
components: {
NavBar,
SearchBox
SearchBox,
NumberInput
},
data() {
return {
@@ -141,6 +154,10 @@
title: res.message,
icon: 'none'
})
this.val1 = ''
this.val2 = ''
this.val3 = ''
this.val4 = ''
this.disabled3 = false
} catch (e) {
this.disabled3 = false
@@ -159,6 +176,10 @@
title: res.message,
icon: 'none'
})
this.val1 = ''
this.val2 = ''
this.val3 = ''
this.val4 = ''
this.disabled4 = false
} catch (e) {
this.disabled4 = false

View File

@@ -28,8 +28,8 @@
<tr v-for="(e, i) in dataList" :key="i">
<td>{{e.box_no}}</td>
<td>{{e.material_code}}</td>
<td>{{e.material_name}}</td>
<td>{{e.struct_code}}</td>
<td>{{e.material_name}}</td>
</tr>
</tbody>
</table>

View File

@@ -23,13 +23,24 @@
<view class="filter_item">
<view class="filter_label">{{$t('filter.temperature')}}</view>
<view class="filter_input_wraper">
<input type="text" class="filter_input" v-model="val3">
<!-- <input type="text" class="filter_input" v-model="val3"> -->
<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')}}</view>
<view class="filter_input_wraper">
<input type="text" class="filter_input" v-model="val4">
<!-- <input type="text" class="filter_input" v-model="val4"> -->
<NumberInput
v-model="val4"
input-class="filter_input"
mode="integer"
/>
</view>
</view>
<view class="filter_item">
@@ -53,11 +64,13 @@
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import NumberInput from '@/components/NumberInput.vue'
import {handleBakingovenInAndOut, handleBakingcheckConfirm, bakingquery} from '@/utils/getData1.js'
export default {
components: {
NavBar,
SearchBox
SearchBox,
NumberInput
},
data() {
return {

View File

@@ -11,8 +11,9 @@
</view>
</view>
<view class="zd-row jccenter mgt20">
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="val1 && type === '2' && disabled4" style="margin-right: 15px" @tap="_rawScrollDowm('2')">{{$t('button.upper-axis')}}</button>
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="val1 && type === '4' && disabled4" @tap="_rawScrollDowm('4')">{{$t('button.lower-axis')}}</button>
<button class="zd-col-7 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="val1 && type === '2' && disabled4" style="margin-right: 15px" @tap="_rawScrollDowm('2')">{{$t('button.upper-axis')}}</button>
<button class="zd-col-7 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="val1 && type === '4' && disabled4" @tap="_rawScrollDowm('4')">{{$t('button.lower-axis')}}</button>
<button class="zd-col-7 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled2" @tap="_confirmBlanking">{{$t('button.ready-to-go')}}</button>
</view>
</view>
<view class="zd_wrapper">
@@ -68,10 +69,8 @@
<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-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled2" @tap="_confirmBlanking">{{$t('button.ready-to-go')}}</button>
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled3" @tap="_rawStart">{{$t('button.start-work-order')}}</button>
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="type === '1' && disabled4" @tap="_rawScrollDowm('1')">{{$t('button.roll-down')}}</button>
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="type === '3' && disabled4" @tap="_rawScrollDowm('3')">{{$t('button.single-volume')}}</button>
<button class="zd-col-11 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="type === '1' && disabled4" @tap="_rawScrollDowm('1')">{{$t('button.roll-down')}}</button>
<button class="zd-col-11 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="type === '3' && disabled4" @tap="_rawScrollDowm('3')">{{$t('button.single-volume')}}</button>
</view>
<up-top ref="UT" :scrollTop="top"></up-top>
</view>
@@ -81,7 +80,7 @@
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import UpTop from '@/components/upTop.vue'
import {queryRawFoilList, createOrder, confirmBlanking, rawStart, rawScrollDowm} from '@/utils/getData1.js'
import {queryRawFoilList, createOrder, confirmBlanking, rawScrollDowm} from '@/utils/getData1.js'
export default {
components: {
NavBar,
@@ -161,12 +160,12 @@
// 准备就绪
async _confirmBlanking () {
this.disabled2 = true
if (!this.pkId) {
if (!this.val1) {
this.disabled2 = false
return
}
try {
let res = await confirmBlanking(this.pkObj)
let res = await confirmBlanking(this.val1)
this.disabled2 = false
this.pkId = ''
this.pkObj = {}
@@ -179,27 +178,6 @@
this.disabled2 = false
}
},
// 开始工单
async _rawStart () {
this.disabled3 = true
if (!this.pkId) {
this.disabled3 = false
return
}
try {
let res = await rawStart(this.pkObj)
this.disabled3 = false
this.pkId = ''
this.pkObj = {}
this.searchList()
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled3 = false
}
},
// 正常下卷/单下卷/单上轴/单下轴
async _rawScrollDowm (type) {
this.disabled4 = true

View File

@@ -69,6 +69,7 @@
title: res.message,
icon: 'none'
})
this.cleanUp()
} catch (e) {
this.disabled = false
}
@@ -82,6 +83,7 @@
title: res.message,
icon: 'none'
})
this.cleanUp()
} catch (e) {
this.disabled = false
}

View File

@@ -135,6 +135,7 @@
title: res.message,
icon: 'none'
})
this.clearUp()
this.disabled = false
} catch (e) {
this.disabled = false

View File

@@ -196,6 +196,7 @@
try {
let res = await forcedFeedShaft(this.index1, deviceT, this.index2, upLT, this.upL, upRT, this.upR, lowLT, this.lowL, lowRT, this.lowR)
this.disabled = false
this.dataList = []
uni.showToast({
title: res.message,
icon: 'none'

View File

@@ -76,6 +76,7 @@
title: res.message,
icon: 'none'
})
this.index = ''
this.disabled = false
} catch (e) {
this.disabled = false

View File

@@ -153,6 +153,7 @@
title: res.message,
icon: 'none'
})
this.clearUp()
this.disabled = false
} catch (e) {
this.disabled = false

View File

@@ -101,6 +101,7 @@
title: res.message,
icon: 'none'
})
this.clearUp()
this.disabled = false
} catch (e) {
this.disabled = false

View File

@@ -52,6 +52,7 @@
title: res.message,
icon: 'none'
})
this.clearUp()
this.disabled = false
} catch (e) {
this.disabled = false

View File

@@ -64,6 +64,7 @@
title: res.message,
icon: 'none'
})
this.clearUp()
this.disabled = false
} catch (e) {
this.disabled = false
@@ -81,6 +82,7 @@
title: res.message,
icon: 'none'
})
this.clearUp()
this.disabled = false
} catch (e) {
this.disabled = false

View File

@@ -17,7 +17,13 @@
<span class="filter_label">{{$t('filter.chipweight')}}</span>
</view>
<view class="filter_input_wraper">
<input type="number" class="filter_input" v-model="val2">
<!-- <input type="number" class="filter_input" v-model="val2"> -->
<NumberInput
v-model="val2"
input-class="filter_input"
mode="decimal"
:decimalLength="3"
/>
</view>
</view>
<view class="filter_item">
@@ -25,7 +31,13 @@
<span class="filter_label">{{$t('grid.sub-roll-weight')}}</span>
</view>
<view class="filter_input_wraper">
<input type="number" class="filter_input" v-model="val3">
<!-- <input type="number" class="filter_input" v-model="val3"> -->
<NumberInput
v-model="val3"
input-class="filter_input"
mode="decimal"
:decimalLength="3"
/>
</view>
</view>
<view class="msg_item">{{$t('grid.tip')}}{{obj.tip}}</view>
@@ -41,11 +53,13 @@
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import NumberInput from '@/components/NumberInput.vue'
import {doSubRollWeightBindingTip, doSubRollWeightBinding} from '@/utils/getData3.js'
export default {
components: {
NavBar,
SearchBox
SearchBox,
NumberInput
},
data() {
return {

View File

@@ -136,6 +136,7 @@
title: res.message,
icon: 'none'
})
this.clearUp()
this.disabled = false
} catch (e) {
this.disabled = false

View File

@@ -50,10 +50,10 @@ export const createOrder = (code, name) => request({
}
})
// 确认下卷-改为:准备就绪
export const confirmBlanking = (rjo) => request({
export const confirmBlanking = (code) => request({
url: 'api/pda/raw/confirmBlanking',
data: {
raw_jo: rjo
point_code: code
}
})
// 开始工单