From 2270bd5b818091097c6e8c3fd50ebce27ee9ee8d Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 23 Jan 2026 10:39:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
uniapps/work-app/src/subPackages/userDetail/infos/index.vue | 6
uniapps/work-app/src/subPackages/userDetail/password/index.vue | 6
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue | 12 +
uniapps/work-app/src/utils/requestGd/index.js | 4
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/RefuseOrderDialog1.vue | 118 ++++++++++++++++
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue | 111 ++++++++++++---
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue | 32 ++-
applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue | 2
uniapps/work-app/src/api/work/index1.js | 8 +
uniapps/work-app/src/pages/user/index.vue | 6
uniapps/work-app/src/subPackages/workDetail/index.vue | 96 +++++++------
11 files changed, 300 insertions(+), 101 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
index ce3fe74..e0fb4f4 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
@@ -58,7 +58,7 @@
</div>
<!-- 子任务表格表单 -->
- <div class="task-table-section">
+ <div class="task-table-section" v-if="selectedWorkOrderId">
<div class="detail-title" :style="{marginTop: pxToRem(10)}">添加子任务</div>
<div class="task-table-container">
<el-table :data="taskList">
@@ -256,7 +256,7 @@
// 获取工单列表
async function getWorkOrderList() {
- const res = await gdWorkOrderPageApi({ size: 999, })
+ const res = await gdWorkOrderPageApi({ size: 999,workOrderStatus: '20' })
workOrderList.value = res?.data?.data?.records ?? []
}
@@ -273,11 +273,14 @@
// 获取设备列表
async function getDeviceList() {
const res = await gdManageDeviceListApi({
- // TODO 需要传入ids设备
- // ids:
+ deviceIds: selectedWorkOrder.value.recommendDeviceIds
})
deviceList.value = res?.data?.data ?? []
}
+
+watch(()=>selectedWorkOrderId.value,()=>{
+ getDeviceList()
+})
// 提交新增
async function handleSubmit() {
@@ -354,7 +357,6 @@
onMounted(() => {
getWorkOrderList()
getFlyerList()
- getDeviceList()
})
defineExpose({ open })
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/RefuseOrderDialog1.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/RefuseOrderDialog1.vue
new file mode 100644
index 0000000..51b0d79
--- /dev/null
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/RefuseOrderDialog1.vue
@@ -0,0 +1,118 @@
+<template>
+ <el-dialog
+ class="gd-dialog"
+ v-model="visible"
+ title="编辑"
+ @closed="visible = false"
+ destroy-on-close
+ :close-on-click-modal="false"
+ >
+ <div v-if="dialogReadonly">
+ <el-row class="detail-row-view">
+ <el-col :span="24">
+ <div class="label">{{formLabelStr}}：</div>
+ <div class="val">{{ formData.rejectReason || '' }}</div>
+ </el-col>
+ </el-row>
+ </div>
+ <el-form
+ v-else
+ class="gd-dialog-form"
+ ref="formRef"
+ :model="formData"
+ :rules="rules"
+ :disabled="dialogReadonly"
+ label-width="80px"
+ >
+ <el-row>
+ <el-col :span="24">
+ <el-form-item :label="formLabelStr" prop="rejectReason">
+ <el-input
+ class="gd-input"
+ v-model="formData.rejectReason"
+ type="textarea"
+ :rows="4"
+ placeholder="请输入"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <template #footer>
+ <el-button color="#F2F3F5" @click="visible = false">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
+ <el-button
+ class="save-btn"
+ color="#4C34FF"
+ v-if="!dialogReadonly"
+ :loading="submitting"
+ :disabled="submitting"
+ @click="handleSubmit"
+ >
+ 确认
+ </el-button>
+ </template>
+ </el-dialog>
+</template>
+
+<script setup>
+import { computed, ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { fieldRules, getDictLabel } from '@ztzf/utils'
+import { gdWorkOrderHandleStatusApi } from '@/views/orderView/orderManage/orderManage/orderManageApi'
+import { gdPatrolTaskAuditApi } from '@/views/orderView/orderManage/inspectionRequest/inspectionRequestApi'
+
+// 初始化表单数据
+const initForm = () => ({
+ auditStatus: null,
+ rejectReason: '',
+ id: null,
+})
+
+const emit = defineEmits(['success'])
+const formRef = ref(null) // 表单实例
+const formData = ref(initForm()) // 表单数据
+const visible = defineModel() // 弹框显隐
+const dialogMode = ref('add') // 弹框模式
+const submitting = ref(false) // 提交中
+const dialogReadonly = computed(() => dialogMode.value === 'view')
+const titleEnum = ref({ edit: '编辑', view: '查看', add: '新增' })
+
+const rules = {
+ rejectReason: fieldRules(true, 200),
+}
+
+// 提交新增/编辑
+async function handleSubmit() {
+ const isValid = await formRef.value?.validate().catch(() => false)
+ if (!isValid) return
+ submitting.value = true
+ gdPatrolTaskAuditApi(formData.value)
+ .then(res => {
+ ElMessage.success('提交成功')
+ visible.value = false
+ emit('success')
+ })
+ .finally(() => {
+ submitting.value = false
+ })
+}
+
+let formLabelStr = ref('原因')
+
+
+// 操作类型：1.同意签收、2.拒绝签收 、3.撤回任务 、4.同意审核、 5.拒绝审核、 6.验收通过、 7.验收拒绝
+async function open({ mode = 'add', row, formLabel, type } = {}) {
+ dialogMode.value = mode
+ formLabelStr.value = formLabel
+ formData.value = {
+ id: row.id,
+ auditStatus: type,
+ }
+ if (dialogMode.value !== 'add'){
+ formData.value.rejectReason = row.rejectReason
+ }
+}
+
+defineExpose({ open })
+</script>
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
index 41b1e74..1945dfe 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
@@ -46,9 +46,9 @@
<div class="val">{{ formData.taskDesc }}</div>
</el-col>
</el-row>
- <template v-if="['6','7','8'].includes(taskStatus)">
- <div>任务成功({{list.length || 0}}条)</div>
- <div style="display: flex">
+ <template v-if="['6', '7', '8'].includes(taskStatus)">
+ <div>任务成功({{ list.length || 0 }}条)</div>
+ <div style="display: flex">
<div v-for="item in list">
<el-image
v-if="item.resultUrl"
@@ -170,32 +170,40 @@
</div>
<template #footer>
- <!-- <el-button color="#F2F3F5" @click="visible = false">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>-->
- <el-button
- class="save-btn"
- color="#4C34FF"
- v-if="!dialogReadonly"
- :loading="submitting"
- :disabled="submitting"
- @click="handleSubmit"
- >
- 确认
- </el-button>
<template v-if="requester">
-<!-- statusChange(6)-->
- <el-button color="#F2F3F5" v-if="taskStatus === '1'">拒绝原因</el-button>
- <el-button color="#F2F3F5" @click="statusChange(3)" v-if="taskStatus === '3'">撤回任务</el-button>
- <el-button color="#F2F3F5" @click="refusalToAccept" v-if="taskStatus === '6'">拒绝验收</el-button>
- <el-button color="#F2F3F5" @click="statusChange(6)" v-if="taskStatus === '6'">验收通过</el-button>
+ <el-button
+ v-if="!dialogReadonly || ['1','4'].includes(taskStatus)"
+ :loading="submitting"
+ :disabled="submitting"
+ @click="handleSubmit"
+ >
+ 提交
+ </el-button>
+ <el-button v-if="['1','4'].includes(taskStatus)" @click="viewDescription">
+ {{ gdStatusObj[taskStatus].reason }}
+ </el-button>
+ <el-button @click="statusChange(3)" v-if="taskStatus === '3'">撤回任务</el-button>
+ <el-button @click="refusalToAccept" v-if="taskStatus === '6'">拒绝验收</el-button>
+ <el-button @click="statusChange(6)" v-if="taskStatus === '6'">验收通过</el-button>
</template>
<template v-else>
- <el-button color="#F2F3F5" @click="statusChange(2)" v-if="taskStatus === '0'">拒绝签收</el-button>
- <el-button color="#F2F3F5" @click="statusChange(1)" v-if="taskStatus === '0'">签收</el-button>
- <el-button color="#F2F3F5" @click="statusChange(5)" v-if="taskStatus === '3'">驳回</el-button>
- <el-button color="#F2F3F5" @click="statusChange(4)" v-if="taskStatus === '3'">通过</el-button>
+ <el-button v-if="['7'].includes(taskStatus)" @click="viewDescription">
+ {{ gdStatusObj[taskStatus].reason }}
+ </el-button>
+ <el-button v-if="taskStatus === '0'" @click="addDescription">拒绝签收</el-button>
+ <el-button v-if="taskStatus === '0'" @click="statusChange(1)" >签收</el-button>
+ <el-button v-if="taskStatus === '3'" @click="addDescription" >驳回</el-button>
+ <el-button v-if="taskStatus === '3'" @click="statusChange(4)" >同意</el-button>
</template>
</template>
+
+ <RefuseOrderDialog1
+ ref="refuseOrderDialogRef"
+ v-if="rejectVisible"
+ v-model="rejectVisible"
+ @success="rejectSuccess"
+ />
</el-dialog>
</template>
@@ -209,6 +217,8 @@
import { pxToRem } from '@/utils/rem'
import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
import { gdTaskResultListApi } from '@/views/orderView/orderManage/clueEvents/achievementApi'
+import RefuseOrderDialog from '@/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue'
+import RefuseOrderDialog1 from '@/views/orderView/orderManage/inspectionRequest/RefuseOrderDialog1.vue'
// 初始化表单数据
const initForm = () => ({
@@ -223,10 +233,11 @@
workOrderId: null,
})
+const rejectVisible = ref(false)
const mapRef = ref(null)
const dictObj = inject('dictObj')
const requester = inject('requester')
-const emit = defineEmits(['success','refusalAccept'])
+const emit = defineEmits(['success', 'refusalAccept'])
const formRef = ref(null)
const formData = ref(initForm())
const visible = defineModel()
@@ -235,6 +246,8 @@
const dialogReadonly = computed(() => dialogMode.value === 'view')
const titleEnum = ref({ edit: '编辑', view: '查看' })
const taskStatus = computed(() => formData.value.taskStatus)
+const refuseOrderDialogRef = ref(null)
+
// 下拉选项
const flyerList = ref([])
const deviceList = ref([])
@@ -244,6 +257,20 @@
{ name: '航线2', id: '2' },
{ name: '航线3', id: '3' },
])
+
+
+const gdStatusObj = {
+ '0': { reason: '拒绝原因',operationType: '2' },
+ '1': { reason: '拒绝原因' },
+ '2': { reason: '' },
+ '3': { reason: '驳回原因',operationType: '5' },
+ '4': { reason: '驳回原因' },
+ '5': { reason: '' },
+ '6': { reason: '拒绝原因' },
+ '7': { reason: '拒绝原因' },
+ '8': { reason: '' },
+}
+
let viewer
@@ -255,6 +282,36 @@
patrolRouteUrl: fieldRules(true),
recommendFlyerName: fieldRules(true),
deviceId: fieldRules(true),
+}
+
+function rejectSuccess() {
+ visible.value = false
+ emit('success')
+}
+
+
+// 填写说明
+function addDescription() {
+ rejectVisible.value = true
+ nextTick(() => {
+ refuseOrderDialogRef.value.open({
+ mode: 'add',
+ row: formData.value,
+ type: gdStatusObj[taskStatus.value].operationType,
+ formLabel: gdStatusObj[taskStatus.value].reason,
+ })
+ })
+}
+// 查看说明
+function viewDescription() {
+ rejectVisible.value = true
+ nextTick(() => {
+ refuseOrderDialogRef.value.open({
+ mode: 'view',
+ row: formData.value,
+ formLabel: gdStatusObj[taskStatus.value].reason,
+ })
+ })
}
// 获取航线名称
@@ -296,7 +353,7 @@
}
function refusalToAccept() {
- emit('refusalAccept',formData.value)
+ emit('refusalAccept', formData.value)
visible.value = false
}
@@ -335,8 +392,8 @@
// 打开弹框
async function open({ mode = 'view', row } = {}) {
dialogMode.value = mode
- formData.value = { ...initForm(), ...row };
- ['6','7','8'].includes(row.taskStatus) && getList()
+ formData.value = { ...initForm(), ...row }
+ ;['6', '7', '8'].includes(row.taskStatus) && getList()
initMap()
}
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
index 0cafd2f..1de0080 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
@@ -181,13 +181,12 @@
<template #footer>
<template v-if="requester">
<el-button
- v-if="['11', '31'].includes(gdStatus) || suddenlyEdit || (!dialogReadonly && !formData.id)"
+ v-if="['11'].includes(gdStatus) || suddenlyEdit || (!dialogReadonly && !formData.id)"
:loading="submitting"
:disabled="submitting"
@click="handleSubmit"
>
- {{ gdStatus === '11' ? '发布' : '提交修改' }}
- 发布
+ {{ gdStatus === '11' || !gdStatus ? '发布' : '提交修改' }}
</el-button>
<el-button v-if="['11', '21', '23', '24', '25', '31', '60'].includes(gdStatus)" @click="viewDescription">
{{ gdStatusObj[gdStatus].reason }}
@@ -206,8 +205,9 @@
<el-button v-if="gdStatus === '22'" @click="statusChange(7)">同意修改</el-button>
<el-button v-if="gdStatus === '22'" @click="statusChange(8)">不同意修改</el-button>
<el-button v-if="gdStatus === '21'" @click="statusChange(5)">同意取消</el-button>
- <el-button v-if="gdStatus === '21'" @click="statusChange(6)">不同意取消</el-button>
+ <el-button v-if="gdStatus === '21'" @click="addDescription">不同意取消</el-button>
<el-button v-if="gdStatus === '30'" @click="addDescription">协商修改</el-button>
+ <el-button v-if="gdStatus === '31'" @click="statusChange(10)">同意</el-button>
</template>
</template>
@@ -279,11 +279,10 @@
const hasPatrolTaskList = computed(() => ['30', '40', '50', '60'].includes(String(formData.value.workOrderStatus)))
const gdStatusObj = {
- '0': { reason: '' },
'10': { reason: '拒绝原因', operationType: '2' },
'11': { reason: '拒绝原因' },
'20': { reason: '取消原因', operationType: '3' },
- '21': { reason: '取消原因' },
+ '21': { reason: '原因', operationType: '6' },
'22': { reason: '驳回原因' },
'23': { reason: '取消原因' },
'24': { reason: '驳回原因', operationType: '3' },
@@ -291,7 +290,7 @@
'30': { reason: '修改原因', operationType: '9' },
'31': { reason: '修改原因' },
'40': { reason: '' },
- '50': { reason: '情况说明', operationType: '10' },
+ '50': { reason: '情况说明', operationType: '11' },
'60': { reason: '情况说明' },
}
@@ -306,7 +305,8 @@
deviceLoadDemand: fieldRules(true),
}
-// 操作类型：1接单，2拒接接单，3申请取消，4申请修改， 5同意取消 6不同意取消 7.同意修改 8.不同意修改 9.协商修改
+// 操作类型：1接单，2拒接接单，3申请取消，4申请修改， 5同意取消
+// 6不同意取消 7.同意修改 8.不同意修改 9.协商修改,10:同意协商修改，11.结算
function statusChange(operationType) {
gdWorkOrderHandleStatusApi({
operationType: operationType,
@@ -345,12 +345,15 @@
})
}
+// 查看说明
function viewDescription() {
rejectVisible.value = true
- refuseOrderDialogRef.value.open({
- mode: 'view',
- row: formData.value,
- formLabel: gdStatusObj[gdStatus.value].reason,
+ nextTick(() => {
+ refuseOrderDialogRef.value.open({
+ mode: 'view',
+ row: formData.value,
+ formLabel: gdStatusObj[gdStatus.value].reason,
+ })
})
}
@@ -360,7 +363,7 @@
const str = [...pointList.value, pointList.value[0]].map(item => `${item.longitude} ${item.latitude}`).join(',')
let geom = `POLYGON((${str}))`
const res = await gdManageDeviceListApi({
- ids: formData.value.recommendDeviceIds,
+ deviceIds: formData.value.recommendDeviceIds,
devicePayload: dialogMode.value === 'add' ? formData.value.deviceLoadDemand : '',
geom: dialogMode.value === 'add' ? geom : '',
})
@@ -370,6 +373,7 @@
}
}
+// 设备需求变化
function loadDemandChange() {
formData.value.recommendDeviceIds = ''
selectedDevices.value = []
@@ -418,6 +422,7 @@
}
)
+// 加载时间线list
function loadList() {
gdWorkOrderFlowListApi({ workOrderId: formData.value.id }).then(res => {
processList.value = res.data.data
@@ -581,6 +586,7 @@
}
.rightBox {
+ width: 350px;
.title {
font-weight: 500;
font-size: 14px;
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue
index 03f2608..b6df90d 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue
@@ -60,8 +60,6 @@
import { ElMessage } from 'element-plus'
import { fieldRules, getDictLabel } from '@ztzf/utils'
import { gdWorkOrderHandleStatusApi } from '@/views/orderView/orderManage/orderManage/orderManageApi'
-import { pxToRem } from '@/utils/rem'
-import dayjs from 'dayjs'
// 初始化表单数据
const initForm = () => ({
diff --git a/uniapps/work-app/src/api/work/index1.js b/uniapps/work-app/src/api/work/index1.js
index 1693ce5..cc4e278 100644
--- a/uniapps/work-app/src/api/work/index1.js
+++ b/uniapps/work-app/src/api/work/index1.js
@@ -48,3 +48,11 @@
params,
})
}
+// 退回工单
+export const backGdApi = (data) => {
+ return request({
+ url: '/drone-gd/workOrder/gdClueEvent/handle',
+ method: 'post',
+ data,
+ })
+}
diff --git a/uniapps/work-app/src/pages/user/index.vue b/uniapps/work-app/src/pages/user/index.vue
index 0ac0dc0..9aba9ae 100644
--- a/uniapps/work-app/src/pages/user/index.vue
+++ b/uniapps/work-app/src/pages/user/index.vue
@@ -163,15 +163,15 @@
}
.goOutStyle {
width: 670rpx;
- height: 100rpx;
+ height: 76rpx;
background: #1D6FE9;
border-radius: 8rpx 8rpx 8rpx 8rpx;
font-family: "Source Han Sans CN";
font-weight: 400;
- font-size: 36rpx;
+ font-size: 28rpx;
color: #ffffff;
text-align: center;
- line-height: 100rpx;
+ line-height: 76rpx;
margin: auto;
margin-top: 114rpx;
diff --git a/uniapps/work-app/src/subPackages/userDetail/infos/index.vue b/uniapps/work-app/src/subPackages/userDetail/infos/index.vue
index 5b41952..3e3b0b5 100644
--- a/uniapps/work-app/src/subPackages/userDetail/infos/index.vue
+++ b/uniapps/work-app/src/subPackages/userDetail/infos/index.vue
@@ -361,13 +361,13 @@
.custom-style {
width: 276rpx;
- height: 100rpx;
+ height: 76rpx;
font-family: "Source Han Sans CN";
font-weight: 400;
- font-size: 36rpx;
+ font-size: 28rpx;
}
:deep(.u-button.data-v-461e713c){
width: 276rpx !important;
- height: 100rpx !important;
+ height: 76rpx !important;
}
</style>
diff --git a/uniapps/work-app/src/subPackages/userDetail/password/index.vue b/uniapps/work-app/src/subPackages/userDetail/password/index.vue
index e46ae19..05d0da0 100644
--- a/uniapps/work-app/src/subPackages/userDetail/password/index.vue
+++ b/uniapps/work-app/src/subPackages/userDetail/password/index.vue
@@ -388,14 +388,14 @@
.custom-style {
width: 276rpx;
- height: 100rpx;
+ height: 76rpx;
font-family: "Source Han Sans CN";
font-weight: 400;
- font-size: 36rpx;
+ font-size: 28rpx;
}
:deep(.u-button.data-v-461e713c){
width: 276rpx !important;
- height: 100rpx !important;
+ height: 76rpx !important;
}
.getCode {
margin-left: 20rpx;
diff --git a/uniapps/work-app/src/subPackages/workDetail/index.vue b/uniapps/work-app/src/subPackages/workDetail/index.vue
index b58befa..102ea91 100644
--- a/uniapps/work-app/src/subPackages/workDetail/index.vue
+++ b/uniapps/work-app/src/subPackages/workDetail/index.vue
@@ -7,30 +7,6 @@
<div class="share-btn" @click="onShareClick"><img src="@/static/images/work/share.svg" alt=""></div>
</template>
</u-navbar>
-
- <!-- 分享弹出层 -->
- <div v-if="showShareModal" class="share-modal-overlay" @click="onShareModalClose">
- <div class="share-modal-content" @click.stop>
- <div class="share-modal-header">
- <div class="share-modal-title">分享到</div>
- <div class="share-modal-close" @click="onShareModalClose">×</div>
- </div>
- <div class="share-modal-body">
- <div class="share-item" @click="shareToWechat">
- <div class="share-icon wechat"></div>
- <div class="share-name">微信好友</div>
- </div>
- <div class="share-item" @click="shareToMoments">
- <div class="share-icon moments"></div>
- <div class="share-name">朋友圈</div>
- </div>
- <div class="share-item" @click="copyLink">
- <div class="share-icon link"></div>
- <div class="share-name">复制链接</div>
- </div>
- </div>
- </div>
- </div>
<div class="detailTop">
<div class="image-container">
<u-swiper
@@ -45,15 +21,8 @@
height="410rpx"
@click="previewImage"
></u-swiper>
- <!-- <div class="detailTitle">-->
- <!-- <div class="titleText">-->
- <!-- <div class="itemName">{{workDetailData.event_name}}</div>-->
- <!-- <div class="itemTime">{{formatDate(workDetailData.create_time)}}</div>-->
- <!-- </div>-->
- <!-- </div>-->
</div>
</div>
-
<!-- 工单内容 -->
<div class="worderContainer">
<div class="workOrderContent">
@@ -69,7 +38,7 @@
</div>
<div class="orderRow">
<div class="rowTitle">处置部门</div>
- <div>{{ workDetailData.disposeDept }}</div>
+ <div>{{ workDetailData.disposeDeptName }}</div>
</div>
<div class="orderRow">
<div class="rowTitle">拍摄时间</div>
@@ -98,8 +67,31 @@
<!-- 操作按钮 -->
<div class="actionButton">
<div class="btngroups">
- <up-button type="primary" color="#AEAEAE" text="退回"></up-button>
- <up-button type="primary" color="#1D6FE9" text="确认"></up-button>
+ <up-button type="primary" color="#AEAEAE" text="退回" @click="rejectTicket"></up-button>
+ <up-button type="primary" color="#1D6FE9" text="确认" @click="confirmTheTicket"></up-button>
+ </div>
+ </div>
+ <!-- 分享弹出层 -->
+ <div v-if="showShareModal" class="share-modal-overlay" @click="onShareModalClose">
+ <div class="share-modal-content" @click.stop>
+ <div class="share-modal-header">
+ <div class="share-modal-title">分享到</div>
+ <div class="share-modal-close" @click="onShareModalClose">×</div>
+ </div>
+ <div class="share-modal-body">
+ <div class="share-item" @click="shareToWechat">
+ <div class="share-icon wechat"></div>
+ <div class="share-name">微信好友</div>
+ </div>
+ <div class="share-item" @click="shareToMoments">
+ <div class="share-icon moments"></div>
+ <div class="share-name">朋友圈</div>
+ </div>
+ <div class="share-item" @click="copyLink">
+ <div class="share-icon link"></div>
+ <div class="share-name">复制链接</div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -108,7 +100,7 @@
<script setup>
// import { getShowImg, getSmallImg } from '@/utils/util'
import { ref, computed } from 'vue'
-import {getGddetailedData} from '/src/api/work/index1.js'
+import {getGddetailedData,backGdApi} from '/src/api/work/index1.js'
import dayjs from 'dayjs'
const formatDate = dateString => {
return dayjs(dateString).format('MM/DD HH:mm')
@@ -129,10 +121,8 @@
workDetailData.value = response
console.log('详情', workDetailData.value)
-
}
// 图片预览
-
const previewImage = index => {
if (getImageList.value.length === 0) return
const currentIndex = typeof index === 'number' ? index : 0
@@ -160,7 +150,27 @@
url: `/subPackages/workDetail/mapWork/index?eventNum=${item.event_num}`,
})
}
+// 退回
+const rejectTicket = () => {
+ const id = workDetailData.value.id
+ backGdApi({eventId : id,eventStatus:'0'}).then(res => {
+ uni.showToast({
+ title: '退回成功',
+ icon: 'success',
+ })
+ })
+}
+// 确认工单
+const confirmTheTicket = () => {
+ const id = workDetailData.value.id
+ backGdApi({eventId : id,eventStatus:'1'}).then(res => {
+ uni.showToast({
+ title: '确认成功',
+ icon: 'success',
+ })
+ })
+}
// 分享模态框状态
const showShareModal = ref(false)
@@ -283,13 +293,13 @@
<style lang="scss" scoped>
.workDetailContainer {
// 添加导航栏高度的padding-top，避免内容被遮挡
- padding-top: 44px;
+ padding-top: 88rpx;
// 分享按钮样式
.share-btn {
- color: #1D6FE9;
- font-size: 14px;
- padding: 0 10px;
- line-height: 44px;
+ img {
+ width: 40rpx;
+ height: 40rpx;
+ }
}
.detailTop {
.image-container {
@@ -422,7 +432,7 @@
align-items: center;
:deep(.u-button) {
width: 276rpx !important;
- height: 100rpx !important;
+ height: 76rpx !important;
&:last-child {
margin-left: 30rpx;
}
diff --git a/uniapps/work-app/src/utils/requestGd/index.js b/uniapps/work-app/src/utils/requestGd/index.js
index 3875688..2f8613e 100644
--- a/uniapps/work-app/src/utils/requestGd/index.js
+++ b/uniapps/work-app/src/utils/requestGd/index.js
@@ -28,7 +28,7 @@
const {detail} = useUserStore().$state?.userInfo || {}
// 假设有token值需要在头部需要携带
// let accessToken = useUserStore()?.$state?.userInfo?.gd_access_token;
- let accessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJ1c2VyX25hbWUiOiJ5ankiLCJyZWFsX25hbWUiOiJ5ankiLCJhdmF0YXIiOiIiLCJhdXRob3JpdGllcyI6WyJrZmpzIl0sImNsaWVudF9pZCI6InNhYmVyIiwicm9sZV9uYW1lIjoia2ZqcyIsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IGJsYWRleCIsInBvc3RfaWQiOiIiLCJ1c2VyX2lkIjoiMjAwODc5MzU1MDA1OTkyNTUwNSIsInJvbGVfaWQiOiIyMDA4NzMzNDY5MTg3MzY2OTE0Iiwic2NvcGUiOlsiYWxsIl0sIm5pY2tfbmFtZSI6InlqeSIsIm9hdXRoX2lkIjoiIiwiZGV0YWlsIjp7ImFyZWFDb2RlIjpudWxsLCJhcmVhTmFtZSI6Iuaxn-ilv-ecgSIsImFjdGl2ZUxvYW5zQXJlYUNvZGUiOltdfSwiZXhwIjoxNzY5MDc1MzY1LCJkZXB0X2lkIjoiMTEyMzU5ODgxMzczODY3NTIwMSIsImp0aSI6ImUwMGFhNzIzLTU5YjgtNDNmNy1hZmU2LTNiMjZlNTM5NTUxMiIsImFjY291bnQiOiJ5ankifQ.CJTDqgL2wu2KgrUNncBz34VYPoxUfKXxgScBUUE-BhM'
+ let accessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJ1c2VyX25hbWUiOiJhZG1pbiIsInJlYWxfbmFtZSI6IueuoeeQhuWRmCIsImF2YXRhciI6Imh0dHBzOi8vZ3cuYWxpcGF5b2JqZWN0cy5jb20vem9zL3Jtc3BvcnRhbC9CaWF6ZmFueG1hbU5Sb3h4VnhrYS5wbmciLCJhdXRob3JpdGllcyI6WyJhZG1pbmlzdHJhdG9yIl0sImNsaWVudF9pZCI6InNhYmVyIiwicm9sZV9uYW1lIjoiYWRtaW5pc3RyYXRvciIsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IGJsYWRleCIsInBvc3RfaWQiOiIxMTIzNTk4ODE3NzM4Njc1MjAxIiwidXNlcl9pZCI6IjExMjM1OTg4MjE3Mzg2NzUyMDEiLCJyb2xlX2lkIjoiMTEyMzU5ODgxNjczODY3NTIwMSIsInNjb3BlIjpbImFsbCJdLCJuaWNrX25hbWUiOiLnrqHnkIblkZgiLCJvYXV0aF9pZCI6IiIsImRldGFpbCI6eyJhcmVhQ29kZSI6bnVsbCwiYXJlYU5hbWUiOiLmsZ_opb_nnIEiLCJhY3RpdmVMb2Fuc0FyZWFDb2RlIjpbXX0sImV4cCI6MTc2OTEzNjM3OSwiZGVwdF9pZCI6IjExMjM1OTg4MTM3Mzg2NzUyMDEiLCJqdGkiOiI4MmIxOTdlYi0zY2NhLTQ0YmEtYjQ1OS0zODE5ZWIzZjUxN2IiLCJhY2NvdW50IjoiYWRtaW4ifQ.Mf--eQ96cYH1GhsySwoceM1c3dF-F7qt5RmQZ3MzYWY'
if (accessToken) {
config.header['Blade-Auth'] = 'bearer ' + accessToken;
}
@@ -75,7 +75,7 @@
// 引入拦截器配置
export function setupRequest () {
httpGd.setConfig(defaultConfig => {
-
+
/* defaultConfig 为默认全局配置 */
defaultConfig.baseURL = getEnvObj().VITE_API_BASE_URL_GD
// #ifdef H5
--
Gitblit v1.9.3