修改空轴退回，删除空轴绑定130
This commit is contained in:
@@ -2,8 +2,8 @@
|
||||
"name" : "海亮铜箔",
|
||||
"appid" : "__UNI__3A002CD",
|
||||
"description" : "海亮铜箔二期手持系统",
|
||||
"versionName" : "1.2.9",
|
||||
"versionCode" : 129,
|
||||
"versionName" : "1.3.0",
|
||||
"versionCode" : 130,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关 */
|
||||
"app-plus" : {
|
||||
|
||||
@@ -678,14 +678,6 @@
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
|
||||
}
|
||||
,{
|
||||
"path" : "pages/SecondPhase/slitting/EmptyAxisBind",
|
||||
"style" :
|
||||
{
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
|
||||
}
|
||||
,{
|
||||
"path" : "pages/SecondPhase/slitting/EmptyAxisReturn",
|
||||
|
||||
@@ -1,115 +0,0 @@
|
||||
<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">分切暂存位</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">气胀轴规格</span>
|
||||
</view>
|
||||
<view class="filter_input_wraper">
|
||||
<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row submitbar">
|
||||
<button class="zd-col-5 btn-submit btn-default" @tap="clearUp">清空</button>
|
||||
<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1 || !index1}" @tap="toSure1">清除</button>
|
||||
<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1 || !index1}" @tap="toSure3">气胀轴绑定</button>
|
||||
</view>
|
||||
<uni-popup ref="alertDialog" type="dialog">
|
||||
<uni-popup-dialog type="info" cancelText="关闭" confirmText="确定" title="提示" :content="content" @confirm="dialogConfirm"></uni-popup-dialog>
|
||||
</uni-popup>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import {toCleanCutCacheInventory, slitterShaftBinding} from '@/utils/getData3.js'
|
||||
export default {
|
||||
components: {
|
||||
NavBar,
|
||||
SearchBox
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
title: '',
|
||||
val1: '',
|
||||
options1: [{text: '3寸4代', value: '3-4'}, {text: '3寸5代', value: '3-5'}, {text: '6寸5代', value: '6-5'}],
|
||||
index1: '',
|
||||
content: '',
|
||||
type: ''
|
||||
};
|
||||
},
|
||||
onLoad (options) {
|
||||
this.title = options.title
|
||||
},
|
||||
methods: {
|
||||
selectChange1(e) {
|
||||
this.index1 = e
|
||||
},
|
||||
dialogConfirm () {
|
||||
if (this.type === 1) {
|
||||
this._toCleanCutCacheInventory()
|
||||
} else if (this.type === 3) {
|
||||
this._slitterShaftBinding()
|
||||
}
|
||||
},
|
||||
toSure1 () {
|
||||
if (!this.val1) {
|
||||
return
|
||||
}
|
||||
this.content = '确认是否清除点位数据？'
|
||||
this.type = 1
|
||||
this.$refs.alertDialog.open()
|
||||
},
|
||||
async _toCleanCutCacheInventory () {
|
||||
try {
|
||||
let res = await toCleanCutCacheInventory(this.val1)
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
icon: 'none'
|
||||
})
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
}
|
||||
},
|
||||
toSure3 () {
|
||||
if (!this.val1 || !this.index1) {
|
||||
return
|
||||
}
|
||||
this.content = '确认是否绑定气胀轴？'
|
||||
this.type = 3
|
||||
this.$refs.alertDialog.open()
|
||||
},
|
||||
async _slitterShaftBinding () {
|
||||
let obj = this.options1.find(item => item.value === this.index1)
|
||||
try {
|
||||
let res = await slitterShaftBinding(this.val1, obj)
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
icon: 'none'
|
||||
})
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
}
|
||||
},
|
||||
clearUp () {
|
||||
this.val1 = ''
|
||||
this.index1 = ''
|
||||
this.disabled = false
|
||||
this.disabled1 = false
|
||||
this.disabled2 = false
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -16,6 +16,22 @@
|
||||
<uni-data-select v-model="index" :searchInput="true" :localdata="newoptions" @change="selectChange" @handleChange="handleChange" @showSelector="showSelector"></uni-data-select>
|
||||
</view>
|
||||
</view>
|
||||
<view class="filter_item">
|
||||
<view class="filter_label_wraper">
|
||||
<span class="filter_label">暂存A位</span>
|
||||
</view>
|
||||
<view class="filter_input_wraper">
|
||||
<uni-data-select v-model="size1" :localdata="options1" @change="sizeChange1"></uni-data-select>
|
||||
</view>
|
||||
</view>
|
||||
<view class="filter_item">
|
||||
<view class="filter_label_wraper">
|
||||
<span class="filter_label">暂存B位</span>
|
||||
</view>
|
||||
<view class="filter_input_wraper">
|
||||
<uni-data-select v-model="size2" :localdata="options1" @change="sizeChange2"></uni-data-select>
|
||||
</view>
|
||||
</view>
|
||||
<view class="msg_item">暂存A位：{{obj.a_point}}</view>
|
||||
<view class="msg_item">暂存B位：{{obj.b_point}}</view>
|
||||
<view class="msg_item">状态：{{obj.status}}</view>
|
||||
@@ -23,7 +39,7 @@
|
||||
</view>
|
||||
<view class="zd-row submitbar">
|
||||
<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
|
||||
<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index}" :disabled="disabled" @tap="toSure">内包间</button>
|
||||
<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index || !size1 || !size2}" :disabled="disabled" @tap="toSure">退轴</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -45,6 +61,9 @@
|
||||
options2: [],
|
||||
index2: '',
|
||||
obj: {a_point: '-', b_point: '-', status: '-'},
|
||||
options1: [{text: '3寸4代', value: '3-4'}, {text: '3寸5代', value: '3-5'}, {text: '6寸5代', value: '6-5'}],
|
||||
size1: '',
|
||||
size2: '',
|
||||
disabled: false
|
||||
};
|
||||
},
|
||||
@@ -102,9 +121,15 @@
|
||||
this.options = [...res]
|
||||
this.newoptions = [...res]
|
||||
},
|
||||
sizeChange1(e) {
|
||||
this.size1 = e
|
||||
},
|
||||
sizeChange2(e) {
|
||||
this.size2 = e
|
||||
},
|
||||
toSure () {
|
||||
this.disabled = true
|
||||
if (!this.index) {
|
||||
if (!this.index || !this.size1 || !this.size2) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
@@ -123,7 +148,7 @@
|
||||
},
|
||||
async _returnShaft () {
|
||||
try {
|
||||
let res = await returnShaft(this.index)
|
||||
let res = await returnShaft(this.index, this.size1, this.size2)
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
icon: 'none'
|
||||
@@ -136,6 +161,8 @@
|
||||
clearUp () {
|
||||
this.index = ''
|
||||
this.index2 = ''
|
||||
this.size1 = ''
|
||||
this.size2 = ''
|
||||
this.options = []
|
||||
this.obj = {a_point: '-', b_point: '-', status: '-'}
|
||||
},
|
||||
|
||||
@@ -531,16 +531,9 @@ export const boxReturn = (code, box) => request({
|
||||
/**
|
||||
* 空轴退回
|
||||
*/
|
||||
export const returnShaft = (code) => request({
|
||||
export const returnShaft = (code, size1, size2) => request({
|
||||
url:'api/pda/slitter/returnShaft',
|
||||
data: {point_code: code}
|
||||
})
|
||||
/**
|
||||
* 空轴绑定
|
||||
*/
|
||||
export const slitterShaftBinding = (code, size) => request({
|
||||
url:'api/pda/slitter/ShaftBinding',
|
||||
data: {point_code: code, size: size}
|
||||
data: {point_code: code, size1: size1, size2: size2}
|
||||
})
|
||||
/**
|
||||
* 饵料下卷
|
||||
|
||||
Reference in New Issue
Block a user