From 566ac88c89db5d77a30359864320def78781db90 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Thu, 12 Mar 2026 13:49:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                           |  14 +++
 pages/hdyy/wrcdj/cksl-matersave.vue  | 165 +++++++++++++++++++++++++++
 pages/hdyy/wrcdj/cksl.vue            | 157 +++++++++++++++++++++++++
 pages/hdyy/wrcdj/wrc-load.vue        |   2 -
 pages/hdyy/wrcdj/wrc-unload.vue      |   2 -
 pages/hdyy/wrcdj/wrczh-matersave.vue |   2 +-
 utils/getData3.js                    |   2 +-
 utils/mork02.js                      |   1 +
 8 files changed, 339 insertions(+), 6 deletions(-)
 create mode 100644 pages/hdyy/wrcdj/cksl-matersave.vue
 create mode 100644 pages/hdyy/wrcdj/cksl.vue

diff --git a/pages.json b/pages.json
index e928163..8d9e14d 100644
--- a/pages.json
+++ b/pages.json
@@ -538,6 +538,20 @@
                 "navigationStyle": "custom"
             }
         }
+        ,{
+            "path" : "pages/hdyy/wrcdj/cksl",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
+        ,{
+            "path" : "pages/hdyy/wrcdj/cksl-matersave",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/hdyy/wrcdj/cksl-matersave.vue b/pages/hdyy/wrcdj/cksl-matersave.vue
new file mode 100644
index 0000000..e4aeb45
--- /dev/null
+++ b/pages/hdyy/wrcdj/cksl-matersave.vue
@@ -0,0 +1,165 @@
+<template>
+	<view class="zd_container">
+		<!-- 物料维护（仓库送料） -->
+		<nav-bar :title="title" :inner="true"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">无人车点位</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<uni-data-select v-model="index1" :localdata="options1"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">物料类别</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<uni-data-select v-model="index2" :localdata="options2"></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-14">
+						<input type="text" placeholder="输入物料关键字" class="filter_input" v-model="keyword" @focus="handleFocus">
+					</view>
+					<button class="mini-btn" type="primary" @tap="_queryMaterialInfo">查询</button>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th @tap="toAllCheck"><uni-icons :type="allCheck ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></th>
+								<!-- <th></uni-icons></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">
+								<td @tap="toCheck(e)"><uni-icons :type="e.checked ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.class_name}}</td>
+								<td>{{e.supp_name}}</td>
+								<td>{{e.produce_name}}</td>
+								<td>{{e.quality_code}}</td>
+								<td>{{e.unit_name}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-11 button-primary" :class="{'button-info': !(this.index1 && this.checkedArr.length)}" @tap="toSure">确认</button>
+			<button class="zd-col-11 button-primary" @tap="toQuit">退出</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryCarPoint, queryClassType, queryMaterialInfo} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				keyword: null,
+				options1: [],
+				index1: '',
+				options2: [],
+				index2: '',
+				dataList: [],
+				// dataList: [{material_code: 'm001', qty: 100, checked: false, initialQty: 100}, {material_code: 'm002', qty: 200, checked: false, initialQty: 200}, {material_code: 'm003', qty: 300, checked: false, initialQty: 300}, {material_code: 'm004', qty: 400, checked: false, initialQty: 400}],
+				allCheck: false,
+				checkedArr: []
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._queryCarPoint()
+			this._queryClassType()
+		},
+		methods: {
+			handleFocus () {
+				this.keyword = null
+			},
+			async _queryCarPoint () {
+				try {
+					let res = await queryCarPoint()
+					if (res) {
+						this.options1 = res.data
+					} else {
+						this.options1 = []
+					}
+				} catch (e) {
+					this.options1 = []
+				}
+			},
+			
+			async _queryClassType () {
+				try {
+					let res = await queryClassType()
+					if (res) {
+						this.options2 = res.data
+					} else {
+						this.options2 = []
+					}
+				} catch (e) {
+					this.options2 = []
+				}
+			},
+			async _queryMaterialInfo () {
+				try {
+					let res = await queryMaterialInfo(this.index2, this.keyword)
+					if (res && res.data.length > 0) {
+						this.dataList = [...res.data]
+					} else {
+						this.dataList = []
+					}
+				} catch (e) {
+					this.dataList = []
+				}
+			},
+			toAllCheck () {
+				this.allCheck = !this.allCheck
+				this.dataList.map(el => {
+					el.checked = this.allCheck
+				})
+				this.checkedArr = this.dataList.filter(el => el.checked === true)
+			},
+			toCheck (e) {
+				e.checked = !e.checked
+				this.checkedArr = this.dataList.filter(el => el.checked === true)
+				this.allCheck = this.checkedArr.length === this.dataList.length
+			},
+			toSure () {
+				if (this.index1 && this.checkedArr.length) {
+					this.$store.dispatch('setPublicArr', this.checkedArr)
+					this.$store.dispatch('setPublicObj', this.index1)
+					uni.navigateBack()
+				}
+			},
+			toQuit () {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/hdyy/wrcdj/cksl.vue b/pages/hdyy/wrcdj/cksl.vue
new file mode 100644
index 0000000..7c04378
--- /dev/null
+++ b/pages/hdyy/wrcdj/cksl.vue
@@ -0,0 +1,157 @@
+<template>
+	<view class="zd_container">
+		<!-- 仓库送料 -->
+		<nav-bar :title="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>
+								<th>数量</th>
+								<th>计量单位</th>
+								<th>操作</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td>{{e.point_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td><input type="text" class="sin_input" v-model="e.pcsn"></td>
+								<td><input type="number" class="sin_input" v-model="e.qty"  @blur="handleBlur(e)"></td>
+								<td>{{e.unit_name}}</td>
+								<td style="color: #4e6ef2;" @tap="toDel(e)">删除</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-7 button-primary" :disabled="disabled" @tap="_callCarIos">呼叫无人车</button>
+			<button class="zd-col-7 button-primary" @tap="toZh">装货</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !dataList.length}" :disabled="disabled" @tap="_sendTask">确认送料</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {callCarIos, sendTask} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				pointCode: '',
+				dataList: [],
+				// dataList: [{material_code: 'm001', qty: 100, checked: false, initialQty: 100}, {material_code: 'm002', qty: 200, checked: false, initialQty: 200}],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		onShow () {
+			this.pointCode = this.$store.getters.publicObj
+			if (this.$store.getters.publicArr.length) {
+				const newItems = this.$store.getters.publicArr;
+				const existingCodes = new Set(this.dataList.map(item => item.material_code));
+				newItems.forEach(item => {
+					// 若物料编码不存在于现有集合中，则添加
+					if (!existingCodes.has(item.material_code)) {
+						item.point_code = this.pointCode
+						item.pcsn = ''
+						item.qty = ''
+						this.dataList.push(item)
+						existingCodes.add(item.material_code)
+					}
+				});
+				this.$store.dispatch('setPublicArr', '')
+				console.log(90)
+			}
+		},
+		methods: {
+			handleBlur (e) {
+				if (e.qty) {
+					if (e.qty < 0) {
+						e.qty = 0
+					} else {
+						e.qty = e.qty.replace(/[^0-9]/g, '')
+						e.qty = e.qty.replace(/^0+/, '') || '0'
+					}
+				} else {
+					// uni.showToast({
+					// 	title: '数量必填',
+					// 	icon: 'none'
+					// })
+				}
+			},
+			toDel (e) {
+				const index = this.dataList.indexOf(e)
+				if (index !== -1) {
+					this.dataList.splice(index, 1); // 直接修改原数组，视图自动更新
+				}
+			},
+			toEmpty () {
+				this.dataList = []
+				this.disabled = false
+			},
+			toZh () {
+				uni.navigateTo({
+					url: '/pages/hdyy/wrcdj/cksl-matersave?title=物料维护'
+				})
+			},
+			async _callCarIos () {
+				this.disabled = true
+				try {
+					let res = await callCarIos()
+					if (res) {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+					this.toEmpty()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _sendTask () {
+				const hasEmpty = this.dataList.some(item => item.pcsn === '' || item.qty === '');
+				if (hasEmpty) {
+					uni.showToast({
+						title: '请填写批号和数量',
+						icon: 'none'
+					})
+					return false
+				}
+				console.log(this.dataList, 666)
+				this.disabled = true
+				try {
+					let res = await sendTask(this.dataList)
+					if (res) {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+					this.toEmpty()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/hdyy/wrcdj/wrc-load.vue b/pages/hdyy/wrcdj/wrc-load.vue
index 974f79d..293fdae 100644
--- a/pages/hdyy/wrcdj/wrc-load.vue
+++ b/pages/hdyy/wrcdj/wrc-load.vue
@@ -9,7 +9,6 @@
 						<thead>
 							<tr>
 								<!-- <th @tap="toAllCheck"><uni-icons :type="allCheck ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></th> -->
-								<th>序号</th>
 								<th>点位编码</th>
 								<th>点位名称</th>
 								<th>点位状态</th>
@@ -22,7 +21,6 @@
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
 								<!-- <td @tap="toCheck(e)"><uni-icons :type="e.checked ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></td> -->
-								<td>{{i+1}}</td>
 								<td>{{e.point_code}}</td>
 								<td>{{e.point_name}}</td>
 								<td>{{['', '空位', '有箱有料'][Number(e.point_status)]}}</td>
diff --git a/pages/hdyy/wrcdj/wrc-unload.vue b/pages/hdyy/wrcdj/wrc-unload.vue
index 517d45d..236262d 100644
--- a/pages/hdyy/wrcdj/wrc-unload.vue
+++ b/pages/hdyy/wrcdj/wrc-unload.vue
@@ -8,7 +8,6 @@
 					<table>
 						<thead>
 							<tr>
-								<th>序号</th>
 								<th>点位编码</th>
 								<th>点位名称</th>
 								<th>物料编码</th>
@@ -18,7 +17,6 @@
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
-								<td>{{i+1}}</td>
 								<td>{{e.point_code}}</td>
 								<td>{{e.point_name}}</td>
 								<td>{{e.material_code}}</td>
diff --git a/pages/hdyy/wrcdj/wrczh-matersave.vue b/pages/hdyy/wrcdj/wrczh-matersave.vue
index a6866b8..2f1e3c7 100644
--- a/pages/hdyy/wrcdj/wrczh-matersave.vue
+++ b/pages/hdyy/wrcdj/wrczh-matersave.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<!-- 物料维护 -->
+		<!-- 物料维护（无人车装货） -->
 		<nav-bar :title="title" :inner="true"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
diff --git a/utils/getData3.js b/utils/getData3.js
index 9fc992a..1dcb455 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -506,7 +506,7 @@ export const callCarIos = () => request({
 	data: {}
 })
 // 确认送料
-export const sendTask = () => request({
+export const sendTask = (rows) => request({
 	url:'api/notCar/sendTask',
 	data: {rows: rows}
 })
diff --git a/utils/mork02.js b/utils/mork02.js
index 9fb0564..9343a31 100644
--- a/utils/mork02.js
+++ b/utils/mork02.js
@@ -7,6 +7,7 @@ export const allAuthority = () => {
 			{menu_id: '1', path: 'RF01', title: '无人车对接', sonTree: [
 				{menu_id: '1', title: '无人车卸货', path: '/pages/hdyy/wrcdj/wrc-unload'},
 				{menu_id: '2', title: '无人车装货', path: '/pages/hdyy/wrcdj/wrc-load'},
+				{menu_id: '3', title: '仓库送料', path: '/pages/hdyy/wrcdj/cksl'},
 			]},
 			{menu_id: '2', path: 'RF02', title: '空载具管理', sonTree: [
 				{menu_id: '1', title: '空载具入库', path: '/pages/hdyy/kzj/kzj-instore'},