生箔工序页面删除搜索弹窗

common/style/layout.styl

@@ -438,6 +438,15 @@ uni-button[disabled]:not([type]) {
 	border-color: #c9c9c9;
 	background-color: #c9c9c9;
 }
+uni-button[type=default] {
+	border: 2rpx solid #c9c9c9;
+}
+uni-button[type=primary] {
+	border: 2rpx solid #007aff;
+}
+uni-button[size=mini] {
+	vertical-align: middle;
+}
 
 /** 下拉框 */
 .uni-select__selector {

common/style/reset.css

@@ -140,6 +140,9 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
 .h-50 {
 	height: 50% !important;
 }
+.mgt20 {
+	margin-top: 20rpx;
+}
 .mgt40 {
 	margin-top: 40rpx;
 }

locale/en.json

@@ -33,7 +33,7 @@
 	"button.print": "Printing",
 	"button.force-complete": "Force Completion",
 	"button.reissue": "Re - issue",
-	"button.ready": "Ready",
+	"button.ready-to-go": "Ready",
 	"button.start-work-order": "Start Work Order",
 	"button.add-order": "Create New Work Order",
 	"button.roll-down": "Normal Unwinding",

pages/SecondPhase/production/SboProcess.vue

@@ -3,12 +3,31 @@
 		<!-- <nav-bar title="生箔工序"></nav-bar> -->
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
-			<view class="zd-row mgb10">
-				<view class="zd-col-18">
-					<button class="mgr20" size="mini" type="primary" :disabled="!pkId || disabled2" @tap="_confirmBlanking">{{$t('button.ready-to-go')}}</button>
-					<button size="mini" type="primary" :disabled="!pkId || disabled3" @tap="_rawStart">{{$t('button.start-work-order')}}</button>
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label">{{$t('grid.point-code')}}</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val1" />
+					</view>
 				</view>
-				<button class="btn-search-icon" size="mini" @tap="toggleSearchPopup"><uni-icons type="search" size="24" color="#272727"></uni-icons></button>
+				<view class="zd-row jccenter mgt20">
+					<view class="mgt10">
+						<button type="primary" size="mini" :disabled="val1 && type === '2' && disabled4" style="margin-right: 15px" @tap="_rawScrollDowm('2')">{{$t('button.upper-axis')}}</button>
+						<button type="primary" size="mini" :disabled="val1 && type === '4' && disabled4" @tap="_rawScrollDowm('4')">{{$t('button.lower-axis')}}</button>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label">{{$t('filter.mother-roll')}}</view>
+					<view class="zd-row">
+						<view class="zd-col-21 filter_input_wraper">
+							<search-box v-model="val2" />
+						</view>
+						<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>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -51,32 +70,23 @@
 			<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': !pkId}" :disabled="disabled2" @tap="_confirmBlanking">{{$t('button.ready-to-go')}}</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled3" @tap="_rawStart">{{$t('button.roll-down')}}</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>
-			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="type === '2' && disabled4" @tap="_rawScrollDowm('2')">{{$t('button.upper-axis')}}</button>
-			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="type === '4' && disabled4" @tap="_rawScrollDowm('4')">{{$t('button.lower-axis')}}</button>
 		</view>
 		<up-top ref="UT" :scrollTop="top"></up-top>
-		<SearchPopup
-			ref= "SearchPopup"
-			:conditions="conditions"
-			@clear="handleClear"
-			@search="searchList"
-		>
-		</SearchPopup>
 	</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
-	import SearchPopup from '@/components/SearchPopup.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import UpTop from '@/components/upTop.vue'
 	import {queryRawFoilList, createOrder, confirmBlanking, rawStart, rawScrollDowm} from '@/utils/getData1.js'
 	export default {
 		components: {
 			NavBar,
-			SearchPopup,
 			SearchBox,
 			UpTop
 		},
@@ -84,14 +94,8 @@
 			return {
 				title: '',
 				top: 0,
-				initialConditions: [
-					{ required: false, key: 'scan', label: this.$t('grid.point-code'), value: ''},
-					{ required: false, key: 'scan', label: this.$t('filter.mother-roll'), value: '' }
-				],
-				conditions: [
-					{ required: false,  key: 'scan', label: this.$t('grid.point-code'), value: ''},
-					{ required: false, key: 'scan', label: this.$t('filter.mother-roll'), value: '' }
-				],
+				val1: '',
+				val2: '',
 				dataList: [],
 				pkId: '',
 				pkObj: {},
@@ -120,22 +124,6 @@
 			this.$refs.UT.topData(e.scrollTop)
 		},
 		methods: {
-			toggleSearchPopup() {
-				uni.setNavigationBarColor({
-				  frontColor: '#000000', // 导航栏文字颜色，只能是 '#ffffff' 或 '#000000'
-				  backgroundColor: '#ffffff', // 导航栏背景颜色
-				  animation: {
-				    duration: 300, // 动画持续时间（毫秒）
-				    timingFunc: 'ease-in-out' // 动画效果
-				  }
-				});
-				this.$nextTick(() => {
-				  this.$refs.SearchPopup.init()
-				})
-			},
-			handleClear () {
-				this.conditions = [...this.initialConditions]
-			},
 			searchList () {
 				this.pkId = ''
 				this.pkObj = {}
@@ -146,7 +134,7 @@
 			},
 			// 查询列表
 			async _queryRawFoilList () {
-				let res = await queryRawFoilList(this.conditions[0].value, this.conditions[1].value, this.pageNum + '', this.pageSize + '')
+				let res = await queryRawFoilList(this.val1, this.val2, this.pageNum + '', this.pageSize + '')
 				this.totalCount = res.size
 				if (res.size > 0) {
 					const dataMap = res.data
@@ -218,13 +206,18 @@
 			async _rawScrollDowm (type) {
 				this.disabled4 = true
 				this.type = type
-				if (!this.pkId) {
+				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
 				}
 				try {
-					let res = await rawScrollDowm(this.pkObj, type)
+					let res = await rawScrollDowm(this.pkObj, type, this.val1)
 					this.disabled4 = false
 					this.type = ''
 					this.pkId = ''

utils/getData1.js

@@ -64,11 +64,12 @@ export const rawStart = (rjo) => request({
 	}
 })
 // 正常下卷/单下卷/单上轴/单下轴
-export const rawScrollDowm = (rjo, type) => request({
+export const rawScrollDowm = (rjo, type, code) => request({
 	url: 'api/pda/raw/scrollDowm',
 	data: {
 		raw_jo: rjo,
-		type: type
+		type: type,
+		point_code: code
 	}
 })
 // 1.2呼叫