二次确认
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
<nav-bar :title="title"></nav-bar>
|
||||
<view class="zd_content">
|
||||
<view class="zd_wrapper">
|
||||
<view class="filter_item">
|
||||
<view class="filter_item is-required">
|
||||
<view class="filter_label_wraper">
|
||||
<span class="filter_label">{{$t('grid.point-code')}}</span>
|
||||
</view>
|
||||
@@ -12,7 +12,7 @@
|
||||
<search-box v-model="val1" @handleChange="handleChange1"/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="filter_item">
|
||||
<view class="filter_item is-required">
|
||||
<view class="filter_label_wraper">
|
||||
<span class="filter_label">{{$t('filter.mother-roll')}}</span>
|
||||
</view>
|
||||
@@ -20,7 +20,7 @@
|
||||
<search-box v-model="val2" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="filter_item">
|
||||
<view class="filter_item is-required">
|
||||
<view class="filter_label">{{$t('filter.temperature')}}</view>
|
||||
<view class="filter_input_wraper">
|
||||
<!-- <input type="number" class="filter_input" v-model="val3"> -->
|
||||
@@ -32,7 +32,7 @@
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="filter_item">
|
||||
<view class="filter_item is-required">
|
||||
<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"> -->
|
||||
@@ -47,8 +47,8 @@
|
||||
</view>
|
||||
<view class="zd-row submitbar">
|
||||
<button class="zd-col-4 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
|
||||
<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !val1 || !val2 || !val3 || !val4}" :disabled="disabled" @tap="_ovenInAndOut1('1')">{{$t('button.enter-box')}}</button>
|
||||
<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="_ovenInAndOut2('2')">{{$t('button.out-box')}}</button>
|
||||
<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !val1 || !val2 || !val3 || !val4}" :disabled="disabled" @tap="handleConfirm('1')">{{$t('button.enter-box')}}</button>
|
||||
<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="handleConfirm('2')">{{$t('button.out-box')}}</button>
|
||||
<button class="zd-col-6 btn-submit btn-success" :disabled="disabled" @click="_inHotByPoint">定点入箱</button>
|
||||
</view>
|
||||
<view class="msg_wrapper" :class="active ? 'popshow' : 'pophide'" style="height: auto">
|
||||
@@ -115,6 +115,7 @@
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import NumberInput from '@/components/NumberInput.vue'
|
||||
import { confirmAction } from '@/utils/utils.js'
|
||||
import {ovenInAndOut, bakingquery, inHotByPoint} from '@/utils/getData1.js'
|
||||
export default {
|
||||
components: {
|
||||
@@ -153,12 +154,26 @@
|
||||
let res = await bakingquery(val1)
|
||||
this.val2 = res.data.container_name
|
||||
},
|
||||
async _ovenInAndOut1 (type) {
|
||||
this.disabled = true
|
||||
if (!this.val1 || !this.val2 ||!this.val3 || !this.val4) {
|
||||
async handleConfirm(type) {
|
||||
if ((!this.val1 || !this.val2 ||!this.val3 || !this.val4) && type === '1') {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
if (!this.val1 && type === '2') {
|
||||
return
|
||||
}
|
||||
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?")
|
||||
if (isConfirmed) {
|
||||
if (type === '1') {
|
||||
this._ovenInAndOut1()
|
||||
}
|
||||
if (type === '2') {
|
||||
this._ovenInAndOut2()
|
||||
}
|
||||
}
|
||||
},
|
||||
async _ovenInAndOut1 (type) {
|
||||
this.disabled = true
|
||||
try {
|
||||
let res = await ovenInAndOut(this.val1, this.val2,this.val3, this.val4, type)
|
||||
uni.showToast({
|
||||
@@ -172,10 +187,6 @@
|
||||
},
|
||||
async _ovenInAndOut2 (type) {
|
||||
this.disabled = true
|
||||
if (!this.val1) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
try {
|
||||
let res = await ovenInAndOut(this.val1, '','', '', type)
|
||||
uni.showToast({
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<nav-bar :title="title"></nav-bar>
|
||||
<view class="zd_content">
|
||||
<view class="zd_wrapper">
|
||||
<view class="filter_item">
|
||||
<view class="filter_item is-required">
|
||||
<view class="filter_label_wraper">
|
||||
<span class="filter_label">{{$t('grid.sub-roll-number')}}</span>
|
||||
</view>
|
||||
@@ -12,7 +12,7 @@
|
||||
<search-box v-model="val1" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="filter_item">
|
||||
<view class="filter_item is-required">
|
||||
<view class="filter_label">{{$t('filter.control-point')}}</view>
|
||||
<view class="filter_input_wraper">
|
||||
<uni-data-select v-model="index1" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options1" @change="selectChange1"></uni-data-select>
|
||||
@@ -28,7 +28,7 @@
|
||||
</view>
|
||||
<view class="zd-row submitbar">
|
||||
<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
|
||||
<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1 && !index1}" :disabled="disabled" @tap="_updatePackageInfo">{{$t('button.confirm')}}</button>
|
||||
<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1 && !index1}" :disabled="disabled" @tap="handleConfirm">{{$t('button.confirm')}}</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -36,6 +36,7 @@
|
||||
<script>
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import { confirmAction } from '@/utils/utils.js'
|
||||
import {updatePackageInfo2} from '@/utils/getData3.js'
|
||||
export default {
|
||||
components: {
|
||||
@@ -63,12 +64,17 @@
|
||||
selectChange1 (e) {
|
||||
this.index1 = e
|
||||
},
|
||||
async _updatePackageInfo () {
|
||||
this.disabled = true
|
||||
async handleConfirm() {
|
||||
if (!this.val1 && !this.index1) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?")
|
||||
if (isConfirmed) {
|
||||
this._updatePackageInfo()
|
||||
}
|
||||
},
|
||||
async _updatePackageInfo () {
|
||||
this.disabled = true
|
||||
try {
|
||||
let res = await updatePackageInfo2(this.index, this.val1, this.index1)
|
||||
uni.showToast({
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<nav-bar :title="title"></nav-bar>
|
||||
<view class="zd_content">
|
||||
<view class="zd_wrapper">
|
||||
<view class="filter_item">
|
||||
<view class="filter_item is-required">
|
||||
<view class="filter_label_wraper">
|
||||
<span class="filter_label">{{$t('grid.point-code')}}</span>
|
||||
</view>
|
||||
@@ -12,7 +12,7 @@
|
||||
<search-box v-model="val1" @handleChange="handleChange1"/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="filter_item">
|
||||
<view class="filter_item is-required">
|
||||
<view class="filter_label_wraper">
|
||||
<span class="filter_label">{{$t('filter.mother-roll')}}</span>
|
||||
</view>
|
||||
@@ -43,7 +43,7 @@
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="filter_item">
|
||||
<view class="filter_item is-required">
|
||||
<view class="filter_label_wraper">
|
||||
<span class="filter_label">{{$t('filter.end')}}</span>
|
||||
</view>
|
||||
@@ -54,9 +54,9 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row submitbar">
|
||||
<button class="zd-col-7 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2 || !val5}" :disabled="disabled" @tap="_handleBakingovenInAndOut1('1')">{{$t('button.enter-box')}}</button>
|
||||
<button class="zd-col-7 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2 || !val5}" :disabled="disabled" @tap="_handleBakingovenInAndOut2('2')">{{$t('button.out-box')}}</button>
|
||||
<button class="zd-col-7 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled3" @tap="_handleBakingcheckConfirm">{{$t('button.quality-approved')}}</button>
|
||||
<button class="zd-col-7 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2 || !val5}" :disabled="disabled" @tap="handleConfirm1('1')">{{$t('button.enter-box')}}</button>
|
||||
<button class="zd-col-7 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2 || !val5}" :disabled="disabled" @tap="handleConfirm1('2')">{{$t('button.out-box')}}</button>
|
||||
<button class="zd-col-7 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled3" @tap="handleConfirm2">{{$t('button.quality-approved')}}</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -65,6 +65,7 @@
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import NumberInput from '@/components/NumberInput.vue'
|
||||
import { confirmAction } from '@/utils/utils.js'
|
||||
import {handleBakingovenInAndOut, handleBakingcheckConfirm, bakingquery} from '@/utils/getData1.js'
|
||||
export default {
|
||||
components: {
|
||||
@@ -99,12 +100,17 @@
|
||||
let res = await bakingquery(val1)
|
||||
this.val2 = res.data.container_name
|
||||
},
|
||||
async _handleBakingovenInAndOut1 (type) {
|
||||
this.disabled = true
|
||||
async handleConfirm1(type) {
|
||||
if (!this.val1 || !this.val2 || !this.val5) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?")
|
||||
if (isConfirmed) {
|
||||
this._handleBakingovenInAndOut1(type)
|
||||
}
|
||||
},
|
||||
async _handleBakingovenInAndOut1 (type) {
|
||||
this.disabled = true
|
||||
try {
|
||||
let res = await handleBakingovenInAndOut(this.val1, this.val2,this.val3, this.val4, this.val5, type)
|
||||
uni.showToast({
|
||||
@@ -143,12 +149,17 @@
|
||||
this.disabled = false
|
||||
}
|
||||
},
|
||||
async _handleBakingcheckConfirm () {
|
||||
this.disabled3 = true
|
||||
async handleConfirm2() {
|
||||
if (!this.val1 || !this.val2) {
|
||||
this.disabled3 = false
|
||||
return
|
||||
}
|
||||
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?")
|
||||
if (isConfirmed) {
|
||||
this._handleBakingcheckConfirm()
|
||||
}
|
||||
},
|
||||
async _handleBakingcheckConfirm () {
|
||||
this.disabled3 = true
|
||||
try {
|
||||
let res = await handleBakingcheckConfirm(this.val1, this.val2)
|
||||
uni.showToast({
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<nav-bar :title="title"></nav-bar>
|
||||
<view class="zd_content">
|
||||
<view class="zd_wrapper">
|
||||
<view class="filter_item">
|
||||
<view class="filter_item is-required">
|
||||
<view class="filter_label_wraper">
|
||||
<span class="filter_label">{{$t('filter.mother-roll')}}</span>
|
||||
</view>
|
||||
@@ -12,7 +12,7 @@
|
||||
<search-box v-model="val1" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="filter_item">
|
||||
<view class="filter_item is-required">
|
||||
<view class="filter_label">{{$t('filter.type')}}</view>
|
||||
<view class="filter_input_wraper">
|
||||
<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options"></uni-data-select>
|
||||
@@ -22,7 +22,7 @@
|
||||
</view>
|
||||
<view class="zd-row submitbar">
|
||||
<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
|
||||
<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1 || !index}" :disabled="disabled" @tap="_bakingReBake">{{$t('button.confirm')}}</button>
|
||||
<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1 || !index}" :disabled="disabled" @tap="handleConfirm">{{$t('button.confirm')}}</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -30,6 +30,7 @@
|
||||
<script>
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import { confirmAction } from '@/utils/utils.js'
|
||||
import {bakingReBake} from '@/utils/getData3.js'
|
||||
export default {
|
||||
components: {
|
||||
@@ -54,12 +55,17 @@
|
||||
this.index = ''
|
||||
this.disabled = false
|
||||
},
|
||||
async _bakingReBake () {
|
||||
this.disabled = true
|
||||
async handleConfirm() {
|
||||
if (!this.val1 || !this.index) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?")
|
||||
if (isConfirmed) {
|
||||
this._bakingReBake()
|
||||
}
|
||||
},
|
||||
async _bakingReBake () {
|
||||
this.disabled = true
|
||||
try {
|
||||
let res = await bakingReBake(this.val1, this.index)
|
||||
uni.showToast({
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<nav-bar :title="title"></nav-bar>
|
||||
<view class="zd_content">
|
||||
<view class="zd_wrapper">
|
||||
<view class="filter_item">
|
||||
<view class="filter_item is-required">
|
||||
<view class="filter_label_wraper">
|
||||
<span class="filter_label">{{$t('filter.mother-roll')}}</span>
|
||||
</view>
|
||||
@@ -12,7 +12,7 @@
|
||||
<search-box v-model="val1" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="filter_item">
|
||||
<view class="filter_item is-required">
|
||||
<view class="filter_label">{{$t('grid.weight')}}</view>
|
||||
<view class="filter_input_wraper">
|
||||
<NumberInput
|
||||
@@ -27,7 +27,7 @@
|
||||
</view>
|
||||
<view class="zd-row submitbar">
|
||||
<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
|
||||
<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1 && !val2}" :disabled="disabled" @tap="_confirmWeight">{{$t('button.confirm')}}</button>
|
||||
<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1 && !val2}" :disabled="disabled" @tap="handleConfirm">{{$t('button.confirm')}}</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -36,6 +36,7 @@
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import NumberInput from '@/components/NumberInput.vue'
|
||||
import { confirmAction } from '@/utils/utils.js'
|
||||
import {confirmWeight} from '@/utils/getData3.js'
|
||||
export default {
|
||||
components: {
|
||||
@@ -55,12 +56,17 @@
|
||||
this.title = options.title
|
||||
},
|
||||
methods: {
|
||||
async _confirmWeight () {
|
||||
this.disabled = true
|
||||
async handleConfirm() {
|
||||
if (!this.val1 || !this.val2) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?")
|
||||
if (isConfirmed) {
|
||||
this._confirmWeight()
|
||||
}
|
||||
},
|
||||
async _confirmWeight () {
|
||||
this.disabled = true
|
||||
try {
|
||||
let res = await confirmWeight(this.val1, this.val2)
|
||||
uni.showToast({
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<nav-bar :title="title"></nav-bar>
|
||||
<view class="zd_content">
|
||||
<view class="zd_wrapper">
|
||||
<view class="filter_item">
|
||||
<view class="filter_item is-required">
|
||||
<view class="filter_label_wraper">
|
||||
<span class="filter_label">{{$t('grid.sub-roll-number')}}</span>
|
||||
</view>
|
||||
@@ -12,13 +12,13 @@
|
||||
<search-box v-model="val1" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="filter_item">
|
||||
<view class="filter_item is-required">
|
||||
<view class="filter_label">{{$t('filter.printer')}}</view>
|
||||
<view class="filter_input_wraper">
|
||||
<uni-data-select v-model="index1" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options1" @change="selectChange1"></uni-data-select>
|
||||
</view>
|
||||
</view>
|
||||
<view class="filter_item">
|
||||
<view class="filter_item is-required">
|
||||
<view class="filter_label">{{$t('filter.label-type')}}</view>
|
||||
<view class="filter_input_wraper">
|
||||
<uni-data-select v-model="index2" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options2" @change="selectChange2"></uni-data-select>
|
||||
@@ -28,7 +28,7 @@
|
||||
</view>
|
||||
<view class="zd-row submitbar">
|
||||
<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
|
||||
<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !index1 || !index2}" :disabled="disabled" @tap="_printTable">打印</button>
|
||||
<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !index1 || !index2}" :disabled="disabled" @tap="handleConfirm">打印</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -36,6 +36,7 @@
|
||||
<script>
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import { confirmAction } from '@/utils/utils.js'
|
||||
import {getPrint, printTable} from '@/utils/getData3.js'
|
||||
export default {
|
||||
components: {
|
||||
@@ -72,12 +73,17 @@
|
||||
selectChange2 (e) {
|
||||
this.index2 = e
|
||||
},
|
||||
async _printTable () {
|
||||
this.disabled = true
|
||||
async handleConfirm() {
|
||||
if (!this.val1 || !this.index1 || !this.index2) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?")
|
||||
if (isConfirmed) {
|
||||
this._printTable()
|
||||
}
|
||||
},
|
||||
async _printTable () {
|
||||
this.disabled = true
|
||||
try {
|
||||
let res = await printTable(this.val1, this.index1, this.index2)
|
||||
uni.showToast({
|
||||
|
||||
@@ -11,9 +11,9 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row jccenter mgt20">
|
||||
<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>
|
||||
<button class="zd-col-7 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="val1 && type === '2' && disabled2" style="margin-right: 15px" @tap="handleConfirm1('2')">{{$t('button.upper-axis')}}</button>
|
||||
<button class="zd-col-7 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="val1 && type === '4' && disabled2" @tap="handleConfirm1('4')">{{$t('button.lower-axis')}}</button>
|
||||
<button class="zd-col-7 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled1" @tap="handleConfirm2('5')">{{$t('button.ready-to-go')}}</button>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd_wrapper">
|
||||
@@ -23,7 +23,7 @@
|
||||
<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options"></uni-data-select>
|
||||
</view>
|
||||
</view>
|
||||
<view class="filter_item">
|
||||
<view class="filter_item is-required">
|
||||
<view class="filter_label">{{$t('filter.mother-roll')}}</view>
|
||||
<view class="zd-row">
|
||||
<view class="zd-col-21 filter_input_wraper">
|
||||
@@ -32,7 +32,9 @@
|
||||
<button class="btn-search-icon" style="text-align: right;" size="mini" @tap="searchList"><uni-icons type="search" size="24" color="#272727"></uni-icons></button>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="zd-row jccenter mgt20">
|
||||
<button class="zd-col-7 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled1" @tap="handleConfirm2('6')">{{$t('button.add-order')}}</button>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd_wrapper grid-wraper">
|
||||
<view class="slide_new">
|
||||
@@ -75,8 +77,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-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>
|
||||
<button class="zd-col-11 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="type === '1' && disabled2" @tap="handleConfirm1('1')">{{$t('button.roll-down')}}</button>
|
||||
<button class="zd-col-11 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="type === '3' && disabled2" @tap="handleConfirm1('3')">{{$t('button.single-volume')}}</button>
|
||||
</view>
|
||||
<up-top ref="UT" :scrollTop="top"></up-top>
|
||||
</view>
|
||||
@@ -86,6 +88,7 @@
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import UpTop from '@/components/upTop.vue'
|
||||
import { confirmAction } from '@/utils/utils.js'
|
||||
import {queryProductArea, queryRawFoilList, createOrder, confirmBlanking, rawScrollDowm} from '@/utils/getData1.js'
|
||||
export default {
|
||||
components: {
|
||||
@@ -106,9 +109,6 @@
|
||||
pkObj: {},
|
||||
disabled1: false,
|
||||
disabled2: false,
|
||||
disabled3: false,
|
||||
disabled4: false,
|
||||
disabled5: false,
|
||||
reload: false,
|
||||
status: 'more',
|
||||
contentText: {
|
||||
@@ -171,16 +171,29 @@
|
||||
this.status = 'noMore'
|
||||
}
|
||||
},
|
||||
// 准备就绪
|
||||
async _confirmBlanking () {
|
||||
this.disabled2 = true
|
||||
if (!this.val1) {
|
||||
this.disabled2 = false
|
||||
// 准备就绪/新增工单
|
||||
async handleConfirm2(type) {
|
||||
if (!this.val1 && type === '5') {
|
||||
return
|
||||
}
|
||||
if ((!this.val1 || !this.val2) && type === '6') {
|
||||
return
|
||||
}
|
||||
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?")
|
||||
if (isConfirmed) {
|
||||
if (type === '5') {
|
||||
this._confirmBlanking()
|
||||
}
|
||||
if (type === '6') {
|
||||
this._createOrder()
|
||||
}
|
||||
}
|
||||
},
|
||||
async _confirmBlanking () {
|
||||
this.disabled1 = true
|
||||
try {
|
||||
let res = await confirmBlanking(this.val1)
|
||||
this.disabled2 = false
|
||||
this.disabled1 = false
|
||||
this.pkId = ''
|
||||
this.pkObj = {}
|
||||
this.searchList()
|
||||
@@ -189,26 +202,47 @@
|
||||
icon: 'none'
|
||||
})
|
||||
} catch (e) {
|
||||
this.disabled2 = false
|
||||
this.disabled1 = false
|
||||
}
|
||||
},
|
||||
// 正常下卷/单下卷/单上轴/单下轴
|
||||
async _rawScrollDowm (type) {
|
||||
this.disabled4 = true
|
||||
async _createOrder () {
|
||||
this.disabled1 = true
|
||||
try {
|
||||
let res = await createOrder(this.val1, this.val2)
|
||||
this.disabled1 = false
|
||||
this.pkId = ''
|
||||
this.pkObj = {}
|
||||
this.searchList()
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
icon: 'none'
|
||||
})
|
||||
} catch (e) {
|
||||
this.disabled1 = false
|
||||
}
|
||||
},
|
||||
async handleConfirm1(type) {
|
||||
this.type = type
|
||||
if (!this.pkId && (type === '1' || type === '3')) {
|
||||
this.disabled4 = false
|
||||
this.type = ''
|
||||
return
|
||||
}
|
||||
if (!this.val1 && (type === '2' || type === '4')) {
|
||||
this.disabled4 = false
|
||||
this.type = ''
|
||||
return
|
||||
}
|
||||
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?")
|
||||
if (isConfirmed) {
|
||||
this._rawScrollDowm(type)
|
||||
}
|
||||
},
|
||||
// 正常下卷/单下卷/单上轴/单下轴
|
||||
async _rawScrollDowm (type) {
|
||||
this.disabled2 = true
|
||||
|
||||
try {
|
||||
let res = await rawScrollDowm(this.pkObj, type, this.val1)
|
||||
this.disabled4 = false
|
||||
this.disabled2 = false
|
||||
this.type = ''
|
||||
this.pkId = ''
|
||||
this.pkObj = {}
|
||||
@@ -218,7 +252,7 @@
|
||||
icon: 'none'
|
||||
})
|
||||
} catch (e) {
|
||||
this.disabled4 = false
|
||||
this.disabled2 = false
|
||||
this.type = ''
|
||||
}
|
||||
},
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<nav-bar :title="title"></nav-bar>
|
||||
<view class="zd_content">
|
||||
<view class="zd_wrapper">
|
||||
<view class="filter_item">
|
||||
<view class="filter_item is-required">
|
||||
<view class="filter_label_wraper">
|
||||
<span class="filter_label">{{$t('grid.sub-roll-number')}}</span>
|
||||
</view>
|
||||
@@ -22,7 +22,7 @@
|
||||
</view>
|
||||
<view class="zd-row submitbar">
|
||||
<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
|
||||
<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="_updatePackageInfo">{{$t('button.confirm')}}</button>
|
||||
<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="handleConfirm">{{$t('button.confirm')}}</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -30,6 +30,7 @@
|
||||
<script>
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import { confirmAction } from '@/utils/utils.js'
|
||||
import {updatePackageInfo} from '@/utils/getData3.js'
|
||||
export default {
|
||||
components: {
|
||||
@@ -52,12 +53,17 @@
|
||||
selectChange (e) {
|
||||
this.index = e
|
||||
},
|
||||
async _updatePackageInfo () {
|
||||
this.disabled = true
|
||||
async handleConfirm() {
|
||||
if (!this.val1) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?")
|
||||
if (isConfirmed) {
|
||||
this._updatePackageInfo()
|
||||
}
|
||||
},
|
||||
async _updatePackageInfo () {
|
||||
this.disabled = true
|
||||
try {
|
||||
let res = await updatePackageInfo(this.index, this.val1)
|
||||
uni.showToast({
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
</view>
|
||||
<view class="zd-row submitbar">
|
||||
<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
|
||||
<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !arr1.length}" :disabled="disabled" @tap="_zjInBoundConfirm">装箱入库</button>
|
||||
<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !arr1.length}" :disabled="disabled" @tap="handleConfirm">装箱入库</button>
|
||||
</view>
|
||||
<up-top ref="UT" :scrollTop="top"></up-top>
|
||||
</view>
|
||||
@@ -67,6 +67,7 @@
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import UpTop from '@/components/upTop.vue'
|
||||
import { confirmAction } from '@/utils/utils.js'
|
||||
import {zjInBound, zjInBoundConfirm} from '@/utils/getData3.js'
|
||||
export default {
|
||||
components: {
|
||||
@@ -117,12 +118,17 @@
|
||||
this.disabled = false
|
||||
this.isV = '0'
|
||||
},
|
||||
async _zjInBoundConfirm () {
|
||||
this.disabled = true
|
||||
async handleConfirm() {
|
||||
if (!this.arr1.length) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?")
|
||||
if (isConfirmed) {
|
||||
this._zjInBoundConfirm()
|
||||
}
|
||||
},
|
||||
async _zjInBoundConfirm () {
|
||||
this.disabled = true
|
||||
try {
|
||||
let res = await zjInBoundConfirm(this.arr1.join(','), this.isV)
|
||||
uni.showToast({
|
||||
|
||||
Reference in New Issue
Block a user