1.18整合
This commit is contained in:
皮
@@ -28,141 +28,154 @@
|
||||
<view class="date-input" @click="show = true">
|
||||
<text :class="selectedDate ? '' : 'text-gray'">{{ selectedDate || '请选择日期' }}</text>
|
||||
</view>
|
||||
<up-calendar :show="show" :mode="mode" @confirm="confirmDate" @close="show = false"></up-calendar>
|
||||
<view class="flex margin-bottom">
|
||||
<view class="text-gray">整改人员</view>
|
||||
<view class="text-red">*</view>
|
||||
<up-datetime-picker hasInput :show="show" v-model="value1" mode="date"></up-datetime-picker>
|
||||
<view class=" margin-bottom margin-top">
|
||||
<!-- <view class="text-gray">整改人员</view>
|
||||
<view class="text-red">*</view> -->
|
||||
<up-select v-model:current="cateId" label="整改人员" :options="cateList" @select="selectItem"></up-select>
|
||||
</view>
|
||||
<up-radio-group v-model="radiovalue1" placement="column" @change="groupChange">
|
||||
<up-radio shape="square" :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1"
|
||||
:key="index" :label="item.name" :name="item.name" @change="radioChange"></up-radio>
|
||||
</up-radio-group>
|
||||
|
||||
<view class="flex margin-bottom">
|
||||
<view class="text-gray">整改图片/视频</view>
|
||||
<view class="text-red">*</view>
|
||||
</view>
|
||||
<up-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="10"></up-upload>
|
||||
<up-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple
|
||||
:maxCount="10"></up-upload>
|
||||
<button class="bg-blue round margin-top-xl" @click="handleSubmit">提交整改</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {ref,reactive} from 'vue'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import {submitRectification} from '@/request/api.js'
|
||||
import { baseUrl, AUTH_TOKEN } from '@/request/request.js'
|
||||
|
||||
import {ref,reactive,onMounted} from 'vue'
|
||||
import {onLoad} from '@dcloudio/uni-app'
|
||||
import {submitRectification,getDepartmentPersonUsers} from '@/request/api.js'
|
||||
import {baseUrl,getToken} from '@/request/request.js'
|
||||
|
||||
// 从页面参数获取的ID
|
||||
const hazardId = ref('');
|
||||
const assignId = ref('');
|
||||
|
||||
|
||||
// 表单数据
|
||||
const formData = reactive({
|
||||
rectifyPlan: '', // 整改方案
|
||||
rectifyResult: '', // 整改完成情况
|
||||
planCost: '', // 投资资金(计划)
|
||||
actualCost: '' // 投资资金(实际)
|
||||
rectifyPlan: '', // 整改方案
|
||||
rectifyResult: '', // 整改完成情况
|
||||
planCost: '', // 投资资金(计划)
|
||||
actualCost: '' // 投资资金(实际)
|
||||
});
|
||||
|
||||
|
||||
const show = ref(false);
|
||||
const mode = ref('single');
|
||||
const value1 = ref(Date.now());
|
||||
const selectedDate = ref('');
|
||||
const radiovalue1 = ref('');
|
||||
|
||||
// 整改人员
|
||||
const cateId = ref('')
|
||||
const cateList = ref([])
|
||||
|
||||
// 基本案列数据
|
||||
const radiolist1 = reactive([{
|
||||
name: '孙致远',
|
||||
disabled: false,
|
||||
},
|
||||
{
|
||||
name: '符友成',
|
||||
disabled: false,
|
||||
},
|
||||
{
|
||||
name: '向彪',
|
||||
disabled: false,
|
||||
},
|
||||
{
|
||||
name: '向纪荣',
|
||||
disabled: false,
|
||||
},
|
||||
]);
|
||||
// 获取部门人员列表
|
||||
const fetchDeptUsers = async () => {
|
||||
try {
|
||||
const res = await getDepartmentPersonUsers();
|
||||
if (res.code === 0 && res.data) {
|
||||
// 将部门下的用户数据扁平化为 up-select 需要的格式
|
||||
const userList = [];
|
||||
res.data.forEach(dept => {
|
||||
if (dept.users && dept.users.length > 0) {
|
||||
dept.users.forEach(user => {
|
||||
userList.push({
|
||||
id: String(user.userId),
|
||||
name: `${user.nickName}（${dept.deptName}）`
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
cateList.value = userList;
|
||||
console.log('整改人员列表:', cateList.value);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取部门人员失败:', error);
|
||||
}
|
||||
};
|
||||
|
||||
// 页面加载时获取人员列表
|
||||
fetchDeptUsers();
|
||||
|
||||
// 上传图片
|
||||
const fileList1 = ref([]);
|
||||
|
||||
|
||||
// 删除图片
|
||||
const deletePic = (event) => {
|
||||
fileList1.value.splice(event.index, 1);
|
||||
fileList1.value.splice(event.index, 1);
|
||||
};
|
||||
|
||||
// 新增图片
|
||||
|
||||
// 新增图】片
|
||||
const afterRead = async (event) => {
|
||||
// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
|
||||
let lists = [].concat(event.file);
|
||||
let fileListLen = fileList1.value.length;
|
||||
lists.map((item) => {
|
||||
fileList1.value.push({
|
||||
...item,
|
||||
status: 'uploading',
|
||||
message: '上传中',
|
||||
});
|
||||
});
|
||||
for (let i = 0; i < lists.length; i++) {
|
||||
const result = await uploadFilePromise(lists[i].url);
|
||||
let item = fileList1.value[fileListLen];
|
||||
fileList1.value.splice(fileListLen, 1, {
|
||||
...item,
|
||||
status: 'success',
|
||||
message: '',
|
||||
url: result,
|
||||
});
|
||||
fileListLen++;
|
||||
}
|
||||
// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
|
||||
let lists = [].concat(event.file);
|
||||
let fileListLen = fileList1.value.length;
|
||||
lists.map((item) => {
|
||||
fileList1.value.push({
|
||||
...item,
|
||||
status: 'uploading',
|
||||
message: '上传中',
|
||||
});
|
||||
});
|
||||
for (let i = 0; i < lists.length; i++) {
|
||||
const result = await uploadFilePromise(lists[i].url);
|
||||
let item = fileList1.value[fileListLen];
|
||||
fileList1.value.splice(fileListLen, 1, {
|
||||
...item,
|
||||
status: 'success',
|
||||
message: '',
|
||||
url: result,
|
||||
});
|
||||
fileListLen++;
|
||||
}
|
||||
};
|
||||
|
||||
// 日期选择确认
|
||||
const confirmDate = (e) => {
|
||||
selectedDate.value = e[0];
|
||||
show.value = false;
|
||||
};
|
||||
|
||||
|
||||
const uploadFilePromise = (filePath) => {
|
||||
return new Promise((resolve, reject) => {
|
||||
uni.uploadFile({
|
||||
url: baseUrl + '/frontend/attachment/upload',
|
||||
filePath: filePath,
|
||||
name: 'file',
|
||||
header: {
|
||||
'Authorization': AUTH_TOKEN
|
||||
},
|
||||
success: (res) => {
|
||||
const data = JSON.parse(res.data);
|
||||
if (data.code === 0) {
|
||||
resolve(data.data);
|
||||
} else {
|
||||
reject(data.msg || '上传失败');
|
||||
}
|
||||
},
|
||||
fail: (err) => {
|
||||
console.error('上传失败:', err);
|
||||
reject(err);
|
||||
}
|
||||
});
|
||||
});
|
||||
return new Promise((resolve, reject) => {
|
||||
uni.uploadFile({
|
||||
url: baseUrl + '/frontend/attachment/upload',
|
||||
filePath: filePath,
|
||||
name: 'file',
|
||||
header: {
|
||||
'Authorization': getToken()
|
||||
},
|
||||
success: (res) => {
|
||||
const data = JSON.parse(res.data);
|
||||
if (data.code === 0) {
|
||||
resolve(data.data);
|
||||
} else {
|
||||
reject(data.msg || '上传失败');
|
||||
}
|
||||
},
|
||||
fail: (err) => {
|
||||
console.error('上传失败:', err);
|
||||
reject(err);
|
||||
}
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
// 提交整改
|
||||
const handleSubmit = async () => {
|
||||
if (!formData.rectifyPlan) {
|
||||
uni.showToast({ title: '请输入整改方案', icon: 'none' });
|
||||
uni.showToast({
|
||||
title: '请输入整改方案',
|
||||
icon: 'none'
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (!formData.rectifyResult) {
|
||||
uni.showToast({ title: '请输入整改完成情况', icon: 'none' });
|
||||
uni.showToast({
|
||||
title: '请输入整改完成情况',
|
||||
icon: 'none'
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// 构建附件列表
|
||||
const attachments = fileList1.value.map(file => {
|
||||
let url = '';
|
||||
@@ -179,7 +192,7 @@
|
||||
fileSize: file.size || 0
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
const params = {
|
||||
hazardId: hazardId.value,
|
||||
assignId: assignId.value,
|
||||
@@ -189,23 +202,32 @@
|
||||
actualCost: Number(formData.actualCost) || 0,
|
||||
attachments: attachments
|
||||
};
|
||||
|
||||
|
||||
try {
|
||||
const res = await submitRectification(params);
|
||||
if (res.code === 0) {
|
||||
uni.showToast({ title: '提交成功', icon: 'success' });
|
||||
uni.showToast({
|
||||
title: '提交成功',
|
||||
icon: 'success'
|
||||
});
|
||||
setTimeout(() => {
|
||||
uni.navigateBack();
|
||||
}, 1500);
|
||||
} else {
|
||||
uni.showToast({ title: res.msg || '提交失败', icon: 'none' });
|
||||
uni.showToast({
|
||||
title: res.msg || '提交失败',
|
||||
icon: 'none'
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('提交整改失败:', error);
|
||||
uni.showToast({ title: '请求失败', icon: 'none' });
|
||||
uni.showToast({
|
||||
title: '请求失败',
|
||||
icon: 'none'
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
onLoad((options) => {
|
||||
if (options.hazardId) {
|
||||
hazardId.value = options.hazardId;
|
||||
@@ -214,6 +236,11 @@
|
||||
assignId.value = options.assignId;
|
||||
}
|
||||
});
|
||||
// 选择整改人员
|
||||
const selectItem = (item) => {
|
||||
console.log('选择的整改人员:', item);
|
||||
cateId.value = item.id;
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@@ -221,14 +248,14 @@
|
||||
min-height: 100vh;
|
||||
background: #EBF2FC;
|
||||
}
|
||||
|
||||
|
||||
.date-input {
|
||||
background: #fff;
|
||||
border-radius: 8rpx;
|
||||
padding: 24rpx 20rpx;
|
||||
margin-bottom: 20rpx;
|
||||
border: 1rpx solid #F6F6F6 ;
|
||||
|
||||
border: 1rpx solid #F6F6F6;
|
||||
|
||||
text {
|
||||
font-size: 28rpx;
|
||||
color: #333;
|
||||
|
||||
Reference in New Issue
Block a user