修改

起风了
1 parent 9c04a298
Showing 18 changed files with 85 additions and 14 deletions
.DS_Store
apis/modules/oauth.js
pages.json
pages/declaration/list.vue
pages/funeralreport/funeralreport.vue
pages/home/home.vue
pages/mydeathdetail/mydeathdetail.vue
static/.DS_Store
static/img/.DS_Store
static/img/04.jpg
static/img/05.jpg
static/img/06.jpg
static/imgs/.DS_Store
static/ly/.DS_Store
static/ly/image5.png
static/ly/image6.png
static/ly/image7.png
static/ly/image8.png
@@ -167,4 +167,14 @@ export default {
 	pqxxqr(data){
 		return request.put('/funeral/call/editFuneralStatus',data)
 	},
+	
+	// 获取车辆信息
+	// /funeral/vehicle/list
+	getcllist(data){
+		return request.get('/funeral/vehicle/list',data)
+	},
+	// 获取收敛工信息
+	getclglist(data){
+		return request.get('/funeral/driver/list',data)
+	},
 }
 \ No newline at end of file
@@ -310,7 +310,7 @@
 		}, {
 			"path": "pages/declaration/list",
 			"style": {
-				"navigationBarTitleText": "区域申报",
+				"navigationBarTitleText": "区域服务",
 				"enablePullDownRefresh": false
 			}
@@ -24,7 +24,7 @@
 					<image style="height: 120rpx;width: 100%;" src="../../static/ly/image5.png" mode="aspectFit"></image>
 				</view>
 				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
-					建筑物备案
+					建筑物名称备案
 				</view>
 			</view>
 			<view @click="gopath('/pages/declaration/newDeclaration')" style="width: 49%;padding: 50rpx 30rpx;background: rgba(255,255,255,0.63);border-radius: 30rpx;margin-top:20rpx;">
@@ -32,7 +32,7 @@
 					<image style="height: 120rpx;width: 100%;" src="../../static/ly/image6.png" mode="aspectFit"></image>
 				</view>
 				<view style="width: 100%;color: #3D3D3D;text-align: center;font-size: 25rpx;margin-top: 10rpx;">
-					地名备案
+					地名申报
 				</view>
 			</view>
@@ -3,7 +3,6 @@
 		<pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
 		<view class="listBox" :style="{'padding-top':(pageTop+'px')}">
 		<view class="content">
-			
 			<view class="message-list">
 			<view class="titleall-box">
 				<view class="titleall-left"><view class="titleall-left-line"></view>逝者信息<text style="color: red;">（必填）</text></view>
@@ -37,7 +36,7 @@
 						<view class="info-box-small">逝者民族</view>
 					</view>
 				</view>
-				<u-picker :show="xbshow" @confirm="xbconfirm" @close="xbclose" :columns="xbcolumns"></u-picker>
+				<u-picker :show="xbshow" @confirm="xbconfirm" @cancel="xbclose" :columns="xbcolumns"></u-picker>
 			</view>
 			</view>
@@ -116,7 +115,7 @@
 							<view class="info-box-small">死亡日期</view>
 						</view>
 					</view>
-					<u-picker :show="swyyshow" @confirm="swyyconfirm" @close="swyyclose" :columns="swyycolumns"></u-picker>
+					<u-picker :show="swyyshow" @confirm="swyyconfirm" @cancel="swyyclose" :columns="swyycolumns"></u-picker>
 				</view>
 			</view>
 			<u-calendar minDate="2023-11-01" maxDate="3050-12-01" :show="timeshow" @confirm="timeconfirm" @close="timeclose"></u-calendar>
@@ -143,7 +142,7 @@
 						<!-- <view><input class="input-text" type="text" placeholder="请选择" placeholder-class="inputtext" /></view> -->
 						<view class="info-box-small">与逝者关系</view>
 					</view>
-					<u-picker :show="qsgxshow" @confirm="qsgxconfirm" @close="xbclose" :columns="qsgxcolumns"></u-picker>
+					<u-picker :show="qsgxshow" @confirm="qsgxconfirm" @cancel="qsgxclose" :columns="qsgxcolumns"></u-picker>
 					<view class="info-box-width">
 						<view><input class="input-text" v-model="from.relativeIdCardNumber" type="text" placeholder="请输入" placeholder-class="inputtext" /></view>
 						<view class="info-box-small">家属证件号码</view>
@@ -230,8 +229,9 @@
 				],
 				timeshow:false,
 				jytimeshow:false,
+				// 不详、车祸、触电、溺水、枪击、烧死、事故、摔、死胎、死刑、他杀、滝死、意外、中毒、坠楼、自杀
 				swyycolumns:[
-					['自然死亡','疾病死亡','意外死亡']
+					['病','不详','车祸','触电','溺水','枪击','烧死','事故','摔','死胎','死刑','他杀','滝死','意外','中毒','坠楼','自杀']
 				],
 				swyyshow:false,
@@ -90,7 +90,7 @@
 				<view class="title">
 					<view class="box1">
 						<image src="../../static/new/矩形 331.png" mode=""></image>
-						<span>区域服务</span>
+						<span>区域划分</span>
 					</view>
 				</view>
 				<view class="content" style="margin-bottom:40rpx;">
@@ -77,20 +77,25 @@
 			<!-- <view class="message-list">
 				<view class="titleall-box">
-					<view class="titleall-left"><view class="titleall-left-line"></view>派遣司机</view>
+					<view class="titleall-left"><view class="titleall-left-line"></view>派遣司机收敛工</view>
 				</view>
 				<view class="info-box">
 					<view class="info-box-list">
 						<view class="info-box-width width100">
-							
+							<view class="">
+								<view @click="sjshow = true">{{sjinfo.name}}</view>
+								<view class="info-box-small">司机</view>
+							</view>
 						</view>
 					</view>
+					<u-picker :show="sjshow" @confirm="sjconfirm" @cancel="sjclose" :columns="sjcolumns"></u-picker>
 					<view class="info-box-list">
 						<view class="info-box-width width100">
-							<view>16:20-17:00</view>
-							<view class="info-box-small">火化时间（此为预约时间，非实际火化时间）</view>
+							<view @click="slgshow = true">{{slginfo.name}}</view>
+							<view class="info-box-small">收敛工</view>
 						</view>
 					</view>
+					<u-picker :show="slgshow" @confirm="slgconfirm" @cancel="slgclose" :columns="slgcolumns"></u-picker>
 				</view>
 			</view> -->
 		</view>
@@ -134,7 +139,22 @@
 				    width: 10,
 				    arrowLine: true,
 				    borderWidth: 2 //线的边框宽度，还有很多参数，请看文档 
-				}]
+				}],
+				
+				sjinfo:{
+					name:"请选择"
+				},
+				sjshow:false,
+				sjcolumns:[
+					['男', '女']
+				],
+				slginfo:{
+					name:"请选择"
+				},
+				slgshow:false,
+				slgcolumns:[
+					['男', '女']
+				],
 			};
 		},
 		onPageScroll(e) {this.$refs.nv.pageScroll(e)},
@@ -142,12 +162,53 @@
 			pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
 		},
 		onLoad(params) {
+			this.getcllist();
+			this.getclglist();
 			this.info = JSON.parse(params.info)
 			console.log(this.info);
 			this.getbsdetail(this.info.orderNumber)
+			
 			// this.OrderType = params.type;
 		},
 		methods:{
+			// 获取车辆信息
+			getcllist(){
+				var info = {
+					pageNum: 1,
+					pageSize: 10,
+					vehicleStatus: "0",
+				}
+				this.API.getcllist(info).then(res=>{
+					console.log("车辆情况",res);
+				})
+			},
+			// 
+			sjconfirm(e){
+				this.sjshow = false
+			},
+			sjclose(){
+				this.sjshow = false
+			},
+			// 获取收敛工信息
+			getclglist(){
+				// 收敛工司机
+				var info = {
+				        pageNum: 1,
+				        pageSize: 10,
+				        position: "收敛工",
+				        status: "0",
+				};
+				this.API.getclglist(info).then(res=>{
+					console.log("收敛工",res);
+				})
+			},
+			slgconfirm(e){
+				this.slgshow = false
+			},
+			slgclose(){
+				this.slgshow = false
+			},
+			// 
 			lxdh(){
 				uni.showModal({
 					title: '联系电话',