From ab6d9beb67918c5aa54b61dc683690db557ad209 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 2 Sep 2024 14:07:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E5=B7=A5?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/manage/modify-process.vue | 24 +++++++++++-------------
 utils/getData2.js               |  8 ++++++--
 utils/mork2.js                  |  8 +++++---
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/pages/manage/modify-process.vue b/pages/manage/modify-process.vue
index deb55fc..0def976 100644
--- a/pages/manage/modify-process.vue
+++ b/pages/manage/modify-process.vue
@@ -17,13 +17,13 @@
 								<td>{{e.order_code}}</td>
 								<td>
 									<view class="td_select">
-										<uni-data-select v-model="e.process" :localdata="options" @change="selectChange"></uni-data-select>
+										<uni-data-select v-model="e.region_code" :localdata="options" @change="selectChange"></uni-data-select>
 									</view>
 								</td>
 								<td>
 									<uni-datetime-picker
 										type="datetime"
-										v-model="e.time"
+										v-model="e.due_date"
 										@change="changeLog"
 									/>
 								</td>
@@ -35,7 +35,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !dataList.length}" :disabled="disabled" @tap="_handheldBlanking">入库确认</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !dataList.length}" :disabled="disabled" @tap="_updateOrder">入库确认</button>
 		</view>
 	</view>
 </template>
@@ -43,8 +43,8 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {regionList, modifyProcess} from '@/utils/mork2.js'
-	import {handheldBlanking} from '@/utils/getData2.js'
+	// import {regionList, fabOrders} from '@/utils/mork2.js'
+	import {regionList, fabOrders, updateOrder} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -71,30 +71,28 @@
 				this.options.map(el => {
 					this.$set(el, 'text', el.label)
 				})
-				this._modifyProcess()
+				this._fabOrders()
 			},
-			async _modifyProcess () {
-				let res = await modifyProcess()
-				this.dataList = [...res]
+			async _fabOrders () {
+				let res = await fabOrders()
+				this.dataList = [...res.content]
 			},
 			selectChange (val) {
-				console.log(val)
 			},
 			changeLog (e) {
-				console.log(e)
 			},
 			clearUp () {
 				this.dataList = []
 				this.disabled = false
 			},
-			async _handheldBlanking () {
+			async _updateOrder () {
 				this.disabled = true
 				if (!this.dataList.length) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await handheldBlanking(this.dataList)
+					let res = await updateOrder(this.dataList)
 					this.clearUp()
 				} catch (e) {
 					this.disabled = false
diff --git a/utils/getData2.js b/utils/getData2.js
index b92160b..0200e69 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -65,7 +65,11 @@ export const handheldBlanking = (code, rcode, vcode, material) => request({
 	data: {device_code: code, region_code: rcode, vehicle_code: vcode, material: material}
 })
 // 修改订单工序
-export const modifyProcess = (data) => request({
-	url:'api/handheld/modifyProcess',
+export const fabOrders = (data) => request({
+	url:'api/fab/orders',
+	data: data
+})
+export const updateOrder = (data) => request({
+	url:'api/handheld/updateOrder',
 	data: data
 })
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index b9f9216..fb56c7f 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -14,9 +14,11 @@ export const regionList = () => {
 	return res
 }
 	
-export const modifyProcess = (data) => {
-	let res = [
-		{order_code: '111', process: '1', time: '2020-10-10 11:30:30'}, {order_code: '111', process: '2', time: '2020-10-10 11:30:30'}
+export const fabOrders = (data) => {
+	let res = {
+		content: [
+		{order_code: '111', region_code: '3', due_date: '2020-10-10 11:30:30'}
 	]
+	}
 	return res
 }
\ No newline at end of file