Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/aiot-app into dengfei

manifest.json

@@ -2,7 +2,7 @@
     "name" : "智慧工厂",
     "appid" : "__UNI__45B3907",
     "description" : "",
-    "versionName" : "V1.0.3.51",
+    "versionName" : "V1.0.3.53",
     "versionCode" : "100",
     "transformPx" : false,
     "h5" : {

pages/dispatchManage/taskWork/OrderTask.vue

@@ -91,7 +91,8 @@
 					status: {
 						0: '待接收',
 						1: '执行中',
-						2: '已完成'
+						2: '待验收',
+						4: '已验收'
 					},
 					//紧急程度
 					urgent: {

pages/dispatchManage/taskWork/detail.vue

@@ -76,7 +76,7 @@
 					<template v-else-if="info.status === 1">
 						<button class="btn-execute" type="primary" @click="handleReport('update')">报工</button>
 					</template>
-					<button v-else-if="info.status === 2" class="btn-execute" type="primary"
+					<button v-else-if="info.status === 2 || info.status === 4" class="btn-execute" type="primary"
 						@click="handleReport('view')">查看报工详情</button>
 
 				</template>

pages/dispatchManage/taskWork/index.vue

@@ -40,21 +40,31 @@
 			return {
 				tabList: [{
 						value: 0,
+						key: 0,
 						label: '待接收',
 						list: [],
 						number: 0
 					},
 					{
 						value: 1,
+						key: 1,
 						label: '执行中',
 						list: [],
 						number: 0
 					},
 					{
 						value: 2,
+						key: 2,
 						label: '已完成',
 						list: [],
 						number: 0
+					},
+					{
+						value: 4,
+						key: 3,
+						label: '已验收',
+						list: [],
+						number: 0
 					}
 				],
 				pickTabIndex: 0,
@@ -114,6 +124,14 @@
 				}).then(res => {
 					this.tabList[2].number = res.count
 				})
+				logistictraklistnotePageListAPI({
+					status: 4,
+					pageNum: 1,
+					size: 1,
+					// userId: this.userInfo.userI
+				}).then(res => {
+					this.tabList[3].number = res.count
+				})
 			},
 			getFirstList: function() {
 				page = 1
@@ -138,8 +156,12 @@
 				}
 				logistictraklistnotePageListAPI(params)
 					.then(res => {
-						this.tabList[this.pickTabIndex].list = res.list
-						isEnd = this.tabList[this.pickTabIndex].list >= res.count
+						if (page === 1) {
+							this.tabList[this.pickTabIndex].list = res.list
+						} else {
+							this.tabList[this.pickTabIndex].list = [...this.tabList[this.pickTabIndex].list, ...res.list]
+						}
+						isEnd = this.tabList[this.pickTabIndex].list.length >= res.count
 						uni.hideLoading()
 					})
 					.catch(() => {

pages/dispatchManage/taskWork/reportDetail.vue

@@ -52,6 +52,12 @@
 							</view>
 						</view>
 					</view>
+					<view v-if="formData.status == 4" class="kd-cell">
+						<text class="kd-label">验收说明</text>
+						<uni-easyinput v-model="formData.checkRemark" :clearable="false" :inputBorder="false" :disabled="true">
+						
+						</uni-easyinput>
+					</view>
 
 					<template v-if="formData.costList && formData.costList.length > 0">
 						<view class="kd-cell-divider"></view>
@@ -144,12 +150,18 @@
 		onLoad(options) {
 			console.log('options~~~', options)
 			let initData = JSON.parse(options.item)
+
+			const apiInfo = uni.getStorageSync('apiInfo')
+
+				const orgin =
+					apiInfo.hostname &&
+					`${apiInfo.protocal || ''}${apiInfo.hostname || ''}:${apiInfo.port || ''}`
 			
 			// 处理开始里程图片（使用路径生成URL，同步ID）
 			initData.startMileageImages = initData.startMileageImagesPaths
 				? initData.startMileageImagesPaths.split(',').map((path, index) => ({
 					id: initData.startMileageImagesFileIds.split(',')[index] || '', // 对应ID
-					url: `${window.location.origin}/api/main/file/getFile?objectName=${path}`, // 使用路径作为参数
+					url: `${orgin}/api/main/file/getFile?objectName=${path}`, // 使用路径作为参数
 					status: 'done'
 				}))
 				: [];
@@ -158,7 +170,7 @@
 			initData.endMileageImages = initData.endMileageImagesPaths
 				? initData.endMileageImagesPaths.split(',').map((path, index) => ({
 					id: initData.endMileageImagesFileIds.split(',')[index] || '',
-					url: `${window.location.origin}/api/main/file/getFile?objectName=${path}`,
+					url: `${orgin}/api/main/file/getFile?objectName=${path}`,
 					status: 'done'
 				}))
 				: [];