二次sure

pages/SecondPhase/slitting/AGVPass.vue

@@ -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.point')}}</span>
 					</view>
@@ -16,7 +16,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}" :disabled="disabled" @tap="_AGVPass">{{$t('button.release')}}</button>
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !val1}" :disabled="disabled" @tap="handleConfirm">{{$t('button.release')}}</button>
 		</view>
 	</view>
 </template>
@@ -24,6 +24,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	import { confirmAction } from '@/utils/utils.js'
 	import {AGVPass} from '@/utils/getData3.js'
 	export default {
 		components: {
@@ -41,12 +42,17 @@
 			this.title = options.title
 		},
 		methods: {
-			async _AGVPass () {
+			async handleConfirm() {
-				this.disabled = true
 				if (!this.val1) {
-					this.disabled = false
 					return
 				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._AGVPass()
+				}
+			},
+			async _AGVPass () {
+				this.disabled = true
 				try {
 					let res = await AGVPass(this.val1)
 					uni.showToast({

pages/SecondPhase/slitting/BaitRoll.vue

@@ -4,13 +4,13 @@
 		<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">{{$t('filter.area')}}</view>
 					<view class="filter_input_wraper">
 						<uni-data-select v-model="index2" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options2" @change="selectChange2"></uni-data-select>
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label_wraper">
 						<span class="filter_label">{{$t('filter.device')}}</span>
 					</view>
@@ -18,19 +18,19 @@
 						<uni-data-select v-model="index3" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options3" @change="selectChange3"></uni-data-select>
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label">{{$t('filter.point')}}</view>
 					<view class="filter_input_wraper">
 						<uni-data-select v-model="index1" :placeholder="$t('uni.dataSelect.placeholder')" :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.tubecore-l')}}</view>
 					<view class="filter_input_wraper">
 						<uni-data-select v-model="upL" :searchInput="true" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="newaxis1" @handleChange="handleChange1" @showSelector="showSelector1"></uni-data-select>
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label">{{$t('filter.tubecore-r')}}</view>
 					<view class="filter_input_wraper">
 						<uni-data-select v-model="upR" :searchInput="true" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="newaxis2" @handleChange="handleChange2" @showSelector="showSelector2"></uni-data-select>
@@ -51,7 +51,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': !index1 ||!index2 || !index3 || (!upL && !upR)}" :disabled="disabled" @tap="_downBait">{{$t('button.surerolldown')}}</button>
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index1 ||!index2 || !index3 || (!upL && !upR)}" :disabled="disabled" @tap="handleConfirm">{{$t('button.surerolldown')}}</button>
 		</view>
 	</view>
 </template>
@@ -59,6 +59,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	import { confirmAction } from '@/utils/utils.js'
 	import {queryProductArea, queryDeviceByarea, devicePointQuery} from '@/utils/getData2.js'
 	import {paperQueryPaperMaterial, downBait} from '@/utils/getData3.js'
 	export default {
@@ -143,13 +144,18 @@
 				this.upR = ''
 				this.disabled = false
 			},
+			async handleConfirm() {
+				if (!this.index1 ||!this.index2 || !this.index3 || (!this.upL && !this.upR)) {
+					return
+				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._downBait()
+				}
+			},
 			/** 确认 */
 			async _downBait () {
 				this.disabled = true
-				if (!this.index1 ||!this.index2 || !this.index3 || (!this.upL && !this.upR)) {
-					this.disabled = false
-					return
-				}
 				try {
 					let upLT = ''
 					let upRT = ''

pages/SecondPhase/slitting/CallShaft.vue

@@ -10,7 +10,7 @@
 						<uni-data-select v-model="index1" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options1" @change="selectChange1"></uni-data-select>
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label_wraper">
 						<span class="filter_label">{{$t('filter.device')}}</span>
 					</view>
@@ -18,25 +18,25 @@
 						<uni-data-select v-model="index2" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options2" @change="selectChange2"></uni-data-select>
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label">{{$t('filter.uppershaft-l')}}</view>
 					<view class="filter_input_wraper">
 						<uni-data-select v-model="upL" :searchInput="true" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="newaxis1" @handleChange="handleChange1" @showSelector="showSelector1"></uni-data-select>
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label">{{$t('filter.uppershaft-r')}}</view>
 					<view class="filter_input_wraper">
 						<uni-data-select v-model="upR" :searchInput="true" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="newaxis2" @handleChange="handleChange2" @showSelector="showSelector2"></uni-data-select>
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label">{{$t('filter.lowershaft-l')}}</view>
 					<view class="filter_input_wraper">
 						<uni-data-select v-model="lowL" :searchInput="true" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="newaxis3" @handleChange="handleChange3" @showSelector="showSelector3"></uni-data-select>
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label">{{$t('filter.lowershaft-r')}}</view>
 					<view class="filter_input_wraper">
 						<uni-data-select v-model="lowR" :searchInput="true" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="newaxis4" @handleChange="handleChange4" @showSelector="showSelector4"></uni-data-select>
@@ -78,7 +78,7 @@
 		</view>
 		<view class="zd-row submitbar">
 			<button class="zd-col-5 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
-			<button class="zd-col-8 btn-submit btn-success letter-30" :class="{'btn-info': !index2 || (!upL && !upR && !lowL && !lowR)}" :disabled="disabled" @tap="_forcedFeedShaft">{{$t('button.sendaxis')}}</button>
+			<button class="zd-col-8 btn-submit btn-success letter-30" :class="{'btn-info': !index2 || (!upL && !upR && !lowL && !lowR)}" :disabled="disabled" @tap="handleConfirm">{{$t('button.sendaxis')}}</button>
 			<button class="zd-col-8 btn-submit btn-success" @tap="_showManualView">{{$t('button.refresh')}}</button>
 		</view>
 		<up-top ref="UT" :scrollTop="top"></up-top>
@@ -89,6 +89,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, queryDeviceByarea, showManualView} from '@/utils/getData2.js'
 	import {paperQueryPaperMaterial, forcedFeedShaft, urgentPlan} from '@/utils/getData3.js'
 	export default {
@@ -163,12 +164,17 @@
 				this.lowR = ''
 				this.disabled = false
 			},
-			async _forcedFeedShaft () {
+			async handleConfirm() {
-				this.disabled = true
 				if (!this.index2 || (!this.upL && !this.upR && !this.lowL && !this.lowR)) {
-					this.disabled = false
 					return
 				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._forcedFeedShaft()
+				}
+			},
+			async _forcedFeedShaft () {
+				this.disabled = true
 				let deviceT = ''
 				let upLT = ''
 				let upRT = ''

pages/SecondPhase/slitting/Cutaxis.vue

@@ -12,7 +12,7 @@
 						<uni-data-select v-model="index2" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options2" @change="selectChange2"></uni-data-select>
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<!-- <view class="filter_label">设备</view> -->
 					<view class="filter_label_wraper">
 						<span class="filter_label">{{$t('filter.device')}}</span>
@@ -63,7 +63,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': !index || !dataList.length}" :disabled="disabled" @tap="_downShafts">{{$t('button.confirmlowershaft')}}</button>
+			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !index || !dataList.length}" :disabled="disabled" @tap="handleConfirm">{{$t('button.confirmlowershaft')}}</button>
 		</view>
 	</view>
 </template>
@@ -71,6 +71,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	import { confirmAction } from '@/utils/utils.js'
 	import {queryProductArea} from '@/utils/getData2.js'
 	import {slitterDevices} from '@/utils/getData3.js'
 	import {downShafts} from '@/utils/getData4.js'
@@ -135,12 +136,17 @@
 			handleDelete (index) {
 				this.dataList.splice(index, 1)
 			},
-			async _downShafts () {
+			async handleConfirm() {
-				this.disabled = true
 				if (!this.index || !this.dataList.length) {
-					this.disabled = false
 					return
 				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._downShafts()
+				}
+			},
+			async _downShafts () {
+				this.disabled = true
 				try {
 					let res = await downShafts(this.index, this.dataList)
 					if (res) {

pages/SecondPhase/slitting/DoInitShaft.vue

@@ -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.point')}}</span>
 					</view>
@@ -24,7 +24,7 @@
 			</view>
 		</view>
 		<view class="zd-row submitbar">
-			<button class="zd-col-22 btn-submit btn-success" :class="{'btn-info': !index}" :disabled="disabled" @tap="_doInitShaftPoint">{{$t('button.confirm')}}</button>
+			<button class="zd-col-22 btn-submit btn-success" :class="{'btn-info': !index}" :disabled="disabled" @tap="handleConfirm">{{$t('button.confirm')}}</button>
 		</view>
 	</view>
 </template>
@@ -32,6 +32,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	import { confirmAction } from '@/utils/utils.js'
 	import {getShaftPoint, doInitShaftPoint} from '@/utils/getData3.js'
 	export default {
 		components: {
@@ -64,12 +65,17 @@
 			selectChange (e) {
 				this.index = e
 			},
-			async _doInitShaftPoint () {
+			async handleConfirm() {
-				this.disabled = true
 				if (!this.index) {
-					this.disabled = false
 					return
 				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._doInitShaftPoint()
+				}
+			},
+			async _doInitShaftPoint () {
+				this.disabled = true
 				try {
 					let res = await doInitShaftPoint(this.index, this.isV)
 					uni.showToast({

pages/SecondPhase/slitting/PaperBind.vue

@@ -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.pallet-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_wraper">
 						<span class="filter_label">{{$t('filter.tubecode')}}</span>
 					</view>
@@ -20,13 +20,13 @@
 						<search-box v-model="val3" />
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label">{{$t('filter.rownum')}}</view>
 					<view class="filter_input_wraper">
 						<uni-data-select v-model="index1" :placeholder="$t('uni.dataSelect.placeholder')" :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.colnum')}}</view>
 					<view class="filter_input_wraper">
 						<uni-data-select v-model="index2" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options2" @change="selectChange2"></uni-data-select>
@@ -36,8 +36,8 @@
 		</view>
 		<view class="zd-row submitbar">
 			<button class="zd-col-5 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
-			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1 || !index1 || !index2 || !val3}" :disabled="disabled" @tap="_operateIvt('1')">{{$t('button.bind')}}</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1 || !index1 || !index2 || !val3}" :disabled="disabled" @tap="handleConfirm('1')">{{$t('button.bind')}}</button>
-			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1 || !index1 || !index2 || !val3}" :disabled="disabled" @tap="_operateIvt('2')">{{$t('button.cleanup')}}</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1 || !index1 || !index2 || !val3}" :disabled="disabled" @tap="handleConfirm('2')">{{$t('button.cleanup')}}</button>
 		</view>
 	</view>
 </template>
@@ -45,6 +45,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	import { confirmAction } from '@/utils/utils.js'
 	import {queryPaperMaterial} from '@/utils/getData2.js'
 	import {operateIvt} from '@/utils/getData3.js'
 	export default {
@@ -89,12 +90,17 @@
 			showSelector () {
 				this.newoptions = this.options
 			},
-			async _operateIvt (type) {
+			async handleConfirm(type) {
-				this.disabled = true
 				if (!this.val1 || !this.index1 || !this.index2 || !this.val3) {
-					this.disabled = false
 					return
 				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._operateIvt(type)
+				}
+			},
+			async _operateIvt (type) {
+				this.disabled = true
 				try {
 					let res = await operateIvt(type, this.val1, this.index1, this.index2, this.val3)
 					uni.showToast({

pages/SecondPhase/slitting/RollCacheManage.vue

@@ -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.point')}}</span>
 					</view>
@@ -17,8 +17,8 @@
 		</view>
 		<view class="zd-row submitbar">
 			<button class="zd-col-5 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
-			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="toSure('2')">{{$t('button.emptyaxis')}}</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="handleConfirm('2')">{{$t('button.emptyaxis')}}</button>
-			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="toSure('1')">{{$t('button.cleanup')}}</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="handleConfirm('1')">{{$t('button.cleanup')}}</button>
 		</view>
 	</view>
 </template>
@@ -26,6 +26,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	import { confirmAction } from '@/utils/utils.js'
 	import {rollCacheManageTip, rollCacheManage} from '@/utils/getData3.js'
 	export default {
 		components: {
@@ -60,12 +61,17 @@
 				this.obj = {msg: '-'}
 				this.disabled = false
 			},
-			async toSure (type) {
+			async handleConfirm(type) {
-				this.disabled = true
 				if (!this.val1) {
-					this.disabled = false
 					return
 				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._rollCacheManage(type)
+				}
+			},
+			async _rollCacheManage (type) {
+				this.disabled = true
 				try {
 					let res = await rollCacheManage(this.val1, type)
 					if (res) {

pages/SecondPhase/slitting/ShaftSave.vue

@@ -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">{{$t('filter.point')}}</view>
 					<view class="filter_input_wraper">
 						<search-box v-model="val1" />
@@ -14,8 +14,8 @@
 		</view>
 		<view class="zd-row submitbar">
 			<button class="zd-col-5 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
-			<button class="zd-col-8 btn-submit btn-success letter-30" :class="{'btn-info': !val1}" :disabled="disabled" @tap="_shaftMaintenanceInventory('0')">{{$t('button.clearaxis')}}</button>
+			<button class="zd-col-8 btn-submit btn-success letter-30" :class="{'btn-info': !val1}" :disabled="disabled" @tap="handleConfirm('0')">{{$t('button.clearaxis')}}</button>
-			<button class="zd-col-8 btn-submit btn-success letter-30" :class="{'btn-info': !val1}" :disabled="disabled" @tap="_shaftMaintenanceInventory('1')">{{$t('button.axisplacement')}}</button>
+			<button class="zd-col-8 btn-submit btn-success letter-30" :class="{'btn-info': !val1}" :disabled="disabled" @tap="handleConfirm('1')">{{$t('button.axisplacement')}}</button>
 		</view>
 	</view>
 </template>
@@ -23,6 +23,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	import { confirmAction } from '@/utils/utils.js'
 	import {shaftMaintenanceInventory} from '@/utils/getData3.js'
 	export default {
 		components: {
@@ -40,12 +41,17 @@
 			this.title = options.title
 		},
 		methods: {
-			async _shaftMaintenanceInventory (type) {
+			async handleConfirm(type) {
-				this.disabled = true
 				if (!this.val1) {
-					this.disabled = false
 					return
 				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._shaftMaintenanceInventory(type)
+				}
+			},
+			async _shaftMaintenanceInventory (type) {
+				this.disabled = true
 				try {
 					let res = await shaftMaintenanceInventory(this.val1, type)
 					uni.showToast({

pages/SecondPhase/slitting/SlittingCutting2.vue

@@ -12,7 +12,7 @@
 						<uni-data-select v-model="index2" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options2" @change="selectChange2"></uni-data-select>
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<!-- <view class="filter_label">设备</view> -->
 					<view class="filter_label_wraper">
 						<span class="filter_label">{{$t('filter.device')}}</span>
@@ -95,7 +95,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': !index || !dataList.length}" :disabled="disabled" @tap="_downRolls2">{{$t('button.confirm')}}</button>
+			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !index || !dataList.length}" :disabled="disabled" @tap="handleConfirm">{{$t('button.confirm')}}</button>
 		</view>
 	</view>
 </template>
@@ -103,6 +103,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	import { confirmAction } from '@/utils/utils.js'
 	import {queryProductArea} from '@/utils/getData2.js'
 	import {slitterDevices, downRolls2} from '@/utils/getData3.js'
 	export default {
@@ -186,12 +187,17 @@
 			handleDelete (index) {
 				this.dataList.splice(index, 1)
 			},
-			async _downRolls2 () {
+			async handleConfirm() {
-				this.disabled = true
 				if (!this.index || !this.dataList.length) {
-					this.disabled = false
 					return
 				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._downRolls2()
+				}
+			},
+			async _downRolls2 () {
+				this.disabled = true
 				try {
 					let res = await downRolls2(this.index, this.dataList)
 					if (res) {

pages/SecondPhase/slitting/SlittingFeeding.vue

@@ -12,7 +12,7 @@
 						<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options" @change="selectChange"></uni-data-select>
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label_wraper">
 						<span class="filter_label">{{$t('filter.point')}}</span>
 					</view>
@@ -82,8 +82,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': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('2')">{{$t('button.full-shaft-return')}}</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled2" @tap="handleConfirm('2')">{{$t('button.full-shaft-return')}}</button>
-			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('1')">{{$t('button.empty-shaft-return')}}</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled2" @tap="handleConfirm('1')">{{$t('button.empty-shaft-return')}}</button>
 			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled" @tap="manCall">{{$t('button.manual-call')}}</button>
 			<!-- <button class="zd-col-3 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled" @tap="toSure">呼叫</button> -->
 			<button class="zd-col-3 btn-submit btn-success" @tap="searchList">{{$t('button.search')}}</button>
@@ -133,6 +133,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, feedingQueryMaterialInfo, feedingConfirm, feedingQueryPoint, feedingVehicleReturn} from '@/utils/getData2.js'
 	import {feedinghandleConfirm} from '@/utils/getData4.js'
 	export default {
@@ -334,17 +335,22 @@
 					this.disabled1 = false
 				}
 			},
-			/** 空轴送回 */
+			async handleConfirm(type) {
-			async _feedingVehicleReturn (type) {
-				this.disabled2 = true
 				if (!this.val1) {
-					this.disabled2 = false
 					uni.showToast({
 						title: '点位不能为空',
 						icon: 'none'
 					})
 					return
 				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._feedingVehicleReturn(type)
+				}
+			},
+			/** 空轴送回 */
+			async _feedingVehicleReturn (type) {
+				this.disabled2 = true
 				try {
 					let res = await feedingVehicleReturn(this.val1, type)
 					this.disabled2 = false

pages/SecondPhase/slitting/StockingArea.vue

@@ -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.point')}}</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_wraper">
 						<span class="filter_label">{{$t('filter.pallet-number')}}</span>
 					</view>
@@ -23,10 +23,10 @@
 			</view>
 		</view>
 		<view class="zd-row submitbar">
-			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_doStockAreaBinding">{{$t('button.bind')}}</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="handleConfirm2">{{$t('button.bind')}}</button>
-			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="_doStockAreaUnbinding">{{$t('button.unbind')}}</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="handleConfirm3">{{$t('button.unbind')}}</button>
-			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_instorStock('1')">{{$t('button.tubeinstore')}}</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="handleConfirm1('1')">{{$t('button.tubeinstore')}}</button>
-			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_instorStock('0')">{{$t('button.emptydiskrecycle')}}</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="handleConfirm1('0')">{{$t('button.emptydiskrecycle')}}</button>
 		</view>
 	</view>
 </template>
@@ -34,6 +34,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	import { confirmAction } from '@/utils/utils.js'
 	import {doStockAreaBinding, doStockAreaUnbinding, instorStock} from '@/utils/getData3.js'
 	export default {
 		components: {
@@ -52,12 +53,17 @@
 			this.title = options.title
 		},
 		methods: {
-			async _doStockAreaBinding () {
+			async handleConfirm2() {
-				this.disabled = true
 				if (!this.val1 || !this.val2) {
-					this.disabled = false
 					return
 				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._doStockAreaBinding()
+				}
+			},
+			async _doStockAreaBinding () {
+				this.disabled = true
 				try {
 					let res = await doStockAreaBinding(this.val1, this.val2)
 					uni.showToast({
@@ -70,12 +76,17 @@
 					this.disabled = false
 				}
 			},
-			async _doStockAreaUnbinding () {
+			async handleConfirm3() {
-				this.disabled = true
 				if (!this.val1) {
-					this.disabled = false
 					return
 				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._doStockAreaUnbinding()
+				}
+			},
+			async _doStockAreaUnbinding () {
+				this.disabled = true
 				try {
 					let res = await doStockAreaUnbinding(this.val1)
 					uni.showToast({
@@ -88,12 +99,17 @@
 					this.disabled = false
 				}
 			},
-			async _instorStock (type) {
+			async handleConfirm1(type) {
-				this.disabled = true
 				if (!this.val1 || !this.val2) {
-					this.disabled = false
 					return
 				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._instorStock(type)
+				}
+			},
+			async _instorStock (type) {
+				this.disabled = true
 				try {
 					let res = await instorStock(this.val1, this.val2, type)
 					uni.showToast({

pages/SecondPhase/slitting/SubRollWeight.vue

@@ -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"  @handleChange="handleChange"/>
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label_wraper">
 						<span class="filter_label">{{$t('filter.chipweight')}}</span>
 					</view>
@@ -26,7 +26,7 @@
 						/>
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label_wraper">
 						<span class="filter_label">{{$t('grid.sub-roll-weight')}}</span>
 					</view>
@@ -45,7 +45,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 || (!val2 && !val3)}" :disabled="disabled" @tap="_doSubRollWeightBinding">{{$t('button.bind')}}</button>
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || (!val2 && !val3)}" :disabled="disabled" @tap="handleConfirm">{{$t('button.bind')}}</button>
 		</view>
 	</view>
 </template>
@@ -54,6 +54,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 {doSubRollWeightBindingTip, doSubRollWeightBinding} from '@/utils/getData3.js'
 	export default {
 		components: {
@@ -82,12 +83,17 @@
 				let res = await doSubRollWeightBindingTip(e)
 				this.obj = res
 			},
-			async _doSubRollWeightBinding () {
+			async handleConfirm() {
-				this.disabled = true
 				if (!this.val1 || (!this.val2 && !this.val3)) {
-					this.disabled = false
 					return
 				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._doSubRollWeightBinding()
+				}
+			},
+			async _doSubRollWeightBinding () {
+				this.disabled = true
 				try {
 					let res = await doSubRollWeightBinding(this.val1, this.val2, this.val3)
 					uni.showToast({

pages/SecondPhase/slitting/TubeStock.vue

@@ -10,7 +10,7 @@
 						<uni-data-select v-model="index1" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options1" @change="selectChange1"></uni-data-select>
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="filter_item is-required">
 					<view class="filter_label_wraper">
 						<span class="filter_label">{{$t('filter.corespecifications')}}</span>
 					</view>
@@ -52,7 +52,7 @@
 		</view>
 		<view class="zd-row submitbar">
 			<button class="zd-col-5 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
-			<button class="zd-col-8 btn-submit btn-success letter-30" :class="{'btn-info': !index2}" :disabled="disabled" @tap="_moveStock">{{$t('button.stockup')}}</button>
+			<button class="zd-col-8 btn-submit btn-success letter-30" :class="{'btn-info': !index2}" :disabled="disabled" @tap="handleConfirm">{{$t('button.stockup')}}</button>
 			<button class="zd-col-8 btn-submit btn-success" @tap="_showPapervehicleView">{{$t('button.refresh')}}</button>
 		</view>
 		<up-top ref="UT" :scrollTop="top"></up-top>
@@ -63,6 +63,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 {showPapervehicleView, moveStock, queryProductArea, queryPaperMaterial} from '@/utils/getData4.js'
 	export default {
 		components: {
@@ -124,12 +125,17 @@
 				let res = await paperQueryPaperMaterial()
 				this.dataList = [...res.rows]
 			},
-			async _moveStock () {
+			async handleConfirm() {
-				this.disabled = true
 				if (!this.index1 || !this.index2) {
-					this.disabled = false
 					return
 				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._moveStock()
+				}
+			},
+			async _moveStock () {
+				this.disabled = true
 				try {
 					let res = await moveStock(this.pkObj)
 					uni.showToast({