新增部分模块

pages.json

@@ -1390,8 +1390,23 @@
         "navigationBarTitleText": "",
         "enablePullDownRefresh": false
       }
-
+    },
-    }
+	 {
+	  "path": "pages/projectEnd/ukashManage/ukashManage",
+	  "style": {
+	    "navigationBarTitleText": "",
+	    "enablePullDownRefresh": false,
+		"enablePullDownRefresh": true,
+		"onReachBottomDistance": 100
+	  }
+	},
+	 {
+	  "path": "pages/projectEnd/ukashManage/materials",
+	  "style": {
+	    "navigationBarTitleText": "",
+	    "enablePullDownRefresh": false
+	  }
+	}
   ],
   // "subPackages":[{
   // 	"root": "carManage",

pages/projectEnd/projectIndex/projectIndex.vue

@@ -643,6 +643,11 @@ export default {
             url: '../../fileManage/fileManage'
           })
           break
+		  case 'ukashManage':
+		    uni.navigateTo({
+		      url: '../../projectEnd/ukashManage/ukashManage'
+		    })
+		    break
         case 'betonManage':
           uni.navigateTo({
             url: '../betonManage/index'

pages/projectEnd/qualityManage/addIssue.vue

@@ -545,7 +545,8 @@
         subListData: [], //分项工程
         subsectionIndex: -1, //分部工程
         subentryIndex: -1, ////分项工程
-
+		taskId: '', //任务ID
+        itemId: '' // 任务子ID
       }
     },
     onLoad(option) {
@@ -557,9 +558,10 @@
       this.getPersonList();
       this.getProgressListData()
       console.log('lll', option.taskId, option.itemId)
-      this.form.taskId = option.taskId ? option.taskId : null
+      this.taskId = option.taskId 
-      this.form.itemId = option.itemId ? option.itemId : null
+      this.itemId = option.itemId 
-
+	  this.form.taskId = option.taskId
+      this.form.itemId = option.itemId 
     },
 
 
@@ -1107,7 +1109,7 @@
 
 
       //新增保存
-      addSaveBtn() {
+     async addSaveBtn() {
         let arr = [],
           arr2 = [];
 
@@ -1209,6 +1211,7 @@
         data.measurePoints = pointArr.join(',')
         console.log('data.measurePoints=============', data.measurePoints);
         if (this.typeCheck == "type1") {
+			console.log(data);
           // 质量问题
           this.sendRequest({
             url: 'xmgl/qualityInspectionRecord/add',
@@ -1232,6 +1235,8 @@
             }
           })
         } else {
+			console.log(this.taskId);
+			console.log(this.itemId);
           // 排查记录
           let data2 = {
             dangerDesc: data.dangerDesc,
@@ -1253,8 +1258,11 @@
             subentryId: data.subentryId, //分项工程
             floor: data.floor, //巡检楼层
             addedDescription: data.addedDescription, //事件描述
+			taskId: this.taskId || null, // 任务ID
+			itemId: this.itemId || null // 任务子ID
           }
-          this.sendRequest({
+		  console.log(data.taskId);
+         await this.sendRequest({
             url: 'xmgl/qualityInspectionRecord/add',
             method: 'post',
             data: data2,
@@ -1283,7 +1291,7 @@
 
         this.typeCheck = value
         this.checkedTab = value
-        console.log('切换tab', this.typeCheck);
+        console.log('切换tab', this.form);
         // 重制内容
         this.form = {
           regionId: "", // 检查部位
@@ -1310,6 +1318,8 @@
           imageUrl: "",
           fileUrl: "",
           recordType: 1,
+		  // taskId:'',
+		  // itemId:''
         };
         this.issueName = ''
         this.checkPointName = ""

pages/projectEnd/qualityManage/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="listPage" @touchend="end" @touchmove="move" :class="{popupShow:popupShow}">
+  <view class="listPage" :class="{popupShow:popupShow}">
     <headers :showBack="true">
       <view class="headerName">
         检查台账

pages/projectEnd/qualityManage/taskList.vue

@@ -10,9 +10,13 @@
             <text>{{ statisticsData.rectifyNum }}</text>
             待整改
           </view>
+		  <view class="info-item b-right">
+		    <text>{{ statisticsData.checkNum }}</text>
+		    待复查
+		  </view>
           <view class="info-item b-right">
             <text>{{ statisticsData.reviewNum }}</text>
-            待审核
+            待核验
           </view>
           <view class="info-item">
             <text>{{ statisticsData.closeNum }}</text>

pages/projectEnd/safeManage/dangerList.vue

@@ -280,6 +280,7 @@
 	}
 	.no-data{
 		text-align: center;
+		margin-top: 50%;
 		.img{
 			display: block;
 			height: 200rpx;

pages/projectEnd/ukashManage/materials.vue

@@ -0,0 +1,130 @@
+<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>
+</template>
+
+<script>
+  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)
+         }
+       })
+     },
+      }
+    }
+  
+</script>
+
+<style lang="scss" scoped>
+	.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;
+	   }
+  }
+  }
+</style>

pages/projectEnd/ukashManage/ukashManage.vue

@@ -0,0 +1,129 @@
+<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>
+</template>
+
+<script>
+  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
+		 })
+	 }
+      }
+    }
+  
+</script>
+
+<style lang="scss" scoped>
+	.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;
+	   }
+  }
+  }
+</style>

pages/standardScheduleNews/index.vue

@@ -99,7 +99,7 @@ export default {
     }
   },
   onLoad(option) {
-	  console.log(option,666)
+	  console.log(this.listData)
 	if(option){
 		this.option = option
 	}
@@ -193,16 +193,17 @@ export default {
         method: 'get',
         data: {...that.condition,...that.option},
         success: res => {
-          let arr = JSON.parse(JSON.stringify(this.listData));
+			console.log(res);
+          // let arr = JSON.parse(JSON.stringify(this.listData));
           if (res.result.records.length > 0) {
-            let newArr = arr.concat(res.result.records);
+            // let newArr = arr.concat(res.result.records);
             if (res.result.records.length < 10) {
               that.teach = false;
             } else {
               that.teach = true;
             }
-            that.listData = newArr;
+            that.listData = res.result.records;
-            that.numberTasks = newArr.length
+            that.numberTasks = res.result.records.length
             console.log('进度数据', that.listData)
           } else {
             that.teach = false;