From 265de772bd4dc446c6a8455175bfb0b284a145ff Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Wed, 24 Apr 2024 19:52:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=95=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MaterialProductionInput.js                |  15 +-
 .../MaterialProductionInput.vue               | 158 ++++++++++++++++--
 utils/request.js                              |   3 +-
 3 files changed, 157 insertions(+), 19 deletions(-)

diff --git a/api/materialManagement/MaterialProductionInput.js b/api/materialManagement/MaterialProductionInput.js
index ec88c0d..0019ac4 100644
--- a/api/materialManagement/MaterialProductionInput.js
+++ b/api/materialManagement/MaterialProductionInput.js
@@ -3,7 +3,7 @@ import upload from '@/utils/upload'
 
 export function achievestartpoints(params) {
 	return request({
-		url: 'mes/mm/materialinput/getstartpoints',
+		url: '/mes/mm/materialinput/getstartpoints',
 		method: 'get',
 		params
 	})
@@ -11,8 +11,17 @@ export function achievestartpoints(params) {
 
 export function achievesendpoints(params) {
 	return request({
-		url: 'mes/mm/materialinput/getendpoints',
+		url: '/mes/mm/materialinput/getendpoints',
 		method: 'get',
 		params
 	})
-}
\ No newline at end of file
+}
+
+
+export function getworkorderlist(data) {
+	return request({
+		url: '/mes/mm/materialinput/getworkorderlist',
+		method: 'post',
+		data
+	})
+}
diff --git a/pages/materialManagement/MaterialProductionInput/MaterialProductionInput.vue b/pages/materialManagement/MaterialProductionInput/MaterialProductionInput.vue
index aae2222..e527940 100644
--- a/pages/materialManagement/MaterialProductionInput/MaterialProductionInput.vue
+++ b/pages/materialManagement/MaterialProductionInput/MaterialProductionInput.vue
@@ -1,40 +1,168 @@
 <!-- 仓库配料 -->
 <template>
 	<view>
-		<u--text text="仓库配料表单" size="50"></u--text>
 		<u-line></u-line>
-		<u-scroll-list>
-			<view v-for="(item, index) in start_point_positions" :key="index">
-				<u-tag :text="item"></u-tag>
-			</view>
-		</u-scroll-list>
+		<view class="area">
+			<u--form labelPosition="left" labelWidth="240" :labelStyle="labelstyle">
+				<u-form-item label="输入站点" borderBottom>
+					<u--input
+						v-model="select_position"
+						border="surround"
+						placeholder="后置图标"
+						suffixIcon="map-fill"
+						suffixIconStyle="{color: #00aaff;font-size: 30px;}"
+					></u--input>
+				</u-form-item>
+			</u--form>
+
+			<u-scroll-list>
+				<view v-for="(item, index) in start_point_positions" :key="index">
+					<view style="margin-right: 10px">
+						<u-button type="primary" icon="map" :text="item" v-if="index % 3 == 0" @click="check_position(item)"></u-button>
+						<u-button type="success" icon="map" :text="item" v-if="index % 3 == 1" @click="check_position(item)"></u-button>
+						<u-button
+							color="linear-gradient(to right, rgb(66, 83, 216), rgb(213, 51, 186))"
+							icon="map"
+							:text="item"
+							v-if="index % 3 == 2"
+							@click="check_position(item)"
+						></u-button>
+					</view>
+				</view>
+			</u-scroll-list>
+		</view>
+		<u-line></u-line>
+		<view class="area">
+			<view style="margin-top: 5px; margin-bottom: 20px; font-size: 1.2rem">选择日期： {{ workerorder_time | formatDate }}</view>
+			<u-button @click="timeshow = true">选择日期</u-button>
+			<u-datetime-picker :show="timeshow" v-model="workerorder_time" mode="date" @confirm="confirm()" @cancel="timeshow = false"></u-datetime-picker>
+		</view>
+		<u-line></u-line>
+		<u-row gutter="30">
+			<u-col span="4">
+				<view>工单号</view>
+			</u-col>
+			<u-col span="3">
+				<span>计划上件数</span>
+			</u-col>
+			<u-col span="3">
+				<span>已经上件数</span>
+			</u-col>
+			<u-col span="2">
+				<span>选中</span>
+			</u-col>
+		</u-row>
+		<view class="area scrollable-container">
+			<u-list>
+				<u-list-item v-for="(item, index) in workerorder_list" :key="index">
+					<u-row gutter="30">
+						<u-col span="4">
+							<u-tag :text="item.clientWorkorder" plain></u-tag>
+						</u-col>
+						<u-col span="3">
+							<u-tag :text="item.previousNumber" plain></u-tag>
+						</u-col>
+						<u-col span="3">
+							<u-tag type="success" :text="item.previousNumbered" plain></u-tag>
+						</u-col>
+						<u-col span="2">
+							<u-switch v-model="item.selected" @change="change_selected(index)" size="38"></u-switch>
+						</u-col>
+					</u-row>
+					<u-line></u-line>
+				</u-list-item>
+			</u-list>
+		</view>
 	</view>
 </template>
 
 <script>
-import {achievestartpoints }   from '@/api/materialManagement/MaterialProductionInput.js';
+import { achievestartpoints, getworkorderlist } from '@/api/materialManagement/MaterialProductionInput.js';
 
 export default {
 	data() {
 		return {
-			start_point_positions: []
+			start_point_positions: [],
+			select_position: '', //选中的 站点
+			timeshow: false,
+			workerorder_time: Number(new Date()),
+			labelstyle: { 'font-size': '1.2rem' },
+			workerorder_list: []
 		};
 	},
+	filters: {
+		formatDate: function (value) {
+			// 创建一个 Date 对象，并使用时间戳初始化
+			const date = new Date(value);
+
+			// 提取年、月、日信息
+			const year = date.getFullYear();
+			const month = date.getMonth() + 1; // 月份从 0 开始，所以要加 1
+			const day = date.getDate();
+
+			return `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day}`;
+		}
+	},
+	watch: {
+		workerorder_time(newvalue, oldvalue) {
+			this.get_workorder_list();
+		}
+	},
 	mounted() {
-		this.get_startpoints()
+		this.get_startpoints();
 	},
 	methods: {
 		// todo 获取上料起点
 
-		get_startpoints(){
-			achievestartpoints().then((res)=>{
-				if(res.code==200){
-					this.start_point_positions=red.data;
+		get_startpoints() {
+			achievestartpoints().then((res) => {
+				if (res.code == 200) {
+					this.start_point_positions = res.data;
 				}
-			})
+			});
+		},
+		check_position(item) {
+			this.select_position = item;
+		},
+
+		//todo  选择时间
+		confirm() {
+			this.timeshow = false;
+		},
+		//todo  根据日期获取工单
+		get_workorder_list() {
+			let date = new Date(this.workerorder_time);
+			const query = {
+				datetimespan: date
+			};
+			getworkorderlist(query).then((res) => {
+				if (res.code == 200) {
+					this.workerorder_list = res.data;
+					this.workerorder_list.forEach((item) => {
+						item['selected'] = false;
+						item['previousNumbered'] = 0;
+					});
+				}
+			});
+		},
+		//todo  选中事件
+		change_selected(index) {
+			console.log(index);
+			//this.workerorder_list[index].selected = true;
+			this.$set(this.workerorder_list[index], 'selected', true);
+			console.log(this.workerorder_list[index])
 		}
 	}
 };
 </script>
 
-<style></style>
+<style scoped>
+.area {
+	background-color: white;
+}
+.scrollable-container {
+	height: 300px;
+	overflow: auto;
+	border: 3px solid #ccc;
+}
+</style>
diff --git a/utils/request.js b/utils/request.js
index 722cf60..84ed3b9 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -40,7 +40,7 @@ const request = config => {
 		config.url = url
 	}
 	return new Promise((resolve, reject) => {
-		
+
 		uni.request({
 				method: config.method || 'get',
 				timeout: config.timeout || timeout,
@@ -84,6 +84,7 @@ const request = config => {
 				resolve(res.data)
 			})
 			.catch(error => {
+						
 				let {
 					message
 				} = error