From d0f9ccb8525060bbfce54e4cae055a8e81cc3565 Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Wed, 10 Sep 2025 12:20:40 +0800
Subject: [PATCH] 12345工单  问题上报

---
 pages/work/daily/reporting.vue | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 pages/work/daily/workOrder.vue |  55 +++++++++++++++++++++++++++++++++++--------------------
 2 files changed, 160 insertions(+), 26 deletions(-)

diff --git a/pages/work/daily/reporting.vue b/pages/work/daily/reporting.vue
index 8f9a3b3..9069175 100644
--- a/pages/work/daily/reporting.vue
+++ b/pages/work/daily/reporting.vue
@@ -6,7 +6,9 @@
 				<tui-input placeholder="请选择" label="养护道路" v-model="formData.roadName" disabled @click="pickerOpen(2)"></tui-input>
 				<tui-input placeholder="请选择" label="养护组长" v-model="formData.leaderUserName" disabled @click="pickerOpen(3)"></tui-input>
 				<tui-input placeholder="请选择" label="具体位置" v-model="formData.lonLatAddress" disabled @click="openMap()"></tui-input>
-				<tui-input placeholder="请选择" label="问题来源" v-model="formData.problemSourceName" disabled @click="pickerOpen(4)"></tui-input>
+
+        <tui-input placeholder="请选择" label="问题来源" v-if="editDisabled" v-model="formData.problemSourceName" disabled></tui-input>
+				<tui-input placeholder="请选择" label="问题来源" v-else v-model="formData.problemSourceName" disabled @click="pickerOpen(4)"></tui-input>
 				<tui-form-item label="紧急程度" :bottomBorder="false">
 					<tui-radio-group v-model="formData.pressingType">
 						<view class="fs-flex">
@@ -23,7 +25,7 @@
 			<tui-white-space></tui-white-space>
 			<tui-tab :tabs="tabList" scroll bold :leftGap="30" @change="tabChange"></tui-tab>
 			<tui-white-space></tui-white-space>
-			<tui-upload v-show="currentIndex == 0" background="#fff" :width="210" :radius="10" :height="210" delColor="#333" custom :serverUrl="serverURL" :header="{'Authorization': userToken}" :limit="3" @complete="complete($event, 'imgs')">
+			<tui-upload v-show="currentIndex == 0" background="#fff" :value="imgsValue" :width="210" :radius="10" :height="210" delColor="#333" custom :serverUrl="serverURL" :header="{'Authorization': userToken}" :limit="3" @complete="complete($event, 'imgs')">
 				<text class="fs-size__28 fs-color__subtitle fs-weight__400">问题图片</text>
 			</tui-upload>
 			<tui-upload v-show="currentIndex == 1" background="#fff" :width="210" :radius="10" :height="210" delColor="#333" custom :serverUrl="serverURL" :header="{'Authorization': userToken}" :limit="3" @complete="complete($event, 'streetImgList')">
@@ -41,7 +43,7 @@
 </template>
 
 <script>
-import { uploadURL } from '@/config/app'
+import { uploadURL, OSSURL } from '@/config/app'
 import { apiCaseAdd, apiStreetList, apiRoadListByStreetId, apiLeaderList } from '@/api/work'
 import { apiTypeList } from '@/api/app'
 const rules = [
@@ -110,12 +112,109 @@ export default {
 			serverURL: uploadURL,
 			currentIndex: 0,
 			tabList: ['问题图片', '街景图片', '远景图片'],
+      hotlinenumber:'',
+      editDisabled:false,
+      imgsValue:[], //初始化图片
 		}
 	},
-	onLoad() {
-		this.getStreetList()
+	onLoad(options) {
+    this.getStreetList()
 		this.getLeaderList()
 		this.getTypeList()
+    this.hotlinenumber = options.hotlinenumber
+    if(this.hotlinenumber){
+
+
+      // 1. 获取 eventChannel 实例
+      const eventChannel = this.getOpenerEventChannel();
+
+      // 2. 监听A页面发送的事件，接收大量数据
+      eventChannel.on('largeDataFromWorkOrder', (largeData) => {
+        console.log('A页面传递的大量数据：', largeData);
+        // 存储到 data 中供页面使用
+        // this.formData = largeData;
+        this.editDisabled = true
+        let largeData1 = {
+          "searchEntities": null,
+          "createBy": "吴宗刚",
+          "createTime": "2025-09-08 22:48:39",
+          "updateBy": "xcyl",
+          "updateTime": "2025-09-09 19:56:56",
+          "remark": null,
+          "beginTime": null,
+          "endTime": "2025-09-30 15:52:20",
+          "exportType": null,
+          "params": {},
+          "id": "5a76e18752f69dca1e98666aa93cc7c9",
+          "hotlinenumber": "WO005_20250908224839",
+          "casefile": null,
+          "eventsouce": "12345",
+          "citynum": "西城自己的-2250627-7777777",
+          "regionnum": "西城园林-250627-7777777",
+          "taskstate": "gdtype02",
+          "ownership": "0",
+          "casesource": "01",
+          "department": "10002",
+          "companyid": "10002",
+          "companyVo": "西城园林",
+          "street": "110102012000",
+          "streetVo": "什刹海街道",
+          "callName": "王虹云-西城自己创建",
+          "callTel": "13581551620",
+          "acceptcasetime": "2025-09-02 00:00:00",
+          "address": "什刹海公园东门东侧道北",
+          "content": "市民反映，西城区恭王府南门口东侧道北有一颗近百年的杨树，被连根斩了，希望查询财产去向、哪个部门砍伐的，是否是盗伐的，之前北京站前街也发生过类似的情况，希望核实，来电反映协调核实恭王府南门口东侧道北杨树被砍伐问题。市民反映，西城区恭王府南门口东侧道北有一颗近百年的杨树，被连根斩了，希望查询财产去向、哪个部门砍伐的，是否是盗伐的，之前北京站前街也发生过类似的情况，希望核实，来电反映协调核实恭王府南门口东侧道北杨树被砍伐问题。市民反映，西城区恭王府南门口东侧道北有一颗近百年的杨树，被连根斩了，希望查询财产去向、哪个部门砍伐的，是否是盗伐的，之前北京站前街也发生过类似的情况，希望核实，来电反映协调核实恭王府南门口东侧道北杨树被砍伐问题。市民反映，西城区恭王府南门口东侧道北有一颗近百年的杨树，被连根斩了，希望查询财产去向、哪个部门砍伐的，是否是盗伐的，之前北京站前街也发生过类似的情况，希望核实，来电反映协调核实恭王府南门口东侧道北杨树被砍伐问题。",
+          "casepic": "https://test.jichengshanshui.com.cn:28310/yuanlin/alioss/yl/images/2025/09/08/af671146754be2596b65e87e544c481f.jpg",
+          "dealuser": "xcyl严家齐巡查员",
+          "dispatcher": "0",
+          "dispperson": "368",
+          "disppersonVo": "xcyl严家齐巡查员",
+          "replyResult": null,
+          "picResult1": null,
+          "picResult2": null,
+          "picResult3": null,
+          "finishTime": null,
+          "replayrtime": null,
+          "ownercompany": null,
+          "casetype": null,
+          "handingresult": null,
+          "resolvedesp": "是我的问题， 但就是不处理， 就这么着~！！！！！！",
+          "rstResolvedesp": null,
+          "dealBy": null,
+          "dealTime": null,
+          "replayBy": null,
+          "replayTime": null,
+          "ownershipBy": "xcyl",
+          "ownershipTime": "2025-09-09 19:56:56",
+          "reserve1": "1",
+          "reserve2": null,
+          "reserve3": null,
+          "sysPhotoList": null
+        }
+        console.log(this.formData)
+        this.formData.streetName = largeData.streetVo
+        this.formData.streetId = largeData.street
+        this.getRoadList( this.formData.streetId)
+        this.formData.lonLatAddress = largeData.address
+        this.formData.remark = largeData.content
+        this.formData.problemSourceName = '12345工单'
+        this.formData.problemSourceId = 2
+        this.formData.thirdWorkOrderNo = largeData.hotlinenumber
+
+        // this.formData.imgs = largeData.casepic
+        if(largeData.casepic){
+          let picData = largeData.casepic.replace(OSSURL, "")
+          this.imgsValue = [picData]
+          // this.formData.imgs.push({
+          //   url: picData, // 接口返回的图片地址
+          //   id: Date.now() // 用时间戳作为唯一标识
+          // });
+        }
+      });
+    }else{
+
+
+    }
 	},
 	methods: {
 		// 获取街道列表
@@ -185,7 +284,21 @@ export default {
 		},
 		// 上传完成
 		complete(e, type) {
-			if (e.status == 1) this.formData[type] = e.imgArr
+			if (e.status == 1) {
+        if(type == 'imgs'){
+          // 直接添加新图，不删除默认图
+          // this.imgsValue.push({
+          //   url: event.url, // 接口返回的新图地址
+          //   isDefault: false,
+          //   id: Date.now() // 时间戳作为唯一标识
+          // });
+          this.imgsValue = e.imgArr
+        }else{
+          this.formData[type] = e.imgArr
+        }
+
+        console.log( this.formData[type])
+      }
 		},
 		// 提交
 		onSubmit() {
@@ -194,11 +307,17 @@ export default {
 					uni.$tui.toast(res.errorMsg)
 					return
 				}
+        // 关键：提交所有图片（默认图 + 新图）
+        // this.formData.imgs = this.imgsValue.map(item => item.url);
+        this.formData.imgs = this.imgsValue
 				if (!this.formData.imgs.length || !this.formData.streetImgList.length || !this.formData.longRangeImgList.length) {
 					uni.$tui.toast('请上传图片')
 					return
 				}
 				this.isLoading = true
+
+
+
 				apiCaseAdd({data:{...this.formData}}).then(res => {
 					uni.$tui.toast('提交成功')
 					setTimeout(() => { uni.navigateBack() }, 1500)
diff --git a/pages/work/daily/workOrder.vue b/pages/work/daily/workOrder.vue
index 7aff667..a132f7a 100644
--- a/pages/work/daily/workOrder.vue
+++ b/pages/work/daily/workOrder.vue
@@ -3,24 +3,25 @@
     <z-paging ref="paging" v-model="dataList" @query="queryList" :auto="false" >
 
       <view class="ul fs-p20">
-        <view class="li fs-bg__white fs-p30 fs-size__h4 fs-radius__sm fs-mt20" v-for="(item, index) in dataList">
-          <view @click="toDetails(item.planNo)">
-            <view class="fs-flex__between">
-              <view class="fs-weight__bold fs-flex1 fs-ellipsis">{{item.planName}}</view>
-              <tui-text v-if="item.planStatus" text="已完成" type="success"></tui-text>
-              <tui-text v-else text="未完成" type="danger"></tui-text>
+        <view class="li fs-bg__white fs-p30 fs-size__h4 fs-radius__sm fs-mt20 cad-box-shadow" v-for="(item, index) in dataList" :key="'planName'+item.hotlinenumber">
+          <view @click="toReport(item)">
+<!--            <view class="fs-flex__between">-->
+<!--              <view class="fs-weight__bold fs-flex1 fs-ellipsis">{{item.planName}}</view>-->
+<!--              <tui-text v-if="item.planStatus" text="已完成" type="success"></tui-text>-->
+<!--              <tui-text v-else text="未完成" type="danger"></tui-text>-->
+<!--            </view>-->
+            <view class="fs-flex fs-flex__between fs-mt20">
+              <view class="fs-flex1 fs-ellipsis">编码：{{item.hotlinenumber}}</view>
+              <view class="" style="color: #f00">待派单</view>
             </view>
             <view class="fs-flex fs-mt20">
-              <view class="fs-flex1">编码：{{item.hotlinenumber}}</view>
-              <view class="fs-flex1">周期：{{item.levelValue}}{{item.cycleName}}</view>
+              <view class="fs-flex1 fs-ellipsis">所在街道：{{item.streetVo}}</view>
             </view>
             <view class="fs-flex fs-mt20">
-              <view class="fs-flex1">养护类型：{{item.maintainTypeName}}</view>
-              <view class="fs-flex1">养护等级：{{item.curingLevelName}}</view>
+              <view class="fs-flex1 fs-ellipsis">详细地址：{{item.address}}{{item.address}}{{item.address}}</view>
             </view>
             <view class="fs-flex__between fs-mt20">
-              <view class="fs-flex1">计划次数：{{item.planNum}}</view>
-              <view class="fs-flex1">完成次数：{{item.planFinishNum}}</view>
+              <view class="fs-flex1 fs-ellipsis">截止日期：{{item.endTime}}</view>
             </view>
           </view>
 
@@ -74,12 +75,13 @@ export default {
   },
   methods: {
     // 获取巡检列表
-    queryList() {
+    queryList(pageNo, pageSize) {
       const useCounter = useCounterStore()
       console.log(useCounter.userInfo.userId)
       const params = {
         dispperson:useCounter.userInfo.userId,
-        taskstate:'gdtype02'
+        taskstate:'gdtype02',
+        pageReq: {pageNum: pageNo, pageSize: pageSize},
       }
       hotlinecaseList({data:params}).then(res => {
         this.$refs.paging.complete(res.rows)
@@ -87,13 +89,26 @@ export default {
     },
 
     // 跳转详情
-    toDetails(planno) {
-      uni.$tui.href(`/pages/work/daily/inspection/details?planno=${planno}`)
+    toReport(i) {
+      // uni.$tui.href(`/pages/work/daily/work/reporting?hotlinenumber=${hotlinenumber}`)
+      console.log(i)
+      uni.navigateTo({
+        url:`/pages/work/daily/reporting?hotlinenumber=${i.hotlinenumber}`, // B页面路径
+        // 1. （可选）监听B页面的回调（如需双向通信）
+        events: {
+          sendBackData: (data) => {
+            console.log('B页面回传的数据：', data);
+          }
+        },
+        // 2. 向B页面传递数据
+        success: (res) => {
+          // 通过 eventChannel 发送数据，key 可自定义（如 "largeDataFromA"）
+          res.eventChannel.emit('largeDataFromWorkOrder', i);
+        }
+      });
+
     },
-    // 跳转记录
-    toRecord(planno) {
-      uni.$tui.href(`/pages/work/daily/inspection/record?planno=${planno}`)
-    }
+
   }
 }
 </script>
--
libgit2 0.21.4