root/hht-ynhl-one-uni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

生箔工序修改

Browse Source
This commit is contained in:
caill
2025-06-24 16:46:15 +08:00
parent ba77ea34ba
commit 4c926e91fc
2 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pages/SecondPhase/production/SboProcess.vue
View File

@@ -11,8 +11,9 @@
</view> </view>
</view> </view>
<view class="zd-row jccenter mgt20"> <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-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-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 === '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> </view>
<view class="zd_wrapper"> <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"/> <uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
</view> </view>
<view class="zd-row submitbar"> <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-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-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled3" @tap="_rawStart">{{$t('button.start-work-order')}}</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>
<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>
</view> </view>
<up-top ref="UT" :scrollTop="top"></up-top> <up-top ref="UT" :scrollTop="top"></up-top>
</view> </view>
@@ -81,7 +80,7 @@
import NavBar from '@/components/NavBar.vue' import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue' import SearchBox from '@/components/SearchBox.vue'
import UpTop from '@/components/upTop.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 { export default {
components: { components: {
NavBar, NavBar,
@@ -161,12 +160,12 @@
// 准备就绪 // 准备就绪
async _confirmBlanking () { async _confirmBlanking () {
this.disabled2 = true this.disabled2 = true
if (!this.pkId) { if (!this.val1) {
this.disabled2 = false this.disabled2 = false
return return
} }
try { try {
let res = await confirmBlanking(this.pkObj) let res = await confirmBlanking(this.val1)
this.disabled2 = false this.disabled2 = false
this.pkId = '' this.pkId = ''
this.pkObj = {} this.pkObj = {}
@@ -179,27 +178,6 @@
this.disabled2 = false 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) { async _rawScrollDowm (type) {
this.disabled4 = true this.disabled4 = true

4
utils/getData1.js
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', url: 'api/pda/raw/confirmBlanking',
data: { data: {
raw_jo: rjo point_code: code
} }
}) })
// 开始工单 // 开始工单