From 40bab7f4860e691e26684f2586f67b5905c4783e Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 13 Apr 2023 19:31:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/management/DeliveryConfirm.vue     |  2 +-
 pages/management/HalfFinishedInStore.vue |  3 +-
 pages/management/MaterList.vue           |  4 +-
 utils/getData2.js                        | 52 ++++--------------------
 vuex/modules/data.js                     |  9 ++--
 5 files changed, 18 insertions(+), 52 deletions(-)

diff --git a/pages/management/DeliveryConfirm.vue b/pages/management/DeliveryConfirm.vue
index 60fd279..ad16f48 100644
--- a/pages/management/DeliveryConfirm.vue
+++ b/pages/management/DeliveryConfirm.vue
@@ -77,7 +77,7 @@
 			},
 			async _releasepoint (type) {
 			  try {
-				let res = await inOutExceptionInstConfirm(this.index1, this.val1, type) 
+				let res = await releasepoint(this.index1, this.val1, type) 
 				this.disabled1 = false
 				this.disabled2 = false
 				this.index1 = ''
diff --git a/pages/management/HalfFinishedInStore.vue b/pages/management/HalfFinishedInStore.vue
index 284deb7..941d1aa 100644
--- a/pages/management/HalfFinishedInStore.vue
+++ b/pages/management/HalfFinishedInStore.vue
@@ -74,11 +74,12 @@
 			};
 		},
 		onShow () {
+			console.log(this.$store.getters.publicObj)
 			if (this.$store.getters.publicObj !== '') {
 				this.val2 = this.$store.getters.publicObj.material_code
 				this.val3 = this.$store.getters.publicObj.material_name
 				this.val4 = this.$store.getters.publicObj.material_spec
-				this.val7 = this.$store.getters.publicObj.material_id
+				this.val7 = this.$store.getters.publicObj.material_uuid
 			}
 		},
 		destroyed () {
diff --git a/pages/management/MaterList.vue b/pages/management/MaterList.vue
index 41e08ac..c65cd15 100644
--- a/pages/management/MaterList.vue
+++ b/pages/management/MaterList.vue
@@ -29,7 +29,7 @@
 					</tr>
 				</thead>
 				<tbody>
-					<tr v-for="e in dataList" :key="e.sale_code" :class="{'checked': e.checked}">
+					<tr v-for="e in dataList" :key="e.material_id" :class="{'checked': e.checked}">
 						<td>
 							<view class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}" @tap="toCheck(e)">&#xe608;</view>
 						</td>
@@ -83,7 +83,7 @@
 			},
 			/** 初始化查询 */
 			async _orderSearch () {
-				let res = await orderSearch(this.val1, this.pageNum + '', this.pageSize + '')
+				let res = await orderSearch(this.pageNum + '', this.pageSize + '', this.val1)
 				this.totalCount = res.totalElements
 				if (res.totalElements > 0) {
 					res.content.map(el => {
diff --git a/utils/getData2.js b/utils/getData2.js
index 518783f..e4ab981 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -112,52 +112,14 @@ export const deleteBox = (obj) => request({
 
 /** 物料列表 */
 // 根据订单获取订单信息
-// export const orderSearch = (page, size, order) => request({
-// 	url:'api/pda/finishproduct/order',
-// 	data: {
-// 		order: order,
-// 		page: page,
-// 		size: size
-// 	}
-// })
-export const orderSearch = (page, size, order) => {
-	let res = {
-		"content": [
-		    {
-		      "sale_id": "1638477659967197184",
-		      "plandeliver_date": "",
-		      "sale_type": "YBO1",
-		      "produce_seq": "1",
-		      "order_line_code": "abe23eb6-d906-11ed-aaf6-20283eb8db7f",
-		      "remark": "",
-		      "is_success": "0",
-		      "update_time": "2023-03-22 17:48:10",
-		      "material_spec": "M1/2",
-		      "update_optname": "管理员",
-		      "create_id": "1",
-		      "sale_qty": "2060",
-		      "sale_code": "0022058857",
-		      "cust_name": "",
-		      "material_name": "紫铜直通连接帽\\CG\\M1/2\\ZM-BA40104",
-		      "seq_no": "100",
-		      "qty_unit_id": "1638470541201510400",
-		      "create_time": "2023-03-22 17:48:10",
-		      "unit_name": "PC",
-		      "cust_code": "",
-		      "material_id": "1528699594626699264",
-		      "cust_id": "",
-		      "status": "10",
-		      "create_name": "管理员",
-		      "update_optid": "1",
-		      "material_code": "24005459",
-			  "in_qty": '0.000',
-			  "checked": true
-		    }, {sale_code: '1'}
-		  ],
-		  "totalElements": 14
+export const orderSearch = (page, size, order) => request({
+	url:'api/pda/finishproduct/order',
+	data: {
+		order: order,
+		page: page,
+		size: size
 	}
-	return res
-}
+})
 
 /** 成品入库 */
 // 入库
diff --git a/vuex/modules/data.js b/vuex/modules/data.js
index f623507..e2914f9 100644
--- a/vuex/modules/data.js
+++ b/vuex/modules/data.js
@@ -16,9 +16,12 @@ const actions = {
   }
 }
 const mutations = {
-  [types.PUBLIC_ARR] (state, res) {
-    state.publicArr = res
-  }
+	[types.PUBLIC_OBJ] (state, res) {
+	  state.publicObj = res
+	},
+	[types.PUBLIC_ARR] (state, res) {
+	state.publicArr = res
+	}
 }
 export default {
   state,