From 20e06b67c5a0e0480dc019d54f0733636981d555 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 10 Nov 2023 17:19:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=B7=E7=A2=BE=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                        |  7 +++
 pages/home/home.vue               |  3 +-
 pages/modules/hunnian-operate.vue | 89 +++++++++++++++++++++++++++++++
 utils/getData2.js                 | 16 +++++-
 4 files changed, 113 insertions(+), 2 deletions(-)
 create mode 100644 pages/modules/hunnian-operate.vue

diff --git a/pages.json b/pages.json
index f2eb449..2329e27 100644
--- a/pages.json
+++ b/pages.json
@@ -121,6 +121,13 @@
             }
             
         }
+        ,{
+            "path" : "pages/modules/hunnian-operate",
+            "style": {
+            	"navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index fe62546..797bd30 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -67,7 +67,8 @@
 						{menu_id: '7', name: '空盘入库', path: '/pages/modules/empty-instore'}
 					]},
 					{menu_id: '6', icon: 'RF10', name: '压机搬运', path: '/pages/modules/press-carry', sonTree: []},
-					{menu_id: '7', icon: 'RF08', name: '货架盘点', path: '/pages/modules/shelf-check', sonTree: []}
+					{menu_id: '7', icon: 'RF08', name: '货架盘点', path: '/pages/modules/shelf-check', sonTree: []},
+					{menu_id: '8', icon: 'RF02', name: '混碾操作', path: '/pages/modules/hunnian-operate', sonTree: []}
 				],
 				show: false,
 				secM: []
diff --git a/pages/modules/hunnian-operate.vue b/pages/modules/hunnian-operate.vue
new file mode 100644
index 0000000..ac4755a
--- /dev/null
+++ b/pages/modules/hunnian-operate.vue
@@ -0,0 +1,89 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="混碾操作"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>压机编号</th>
+								<th>泥料号</th>
+								<th>工单号</th>
+								<th>是否上料</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{'checked': e.record_id === pkId}">
+								<td>{{e.device_code}}</td>
+								<td>{{e.material_id}}</td>
+								<td>{{e.workorder_id}}</td>
+								<td>{{e.is_finish}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" @tap="_mixRequestInfo">刷新</button>
+			<button class="submit-button" :disabled="disabled" @tap="toSure">删除</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import {mixRequestInfo, mixDeleteInfo} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar
+		},
+		data() {
+			return {
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false
+			};
+		},
+		created () {
+			this._mixRequestInfo()
+		},
+		methods: {
+			/** grid查询 */
+			async _mixRequestInfo () {
+				let res = await mixRequestInfo()
+				this.dataList = [...res]
+			},
+			/** 删除 */
+			async toSure () {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await mixDeleteInfo(this.pkObj)
+					this.disabled = false
+					this.pkId = ''
+					this.pkObj = {}
+					this._mixRequestInfo()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.record_id ? '' : e.record_id
+				this.pkObj = this.pkId === e.record_id ? e : {}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/utils/getData2.js b/utils/getData2.js
index 10e8739..939aad5 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -155,4 +155,18 @@ export const shelfUpdateData = (code, status, vcode, qty, id) => request({
 		material_qty: qty,
 		material_id: id
 	}
-})
\ No newline at end of file
+})
+
+/**
+ * 混碾操作
+ */
+// 获取要料信息
+export const mixRequestInfo = () => request({
+	url:'api/pda/mix/requestInfo',
+	data: {}
+})
+// 删除数据
+export const mixDeleteInfo = (obj) => request({
+	url:'api/pda/mix/deleteInfo',
+	data: obj
+})