优化

pages.json

@@ -19,7 +19,7 @@
 		    
 		},
 		{
-		    "path" : "pages/data-filled/index",
+		    "path" : "pages/check/index",
 		    "style" :                                                                                    
 		    {
 		        "navigationBarTitleText": "",
@@ -28,55 +28,15 @@
 		    
 		},
 		{
-			"path" : "pages/sample-check-list/index",
-			"style" :
-			{
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		},{
-			"path" : "pages/sample-check-list/sample-detail/index",
-			"style" :
-			{
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		},
-		{
-			"path" : "pages/sample-check-list/home",
-			"style" :
-			{
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		},{
-			"path" : "pages/zf-task-list/index",
-			"style" :
-			{
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		},{
-			"path" : "pages/zf-task-list/taskList",
-			"style" :
-			{
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		},{
-			"path" : "pages/zf-task-list/sampleRandom/index",
-			"style" :
-			{
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
+		    "path" : "pages/check-record/index",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "",
+		        "enablePullDownRefresh": false
+		    }
+		    
 		},
+		
 
 		{
 		    "path" : "pages/home/index",
@@ -140,61 +100,8 @@
 	            "enablePullDownRefresh": false
 	        }
 	        
-	    },
-		{
-		    "path" : "pages/quick-task/index",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
-		{
-            "path" : "pages/quick-task/camera",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        },
-		{
-		    "path" : "pages/quick-task/form",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-        ,{
-            "path" : "pages/quick-task/result",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        },
-		{
-		    "path" : "pages/quick-task/list",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
-		{
-		    "path" : "pages/quick-task/quick-list",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
+	    }
+		
 	
     ],
 	"permission": {

pages/data-filled/data-filled-model.js

@@ -1,23 +0,0 @@
-import {
-	Base
-} from '../../static/util/base.js'
-class DataFilled extends Base {
-	constructor() {
-		super();
-	}
-
-	getAhSampleSheetDetail(id,callBack) {
-		var params = {
-			url: '/ah/ahSampleSheet/'+id,
-			sCallBack: function(res) {
-				callBack && callBack(res)
-			}
-		}
-		this.serviceRequest(params);
-	}
-}
-
-const _dataFilled = new DataFilled();
-export {
-	_dataFilleds
-}

pages/data-filled/index.vue

@@ -1,253 +0,0 @@
-<template>
-	<view class="home">
-		<cu-custom class="home-custom" bgColor=".bg-sancolor" bgImage="../../static/icons/bg.png" :isBack="true">
-			<block slot="content">皖监测</block>
-		</cu-custom>
-		<view>
-			<view class="cu-list menu content-box">
-				<view class="cu-bar bg-white margin-top">
-					<view class="action">
-						<text class="cuIcon-title text-green"></text>
-						<text>优质农产品监测与评价</text>
-						<span class="filled-instro" data-target="Modal" @tap="filledButton">（填写说明）</span>
-					</view>
-				</view>
-				<form>
-					<view class="cu-form-group ">
-						<view class="title">1.基地名称</view>
-						<input placeholder="请输入基地名称" name="input" ></input>
-					</view>
-					<!-- <view class="cu-form-group ">
-						<view class="title">基地类型</view>
-						<input placeholder="请输入基地类型" name="input"></input>
-						<button class='cu-btn bg-green shadow'>＋</button>
-					</view>
-					 -->
-					<view class="cu-form-group "  v-for="(item, index) in jdlx">
-						<view class="title">2.基地类型</view>
-						<picker @change="PickerChange" :value="item.index" :range="picker" v-model="item.name">
-							<view class="picker">
-								{{index>-1?picker[item.index]:'选择基地类型'}}
-							</view>
-						</picker>
-						
-					</view>	
-					<!-- <button class='cu-btn bg-green' @tap="addJdlx" style="margin-left: 5px;">＋</button> -->
-					<view class="padding flex flex-direction">
-					  <button class="cu-btn bg-grey lg"  @tap="addJdlx">添加多个基地类型</button>
-					</view>
-					
-					<view  v-for="(item, index) in product">
-					<view class="cu-form-group margin-top">
-						<view class="title">3.主要产品</view>
-						<input placeholder="请输入主要产品" name="input" ></input>
-					</view>
-					<view class="cu-form-group ">
-						<view class="title">4.基地规模</view>
-						<input placeholder="请输入基地规模" name="input"></input>
-					</view>
-					<view class="cu-form-group ">
-						<view class="title">5.产品产量</view>
-						<input placeholder="请输入产品产量" name="input"></input>
-						<view>公斤</view>
-					</view>
-					<view class="cu-form-group ">
-						<view class="title">6.产品产值</view>
-						<input placeholder="请输入产品产值" name="input"></input>
-						<view>元</view>
-					</view>
-					<view class="cu-form-group ">
-						<view class="title">7.产品分类</view>
-						<picker @change="PickerCategoryChange"   :range="category">
-							<view class="picker">
-								{{indexCategory>-1?category[item.index]:'选择产品分类'}}
-							</view>
-						</picker>
-					</view>
-					<view class="cu-form-group ">
-						<view class="title">单位</view>
-						<input placeholder="请输入产品单位" name="input"></input>
-					</view>
-					</view>
-					
-					<view class="padding flex flex-direction">
-					  <button class="cu-btn bg-grey lg"  @tap="addProduct">添加多个产品</button>
-					</view>
-					
-					<view class="cu-form-group margin-top">
-						<view class="title">8.社会信用代码</view>
-						<input placeholder="请输入产品产量" name="input"></input>
-					</view>
-					<view class="cu-form-group ">
-						<view class="title">9.主要联系人</view>
-						<input placeholder="请输入姓名" name="input"></input>
-					</view>
-					<view class="cu-form-group ">
-						<view class="title">10.联系电话</view>
-						<input placeholder="请输入11位手机号" name="input"></input>
-					</view>
-					<view class="cu-form-group ">
-						<view class="title">11.行政区划</view>
-						<input placeholder="请输入行政区划" name="input"></input>
-					</view>
-					<view class="cu-form-group ">
-						<view class="title">12.基地地址</view>
-						<input placeholder="请输入基地详细地址" name="input"></input>
-					</view>
-					<view class="cu-form-group ">
-						<view class="title">13.证书编号</view>
-						<input placeholder="请输入证书编号" name="input"></input>
-					</view>
-					<view class="cu-form-group ">
-						<view class="title">14.证书有效期</view>
-						<input placeholder="请输入证书有效期" name="input"></input>
-					</view>
-				</form>
-				
-				<view class="padding flex flex-direction">
-				  <button class="cu-btn bg-green  lg">保存</button>
-				</view>
-			</view>
-			
-			<view class="cu-modal" :class="modalName=='Modal'?'show':''">
-						<view class="cu-dialog">
-							<view class="cu-bar bg-white justify-end">
-								<view class="content">填写说明</view>
-								<view class="action" @tap="hideModal">
-									<text class="cuIcon-close text-red"></text>
-								</view>
-							</view>
-							<view class="padding-xl" style="text-align: left;">
-								<view><span class="filled-name">1.基地名称：</span>录入基地的准确全称。有固定名称的，填写须与基地取得相关认证登记证书上的名称一致;无固定名称的，按“基地主体+所在乡镇+基地名称”格式填写。</view>
-								<view><span class="filled-name">2.基地类型：</span>分为绿色食品生产基地、有机农产品生产基地、地理标志农产品核心生产基地、良好农业规范认证生产基地、全程质量控制生产基地、名特优新农产品生产基地、绿色食品原料标准化生产基地、省级绿色优质农产品生产基地8个类型。如有多个类型，需逐个录入。</view>
-								<view><span class="filled-name">3.主要产品：</span>录入该基地生产的主要农产品名称。如有多种产品，需逐个录入。</view>
-								<view><span class="filled-name">4.基地规模：</span>依据产品名称，分别录入应对产品规模。</view>
-								<view><span class="filled-name">5.产品产量：</span>上一年度产品产量，公斤。</view>
-								<view><span class="filled-name">6.产品产值：</span>上一年度产品产值，元。</view>
-								<view><span class="filled-name">7.产品分类及单位：</span>①种植类，填写该基地实际种植面积，单位为亩;②畜禽类，填写该基地对应畜禽当前的存栏量，其中猪、牛、羊单位为头，鸡单位为只;③水产类，填写该基地水产品养殖面积，单位为亩。④其他类,指未列入选项的产品品种，单位由县级根据实际品种确定。</view>
-								
-								<view><span class="filled-name">8.社会信用代码/身份证：</span>优先录入主体统一社会信用代码，无统一社会信用代码的，可以录入主体身份号码。如农户或者家庭农场主体可填写身份证号码。</view>
-								<view><span class="filled-name">9.主要联系人：</span>基地联系人姓名。。</view>
-								<view><span class="filled-name">10.联系电话：</span>录入11位电话号码。</view>
-								<view><span class="filled-name">11.行政区划：</span>录入对应的行政区划全称，可查看行政区域字典表。如为直管市、直管县，则两级录入同一个名称。</view>
-								<view><span class="filled-name">12.基地地址：</span>录入基地详细地址。如:红岩村濮岩路219号。</view>
-								<view><span class="filled-name">13.证书编号：</span>录入对应产品的证书编号。</view>
-								<view><span class="filled-name">14.证书有效期：</span>为证书有效期开始日期、截止日期，按照对应证书有效期限填写。</view>
-								
-							</view>
-						</view>
-					</view>
-		</view>
-		</view>
-</template>
-
-
-<script>
-	// import {_dataFilleds} from'./data-filled-model.js'
-	export default {
-
-		data() {
-			return {
-				sampleDetailInfo: null,
-				input_diabled: false,
-				modalName: null,
-				
-				indexCategory:0,
-				picker: ['绿色食品生产基地','有机农产品生产基地','地理标志农产品核心生产基地','良好农业规范认证生产基地','全程质量控制生产基地','名特优新农产品生产基地','绿色食品原料标准化生产基地','省级绿色优质农产品生产基地'],
-				category:['种植类','畜禽类','水产类','其他类'],
-				jdlx:[
-					{
-						name:'',
-						index: 0
-					}
-				],
-				product:[{
-					zycp: '',
-					jdgm: '',
-					cpcl: '',
-					cpcz: '',
-					cpfl: '',
-					dw: '',
-					index:0
-				}]
-			}
-		},
-
-		created() {
-
-		},
-		onLoad(options) {
-
-		},
-
-		mounted() {
-
-		},
-		methods: {
-			filledButton(e){
-				this.modalName = e.currentTarget.dataset.target
-			},
-			hideModal(e) {
-				this.modalName = null
-			},
-			PickerChange(e) {
-				this.index = e.detail.value
-			},
-			PickerCategoryChange(e){
-				this.indexCategory = e.detail.value
-			},
-			addJdlx(){
-				this.jdlx.push({
-					name:''
-				})
-			},
-			addProduct(){
-				this.product.push({
-					zycp: '',
-					jdgm: '',
-					cpcl: '',
-					cpcz: '',
-					cpfl: '',
-					dw: ''
-				})
-			}
-			// rediectHome(){
-			//    uni.redirectTo({
-			//    	url:'/pages/index/index'
-			//    })	
-			// },
-			// toSampleInfoList(id){
-			// 	uni.navigateTo({
-			// 		url:'/pages/sample-info-list/index?id='+id
-			// 	})
-			// },
-			// getSampleInfoDetail(id){
-			// 	_dataFilleds.getAhSampleSheetDetail(id,res=>{
-			// 		console.log(res)
-			// 		this.sampleDetailInfo = res.data.data
-			// 	})
-			// },
-			// saveSampleInfoList(){
-			// 	console.log(11)
-			// }
-		}
-	}
-</script>
-
-<style scoped>
-/* 	.content {
-		padding: 10px;
-	}
-
-	.content-box {
-		margin: 10px;
-		border-radius: 5px;
-	} */
-	.filled-instro{
-		color: cadetblue;
-		text-decoration:underline;
-	}
-	.filled-name{
-		font-weight: bold;
-	}
-</style>

pages/home/index.vue

@@ -6,65 +6,16 @@
     </cu-custom>
     <scroll-view scroll-y class="page">
 
-		<view>
-			<view class=" cu-bar bg-white solid-bottom margin-top" >
-			    <view class="action">
-			        <text class="cuIcon-title text-blue"></text> 信息填报
-			    </view>
-			</view>
-			<view class="cu-list menu margin-top">
-				<view class="cu-form-group">
-					<view class="title must">专家名称</view>
-					<input type="text" :value="userInfo.author">
-				</view>
-			    <view class="cu-form-group">
-			        <view class="title must">位置选择</view>
-					<picker :value="userInfo.site" :range="pickerRange"  @change="caseTypeChange">
-						<view class="picker">
-							{{ userInfo.site ?userInfo.site :'请选择'}}
-						</view>
-					</picker>
-			    </view>
-				
-			    <view class="cu-form-group">
-			        <view class="title must">指导时间</view>
-			        <input type="text" :value="userInfo.pzdt" disabled>
-			    </view>
-			    <view class="cu-bar bg-white ">
-			    	<view class="action must">
-			    		现场图片
-			    	</view>
-			    	<view class="action">
-			    		{{ imgList.length }}/1
-			    	</view>
-			    </view>
-			    <view class="cu-form-group">
-			    	<view class="grid col-4 grid-square flex-sub">
-			    		<view class="bg-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage" :data-url="imgList[index]">
-			    			<image :src="imgList[index]" mode="aspectFill"></image>
-			    			<view class="cu-tag bg-red" @tap.stop="DelImg" :data-index="index">
-			    				<text class='cuIcon-close'></text>
-			    			</view>
-			    		</view>
-			    		<view class="solids" @tap="ChooseImage" v-if="imgList.length<1">
-			    			<text class='cuIcon-cameraadd'></text>
-			    		</view>
-			    	</view>
-			    </view>
-			</view>
-			
-			<view class="padding  flex flex-direction">
-			    <button class="cu-btn bg-blue lg  margin-tb-sm shadow-blur text-lg"
-			            @click="submit" type="" >提交
-			    </button>
-			</view>
-			
-			
+		<view class="nav-list" style="margin-top: 40%;">
+			<navigator hover-class="none" @tap="toPage(index)"  class="nav-li" :class="'bg-'+item.color"
+			 v-for="(item,index) in elements" :key="index" style="width: 60%;margin-left: 20%">
+				<view class="nav-title" style="text-align: center;font-size: 50rpx;">{{item.title}}</view>  
+				<view class="nav-name"></view>
+			</navigator>
 		</view>
 		
 		
 		
-		
 		<view class="footer">
 			<view>主办单位：安徽省农业农村厅质监处</view>
 			<view>技术支持：安徽省北斗精准农业信息工程实验室</view>
@@ -83,6 +34,20 @@
     name: "basics",
     data() {
       return {
+		elements: [{
+			title: '信息填报',
+			name: 'layout',
+			color: 'green',
+			cuIcon: 'shengchanjidi',
+			subTitle:'基地'
+		},
+		{
+		    title: '填报记录',
+		    name: 'layout',
+		    color: 'blue',
+		    cuIcon: 'renzheng',
+		    subTitle:'检测'
+		}],
         cardCur: 0,
         dotStyle: false,
         towerStart: 0,
@@ -98,177 +63,23 @@
 		}
 	},
 	created() {
-		const now = new Date();
-		const year = now.getFullYear();
-		const month = now.getMonth() + 1;
-		const day = now.getDate();
-		const today = year + "-" + (month >= 10 ? month : ("0" + month)) + "-" + (day >= 10 ? day : ("0" + day));
-		this.$set(this.userInfo, "pzdt", today);
-		
-		
-		this.getLo();
-		
-		this.$set(this.userInfo,"author",wx.getStorageSync('username'));
-		console.log("缓存"+wx.getStorageSync('username'))
 		
 		this.toNextPage();
-		
-		
-		
-		
-		
-		
-		
+
 		
 	},
     methods: {
-		getLocation() {
-			return new Promise((resolve, reject) => {
-				uni.getLocation({
-					type: 'gcj02',
-					success: res => {
-						console.log('当前位置的经度：' + res.longitude);
-						console.log('当前位置的纬度：' + res.latitude);
-						const {latitude: lat, longitude: lng} = res;
-						resolve(res);
-					},
-					fail: err => {
-						this.$msg("位置获取失败");
-						reject("位置获取失败");
-					}
-				});
-			})
-		},
-		getLo(){
-			console.log("1111111")
-			uni.showLoading({
-			    title:'获取位置中...'
-			});
-			this.getLocation().then(res => {
-				console.log(res)
-				_home.location({
-					volatitude:res.latitude,
-					volongitude:res.longitude
-				},res=>{
-					uni.hideLoading();
-					console.log(res)
-					console.log(res.data.data[1].site)
-					var a=[];
-					a=res.data.data;
-					this.caseTypeList=[];
-					for (let i = 0; i < a.length; i++) {
-						
-						this.caseTypeList.push({
-							id:i,
-							site:a[i].site,
-						})
-						
-					}
+		toPage(index){
+			console.log("选择index" + index);
+			if(index==0){
+				uni.navigateTo({
+					url:'/pages/check/index'
 				})
-				
-				
-				
-			   /* const {latitude: lat, longitude: lng} = res;
-			    if(!lat || !lng){
-			        this.$msg("位置信息获取失败");
-			        this.disableFirstBtn = false;
-			    }
-			    this.$set(this.checkInfo, "check_lng", lng)
-			    this.$set(this.checkInfo, "check_lat", lat) */
-			})
-		},
-		
-		/**
-		 * 类型选择事件
-		 * **/
-		caseTypeChange(e){
-			console.log(e.detail.value);
-			//this.userInfo.case_type=e.detail.value;
-			this.$set(this.userInfo,"site",this.caseTypeList[e.detail.value].site)
-		},
-		submit(){
-			var that=this;
-			this.$set(this.userInfo,"imgurl",this.imgList.join(','))
-			console.log(this.userInfo);
-			
-			  wx.showModal({
-			    title: '提示', //提示的标题
-			    content: '确定提交吗？', //提示的内容
-			    success: function(res) {
-					if(res.confirm) {
-						_home.getLandImg(that.userInfo,res=>{
-							console.log(res)
-							if(res.data.code===1){
-								that.$msg("上报成功！");
-								
-								delete that.userInfo.imgurl;
-								delete that.userInfo.site;
-								that.imgList=[]
-							}else{
-								that.$msg("上报失败！");
-							}
-						})
-					}
-			    }
-			  })
-			
-			
-			
-			
-			
-		},
-		//照片
-		ChooseImage() {
-			uni.chooseImage({
-				count:3, //默认9
-				sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-				sourceType: ['album', 'camera'], //从相册选择
-				success: (res) => {
-					console.log(res)
-					uni.showLoading({
-						title: '图片上传中'
-					})
-					_home.ChooseImage(res.tempFilePaths[0], res => {
-						console.log('返回的结果',res)
-						let data = res.data
-						data = JSON.parse(data)
-						console.log(data)
-						var url=data.data;
-						console.log(url);
-						
-						if (this.imgList.length !== 0) {
-							this.imgList = this.imgList.concat(data.data)
-						} else {
-							this.imgList = [data.data]
-						}
-						//this.userInfo.report_image.push(url)
-						this.$set(this.userInfo,"imgurl",url)
-						uni.hideLoading()
-					})
-				}
-			});
-		},
-		DelImg(e) {
-			uni.showModal({
-				title: '图片删除',
-				content: '确定要删除图片吗？',
-				cancelText: '取消',
-				confirmText: '确认',
-				success: res => {
-					console.log(res)
-					if (res.confirm) {
-						/* this.infoList.product_images.splice(e.currentTarget.dataset.index, 1);
-						this.imgList.splice(e.currentTarget.dataset.index, 1); */
-						this.imgList.splice(e.currentTarget.dataset.index, 1)
-					}
-				}
-			})
-		},
-		ViewImage(index) {
-		    uni.previewImage({
-		    	urls: this.imgList,
-		    	current: e.currentTarget.dataset.url
-		    });
+			}else if(index==1){
+				uni.navigateTo({
+				url:'/pages/check-record/index'
+				})
+			}
 		},
 		toNextPage() {
         console.log("判断登录");

pages/quick-task/camera.vue

@@ -1,142 +0,0 @@
-<template>
-	<view>
-		<cu-custom class="home-custom" bgColor=".bg-sancolor"
-		           bgImage="https://ahwgh.oss-cn-hangzhou.aliyuncs.com/enterprise/6525f808df760.png" :isBack="true">
-		    <block slot="content">快速检测</block>
-		</cu-custom>
-		<camera device-position="back" flash="off" @error="error" style="width: 100%; height: 89.5vh;">
-			<cover-view class="float-content">
-				<cover-view class="out-border">
-					<cover-view class="title">二维码</cover-view>
-					<cover-view class="inside-border">
-						<cover-view class="thick-line">
-							<cover-view class="flag">C</cover-view>
-						</cover-view>
-						<cover-view class="thin-line"></cover-view>
-						<cover-view class="thick-line">
-							<cover-view class="flag">T</cover-view>
-						</cover-view>
-					</cover-view>
-				</cover-view>
-				<cover-view class="desc">请将显色区域放入框内</cover-view>
-			</cover-view>
-			<cover-view class="control">
-				<cover-view class="take-photo" @click="takePhoto">
-					<cover-view class="white-circle"></cover-view>
-				</cover-view>
-			</cover-view>
-		</camera>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			takePhoto() {
-				const ctx = uni.createCameraContext();
-				ctx.takePhoto({
-					quality: 'high',
-					success: (res) => {
-						uni.redirectTo({
-							url: '/pages/quick-task/result?pic=' + res.tempImagePath
-						});
-					}
-				});
-			}
-		}
-	}
-</script>
-
-<style scoped>
-.control{
-	position: absolute;
-	bottom: 0;
-	height: 15vh;
-	width: 100%;
-	background: rgba(0, 0, 0, 0.42);
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-.take-photo{
-	width: 10vh;
-	height: 10vh;
-	border-radius: 50%;
-	background: #b4b4b4;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-.white-circle{
-	width: 8vh;
-	height: 8vh;
-	border-radius: 50%;
-	background: #fff;
-}
-.float-content{
-	width: 100%;
-	height: 75vh;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-}
-.out-border{
-	width: 40%;
-	height: 55vh;
-	border: 2px solid #FFF;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-}
-.out-border .title{
-	margin-top: -40%;
-	color: red;
-	font-size: 26px;
-	margin-bottom: 5vh;
-	font-weight: bold;
-}
-.desc{
-	color: red;
-	font-size: 16px;
-	margin-top: 3vh;
-	font-weight: bold;
-}
-
-.inside-border{
-	border: 2px solid red;
-	width: 40%;
-	height: 10vh;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-}
-.thick-line{
-	width: 80%;
-	height: 2px;
-	background: red;
-	position: relative;
-}
-
-.thick-line .flag{
-	font-size: 20px;
-	position: absolute;
-	right: -25px;
-	top: -12px;
-	margin-top: 0;
-	font-weight: bold;
-}
-.thin-line{
-	width: 80%;
-	height: 1px;
-	background: red;
-	margin: 2.5vh 0;
-}
-</style>

pages/quick-task/form.vue

@@ -1,504 +0,0 @@
-<template>
-	<view class="form">
-		<view class="DrawerPage" :class="modalName=='DrawerModalL'?'show':''">
-			<cu-custom class="home-custom" bgColor=".bg-sancolor"
-			           bgImage="https://ahwgh.oss-cn-hangzhou.aliyuncs.com/enterprise/6525f808df760.png"
-			           :isBack="true">
-			    <block slot="content">胶体金检测</block>
-			</cu-custom>
-			<view>
-				<view>
-					<view class="cu-bar bg-white margin-top-sm solid-bottom">
-					    <view class="action">
-					        <text class="cuIcon-titles text-green"></text>
-					        <text>产品信息</text>
-					    </view>
-					</view>
-				    <view class="cu-form-group">
-				        <view class="title">所属区域</view>
-				
-				        <picker mode="multiSelector" :range="regionArray" @change="RegionChange"
-				                :value="regionIndex"
-				                @columnchange="columnchange">
-				            <view class="picker">
-				                {{ queryXzq }}
-				            </view>
-				        </picker>
-				    </view>
-					<view class="cu-form-group" @tap="showModal"
-					      :data-target="'DrawerModalL'">
-					    <view class="title">单位名称</view>
-					    <picker disabled="disabled">
-					        <view class="picker">
-					            {{ companyDetailInfo.bySampleUnitName || "请选择单位" }}
-					        </view>
-					    </picker>
-					</view>
-					<view class="cu-form-group" @tap="showModal"
-					      :data-target="'SampleModelL'">
-					    <view class="title">样品名称</view>
-					    <picker disabled="disabled">
-					        <view class="picker">
-					            {{ sampleDetailInfo.productName || "请选择样品" }}
-					        </view>
-					    </picker>
-					</view>
-					<view class="cu-form-group" @tap="showModal"
-					      :data-target="'JTJModelL'">
-					    <view class="title">胶体金类型</view>
-					    <picker disabled="disabled">
-					        <view class="picker">
-					            {{ JTJDetailInfo.name || "请选择胶体金类型" }}
-					        </view>
-					    </picker>
-					</view>
-					
-					<view class="padding flex flex-direction padding-bottom-xl fixedFootBtn bg-white padding-top-xs">
-					    <button class="cu-btn bg-green lg margin-top-sm shadow-blur" type="" @tap="nextSetp">
-					        上报
-					    </button>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="DrawerClose" :class="modalName==='DrawerModalL'?'show':''" @tap="hideModal">
-		    <text class="cuIcon-pullright"></text>
-		</view>
-		<scroll-view scroll-y class="DrawerWindow solid-right" :class="modalName==='DrawerModalL'?'show':''">
-		    <view class="bg-white padding-bottom" style="min-height: 100vh">
-		        <cu-custom class="home-custom" bgColor=".bg-sancolor"
-		                   bgImage="https://ahwgh.oss-cn-hangzhou.aliyuncs.com/enterprise/6525f808df760.png">
-		            <block slot="content">企业列表</block>
-		        </cu-custom>
-		        <view class="cu-list menu text-left">
-		            <view class="cu-bar search bg-white">
-		                <view class="search-form round">
-		                    <text class="cuIcon-search"></text>
-		                    <input type="text" placeholder="输入企业名称搜索" confirm-type="search" v-model="enterprisesName" />
-		                </view>
-		                <view class="action">
-		                    <button class="cu-btn bg-green shadow-blur round" @tap="searchEnterPrise">搜索</button>
-		                </view>
-		            </view>
-		        </view>
-		        <view class="cu-list menu bg-white margin-top-sm" v-for="(item,index) in qyList" :key="item.qydm"
-		              @tap="choseQy(index)">
-		            <view class="cu-item">
-		                <view class="action">
-		                    <text class="cuIcon-titles text-green"></text>
-		                    {{ item.enterprisesName }}
-		                </view>
-		            </view>
-		            <view class="cu-item">
-		                所属区域：<!-- {{ item.enterprisesAddress.split(" ")[0].replaceAll(",", "-") }} -->
-		            </view>
-		        </view>
-		        <view class="cu-load bg-green light text-sm" v-show="pageTotal !==0" @tap="getEnterPriseList"
-		              :class="pageNum > pageTotal?'over':'more'"></view>
-		        <view class="radius shadow-warp bg-white margin-top text-lg" v-show="pageTotal === 0">
-		            <view class="cu-list menu-avatar">
-		                <view class="cu-item">
-		                    <view class="content">
-		                        <view class="text-sm text-center" style="justify-content: center;">
-		                            <text class="text-cut text-lg">
-		                                <text class="cuIcon-warn text-yellow margin-right-xs text-xl"></text>
-		                                未查询到相关数据
-		                            </text>
-		                        </view>
-		                    </view>
-		                </view>
-		            </view>
-		        </view>
-		    </view>
-		</scroll-view>
-		
-		<view class="DrawerClose" :class="modalName==='SampleModelL'?'show':''" @tap="hideModal">
-		    <text class="cuIcon-pullright"></text>
-		</view>
-		<scroll-view scroll-y class="DrawerWindow solid-right" :class="modalName==='SampleModelL'?'show':''">
-		    <view class="bg-white padding-bottom" style="min-height: 100vh">
-		        <cu-custom class="home-custom" bgColor=".bg-sancolor"
-		                   bgImage="https://ahwgh.oss-cn-hangzhou.aliyuncs.com/enterprise/6525f808df760.png">
-		            <block slot="content">样品列表</block>
-		        </cu-custom>
-		        <view class="cu-list menu bg-white margin-top-sm" v-for="(item,index) in sampleList" :key="item.qydm"
-		              @tap="choseSample(index)">
-		            <view class="cu-item">
-		                <view class="action">
-		                    <text class="cuIcon-titles text-green"></text>
-		                    {{ item.productName }}
-		                </view>
-		            </view>
-		        </view>
-		        <view class="cu-load bg-green light text-sm" v-show="spageTotal !==0" @tap="getSampleList"
-		              :class="spageNum > spageTotal?'over':'more'"></view>
-		        <view class="radius shadow-warp bg-white margin-top text-lg" v-show="spageTotal === 0">
-		            <view class="cu-list menu-avatar">
-		                <view class="cu-item">
-		                    <view class="content">
-		                        <view class="text-sm text-center" style="justify-content: center;">
-		                            <text class="text-cut text-lg">
-		                                <text class="cuIcon-warn text-yellow margin-right-xs text-xl"></text>
-		                                未查询到相关数据
-		                            </text>
-		                        </view>
-		                    </view>
-		                </view>
-		            </view>
-		        </view>
-		    </view>
-		</scroll-view>
-		
-		
-		<view class="DrawerClose" :class="modalName==='JTJModelL'?'show':''" @tap="hideModal">
-		    <text class="cuIcon-pullright"></text>
-		</view>
-		<scroll-view scroll-y class="DrawerWindow solid-right" :class="modalName==='JTJModelL'?'show':''">
-		    <view class="bg-white padding-bottom" style="min-height: 100vh">
-		        <cu-custom class="home-custom" bgColor=".bg-sancolor"
-		                   bgImage="https://ahwgh.oss-cn-hangzhou.aliyuncs.com/enterprise/6525f808df760.png">
-		            <block slot="content">胶体金类型</block>
-		        </cu-custom>
-				<view class="cu-list menu text-left">
-				    <view class="cu-bar search bg-white">
-				        <view class="search-form round">
-				            <text class="cuIcon-search"></text>
-				            <input type="text" placeholder="输入胶体金类型搜索" confirm-type="search" v-model="JTJName" />
-				        </view>
-				        <view class="action">
-				            <button class="cu-btn bg-green shadow-blur round" @tap="searchJTJ">搜索</button>
-				        </view>
-				    </view>
-				</view>
-		        <view class="cu-list menu bg-white margin-top-sm" v-for="(item,index) in JTJList" :key="item.qydm"
-		              @tap="choseJTJ(index)">
-		            <view class="cu-item">
-		                <view class="action">
-		                    <text class="cuIcon-titles text-green"></text>
-		                    {{ item.name }}
-		                </view>
-		            </view>
-		        </view>
-		        <view class="cu-load bg-green light text-sm" v-show="jpageTotal !==0" @tap="getJTJList"
-		              :class="jpageNum > jpageTotal?'over':'more'"></view>
-		        <view class="radius shadow-warp bg-white margin-top text-lg" v-show="jpageTotal === 0">
-		            <view class="cu-list menu-avatar">
-		                <view class="cu-item">
-		                    <view class="content">
-		                        <view class="text-sm text-center" style="justify-content: center;">
-		                            <text class="text-cut text-lg">
-		                                <text class="cuIcon-warn text-yellow margin-right-xs text-xl"></text>
-		                                未查询到相关数据
-		                            </text>
-		                        </view>
-		                    </view>
-		                </view>
-		            </view>
-		        </view>
-		    </view>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-	import { _sampleDetail } from "../sample-detail/sample-detail-model.js";
-	export default {
-	    data() {
-	        return {
-				regionArray: [],
-				regionIndex: [],
-				queryXzq: "请选择",
-				xzqObjList: [],
-				qyList: [],
-				companyDetailInfo: {},
-				modalName: null,
-				enterprisesName: null,
-				pageNum: 1,
-				pageSize: 10,
-				pageTotal: 1,
-				
-				sampleName: '',
-				sampleList: [],
-				spageNum: 1,
-				spageSize: 10,
-				spageTotal: 1,
-				sampleDetailInfo: {},
-				
-				JTJName: '',
-				JTJList: [],
-				jpageNum: 1,
-				jpageSize: 100,
-				jpageTotal: 1,
-				JTJDetailInfo: {},
-			}
-		},
-		mounted() {
-		    this.initRange();
-		},
-		methods: {
-			nextSetp() {
-				if(!this.queryXzqdm) {
-					this.$msg("请先选择所属区域");
-					return false;
-				}
-				if(!this.companyDetailInfo.qydm) {
-					this.$msg("请先选择单位");
-					return false;
-				}
-				if(!this.sampleDetailInfo.productName) {
-					this.$msg("请先选择样品");
-					return false;
-				}
-				if(!this.JTJDetailInfo.name) {
-					this.$msg("请先选择胶体金类型");
-					return false;
-				}
-				uni.navigateTo({
-				  url: "/pages/quick-task/index"
-				});
-			},
-			async initRange() {
-			    const { unitId,name } = uni.getStorageSync("userInfo");
-          let role = uni.getStorageSync("role");
-          let  xzqdm;
-          if(role=="f35551e4a06647dea5c2c43aaba22c2a"){
-            xzqdm = unitId.substring(4, 13);
-          }
-          if(role=="a1cbf841b0514b47bbdd3f50c80b729f"){
-            xzqdm = unitId
-
-          }
-
-			    let level = 0;
-			    if (xzqdm.endsWith("0000000")) { //省
-			        level = 3;
-			    } else if (xzqdm.endsWith("00000")) { //市
-			        level = 2;
-			    } else if (xzqdm.endsWith("000")) { //县
-			        level = 1;
-			    }
-          const xzqlist = await this.getSubXzqList(xzqdm);
-          if(level!==0){
-
-            xzqlist.unshift({
-              xzqdm: "",
-              xzqmc: "请选择"
-            });
-
-            this.regionArray.splice(0, this.regionArray.length, xzqlist.map(v => v.xzqmc));
-            this.xzqObjList.splice(0, this.xzqObjList.length, xzqlist);
-            this.regionIndex.splice(0, this.regionIndex.length, 0);
-
-            for (let i = 0; i < level - 1; i++) {
-              this.regionArray.push(["请选择"]);
-              this.xzqObjList.push({ xzqdm: "", xzqmc: "请选择" });
-              this.regionIndex.push(0);
-            }
-          }else{
-            xzqlist.unshift({
-              xzqdm: unitId,
-              xzqmc: name
-            });
-            this.regionArray.push([name]);
-            this.xzqObjList.push({ xzqdm: unitId, xzqmc: name });
-            this.regionIndex.push(0);
-          }
-
-
-			},
-			getSubXzqList(xzqdm) {
-			    return new Promise(resolve => {
-			        _sampleDetail.getSubXzqList(xzqdm, res => {
-			            resolve(res);
-			        });
-			    });
-			},
-			RegionChange(e) {
-			    this.regionIndex = e.detail.value;
-			    let xzqdm = "", xzqmc = [];
-			    for (let i = 0; i <= this.regionIndex.length - 1; i++) {
-			        if (this.regionArray[i][this.regionIndex[i]] !== "请选择") {
-			            xzqmc.push(this.regionArray[i][this.regionIndex[i]]);
-			            xzqdm = this.xzqObjList[i][this.regionIndex[i]].xzqdm;
-			        }
-			    }
-			    this.queryXzqdm = xzqdm;
-			    this.queryXzq = xzqmc.join("/");
-			},
-			async columnchange(e) {
-			    const { column, value } = e.detail;
-			    const xzqdm = this.xzqObjList[column][value]["xzqdm"];
-			    if (xzqdm) {
-			        if (column <= this.regionIndex.length - 2) {
-			            const subList = await this.getSubXzqList(xzqdm);
-			            subList.unshift({
-			                xzqdm: "",
-			                xzqmc: "请选择"
-			            });
-			            this.xzqObjList.splice(column + 1, 1, subList); //逐级push-乡镇
-			            this.regionIndex.splice(column + 1, 1, 0);
-			            this.regionArray.splice(column + 1, 1, subList.map(v => v.xzqmc));
-			            for (let i = column + 2; i < this.regionIndex.length; i++) {
-			                this.xzqObjList.splice(i, 1, [{ xzqdm: "", xzqmc: "请选择" }]); //逐级push-乡镇
-			                this.regionIndex.splice(i, 1, 0);
-			                this.regionArray.splice(i, 1, ["请选择"]);
-			            }
-			        }
-			    } else {
-			        for (let i = column + 1; i < this.regionIndex.length; i++) {
-			            this.xzqObjList.splice(i, 1, [{ xzqdm: "", xzqmc: "请选择" }]); //逐级push-乡镇
-			            this.regionIndex.splice(i, 1, 0);
-			            this.regionArray.splice(i, 1, ["请选择"]);
-			        }
-			    }
-			
-			},
-			showModal(e) {
-			    const modalName = e.currentTarget.dataset.target;
-			    if (modalName === "DrawerModalL") {
-					if(!this.queryXzqdm) {
-						this.$msg("请先选择所属区域");
-						return false;
-					}
-			        this.getEnterPriseList();
-			    } else if (modalName === "SampleModelL") {
-					if(!this.companyDetailInfo.qydm) {
-						this.$msg("请先选择单位");
-						return false;
-					}
-					this.getSampleList()
-            console.log(this.sampleList)
-				} else if (modalName === "JTJModelL") {
-					this.getJTJTypeList()
-				}
-			    this.modalName = modalName;
-			},
-			choseQy(index) {
-			    const {
-			        enterprisesName: bySampleUnitName,
-			        qydm,
-			    } = this.qyList[index];
-			    this.companyDetailInfo.bySampleUnitName = bySampleUnitName;
-			    this.companyDetailInfo.qydm = qydm;
-			    this.modalName = null;
-				uni.setStorageSync("enterprisesInfo", {
-					enterprisesName: bySampleUnitName,
-					qydm
-				});
-			},
-			choseSample(index) {
-				this.sampleDetailInfo = {
-					...this.sampleList[index]
-				}
-				this.modalName = null;
-				uni.setStorageSync("sampleInfo", this.sampleDetailInfo);
-			},
-			choseJTJ(index) {
-				this.JTJDetailInfo = {
-					...this.JTJList[index]
-				}
-				this.modalName = null;
-				uni.setStorageSync("JTJInfo", this.JTJDetailInfo);
-			},
-			hideModal(e) {
-			    this.modalName = null;
-			},
-			searchEnterPrise() {
-			    this.pageNum = 1;
-			    this.pageTotal = 1;
-			    this.getEnterPriseList();
-			},
-			searchJTJ() {
-				this.jpageNum = 1;
-				this.jpageTotal = 1;
-				this.getJTJTypeList();
-			},
-			getEnterPriseList() {
-			    const param = {
-			        pageNum: this.pageNum,
-			        pageSize: this.pageSize,
-			        towns: this.queryXzqdm
-			    };
-			    if (this.enterprisesName) {
-			        param.enterprisesName = this.enterprisesName;
-			    }
-			    _sampleDetail.getEnterPriseList(param, res => {
-			        const { data, message, code } = res;
-			        if (code === 200) {
-			            const { records, total } = data;
-			            this.pageTotal = Math.ceil(total / this.pageSize);
-			            if (this.pageNum === 1) {
-			                this.qyList = records;
-			            } else {
-			                this.qyList = this.qyList.concat(records);
-			            }
-			            this.pageNum++;
-			        } else {
-			            uni.showToast({
-			                icon: "none",
-			                title: message,
-			                duration: 1000
-			            });
-			        }
-			    });
-			},
-			getSampleList() {
-				const param = {
-				    pageNum: this.spageNum,
-				    pageSize: this.spageSize,
-				    qydm: this.companyDetailInfo.qydm
-				};
-				_sampleDetail.getSampleByCompany(param, res => {
-				    const { data, message, code } = res;
-
-				    if (code === 200) {
-				        const { records, total } = data;
-                console.log(records)
-				        this.spageTotal = Math.ceil(total / this.spageSize);
-				        if (this.spageNum === 1) {
-				            this.sampleList = records;
-                    console.log(this.sampleList)
-				        } else {
-				            this.sampleList = this.sampleList.concat(records);
-				        }
-				        this.spageNum++;
-				    } else {
-				        uni.showToast({
-				            icon: "none",
-				            title: message,
-				            duration: 1000
-				        });
-				    }
-				});
-			},
-			getJTJTypeList() {
-				const param = {
-					pageNum: this.jpageNum,
-					pageSize: this.jpageSize
-				}
-				_sampleDetail.getJTJTypeList(param, res => {
-					const { data, message, code } = res;
-					if (code === 200) {
-					    const { records, total } = data;
-					    this.jpageTotal = Math.ceil(total / this.jpageSize);
-					    if (this.jpageNum === 1) {
-					        this.JTJList = records;
-					    } else {
-					        this.JTJList = this.JTJList.concat(records);
-					    }
-					    this.jpageNum++;
-					} else {
-					    uni.showToast({
-					        icon: "none",
-					        title: message,
-					        duration: 1000
-					    });
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-</style>

pages/quick-task/index.vue

@@ -1,63 +0,0 @@
-<template>
-	<view class="quick-task" style="padding-bottom: 150upx">
-		<cu-custom class="home-custom" bgColor=".bg-sancolor"
-		           bgImage="https://ahwgh.oss-cn-hangzhou.aliyuncs.com/enterprise/6525f808df760.png" :isBack="true">
-		    <block slot="content">胶体金检测</block>
-		</cu-custom>
-		<view class="content">
-			<view v-if="step === 'first'" class="first-step">
-				<image src="../../static/icons/reagent.png" mode="aspectFit"></image>
-				<button class="cu-btn bg-green lg margin-top-sm shadow-blur" type="" @tap="startCheck">
-				    开始检测
-				</button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-		    return {
-		       step: 'first',
-		    };
-		},
-		created() {
-		   
-		},
-		methods: {
-			startCheck() {
-				uni.navigateTo({
-				  url: "/pages/quick-task/camera"
-				});
-			}
-		}
-	}
-</script>
-
-<style scoped>
-.quick-task{
-	background: #fff;
-	height: 100%;
-	width: 100%;
-}
-.content{
-	height: 80vh;
-}
-.first-step{
-	height: 100%;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-	padding-top: 20vh;
-}
-.first-step button {
-	width: 90%;
-	margin-top: 20vh;
-}
-.first-step image {
-	width: 60vw;
-	margin-left: 10vw;
-}
-</style>

pages/quick-task/list.vue

@@ -1,298 +0,0 @@
-<template>
-	<view class="quick-task" style="padding-bottom: 150upx">
-		<cu-custom class="home-custom" bgColor=".bg-sancolor"
-			bgImage="https://ahwgh.oss-cn-hangzhou.aliyuncs.com/enterprise/6525f808df760.png" :isBack="true">
-			<block slot="content">胶体金检测</block>
-		</cu-custom>
-		<!-- 搜索部分 -->
-		<view class="search-Top"
-			style="position: fixed;z-index: 999; width: 100%;box-shadow: 0 5px 10px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);">
-			<view class="cu-bar search bg-white">
-				<view class="search-form radius">
-					<text class="cuIcon-search"></text>
-					<input type="text" placeholder="输入企业名称搜索" confirm-type="search" v-model="enterprisesName" />
-					<text class="cuIcon cuIcon-close endClass text-xxl text-bold" @tap="resetEnterprisesQuery"
-						v-show="enterprisesName !== ''"></text>
-				</view>
-				<view class="action">
-					<!-- 全部的按钮 -->
-					<picker mode="multiSelector" :range="regionArray" @change="RegionChange" :value="regionIndex"
-						@columnchange="columnchange">
-						<view class="picker">
-							{{queryXzq}}
-						</view>
-					</picker>
-					<text class="cuIcon-triangledownfill"></text>
-				</view>
-			</view>
-			<view class="cu-bar search bg-white">
-				<view class="search-form radius">
-					<text class="cuIcon-search"></text>
-					<input type="text" placeholder="输入样本名称搜索" confirm-type="search" v-model="productName" />
-					<text class="cuIcon cuIcon-close endClass text-xxl text-bold" @tap="resetProductQuery"
-						v-show="productName !== ''"></text>
-				</view>
-				<view class="action">
-					<!-- 全部的按钮 -->
-					<button class="cu-btn bg-green shadow-blur" style="margin-right: 22px;" @tap="search">搜索</button>
-				</view>
-			</view>
-		</view>
-		<!-- 列表部分 -->
-		<view class="padding-sm quick-list">
-			<view class="cu-list menu margin-top taskDetail bg-white" v-for="(item, index) in listData" :key="index">
-				<view class="cu-item">
-					<view class="title text-black text-bold text-lg">
-						<text class="cuIcon-titles text-green"></text>
-						{{ item.jcxm }}
-					</view>
-					<view class="action">
-						<view class="text-gray">
-							{{ [1,2].includes(item.jcjg) ? '阴性' : '阳性' }}
-						</view>
-
-					</view>
-				</view>
-				<view class="content padding-sm detail solid-bottom">
-					<view>检测编号：{{ item.jcbh }}</view>
-					<view>检测站名称：{{ item.jczmc }}</view>
-					<view>被检单位：{{ item.enterprisesName }}</view>
-					<view>样本名称：{{ item.productName }}</view>
-					<view>产品批次号：{{ item.batchId }}</view>
-				</view>
-			</view>
-		</view>
-		<view class="padding flex flex-direction padding-bottom-xl fixedFootBtn padding-top-xs">
-			<button class="cu-btn bg-green lg margin-top-sm shadow-blur" type="" @tap="nextSetp">
-				新增检测
-			</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		_sampleDetail
-	} from "../sample-detail/sample-detail-model.js";
-	export default {
-		data() {
-			return {
-				listData: [],
-				regionArray: [],
-				regionIndex: [],
-				xzqObjList: [],
-				queryXzq:"全部",
-				queryXzqdm: null,
-				pageNum: 1,
-				pageSize: 10,
-				pageTotal: 1,
-				unitId: '',
-				enterprisesName: '',
-				productName: '',
-				inSearching: false,
-			};
-		},
-		onLoad() {
-			const { unitId } = uni.getStorageSync("userInfo");
-			this.unitId = unitId;
-			this.queryXzqdm = unitId;
-			this.getList()
-			this.initRange();
-		},
-		methods: {
-			search() {
-				this.pageNum = 1;
-				this.getList()
-			},
-			resetEnterprisesQuery(){
-			    this.enterprisesName = "";
-			},
-			resetProductQuery() {
-				this.productName = "";
-			},
-			getList() {
-				this.inSearching = true
-				_sampleDetail.getJTJList({
-					xzqCode: this.queryXzqdm,
-					enterprisesName: this.enterprisesName,
-					productName: this.productName,
-					pageNum: this.pageNum,
-					pageSize: this.pageSize
-				}, res => {
-					const { records, total } = res.data
-					if (this.pageNum === 1) {
-						this.listData = records
-					} else {
-						this.listData = this.listData.concat(records) 
-					}
-					this.pageTotal = total
-					this.inSearching = false
-					if (records.length > 0) {
-						this.pageNum++
-					}
-				})
-			},
-			onReachBottom() {
-			    this.getList();
-			},
-			getSubXzqList(xzqdm) {
-			    return new Promise(resolve => {
-			        _sampleDetail.getSubXzqList(xzqdm, res => {
-			            resolve(res);
-			        });
-			    });
-			},
-			async initRange() {
-				const {
-					unitId,
-					name
-				} = uni.getStorageSync("userInfo");
-				let role = uni.getStorageSync("role");
-				let xzqdm;
-				if (role == "f35551e4a06647dea5c2c43aaba22c2a") {
-					xzqdm = unitId.substring(4, 13);
-				}
-				if (role == "a1cbf841b0514b47bbdd3f50c80b729f") {
-					xzqdm = unitId
-
-				}
-
-				let level = 0;
-				if (xzqdm.endsWith("0000000")) { //省
-					level = 3;
-				} else if (xzqdm.endsWith("00000")) { //市
-					level = 2;
-				} else if (xzqdm.endsWith("000")) { //县
-					level = 1;
-				}
-				const xzqlist = await this.getSubXzqList(xzqdm);
-				if (level !== 0) {
-
-					xzqlist.unshift({
-						xzqdm: "",
-						xzqmc: "请选择"
-					});
-
-					this.regionArray.splice(0, this.regionArray.length, xzqlist.map(v => v.xzqmc));
-					this.xzqObjList.splice(0, this.xzqObjList.length, xzqlist);
-					this.regionIndex.splice(0, this.regionIndex.length, 0);
-
-					for (let i = 0; i < level - 1; i++) {
-						this.regionArray.push(["请选择"]);
-						this.xzqObjList.push({
-							xzqdm: "",
-							xzqmc: "请选择"
-						});
-						this.regionIndex.push(0);
-					}
-				} else {
-			 	xzqlist.unshift({
-						xzqdm: unitId,
-						xzqmc: name
-					});
-					this.regionArray.push([name]);
-					this.xzqObjList.push({
-						xzqdm: unitId,
-						xzqmc: name
-					});
-					this.regionIndex.push(0);
-				}
-
-
-			},
-			async columnchange(e) {
-			    const { column, value } = e.detail;
-			    const xzqdm = this.xzqObjList[column][value]["xzqdm"];
-			    if (xzqdm) {
-			        if (column <= this.regionIndex.length - 2) {
-			            const subList = await this.getSubXzqList(xzqdm);
-			            subList.unshift({
-			                xzqdm: "",
-			                xzqmc: "请选择"
-			            });
-			            this.xzqObjList.splice(column + 1, 1, subList); //逐级push-乡镇
-			            this.regionIndex.splice(column + 1, 1, 0);
-			            this.regionArray.splice(column + 1, 1, subList.map(v => v.xzqmc));
-			            for (let i = column + 2; i < this.regionIndex.length; i++) {
-			                this.xzqObjList.splice(i, 1, [{ xzqdm: "", xzqmc: "请选择" }]); //逐级push-乡镇
-			                this.regionIndex.splice(i, 1, 0);
-			                this.regionArray.splice(i, 1, ["请选择"]);
-			            }
-			        }
-			    } else {
-			        for (let i = column + 1; i < this.regionIndex.length; i++) {
-			            this.xzqObjList.splice(i, 1, [{ xzqdm: "", xzqmc: "请选择" }]); //逐级push-乡镇
-			            this.regionIndex.splice(i, 1, 0);
-			            this.regionArray.splice(i, 1, ["请选择"]);
-			        }
-			    }
-			
-			},
-			RegionChange(e){
-			    this.regionIndex = e.detail.value;
-			    let xzqdm = "", xzqmc = [];
-			    for (let i = 0; i <= this.regionIndex.length - 1; i++) {
-			        if (this.regionArray[i][this.regionIndex[i]] !== "请选择") {
-			            xzqmc.push(this.regionArray[i][this.regionIndex[i]]);
-			            xzqdm = this.xzqObjList[i][this.regionIndex[i]].xzqdm;
-			        }
-			    }
-			    this.queryXzqdm = xzqdm || this.unitId;
-			    this.queryXzq = xzqmc.join("/") || '全部';
-				this.pageNum = 1
-			    this.getList();//查询
-			},
-			nextSetp() {
-				uni.navigateTo({
-					url: "/pages/quick-task/form"
-				});
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.quick-task {
-		background: #fff;
-		height: 100%;
-		width: 100%;
-	}
-
-	.first-step {
-		height: 100%;
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		padding-top: 20vh;
-	}
-
-	.first-step button {
-		width: 90%;
-		margin-top: 20vh;
-	}
-
-	.first-step image {
-		width: 60vw;
-		margin-left: 10vw;
-	}
-
-	.quick-list {
-		padding-top: 100px;
-		padding-bottom: 100px;
-	}
-
-	.detail view {
-		height: 1.8em;
-		line-height: 1.8em !important;
-		border: none;
-		color: gray;
-	}
-
-	.taskDetail {
-		/*border: 1rpx solid #8799a3;*/
-		box-shadow: 0 0 25upx #aaa;
-		border-radius: 10rpx;
-		overflow: hidden;
-	}
-</style>

pages/quick-task/quick-list.vue

@@ -1,334 +0,0 @@
-<template>
-	<view class="quick-task" style="padding-bottom: 150upx">
-		<cu-custom class="home-custom" bgColor=".bg-sancolor"
-			bgImage="https://ahwgh.oss-cn-hangzhou.aliyuncs.com/enterprise/6525f808df760.png" :isBack="true">
-			<block slot="content">快速检测</block>
-		</cu-custom>
-		<!-- 搜索部分 -->
-		<view class="search-Top"
-			style="position: fixed;z-index: 999; width: 100%;box-shadow: 0 5px 10px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);">
-			<view class="cu-bar search bg-white">
-                <view class="action">
-                    <!-- 全部的按钮 -->
-                    <picker mode="multiSelector" :range="regionArray" @change="RegionChange" :value="regionIndex"
-                            @columnchange="columnchange">
-                        <view class="picker">
-                            {{queryXzq}}
-                        </view>
-                    </picker>
-                    <text class="cuIcon-triangledownfill"></text>
-                </view>
-				<view class="search-form radius">
-					<text class="cuIcon-search"></text>
-					<input type="text" placeholder="输入企业名称搜索" confirm-type="search" v-model="enterprisesName" />
-					<text class="cuIcon cuIcon-close endClass text-xxl text-bold" @tap="resetEnterprisesQuery"
-						v-show="enterprisesName !== ''"></text>
-				</view>
-                <view class="action">
-                    <!-- 全部的按钮 -->
-                    <button class="cu-btn bg-green shadow-blur" @tap="search">搜索</button>
-                </view>
-			</view>
-			<view class="cu-form-group">
-                <view class="title">
-                    <text class="padding-right-sm"><text class="cuIcon-filter"></text>筛选更多</text>
-                    <view class="cu-tag bg-orange light">测试</view></view>
-                <view>
-                    <view class="text-bold text-df">
-                        <text class="cuIcon-close"></text>
-                        重置</view>
-                </view>
-<!--				<view class="search-form radius">
-					<text class="cuIcon-search"></text>
-					<input type="text" placeholder="输入样本名称搜索" confirm-type="search" v-model="productName" />
-					<text class="cuIcon cuIcon-close endClass text-xxl text-bold" @tap="resetProductQuery"
-						v-show="productName !== ''"></text>
-				</view>-->
-			</view>
-		</view>
-		<!-- 列表部分 -->
-		<view class="padding-sm quick-list">
-			<view class="cu-list menu margin-top-sm taskDetail bg-white" v-for="(item, index) in listData" :key="index">
-				<view class="cu-item">
-					<view class="title text-black text-bold text-lg">
-						<text class="cuIcon-titles text-green"></text>
-						{{ item.jcxm }}
-					</view>
-					<view class="action">
-						<view class="radius text-lg text-bold" :class="item.jcjg ? 'text-green':'text-red'">
-							{{ item.jcjg ? '合格' : '不合格' }}
-						</view>
-					</view>
-				</view>
-				<view class="content padding-sm detail solid-bottom">
-					<view>检测任务编号：{{ item.rwbh }}</view>
-					<view>检测站名称：{{ item.jczmc }}</view>
-					<view>被检企业名称：{{ item.enterprisesName }}</view>
-					<view>样本名称：{{ item.ybmc }}</view>
-					<view>产品批次号：{{ item.productBatchId }}</view>
-					<view>检测时间：{{ item.jcTime }}</view>
-					<view>检测值：{{ item.jcz }}{{ item.jczUnit }}</view>
-					<view>检测类型：{{ typeMap[item.type] }}</view>
-					<view>创建时间：{{ item.createTime }}</view>
-				</view>
-			</view>
-		</view>
-        <view class="cu-modal" :class="modalName==='filterDlg'?'show':''">
-            <view class="cu-dialog">
-<!--                <view class="cu-bar bg-white justify-end">
-                    <view class="content" style="width: 100%">添加抽样单</view>
-                    <view class="action" @tap="hideModal">
-                        <text class="cuIcon-close text-red"></text>
-                    </view>
-                </view>-->
-                <view class="padding-lr-lg bg-white padding-bottom">
-                    <view class="cu-list menu">
-                        <view class="cu-form-group ">
-                            <view class="title">样品名称</view>
-                            <input name="input" v-model="productName" placeholder="请输入抽样人员1">
-                        </view>
-                        <view class="cu-form-group ">
-                            <view class="title">检测结果</view>
-                            <input name="input" v-model="options.samplingPeopleSecond" placeholder="请输入抽样人员2">
-                        </view>
-                    </view>
-                    <view class="padding flex flex-direction">
-                        <button class="cu-btn bg-blue lg" @tap="submitSampleSheet">提交</button>
-                    </view>
-                </view>
-            </view>
-        </view>
-	</view>
-</template>
-
-<script>
-	import {
-		_sampleDetail
-	} from "../sample-detail/sample-detail-model.js";
-	export default {
-		data() {
-			return {
-				listData: [],
-				regionArray: [],
-				regionIndex: [],
-				xzqObjList: [],
-				queryXzq:"全部",
-				queryXzqdm: null,
-                modalName: null,
-				pageNum: 1,
-				pageSize: 10,
-				pageTotal: 1,
-				unitId: '',
-				enterprisesName: '',
-				productName: '',
-				inSearching: false,
-				typeMap: {
-					1: '农残',
-					2: '畜禽',
-					3: '水产'
-				}
-			};
-		},
-		onLoad() {
-			const { unitId } = uni.getStorageSync("userInfo");
-			this.unitId = unitId;
-			this.queryXzqdm = unitId;
-			this.getList()
-			this.initRange();
-		},
-		methods: {
-			search() {
-				this.pageNum = 1;
-				this.getList()
-			},
-			resetEnterprisesQuery(){
-			    this.enterprisesName = "";
-			},
-			resetProductQuery() {
-				this.productName = "";
-			},
-			getList() {
-				this.inSearching = true
-				_sampleDetail.getQuickList({
-					xzqCode: this.queryXzqdm.substring(4, 13),
-					enterprisesName: this.enterprisesName,
-					ybmc: this.productName,
-					pageNum: this.pageNum,
-					pageSize: this.pageSize
-				}, res => {
-					const { records, total } = res.data
-					if (this.pageNum === 1) {
-						this.listData = records
-					} else {
-						this.listData = this.listData.concat(records) 
-					}
-					this.pageTotal = total
-					this.inSearching = false
-					if (records.length > 0) {
-						this.pageNum++
-					}
-				})
-			},
-			onReachBottom() {
-			    this.getList();
-			},
-			getSubXzqList(xzqdm) {
-			    return new Promise(resolve => {
-			        _sampleDetail.getSubXzqList(xzqdm, res => {
-			            resolve(res);
-			        });
-			    });
-			},
-			async initRange() {
-				const {
-					unitId,
-					name
-				} = uni.getStorageSync("userInfo");
-				let role = uni.getStorageSync("role");
-				let xzqdm;
-				if (role == "f35551e4a06647dea5c2c43aaba22c2a") {
-					xzqdm = unitId.substring(4, 13);
-				}
-				if (role == "a1cbf841b0514b47bbdd3f50c80b729f") {
-					xzqdm = unitId
-
-				}
-
-				let level = 0;
-				if (xzqdm.endsWith("0000000")) { //省
-					level = 3;
-				} else if (xzqdm.endsWith("00000")) { //市
-					level = 2;
-				} else if (xzqdm.endsWith("000")) { //县
-					level = 1;
-				}
-				const xzqlist = await this.getSubXzqList(xzqdm);
-				if (level !== 0) {
-
-					xzqlist.unshift({
-						xzqdm: "",
-						xzqmc: "请选择"
-					});
-
-					this.regionArray.splice(0, this.regionArray.length, xzqlist.map(v => v.xzqmc));
-					this.xzqObjList.splice(0, this.xzqObjList.length, xzqlist);
-					this.regionIndex.splice(0, this.regionIndex.length, 0);
-
-					for (let i = 0; i < level - 1; i++) {
-						this.regionArray.push(["请选择"]);
-						this.xzqObjList.push({
-							xzqdm: "",
-							xzqmc: "请选择"
-						});
-						this.regionIndex.push(0);
-					}
-				} else {
-			 	xzqlist.unshift({
-						xzqdm: unitId,
-						xzqmc: name
-					});
-					this.regionArray.push([name]);
-					this.xzqObjList.push({
-						xzqdm: unitId,
-						xzqmc: name
-					});
-					this.regionIndex.push(0);
-				}
-
-
-			},
-			async columnchange(e) {
-			    const { column, value } = e.detail;
-			    const xzqdm = this.xzqObjList[column][value]["xzqdm"];
-			    if (xzqdm) {
-			        if (column <= this.regionIndex.length - 2) {
-			            const subList = await this.getSubXzqList(xzqdm);
-			            subList.unshift({
-			                xzqdm: "",
-			                xzqmc: "请选择"
-			            });
-			            this.xzqObjList.splice(column + 1, 1, subList); //逐级push-乡镇
-			            this.regionIndex.splice(column + 1, 1, 0);
-			            this.regionArray.splice(column + 1, 1, subList.map(v => v.xzqmc));
-			            for (let i = column + 2; i < this.regionIndex.length; i++) {
-			                this.xzqObjList.splice(i, 1, [{ xzqdm: "", xzqmc: "请选择" }]); //逐级push-乡镇
-			                this.regionIndex.splice(i, 1, 0);
-			                this.regionArray.splice(i, 1, ["请选择"]);
-			            }
-			        }
-			    } else {
-			        for (let i = column + 1; i < this.regionIndex.length; i++) {
-			            this.xzqObjList.splice(i, 1, [{ xzqdm: "", xzqmc: "请选择" }]); //逐级push-乡镇
-			            this.regionIndex.splice(i, 1, 0);
-			            this.regionArray.splice(i, 1, ["请选择"]);
-			        }
-			    }
-			
-			},
-			RegionChange(e){
-			    this.regionIndex = e.detail.value;
-			    let xzqdm = "", xzqmc = [];
-			    for (let i = 0; i <= this.regionIndex.length - 1; i++) {
-			        if (this.regionArray[i][this.regionIndex[i]] !== "请选择") {
-			            xzqmc.push(this.regionArray[i][this.regionIndex[i]]);
-			            xzqdm = this.xzqObjList[i][this.regionIndex[i]].xzqdm;
-			        }
-			    }
-			    this.queryXzqdm = xzqdm || this.unitId;
-			    this.queryXzq = xzqmc.join("/") || '全部';
-				this.pageNum = 1
-			    this.getList();//查询
-			},
-			nextSetp() {
-				uni.navigateTo({
-					url: "/pages/quick-task/form"
-				});
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.quick-task {
-		background: #fff;
-		height: 100%;
-		width: 100%;
-	}
-
-	.first-step {
-		height: 100%;
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		padding-top: 20vh;
-	}
-
-	.first-step button {
-		width: 90%;
-		margin-top: 20vh;
-	}
-
-	.first-step image {
-		width: 60vw;
-		margin-left: 10vw;
-	}
-
-	.quick-list {
-		padding-top: 100px;
-	}
-
-	.detail view {
-		height: 1.8em;
-		line-height: 1.8em !important;
-		border: none;
-		color: gray;
-	}
-
-	.taskDetail {
-		/*border: 1rpx solid #8799a3;*/
-		box-shadow: 0 0 25upx #aaa;
-		border-radius: 10rpx;
-		overflow: hidden;
-	}
-</style>

pages/quick-task/result.vue

@@ -1,148 +0,0 @@
-<template>
-	<view class="result">
-		<cu-custom class="home-custom" bgColor=".bg-sancolor"
-		           bgImage="https://ahwgh.oss-cn-hangzhou.aliyuncs.com/enterprise/6525f808df760.png" :isBack="true">
-		    <block slot="content">胶体金检测</block>
-		</cu-custom>
-		<image :src="tempImage" mode="aspectFit"></image>
-		<view class="result-icon">
-			<view class="success-icon" v-if="[1, 2].includes(status)">
-				<image class="icon" src="../../static/icons/result-icon.svg" mode="aspectFit"></image>
-				<text>阴性</text>
-			</view>
-			<view class="fail-icon" v-else-if="[3, 4].includes(status)">
-				<image class="icon" src="../../static/icons/fail-icon.svg" mode="aspectFit"></image>
-				<text>阳性</text>
-			</view>
-			<view class="cancel-icon" v-else-if="-1 === status">
-				<image class="icon" src="../../static/icons/cancel-icon.svg" mode="aspectFit"></image>
-				<text>无效</text>
-			</view>
-		</view>
-		
-		<view class="padding flex flex-direction padding-bottom-xl fixedFootBtn padding-top-xs">
-		    <button class="cu-btn bg-green lg margin-top-sm shadow-blur" type="" @tap="nextSetp">
-		        完成
-		    </button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { _sampleDetail } from "../sample-detail/sample-detail-model.js";
-	export default {
-		data() {
-			return {
-				tempImage: '',
-				status: null,
-			}
-		},
-		onLoad(option) {
-			if (option.pic) {
-				uni.showLoading({
-					title: '识别中'
-				});
-				this.tempImage = option.pic
-				_sampleDetail.submitJTJImage(option.pic, (res) => {
-					const { data, message, code } = JSON.parse(res);
-					console.log('code:', data, code)
-					if (code === 200) {
-						const { image, jcjg } = data;
-						this.status = jcjg;
-						uni.hideLoading()
-						// 如果检测成功了，需要保存结果，暂时没有接口
-						// if ([1,2,3,4].includes(jcjg)) {
-							this.saveResult({
-								image,
-								jcjg
-							})
-						// }
-					}
-				})
-			}
-		},
-		methods: {
-			saveResult({ jcjg, image }) {
-				const { unitId: jczbh, name: jczmc } = uni.getStorageSync("userInfo");
-				const { enterprisesName, qydm } = uni.getStorageSync("enterprisesInfo");
-				const { batchId, productName, productType } = uni.getStorageSync("sampleInfo");
-				const { name: jcxm } = uni.getStorageSync("JTJInfo");
-				_sampleDetail.saveResult({
-					  batchId,
-					  enterprisesName,
-					  image,
-					  "jcbh": "",
-					  jcjg,
-					  jcxm,
-					  jczbh,
-					  jczmc,
-					  productName,
-					  productType,
-					  qydm
-				}, res => {
-					
-				})
-			},
-			nextSetp() {
-				uni.redirectTo({
-					url: '/pages/index/index'
-				});
-			}
-		}
-	}
-</script>
-
-<style>
-.result-icon{
-	position: absolute;
-	top: 10px;
-	left: 10px;
-	z-index: 100;
-	width: 100vw;
-	height: 100vh;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-.result-icon .icon{
-	width: 200px;
-	height: 200px;
-}
-.result image{
-	width: 100vw;
-	height: 89vh;
-}
-.fail-icon,
-.success-icon,
-.cancel-icon{
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-.success-icon text{
-	color: #80d185;
-	font-size: 30px;
-	font-weight: bold;
-	position: absolute;
-	transform: rotate(-35deg);
-}
-.fail-icon text{
-	color: #d81e06;
-	font-size: 30px;
-	font-weight: bold;
-	position: absolute;
-	transform: rotate(-35deg);
-}
-
-.cancel-icon text{
-	color: #515151;
-	font-size: 30px;
-	font-weight: bold;
-	position: absolute;
-	transform: rotate(-35deg);
-}
-.fixedFootBtn{
-	border: none;
-	z-index: 1000;
-}
-</style>

pages/sample-check-list/check-model.js

@@ -1,89 +0,0 @@
-import {
-	Base
-} from '../../static/util/base.js'
-class CheckModel extends Base {
-	constructor() {
-		super();
-	}
-
-	getSampleListByNJB(data,callBack) {
-		var params = {
-			url: '/ah/ahSampleSheet/getSampleListByNJB',
-			data:data,
-			sCallBack: function(res) {
-				callBack && callBack(res.data)
-			}
-		}
-		this.serviceRequest(params);
-	}
-
-	getSampleInfoByNJB(sampleSheetNumber,callBack) {
-		var params = {
-			url: '/ah/ahSampleSheet/getSampleInfoByNJB',
-			data:{sampleSheetNumber},
-			sCallBack: function(res) {
-				callBack && callBack(res.data)
-			}
-		}
-		this.serviceRequest(params);
-	}
-
-	submitSampleSheetNJB(id,callBack) {
-		var params = {
-			url: '/ah/ahSampleSheet/submitSampleSheetNJB',
-			data:{id},
-			sCallBack: function(res) {
-				callBack && callBack(res.data)
-			}
-		}
-		this.serviceRequest(params);
-	}
-
-	submitSampleSheet(data,callBack) {
-		var params = {
-			url: '/ah/ahCheckNak/submitSampleSheet',
-			data:data,
-			sCallBack: function(res) {
-				callBack && callBack(res)
-			}
-		}
-		this.serviceRequest(params);
-	}
-
-	/**
-	 * 查询抽样单详情
-	 * @param id
-	 * @param callBack
-	 */
-
-	getAhSampleSheetDetail(id,callBack) {
-		var params = {
-			url: '/ah/ahSampleSheet/'+id,
-			sCallBack: function(res) {
-				callBack && callBack(res.data)
-			}
-		}
-		this.serviceRequest(params);
-	}
-
-	/**
-	 * 获取本抽样单下面所有样品详细信息
-	 */
-
-	getSampleSheetDetailData(data,callBack){
-		const params = {
-			url: '/ah/ahSampleDetail/list',
-			type: 'get',
-			data:data,
-			sCallBack: function(res) {
-				callBack && callBack(res.data)
-			}
-		}
-		this.serviceRequest(params);
-	}
-}
-
-const _checkModel = new CheckModel();
-export {
-	_checkModel
-}

pages/sample-check-list/home.vue

@@ -1,69 +0,0 @@
-<template name="basics">
-    <view>
-        <cu-custom class="home-custom" bgColor=".bg-sancolor"
-                   bgImage="https://ahwgh.oss-cn-hangzhou.aliyuncs.com/enterprise/6525f808df760.png" :isBack="true">
-            <view slot="backText">返回</view>
-            <block slot="content">第三方检测</block>
-        </cu-custom>
-        <scroll-view scroll-y class="page">
-            <view class="nav-list" style="margin-top: 40upx;">
-                <view hover-class="none" @tap="toNextPage" :data-path="item.path" class="nav-li"
-                      :class="'bg-'+item.color"
-                      :style="[{animation: 'show ' + ((index+1)*0.2+1) + 's 1'}]" v-for="(item,index) in elements"
-                      :key="index">
-                    <view class="nav-title">{{ item.title }}</view>
-                    <view class="nav-name">{{ item.subTitle }}</view>
-
-                </view>
-            </view>
-        </scroll-view>
-    </view>
-</template>
-
-<script>
-
-    export default {
-        data() {
-            return {
-                elements: [
-                    {
-                        title: "监督抽查",
-                        name: "layout",
-                        color: "green",
-                        subTitle: "监督",
-                        path: "/pages/sample-check-list/index"
-                    },
-                    {
-                        title: "例行监测",
-                        name: "background",
-                        color: "mauve",
-                        subTitle: "例行",
-                        path: "/pages/zf-task-list/taskList"
-                    }
-                ]
-            };
-        },
-        onShow() {
-            /**/
-            const userInfo = uni.getStorageSync("userInfo");
-            if ((userInfo.level !== "乡镇级" && userInfo.person_group !== "组长") && this.elements.length === 1) {
-                this.elements.push({
-                    title: "网格员审核",
-                    name: "background",
-                    color: "red",
-                    subTitle: "Review",
-                    path: "/pages/grid/view"
-                });
-            }
-        },
-        methods: {
-            toNextPage(e) {
-                // console.log();
-                //判断有没有登录，没有登录直接跳到登录，登录了 跳到任务详情
-                uni.navigateTo({
-                    url: e.currentTarget.dataset.path
-                });
-            }
-        }
-    };
-</script>

pages/sample-check-list/index.vue

@@ -1,254 +0,0 @@
-<template>
-    <view class="quick-task" style="padding-bottom: 150upx">
-        <cu-custom class="home-custom" bgColor=".bg-sancolor"
-                   bgImage="https://ahwgh.oss-cn-hangzhou.aliyuncs.com/enterprise/6525f808df760.png" :isBack="true">
-            <block slot="content">定量检测</block>
-        </cu-custom>
-        <view class="cu-bar search bg-white">
-            <view class="text-center text-xxl text-bold padding-left-sm" @tap="scanQrCode">
-                <text class="cuIcon-scan text-orange lg"></text>
-            </view>
-            <view class="search-form">
-                <text class="cuIcon-search"></text>
-                <input type="text" placeholder="输入抽样单号查询新抽样单" v-model="sampleSheetNumber" style="padding-right: 0;">
-                <text class="cuIcon cuIcon-close endClass text-xxl text-bold" @tap="sampleSheetNumber = ''"
-                                                                                                v-show="sampleSheetNumber !== ''"></text>
-            </view>
-            <view class="action">
-                <button class="cu-btn bg-green shadow-blur round" @tap="searchNewSample">查询</button>
-            </view>
-        </view>
-        <view class="padding-sm quick-list" v-if="!searchSample.id">
-            <view class="cu-list menu bg-white shadow" v-for="(item, index) in listData" :key="index">
-                <view class="cu-item">
-                    <view class="title text-black text-bold text-lg">
-                        <text class="cuIcon-titles text-green"></text>
-                        {{ item.ahSampleDetailList.map(v => v.name).join(",") }}
-                    </view>
-                    <view class="action">
-                        <text class="text-orange text-bold text-lg"
-                              v-if="item.sampleStatus==='WAIT_ENTERPRISES_SUBMIT'">待确认
-                        </text>
-                    </view>
-                </view>
-                <view class="content padding-sm detail solid-bottom">
-                    <!--                    <view>抽检产品：{{  }}</view>-->
-                    <view>抽样任务：{{ item.ahTasks.taskName }}</view>
-                    <view>任务编号：{{ item.ahTasks.taskNumber }}</view>
-                    <view>年度/季度：{{ item.ahTasks.taskYear.substr(0, 4) }}-{{
-                            item.ahTasks.taskBatch
-                        }}
-                    </view>
-                    <view>发布单位：{{ item.publishUnitName }}</view>
-                    <view>抽样单位：{{ item.sampleUnitName }}</view>
-                    <view class="text-gray">抽样人员：{{ item.samplingPeopleFirst }}、{{ item.samplingPeopleSecond }}</view>
-                    <view>抽样时间：{{ item.ahSampleDetailList[0].createTime }}</view>
-                </view>
-                <view class="tools padding-sm">
-                    <view>
-                    </view>
-                    <view style="display: flex;justify-content: space-between;gap:30upx">
-                        <view class="tool" @tap="toSampleDetail(item)">
-                            <view class="cu-btn bg-blue light text-df text-bold">
-                                {{ item.sampleStatus === 'WAIT_ENTERPRISES_SUBMIT' ? '去确认' : '查看' }}
-                                <text class="cuIcon-right lg"></text>
-                            </view>
-                        </view>
-                    </view>
-                </view>
-            </view>
-            <view class="radius shadow-warp bg-white text-lg" v-if="listData.length === 0">
-                <view class="cu-list menu-avatar">
-                    <view class="cu-item">
-                        <view class="content">
-                            <view class="text-sm text-center" style="justify-content: center;">
-                                <text class="text-cut text-lg">
-                                    <text class="cuIcon-warn text-yellow margin-right-xs text-xl"></text>
-                                    未查询到相关数据
-                                </text>
-                            </view>
-                        </view>
-                    </view>
-                </view>
-            </view>
-
-        </view>
-        <view class="padding-sm quick-list" v-if="searchSample.id">
-            <view class="cu-list menu bg-white shadow">
-                <view class="cu-item">
-                    <view class="title text-black text-bold text-lg">
-                        <text class="cuIcon-titles text-green"></text>
-                        {{ searchSample.bySampleUnitName }}
-                    </view>
-                    <view class="action">
-                        <!--                        <text class="text-orange text-bold text-lg"
-                                                      v-if="item.sampleStatus==='WAIT_ENTERPRISES_SUBMIT'">待确认
-                                                </text>-->
-                    </view>
-                </view>
-                <view class="content padding-sm detail solid-bottom">
-                    <view>抽样单编号：{{ searchSample.samplingNumber }}</view>
-                    <view>抽样样品：{{ searchSample.mustProductName }}</view>
-                    <view>抽样单位：{{ searchSample.sampleUnitName }}</view>
-                    <view class="text-gray">抽样人员：{{ searchSample.samplingPeopleFirst }}、{{ searchSample.samplingPeopleSecond }}</view>
-                    <view>抽样时间：{{ searchSample.updateTime }}</view>
-                </view>
-                <view class="tools padding-sm">
-                    <view>
-                    </view>
-                    <view style="display: flex;justify-content: space-between;gap:30upx">
-                        <view class="tool" @tap="toSampleDetail(searchSample.id)">
-                            <view class="cu-btn bg-blue light text-df text-bold">
-                                {{ searchSample.sampleStatus === 'WAIT_ENTERPRISES_SUBMIT' ? '去确认' : '查看' }}
-                                <text class="cuIcon-right lg"></text>
-                            </view>
-                        </view>
-                    </view>
-                </view>
-            </view>
-        </view>
-
-    </view>
-</template>
-
-<script>
-    import {
-        _checkModel
-    } from "./check-model";
-
-    export default {
-        data() {
-            return {
-                curIndex: 1,
-                listData: [],
-                modalName: null,
-                pageNum: 1,
-                pageSize: 10,
-                pageTotal: 1,
-                sampleSheetNumber:'',
-                searchSample:{}
-            };
-        },
-        onShow() {
-            this.pageNum = 1;
-            this.pageSize = 10
-            this.getList();
-        },
-        methods: {
-            search() {
-                this.pageNum = 1;
-                this.getList()
-            },
-            getList() {
-                // this.inSearching = true
-                _checkModel.getSampleListByNJB({
-                    pageNum: this.pageNum,
-                    pageSize: this.pageSize
-                }, res => {
-                    console.log(res);
-                    const {records, total} = res.data
-                    if (this.pageNum === 1) {
-                        this.listData = records
-                    } else {
-                        this.listData = this.listData.concat(records)
-                    }
-                    this.pageTotal = total
-                    // this.inSearching = false
-                    if (records.length > 0) {
-                        this.pageNum++
-                    }
-                })
-            },
-            onReachBottom() {
-                this.getList();
-            },
-            toSampleDetail(item) {
-                // uni.setStorageSync("sampleDetail", item);
-                uni.navigateTo({
-                    url: "/pages/sample-check-list/sample-detail/index?id="+item.id
-                })
-
-            },
-            scanQrCode(){
-                uni.scanCode({
-                    scanType:["qrCode"],
-                    success: res=>{
-                        this.sampleSheetNumber = res.result;
-                        this.searchNewSample();
-                    }
-                });
-            },
-            searchNewSample(){
-                if(!this.sampleSheetNumber){
-                    this.$msg("请输入或扫描抽样单号");
-                    return
-                }
-                _checkModel.getSampleInfoByNJB(this.sampleSheetNumber,res=>{
-                    const {code,data,message} = res;
-                    if(code === 200){
-                        if(data && data.ahSampleSheet){
-                            this.searchSample = data.ahSampleSheet;
-                        }else{
-                            this.$msg("未查询到抽样单信息");
-                        }
-                    }else{
-                        this.$msg(message);
-                    }
-                })
-            }
-        }
-    }
-</script>
-
-<style scoped>
-
-    .quick-task {
-        height: 100%;
-        width: 100%;
-    }
-
-
-    .first-step {
-        height: 100%;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        padding-top: 20vh;
-    }
-
-    .first-step button {
-        width: 90%;
-        margin-top: 20vh;
-    }
-
-    .first-step image {
-        width: 60vw;
-        margin-left: 10vw;
-    }
-
-    /*.quick-list {
-        padding-top: 100px;
-    }*/
-
-    .tools {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 20 upx;
-    }
-
-    .detail view {
-        height: 1.8em;
-        line-height: 1.8em !important;
-        border: none;
-        color: gray;
-    }
-
-    .taskDetail {
-        /*border: 1rpx solid #8799a3;*/
-        box-shadow: 0 0 25 upx #aaa;
-        border-radius: 10 rpx;
-        overflow: hidden;
-    }
-</style>

pages/sample-check-list/sample-detail/index.vue

@@ -1,377 +0,0 @@
-<template>
-    <view class="page">
-        <view class="DrawerPage" :class="modalName=='DrawerModalL'?'show':''">
-            <scroll-view scroll-y style="height: 100vh;z-index: 3">
-                <cu-custom class="home-custom" bgColor=".bg-sancolor"
-                           bgImage="https://ahwgh.oss-cn-hangzhou.aliyuncs.com/enterprise/6525f808df760.png"
-                           :isBack="true">
-                    <block slot="content">抽样单详情</block>
-                </cu-custom>
-                <view :style="'z-index:2;position: sticky;top:calc('+CustomBar+'px - 80rpx)' ">
-                    <view class="cu-list menu">
-                        <view class="cu-item" style="min-height: 80rpx">
-                            <view class="content">
-                                <text class="cuIcon-formfill text-black lg"></text>
-                                <text class="text-black">编号：{{ sampleDetailInfo.samplingNumber }}</text>
-                            </view>
-                        </view>
-                    </view>
-                    <view class="bg-white nav solid-bottom">
-                        <view class="flex text-center">
-                            <view class="cu-item flex-sub" :class="pageIndex === 0?'text-blue cur':''"
-                                  @tap="pageIndex = 0">
-                                抽样基本信息
-                            </view>
-                            <view class="cu-item flex-sub" :class="pageIndex === 1?'text-blue cur':''"
-                                  @tap="pageIndex = 1">
-                                抽样样品信息
-                            </view>
-                            <view class="cu-item flex-sub" :class="pageIndex === 2?'text-blue cur':''"
-                                  @tap="pageIndex = 2">
-                                现场照片
-                            </view>
-                        </view>
-                    </view>
-
-                </view>
-                <view style="margin-bottom: 130rpx">
-                    <!--基本信息-->
-                    <view v-show="pageIndex === 0">
-                        <view class="cu-list menu">
-                            <view class="cu-bar bg-white margin-top-sm solid-bottom">
-                                <view class="action">
-                                    <text class="cuIcon-titles text-green"></text>
-                                    <text>被抽查单位信息</text>
-                                </view>
-                            </view>
-                            <form>
-                                <view class="cu-form-group">
-                                    <view class="title">单位名称</view>
-                                    <view>
-                                        {{ sampleDetailInfo.bySampleUnitName}}
-                                    </view>
-                                    <!--                        <input :disabled="input_diabled" placeholder="请输入单位名称" name="input"
-                                                                   v-model="sampleDetailInfo.bySampleUnitName"></input>-->
-                                </view>
-                                <view class="cu-form-group ">
-                                    <view class="title">单位地址</view>
-                                    <input placeholder="请输入单位地址"
-                                           name="input"
-                                           v-model="sampleDetailInfo.bySampleAddress" disabled></input>
-                                </view>
-                                <view class="cu-form-group ">
-                                    <view class="title">联系人</view>
-                                    <input placeholder="请输入联系人" name="input"
-                                           v-model="sampleDetailInfo.bySampleContactName" disabled></input>
-                                </view>
-                                <view class="cu-form-group ">
-                                    <view class="title">电话</view>
-                                    <input placeholder="请输入电话" name="input"
-                                           v-model="sampleDetailInfo.bySampleContactPhone" disabled></input>
-                                </view>
-                            </form>
-                            <view class="cu-bar bg-white margin-top-sm solid-bottom">
-                                <view class="action">
-                                    <text class="cuIcon-titles text-green"></text>
-                                    <text>抽样单位信息</text>
-                                </view>
-                            </view>
-                            <form>
-                                <view class="cu-form-group">
-                                    <view class="title">单位名称</view>
-                                    <input placeholder="请输入单位名称" name="input"
-                                           v-model="sampleDetailInfo.sampleUnitName" disabled></input>
-                                </view>
-                                <view class="cu-form-group ">
-                                    <view class="title">单位地址</view>
-                                    <input placeholder="请输入单位地址" name="input"
-                                           v-model="sampleDetailInfo.sampleAddress" disabled></input>
-                                </view>
-                                <view class="cu-form-group ">
-                                    <view class="title">联系人</view>
-                                    <input placeholder="请输入联系人" name="input"
-                                           v-model="sampleDetailInfo.sampleContactName" disabled></input>
-                                </view>
-                                <view class="cu-form-group">
-                                    <view class="title">电话</view>
-                                    <input placeholder="请输入电话" name="input"
-                                           v-model="sampleDetailInfo.sampleContactPhone" disabled></input>
-                                </view>
-                                <view class="cu-form-group  align-start">
-                                    <view class="title">备注</view>
-                                    <textarea placeholder="抽样备注" name="input"
-                                           v-model="sampleDetailInfo.samplingMask" disabled></textarea>
-                                </view>
-                            </form>
-
-                            <!--                        <view class="padding flex flex-direction">
-                                                        <button class="cu-btn bg-green  lg" @tap="toSampleInfoList(sampleDetailInfo.id)">管理样品
-                                                        </button>
-                                                    </view>-->
-
-                        </view>
-                    </view>
-                    <view v-show="pageIndex === 1">
-                        <view class="cu-bar bg-white margin-top-sm solid-bottom">
-                            <view class="action">
-                                <text class="cuIcon-titles text-green"></text>
-                                <text>抽样基地信息</text>
-                            </view>
-                        </view>
-                        <form>
-                            <view class="cu-form-group">
-                                <view class="title">抽样地点</view>
-                                <input placeholder="请选择抽样地点" name="input"
-                                       v-model="sampleDetailInfo.samplingAddress" disabled>
-                            </view>
-
-                        </form>
-                        <view class="cu-bar bg-white margin-top-sm solid-bottom">
-                            <view class="action">
-                                <text class="cuIcon-titles text-green"></text>
-                                <text>抽样信息</text>
-                            </view>
-                        </view>
-                        <view class="padding-sm" style="padding-bottom: 180upx">
-                            <view class="cu-list menu bg-white"
-                                  v-for="(item, index) in ahSampleDetailList" :key="index">
-                                <view class="cu-item">
-                                    <view class="title text-black text-bold text-lg">
-                                        <text class="cuIcon-titles text-green"></text>
-                                        {{ index + 1 }}.{{ item.name }}
-                                    </view>
-                                    <view class="action">
-                                        {{ item.samplingDate }}
-                                    </view>
-                                </view>
-                                <view class="content detail padding-sm solid-bottom">
-                                    <view class="text-gray">样品来源：{{ item.source }}</view>
-                                    <view class="text-gray">抽样数量：{{ item.samplingNumber }}{{ item.samplingType }}</view>
-                                    <view class="text-gray">抽样基数：{{ item.samplingBase }}{{ item.samplingType }}</view>
-                                    <view class="text-gray">生产日期：{{ item.manufactureDate }}</view>
-                                </view>
-                            </view>
-                            <view class="radius shadow-warp bg-white text-lg" v-if="ahSampleDetailList.length === 0">
-                                <view class="cu-list menu-avatar">
-                                    <view class="cu-item">
-                                        <view class="content">
-                                            <view class="text-sm text-center" style="justify-content: center;">
-                                                <text class="text-cut text-lg">
-                                                    <text class="cuIcon-warn text-yellow margin-right-xs text-xl"></text>
-                                                    未查询到样本数据
-                                                </text>
-                                            </view>
-                                        </view>
-                                    </view>
-                                </view>
-                            </view>
-                        </view>
-                        <view class="padding flex flex-direction padding-bottom-xl fixedFootBtn bg-white padding-top-xs" v-if="!sampleDetailInfo.commitPeopleId">
-                            <button class="cu-btn bg-blue lg margin-top-sm shadow-blur" type=""  v-if="input_diabled"
-                                    @tap="submitSampleSheet">确认抽样单
-                            </button>
-                        </view>
-                    </view>
-                    <view v-show="pageIndex === 2">
-                        <view class="cu-list menu">
-                            <view class="cu-bar bg-white margin-top-sm solid-bottom">
-                                <view class="action">
-                                    <text class="cuIcon-titles text-green"></text>
-                                    <text>抽样单照片</text>
-                                </view>
-                            </view>
-                            <view class="cu-form-group">
-                                <view class="grid col-3 grid-square flex-sub">
-                                    <view class="bg-img" @tap="ViewImage(sampleDetailInfo.sampleSheetPhoto)" v-if="sampleDetailInfo.sampleSheetPhoto">
-                                        <image :src='sampleDetailInfo.sampleSheetPhoto' mode='aspectFill'></image>
-                                    </view>
-                                    <view class="solids"  v-if="!sampleDetailInfo.sampleSheetPhoto">
-                                        <text>未上传</text>
-                                    </view>
-                                </view>
-                            </view>
-                            <view class="cu-bar bg-white margin-top-sm solid-bottom">
-                                <view class="action">
-                                    <text class="cuIcon-titles text-green"></text>
-                                    <text>封样照片</text>
-                                </view>
-                            </view>
-                            <view class="cu-form-group">
-                                <view class="grid col-3 grid-square flex-sub">
-                                    <view class="bg-img" @tap="ViewImage(sampleDetailInfo.sealingPhoto)" v-if="sampleDetailInfo.sealingPhoto">
-                                        <image :src='sampleDetailInfo.sealingPhoto' mode='aspectFill'></image>
-                                    </view>
-                                    <view class="solids" v-if="!sampleDetailInfo.sealingPhoto">
-                                        <text>未上传</text>
-                                    </view>
-                                </view>
-                            </view>
-                            <view class="cu-bar bg-white margin-top-sm solid-bottom">
-                                <view class="action">
-                                    <text class="cuIcon-titles text-green"></text>
-                                    <text>抽样人员合影照片</text>
-                                </view>
-                            </view>
-                            <view class="cu-form-group">
-                                <view class="grid col-3 grid-square flex-sub">
-                                    <view class="bg-img" @tap="ViewImage(sampleDetailInfo.groupPhoto)" v-if="sampleDetailInfo.groupPhoto">
-                                        <image :src='sampleDetailInfo.groupPhoto' mode='aspectFill'></image>
-                                    </view>
-                                    <view class="solids" v-if="!sampleDetailInfo.groupPhoto">
-                                        <text>未上传</text>
-                                    </view>
-                                </view>
-                            </view>
-                        </view>
-
-                    </view>
-                </view>
-                <view class="padding flex flex-direction padding-bottom-xl fixedFootBtn bg-white padding-top">
-                    <button class="cu-btn bg-blue lg shadow-blur" type="" @tap="submitSampleSheet">确认抽样单</button>
-                </view>
-            </scroll-view>
-        </view>
-    </view>
-</template>
-
-
-<script>
-    import { _checkModel } from "../check-model";
-
-    export default {
-
-        data() {
-            return {
-                CustomBar: this.CustomBar,
-                pageIndex: 0,
-                sampleDetailInfo: {},
-                ahSampleDetailList: [],
-            };
-        },
-        onLoad(options) {
-            this.getSampleInfoDetail(options.id);
-        },
-        methods: {
-            getSubXzqList(xzqdm) {
-                return new Promise(resolve => {
-                    _checkModel.getSubXzqList(xzqdm, res => {
-                        resolve(res);
-                    });
-                });
-            },
-            getSampleInfoDetail(id) {
-                _checkModel.getAhSampleSheetDetail(id, res => {
-                    const {code,data,message} = res;
-                    if(code === 200){
-                        console.log("getAhSampleSheetDetail",data);
-                        this.sampleDetailInfo = data.ahSampleSheet;
-                        //查询抽样样品信息
-                        this.getSampleSheetDetailData();
-                    }else{
-                        this.$msg(message);
-                        this.input_diabled = true;
-                    }
-
-                });
-            },
-            submitSampleSheet(){
-                uni.showModal({
-                    title: "提示",
-                    content: "确认完成当前抽样单",
-                    cancelText: "取消",
-                    confirmText: "确认",
-                    success: res => {
-                        if (res.confirm) {
-                            _checkModel.submitSampleSheetNJB(this.sampleDetailInfo.id,res=>{
-                                const {code,message} = res;
-                                if(code === 200){
-                                    this.$msg("确认成功");
-                                    setTimeout(() => {
-                                        uni.navigateTo({
-                                            url: '/pages/sample-check-list/index'
-                                        })
-                                    }, 1500)
-                                } else {
-                                    this.$msg(message);
-                                }
-                            })
-                        }
-                    }})
-
-            },
-
-            getSampleSheetDetailData() {
-                _checkModel.getSampleSheetDetailData({
-                    sampleSheetId: this.sampleDetailInfo.id,
-                    pageNum: 1,
-                    pageSize: 100
-                }, res => {
-                    const { code, message, data: { records } } = res;
-                    if (code === 200) {
-                        this.ahSampleDetailList = records;
-                    } else {
-                        this.$msg(message);
-                    }
-                });
-            },
-            ViewImage(url) {
-                uni.previewImage({
-                    urls: [url],
-                    current: url
-                });
-            },
-
-        }
-    };
-
-</script>
-
-<style scoped>
-    .page {
-        /*background-image: var(--gradualBlue);*/
-        background-image: linear-gradient(45deg, #0081ff, #1cbbb4);
-        width: 100vw;
-        overflow: hidden;
-    }
-
-    .DrawerPage .nav .cu-item.cur {
-        border-bottom: 4rpx solid;
-    }
-
-    .DrawerPage .nav .cu-item.cur::after {
-        content: none;
-    }
-
-    /*.nav .cu-item{
-        height: 70rpx;
-        line-height: 70rpx;
-    }*/
-    .cu-modal.drawer-modal .cu-dialog {
-        min-width: 85vw;
-    }
-
-    .btDialog {
-        min-height: 80vh;
-    }
-
-    .detail view {
-        height: 1.8em;
-        line-height: 1.8em !important;
-        border: none;
-        color: gray;
-    }
-
-    .tools {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 20upx;
-    }
-    .fixedFootBtn {
-        border-top: 1px solid #ddd;
-        position: fixed;
-        width: 100vw;
-        bottom: 0;
-        z-index: 1000;
-    }
-</style>

pages/zf-task-list/index.vue

@@ -1,176 +0,0 @@
-<template>
-    <view class="home padding-bottom">
-        <cu-custom class="home-custom" bgColor=".bg-sancolor"
-                   bgImage="https://ahwgh.oss-cn-hangzhou.aliyuncs.com/enterprise/6525f808df760.png" :isBack="true">
-            <block slot="content">任务列表</block>
-        </cu-custom>
-        <view class="padding-sm">
-            <view class="cu-list menu margin-top taskDetail bg-white"
-                  v-for="(item, index) in taskListData" :key="index">
-                <view class="cu-item">
-                    <view class="title text-black text-bold text-lg">
-                        <text class="cuIcon-titles text-green"></text>
-                        抽样区域：{{ item.sampleUnitName }}
-                    </view>
-                </view>
-                <view class="content padding-sm detail solid-bottom">
-                    <view>
-                        <text class="text-green">
-                            抽样批次数：
-                            <text class="text-xl text-bold">{{ item.batchNumber }}</text>
-                        </text>
-                    </view>
-                    <view>分配单位：{{ item.publishUnitName }}</view>
-                    <view>分配人员：{{ item.publishName }}</view>
-                    <view>分配时间：{{item.ahTasks.updateTime}}
-                    </view>
-                </view>
-                <view class="tools" style="justify-content: space-between">
-                    <view>
-                    </view>
-                    <view class="tool"
-                          @tap="handleRandomCmp(item)">
-                        <view class="text-blue text-df text-bold text">
-                            抽取检查企业>>
-                        </view>
-                    </view>
-                </view>
-            </view>
-        </view>
-        <view class="cu-load bg-green light text-sm" v-show="pageTotal > 0"
-              :class="page > pageTotal?'over':'loading'"></view>
-        <view class="radius shadow-warp bg-white margin-top text-lg" v-show="pageTotal === 0">
-            <view class="cu-list menu-avatar">
-                <view class="cu-item">
-                    <view class="content">
-                        <view class="text-sm text-center" style="justify-content: center;">
-                            <text class="text-cut">
-                                <text class="cuIcon-warn text-yellow margin-right-xs text-xl"></text>
-                                未查询到相关数据
-                            </text>
-                        </view>
-                    </view>
-                </view>
-            </view>
-        </view>
-    </view>
-
-</template>
-
-
-<script>
-    import {
-        _zfyTaskList
-    } from "./zf-task-list-model.js";
-
-    export default {
-
-        data() {
-            return {
-                page: 1,
-                size: 10,
-                pageTotal: 1,
-                taskListData: [],
-                curTask: {},
-                taskId:null
-            };
-        },
-        onReachBottom() {
-        },
-        onShow() {
-            this.page = 1;
-            this.pageTotal = 1;
-            this.getCheckTaskListBySample();
-        },
-        onLoad(option){
-            this.taskId = option.taskId;
-        },
-        methods: {
-            getCheckTaskListBySample() {
-                if (this.page === 1 || (this.page <= this.pageTotal)) {
-                    _zfyTaskList.getCheckTaskListBySample({
-                        pageNum: this.page,
-                        pageSize: this.size,
-                        taskId:this.taskId
-                    }, res => {
-                        const {data, message, code} = res;
-                        if (code === 200) {
-                            const {records, total} = data;
-                            this.pageTotal = Math.ceil(total / this.size);
-                            if (this.page === 1) {
-                                this.taskListData = records;
-                            } else {
-                                this.taskListData = this.taskListData.concat(records);
-                            }
-                            this.page++;
-                        } else {
-                            this.$msg(message);
-                        }
-                    });
-                }
-            },
-            handleRandomCmp(item) {
-                uni.navigateTo({
-                    url: "/pages/zf-task-list/sampleRandom/index?taskId=" + item.taskId +
-                        "&sampleCheckId=" + item.id+"&batchNumber="+ item.batchNumber+"&sampleId="+item.sampleId
-                });
-            },
-            formatDate(dateTime) {
-                return dateTime.substring(0, 10)
-            }
-
-        }
-    };
-</script>
-
-<style scoped>
-    .detail view {
-        height: 2em;
-        line-height: 2em !important;
-        border: none;
-        color: gray;
-    }
-
-    .tools {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 30upx;
-
-    }
-    .tool .text{
-        font-size: 1.1em!important;
-    }
-
-    .taskDetail {
-        /*border: 1rpx solid #8799a3;*/
-        box-shadow: 0 0 25upx #aaa;
-        border-radius: 10rpx;
-        overflow: hidden;
-    }
-
-    .btn-item {
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-    }
-
-    .cu-tag {
-        padding: 20upx;
-        border-radius: 10upx;
-    }
-
-    label {
-        padding-left: .5em;
-    }
-
-    .text-content {
-        line-height: 2em;
-        white-space: pre-line;
-        text-align: left;
-        max-height: 60vh;
-        overflow-y: scroll;
-        /*padding-bottom: 100rpx;*/
-    }
-</style>

pages/zf-task-list/sampleRandom/index.vue

@@ -1,534 +0,0 @@
-<template>
-	<view class="home padding-bottom">
-		<cu-custom class="home-custom" bgColor=".bg-sancolor"
-				   bgImage="https://ahwgh.oss-cn-hangzhou.aliyuncs.com/enterprise/6525f808df760.png" :isBack="true">
-			<block slot="content">企业抽检</block>
-		</cu-custom>
-		<view class="cu-form-group solid-bottom">
-			<view class="title text-xl text-bold">
-				<text class="cuIcon cuIcon-titles text-blue"></text>
-				抽样主体列表
-			</view>
-			<view>抽样批次数：
-				<text class="text-bold text-lg">{{ batchNumber }}</text>
-			</view>
-		</view>
-		<view class="padding-sm" style="margin-bottom: 130rpx">
-			<view class="cu-list menu margin-top-sm taskDetail bg-white"
-				  v-for="(item, index) in sampleList" :key="index">
-				<view class="cu-item">
-					<view class="content text-black text-bold">
-						<text class="cuIcon-titles text-green">{{ index + 1 }}.</text>
-						{{ item.bySampleUnitName }}
-					</view>
-					<view class="action">
-
-					</view>
-				</view>
-				<view class="content padding-sm detail solid-bottom">
-					<view class="text-bold text-orange">当前状态：{{ setSampleStatus(item.sampleStatus) }}</view>
-					<view>抽检样品：{{ item.mustProductName }}
-					</view>
-					<view>负责人：{{ item.bySampleContactName }}</view>
-					<view>联系电话：{{ item.bySampleContactPhone }}</view>
-					<view style="height: auto">企业地址：{{ item.bySampleAddress.replaceAll(",", "").replaceAll(" ", "")
-						}}
-					</view>
-				</view>
-				<view class="tools" style="justify-content: space-between">
-					<view>
-					</view>
-					<!--                    <view class="tool" v-if="item.ahTasks.status ==='TASK_RUNNING'"
-											  @tap="handleTaskDetail(item)">
-											<view class="cu-tag bg-blue light text-df text-bold">去抽样 >></view>
-										</view>-->
-
-					<view class="tool" @tap="toFillSample(item)">
-						<view class="text-blue text-df text-bold text">
-							{{ getBtnName(item.sampleStatus) }}>>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="radius shadow-warp bg-white text-lg" v-if="sampleList.length === 0">
-				<view class="cu-list menu-avatar">
-					<view class="cu-item">
-						<view class="content">
-							<view class="text-sm text-center" style="justify-content: center;">
-								<text class="text-cut text-lg">
-									<text class="cuIcon-warn text-yellow margin-right-xs text-xl"></text>
-									未添加抽检主体数据
-								</text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<view class="padding flex flex-direction padding-bottom-xl fixedFootBtn bg-white padding-top">
-			<button class="cu-btn bg-blue lg shadow-blur" type="" @tap="showFirstProductChoose"
-					:disabled="sampleList.length >= batchNumber">抽取抽检主体
-			</button>
-		</view>
-		<view class="cu-modal bottom-modal" :class="modalName==='productListModal'?'show':''">
-			<view class="cu-dialog" @tap.stop.prevent>
-				<view class="cu-bar bg-white">
-					<view class="action text-blue" @tap="hideModal">取消</view>
-					<view class="content text-bold">选择抽检样品</view>
-				</view>
-				<view class="bg-white">
-					<view class="cu-bar search bg-white">
-						<view class="search-form radius text-left">
-							<text class="cuIcon-search"></text>
-							<input type="text" placeholder="输入样品名称搜索" confirm-type="search"
-								   v-model="queryProName" />
-							<text class="cuIcon cuIcon-close endClass text-xxl text-bold" @tap="resetQymcQuery"
-								  v-show="queryProName !== ''"></text>
-						</view>
-						<view class="action"><!-- 全部的按钮 -->
-							<button class="cu-btn bg-green shadow-blur round" @tap="searchProduct">搜索</button>
-						</view>
-					</view>
-					<scroll-view scroll-y class="productScroll padding" @scrolltolower="getProductList">
-						<radio-group @change="productNameChange">
-							<view class="flex flex-wrap">
-								<view class="basis-df padding-xs text-left" v-for="(item,index) in productList"
-									  :key="index">
-									<checkbox :value="item.productName" class="radio" :id="'productName'+index"
-											  :checked="sampleRandom.productName === item.productName"></checkbox>
-									<label :for="'productName'+index">{{ item.productName }}</label>
-								</view>
-							</view>
-						</radio-group>
-					</scroll-view>
-
-				</view>
-			</view>
-		</view>
-		<view class="cu-modal" :class="modalName==='SureProductNameModal'?'show':''">
-			<view class="cu-dialog">
-				<view class="cu-bar bg-white justify-end">
-					<view class="content">抽检企业</view>
-					<view class="action" @tap="hideModal">
-						<text class="cuIcon-close text-red"></text>
-					</view>
-				</view>
-				<view class="padding-left padding-right padding-bottom-sm cu-list menu bg-white">
-					<view class="cu-form-group">
-						<view class="title">抽样样品名称</view>
-						<picker :disabled="true" @tap="modalName = 'productListModal'">
-							<view class="picker">
-								{{ sampleRandom.productName }}
-							</view>
-						</picker>
-					</view>
-					<view class="cu-form-group" v-if="!isCounty">
-						<view class="title">所属区域</view>
-						<picker :range="regionArray" @change="RegionChange"
-								:value="selectIndex">
-							<view class="picker">
-								{{ regionArray[selectIndex] || "请选择区域" }}
-							</view>
-						</picker>
-					</view>
-					<view class="cu-form-group solid-bottom">
-						<view class="title">抽检主体数量</view>
-						<input type="number" v-model.trim="sampleRandom.enterprisesNum"
-							   placeholder="请输入抽检主体数量">
-					</view>
-					<view class="text-right padding-right text-gray padding-top-sm"
-						  v-show="lastCmpNum !== null && lastCmpNum >= 0">
-						<text>剩余可抽取主体：
-							<text class="text-bold text-lg">{{ lastCmpNum }}</text>
-							家
-						</text>
-					</view>
-				</view>
-				<view class="padding flex flex-direction">
-					<button class="cu-btn bg-green lg shadow-blur" type="" @tap="getEnterprisesList"
-							:disabled="lastCmpNum == null || lastCmpNum === 0">抽取
-					</button>
-				</view>
-			</view>
-		</view>
-		<view class="cu-modal" :class="modalName=='onSureSampleEnterpriseModel'?'show':''">
-			<view class="cu-dialog">
-				<view class="cu-bar bg-white justify-end">
-					<view class="content">待确认抽检主体</view>
-					<view class="action" @tap="hideModal">
-						<text class="cuIcon-close text-red"></text>
-					</view>
-				</view>
-				<view class="padding-left padding-right padding-bottom-sm cu-list menu bg-white">
-					<scroll-view class="text-content" scroll-y>
-						<view class="cu-item">
-							<view class="title text-black text-bold text-lg text-left"
-								  v-for="(item,index) in onSureEnterpriseList"
-								  :key="index">
-								<text class="cuIcon-title text-green margin-right-xs"></text>
-								<text>{{ item.enterprisesName }}</text>
-							</view>
-						</view>
-					</scroll-view>
-				</view>
-				<view class="cu-bar bg-green light" @tap="createSampleSheetList">
-					<view class="action margin-0 flex-sub">确认</view>
-				</view>
-			</view>
-		</view>
-	</view>
-
-
-</template>
-
-
-<script>
-import {
-	_sampleRandom
-} from "./sample-random-model";
-import { _taskList } from "../../task-list/task-list-model";
-
-export default {
-	data() {
-		return {
-			taskId: null,
-			sampleCheckId: null,
-			batchNumber: 0,
-			sampleRandom: {
-				productName: "",
-				enterprisesNum: ""
-			},
-			onSureEnterpriseList: [],
-			productList: [],
-			taskListData: [],
-			taskTypeList: [],
-			taskDetailList: [],
-			taskStatus: [],
-			modalName: null,
-			xzqdm: null,
-			pageTotal: 1,
-			totalCount: 0,
-			page: 1,
-			size: 40,
-			samplePage: 1,
-			sampleSize: 10,
-			samplePageTotal: 1,
-			sampleTotalCount: 0,
-			sampleList: [],
-			zfrSelected: [],
-			serviceZfrSelected: [],
-			queryProName: "",
-			subXzqList: [],
-			selectIndex: null,
-			lastCmpNum: null,
-			sampleStatus: [],
-			isCounty:false
-		};
-	},
-	onLoad(param) {
-		this.page = 1;
-		this.pageTotal = 1;
-		this.taskId = param.taskId;
-		this.batchNumber = param.batchNumber;
-		this.sampleCheckId = param.sampleCheckId;
-		this.xzqdm = param.sampleId;
-		if (this.xzqdm.endsWith("000") && !this.xzqdm.endsWith("00000")) {
-			this.isCounty = true;
-		}
-		this.getProductList();
-		this.getSampleCheckList();
-		this.initXzqRange();
-		this.getSampleStatus();
-	},
-	computed: {
-		regionArray() {
-			return this.subXzqList.map(v => v.xzqmc);
-		},
-		selectXzqCode() {
-			if(this.isCounty){
-				return this.xzqdm;
-			} else {
-				if (this.selectIndex !== null) {
-					return this.subXzqList[this.selectIndex].xzqdm;
-				}
-			}
-
-		}
-	},
-	methods: {
-		showFirstProductChoose() {
-			this.sampleRandom.enterprisesNum = null;
-			this.sampleRandom.productName = null;
-			this.modalName = "productListModal";
-		},
-		getSampleCheckList() {
-			if (this.samplePage === 1 || (this.samplePage <= this.samplePageTotal)) {
-				_sampleRandom.getSampleCheckList({
-					pageNum: this.samplePage,
-					pageSize: this.sampleSize,
-					sampleCheckId: this.sampleCheckId
-				}, res => {
-					const { data, message, code } = res;
-					if (code === 200) {
-						const { records, total } = data;
-						this.sampleTotalCount = total;
-						this.samplePageTotal = Math.ceil(total / this.sampleSize);
-						if (this.samplePage === 1) {
-							this.sampleList = records;
-						} else {
-							this.sampleList = this.sampleList.concat(records);
-						}
-						this.samplePage++;
-					} else {
-						uni.showToast({
-							icon: "none",
-							title: message,
-							duration: 1000
-						});
-					}
-				});
-			}
-		},
-
-		searchProduct() {
-			this.page = 1;
-			this.pageTotal = 1;
-			this.getProductList();
-		},
-		resetQymcQuery() {
-			this.queryProName = "";
-			this.searchProduct();
-		},
-		getProductList() {
-			if (this.page === 1 || (this.page <= this.pageTotal)) {
-				_sampleRandom.getProductList({
-					pageNum: this.page,
-					pageSize: this.size,
-					xzqCode: this.xzqdm,
-					productName: this.queryProName
-				}, res => {
-					const { data, message, code } = res;
-					if (code === 200) {
-						const { list, total } = data;
-						this.totalCount = total;
-						this.pageTotal = Math.ceil(total / this.size);
-						if (this.page === 1) {
-							this.productList = list;
-						} else {
-							this.productList = this.productList.concat(list);
-						}
-						this.page++;
-					} else {
-						uni.showToast({
-							icon: "none",
-							title: message,
-							duration: 1000
-						});
-					}
-				});
-			}
-		},
-		getEnterPrisesNum() {
-			if (this.selectXzqCode !== "" && this.selectXzqCode !== null && this.sampleRandom.productName) {
-				_sampleRandom.getEnterPrisesNum({
-					xzqCode: this.selectXzqCode,
-					productName: this.sampleRandom.productName
-				}, res => {
-					this.lastCmpNum = res.data;
-				});
-			} else {
-				this.lastCmpNum = null;
-			}
-
-		},
-		showModal(e) {
-			this.modalName = e.currentTarget.dataset.target;
-			_sampleRandom.getTaskSampleDetail(e.currentTarget.dataset.taskid, res => {
-				this.taskDetailList = res.data.records;
-			});
-		},
-		hideModal(e) {
-			this.curTask = null;
-			this.modalName = null;
-		},
-		createSampleSheetList() {
-			if (this.onSureEnterpriseList.length <= 0) {
-				this.$msg("抽检企业为空");
-				return;
-			}
-			const postData = this.onSureEnterpriseList.map(v => {
-				return {
-					bySampleAddress: v.enterprisesAddress,
-					bySampleContactName: v.fzrName,
-					bySampleContactPhone: v.fzrPhone,
-					bySampleUnitName: v.enterprisesName,
-					mustProductName: this.sampleRandom.productName,
-					qydm: v.qydm,
-					taskId: this.taskId,
-					sampleCheckId: this.sampleCheckId
-				};
-			});
-			_sampleRandom.createSampleSheetList(postData, res => {
-				const { code, message } = res;
-				if (code === 200) {
-					this.$msg("添加成功");
-					this.modalName = null;
-					this.samplePage = 1;
-					this.samplePageTotal = 1;
-					this.getSampleCheckList();
-				} else {
-					this.$msg(message);
-				}
-			});
-		},
-		getEnterprisesList() {
-			// this.onSureEnterpriseList = true;
-			if (!this.isCounty && this.selectIndex === null) {
-				this.$msg("请选择抽样区域");
-				return;
-			}
-			const postData = Object.assign({}, this.sampleRandom);
-			if (!postData.productName) {
-				this.$msg("请选择抽样样品名称");
-				return;
-			}
-			if (parseInt(postData.enterprisesNum) <= 0 || "" + parseInt(postData.enterprisesNum) === "NaN") {
-				this.$msg("请输入抽检主体数量");
-				return;
-			}
-			if (parseInt(postData.enterprisesNum) + this.sampleList.length > this.batchNumber) {
-				this.$msg("抽取企业总数不可超过抽样批次数");
-				return;
-			}
-			if (parseInt(postData.enterprisesNum) > parseInt(this.lastCmpNum)) {
-				this.$msg("抽检主体数量应小于等于剩余主体数量");
-				return;
-			}
-			postData.xzqCode = this.selectXzqCode;
-			postData.taskId = this.taskId;
-			_sampleRandom.getEnterprisesList(postData, res => {
-				if (!res.data || res.data.length === 0) {
-					this.$msg("当前地区无可抽取企业");
-				} else {
-					this.onSureEnterpriseList = res.data;
-					this.modalName = "onSureSampleEnterpriseModel";
-				}
-
-			});
-
-		},
-		setTaskType(taskType) {
-			const taskTypeList = this.taskTypeList;
-			for (let i = 0; i < taskTypeList.length; i++) {
-				if (taskTypeList[i].itemValue === taskType) {
-					return taskTypeList[i].itemKey;
-				}
-			}
-		},
-		setTaskStatus(value) {
-			let taskStatus = this.taskStatus;
-			for (let i = 0; i < taskStatus.length; i++) {
-				if (taskStatus[i].itemValue === value) {
-					return taskStatus[i].itemKey;
-				}
-			}
-		},
-		formatDate(dateTime) {
-			return dateTime.substring(0, 10);
-		},
-		productNameChange(e) {
-			const productName = e.detail.value;
-			if (productName) {
-				this.sampleRandom.productName = productName;
-				this.getEnterPrisesNum();
-				this.modalName = "SureProductNameModal";
-			}
-		},
-		initXzqRange() {
-			_sampleRandom.getXzqdmSubLists(this.xzqdm, city_res => {
-				const { code, data } = city_res;
-				if (code === 200) {
-					this.subXzqList = data;
-				}
-			});
-		},
-		RegionChange(e) {
-			this.selectIndex = e.detail.value;
-			this.getEnterPrisesNum();
-		},
-		getSampleStatus() {
-			_taskList.getDictionary("SAMPLE_SHEET_STATUS", res => {
-				this.sampleStatus = res.data;
-			});
-		},
-		setSampleStatus(value) {
-			console.log("setSampleStatus",value);
-			let sampleStatus = this.sampleStatus;
-			for (let i = 0; i < sampleStatus.length; i++) {
-				if (sampleStatus[i].itemValue === value) {
-					return sampleStatus[i].itemKey;
-				}
-			}
-		},
-		toFillSample(item) {
-			uni.navigateTo({
-				url: "/pages/sample-detail/index?id=" + item.id
-			});
-		},
-		getBtnName(status) {
-			let name = "查看";
-			if (status === "WAIT_SAMPLE") {
-				name = "填报抽样单";
-			}
-			return name;
-		}
-	}
-};
-</script>
-
-<style scoped>
-.detail view {
-	font-size: 31rpx;
-	height: 1.8em;
-	line-height: 1.8em !important;
-	border: none;
-}
-
-.taskDetail {
-	/*border: 1rpx solid #8799a3;*/
-	box-shadow: 0 0 25upx #aaa;
-	border-radius: 10rpx;
-	overflow: hidden;
-}
-
-label {
-	padding-left: .5em;
-}
-
-.productScroll {
-	height: 30em;
-	max-height: 60vh;
-}
-
-.fixedFootBtn {
-	border-top: 1px solid #ddd;
-	position: fixed;
-	width: 100vw;
-	bottom: 0;
-	z-index: 1000;
-}
-
-.tools {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	padding: 30upx;
-
-}
-
-.tool .text {
-	font-size: 1.1em !important;
-}
-
-</style>

pages/zf-task-list/sampleRandom/sample-random-model.js

@@ -1,113 +0,0 @@
-import {Base} from '../../../static/util/base.js'
-
-class SampleRandomModel extends Base {
-
-    constructor() {
-        super();
-    }
-
-    getEnterprisesList(data,callBack) {
-        var params = {
-            url: '/ah/ah-task-zf-user/getEnterprisesList',
-            data:data,
-            sCallBack: function (res) {
-                callBack && callBack(res.data)
-            }
-        }
-        this.serviceRequest(params);
-    }
-
-    getProductList(data,callBack) {
-        var params = {
-            url: '/ah/ah-task-zf-user/getProductList',
-            data:data,
-            sCallBack: function (res) {
-                callBack && callBack(res.data)
-            }
-        }
-        this.serviceRequest(params);
-    }
-
-    getEnterPrisesNum(data,callBack) {
-        var params = {
-            url: '/ah/ah-task-zf-user/getEnterPrisesNum',
-            data:data,
-            sCallBack: function (res) {
-                callBack && callBack(res.data)
-            }
-        }
-        this.serviceRequest(params);
-    }
-
-
-    getTaskSampleDetail(taskId, callBack) {
-        var params = {
-            url: '/ah/ahTaskDetail/list?pageNum=1&pageSize=100&taskId=' + taskId,
-            sCallBack: function (res) {
-                callBack && callBack(res.data)
-            }
-        }
-        this.serviceRequest(params);
-    }
-    getZfUserById(id, callBack) {
-        var params = {
-            url: '/ah/ah-task-zf-user/getZfUserById',
-            data:{id},
-            sCallBack: function (res) {
-                callBack && callBack(res.data)
-            }
-        }
-        this.serviceRequest(params);
-    }
-
-    updateZfyInfo(data, callBack) {
-        var params = {
-            url: '/ah/ahSampleSheet/updateZfyInfo',
-            data:data,
-            type:"POST",
-            sCallBack: function (res) {
-                callBack && callBack(res.data)
-            }
-        }
-        this.serviceRequest(params);
-    }
-    createSampleSheetList(data,callBack){
-        var params = {
-            url: '/ah/ahSampleSheet/createSampleSheet',
-            data:data,
-            type:"POST",
-            sCallBack: function (res) {
-                callBack && callBack(res.data)
-            }
-        }
-        this.serviceRequest(params);
-    }
-    getSampleCheckList(data,callBack){
-        var params = {
-            url: '/ah/ahSampleSheet/listByCheckSample',
-            data:data,
-            sCallBack: function (res) {
-                callBack && callBack(res.data)
-            }
-        }
-        this.serviceRequest(params);
-    }
-    /* 获取改xzqdm下的地点 */
-    getXzqdmSubLists(xzqCode,callBack){
-        var params = {
-            url: '/jg/tZdXzq/list',
-            type: 'GET',
-            data: {xzqCode},
-            header: {
-                'content-type': 'application/x-www-form-urlencoded'
-            },
-            sCallBack: function (res) {
-                callBack && callBack(res)
-            }
-        }
-        this.jgRequest(params);
-    }
-
-}
-const _sampleRandom = new SampleRandomModel();
-export {_sampleRandom}

pages/zf-task-list/taskList.vue

@@ -1,162 +0,0 @@
-<template>
-    <view class="home padding-bottom">
-        <cu-custom class="home-custom" bgColor=".bg-sancolor"
-                   bgImage="https://ahwgh.oss-cn-hangzhou.aliyuncs.com/enterprise/6525f808df760.png" :isBack="true">
-            <block slot="content">例行监测</block>
-        </cu-custom>
-        <view class="padding-sm">
-            <view class="cu-list menu margin-top taskDetail bg-white"
-                  v-for="(item, index) in taskListData" :key="index" @click="navigateToDetail(item.ahTasks.id)">
-                <view class="cu-item arrow">
-                    <view class="title text-black text-bold text-lg">
-                        <text class="cuIcon-titles text-green"></text>
-                        {{ item.ahTasks.taskName }}
-                    </view>
-                </view>
-                <view class="content padding-sm detail solid-bottom padding-bottom padding-left">
-                    <view>任务编号：{{ item.ahTasks.taskNumber }}
-                    </view>
-                    <view>年度/季度：{{ item.ahTasks.taskYear.substr(0, 4) }}/{{
-                            item.ahTasks.taskBatch
-                        }}
-                    </view>
-                    <view>发布单位：{{ item.ahTasks.publishUnitName }}</view>
-                    <view>任务时间：{{
-                            formatDate(item.ahTasks.startTime)
-                        }}至{{ formatDate(item.ahTasks.endTime) }}
-                    </view>
-                </view>
-            </view>
-        </view>
-        <view class="cu-load bg-green light text-sm" v-show="pageTotal > 0"
-              :class="page > pageTotal?'over':'loading'"></view>
-        <view class="radius shadow-warp bg-white margin-top text-lg" v-show="pageTotal === 0">
-            <view class="cu-list menu-avatar">
-                <view class="cu-item">
-                    <view class="content">
-                        <view class="text-sm text-center" style="justify-content: center;">
-                            <text class="text-cut">
-                                <text class="cuIcon-warn text-yellow margin-right-xs text-xl"></text>
-                                未查询到相关数据
-                            </text>
-                        </view>
-                    </view>
-                </view>
-            </view>
-        </view>
-    </view>
-
-</template>
-
-
-<script>
-    import {
-        _zfyTaskList
-    } from "./zf-task-list-model.js";
-
-    export default {
-        data() {
-            return {
-                page: 1,
-                size: 10,
-                pageTotal: 1,
-                taskListData: []
-            };
-        },
-        onReachBottom() {
-            this.getCheckTaskList();
-        },
-        onShow() {
-            this.page = 1;
-            this.pageTotal = 1;
-            this.getCheckTaskList();
-        },
-        methods: {
-            getCheckTaskList() {
-                if (this.page === 1 || (this.page <= this.pageTotal)) {
-                    _zfyTaskList.getCheckTaskList({
-                        pageNum: this.page,
-                        pageSize: this.size,
-						taskType:"TASK_COMMON"
-                    }, res => {
-                        const {data, message, code} = res;
-                        if (code === 200) {
-                            const {records, total} = data;
-                            this.pageTotal = Math.ceil(total / this.size);
-                            if (this.page === 1) {
-                                this.taskListData = records;
-                            } else {
-                                this.taskListData = this.taskListData.concat(records);
-                            }
-                            this.page++;
-                        } else {
-                            this.$msg(message);
-                        }
-                    });
-                }
-            },
-            navigateToDetail(taskId) {
-                uni.navigateTo({
-                    url: "/pages/zf-task-list/index?taskId=" + taskId
-                });
-            },
-
-            formatDate(dateTime) {
-                return dateTime.substring(0, 10)
-            }
-        }
-    };
-</script>
-
-<style scoped>
-    .detail view {
-        font-size: 30rpx;
-        height: 2em;
-        line-height: 2em !important;
-        border: none;
-        color: gray;
-    }
-
-    .tools {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 30upx;
-
-    }
-    .tool .text{
-        font-size: 1.1em!important;
-    }
-
-    .taskDetail {
-        /*border: 1rpx solid #8799a3;*/
-        box-shadow: 0 0 25upx #aaa;
-        border-radius: 10rpx;
-        overflow: hidden;
-    }
-
-    .btn-item {
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-    }
-
-    .cu-tag {
-        padding: 20upx;
-        border-radius: 10upx;
-    }
-
-    label {
-        padding-left: .5em;
-    }
-
-    .text-content {
-        line-height: 2em;
-        white-space: pre-line;
-        text-align: left;
-        max-height: 60vh;
-        overflow-y: scroll;
-        /*padding-bottom: 100rpx;*/
-    }
-</style>

pages/zf-task-list/zf-task-list-model.js

@@ -1,43 +0,0 @@
-import {Base} from '../../static/util/base.js'
-
-class ZfTaskList extends Base {
-
-    constructor() {
-        super();
-    }
-
-    /**
-     * 查询检测机构执法人员全部任务
-     * @param data
-     * @param callBack
-     */
-    getCheckTaskList(data,callBack) {
-        var params = {
-            url: '/ah/ahZoneSampleCheck/getCheckTaskList',
-            data:data,
-            sCallBack: function (res) {
-                callBack && callBack(res.data)
-            }
-        }
-        this.serviceRequest(params);
-    }
-
-    /**
-     * 查询检测机构执法人员需执行的任务
-     * @param data
-     * @param callBack
-     */
-    getCheckTaskListBySample(data,callBack) {
-        var params = {
-            url: '/ah/ahZoneSampleCheck/getCheckTaskListBySample',
-            data:data,
-            sCallBack: function (res) {
-                callBack && callBack(res.data)
-            }
-        }
-        this.serviceRequest(params);
-    }
-
-}
-const _zfyTaskList = new ZfTaskList();
-export {_zfyTaskList}

static/util/config.js

@@ -4,7 +4,7 @@ class Config{
   }
 }
 
-Config.userUrl = 'http://10.11.61.243:8080' //https://user.ahjc.aielab.net
+Config.userUrl = 'http://10.11.5.7:8080' //https://user.ahjc.aielab.net
 //Config.serviceUrl = 'https://service.ahjc.aielab.net' //https://service.ahjc.aielab.net
 Config.serviceUrl = 'http://localhost:8080' //https://service.ahjc.aielab.net
 //Config.jgUrl = 'https://ahjg-admin-server.aielab.net' //http://121.43.231.147:40005