123

api/api.js

 
-let baseURL1 = "http://www.rangertech.com.cn";//测试
+// let baseURL1 = "http://www.rangertech.com.cn";//测试
 // let baseURL1 = 'http://10.81.8.103:8181'
-// let baseURL1 = 'http://10.81.8.126:8181'
+let baseURL1 = 'http://10.81.8.126:8181' // alan
+// let baseURL1 = 'http://289f65x458.qicp.vip'
 // let baseURL1 = "http://localhost:8181";
-//let baseURL1 = "http://289f65x458.qicp.vip";
+// let baseURL1 = "http://289f65x458.qicp.vip";
 //let baseURL1 = "https://rysbsj.shaphc.org:30443"; //钉钉
 let datext='/covid'
 const baseURL = baseURL1+datext;   //

manifest.json

@@ -57,7 +57,7 @@
     },
     "h5" : {
         "title" : "hesuan",
-        "domain" : "www.rangertech.com.cn",
+        "domain" : "289f65x458.qicp.vip",
         "devServer" : {
             "https" : false
         },

pages/ld/sfmrld.vue

@@ -95,7 +95,7 @@
 			let mouth = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
 			let dates = date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate();
 			this.time = date.getFullYear() + "-" + mouth + "-" + dates; //表示当前日期
-			
+			this.postLDList()
 		},
 		methods: {
 			//时间选择器变化

pages/ld/ssdmrld.vue

@@ -14,30 +14,47 @@
 					<button style="width: 50%;" size="mini" type="default" @click="changeWorkSpace">修改工作地点</button>
 					<button style="width: 30%;" size="mini" type="primary" @click="searchData">查询</button>
 				</view>
+			</view>
+			<view v-show="visible" class="picTime">
+				<view class="uni-padding-wrap">
+					<button type="default" @click='visible=!visible'>取消</button>
+					<button type="default" @click="modifyWorkSpace">确定</button>
+				</view>
+				<view class="pickers">
+					<picker-view :indicator-style="indicatorStyle" :value="bindValue" @change="bindChange" class="picker-view">
+						<picker-view-column>
+							<view class="item" v-for="(item,index) in workSpaceList" :key="item.value">{{item.label}}</view>
+						</picker-view-column>
+					</picker-view>
+				</view>
 			</view>
 		</view>
-		<uni-table class="table" :loading="loading" @selection-change="selects" border stripe type='selection'>
+		<uni-table class="table" :loading="loading" @selection-change="normalSelect" border stripe type='selection'>
 			<!-- 表头行 -->
 			<uni-tr>
 				<uni-th width="20%" align="center">姓名</uni-th>
-				<uni-th width="60%" align="center">手机号</uni-th>
+				<uni-th width="40%" align="center">手机号</uni-th>
 				<uni-th width="20%" align="center">所属部门</uni-th>
+				<uni-th width="20%" align="center">工作地点</uni-th>
 			</uni-tr>
 			<!-- 表格数据行 -->
-			<!-- <uni-tr v-for="(item,index) in userList" :key="index"> -->
-			<uni-tr>
+			<uni-tr v-for="(item,index) in userList" :key="index">
+				<!-- <uni-tr> -->
+				<uni-td align="center">
+					{{item.name}}
+				</uni-td>
 				<uni-td align="center">
-					1
+					{{item.phone}}
 				</uni-td>
 				<uni-td align="center">
-					1
+					{{item.officeName}}
 				</uni-td>
 				<uni-td align="center">
-					1
+					{{item.areaType=='1'?'金山':'市区'}}
 				</uni-td>
 			</uni-tr>
 		</uni-table>
-
+		<uni-pagination class="pagin" show-icon="true" :total="pagination.total" :current="pagination.current" @change='handleChangePage'></uni-pagination>
 	</view>
 </template>
 
@@ -49,7 +66,11 @@
 	import * as dd from 'dingtalk-jsapi';
 	export default {
 		data() {
-			return {
+			return {
+				bindValue: [],
+				visible: false,
+				workSpaceList: [],
+				value: [],
 				userList: [],
 				total: 0,
 				loading: false,
@@ -71,10 +92,15 @@
 				time: '',
 				numList: [],
 				numData: '',
-				visible: true,
 				indicatorStyle: `height: 50px;`,
 				name: '',
-				phone: ''
+				phone: '',
+				selectedRows: [],
+				selectedWorkSpace: '',
+				pagination: {
+					total:0,
+					current: 1
+				}
 			}
 		},
 		onLoad() {
@@ -84,13 +110,29 @@
 			let mouth = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
 			let dates = date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate();
 			this.time = date.getFullYear() + "-" + mouth + "-" + dates; //表示当前日期
-
+			this.getList()
 		},
 		methods: {
+			normalSelect(selection, row) {
+				this.selectedRows = []
+				let selectIndex = selection.detail.index
+
+				console.log(selectIndex)
+				selectIndex.forEach((item, index) => {
+					console.log(selectIndex[index])
+					this.selectedRows.push(
+						this.userList[selectIndex[index]].reportId
+					)
+				})
+			},
+			handleChangePage(e) {
+				this.pagination.current = e.current
+				this.searchData()
+			},
 			//时间选择器变化
-			bindChange: function(date) {
-				this.time = date;
-				this.postLDList()
+			bindChange: function(date) {
+				console.log(date)
+				this.bindValue = date.detail.value
 			},
 			postLDList() {
 				this.numList = []
@@ -128,30 +170,34 @@
 					name: this.name,
 					phone: this.phone,
 					reportNum: that.getQueryString('num'),
-					userType: this.getQueryString('userType')
+					// reportNum: 'mr20210830170300',
+					userType: that.getQueryString('userType'),
+					// userType: '1',
+					current: this.pagination.current
 				}
-				this.userList = []
+				this.userList = []
+				postRequest('/sys-dict/findDictByType', {type: 'area_type'}).then((res) => {
+					if (res.code == '200') {
+						this.loading = false;
+						this.workSpaceList = res.data;
+					} else {
+						this.workSpaceList = []
+						this.loading = false;
+					}
+				})
+				
 				postRequest('/dailyReport/alreadyReportList', data).then((res) => {
-					if (res.code == '200' && res.data.length > 0) {
+					if (res.code == '200') {
 						this.loading = false;
-						this.userList = res.data;
+						this.userList = res.data.records;
+						this.pagination.total = res.data.total
+						this.pagination.current = res.data.current
 					} else {
 						this.userList = []
 						this.loading = false;
 					}
 				})
 			},
-			selects(ss) {
-				// let list=[]
-				// let index=ss.detail.index;
-				// index.forEach(item=>{
-				// 	list.push(this.userList[item].id)
-				// })
-				// this.userIdlist=list
-
-				console.log(ss)
-			},
-			changeWorkSpace() {},
 			clickNum(officeId, type, areaType) {
 				let data = {
 					areaType,
@@ -161,6 +207,36 @@
 				uni.navigateTo({
 					url: `/pages/ld/sfInfo?data=${JSON.stringify(data)}`
 				})
+			},
+			changeWorkSpace() {
+				if(this.selectedRows.length > 0) {
+					this.visible = !this.visible
+				} else {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '请至少选择一项！',
+						success: function(res) {
+							
+						}
+					})
+				}
+			},
+			modifyWorkSpace() {
+				console.log(this.selectedRows.length)
+				const data = {
+				  "areaType": this.bindValue.toString(),
+				  "reportIds": this.selectedRows
+				}
+				postRequest('/dailyReport/updateAreaType', data).then((res) => {
+					if (res.code == '200') {
+						this.loading = false;
+						this.searchData()
+					} else {
+						this.loading = false;
+						this.searchData()
+					}
+				})
 			}
 		}
 	}
@@ -284,4 +360,24 @@
 	.tab::after {
 		border: 0;
 	}
+
+	.picker-view {
+		width: 750rpx;
+		height: 600rpx;
+		margin-top: 20rpx;
+	}
+
+	.item {
+		height: 50px;
+		align-items: center;
+		justify-content: center;
+		text-align: center;
+	}
+	
+	.pagin {
+		width:94%;
+		margin: 10px 3%;
+		position: absolute;
+		bottom: 0;
+	}
 </style>

pages/ld/ynmrld.vue

@@ -95,7 +95,7 @@
 			let mouth = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
 			let dates = date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate();
 			this.time = date.getFullYear() + "-" + mouth + "-" + dates; //表示当前日期
-			
+			this.postLDList()
 		},
 		methods: {
 			//时间选择器变化

pages/login/login.vue

@@ -23,8 +23,8 @@
 			}
 		},
 		onLoad: function() {
-			this.findToOpenId();
-			// this.findToOpenIdSimulate();
+			// this.findToOpenId();
+			this.findToOpenIdSimulate();
 		},
 		methods: {
 			getQueryString(name) {