浏览代码

提供测试施工报告

twt 2 年之前
父节点
当前提交
ea5f2e4bdf
共有 4 个文件被更改,包括 28 次插入14 次删除
  1. 11 11
      pages.json
  2. 2 1
      pages/report/complete.vue
  3. 1 1
      pages/report/working.vue
  4. 14 1
      pages/user/user.vue

+ 11 - 11
pages.json

@@ -1,24 +1,24 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
 		
-        {
-        	"path": "pages/report/complete",
-        	"style": {
-        		"navigationBarTitleText": "完工报告",
-        		"enablePullDownRefresh": true
-        	}
-        },
 		{
-			"path": "pages/report/working",
+			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "施工报告",
+				"navigationStyle": "custom",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "pages/index/index",
+			"path": "pages/report/complete",
 			"style": {
-				"navigationStyle": "custom",
+				"navigationBarTitleText": "完工报告",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/report/working",
+			"style": {
+				"navigationBarTitleText": "施工报告",
 				"enablePullDownRefresh": true
 			}
 		},

+ 2 - 1
pages/report/complete.vue

@@ -116,6 +116,7 @@
 		onLoad(opt) {
 
 			this.id = opt.id
+			console.log(this.id)
 			this.themeColor = uni.getStorageSync("themeColor");
 			this.userInfo = this.$store.state.userInfo;
 			this.ext = this.$common.getExtStoreId();
@@ -215,7 +216,7 @@
 				});
 
 				this.$http('workOrderMarketing/completeReport', {
-					sheetId: '278569FB-6F21-47AD-8B66-D62D2EA6981D',
+					sheetId:this.id,// '278569FB-6F21-47AD-8B66-D62D2EA6981D',
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					this.itemDetailList=res.data.itemDetailList;

+ 1 - 1
pages/report/working.vue

@@ -197,7 +197,7 @@
 				});
 
 				this.$http('checkCarApi/workingReport', {
-					sheetID: '56D5F8C1-9F11-40BA-8937-B4AABD4666B5',
+					sheetID:this.id,// '56D5F8C1-9F11-40BA-8937-B4AABD4666B5',
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					this.itemDetailList=res.data.itemDetailList;

+ 14 - 1
pages/user/user.vue

@@ -214,7 +214,20 @@
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
-
+			<view class="rowBox" @click="gonavigateTo('../report/complete?id=278569FB-6F21-47AD-8B66-D62D2EA6981D')">
+				<view class="leftView">
+					<image src="../../static/img/icon_kehuzhuanjieshao.png" mode="" class="liftIcon"></image>
+					<view class="rowTitle">完工报告</view>
+				</view>
+				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
+			</view>
+            <view class="rowBox" @click="gonavigateTo('../report/working?id=56D5F8C1-9F11-40BA-8937-B4AABD4666B5')">
+            	<view class="leftView">
+            		<image src="../../static/img/icon_kehuzhuanjieshao.png" mode="" class="liftIcon"></image>
+            		<view class="rowTitle">施工报告</view>
+            	</view>
+            	<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
+            </view>
 			<!-- 先隐藏 -->
 			<!-- <view class="rowBox" @click="gonavigateTo('')">
 				<view class="leftView">