Merge branch 'master' of http://139.9.163.126/gitlab/jinfeng/epidemic

pages.json

@@ -17,6 +17,10 @@
             "path" : "pages/security/security",
             "style" : {}
         }
+        ,{
+            "path" : "pages/fillInDay/fillInDay",
+            "style" : {}
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",

pages/fillIn/fillIn.vue

@@ -100,7 +100,7 @@
 
 			<view class="cu-form-group margin-top-sm">
 				<view class="uni-padding-wrap uni-common-mt">
-					<view class="padding-top padding-bottom" >
+					<view class="padding-top padding-bottom">
 						<checkbox-group @click="openModal">
 							<label>
 								<checkbox value="A" :checked="form.agree == '1'" class="fl" style="margin-top:4upx" />
@@ -1611,12 +1611,12 @@
 						}],
 						showList: [{
 								value: '亲密接触者',
-								show: '32,48'
+								show: [32, 35, 38, 40, 43, 45, 47]
 							},
 
 							{
 								value: '居家观察/正在接受集中医学观察',
-								show: '49,50',
+								show: [49, 50]
 							},
 						]
 					},
@@ -1921,10 +1921,10 @@
 
 		methods: {
 			openModal() {
-				if(!this.form.agree) {
+				if (!this.form.agree) {
 					this.form.agree = '1'
 					this.modalName = true
-				}else {
+				} else {
 					this.form.agree = 0
 				}
 
@@ -1977,7 +1977,7 @@
 					this.$set(checkList[checkList.length - 1], 'checked', false)
 					const values = []
 					for (var i = 0, lenI = checkList.length; i < lenI; ++i) {
-						if(checkList[i].checked) {
+						if (checkList[i].checked) {
 							values.push(checkList[i].label)
 						}
 					}
@@ -2011,23 +2011,17 @@
 				}
 				// 复选框展示和隐藏
 				if (type === 'pickerMore') {
-					const nullList = ['无上述情况','以上均无']
-					const checkList = item.opts
 					let val = evt.detail.value;
 					const showList = item.showList
 					if (showList && showList.length > 0) {
 						showList.forEach(item => {
-							const start = +item.show.split(',')[0]
-							const end = +item.show.split(',')[1]
-
-							for (let i = start, lenI = end; i <= end; i++) {
+							item.show.forEach(child => {
 								this.list.forEach(row => {
-									if (i == row.num) {
+									if (child == row.num) {
 										this.$set(row, 'hidden', !val.includes(item.value))
 									}
 								})
-							}
-
+							})
 						})
 
 					}
@@ -2074,7 +2068,7 @@
 				for (let i = 0; i < this.list.length; i++) {
 					if (this.list[i].required) {
 						const val = this.form[this.list[i].value]
-						if ((!val || val == -1) && !this.list[i].hidden) {
+						if (!val&& !this.list[i].hidden && this.list[i].required) {
 							flag = false
 							uni.showToast({
 								icon: 'none',
@@ -2091,10 +2085,10 @@
 				if (!flag) {
 					return false
 				} else {
-					this.$http.post(`/sict-ncov/record`, this.form).then(res => {
+					this.$http.post(`/sict-ncov/report`, this.form).then(res => {
 						const d = res.data
 						if (d.code == 1) {
-
+							uni.navigateBack()
 						} else {
 							uni.showToast({
 								icon: 'none',

pages/index/index.vue

@@ -4,6 +4,7 @@
 			<view class="btnList">
 				<button class="btnStaff" type="primary" @click="staff">员工填报</button>
 				<button class="btnSecurity" type="primary" @click="security">安保测温</button>
+				<button class="btnSecurity" type="primary" @click="fillInDay">每日填报</button>
 				<image class="img" src="../../static/22.jpg" mode="" ></image>
 				{{option.userId?option.userId:'无'}}
 				<view class="tips">
@@ -58,6 +59,12 @@
 					url: `/pages/security/security`
 				})
 			},
+			fillInDay() {
+				console.log(232)
+				uni.navigateTo({
+					url:`/pages/fillInDay/fillInDay`
+				})
+			},
 			// 获取用户信息
 			getUserInfo(code) {
 				this.$http.post(`/sict-ncov/user/auth?code=${code}`).then(res => {
@@ -89,7 +96,7 @@
 		background-size: cover; 
 		background-image: url('http://139.9.163.126/gastric/static/background.jpg');
 		.btnList{
-			padding-top: 435upx;
+			padding-top: 355upx;
 			.btnStaff,.btnSecurity{
 				background-color: #92d0f1;
 				color: #FFFFFF;