pages/myRepair/myRepair.vue

@@ -38,7 +38,8 @@
 		        </view>
 		        <view class="btns">
 		          <button v-if="!data.wxdegree && (data.state.name=='待评价'|| data.state.name=='已关闭')" @click.stop="handler('changeUser', data)" type="default" class="primaryButton btn">评价</button>
-		        </view>
+							<button v-if="data.state.value=='accept'" @click.stop="recall(data)" type="default" class="primaryButton btn">撤销</button>
+						</view>
 		      </view>
 					<div class="sign-style" v-if="deptRepair && publicRepair">
 						<view class="img-box" v-if="data.repairIncidentType && data.repairIncidentType.name=='科室报修'">
@@ -74,6 +75,17 @@
 				  <button @click="submit" type="default" class="primaryButton btn">提交</button>
 				</view>
 			</uni-popup>
+			<!-- 撤销 -->
+			<uni-popup ref="inputDialog" background-color="#fff" type="center" :before-close="true">
+				<view class="ch-class">撤销原因</view>
+				<view class="popup-content">
+					<input type="text" focus placeholder="请输入撤销原因" v-model="recallValue">
+				</view>
+				<view class="foot_common_btns">
+					<button @click="closeDialog" size="mini" type="default" class="primaryButton btn">取消</button>
+				  <button @click="dialogInputConfirm" size="mini" type="default" class="primaryButton btn">确定</button>
+				</view>
+			</uni-popup>
 		</view>
 
 		<view v-if="tabsIndex0==1">
@@ -204,7 +216,7 @@
 
 <script setup>
 	import { SM } from "@/http/http.js"
-	import { api_getDictionary, api_incident, api_incident_count, api_incidentTask, api_taskresolve, api_systemConfiguration, api_userSave, api_user, api_department, api_repairScanCode, api_getNotice, api_getCount } from "@/http/api.js"
+	import { api_getDictionary, api_incident, api_incident_count, api_incidentTask, api_taskresolve, api_systemConfiguration, api_userSave, api_user, api_department, api_repairScanCode, api_getNotice, api_getCount, api_repairCancel } from "@/http/api.js"
 	import repairsFilter from '@/components/repairsFilter.vue';
 	import IncidentAttachment from '@/components/IncidentAttachment.vue';
 	import { startOfDay, endOfDay, format, add } from 'date-fns'
@@ -239,7 +251,9 @@
 	const assignFlag = ref(false);//指派权限
 	const qiangdan = ref(false);//接单权限
 	const publicRepair = ref({});//公共报修
-
+	const recallValue = ref(null) //撤销原因
+	const inputDialog = ref(null)
+	const dataItem = ref(null)
 	const degreeDictionary = ref(null); //星级字典
 	const rowData = ref(null); //选择的数据
 	const rate = ref(3);//星级
@@ -417,7 +431,55 @@
 	function knowAttachment(){
 	  dataInfo.isAttachment = false;
 	}
-
+	
+	// 关闭撤销
+	function closeDialog(){
+		recallValue.value = null
+		inputDialog.value.close()
+	}
+	
+	// 确定撤销
+	function dialogInputConfirm(){
+		if(!recallValue.value){
+			uni.showToast({
+				icon: 'none',
+			  title: '撤销原因不能为空'
+			});
+			return
+		}
+		uni.showLoading({
+		  title: "加载中",
+		  mask: true,
+		});
+		let query={
+			incident: {...dataItem.value, ...{cancelRemark: recallValue.value}}
+		}
+		api_repairCancel(query).then(res=>{
+			uni.hideLoading();
+			if(res.state==200){
+				inputDialog.value.close()
+				recallValue.value = null
+				uni.showToast({
+					icon: 'none',
+				  title: '撤销成功'
+				});
+				getList(0);
+			}else{
+				uni.showToast({
+					icon: 'none',
+				  title: res.msg
+				});
+			}
+		})
+	}
+	
+	// 撤销
+	function recall(data){
+		dataItem.value = data
+		recallValue.value = null
+		inputDialog.value.open()
+	}
+	
 	// 评价
 	function handler(type, data){
 		rowData.value = data
@@ -993,6 +1055,13 @@
 	page{
 	  height: calc(100vh - var(--window-bottom));
 	}
+	.ch-class{
+		text-align: center;
+		font-size: 32rpx;
+	}
+	.popup-content{
+		padding: 40rpx;
+	}
 	.incidentList{
 	  display: flex;
 	  flex-direction: column;

pages/repair/listHome.vue

@@ -37,7 +37,8 @@
           </view>
           <view class="btns">
             <button v-if="!data.wxdegree && (data.state.name=='待评价'|| data.state.name=='已关闭')" @click.stop="handler('changeUser', data)" type="default" class="primaryButton btn">评价</button>
-          </view>
+						<button v-if="data.state.value=='accept'" @click.stop="recall(data)" type="default" class="primaryButton btn">撤销</button>
+					</view>
         </view>
 				<div class="sign-style" v-if="deptRepair && publicRepair">
 					<view class="img-box" v-if="data.repairIncidentType && data.repairIncidentType.name=='科室报修'">
@@ -72,6 +73,17 @@
 			  <button @click="submit" type="default" class="primaryButton btn">提交</button>
 			</view>
 		</uni-popup>
+		
+		<uni-popup ref="inputDialog" background-color="#fff" type="center" :before-close="true">
+			<view class="ch-class">撤销原因</view>
+			<view class="popup-content">
+				<input type="text" focus placeholder="请输入撤销原因" v-model="recallValue">
+			</view>
+			<view class="foot_common_btns">
+				<button @click="closeDialog" size="mini" type="default" class="primaryButton btn">取消</button>
+			  <button @click="dialogInputConfirm" size="mini" type="default" class="primaryButton btn">确定</button>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -81,7 +93,7 @@
   import { startOfDay, endOfDay, format, add } from 'date-fns'
   import { ref, reactive, computed } from 'vue'
   import { onLoad, onShow, onHide, onPullDownRefresh, onReachBottom, onTabItemTap } from '@dcloudio/uni-app'
-  import { api_getDictionary, api_incident, api_incident_count, api_systemConfiguration, api_incidentTask, api_taskresolve } from "@/http/api.js"
+  import { api_getDictionary, api_incident, api_incident_count, api_systemConfiguration, api_incidentTask, api_taskresolve, api_repairCancel } from "@/http/api.js"
   import { filterFormatDate } from '@/filters/filterFormatDate.js'
   import { computedPriorityStyle } from '@/filters/computedPriorityStyle.js'
   import { computedStateStyle } from '@/filters/computedStateStyle.js'
@@ -115,7 +127,9 @@
   const qiangdan = ref(false);//接单权限
 	const deptRepair = ref({});//科内报修
 	const publicRepair = ref({});//公共报修
-
+	const recallValue = ref(null) //撤销原因
+	const inputDialog = ref(null)
+	const dataItem = ref(null)
 	const degreeDictionary = ref(null); //星级字典
 	const rowData = ref(null); //选择的数据
 	const isSubmit = ref(false);
@@ -231,7 +245,55 @@
   function knowAttachment(){
     dataInfo.isAttachment = false;
   }
-
+	
+	// 关闭撤销
+	function closeDialog(){
+		recallValue.value = null
+		inputDialog.value.close()
+	}
+	
+	// 确定撤销
+	function dialogInputConfirm(){
+		if(!recallValue.value){
+			uni.showToast({
+				icon: 'none',
+			  title: '撤销原因不能为空'
+			});
+			return
+		}
+		uni.showLoading({
+		  title: "加载中",
+		  mask: true,
+		});
+		let query={
+			incident: {...dataItem.value, ...{cancelRemark: recallValue.value}}
+		}
+		api_repairCancel(query).then(res=>{
+			uni.hideLoading();
+			if(res.state==200){
+				inputDialog.value.close()
+				recallValue.value = null
+				uni.showToast({
+					icon: 'none',
+				  title: '撤销成功'
+				});
+				getList(0);
+			}else{
+				uni.showToast({
+					icon: 'none',
+				  title: res.msg
+				});
+			}
+		})
+	}
+	
+	// 撤销
+	function recall(data){
+		dataItem.value = data
+		recallValue.value = null
+		inputDialog.value.open()
+	}
+	
   // 评价
   function handler(type, data){
 		rowData.value = data
@@ -451,6 +513,13 @@
 page{
   height: calc(100vh - var(--window-bottom));
 }
+.ch-class{
+	text-align: center;
+	font-size: 32rpx;
+}
+.popup-content{
+	padding: 40rpx;
+}
 .incidentList{
   display: flex;
   flex-direction: column;

pages/repair/repairsDetail.vue

@@ -179,7 +179,7 @@
     </scroll-view>
     <view class="foot_common_btns">
       <button @click="goBack" type="default" class="primaryButton btn">返回</button>
-			<button v-if="stateId==20413" @click="recall" type="default" class="primaryButton btn">撤销</button>
+			<button v-if="dataInfo.incidentData.state.value=='accept'" @click="recall" type="default" class="primaryButton btn">撤销</button>
 		</view>
     <IncidentAttachment v-if="dataInfo.isAttachment" @knowEmit="knowAttachment" :incidentData="dataInfo.incidentData"></IncidentAttachment>
 

pages/workHourManagementOne/workHourManagementOne.vue

@@ -5,7 +5,7 @@
     </view>
     <view class="body" v-if="dataInfo.list.length">
       <view class="body_item ellipsis" v-for="data in dataInfo.list" :key="data.id" @click="toWorkHourManagementTwo(data)">
-        {{data.workName}}
+				{{ data.workName }} - {{data.workUnit}} - {{data.wage}}元 - {{data.integral.value}}分 
       </view>
     </view>
     <view class="zanwu" v-else>

pages/workHourManagementTwo/workHourManagementTwo.vue

@@ -147,13 +147,10 @@
       uni.stopPullDownRefresh();
       if(res.status == 200){
         let list = res.list || [];
+				for(let i of list){
+					i.workName =  i.workName + '-' + i.workUnit + '-' + i.wage + '元' + '-' + i.integral.value + '分'
+				}
 				dataInfo.list = list
-        // if(list.length){
-        //   dataInfo.hasMore = true;
-        //   dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
-        // }else{
-        //   dataInfo.hasMore = false;
-        // }
       }else{
         uni.showToast({
           icon: 'none',