Skip to content

C
covid
Commit 4073f444 authored by 程卓's avatar 程卓
Browse files
Options

m

parents b86b17d8 8e00cade
Show whitespace changes
Inline Side-by-side
Showing with 532 additions and 101 deletions
api/api.js
View file @ 4073f444
// 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.233:8181'
// let baseURL1 = 'http://10.81.8.126:8181'
// let baseURL1 = "http://localhost:8181";
//let baseURL1 = "http://289f65x458.qicp.vip";
//let baseURL1 = "https://rysbsj.shaphc.org:30443"; //钉钉
......
manifest.json
View file @ 4073f444
......@@ -57,7 +57,7 @@
},
"h5" : {
"title" : "hesuan",
"domain" : "rysbsj.shaphc.org",
"domain" : "www.rangertech.com.cn",
"devServer" : {
"https" : false
},
......
pages.json
View file @ 4073f444
......@@ -352,6 +352,16 @@
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false
}
},
{
"path" : "pages/ld/ssdmrld",
"style" :
{
"navigationBarTitleText": "14点每日流调",
"navigationBarBackgroundColor": "#3297ff",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false
}
}
],
"globalStyle": {
......
pages/ld/sfInfo.vue
View file @ 4073f444
......@@ -17,7 +17,7 @@
</view>
</view>
<view class="sfzhm">
<button size="mini" type="primary" @click="getList">查询</button>
<button style="width: 50%;" size="mini" type="primary" @click="getList">查询</button>
</view>
</view>
</view>
......@@ -35,7 +35,7 @@
<uni-td align="center">{{item.officeName}}</uni-td>
</uni-tr>
</uni-table>
<uni-pagination show-icon="true" style="margin:10px" :total="pagiNation.total" @change="pagi"
<uni-pagination class="pagin" show-icon="true" style="margin:10px" :total="pagiNation.total" @change="pagi"
:current="pagiNation.current"></uni-pagination>
</view>
......@@ -69,6 +69,7 @@
this.type = info.type
this.reportNum = info.reportNum
this.areaType = info.areaType
this.officeId = info.officeId
this.getList()
},
methods: {
......@@ -81,6 +82,7 @@
name: this.name,
phone: this.phone,
current: this.pagiNation.current,
officeId: this.officeId
}
this.userList = []
postRequest('/statistics/reportedResultList', data).then((res) => {
......@@ -171,4 +173,11 @@
.tab::after {
border: 0;
}
.pagin {
width:94%;
margin: 10px 3%;
position: absolute;
bottom: 0;
}
</style>
pages/ld/sfmrld.vue
View file @ 4073f444
......@@ -19,7 +19,7 @@
</view>
</view>
<view class="sfzhm">
<button size="mini" type="primary" @click="searchData">统计</button>
<button style="width: 50%;" size="mini" type="primary" @click="searchData">统计</button>
</view>
</view>
</view>
......@@ -172,7 +172,9 @@
this.userIdlist=list
},
clickNum(officeId,type,areaType) {
console.log(officeId)
let data={
officeId: officeId,
areaType,
type,
reportNum:this.numData
......
pages/ld/ssdmrld.vue 0 → 100644
View file @ 4073f444
<template>
<view>
<view class="grxx">
<view class="grxxItem">
<view class="sfzhm">
<text>姓名</text>
<input v-model="name" class="uni-input" focus />
</view>
<view class="sfzhm">
<text>手机号</text>
<input v-model="phone" class="uni-input" focus />
</view>
<view class="sfzhm">
<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>
<uni-table class="table" :loading="loading" @selection-change="selects" 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="20%" align="center">所属部门</uni-th>
</uni-tr>
<!-- 表格数据行 -->
<!-- <uni-tr v-for="(item,index) in userList" :key="index"> -->
<uni-tr>
<uni-td align="center">
1
</uni-td>
<uni-td align="center">
1
</uni-td>
<uni-td align="center">
1
</uni-td>
</uni-tr>
</uni-table>
</view>
</template>
<script>
import {
postRequest,
getRequest
} from '@/api/api.js'
import * as dd from 'dingtalk-jsapi';
export default {
data() {
return {
userList: [],
total: 0,
loading: false,
tableData: {
companyId: "",
current: 1,
id: "",
officeId: "",
openId: "",
userType: '',
orders: [{
asc: true,
column: ""
}],
size: 10
},
isnb: 0,
picTime: false,
time: '',
numList: [],
numData: '',
visible: true,
indicatorStyle: `height: 50px;`,
name: '',
phone: ''
}
},
onLoad() {
let userType = uni.getStorageSync('userType')
this.tableData.userType = userType;
let date = new Date();
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; //表示当前日期
},
methods: {
//时间选择器变化
bindChange: function(date) {
this.time = date;
this.postLDList()
},
postLDList() {
this.numList = []
this.numData = ''
this.userList = []
let data = {
type: 0, //0:每日流调，1：临时流调，2：在院流调
createDate: this.time
}
postRequest('/dailyReportNum/findListByCodeAndType', data).then(res => {
if (res.code == '200') {
let list = res.data;
list.forEach(item => {
this.numList.push(item.num)
})
this.getList();
}
})
},
searchData() {
this.getList();
},
numInput(value) {
this.numData = value
},
getQueryString(name) {
const reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
const search = window.location.search.split('?')[1] || '';
const r = search.match(reg) || [];
return r[2];
},
getList() {
let that = this
let data = {
name: this.name,
phone: this.phone,
reportNum: that.getQueryString('num'),
userType: this.getQueryString('userType')
}
this.userList = []
postRequest('/dailyReport/alreadyReportList', data).then((res) => {
if (res.code == '200' && res.data.length > 0) {
this.loading = false;
this.userList = res.data;
} 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,
type,
reportNum: this.numData
}
uni.navigateTo({
url: `/pages/ld/sfInfo?data=${JSON.stringify(data)}`
})
}
}
}
</script>
<style>
.grxxItem {
border-radius: 5px;
padding: 10px;
margin: 10px;
box-shadow: 0px 2px 15px 3px rgba(0, 0, 0, 0.1);
}
/deep/.uni-combox__input {
font-size: 14px;
}
.grxxItem .sfzhm {
padding: 10px;
display: flex;
justify-content: space-between;
align-items: center;
font-size: 84%;
color: #999999;
position: relative;
}
.sfzhm .uni-list-cell-left {
width: 30%;
}
.sfzhm image {
width: 28rpx;
height: 30rpx;
}
.sfzhm .uni-list-cell-db {
flex: 1
}
.sfzhm:first-of-type input {
flex: 1;
}
.grxxItem .sfzhm:last-of-type {
border: none;
}
.table {
width: 94%;
margin: 0 3%;
}
/* 时间选择器 */
.picTime {
z-index: 10;
height: 100%;
width: 100%;
background-color: rgba(0, 0, 0, 0.5);
position: fixed;
bottom: 0;
left: 0;
}
.uni-padding-wrap {
position: absolute;
bottom: 400rpx;
left: 0;
width: 750rpx;
background-color: white;
display: flex;
justify-content: center;
padding: 10px 0;
}
.uni-padding-wrap button {
height: 30px;
line-height: 30px;
font-size: 15px;
}
.uni-padding-wrap button:last-of-type {
background-color: #007AFF;
color: white;
}
.pickers {
position: fixed;
bottom: 0;
left: 0;
text-align: center;
width: 750rpx;
height: 400rpx;
margin-top: 20rpx;
background-color: white;
}
.pickers .picker-view {
width: 750rpx;
height: 400rpx;
margin-top: 20rpx;
background-color: white;
}
.tabButton {
color: #007AFF;
text-decoration: underline;
font-size: 14px;
background-color: white;
}
.tabButton::after {
border: 0;
}
.tab {
font-size: 14px;
background-color: white;
}
.tab::after {
border: 0;
}
</style>
pages/ld/ynInfo.vue
View file @ 4073f444
......@@ -17,7 +17,7 @@
</view>
</view>
<view class="sfzhm">
<button size="mini" type="primary" @click="getList">查询</button>
<button style="width: 50%;" size="mini" type="primary" @click="getList">查询</button>
</view>
</view>
</view>
......@@ -35,7 +35,7 @@
<uni-td align="center">{{item.officeName}}</uni-td>
</uni-tr>
</uni-table>
<uni-pagination show-icon="true" style="margin:10px" :total="pagiNation.total" @change="pagi"
<uni-pagination class="pagin" show-icon="true" style="margin:10px" :total="pagiNation.total" @change="pagi"
:current="pagiNation.current"></uni-pagination>
</view>
......@@ -69,6 +69,7 @@
this.type = info.type
this.reportNum = info.reportNum
this.areaType = info.areaType
this.officeId = info.officeId
this.getList()
},
methods: {
......@@ -81,6 +82,7 @@
name: this.name,
phone: this.phone,
current: this.pagiNation.current,
officeId: this.officeId
}
this.userList = []
postRequest('/statistics/reportedResultList', data).then((res) => {
......@@ -171,4 +173,11 @@
.tab::after {
border: 0;
}
.pagin {
width:94%;
margin: 10px 3%;
position: absolute;
bottom: 0;
}
</style>
pages/ld/ynmrld.vue
View file @ 4073f444
......@@ -19,7 +19,7 @@
</view>
</view>
<view class="sfzhm">
<button size="mini" type="primary" @click="searchData">统计</button>
<button style="width: 50%;" size="mini" type="primary" @click="searchData">统计</button>
</view>
</view>
</view>
......@@ -175,7 +175,8 @@
let data={
areaType,
type,
reportNum:this.numData
reportNum:this.numData,
officeId: officeId
}
uni.navigateTo({
url:`/pages/ld/ynInfo?data=${JSON.stringify(data)}`
......
pages/login/login.vue
View file @ 4073f444
......@@ -23,8 +23,8 @@
}
},
onLoad: function() {
//this.findToOpenId();
this.findToOpenIdSimulate();
this.findToOpenId();
// this.findToOpenIdSimulate();
},
methods: {
getQueryString(name) {
......@@ -35,7 +35,8 @@
},
findToOpenId() {
let that = this
let corpId = 'ding0cb9b4dc2a3c263b35c2f4657eb6378f'
// let corpId = 'ding0cb9b4dc2a3c263b35c2f4657eb6378f'
let corpId = 'ding5f0626ed28e32fdb24f2f5cc6abecb85'
dd.ready(() => {
dd.runtime.permission.requestAuthCode({
corpId, //企业ID
......@@ -72,6 +73,10 @@
key: 'userId',
data: res.data.userId
})
uni.setStorage({
key: 'roleList',
data: res.data.roleList
})
let userType = res.data.userType; //角色权限 0 6 10 15 20
let status = res.data.status; //填报状态 0未填报 1已填报
let firstReport = res.data.firstReport; //用户是否首次进入此应用
......@@ -157,7 +162,8 @@
})
let data = {
phone: "18916093189",
// phone: "18665917172",
phone: "15385457051",
corpid:corpId,
appCode: 'covid-register',
type: that.type
......@@ -185,6 +191,10 @@
key: 'userId',
data: res.data.userId
})
uni.setStorage({
key: 'roleList',
data: res.data.roleList
})
let userType = res.data.userType; //角色权限 0 6 10 15 20
let status = res.data.status; //填报状态 0未填报 1已填报
let firstReport = res.data.firstReport; //用户是否首次进入此应用
......
pages/mrldgl/inputMainInfo.vue
View file @ 4073f444
......@@ -9,43 +9,37 @@
<view class="sfzhm">
<text>是否填报</text>
<picker @change="handleIsSubmitChange" :value='index' :range="isSubmitArray">
<picker @change="handleIsSubmitChange" :value='index' :range="isSubmitArray" :disabled='fromStatistics'>
<view class="uni-input">{{isSubmitArray[index]}}</view>
</picker>
</view>
<view class="sfzhm">
<view class="sfzhm" v-if="showMember">
<text>人员类型</text>
<picker @change="handleMemberTypeChange" :value='memberTypeIndex' :range="memberTypeArray">
<picker @change="handleMemberTypeChange" :value='memberTypeIndex' :range="memberTypeArray" :disabled='fromStatistics'>
<view class="uni-input">{{memberTypeArray[memberTypeIndex]}}</view>
</picker>
</view>
<view class="sfzhm">
<text>所属部门</text>
<picker @change="handleDepartmentChange" :value='departmentIndex' :range="departmentArray">
<view class="uni-input">{{departmentArray[departmentIndex]}}</view>
</picker>
<button style="width: 50%;" size='mini' type="primary" @click="searchData">查询</button>
</view>
<view class="sfzhm">
<button type="primary" @click="searchData">查询</button>
</view>
</view>
</view>
<uni-table :loading="loading" @selection-change="selects" border stripe>
<uni-table class="table" :loading="loading" @selection-change="selects" border stripe>
<!-- 表头行 -->
<uni-tr>
<uni-th align="center">姓名</uni-th>
<uni-th align="center">手机号</uni-th>
<uni-th align="center">所属部门</uni-th>
<uni-th width="20%" align="center">姓名</uni-th>
<uni-th width="60%" 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-td align="center">{{item.name}}</uni-td>
<uni-td align="center">{{item.phone}}</uni-td>
<uni-td align="center">{{item.department}}</uni-td>
<uni-td align="center">{{item.officeName}}</uni-td>
</uni-tr>
</uni-table>
<uni-pagination class="pagin" show-icon="true" :total="pagination.total" :current="pagination.current" @change='handleChangePage'></uni-pagination>
<!-- 时间选择器 -->
<view v-show="picTime" class="picTime">
<view class="uni-padding-wrap">
......@@ -118,10 +112,15 @@
}],
size: 10
},
pagination: {
current: 1,
total: 0
},
isnb: 0,
picTime: false,
time: '',
name: '',
showMember: false,
index: 0,
isSubmit: '',
......@@ -130,9 +129,6 @@
memberTypeIndex: 0,
memberTypeArray: ['院内人员','第三方人员'],
departmentIndex: 0,
departmentArray: ['中国建设','中国城建'],
years,
months,
......@@ -141,6 +137,26 @@
value: [9999, month - 1, day - 1],
visible: true,
indicatorStyle: `height: 50px;`,
reportNum: '',
fromStatistics: false,
statisticParams: {}
}
},
onLoad(option) {
this.showMember = Boolean(option.showMemberType)
this.reportNum = option.reportNum
if(!!option.officeId) {
console.log('有officeId')
this.fromStatistics = true
this.statisticParams.userType = option.userType
this.statisticParams.type = option.type
this.statisticParams.officeId = option.officeId
this.statisticParams.reportNum = option.reportNum
option.type == '1'? this.index = 0: this.index = 1
console.log(option.userType)
option.userType == 1? this.memberTypeIndex = 0: this.memberTypeIndex = 1
} else {
console.log('无officeId')
}
},
mounted() {
......@@ -155,7 +171,7 @@
type: 0, //0:每日流调，1：临时流调，2：在院流调
createDate: this.time
}
this.getList();
this.getList()
},
methods: {
searchData() {
......@@ -208,16 +224,29 @@
this.picTime = true
},
getList() {
let data = {
createDate: this.time,
type: '0',
keyWord: this.name
let data = {}
if(!this.fromStatistics) {
console.log(1)
data = {
reportNum: this.reportNum,
userType: this.memberTypeArray[this.memberTypeIndex] == '院内人员'?'1':'2',
type: this.isSubmitArray[this.index] == '是'? '1':'0',
}
postRequest('/dailyReportNum/findListByCodeAndType', data).then((res) => {
if (res.code == '200' && res.data.length > 0) {
} else {
console.log(2)
data = this.statisticParams
}
Object.assign(data, {userName: this.name, size: 10, current: this.pagination.current})
postRequest('/statistics/reportedUserList', data).then((res) => {
if (res.code == '200' && res.data.records.length > 0) {
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;
}
})
......@@ -257,9 +286,11 @@
handleMemberTypeChange: function(e) {
this.memberTypeIndex = e.target.value
},
handleDepartMentChange: function(e) {
this.departmentIndex = e.target.value
},
handleChangePage(e) {
console.log(e)
this.pagination.current = e.current
this.getList()
}
}
}
</script>
......@@ -418,4 +449,16 @@
.tab::after {
border: 0;
}
.table {
width:94%;
margin: 0 3%;
}
.pagin {
width:94%;
margin: 10px 3%;
position: absolute;
bottom: 0;
}
</style>
pages/mrldgl/ldMain.vue
View file @ 4073f444
......@@ -6,17 +6,19 @@
<text>名称</text>
<input v-model="name" class="uni-input" focus />
</view>
<view class="sfzhm" @click="picXs">
<view class="sfzhm">
<text>日期</text>
<input type="text" v-model='time' placeholder="请选择日期" />
<image src="../../static/icon/rili.png" mode=""></image>
<view class="example-body">
<uni-datetime-picker :clearIcon="false" :border="false" type="date" :disabled="false" v-model="time" start="2021-3-20" end="2024-6-20"
@change="bindChange" />
</view>
</view>
<view class="sfzhm">
<button type="primary" @click="searchData">查询</button>
<button style="width: 50%;" size='mini' type="primary" @click="searchData">查询</button>
</view>
</view>
</view>
<uni-table :loading="loading" @selection-change="selects" border stripe>
<uni-table class="table" :loading="loading" @selection-change="selects" border stripe>
<!-- 表头行 -->
<uni-tr>
<uni-th align="center">名称</uni-th>
......@@ -190,6 +192,7 @@
this.loading = false;
this.userList = res.data;
} else {
this.userList = []
this.loading = false;
}
})
......@@ -219,12 +222,25 @@
})
},
clickName(item) {
console.log(item)
const roleList = uni.getStorageSync('roleList')
console.log(roleList.toString().indexOf('superAdmin'))
if(roleList.toString().indexOf('superAdmin') > -1) {
uni.navigateTo({
url: `/pages/mrldgl/statistics?reportNum=${item.num}`
})
} else if(roleList.toString().indexOf('thirdCharge') > -1 && roleList.toString().indexOf('departmentManger') > -1) {
uni.navigateTo({
url: `/pages/mrldgl/inputMainInfo?reportNum=${item.num}&showMemberType=true`
})
} else {
uni.navigateTo({
url: `/pages/mrldgl/inputMainInfo`
url: `/pages/mrldgl/inputMainInfo?reportNum=${item.num}&showMemberType=false`
})
}
}
}
}
</script>
<style>
......@@ -381,4 +397,9 @@
.tab::after {
border: 0;
}
.table {
width:94%;
margin: 0 3%;
}
</style>
pages/mrldgl/statistics.vue
View file @ 4073f444
......@@ -16,22 +16,61 @@
<uni-tr v-for="(item,index) in userList" :key="index">
<uni-td align="center">{{item.officeName}}</uni-td>
<uni-td align="center">
<button :class="item.noneCount>0?'tabButton':'tab'" @click="item.noneCount>0?clickNum(item.officeId,null,0):''" type="default">{{item.noneCount}}</button>
<button @click='tranferData(item.officeId, 1, 1)'>{{item.ynAlreadyCount}}</button>
</uni-td>
<uni-td align="center">
<button :class="item.alreadyCount>0?'tabButton':'tab'" @click="item.alreadyCount>0?clickNum(item.officeId,null,1):''" type="default">{{item.alreadyCount}}</button>
<button @click='tranferData(item.officeId, 1, 0)'>{{item.ynNoneCount}}</button>
</uni-td>
<uni-td align="center">
<button :class="item.jsAlreadyCount>0?'tabButton':'tab'" @click="item.jsAlreadyCount>0?clickNum(item.officeId,1,1):''" type="default">{{item.jsAlreadyCount}}</button>
<button @click='tranferData(item.officeId, 2, 1)'>{{item.dsfAlreadyCount}}</button>
</uni-td>
<uni-td align="center">
<button :class="item.sqAlreadyCount>0?'tabButton':'tab'" @click="item.sqAlreadyCount>0?clickNum(item.officeId,2,1):''" type="default">{{item.sqAlreadyCount}}</button>
<button @click='tranferData(item.officeId, 2, 0)'>{{item.dsfNoneCount}}</button>
</uni-td>
</uni-tr>
</uni-table>
</template>
<script>
import {
postRequest,
getRequest
} from '@/api/api.js'
export default {
data() {
return {
reportNum: '',
loading: false,
userList: []
}
},
onLoad(option) {
this.reportNum = option.reportNum
},
mounted() {
this.getList()
},
methods: {
getList() {
const data = {
reportNum: this.reportNum
}
postRequest('/statistics/reportedStatistics', data).then((res) => {
if (res.code == '200' && res.data.length > 0) {
this.userList = res.data;
} else {
this.userList = []
this.loading = false;
}
})
},
tranferData(officeId, userType, type) {
uni.navigateTo({
url: `/pages/mrldgl/inputMainInfo?reportNum=${this.reportNum}&showMemberType=true&officeId=${officeId}&userType=${userType}&type=${type}`
})
}
}
}
</script>
<style>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment