质量检查以及安全违章接口调试完成
This commit is contained in:
BianLzhaoMin
parent
5395425ba5
commit
2f39f0b71d
|
|
@ -10,23 +10,23 @@
|
|||
style="background-color: #fff; padding: 0 30rpx 20rpx"
|
||||
>
|
||||
<TitleTipModal :TitleTip="`项目信息`" />
|
||||
<up-form-item prop="projectName" label="项目名称" required>
|
||||
<up-form-item prop="proName" label="项目名称" required>
|
||||
<up-input
|
||||
readonly
|
||||
border="none"
|
||||
v-model="addAndEditModel.projectName"
|
||||
:placeholder="props.addAndEditFormType == 3 ? '' : '点击选择项目'"
|
||||
v-model="addAndEditModel.proName"
|
||||
>
|
||||
<template #suffix v-if="props.addAndEditFormType != 3">
|
||||
<up-icon name="arrow-right" @tap="onSelectProject" />
|
||||
</template>
|
||||
</up-input>
|
||||
</up-form-item>
|
||||
<up-form-item prop="major" label="专业">
|
||||
<up-form-item prop="majorName" label="专业">
|
||||
<up-input
|
||||
border="none"
|
||||
readonly
|
||||
v-model="addAndEditModel.major"
|
||||
v-model="addAndEditModel.majorName"
|
||||
:placeholder="props.addAndEditFormType == 3 ? '' : '点击选择专业'"
|
||||
>
|
||||
<template #suffix v-if="props.addAndEditFormType != 3">
|
||||
|
|
@ -34,11 +34,11 @@
|
|||
</template>
|
||||
</up-input>
|
||||
</up-form-item>
|
||||
<up-form-item prop="procedure" label="工序">
|
||||
<up-form-item prop="gxName" label="工序">
|
||||
<up-input
|
||||
border="none"
|
||||
readonly
|
||||
v-model="addAndEditModel.procedure"
|
||||
v-model="addAndEditModel.gxName"
|
||||
:placeholder="props.addAndEditFormType == 3 ? '' : '点击选择工序'"
|
||||
>
|
||||
<template #suffix v-if="props.addAndEditFormType != 3">
|
||||
|
|
@ -48,19 +48,20 @@
|
|||
</up-form-item>
|
||||
|
||||
<TitleTipModal :TitleTip="`检查信息`" />
|
||||
<up-form-item prop="examiner" label="检查人">
|
||||
<up-form-item prop="checkUserName" label="检查人">
|
||||
<up-input
|
||||
border="none"
|
||||
v-model="addAndEditModel.checkUserName"
|
||||
:readonly="props.addAndEditFormType == 3"
|
||||
:placeholder="props.addAndEditFormType == 3 ? '' : '请输入检查人'"
|
||||
/>
|
||||
</up-form-item>
|
||||
<up-form-item prop="inspectTime" label="检查日期">
|
||||
<up-form-item prop="vioDate" label="检查日期">
|
||||
<up-input
|
||||
readonly
|
||||
border="none"
|
||||
inputAlign="right"
|
||||
v-model="addAndEditModel.inspectTime"
|
||||
v-model="addAndEditModel.vioDate"
|
||||
:placeholder="props.addAndEditFormType == 3 ? '' : '点击选择检查日期'"
|
||||
>
|
||||
<template #suffix v-if="props.addAndEditFormType != 3">
|
||||
|
|
@ -68,12 +69,12 @@
|
|||
</template>
|
||||
</up-input>
|
||||
</up-form-item>
|
||||
<up-form-item prop="correctionTerm" label="整改期限" required>
|
||||
<up-form-item prop="rectDate" label="整改期限" required>
|
||||
<up-input
|
||||
readonly
|
||||
border="none"
|
||||
inputAlign="right"
|
||||
v-model="addAndEditModel.correctionTerm"
|
||||
v-model="addAndEditModel.rectDate"
|
||||
:placeholder="props.addAndEditFormType == 3 ? '' : '点击选择整改期限'"
|
||||
>
|
||||
<template #suffix v-if="props.addAndEditFormType != 3">
|
||||
|
|
@ -81,52 +82,56 @@
|
|||
</template>
|
||||
</up-input>
|
||||
</up-form-item>
|
||||
<up-form-item prop="vrLocation" label="违章地点" required>
|
||||
<up-form-item prop="vioPlace" label="检查地点" required>
|
||||
<up-input
|
||||
border="none"
|
||||
v-model="addAndEditModel.vrLocation"
|
||||
v-model="addAndEditModel.vioPlace"
|
||||
:readonly="props.addAndEditFormType == 3"
|
||||
:placeholder="props.addAndEditFormType == 3 ? '' : '请输入违章地点'"
|
||||
:placeholder="props.addAndEditFormType == 3 ? '' : '请输入检查地点'"
|
||||
/>
|
||||
</up-form-item>
|
||||
<up-form-item prop="vrDescribe" label="违章描述" required>
|
||||
<up-form-item prop="vioDesc" label="检查描述" required>
|
||||
<up-textarea
|
||||
autoHeight
|
||||
border="none"
|
||||
v-model="addAndEditModel.vrDescribe"
|
||||
v-model="addAndEditModel.vioDesc"
|
||||
:readonly="props.addAndEditFormType == 3"
|
||||
:placeholder="props.addAndEditFormType == 3 ? '' : '请输入违章描述'"
|
||||
:placeholder="props.addAndEditFormType == 3 ? '' : '请输入检查描述'"
|
||||
/>
|
||||
</up-form-item>
|
||||
<up-form-item
|
||||
prop="vrImgList"
|
||||
:label="props.addAndEditFormType == 3 ? '违章照片' : '违章照片(最多9张)'"
|
||||
required
|
||||
prop="vrImgList"
|
||||
:label="props.addAndEditFormType == 3 ? '检查照片' : '检查照片(最多9张)'"
|
||||
>
|
||||
<up-upload
|
||||
name="1"
|
||||
multiple
|
||||
@delete="onDeletePicVrImgList"
|
||||
@afterRead="onAfterReadVrImgList"
|
||||
:deletable="props.addAndEditFormType != 3"
|
||||
:fileList="addAndEditModel.vrImgList"
|
||||
:maxCount="props.addAndEditFormType == 3 ? 1 : 9"
|
||||
:maxCount="
|
||||
props.addAndEditFormType == 3
|
||||
? addAndEditModel.vrImgList.length
|
||||
: 9 - addAndEditModel.vrImgList
|
||||
"
|
||||
/>
|
||||
</up-form-item>
|
||||
<TitleTipModal :TitleTip="`整改信息`" />
|
||||
<up-form-item prop="correctionPerson" label="整改人" required>
|
||||
<up-form-item prop="rectUserName" label="整改人" required>
|
||||
<up-input
|
||||
border="none"
|
||||
:readonly="props.addAndEditFormType == 3"
|
||||
v-model="addAndEditModel.correctionPerson"
|
||||
v-model="addAndEditModel.rectUserName"
|
||||
:placeholder="props.addAndEditFormType == 3 ? '' : '请输入整改人'"
|
||||
/>
|
||||
</up-form-item>
|
||||
<up-form-item prop="correctionTime" label="整改日期">
|
||||
<up-form-item prop="rectTime" label="整改日期">
|
||||
<up-input
|
||||
readonly
|
||||
border="none"
|
||||
inputAlign="right"
|
||||
v-model="addAndEditModel.correctionTime"
|
||||
v-model="addAndEditModel.rectTime"
|
||||
:placeholder="props.addAndEditFormType == 3 ? '' : '点击选择整改日期'"
|
||||
>
|
||||
<template #suffix v-if="props.addAndEditFormType != 3">
|
||||
|
|
@ -134,12 +139,12 @@
|
|||
</template>
|
||||
</up-input>
|
||||
</up-form-item>
|
||||
<up-form-item prop="correctionDescribe" label="整改说明" required>
|
||||
<up-form-item prop="rectDesc" label="整改说明" required>
|
||||
<up-textarea
|
||||
autoHeight
|
||||
border="none"
|
||||
:readonly="props.addAndEditFormType == 3"
|
||||
v-model="addAndEditModel.correctionDescribe"
|
||||
v-model="addAndEditModel.rectDesc"
|
||||
:placeholder="props.addAndEditFormType == 3 ? '' : '请输入整改说明'"
|
||||
/>
|
||||
</up-form-item>
|
||||
|
|
@ -148,17 +153,26 @@
|
|||
:label="props.addAndEditFormType == 3 ? '整改照片' : '整改照片(最多9张)'"
|
||||
>
|
||||
<up-upload
|
||||
name="1"
|
||||
multiple
|
||||
@delete="onDeleteCorrectionImgList"
|
||||
:deletable="props.addAndEditFormType != 3"
|
||||
@afterRead="onAfterReadCorrectionImgList"
|
||||
:deletable="!props.addAndEditFormType == 3"
|
||||
:fileList="addAndEditModel.correctionImgList"
|
||||
:maxCount="props.addAndEditFormType == 3 ? 1 : 9"
|
||||
:maxCount="
|
||||
props.addAndEditFormType == 3
|
||||
? addAndEditModel.correctionImgList.length
|
||||
: 9 - addAndEditModel.correctionImgList
|
||||
"
|
||||
/>
|
||||
</up-form-item>
|
||||
|
||||
<up-button type="primary" text="提交" @tap="onSubmitForm" style="width: 100%" />
|
||||
<up-button
|
||||
text="提交"
|
||||
type="primary"
|
||||
@tap="onSubmitForm"
|
||||
style="width: 100%"
|
||||
v-if="addAndEditFormType != 3"
|
||||
/>
|
||||
</up-form>
|
||||
|
||||
<!-- 项目选择弹框 -->
|
||||
|
|
@ -180,12 +194,12 @@
|
|||
|
||||
<!-- 工程列表 -->
|
||||
<view class="project-list">
|
||||
<up-list @scrolltolower="onScrollTolower" style="width: 100%">
|
||||
<up-list-item v-for="item in 20" :key="item">
|
||||
<up-cell :title="`xxxxxxxxx工程-${item}`" @tap="onSelectProjectItem(item)">
|
||||
<up-list @scrolltolower="onScrollTolower" style="width: 100%" pagingEnabled>
|
||||
<up-list-item v-for="(item, index) in projectList" :key="item.id">
|
||||
<up-cell :title="item.name" @tap="onSelectProjectItem(item)">
|
||||
<template #icon>
|
||||
<text style="margin-right: 10rpx">
|
||||
{{ item }}
|
||||
{{ index + 1 }}
|
||||
</text>
|
||||
</template>
|
||||
</up-cell>
|
||||
|
|
@ -197,7 +211,7 @@
|
|||
|
||||
<!-- 专业选择器 -->
|
||||
<up-picker
|
||||
keyName="label"
|
||||
keyName="name"
|
||||
:show="majorShow"
|
||||
:columns="majorList"
|
||||
@confirm="onConfirmMajor"
|
||||
|
|
@ -205,7 +219,7 @@
|
|||
/>
|
||||
<!-- 工序选择器 -->
|
||||
<up-picker
|
||||
keyName="label"
|
||||
keyName="name"
|
||||
:show="procedureShow"
|
||||
:columns="procedureList"
|
||||
@confirm="onConfirmProcedure"
|
||||
|
|
@ -221,7 +235,6 @@
|
|||
@cancel="dateShow = !dateShow"
|
||||
/>
|
||||
|
||||
<!-- loading-page -->
|
||||
<up-loading-page
|
||||
color="#333"
|
||||
fontSize="16"
|
||||
|
|
@ -233,11 +246,18 @@
|
|||
</template>
|
||||
|
||||
<script setup>
|
||||
import { reactive, ref } from 'vue'
|
||||
import { reactive, ref, watch } from 'vue'
|
||||
import { debounce } from 'lodash-es' // 引入防抖函数
|
||||
import { getProjectApi, getMajorApi, getProcedureApi } from '@/services/common.js'
|
||||
import {
|
||||
addQualityInspectionApi,
|
||||
editQualityInspectionApi,
|
||||
getQualityInspectionDetailsByIdApi,
|
||||
} from '@/services/qualityInspection.js'
|
||||
import getProjectAndMajorData from '@/hooks/useCommon.js'
|
||||
import TitleTipModal from '@/components/TitleTipModal/index'
|
||||
const addAndEditModelRef = ref(null)
|
||||
|
||||
const addAndEditModelRef = ref(null)
|
||||
const projectShow = ref(false) // 项目选择弹框
|
||||
const majorShow = ref(false) // 专业选择器
|
||||
const procedureShow = ref(false) // 工序选择器
|
||||
|
|
@ -246,31 +266,45 @@ const onSearchProjectName = ref('') // 项目搜索条件
|
|||
const dateValue = ref(Date.now()) // 年月日选择器数据源
|
||||
const sendLoading = ref(false) // 加载中
|
||||
const dateType = ref(1)
|
||||
// const { projectList, majorList, getData } = getProjectAndMajorData()
|
||||
// onMounted(async () => {
|
||||
// await getData()
|
||||
// })
|
||||
|
||||
const props = defineProps({
|
||||
// 表单类型 1. 新增 2. 修改 3. 详情
|
||||
addAndEditFormType: {
|
||||
type: [Number, String],
|
||||
default: () => 1,
|
||||
},
|
||||
// 列表id
|
||||
detailsId: {
|
||||
type: [Number, String],
|
||||
default: () => '',
|
||||
},
|
||||
})
|
||||
|
||||
console.log(props.addAndEditFormType, '表单类型')
|
||||
|
||||
// 修改时删除的数据源
|
||||
const deleteFileList = []
|
||||
// 表单数据源
|
||||
const addAndEditModel = reactive({
|
||||
projectName: '',
|
||||
procedure: '',
|
||||
major: '',
|
||||
examiner: '',
|
||||
inspectTime: '',
|
||||
correctionTerm: '',
|
||||
vrLocation: '',
|
||||
vrDescribe: '',
|
||||
vrImgList: [],
|
||||
correctionPerson: '',
|
||||
correctionDescribe: '',
|
||||
correctionTime: '',
|
||||
correctionImgList: [],
|
||||
dataSource: 2,
|
||||
proId: '', // 工程id
|
||||
proName: '', // 工程名称
|
||||
majorId: '', // 专业id
|
||||
majorName: '', // 专业名称
|
||||
gxId: '', // 工序id
|
||||
gxName: '', // 工序名称
|
||||
checkUserName: '', // 检查人
|
||||
vioDate: '', // 检查时间
|
||||
vioPlace: '', // 检查地点
|
||||
vioDesc: '', // 检查描述
|
||||
rectDate: '', // 整改期限
|
||||
rectUserName: '', //整改人
|
||||
rectTime: '', //整改时间
|
||||
rectDesc: '', //整改说明
|
||||
vrImgList: [], // 检查照片
|
||||
correctionImgList: [], // 整改照片
|
||||
})
|
||||
|
||||
// 校验规则
|
||||
|
|
@ -283,7 +317,7 @@ const addAndEditModelRules = ref({
|
|||
trigger: ['blur', 'change'],
|
||||
},
|
||||
],
|
||||
correctionTerm: [
|
||||
rectDate: [
|
||||
{
|
||||
type: 'string',
|
||||
required: true,
|
||||
|
|
@ -291,31 +325,31 @@ const addAndEditModelRules = ref({
|
|||
trigger: ['blur', 'change'],
|
||||
},
|
||||
],
|
||||
vrLocation: [
|
||||
vioPlace: [
|
||||
{
|
||||
type: 'string',
|
||||
required: true,
|
||||
message: '请填写违章地点',
|
||||
message: '请填写检查地点',
|
||||
trigger: ['blur', 'change'],
|
||||
},
|
||||
],
|
||||
vrDescribe: [
|
||||
vioDesc: [
|
||||
{
|
||||
type: 'string',
|
||||
required: true,
|
||||
message: '请填写违章描述',
|
||||
message: '请填写检查描述',
|
||||
trigger: ['blur', 'change'],
|
||||
},
|
||||
],
|
||||
vrImgList: [
|
||||
{
|
||||
type: 'string',
|
||||
type: 'array',
|
||||
required: true,
|
||||
message: '请上传违章照片',
|
||||
message: '请上传检查照片',
|
||||
trigger: ['blur', 'change'],
|
||||
},
|
||||
],
|
||||
correctionPerson: [
|
||||
rectUserName: [
|
||||
{
|
||||
type: 'string',
|
||||
required: true,
|
||||
|
|
@ -323,7 +357,7 @@ const addAndEditModelRules = ref({
|
|||
trigger: ['blur', 'change'],
|
||||
},
|
||||
],
|
||||
correctionDescribe: [
|
||||
rectDesc: [
|
||||
{
|
||||
type: 'string',
|
||||
required: true,
|
||||
|
|
@ -334,48 +368,63 @@ const addAndEditModelRules = ref({
|
|||
})
|
||||
// 项目数据源
|
||||
const projectList = ref([])
|
||||
|
||||
// 获取项目
|
||||
const getProjectData = async () => {
|
||||
console.log(
|
||||
'%c🔍 获取项目请求入参 %c',
|
||||
'background: linear-gradient(90deg, #FF6B6B, #4ECDC4); color: white; padding: 5px 10px; border-radius: 5px; font-weight: bold;',
|
||||
'',
|
||||
{},
|
||||
)
|
||||
const res = await getProjectApi({})
|
||||
projectList.value = res.data
|
||||
console.log(
|
||||
'%c🔍 获取项目请求出参 %c',
|
||||
'background: linear-gradient(90deg, #FF6B6B, #4ECDC4); color: white; padding: 5px 10px; border-radius: 5px; font-weight: bold;',
|
||||
'',
|
||||
res,
|
||||
)
|
||||
}
|
||||
getProjectData()
|
||||
// 专业数据源
|
||||
const majorList = reactive([
|
||||
[
|
||||
{
|
||||
label: '专业1',
|
||||
value: 2021,
|
||||
},
|
||||
{
|
||||
label: '专业2',
|
||||
value: 2022,
|
||||
},
|
||||
{
|
||||
label: '专业3',
|
||||
value: 2023,
|
||||
},
|
||||
{
|
||||
label: '专业4',
|
||||
value: 2024,
|
||||
},
|
||||
],
|
||||
])
|
||||
const majorList = reactive([])
|
||||
|
||||
// 获取专业
|
||||
const getMajorData = async () => {
|
||||
const { data: res } = await getMajorApi()
|
||||
console.log(
|
||||
'%c🔍 获取专业请求出参 %c',
|
||||
'background: linear-gradient(90deg, #FF6B6B, #4ECDC4); color: white; padding: 5px 10px; border-radius: 5px; font-weight: bold;',
|
||||
'',
|
||||
res,
|
||||
)
|
||||
|
||||
majorList.push(res)
|
||||
}
|
||||
getMajorData()
|
||||
// 工序数据源
|
||||
const procedureList = reactive([
|
||||
[
|
||||
{
|
||||
label: '工序1',
|
||||
id: 2021,
|
||||
},
|
||||
{
|
||||
label: '工序2',
|
||||
id: 2022,
|
||||
},
|
||||
{
|
||||
label: '工序3',
|
||||
id: 2023,
|
||||
},
|
||||
{
|
||||
label: '工序4',
|
||||
id: 2024,
|
||||
},
|
||||
],
|
||||
])
|
||||
const procedureList = reactive([])
|
||||
|
||||
// 获取工序
|
||||
const getProcedureData = async (pid) => {
|
||||
console.log(
|
||||
'%c🔍 获取专业请求入参 %c',
|
||||
'background: linear-gradient(90deg, #FF6B6B, #4ECDC4); color: white; padding: 5px 10px; border-radius: 5px; font-weight: bold;',
|
||||
'',
|
||||
pid,
|
||||
)
|
||||
const { data: res } = await getProcedureApi({ pid })
|
||||
console.log(
|
||||
'%c🔍 获取工序请求出参 %c',
|
||||
'background: linear-gradient(90deg, #FF6B6B, #4ECDC4); color: white; padding: 5px 10px; border-radius: 5px; font-weight: bold;',
|
||||
'',
|
||||
res,
|
||||
)
|
||||
procedureList.push(res)
|
||||
}
|
||||
|
||||
// getProcedureData()
|
||||
|
||||
// 日期格式化
|
||||
const formatter = (type, value) => {
|
||||
|
|
@ -409,7 +458,8 @@ const onScrollTolower = () => {
|
|||
|
||||
// 选择项目
|
||||
const onSelectProjectItem = (item) => {
|
||||
addAndEditModel.projectName = 'xxxxxx工程' + item
|
||||
addAndEditModel.proName = item.name
|
||||
addAndEditModel.proId = item.id
|
||||
projectShow.value = false
|
||||
}
|
||||
|
||||
|
|
@ -426,8 +476,10 @@ const onSelectMajor = () => {
|
|||
|
||||
// 专业确定
|
||||
const onConfirmMajor = (item) => {
|
||||
console.log('---确定', item.value[0].label)
|
||||
addAndEditModel.major = item.value[0].label
|
||||
console.log('---确定', item.value[0].name)
|
||||
addAndEditModel.majorName = item.value[0].name
|
||||
addAndEditModel.majorId = item.value[0].id
|
||||
getProcedureData(item.value[0].id)
|
||||
majorShow.value = false
|
||||
}
|
||||
// 选择工序
|
||||
|
|
@ -437,13 +489,14 @@ const onSelectProcedure = () => {
|
|||
|
||||
// 工序确定
|
||||
const onConfirmProcedure = (item) => {
|
||||
addAndEditModel.procedure = item.value[0].label
|
||||
addAndEditModel.gxName = item.value[0].name
|
||||
addAndEditModel.gxId = item.value[0].id
|
||||
procedureShow.value = false
|
||||
}
|
||||
|
||||
// 打开日期选择器
|
||||
const onSelectDate = (type) => {
|
||||
// type 为类型 1. 检查日期 2. 整改期限 3. 整改日期
|
||||
// type 为类型 1. 违章日期 2. 整改期限 3. 整改日期
|
||||
dateType.value = type
|
||||
dateShow.value = true
|
||||
}
|
||||
|
|
@ -452,13 +505,13 @@ const onSelectDate = (type) => {
|
|||
const onConfirmDate = (item) => {
|
||||
const formatDateValue = formatDate(dateValue.value)
|
||||
if (dateType.value === 1) {
|
||||
addAndEditModel.inspectTime = formatDateValue
|
||||
addAndEditModel.vioDate = formatDateValue
|
||||
}
|
||||
if (dateType.value === 2) {
|
||||
addAndEditModel.correctionTerm = formatDateValue
|
||||
addAndEditModel.rectDate = formatDateValue
|
||||
}
|
||||
if (dateType.value === 3) {
|
||||
addAndEditModel.correctionTime = formatDateValue
|
||||
addAndEditModel.rectTime = formatDateValue
|
||||
}
|
||||
dateShow.value = false
|
||||
console.log('---日期确定', formatDateValue)
|
||||
|
|
@ -474,15 +527,25 @@ const formatDate = (timestamp) => {
|
|||
|
||||
// 违章照片上传
|
||||
const onAfterReadVrImgList = (event) => {
|
||||
console.log('event', event)
|
||||
let lists = [].concat(event.file)
|
||||
lists.map((item) => {
|
||||
addAndEditModel.vrImgList.push({
|
||||
...item,
|
||||
isEdit: false,
|
||||
})
|
||||
})
|
||||
}
|
||||
// 违章照片删除
|
||||
const onDeletePicVrImgList = (event) => {
|
||||
if (
|
||||
props.addAndEditFormType == 2 &&
|
||||
addAndEditModel.vrImgList[event.index].id &&
|
||||
addAndEditModel.vrImgList[event.index].idEdit
|
||||
) {
|
||||
deleteFileList.push({ id: addAndEditModel.vrImgList[event.index].id })
|
||||
}
|
||||
|
||||
addAndEditModel.vrImgList.splice(event.index, 1)
|
||||
}
|
||||
|
||||
|
|
@ -492,37 +555,304 @@ const onAfterReadCorrectionImgList = (event) => {
|
|||
lists.map((item) => {
|
||||
addAndEditModel.correctionImgList.push({
|
||||
...item,
|
||||
isEdit: false,
|
||||
})
|
||||
})
|
||||
}
|
||||
// 违章照片删除
|
||||
// 整改照片删除
|
||||
const onDeleteCorrectionImgList = (event) => {
|
||||
if (
|
||||
props.addAndEditFormType == 2 &&
|
||||
addAndEditModel.correctionImgList[event.index].id &&
|
||||
addAndEditModel.correctionImgList[event.index].idEdit
|
||||
) {
|
||||
deleteFileList.push({ id: addAndEditModel.correctionImgList[event.index]?.id })
|
||||
}
|
||||
|
||||
addAndEditModel.correctionImgList.splice(event.index, 1)
|
||||
}
|
||||
|
||||
// 提交
|
||||
const onSubmitForm = debounce(() => {
|
||||
console.log('---提交')
|
||||
sendLoading.value = true
|
||||
addAndEditModelRef.value.validate().then((valid) => {
|
||||
if (valid) {
|
||||
console.log('校验通过')
|
||||
sendLoading.value = false
|
||||
}
|
||||
})
|
||||
addAndEditModelRef.value
|
||||
.validate()
|
||||
.then(async (valid) => {
|
||||
if (valid) {
|
||||
// 先调上传接口把图片上传
|
||||
sendLoading.value = true
|
||||
const uploadImages = new Promise(async (resolve, reject) => {
|
||||
try {
|
||||
let successVrImgList = []
|
||||
let successCorrectionImgList = []
|
||||
|
||||
let successVrImgListNoEdit = []
|
||||
let successCorrectionImgListNoEdit = []
|
||||
|
||||
if (addAndEditModel.vrImgList.length > 0) {
|
||||
successVrImgListNoEdit = addAndEditModel.vrImgList.map((e) => {
|
||||
if (!e.isEdit) {
|
||||
return {
|
||||
...e,
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
if (successVrImgListNoEdit.length > 0) {
|
||||
successVrImgList = await uploadImgFun(successVrImgListNoEdit, 3)
|
||||
}
|
||||
}
|
||||
if (addAndEditModel.correctionImgList.length > 0) {
|
||||
successCorrectionImgListNoEdit = addAndEditModel.correctionImgList.map(
|
||||
(e) => {
|
||||
if (!e.isEdit) {
|
||||
return {
|
||||
...e,
|
||||
}
|
||||
}
|
||||
},
|
||||
)
|
||||
|
||||
if (successCorrectionImgListNoEdit.length > 0) {
|
||||
successCorrectionImgList = await uploadImgFun(
|
||||
successCorrectionImgListNoEdit,
|
||||
4,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
resolve({ successVrImgList, successCorrectionImgList }) // 上传成功，返回结果
|
||||
} catch (error) {
|
||||
reject(error) // 上传失败，抛出错误
|
||||
}
|
||||
})
|
||||
|
||||
uploadImages
|
||||
.then(async ({ successVrImgList, successCorrectionImgList }) => {
|
||||
console.log('图片上传成功，开始提交表单...')
|
||||
console.log('successVrImgList', successVrImgList)
|
||||
|
||||
// 这里写提交表单的逻辑
|
||||
// 组装参数
|
||||
const {
|
||||
dataSource,
|
||||
proId, // 工程id
|
||||
proName, // 工程名称
|
||||
majorId, // 专业id
|
||||
majorName, // 专业名称
|
||||
gxId, // 工序id
|
||||
gxName, // 工序名称
|
||||
checkUserName, // 检查人
|
||||
vioDate, // 违章时间
|
||||
vioPlace, // 违章地点
|
||||
vioDesc, // 违章描述
|
||||
rectDate, // 整改期限
|
||||
rectUserName, //整改人
|
||||
rectTime, //整改时间
|
||||
rectDesc, //整改说明
|
||||
} = addAndEditModel
|
||||
|
||||
const addParams = {
|
||||
dataSource,
|
||||
proId, // 工程id
|
||||
proName, // 工程名称
|
||||
majorId, // 专业id
|
||||
majorName, // 专业名称
|
||||
gxId, // 工序id
|
||||
gxName, // 工序名称
|
||||
checkUserName, // 检查人
|
||||
vioDate, // 违章时间
|
||||
vioPlace, // 违章地点
|
||||
vioDesc, // 违章描述
|
||||
rectDate, // 整改期限
|
||||
rectUserName, //整改人
|
||||
rectTime, //整改时间
|
||||
rectDesc, //整改说明
|
||||
fileList: [...successVrImgList, ...successCorrectionImgList],
|
||||
uploadType: 2,
|
||||
}
|
||||
|
||||
const SED_API =
|
||||
props.addAndEditFormType == 1
|
||||
? addQualityInspectionApi
|
||||
: editQualityInspectionApi
|
||||
|
||||
if (props.addAndEditFormType == 2) {
|
||||
Object.assign(addParams, {
|
||||
id: props.detailsId,
|
||||
delFileList: deleteFileList,
|
||||
})
|
||||
}
|
||||
|
||||
console.log(
|
||||
'%c🔍 表单提交入参 %c',
|
||||
'background: linear-gradient(90deg, #FF6B6B, #4ECDC4); color: white; padding: 5px 10px; border-radius: 5px; font-weight: bold;',
|
||||
'',
|
||||
addParams,
|
||||
)
|
||||
const res = await SED_API(addParams)
|
||||
console.log(
|
||||
'%c🔍 表单提交出参 %c',
|
||||
'background: linear-gradient(90deg, #FF6B6B, #4ECDC4); color: white; padding: 5px 10px; border-radius: 5px; font-weight: bold;',
|
||||
'',
|
||||
res,
|
||||
)
|
||||
|
||||
sendLoading.value = false
|
||||
if (res.code === 200) {
|
||||
uni.$u.toast(res.data)
|
||||
// setTimeout(() => {
|
||||
// uni.navigateBack({
|
||||
// delta: 1,
|
||||
// })
|
||||
// }, 500)
|
||||
} else {
|
||||
uni.$u.toast(res.data)
|
||||
}
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('图片上传失败:', error)
|
||||
})
|
||||
}
|
||||
})
|
||||
.catch((error) => {})
|
||||
}, 1000)
|
||||
|
||||
// 获取表单详情
|
||||
const getFormDetail = () => {
|
||||
console.log('---获取详情数据')
|
||||
}
|
||||
// props.addAndEditFormType 如果为2怎为编辑表单
|
||||
if (props.addAndEditFormType == 2) {
|
||||
// 先获取详情数据并回显
|
||||
getFormDetail()
|
||||
// 上传逻辑
|
||||
const uploadImgFun = async (list, type) => {
|
||||
return new Promise((resolve, reject) => {
|
||||
let successList = []
|
||||
let files = []
|
||||
|
||||
list.forEach((f) => {
|
||||
let d = {
|
||||
file: f.url,
|
||||
name: 'files',
|
||||
uri: f.url,
|
||||
}
|
||||
files.push(d)
|
||||
})
|
||||
|
||||
sendLoading.value = true
|
||||
|
||||
uni.uploadFile({
|
||||
url: '/imgTool/sys/file/uploadFile',
|
||||
files: files,
|
||||
name: 'files',
|
||||
formData: {
|
||||
params: JSON.stringify({
|
||||
uploadType: 2,
|
||||
sourceType: type,
|
||||
sourceTypeName: type === 3 ? '质量检查-缺陷问题照片' : '质量检查-整改照片',
|
||||
}),
|
||||
},
|
||||
success: (res) => {
|
||||
sendLoading.value = false
|
||||
res = JSON.parse(res.data)
|
||||
|
||||
console.log(res, '上传成功')
|
||||
if (res.code === 200) {
|
||||
successList = res.data
|
||||
resolve(successList) // 上传成功，返回数据
|
||||
} else {
|
||||
uni.$u.toast('上传失败' + res.msg)
|
||||
reject(new Error('上传失败: ' + res.msg))
|
||||
}
|
||||
},
|
||||
fail: (err) => {
|
||||
sendLoading.value = false
|
||||
reject(new Error('网络错误: ' + err.errMsg))
|
||||
},
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
// 获取表单详情
|
||||
const getFormDetail = async () => {
|
||||
const res = await getQualityInspectionDetailsByIdApi({ id: props?.detailsId })
|
||||
|
||||
if (res.code === 200) {
|
||||
const {
|
||||
dataSource,
|
||||
proId, // 工程id
|
||||
proName, // 工程名称
|
||||
majorId, // 专业id
|
||||
majorName, // 专业名称
|
||||
gxId, // 工序id
|
||||
gxName, // 工序名称
|
||||
checkUserName, // 检查人
|
||||
vioDate, // 违章时间
|
||||
vioPlace, // 违章地点
|
||||
vioDesc, // 违章描述
|
||||
rectDate, // 整改期限
|
||||
rectUserName, //整改人
|
||||
rectTime, //整改时间
|
||||
rectDesc, //整改说明
|
||||
rectPhotoList,
|
||||
vioPhotoList,
|
||||
} = res.data
|
||||
|
||||
let rectPhotoListEdit = []
|
||||
let vioPhotoListEdit = []
|
||||
|
||||
if (rectPhotoList.length > 0) {
|
||||
rectPhotoListEdit = rectPhotoList.map((e) => {
|
||||
return {
|
||||
idEdit: true,
|
||||
url: e.originalFilePath,
|
||||
...e,
|
||||
}
|
||||
})
|
||||
}
|
||||
if (vioPhotoList.length > 0) {
|
||||
vioPhotoListEdit = vioPhotoList.map((e) => {
|
||||
return {
|
||||
idEdit: true,
|
||||
url: e.originalFilePath,
|
||||
...e,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
Object.assign(addAndEditModel, {
|
||||
proId, // 工程id
|
||||
proName, // 工程名称
|
||||
majorId, // 专业id
|
||||
majorName, // 专业名称
|
||||
gxId, // 工序id
|
||||
gxName, // 工序名称
|
||||
checkUserName, // 检查人
|
||||
vioDate, // 违章时间
|
||||
vioPlace, // 违章地点
|
||||
vioDesc, // 违章描述
|
||||
rectDate, // 整改期限
|
||||
rectUserName, //整改人
|
||||
rectTime, //整改时间
|
||||
rectDesc, //整改说明
|
||||
vrImgList: vioPhotoListEdit,
|
||||
correctionImgList: rectPhotoListEdit,
|
||||
})
|
||||
|
||||
console.log(addAndEditModel, 'addAndEditModel')
|
||||
|
||||
getProcedureData(majorId)
|
||||
}
|
||||
}
|
||||
|
||||
// 监听当前页面是新增还是修改
|
||||
watch(
|
||||
() => props.addAndEditFormType,
|
||||
(newValue) => {
|
||||
console.log('newValue当前表单的类型', newValue)
|
||||
|
||||
if (newValue != 1) {
|
||||
getFormDetail()
|
||||
}
|
||||
},
|
||||
{
|
||||
deep: true,
|
||||
immediate: true,
|
||||
},
|
||||
)
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
/>
|
||||
|
||||
<view class="container">
|
||||
<AddAndEditForm :addAndEditFormType="addAndEditFormType" />
|
||||
<AddAndEditForm :addAndEditFormType="addAndEditFormType" :detailsId="detailsId" />
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
|
@ -20,6 +20,7 @@ import { ref } from 'vue'
|
|||
import { onLoad } from '@dcloudio/uni-app'
|
||||
|
||||
const { safeAreaInsets } = uni.getSystemInfoSync()
|
||||
const detailsId = ref('')
|
||||
const addAndEditFormType = ref(1)
|
||||
const uploadRecordUrl = ref('/pages/qualityInspection/upload-record/index')
|
||||
|
||||
|
|
@ -27,6 +28,9 @@ onLoad((query) => {
|
|||
if (query.type) {
|
||||
addAndEditFormType.value = query.type
|
||||
}
|
||||
if (query.id) {
|
||||
detailsId.value = query.id
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<up-input
|
||||
clearable
|
||||
placeholder="输入搜索关键词"
|
||||
v-model.trim="onSearchKeyword"
|
||||
v-model.trim="queryParams.keyWord"
|
||||
suffixIconStyle="color: #909399"
|
||||
>
|
||||
<template #suffix>
|
||||
|
|
@ -18,55 +18,50 @@
|
|||
</view>
|
||||
</view>
|
||||
|
||||
<view class="upload-record-list">
|
||||
<view class="upload-record-list" v-if="qualityInspectionList.length > 0">
|
||||
<up-list @scrolltolower="onScrollTolower" style="width: 100%">
|
||||
<up-list-item v-for="item in 10" :key="item">
|
||||
<up-list-item v-for="item in qualityInspectionList" :key="item.id">
|
||||
<view class="record-item">
|
||||
<view @tap="onHandleViewDetails">
|
||||
<view @tap="onHandleViewDetails(item.id)">
|
||||
<!-- 日期 -->
|
||||
<view class="item-date">
|
||||
<text>2024-05-06</text>
|
||||
<text>{{ item.vioDate }}</text>
|
||||
<view>
|
||||
<up-button
|
||||
size="mini"
|
||||
text="修改"
|
||||
type="primary"
|
||||
@tap="onHandleEditRecord"
|
||||
@tap="onHandleEditRecord(item.id)"
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 名称 -->
|
||||
<view class="item-name">
|
||||
<text>N3917</text>
|
||||
<text>{{ item.proName }}</text>
|
||||
</view>
|
||||
|
||||
<!-- 文字内容 -->
|
||||
<view class="text-content">
|
||||
<up-text
|
||||
:lines="2"
|
||||
text="关于uview-plus的取名来由，首字母u来自于uni-app首字母，
|
||||
uni-app是基Vuejs，Vue和View(延伸为UI、视图之意)同音，同时view组件uni-app中
|
||||
最础最重要的组件，故取名uview-plus，表达源于uni-app和Vue之意，同时在此也对它示感谢。"
|
||||
/>
|
||||
<up-text :lines="2" :text="item.vioDesc" />
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 图片内容 -->
|
||||
<view class="swiper-container">
|
||||
<up-swiper
|
||||
:list="list1"
|
||||
:list="item.vioPhotoList"
|
||||
interval="5000"
|
||||
:indicator="true"
|
||||
@click="onClickSwiper"
|
||||
/>
|
||||
<view class="swiper-count"> 3张 </view>
|
||||
<view class="swiper-count"> {{ item.vioPhotoNum }}张 </view>
|
||||
</view>
|
||||
|
||||
<!-- 检查人 -->
|
||||
<view class="inspect-person">
|
||||
<view> 检查人：武松 </view>
|
||||
<view> 整改日期：2025-05-06 </view>
|
||||
<view> 检查人：{{ item.checkUserName }} </view>
|
||||
<view> 整改日期：{{ item.rectTime }} </view>
|
||||
</view>
|
||||
</view>
|
||||
</up-list-item>
|
||||
|
|
@ -76,45 +71,106 @@ uni-app是基Vuejs，Vue和View(延伸为UI、视图之意)同音，同时view
|
|||
{{ finish ? '没有更多数据了~' : '正在加载...' }}
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<up-empty mode="data" v-else />
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import NavBarModal from '@/components/NavBarModal/index'
|
||||
import { ref, reactive } from 'vue'
|
||||
import { ref, computed } from 'vue'
|
||||
import { debounce } from 'lodash-es' // 引入防抖函数
|
||||
const scrollTop = ref(0)
|
||||
const onSearchKeyword = ref('')
|
||||
const finish = ref(false)
|
||||
import { getQualityInspectionListApi } from '@/services/qualityInspection.js'
|
||||
const { safeAreaInsets } = uni.getSystemInfoSync()
|
||||
const upListRef = ref(null) // 获取列表组件的引用
|
||||
const total = ref(0)
|
||||
const qualityInspectionList = ref([])
|
||||
|
||||
const list1 = reactive([
|
||||
'https://img1.baidu.com/it/u=1361177696,203903602&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1455',
|
||||
'https://img1.baidu.com/it/u=1361177696,203903602&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1455',
|
||||
'https://img1.baidu.com/it/u=1361177696,203903602&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1455',
|
||||
])
|
||||
// 查询条件
|
||||
const queryParams = ref({
|
||||
page: 1,
|
||||
limit: 10,
|
||||
keyWord: '',
|
||||
})
|
||||
|
||||
// 获取上传记录列表数据
|
||||
const getQualityInspectionListData = async (isTap = false) => {
|
||||
try {
|
||||
console.log(
|
||||
'%c🔍 获取安全违章上传记录入参 %c',
|
||||
'background: linear-gradient(90deg, #FF6B6B, #4ECDC4); color: white; padding: 5px 10px; border-radius: 5px; font-weight: bold;',
|
||||
'',
|
||||
queryParams.value,
|
||||
)
|
||||
const res = await getQualityInspectionListApi(queryParams.value)
|
||||
|
||||
console.log(
|
||||
'%c🔍 获取安全违章上传记录出参 %c',
|
||||
'background: linear-gradient(90deg, #FF6B6B, #4ECDC4); color: white; padding: 5px 10px; border-radius: 5px; font-weight: bold;',
|
||||
'',
|
||||
res,
|
||||
)
|
||||
|
||||
// 更新总数
|
||||
total.value = res.count
|
||||
// 处理数据
|
||||
if (isTap) {
|
||||
// 点击搜索时，直接替换数据
|
||||
qualityInspectionList.value = res?.data || []
|
||||
// 重置页码
|
||||
queryParams.value.page = 1
|
||||
} else {
|
||||
// 下拉加载时，追加数据
|
||||
if (res.data && res.data.length > 0) {
|
||||
qualityInspectionList.value = [...qualityInspectionList.value, ...res.data]
|
||||
}
|
||||
}
|
||||
|
||||
qualityInspectionList.value.forEach((e) => {
|
||||
e.vioPhotoList = e.vioPhoto?.split(',')
|
||||
})
|
||||
} catch (error) {
|
||||
// 发生错误时重置数据
|
||||
if (isTap) {
|
||||
qualityInspectionList.value = []
|
||||
}
|
||||
}
|
||||
}
|
||||
getQualityInspectionListData()
|
||||
|
||||
// 滚动触底事件
|
||||
const onScrollTolower = debounce(() => {
|
||||
console.log('onScrollTolower')
|
||||
console.log('onScrollTolower', '滚动触底')
|
||||
// 判断是否还有更多数据
|
||||
if (qualityInspectionList.value.length < total.value) {
|
||||
queryParams.value.page++
|
||||
getQualityInspectionListData(false)
|
||||
}
|
||||
}, 500)
|
||||
|
||||
// 判断数据是否加载完毕
|
||||
const finish = computed(() => {
|
||||
if (total.value === qualityInspectionList.value.length) return true
|
||||
})
|
||||
|
||||
// 搜索
|
||||
const onSearchRecord = () => {
|
||||
console.log('onSearchRecord', onSearchKeyword.value)
|
||||
console.log('onSearchRecord', queryParams.value.keyWord)
|
||||
getQualityInspectionListData(true)
|
||||
}
|
||||
// 修改
|
||||
const onHandleEditRecord = () => {
|
||||
const onHandleEditRecord = (id) => {
|
||||
console.log('onHandleEditRecord')
|
||||
uni.redirectTo({
|
||||
url: `/pages/qualityInspection/index?type=2&id=1`, // 强制跳转并传参
|
||||
url: `/pages/qualityInspection/index?type=2&id=${id}`, // 强制跳转并传参
|
||||
})
|
||||
}
|
||||
|
||||
// 查看详情
|
||||
const onHandleViewDetails = () => {
|
||||
const onHandleViewDetails = (id) => {
|
||||
uni.redirectTo({
|
||||
url: `/pages/qualityInspection/index?type=3&id=1`, // 强制跳转并传参
|
||||
url: `/pages/qualityInspection/index?type=3&id=${id}`, // 强制跳转并传参
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -122,6 +178,9 @@ const onHandleViewDetails = () => {
|
|||
const onClickSwiper = (e) => {
|
||||
console.log(e, '点击了轮播图')
|
||||
}
|
||||
|
||||
// 点击返回顶部
|
||||
const onHandleBackTop = () => {}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
|
|
|||
|
|
@ -109,7 +109,12 @@
|
|||
@delete="onDeletePicVrImgList"
|
||||
@afterRead="onAfterReadVrImgList"
|
||||
:fileList="addAndEditModel.vrImgList"
|
||||
:maxCount="props.addAndEditFormType == 3 ? 1 : 9"
|
||||
:deletable="props.addAndEditFormType != 3"
|
||||
:maxCount="
|
||||
props.addAndEditFormType == 3
|
||||
? addAndEditModel.vrImgList.length
|
||||
: 9 - addAndEditModel.vrImgList.length
|
||||
"
|
||||
/>
|
||||
</up-form-item>
|
||||
<TitleTipModal :TitleTip="`整改信息`" />
|
||||
|
|
@ -151,8 +156,13 @@
|
|||
multiple
|
||||
@delete="onDeleteCorrectionImgList"
|
||||
@afterRead="onAfterReadCorrectionImgList"
|
||||
:deletable="props.addAndEditFormType != 3"
|
||||
:fileList="addAndEditModel.correctionImgList"
|
||||
:maxCount="props.addAndEditFormType == 3 ? 1 : 9"
|
||||
:maxCount="
|
||||
props.addAndEditFormType == 3
|
||||
? addAndEditModel.correctionImgList.length
|
||||
: 9 - addAndEditModel.correctionImgList.length
|
||||
"
|
||||
/>
|
||||
</up-form-item>
|
||||
|
||||
|
|
@ -522,16 +532,21 @@ const onAfterReadVrImgList = (event) => {
|
|||
lists.map((item) => {
|
||||
addAndEditModel.vrImgList.push({
|
||||
...item,
|
||||
isEdit: false,
|
||||
})
|
||||
})
|
||||
}
|
||||
// 违章照片删除
|
||||
const onDeletePicVrImgList = (event) => {
|
||||
addAndEditModel.vrImgList.splice(event.index, 1)
|
||||
|
||||
if (props.addAndEditFormType == 2 && addAndEditModel.vrImgList[event.index]?.id) {
|
||||
deleteFileList.push(addAndEditModel.vrImgList[event.index]?.id)
|
||||
if (
|
||||
props.addAndEditFormType == 2 &&
|
||||
addAndEditModel.vrImgList[event.index].id &&
|
||||
addAndEditModel.vrImgList[event.index].idEdit
|
||||
) {
|
||||
deleteFileList.push({ id: addAndEditModel.vrImgList[event.index].id })
|
||||
}
|
||||
|
||||
addAndEditModel.vrImgList.splice(event.index, 1)
|
||||
}
|
||||
|
||||
// 整改照片上传
|
||||
|
|
@ -540,15 +555,21 @@ const onAfterReadCorrectionImgList = (event) => {
|
|||
lists.map((item) => {
|
||||
addAndEditModel.correctionImgList.push({
|
||||
...item,
|
||||
isEdit: false,
|
||||
})
|
||||
})
|
||||
}
|
||||
// 违章照片删除
|
||||
// 整改照片删除
|
||||
const onDeleteCorrectionImgList = (event) => {
|
||||
addAndEditModel.correctionImgList.splice(event.index, 1)
|
||||
if (props.addAndEditFormType == 2 && addAndEditModel.correctionImgList[event.index]?.id) {
|
||||
deleteFileList.push(addAndEditModel.correctionImgList[event.index]?.id)
|
||||
if (
|
||||
props.addAndEditFormType == 2 &&
|
||||
addAndEditModel.correctionImgList[event.index].id &&
|
||||
addAndEditModel.correctionImgList[event.index].idEdit
|
||||
) {
|
||||
deleteFileList.push({ id: addAndEditModel.correctionImgList[event.index]?.id })
|
||||
}
|
||||
|
||||
addAndEditModel.correctionImgList.splice(event.index, 1)
|
||||
}
|
||||
|
||||
// 提交
|
||||
|
|
@ -568,17 +589,35 @@ const onSubmitForm = debounce(() => {
|
|||
let successCorrectionImgListNoEdit = []
|
||||
|
||||
if (addAndEditModel.vrImgList.length > 0) {
|
||||
successVrImgListNoEdit = addAndEditModel.vrImgList.map((e) => !e.isEdit)
|
||||
successVrImgList = await uploadImgFun(successVrImgListNoEdit, 1)
|
||||
successVrImgListNoEdit = addAndEditModel.vrImgList.map((e) => {
|
||||
if (!e.isEdit) {
|
||||
return {
|
||||
...e,
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
if (successVrImgListNoEdit.length > 0) {
|
||||
successVrImgList = await uploadImgFun(successVrImgListNoEdit, 1)
|
||||
}
|
||||
}
|
||||
if (addAndEditModel.correctionImgList.length > 0) {
|
||||
successCorrectionImgListNoEdit = addAndEditModel.correctionImgList.map(
|
||||
(e) => !e.isEdit,
|
||||
)
|
||||
successCorrectionImgList = await uploadImgFun(
|
||||
successCorrectionImgListNoEdit,
|
||||
2,
|
||||
(e) => {
|
||||
if (!e.isEdit) {
|
||||
return {
|
||||
...e,
|
||||
}
|
||||
}
|
||||
},
|
||||
)
|
||||
|
||||
if (successCorrectionImgListNoEdit.length > 0) {
|
||||
successCorrectionImgList = await uploadImgFun(
|
||||
successCorrectionImgListNoEdit,
|
||||
2,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
resolve({ successVrImgList, successCorrectionImgList }) // 上传成功，返回结果
|
||||
|
|
@ -590,6 +629,8 @@ const onSubmitForm = debounce(() => {
|
|||
uploadImages
|
||||
.then(async ({ successVrImgList, successCorrectionImgList }) => {
|
||||
console.log('图片上传成功，开始提交表单...')
|
||||
console.log('successVrImgList', successVrImgList)
|
||||
|
||||
// 这里写提交表单的逻辑
|
||||
// 组装参数
|
||||
const {
|
||||
|
|
@ -627,7 +668,7 @@ const onSubmitForm = debounce(() => {
|
|||
rectTime, //整改时间
|
||||
rectDesc, //整改说明
|
||||
fileList: [...successVrImgList, ...successCorrectionImgList],
|
||||
uploadType: 1,
|
||||
uploadType: 2,
|
||||
}
|
||||
|
||||
const SED_API =
|
||||
|
|
@ -659,11 +700,11 @@ const onSubmitForm = debounce(() => {
|
|||
sendLoading.value = false
|
||||
if (res.code === 200) {
|
||||
uni.$u.toast(res.data)
|
||||
setTimeout(() => {
|
||||
uni.navigateBack({
|
||||
delta: 1,
|
||||
})
|
||||
}, 500)
|
||||
// setTimeout(() => {
|
||||
// uni.navigateBack({
|
||||
// delta: 1,
|
||||
// })
|
||||
// }, 500)
|
||||
} else {
|
||||
uni.$u.toast(res.data)
|
||||
}
|
||||
|
|
@ -708,6 +749,7 @@ const uploadImgFun = async (list, type) => {
|
|||
sendLoading.value = false
|
||||
res = JSON.parse(res.data)
|
||||
|
||||
console.log(res, '上传成功')
|
||||
if (res.code === 200) {
|
||||
successList = res.data
|
||||
resolve(successList) // 上传成功，返回数据
|
||||
|
|
@ -756,7 +798,8 @@ const getFormDetail = async () => {
|
|||
rectPhotoListEdit = rectPhotoList.map((e) => {
|
||||
return {
|
||||
idEdit: true,
|
||||
url: e.url,
|
||||
url: e.originalFilePath,
|
||||
...e,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
@ -764,7 +807,8 @@ const getFormDetail = async () => {
|
|||
vioPhotoListEdit = vioPhotoList.map((e) => {
|
||||
return {
|
||||
idEdit: true,
|
||||
url: e.url,
|
||||
url: e.originalFilePath,
|
||||
...e,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
@ -784,10 +828,12 @@ const getFormDetail = async () => {
|
|||
rectUserName, //整改人
|
||||
rectTime, //整改时间
|
||||
rectDesc, //整改说明
|
||||
vrImgList: vioPhotoList,
|
||||
correctionImgList: rectPhotoList,
|
||||
vrImgList: vioPhotoListEdit,
|
||||
correctionImgList: rectPhotoListEdit,
|
||||
})
|
||||
|
||||
console.log(addAndEditModel, 'addAndEditModel')
|
||||
|
||||
getProcedureData(majorId)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
</view>
|
||||
</view>
|
||||
|
||||
<view class="upload-record-list">
|
||||
<view class="upload-record-list" v-if="safetyViolationsList.length > 0">
|
||||
<up-list ref="upListRef" style="width: 100%" @scrolltolower="onScrollTolower">
|
||||
<up-list-item v-for="item in safetyViolationsList" :key="item.id">
|
||||
<view class="record-item">
|
||||
<view @tap="onHandleViewDetails">
|
||||
<view @tap="onHandleViewDetails(item.id)">
|
||||
<!-- 日期 -->
|
||||
<view class="item-date">
|
||||
<text>{{ item.vioDate }}</text>
|
||||
|
|
@ -69,6 +69,8 @@
|
|||
{{ finish ? '没有更多数据了~' : '正在加载...' }}
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<up-empty mode="data" v-else />
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
|
@ -164,9 +166,9 @@ const onHandleEditRecord = (id) => {
|
|||
}
|
||||
|
||||
// 查看详情
|
||||
const onHandleViewDetails = () => {
|
||||
const onHandleViewDetails = (id) => {
|
||||
uni.redirectTo({
|
||||
url: `/pages/safetyViolations/index?type=3&id=1`, // 强制跳转并传参
|
||||
url: `/pages/safetyViolations/index?type=3&id=${id}`, // 强制跳转并传参
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue