生箔add

pages/ProductManage/SboProcess.vue

@@ -1,19 +1,189 @@
 <template>
-	<view>
+	<view class="container">
-		
+		<nav-bar title="生箔工序"></nav-bar>
+		<view class="content">
+			<view class="wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">设备</span>
+					</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">
+						<search-box v-model="val2" />
+					</view>
+				</view>
+			</view>
+			<view class="wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>状态</th>
+								<th>工单号</th>
+								<th>母卷号</th>
+								<th>机台编码</th>
+								<th>产品编码</th>
+								<th>理论长度</th>
+								<th>开始时间</th>
+								<th>结束时间</th>
+								<th>总重量</th>
+								<th>车号</th>
+								<th>生产区域</th>
+								<th>更新时间</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.container_name === pkId}">
+								<td>{{e.status_name}}</td>
+								<td>{{e.mfg_order_name}}</td>
+								<td>{{e.container_name}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.theory_height}}</td>
+								<td>{{e.realstart_time}}</td>
+								<td>{{e.realend_time}}</td>
+								<td>{{e.productin_qty}}</td>
+								<td>{{e.agvno}}</td>
+								<td>{{e.product_area}}</td>
+								<td>{{e.update_time}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="_needEmptyAxis">呼叫空抽</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled2" @tap="_confirmBlanking">确认下卷</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled3" @tap="_finishBlanking">下卷完成</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled4" @tap="_finish">结束</button>
+		</view>
 	</view>
 </template>
 
 <script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryRawFoilList, needEmptyAxis, confirmBlanking, finishBlanking, finish} from '@/utils/getData1.js'
 	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
 		data() {
 			return {
-				
+				val1: '',
+				val2: '',
+				options: [],
+				index: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled1: false
 			};
+		},
+		created () {
+		},
+		methods: {
+			handleChange (e) {
+				console.log(e)
+			},
+			/** 初始化查询 */
+			async _queryRawFoilList () {
+				if (!this.val1 || !this.val2) {
+					return
+				}
+				let res = await queryRawFoilList(this.val1, this.val2)
+				this.dataList = [...res.rows]	
+			},
+			async _needEmptyAxis () {
+				this.disabled1 = true
+				if (!this.pkId) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await needEmptyAxis(this.pkObj)
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+					this.disabled1 = false
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			async _confirmBlanking () {
+				this.disabled2 = true
+				if (!this.pkId) {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await confirmBlanking(this.pkObj)
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+					this.disabled2 = false
+				} catch (e) {
+					this.disabled2 = false
+				}
+			},
+			async _finishBlanking () {
+				this.disabled3 = true
+				if (!this.pkId) {
+					this.disabled3 = false
+					return
+				}
+				try {
+					let res = await finishBlanking(this.pkObj)
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+					this.disabled3 = false
+				} catch (e) {
+					this.disabled3 = false
+				}
+			},
+			async _finish () {
+				this.disabled4 = true
+				if (!this.pkId) {
+					this.disabled4 = false
+					return
+				}
+				try {
+					let res = await finish(this.pkObj)
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+					this.disabled4 = false
+				} catch (e) {
+					this.disabled4 = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.container_name ? '' : e.container_name
+				this.pkObj = this.pkId === e.container_name ? e : {}
+			}
 		}
 	}
 </script>
 
 <style lang="stylus">
-
+	.slide_new table td:first-child, .slide_new table th:first-child
+		width 92rpx
+	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
+		position sticky
+		left 92rpx
+		z-index 102
 </style>

pages/ProductManage/SboProdProgress.vue

@@ -8,7 +8,7 @@
 						<span class="filter_label">设备</span>
 					</view>
 					<view class="filter_input_wraper">
-						<input type="text" class="filter_input">
+						<search-box v-model="val1" />
 					</view>
 				</view>
 				<view class="filter_item">
@@ -16,7 +16,13 @@
 						<span class="filter_label">母卷</span>
 					</view>
 					<view class="filter_input_wraper">
-						<input type="text" class="filter_input">
+						<search-box v-model="val2" />
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">区域</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
 					</view>
 				</view>
 			</view>
@@ -50,30 +56,62 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button">查询</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2 || !index}" @tap="_queryRawFoil">查询</button>
 		</view>
 	</view>
 </template>
 
 <script>
-	import {queryProductArea, queryRawFoil} from '@/utils/getData1.js'
 	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryProductArea, queryRawFoil} from '@/utils/getData1.js'
 	export default {
 		components: {
-			NavBar
+			NavBar,
+			SearchBox
 		},
 		data() {
 			return {
-				dataList: [{container_name: '1111111'}]
+				val1: '',
+				val2: '',
+				options: [],
+				index: '',
+				dataList: []
 			};
 		},
+		created () {
+			this._queryProductArea()
+		},
 		methods: {
+			handleChange (e) {
+				console.log(e)
+			},
+			/** 选择器 */
+			selectChange(e) {
+				this.index = e
+			},
+			/** 生产区域下拉框查询 */
+			async _queryProductArea () {
+				let res = await queryProductArea()
+				this.options = [...res.rows]
+			},
+			/** 查询 */
+			async _queryRawFoil () {
+				if (!this.val1 || !this.val2 || !this.index) {
+					return
+				}
+				let res = await queryRawFoil(this.val1, this.val2, this.options[this.index].value)
+				this.dataList = [...res.rows]	
+			}
 		}
 	}
 </script>
 
 <style lang="stylus">
-.grid-wraper
+	.slide_new table td:first-child, .slide_new table th:first-child
-	height calc(100% - 238rpx)
+		width 92rpx
+	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
+		position sticky
+		left 92rpx
+		z-index 102
 </style>
-

pages/home/home.vue

@@ -4,7 +4,7 @@
 		<view class="userInfo-wrap">
 			<view class="userInfo">
 				<text class="p1">{{$store.getters.userName}}</text>
-				<text class="p2">欢迎进入扬州晶澳手持系统！</text>
+				<text class="p2">欢迎进入铜箔手持系统！</text>
 			</view>
 			<view class="exit" @tap="Quit">
 				<view class="icon-exit"></view>
@@ -24,7 +24,7 @@
 	export default {
 		data() {
 			return {
-				menu: [{url: '/pages/ProductManage/EmptyPipeInStore', name: '空管入库'}, {url: '/pages/ProductManage/ZjCasing', name: '子卷套管'}, {url: '/pages/ProductManage/ZjDelivery', name: '子卷配送'}, {url: '/pages/ProductManage/ZjOutStore', name: '子卷出站'}, {url: '/pages/task/painttask', name: '任务生成'}, {url: '/pages/task/sitemanage', name: '站点管理'}, {url: '/pages/task/pointrelease', name: '点位取放货确认'}, {url: '/pages/task/taskmanage', name: '任务管理'}, {url: '/pages/task/zlmanage', name: '指令管理'}]
+				menu: [{url: '/pages/ProductManage/SboProdProgress', name: '生箔生产进度'}, {url: '/pages/ProductManage/EmptyPipeInStore', name: '空管入库'}, {url: '/pages/ProductManage/ZjCasing', name: '子卷套管'}, {url: '/pages/ProductManage/ZjDelivery', name: '子卷配送'}, {url: '/pages/ProductManage/ZjOutStore', name: '子卷出站'}, {url: '/pages/task/painttask', name: '任务生成'}, {url: '/pages/task/sitemanage', name: '站点管理'}, {url: '/pages/task/pointrelease', name: '点位取放货确认'}, {url: '/pages/task/taskmanage', name: '任务管理'}, {url: '/pages/task/zlmanage', name: '指令管理'}]
 			};
 		},
 		mounted () {
@@ -41,13 +41,13 @@
 			toPage (url) {
 				uni.redirectTo({
 					url: url
-				})
+				})
-			},
+			},
-			Quit () {
+			Quit () {
-			  this.$store.dispatch('delUserInfo')
+			  this.$store.dispatch('delUserInfo')
 			  uni.redirectTo({
 			  	url: '/pages/login/login'
-			  })
+			  })
 			}
 		}
 	}
@@ -64,27 +64,27 @@
 	_fj()
 	_wh(100%,160rpx)
 	padding 0 30rpx
-	background-color $red
+	background-color $red
 	_bis('../../static/image/info_bg.png',auto,100%,right,bottom)
 	border-radius 12rpx
 	margin-bottom 20rpx
 .userInfo
 	_fj(,flex-start,column)
 .p1
-	_font(34rpx,1,#fff)
+	_font(34rpx,1,#fff)
 	padding-bottom 18rpx
-.p2
+.p2
 	_font(26rpx,1,#fff)
 .exit
 	_fj()
-	height 47rpx
+	height 47rpx
-	padding 0 15rpx
+	padding 0 15rpx
-	border 1px solid #FF967C
+	border 1px solid #FF967C
 	border-radius 20rpx
 .icon-exit
-	_wh(22rpx, 22rpx)
+	_wh(22rpx, 22rpx)
 	_bis('../../static/image/exit.png',22rpx)
-.exit-text
+.exit-text
 	_font(24rpx,47rpx,#fff,,right)
 	padding-left 10rpx
 .menu-wrap
@@ -94,7 +94,7 @@
 	_fj(center)
 	_wh(30%, 120rpx)
 	margin-bottom 40rpx
-	border 1px solid #e74f1a
+	border 1px solid #e74f1a
 	border-radius 5px
 	_font(26rpx, 60rpx,#e74f1a,,center)
 	&:nth-child(3n+2)

utils/getData1.js

@@ -1,3 +1,5 @@
+import request from './request.js'
+
 // 生箔生产进度
 // 1.1生产区域下拉框查询
 export const queryProductArea = (type) => request({