From 6aafccdf0c894a96ba8314d6f51ef5dc83b53426 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 11 Mar 2024 18:07:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=96=99=E5=87=BA=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.css            |  10 ++-
 pages.json                         |   8 ++
 pages/home/home.vue                |   2 +-
 pages/manage/empty-tray-in.vue     |   2 +-
 pages/manage/empty-tray-out.vue    |   2 +-
 pages/manage/group-in-storage.vue  |  12 +--
 pages/manage/mater-out-storage.vue | 133 +++++++++++++++++++++++++++++
 utils/getData2.js                  |  51 +++++------
 8 files changed, 182 insertions(+), 38 deletions(-)
 create mode 100644 pages/manage/mater-out-storage.vue

diff --git a/common/style/layout.css b/common/style/layout.css
index f37a0ed..35239e3 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -71,7 +71,7 @@ uni-button:after {
 	height: 80rpx;
 	font-size: 48rpx;
 	line-height: 80rpx;
-	color: #323232;
+	color: #4e6ef2;
 	text-align: center;
 }
 .icon_phone {
@@ -309,7 +309,7 @@ uni-button:after {
 	border-radius: 10rpx;
 }
 .slide_new table tbody tr td.fontcol1 {
-	color: #007de7;
+	color: #4e6ef2;
 }
 .slide_new table tbody tr td.fontcol2 {
 	color: #000;
@@ -319,16 +319,18 @@ uni-button:after {
 	line-height: 30rpx;
 	padding: 8rpx 20rpx;
 	border-radius: 8rpx;
+	background-color: #F60;
+	color: #fff;
 }
 .slide_new table tbody tr td .fontbg1 {
 	background-color: #cfd2d4;
 	color: #5e5d5d;
 }
-.slide_new table tbody tr td .fontbg3 {
+.slide_new table tbody tr td .fontbg2 {
 	background-color: #96f3b8;
 	color: #36744c;
 }
-.slide_new table tbody tr td .fontbg4 {
+.slide_new table tbody tr td .fontbg3 {
 	background-color: #f3ccb5;
 	color: #ff5e00;
 }
diff --git a/pages.json b/pages.json
index bc21cbf..6b4972a 100644
--- a/pages.json
+++ b/pages.json
@@ -96,6 +96,14 @@
             }
             
         }
+        ,{
+            "path" : "pages/manage/mater-out-storage",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 24de8a7..edaadf7 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -47,7 +47,7 @@
 					{id: 1, title: '空托盘出库', icon: 'RF01', path: '/pages/manage/empty-tray-out'},
 					{id: 2, title: '空托盘入库', icon: 'RF02', path: '/pages/manage/empty-tray-in'},
 					{id: 3, title: '组盘入库', icon: 'RF03', path: '/pages/manage/group-in-storage'},
-					{id: 4, title: '原料出库', icon: 'RF04', path: ''},
+					{id: 4, title: '原料出库', icon: 'RF04', path: '/pages/manage/mater-out-storage'},
 					{id: 5, title: '生产下料', icon: 'RF05', path: ''},
 					{id: 6, title: '点位更新', icon: 'RF06', path: ''},
 					{id: 7, title: '定点作业', icon: 'RF07', path: ''},
diff --git a/pages/manage/empty-tray-in.vue b/pages/manage/empty-tray-in.vue
index edc2db9..1f572b6 100644
--- a/pages/manage/empty-tray-in.vue
+++ b/pages/manage/empty-tray-in.vue
@@ -12,7 +12,7 @@
 							<view class="uni-input">{{index1 !== '' ? options1[index1].text : ''}}</view>
 						</picker>
 					</view>
-					<view class="uni-icons icon_right" @tap="toPhone">&#xe6b5;</view>
+					<view class="uni-icons icon_right">&#xe6b5;</view>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-5">
diff --git a/pages/manage/empty-tray-out.vue b/pages/manage/empty-tray-out.vue
index c09e6c0..1c61cd0 100644
--- a/pages/manage/empty-tray-out.vue
+++ b/pages/manage/empty-tray-out.vue
@@ -12,7 +12,7 @@
 							<view class="uni-input">{{index1 !== '' ? options1[index1].text : ''}}</view>
 						</picker>
 					</view>
-					<view class="uni-icons icon_right" @tap="toPhone">&#xe6b5;</view>
+					<view class="uni-icons icon_right">&#xe6b5;</view>
 				</view>
 				<!-- <view class="zd-row">
 					<view class="zd-col-5">
diff --git a/pages/manage/group-in-storage.vue b/pages/manage/group-in-storage.vue
index a62df22..fe9efa3 100644
--- a/pages/manage/group-in-storage.vue
+++ b/pages/manage/group-in-storage.vue
@@ -12,7 +12,7 @@
 							<view class="uni-input">{{index1 !== '' ? options1[index1].text : ''}}</view>
 						</picker>
 					</view>
-					<view class="uni-icons icon_right" @tap="toPhone">&#xe6b5;</view>
+					<view class="uni-icons icon_right">&#xe6b5;</view>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-5">
@@ -55,7 +55,7 @@
 						<span class="filter_label">是否配盘</span>
 					</view>
 					<view class="zd-col-19 zd-row jcflexend">
-						<switch :checked="isSwitchOn" color="#FFCC33" style="transform:scale(0.7)" @change="switch1Change"/>
+						<switch :checked="isSwitchOn" color="#4e6ef2" style="transform:scale(0.7)" @change="switch1Change"/>
 					</view>
 				</view>
 			</view>
@@ -76,7 +76,7 @@
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i" @click="toChose(e)" :class="{'checked': e.vehicle_code === pkId}">
 								<td class="fontcol1">{{e.vehicle_code}}</td>
-								<td><view class="fontbg fontbg1">{{e.vehicle_type}}</view></td>
+								<td><view class="fontbg">{{e.vehicle_type}}</view></td>
 								<td class="fontcol2">{{e.material_code}}</td>
 								<td class="fontcol2">{{e.material_name}}</td>
 								<td>{{e.point_code}}</td>
@@ -112,7 +112,7 @@
 						<tbody>
 							<tr v-for="e in dataList1" :key="e.group_id" @click="toCheck(e)" :class="{'checked': e.checked}">
 								<td class="fontcol1">{{e.vehicle_code}}</td>
-								<td><view class="fontbg fontbg1">{{e.vehicle_type}}</view></td>
+								<td><view class="fontbg">{{e.vehicle_type}}</view></td>
 								<td class="fontcol2">{{e.material_code}}</td>
 								<td class="fontcol2">{{e.material_name}}</td>
 								<td>{{e.point_code}}</td>
@@ -165,7 +165,7 @@
 		},
 		created () {
 			this._getVehicleType()
-			this._getMaterial()
+			this._queryMaterial()
 			this._queryExistGroup()
 		},
 		methods: {
@@ -178,7 +178,7 @@
 				this.index1 = e.detail.value
 			},
 			/** 物料下拉框*/
-			async _getMaterial (e) {
+			async _queryMaterial (e) {
 				let res = await queryMaterial(e)
 				res.map(el => {
 					this.$set(el, 'value', el.material_id)
diff --git a/pages/manage/mater-out-storage.vue b/pages/manage/mater-out-storage.vue
new file mode 100644
index 0000000..ea41803
--- /dev/null
+++ b/pages/manage/mater-out-storage.vue
@@ -0,0 +1,133 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="原料出库"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">物料</span>
+					</view>
+					<view class="zd-col-19 filter_select">
+						<zxz-uni-data-select v-model="index1" filterable :localdata="options1" @change="selectChange"></zxz-uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">出库点位</span>
+					</view>
+					<view class="zd-col-19">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<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="toChose(e)" :class="{'checked': e.point_code === pkId}">
+								<td class="fontcol1">{{e.point_code}}</td>
+								<td class="fontcol2">{{e.point_name}}</td>
+								<td>{{e.vehicle_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.material_qty}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-11 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-11 button-primary" :class="{'button-info': !pkId || !val1}" :disabled="disabled" @tap="_fullVehicleOut">出库</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryMaterial, queryLinkMaterial, fullVehicleOut} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				options1: [],
+				index1: '',
+				val1: '',
+				dataList: [],
+				pkId: '',
+				disabled: false
+			};
+		},
+		created () {
+			this._queryMaterial()
+		},
+		methods: {
+			/** 物料下拉框*/
+			async _queryMaterial (e) {
+				let res = await queryMaterial(e)
+				res.map(el => {
+					this.$set(el, 'value', el.material_id)
+					this.$set(el, 'text', el.material_name)
+				})
+				this.options1 = [...res]
+			},
+			selectChange (e) {
+				this._queryLinkMaterial(e)
+			},
+			/** grid */
+			async _queryLinkMaterial (e) {
+				let res = await queryLinkMaterial(e)
+				this.dataList = [...res]
+			},
+			toChose (e) {
+				this.pkId = this.pkId === e.point_code ? '' : e.point_code
+			},
+			async _fullVehicleOut () {
+				this.disabled = true
+				if (!this.pkId || !this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await fullVehicleOut(this.pkId, this.val1)
+					this.pkId = ''
+					this.disabled = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.index1 = ''
+				this.dataList = []
+				this.val1 = ''
+				this.disabled = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/utils/getData2.js b/utils/getData2.js
index a1c6fc5..97aa96e 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -171,6 +171,31 @@ export const fullVehicleIn = (code) => request({
 		point_code: code
 	}
 })
+/**
+ * 原料出库
+ */
+// 根据物料信息查询配盘信息
+// export const queryLinkMaterial = (id) => request({
+// 	url:'api/pda/queryLinkMaterial',
+// 	data: {
+// 		material_id: id
+// 	}
+// })
+export const queryLinkMaterial = () => {
+	let res = [
+    {
+        "point_code": "78",
+        "point_name": "片百人共",
+        "vehicle_code": "52",
+        "material_id": "89",
+        "material_code": "85",
+        "material_name": "战干者许",
+        "pcsn": "ullamco Ut",
+        "material_qty": "100"
+    }
+]
+	return res
+}
 /**
  * 任务流转
  */
@@ -243,31 +268,7 @@ export const queryPoints = (type) => request({
 
 
 
-/**
- * 原材料库出库
- */
-// 1.1物料查询
-export const queryLinkMaterial = (id) => request({
-	url:'api/pda/queryLinkMaterial',
-	data: {
-		material_id: id
-	}
-})
-// export const queryLinkMaterial = () => {
-// 	let res = [
-//     {
-//         "point_code": "78",
-//         "point_name": "片百人共",
-//         "vehicle_code": "52",
-//         "material_id": "89",
-//         "material_code": "85",
-//         "material_name": "战干者许",
-//         "pcsn": "ullamco Ut",
-//         "material_qty": "100"
-//     }
-// ]
-// 	return res
-// }
+
 // 1.2满托出库
 export const fullVehicleOut = (code1, code2) => request({
 	url:'api/pda/fullVehicleOut',