From f9cdc2b4c506ee9d45e3e10c820b2c63243da54b Mon Sep 17 00:00:00 2001
From: sjz-mxj <1375998991@qq.com>
Date: Mon, 31 Jul 2023 20:34:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/massif/add_farming.vue |  2 +-
 pages/purchase/apply.vue     |  1 +
 pages/purchase/record.vue    | 20 +++++++++++---------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pages/massif/add_farming.vue b/pages/massif/add_farming.vue
index 08f20b1..3da6249 100644
--- a/pages/massif/add_farming.vue
+++ b/pages/massif/add_farming.vue
@@ -238,8 +238,8 @@ export default {
 			fields:{
 				principal:{label:"操作人",styleType:"parallel", disabled:true},
 				farmingTime:{label:"操作日期",styleType:"parallel",type:"calendar"},
-				userNum:{label:"人工投入(个)",type:"number"},
 				farmingPlanId:{label:"种植计划",type:"select",columns:[],value:[]},
+				userNum:{label:"人工投入(个)",type:"number"},
 				workTime:{label:"工时(天)",type:"number"},
 				images:{label:"农事图片",type:"upImg",num:3},
 				farmingRemarks:{label:"备注",type:"textarea"},
diff --git a/pages/purchase/apply.vue b/pages/purchase/apply.vue
index cc16ce1..d1d66ec 100644
--- a/pages/purchase/apply.vue
+++ b/pages/purchase/apply.vue
@@ -135,6 +135,7 @@ export default {
 	data(){
 		return{
 			formData:{
+				baseId:this.$store.state.baseInfo.id,
 				applicantId: "",
 				applicantName: "",
 				applicantTime: "",
diff --git a/pages/purchase/record.vue b/pages/purchase/record.vue
index a5b9791..08ea7da 100644
--- a/pages/purchase/record.vue
+++ b/pages/purchase/record.vue
@@ -94,10 +94,10 @@
 				</view>
 				<view class="foot">
 					<view class="examine">
-						<text v-if="true">审核人：xxx</text>
-						<text v-if="true" class="over">原因：此处是原因此处是原因此处是处是原因此处是原因此处是</text>
+						<text>审核部门：{{v.auditDepart}}</text>
+						<text  class="over">意见：{{v.reason}}</text>
 					</view>
-					<text class="type" :style="{'--bg':({2:'#FFCB69',3:'#10C176',4:'#EE263A',5:'#2196f3'})[v.applicantStatus]}">{{({2:"审核中",3:"通过",4:"未通过",5:"农资入库"})[v.applicantStatus]}}</text>
+					<text class="type" :style="{'--bg':({1:'#EE263A',2:'#FFCB69',3:'#FFCB69',4:'#FFCB69',5:'#00ff00'})[v.applicantStatus]}">{{({1:"审核未通过",2:"待审核",3:"待审核",4:"审核",5:"审核通过"})[v.applicantStatus]}}</text>
 				</view>
 			</view>
 			<u-empty :show="list.length<=0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
@@ -111,10 +111,11 @@ export default {
 		return{
 			searchVal:{
 				goodsName:"",
-				roleCode:this.$store.getters['userInfo'].roleCode,
+				// roleCode:this.$store.getters['userInfo'].roleCode,
 				pageNo:1,
 				pageSize:6,
-				companyId:this.$store.getters['userInfo'].companyId
+				baseId:this.$store.state.baseInfo.id,
+				// companyId:this.$store.getters['userInfo'].companyId
 			},
 			total:0,
 			list:[],
@@ -131,12 +132,13 @@ export default {
 		},
 		async search(){
 			if(this.total==0||this.list.length<this.total){
-				var res = await request("/api/purchase/purchaseList",{
-					params:this.searchVal
+				var res = await request("/api/purchase/purchasePageList",{
+					method:"post",
+					body:this.searchVal
 				})
 				if(res.statu){
-					this.list=this.list.concat(res.data.records)
-					this.total=res.data.total
+					this.list=this.list.concat(res.data.realRecords)
+					this.total=res.data.page.total
 					this.searchVal.pageNo++
 					if(this.list.length==this.total)uni.showToast({title:"加载完成！",icon:"none"})
 				}else{