二期生箔工序

pages/SecondPhase/production/SboProcess.vue

@@ -12,16 +12,23 @@
 						/>
 					</view>
 				</view>
-				<view class="filter_item">
+				<view class="zd-row">
-					<view class="filter_label_wraper">
+					<view class="zd-col-19">
-						<span class="filter_label">母卷</span>
+						<view class="filter_item">
+							<view class="filter_label_wraper">
+								<span class="filter_label">母卷</span>
+							</view>
+							<view class="filter_input_wraper">
+								<search-box
+								v-model="val2"
+								:focused="true"
+								@handleChange="handleChange"
+								/>
+							</view>
+						</view>
 					</view>
-					<view class="filter_input_wraper">
+					<view class="zd-col-4">
-						<search-box
+						<button class="btn-submit btn-success" @tap="searchList">查询</button>
-						v-model="val2"
-						:focused="true"
-						@handleChange="handleChange"
-						/>
 					</view>
 				</view>
 			</view>
@@ -66,12 +73,11 @@
 			<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-3 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled1" @tap="_needEmptyAxis">呼叫</button>
+			<button class="zd-col-3 btn-submit btn-default" @tap="cleanUp">清空</button>
+			<button class="zd-col-5 btn-submit btn-success letter-30" :disabled="disabled1" @tap="_needEmptyAxisTest">呼叫</button>
 			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !(val1 && !pkId)}" :disabled="disabled5" @tap="_needEmptyVehicle">呼叫空轴</button>
 			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled2" @tap="_confirmBlanking">准备就绪</button>
 			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled3" @tap="_finishBlanking">确认下卷</button>
-			<!-- <button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled4" @tap="_finish">结束</button> -->
-			<button class="zd-col-4 btn-submit btn-success" @tap="searchList">查询</button>
 		</view>
 	</view>
 </template>
@@ -79,7 +85,8 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryRawFoilList, needEmptyAxis, needEmptyVehicle, confirmBlanking, finishBlanking, finish} from '@/utils/getData1.js'
+	import {queryRawFoilList, needEmptyVehicle, confirmBlanking, finishBlanking, finish} from '@/utils/getData1.js'
+	import {needEmptyAxisTest} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -110,7 +117,7 @@
 			};
 		},
 		created () {
-			this._queryRawFoilList()
+			// this._queryRawFoilList()
 		},
 		methods: {
 			searchList () {
@@ -122,7 +129,7 @@
 				this._queryRawFoilList()
 			},
 			handleChange (e) {
-				this.searchList()
+				// this.searchList()
 			},
 			/** 初始化查询 */
 			async _queryRawFoilList () {
@@ -152,18 +159,12 @@
 					this.status = 'noMore'
 				}
 			},
-			async _needEmptyAxis () {
+			/** 呼叫 */
+			async _needEmptyAxisTest () {
 				this.disabled1 = true
-				if (!this.pkId) {
-					this.disabled1 = false
-					return
-				}
 				try {
-					let res = await needEmptyAxis(this.pkObj)
+					let res = await needEmptyAxisTest(this.val1, this.val2)
 					this.disabled1 = false
-					this.pkId = ''
-					this.pkObj = {}
-					this.searchList()
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
@@ -253,6 +254,15 @@
 			toCheck (e) {
 				this.pkId = this.pkId === e.container_name ? '' : e.container_name
 				this.pkObj = this.pkId === e.container_name ? e : {}
+			},
+			cleanUp () {
+				this.val1 = ''
+				this.val2 = ''
+				this.pkId = ''
+				this.pkObj = {}
+				this.totalCount = 0
+				this.dataList = []
+				this.pageNum = 1
 			}
 		}
 	}

utils/getData3.js

@@ -80,3 +80,14 @@ export const surfaceConfirm = (code) => request({
 		point_code: code
 	}
 })
+/**
+ * 生箔工序
+ */
+// 1.1呼叫
+export const needEmptyAxisTest = (code, name) => request({
+	url: 'api/pda/raw/needEmptyAxisTest',
+	data: {
+		point_code: code,
+		container_name: name,
+	}
+})