From 5a114f556777ca11ee7fd1203096b50b69e33a78 Mon Sep 17 00:00:00 2001
From: xiaokangsix <2539509415@qq.com>
Date: Fri, 26 Apr 2024 18:32:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                                      |   2 +-
 pages.json                                   |   1 -
 pages/projectEnd/qualityManage/taskList.vue  |   4 +-
 pages/projectEnd/ukashManage/lookDetails.vue |  50 ++++
 pages/projectEnd/ukashManage/materials.vue   | 241 ++++++++++---------
 pages/projectEnd/ukashManage/ukashManage.vue | 239 +++++++++---------
 6 files changed, 296 insertions(+), 241 deletions(-)
 create mode 100644 pages/projectEnd/ukashManage/lookDetails.vue

diff --git a/main.js b/main.js
index c100f7d1..ccb8eb7f 100644
--- a/main.js
+++ b/main.js
@@ -39,7 +39,7 @@ if (process.env.NODE_ENV === 'development') {
   // Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
   // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
   // Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
-  Vue.prototype.url_config = 'http://192.168.34.155:19111/' //郭圣雄本地
+  Vue.prototype.url_config = 'http://192.168.34.155:19111/' //
   // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址
   Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址
   // Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里
diff --git a/pages.json b/pages.json
index 5dd81822..dd4d1926 100644
--- a/pages.json
+++ b/pages.json
@@ -1395,7 +1395,6 @@
 	  "path": "pages/projectEnd/ukashManage/ukashManage",
 	  "style": {
 	    "navigationBarTitleText": "",
-	    "enablePullDownRefresh": false,
 		"enablePullDownRefresh": true,
 		"onReachBottomDistance": 100
 	  }
diff --git a/pages/projectEnd/qualityManage/taskList.vue b/pages/projectEnd/qualityManage/taskList.vue
index 3e861117..b175e53e 100644
--- a/pages/projectEnd/qualityManage/taskList.vue
+++ b/pages/projectEnd/qualityManage/taskList.vue
@@ -11,11 +11,11 @@
             待整改
           </view>
 		  <view class="info-item b-right">
-		    <text>{{ statisticsData.checkNum }}</text>
+		    <text>{{ statisticsData.reviewNum }}</text>
 		    待复查
 		  </view>
           <view class="info-item b-right">
-            <text>{{ statisticsData.reviewNum }}</text>
+            <text>{{ statisticsData.checkNum }}</text>
             待核验
           </view>
           <view class="info-item">
diff --git a/pages/projectEnd/ukashManage/lookDetails.vue b/pages/projectEnd/ukashManage/lookDetails.vue
new file mode 100644
index 00000000..842e32ba
--- /dev/null
+++ b/pages/projectEnd/ukashManage/lookDetails.vue
@@ -0,0 +1,50 @@
+<template>
+  <view class="projectList">
+    <headers class="fixedheader" :themeType="true" :showBack="true">
+      <view class="headerName">
+        查看明细
+      </view>
+    </headers>
+  <view class="details">
+
+  </view>
+  </view>
+</template>
+
+<script>
+  import headers from '../../../components/headers/headers.vue'
+
+  export default {
+    data() {
+      return {
+
+      }
+    },
+    onShow() {
+    },
+	onLoad(vai) {
+
+	},
+    onReachBottom() {
+	
+    },
+    onPullDownRefresh() {
+
+    },
+    methods: {
+
+      }
+    }
+  
+</script>
+
+<style lang="scss" scoped>
+.projectList{
+	min-height: 100%;
+	background: #f4f5fd;
+	.details{
+		margin: 10px;
+		background-color: #fff;
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pages/projectEnd/ukashManage/materials.vue b/pages/projectEnd/ukashManage/materials.vue
index 7c859af0..bcbe06be 100644
--- a/pages/projectEnd/ukashManage/materials.vue
+++ b/pages/projectEnd/ukashManage/materials.vue
@@ -1,130 +1,133 @@
 <template>
-  <view class="projectList">
-    <headers class="fixedheader" :themeType="true" :showBack="true">
-      <view class="headerName">
-        材料入场管理
-      </view>
-    </headers>
-  <view>
-	  <view class="ukashList">
-	  	  <view class="ukashList-what">
-			  <span style="font-size: 14px;font-weight: 700;">0000</span>
-			  <span class="ukashList-look">查看明细</span>
-		  </view>
-		  <view class="ukashList-time">型号: 2222s</view>
-		  <view class="ukashList-time">规格: 2222s</view>
-		  <view class="ukashList-time">单位: 2222s</view>
-		  <view class="ukashList-time">数量: 2222s</view>
-	  </view>
-  </view>
-  </view>
+	<view class="projectList">
+		<headers class="fixedheader" :themeType="true" :showBack="true">
+			<view class="headerName">
+				材料入场管理
+			</view>
+		</headers>
+		<view>
+			<view class="ukashList">
+				<view class="ukashList-what">
+					<span style="font-size: 14px;font-weight: 700;">0000</span>
+					<span class="ukashList-look">查看明细</span>
+				</view>
+				<view class="ukashList-time">型号: 2222s</view>
+				<view class="ukashList-time">规格: 2222s</view>
+				<view class="ukashList-time">单位: 2222s</view>
+				<view class="ukashList-time">数量: 2222s</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-  import headers from '../../../components/headers/headers.vue'
+	import headers from '../../../components/headers/headers.vue'
 
-  export default {
-    data() {
-      return {
-       search:'',
-	   pageNo: 1,
-	   pageSize: 10,
-	   isLoadMore:false,
-	   dataList:[],
-	   id:''
-      }
-    },
-    onShow() {
-     this.queryList()
-    },
-	onLoad(vai) {
-		console.log(vai.itemS);
-		this.id = vai.itemS
-	},
-    onReachBottom() {
-		console.log(99999);
-   if (!this.isLoadMore) {
-     this.isLoadMore = true
-     this.pageNo + 1
-     this.queryList()
-   }
-    },
-    onPullDownRefresh() {
-		console.log(222);
- this.pageNo = 1
- this.dataList = []
- this.queryList()
-    },
-    methods: {
-     queryList() {
-       let data = {
-         id:this.id
-       }
-       let _this = this
-       this.sendRequest({
-         url: 'xmgl/xzMaterial/queryById',
-         method: 'post',
-         data: data,
-         success: res => {
-			 console.log(res);
-           // this.dataList =res.result.records
-           // if (res.result.records.length < this.pageSize) {
-           //   //判断接口返回数据量小于请求数据量，则表示此为最后一页
-           //   this.isLoadMore = true
-           //   this.loadStatus = 'nomore'
-           // } else {
-           //   this.isLoadMore = false
-           //   // that.loadStatus='more'
-           // }
-           // uni.stopPullDownRefresh()
-           // // console.log(res.result)
-         }
-       })
-     },
-      }
-    }
-  
+	export default {
+		data() {
+			return {
+				search: '',
+				pageNo: 1,
+				pageSize: 10,
+				isLoadMore: false,
+				dataList: [],
+				id: ''
+			}
+		},
+		onShow() {
+			this.queryList()
+		},
+		onLoad(vai) {
+			console.log(vai.itemS);
+			this.id = vai.itemS
+		},
+		onReachBottom() {
+			console.log(99999);
+			// if (!this.isLoadMore) {
+			//   this.isLoadMore = true
+			//   this.pageNo + 1
+			//   this.queryList()
+			// }
+		},
+		onPullDownRefresh() {
+			console.log(222);
+			this.pageNo = 1
+			this.dataList = []
+			this.queryList()
+		},
+		methods: {
+			queryList() {
+				let data = {
+					id:this.id
+				}
+				let _this = this
+				this.sendRequest({
+					url: 'xmgl/xzMaterialDetail/queryById',
+					method: 'post',
+					data: data,
+					success: res => {
+						console.log(res);
+						// this.dataList =res.result.records
+						// if (res.result.records.length < this.pageSize) {
+						//   //判断接口返回数据量小于请求数据量，则表示此为最后一页
+						//   this.isLoadMore = true
+						//   this.loadStatus = 'nomore'
+						// } else {
+						//   this.isLoadMore = false
+						//   // that.loadStatus='more'
+						// }
+						// uni.stopPullDownRefresh()
+						// // console.log(res.result)
+					}
+				})
+			},
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-	.projectList{
+	.projectList {
 		min-height: 100%;
 		background: #f4f5fd;
-		
-	.uni-input {
-    border-radius: 10px;
-    margin: 10px 10px;
-    background-color: #e6e7ef;
-    height: 35px;
-    line-height: 30px;
-    padding: 0 20px;
-    font-size: 14px;
-  }
-  .ukashList{
-	  height: 163px;
-	  background-color: #fff;
-	   margin: 10px 10px;
-	   border-radius: 15px;
-	   .ukashList-what{
-		   display: flex;
-		   justify-content: space-between;
-		   margin: 0 15px;
-		   padding-top: 10px;
-		   .ukashList-look{
-			   background-color: #5081f7;
-			   border-radius: 10px;
-			   padding: 0 4px;
-			   font-size: 12px;
-			   text-align: center;
-			   color: #fff;
-		   }
-	   }
-	   .ukashList-time{
-		   margin-top: 15px;
-		   margin-left: 15px;
-		   font-size: 12px;
-		   color: #b9bbc9;
-	   }
-  }
-  }
+
+		.uni-input {
+			border-radius: 10px;
+			margin: 10px 10px;
+			background-color: #e6e7ef;
+			height: 35px;
+			line-height: 30px;
+			padding: 0 20px;
+			font-size: 14px;
+		}
+
+		.ukashList {
+			height: 163px;
+			background-color: #fff;
+			margin: 10px 10px;
+			border-radius: 15px;
+
+			.ukashList-what {
+				display: flex;
+				justify-content: space-between;
+				margin: 0 15px;
+				padding-top: 10px;
+
+				.ukashList-look {
+					background-color: #5081f7;
+					border-radius: 10px;
+					padding: 0 4px;
+					font-size: 12px;
+					text-align: center;
+					color: #fff;
+				}
+			}
+
+			.ukashList-time {
+				margin-top: 15px;
+				margin-left: 15px;
+				font-size: 12px;
+				color: #b9bbc9;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/projectEnd/ukashManage/ukashManage.vue b/pages/projectEnd/ukashManage/ukashManage.vue
index 5b2c82df..0ed48d76 100644
--- a/pages/projectEnd/ukashManage/ukashManage.vue
+++ b/pages/projectEnd/ukashManage/ukashManage.vue
@@ -1,129 +1,132 @@
 <template>
-  <view class="projectList">
-    <headers class="fixedheader" :themeType="true" :showBack="true">
-      <view class="headerName">
-        材料入场管理
-      </view>
-    </headers>
-  <input class="uni-input" name="searchName" v-model="search" placeholder="请搜索" />
-  <view>
-	  <view class="ukashList" v-for="item in dataList" :key="item.id" @click="jobMaterials(item.id)">
-	  	  <view class="ukashList-what">
-			  <span style="font-size: 14px;font-weight: 700;">{{item.name}}</span>
-			  <span class="ukashList-look">查看明细</span>
-		  </view>
-		  <view class="ukashList-time">入场时间: {{item.entryTime}}</view>
-	  </view>
-  </view>
-  </view>
+	<view class="projectList">
+		<headers class="fixedheader" :themeType="true" :showBack="true">
+			<view class="headerName">
+				材料入场管理
+			</view>
+		</headers>
+		<input class="uni-input" name="searchName" v-model="search" placeholder="请搜索" />
+		<view>
+			<view class="ukashList" v-for="item in dataList" :key="item.id" @click="jobMaterials(item.id)">
+				<view class="ukashList-what">
+					<span style="font-size: 14px;font-weight: 700;">{{item.name}}</span>
+					<span class="ukashList-look">查看明细</span>
+				</view>
+				<view class="ukashList-time">入场时间: {{item.entryTime}}</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-  import headers from '../../../components/headers/headers.vue'
+	import headers from '../../../components/headers/headers.vue'
 
-  export default {
-    data() {
-      return {
-       search:'',
-	   pageNo: 1,
-	   pageSize: 10,
-	   isLoadMore:false,
-	   dataList:[]
-      }
-    },
-    onShow() {
-     this.queryList()
-    },
-    onReachBottom() {
-		console.log(99999);
-   if (!this.isLoadMore) {
-     this.isLoadMore = true
-     this.pageNo + 1
-     this.queryList()
-   }
-    },
-    onPullDownRefresh() {
-		console.log(222);
- this.pageNo = 1
- this.dataList = []
- this.queryList()
-    },
-    methods: {
-     queryList() {
-       let data = {
-         pageNo: this.pageNo,
-         pageSize: this.pageSize
-       }
-       let _this = this
-       this.sendRequest({
-         url: 'xmgl/xzMaterial/page',
-         method: 'post',
-         data: data,
-         success: res => {
-			 console.log(res);
-           this.dataList =res.result.records
-           if (res.result.records.length < this.pageSize) {
-             //判断接口返回数据量小于请求数据量，则表示此为最后一页
-             this.isLoadMore = true
-             this.loadStatus = 'nomore'
-           } else {
-             this.isLoadMore = false
-             // that.loadStatus='more'
-           }
-           uni.stopPullDownRefresh()
-           // console.log(res.result)
-         }
-       })
-     },
-	 jobMaterials(id){
-		 uni.navigateTo({
-		   url: './materials?itemS=' + id
-		 })
-	 }
-      }
-    }
-  
+	export default {
+		data() {
+			return {
+				search: '',
+				pageNo: 1,
+				pageSize: 10,
+				isLoadMore: false,
+				dataList: []
+			}
+		},
+		onShow() {
+			this.queryList()
+		},
+		onReachBottom() {
+			console.log(99999);
+			if (!this.isLoadMore) {
+				this.isLoadMore = true
+				this.pageNo + 1
+				this.queryList()
+			}
+		},
+		onPullDownRefresh() {
+			console.log(222);
+			this.pageNo = 1
+			this.dataList = []
+			this.queryList()
+		},
+		methods: {
+			queryList() {
+				let data = {
+					pageNo: this.pageNo,
+					pageSize: this.pageSize
+				}
+				let _this = this
+				this.sendRequest({
+					url: 'xmgl/xzMaterial/page',
+					method: 'post',
+					data: data,
+					success: res => {
+						console.log(res);
+						this.dataList = res.result.records
+						if (res.result.records.length < this.pageSize) {
+							//判断接口返回数据量小于请求数据量，则表示此为最后一页
+							this.isLoadMore = true
+							this.loadStatus = 'nomore'
+						} else {
+							this.isLoadMore = false
+							// that.loadStatus='more'
+						}
+						uni.stopPullDownRefresh()
+						// console.log(res.result)
+					}
+				})
+			},
+			jobMaterials(id) {
+				uni.navigateTo({
+					url: './materials?itemS=' + id
+				})
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-	.projectList{
+	.projectList {
 		min-height: 100%;
 		background: #f4f5fd;
-		
-	.uni-input {
-    border-radius: 10px;
-    margin: 10px 10px;
-    background-color: #e6e7ef;
-    height: 35px;
-    line-height: 30px;
-    padding: 0 20px;
-    font-size: 14px;
-  }
-  .ukashList{
-	  height: 90px;
-	  background-color: #fff;
-	   margin: 10px 10px;
-	   border-radius: 15px;
-	   .ukashList-what{
-		   display: flex;
-		   justify-content: space-between;
-		   margin: 0 20px;
-		   padding-top: 10px;
-		   .ukashList-look{
-			   background-color: #5081f7;
-			   border-radius: 10px;
-			   padding: 0 4px;
-			   font-size: 12px;
-			   text-align: center;
-			   color: #fff;
-		   }
-	   }
-	   .ukashList-time{
-		   margin-top: 20px;
-		   margin-left: 20px;
-		   font-size: 12px;
-		   color: #b9bbc9;
-	   }
-  }
-  }
+
+		.uni-input {
+			border-radius: 10px;
+			margin: 10px 10px;
+			background-color: #e6e7ef;
+			height: 35px;
+			line-height: 30px;
+			padding: 0 20px;
+			font-size: 14px;
+		}
+
+		.ukashList {
+			height: 90px;
+			background-color: #fff;
+			margin: 10px 10px;
+			border-radius: 15px;
+
+			.ukashList-what {
+				display: flex;
+				justify-content: space-between;
+				margin: 0 20px;
+				padding-top: 10px;
+
+				.ukashList-look {
+					background-color: #5081f7;
+					border-radius: 10px;
+					padding: 0 4px;
+					font-size: 12px;
+					text-align: center;
+					color: #fff;
+				}
+			}
+
+			.ukashList-time {
+				margin-top: 20px;
+				margin-left: 20px;
+				font-size: 12px;
+				color: #b9bbc9;
+			}
+		}
+	}
 </style>
\ No newline at end of file