ykx/jy-safe-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

枚举统一更改

Browse Source
This commit is contained in:
yunkexin 2026-03-11 14:39:29 +08:00
parent 7446923eb0
commit 6fbec55fd3
53 changed files with 1126 additions and 2604 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
pages/apply/subPages/FO/2currentClassRecordEdit.vue
View File

@ -109,7 +109,8 @@
extendRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
getRequest,
@ -117,7 +118,8 @@
import config from '../../../../config/common'
import {
getEnum,
getUserLists
getUserLists,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
@ -241,45 +243,18 @@
}
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
changeSwitch(e) {
this.model.IS_HANDOVER = e;

54
pages/apply/subPages/FO/jobFireEdit.vue
View File

@ -219,7 +219,8 @@
extendIgnoreDataRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -250,7 +251,8 @@
import stepTitle from '@/components/custom/step-title.vue'
import swipeActionItem from '../../../../uni_modules/uview-ui/libs/config/props/swipeActionItem';
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -401,45 +403,17 @@
this.fetchEnums(['SKEvaluateLevelEnum', 'FOJobStepEnum']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
if (this.ID == undefined || this.ID == '') {

53
pages/apply/subPages/FO/jobFireShow.vue
View File

@ -270,7 +270,8 @@
import {
initFilter,
extendRule,
extendInclude
extendInclude,
transformData
} from '../../../../utils/common'
import {
@ -281,7 +282,8 @@
import color from '../../../../uni_modules/uview-ui/libs/config/color'
import config from '../../../../config/common'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
@ -366,46 +368,19 @@
this.fetchEnums(['HMOperationTaskAuditEnum', 'SKEvaluateLevelEnum', 'FOJobStepEnum', 'FOYesOrNoEnum']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.enumsText = newd[1]
this.loadData();
this.loadAuditData()
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
}
})
},
loadData() {
const orgId = uni.getStorageSync('orgId')

55
pages/apply/subPages/FO/jobFireTenEdit.vue
View File

@ -150,7 +150,8 @@
extendIgnoreDataRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -181,7 +182,8 @@
import stepTitle from '@/components/custom/step-title.vue'
import swipeActionItem from '../../../../uni_modules/uview-ui/libs/config/props/swipeActionItem';
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -335,45 +337,18 @@
this.fetchEnums(['FOYesOrNoEnum', 'FOJobStepEnum']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
if (this.ID == undefined || this.ID == '') {

54
pages/apply/subPages/FO/jobFireTwoEdit.vue
View File

@ -112,7 +112,8 @@
extendIgnoreDataRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -143,7 +144,8 @@
import stepTitle from '@/components/custom/step-title.vue'
import swipeActionItem from '../../../../uni_modules/uview-ui/libs/config/props/swipeActionItem';
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -294,45 +296,17 @@
this.fetchEnums(['SKEvaluateLevelEnum', 'FOJobStepEnum', 'FOYesOrNoEnum']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
if (this.ID == undefined || this.ID == '') {

60
pages/apply/subPages/HM/3hazardTaskList.vue
View File

@ -6,8 +6,7 @@
<text>{{dateFilterTxt}}</text>
<u-icon size="14" style="margin-left: 4px;" name="arrow-down"></u-icon>
</view>
<uni-search-bar class="search-bar" radius="100" :value="keyword" @confirm="handleSearch"
@cancel="handleCancelSearch" @clear="handleCancelSearch" placeholder="搜索"></uni-search-bar>
<uni-search-bar class="search-bar" radius="100" :value="keyword" @confirm="handleSearch" @cancel="handleCancelSearch" @clear="handleCancelSearch" placeholder="搜索"></uni-search-bar>
<view class="filter filter-status" @click="handleShowPicker({title: '状态', name: 'status'})">
<text>{{statusFilterTxt}}</text>
<u-icon size="14" style="margin-left: 4px;" name="arrow-down"></u-icon>
@ -34,8 +33,7 @@
</u-empty>
</view>
</view>
<u-picker :show="comPickerInfo.showPicker" :columns="comPickerInfo.columns" @confirm="onConfirmPicker"
:defaultIndex="[0]" @cancel="closePicker"></u-picker>
<u-picker :show="comPickerInfo.showPicker" :columns="comPickerInfo.columns" @confirm="onConfirmPicker" :defaultIndex="[0]" @cancel="closePicker"></u-picker>
</view>
</template>
@ -46,10 +44,12 @@
import {
extendInclude,
extendRule,
initFilter
initFilter,
transformData
} from '../../../../utils/common'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
@ -85,45 +85,17 @@
handleCancelSearch() {
this.keyword = ''
},
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
const orgId = uni.getStorageSync('orgId')

54
pages/apply/subPages/SE/11safeSurveyList.vue
View File

@ -59,10 +59,12 @@
import {
extendInclude,
extendRule,
initFilter
initFilter,
transformData
} from '../../../../utils/common'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
@ -90,45 +92,17 @@
this.fetchEnums(['SESafeSurveyStatus']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
handleSearch(obj) {
this.keyword = obj.value

54
pages/apply/subPages/SE/12trainSurveyList.vue
View File

@ -59,10 +59,12 @@
import {
extendInclude,
extendRule,
initFilter
initFilter,
transformData
} from '../../../../utils/common'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
@ -90,45 +92,17 @@
this.fetchEnums(['SETrainSurveyStatus']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
handleSearch(obj) {
this.keyword = obj.value

166
pages/apply/subPages/SE/1trainNotifyEdit.vue
View File

@ -3,90 +3,66 @@
<view class="card">
<view class="background"></view>
<view>
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="model" :rules="rules"
ref="wForm" errorType="border-bottom" class="demo-ruleForm">
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="model" :rules="rules" ref="wForm" errorType="border-bottom" class="demo-ruleForm">
<u-form-item required label="培训名称" prop="NAME" borderBottom>
<u--input v-model="model.NAME" border="none" slot="right" inputAlign="right" fontSize="14px"
placeholder="请输入培训名称"></u--input>
<u--input v-model="model.NAME" border="none" slot="right" inputAlign="right" fontSize="14px" placeholder="请输入培训名称"></u--input>
</u-form-item>
<u-form-item required label="培训类型" prop="Nav_TrainType.NAME" borderBottom
@click="handleChange('Nav_TrainType','')">
<u--input v-if="model.Nav_TrainType" v-model="model.Nav_TrainType.NAME" placeholder="请选择培训类型"
border="none" inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
<u-form-item required label="培训类型" prop="Nav_TrainType.NAME" borderBottom @click="handleChange('Nav_TrainType','')">
<u--input v-if="model.Nav_TrainType" v-model="model.Nav_TrainType.NAME" placeholder="请选择培训类型" border="none" inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
</u-icon>
</u-form-item>
<u-form-item label="培训性质" prop="IN_OUT_SHOW" borderBottom
@click="handleShowSheet({title: '培训性质', name: 'TrainInOut'})">
<u--input :value="model.IN_OUT_SHOW" placeholder="请选择培训性质" border="none" inputAlign="right"
disabled disabledColor="#fff" fontSize="14px"></u--input>
<u-form-item label="培训性质" prop="IN_OUT_SHOW" borderBottom @click="handleShowSheet({title: '培训性质', name: 'TrainInOut'})">
<u--input :value="model.IN_OUT_SHOW" placeholder="请选择培训性质" border="none" inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12"></u-icon>
</u-form-item>
<u-form-item required label="培训级别" prop="LEVEL_SHOW" borderBottom
@click="handleShowSheet({title: '层级', name: 'FMDepartmentType'})">
<u--input :value="model.LEVEL_SHOW" placeholder="请选择层级" border="none" inputAlign="right"
disabled disabledColor="#fff" fontSize="14px"></u--input>
<u-form-item required label="培训级别" prop="LEVEL_SHOW" borderBottom @click="handleShowSheet({title: '层级', name: 'FMDepartmentType'})">
<u--input :value="model.LEVEL_SHOW" placeholder="请选择层级" border="none" inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12"></u-icon>
</u-form-item>
<u-form-item label="开始时间" required prop="TRAIN_START_TIME" borderBottom
@click="showCheckDate({ name: 'TRAIN_START_TIME'})">
<u--input disabledColor="#fff" v-model="model.TRAIN_START_TIME" disabled placeholder="请选择开始时间"
suffixIcon="arrow-down" suffixIconStyle="font-size:12px" fontSize="14px" border="none"
<u-form-item label="开始时间" required prop="TRAIN_START_TIME" borderBottom @click="showCheckDate({ name: 'TRAIN_START_TIME'})">
<u--input disabledColor="#fff" v-model="model.TRAIN_START_TIME" disabled placeholder="请选择开始时间" suffixIcon="arrow-down" suffixIconStyle="font-size:12px" fontSize="14px" border="none"
customStyle="margin:0px;display:flex;padding:3px 0px" inputAlign="right">
</u--input>
</u-form-item>
<u-form-item label="结束时间" required prop="TRAIN_END_TIME" borderBottom
@click="showCheckDate({name: 'TRAIN_END_TIME'})">
<u--input disabledColor="#fff" v-model="model.TRAIN_END_TIME" disabled placeholder="请选择结束时间"
suffixIcon="arrow-down" suffixIconStyle="font-size:12px" fontSize="14px" border="none"
<u-form-item label="结束时间" required prop="TRAIN_END_TIME" borderBottom @click="showCheckDate({name: 'TRAIN_END_TIME'})">
<u--input disabledColor="#fff" v-model="model.TRAIN_END_TIME" disabled placeholder="请选择结束时间" suffixIcon="arrow-down" suffixIconStyle="font-size:12px" fontSize="14px" border="none"
inputAlign="right" customStyle="margin:0px;display:flex;padding:3px 0px">
</u--input>
</u-form-item>
<u-form-item required label="培训地点" prop="TRAIN_ADDR" borderBottom>
<u--input v-model="model.TRAIN_ADDR" border="none" slot="right" inputAlign="right"
fontSize="14px" placeholder="请填写培训地点"></u--input>
<u--input v-model="model.TRAIN_ADDR" border="none" slot="right" inputAlign="right" fontSize="14px" placeholder="请填写培训地点"></u--input>
</u-form-item>
<u-form-item required label="培训学时" prop="HOURS" borderBottom>
<u--input v-model="model.HOURS" type="number" border="none" slot="right" placeholder="请填写培训学时"
inputAlign="right" fontSize="14px"></u--input>
<u--input v-model="model.HOURS" type="number" border="none" slot="right" placeholder="请填写培训学时" inputAlign="right" fontSize="14px"></u--input>
</u-form-item>
<u-form-item required label="培训老师" prop="Nav_UserTeacher.NAME" borderBottom
@click="handleChange('Nav_UserTeacher','')">
<u--input v-model="(model.Nav_UserTeacher||{}).NAME" border="none" placeholder="请选择培训老师"
inputAlign="right" fontSize="14px"></u--input>
<u-form-item required label="培训老师" prop="Nav_UserTeacher.NAME" borderBottom @click="handleChange('Nav_UserTeacher','')">
<u--input v-model="(model.Nav_UserTeacher||{}).NAME" border="none" placeholder="请选择培训老师" inputAlign="right" fontSize="14px"></u--input>
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
</u-icon>
</u-form-item>
<u-form-item required label="培训形式" prop="TRAINTYPE_SHOW" borderBottom
@click="handleShowSheet({title: '培训形式', name: 'TrainType'})">
<u--input v-model="model.TRAINTYPE_SHOW" placeholder="请选择培训形式" border="none" inputAlign="right"
disabled disabledColor="#fff" fontSize="14px"></u--input>
<u-form-item required label="培训形式" prop="TRAINTYPE_SHOW" borderBottom @click="handleShowSheet({title: '培训形式', name: 'TrainType'})">
<u--input v-model="model.TRAINTYPE_SHOW" placeholder="请选择培训形式" border="none" inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12"></u-icon>
</u-form-item>
<u-form-item required label="考核方式" prop="CHECKTYPE_SHOW" borderBottom
@click="handleShowSheet({title: '培训形式', name: 'PlanCheckType'})">
<u--input v-model="model.CHECKTYPE_SHOW" placeholder="请选择考核方式" border="none" inputAlign="right"
disabled disabledColor="#fff" fontSize="14px"></u--input>
<u-form-item required label="考核方式" prop="CHECKTYPE_SHOW" borderBottom @click="handleShowSheet({title: '培训形式', name: 'PlanCheckType'})">
<u--input v-model="model.CHECKTYPE_SHOW" placeholder="请选择考核方式" border="none" inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
</u-icon>
</u-form-item>
<u-form-item class="custom-form-item" label="培训课件" prop="DetailPost" borderBottom
@click="handleQuerySelect({ formIndex: 'Nav_ListCour', isMultiple: true})">
<u-form-item class="custom-form-item" label="培训课件" prop="DetailPost" borderBottom @click="handleQuerySelect({ formIndex: 'Nav_ListCour', isMultiple: true})">
<view slot="right" class="custom-form-item-right">
<view class="multi">
<u--text v-for="(i, k) in model.Nav_ListCour" :key="k" class="item"
:text="k + 1 + '. ' + i.Nav_Cour.NAME" :size="14"></u--text>
<u--text v-for="(i, k) in model.Nav_ListCour" :key="k" class="item" :text="k + 1 + '. ' + i.Nav_Cour.NAME" :size="14"></u--text>
</view>
<u-icon class="icon" name="arrow-down" size="12">
</u-icon>
</view>
</u-form-item>
<u-form-item class="custom-form-item" label="培训内容" prop="DetailPost" borderBottom
@click="handleQuerySelect({ formIndex: 'Nav_TrainContentList', isMultiple: true})">
<u-form-item class="custom-form-item" label="培训内容" prop="DetailPost" borderBottom @click="handleQuerySelect({ formIndex: 'Nav_TrainContentList', isMultiple: true})">
<view slot="right" class="custom-form-item-right">
<view class="multi">
<u--text v-for="(i, k) in model.Nav_TrainContentList" :key="k" class="item"
:text="k + 1 + '. ' + i.Nav_Point.NAME" :size="14"></u--text>
<u--text v-for="(i, k) in model.Nav_TrainContentList" :key="k" class="item" :text="k + 1 + '. ' + i.Nav_Point.NAME" :size="14"></u--text>
</view>
<u-icon class="icon" name="arrow-down" size="12">
</u-icon>
@ -95,56 +71,41 @@
<u-form-item label="培训安排及要求" prop="TRAIN_PLAN" borderBottom>
</u-form-item>
<u--textarea required v-model="model.TRAIN_PLAN" border="surround"></u--textarea>
<u-form-item label="是否需要培训效果评估" prop="NEED_EVALUATION" borderBottom
@click="handleShowSheet({title: '是否需要培训效果评估', name: 'SETrainNeedSuvey'})">
<u--input :value="model.NEED_EVALUATION_SHOW" placeholder="请选择" border="none" inputAlign="right"
disabled disabledColor="#fff"></u--input>
<u-form-item label="是否需要培训效果评估" prop="NEED_EVALUATION" borderBottom @click="handleShowSheet({title: '是否需要培训效果评估', name: 'SETrainNeedSuvey'})">
<u--input :value="model.NEED_EVALUATION_SHOW" placeholder="请选择" border="none" inputAlign="right" disabled disabledColor="#fff"></u--input>
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12"></u-icon>
</u-form-item>
<u-form-item label="是否触发培训记录" prop="CREATE_NOTIFY_RECORD" borderBottom>
<u-switch inactiveColor="rgb(230, 230, 230)" size="24" space="4"
v-model="model.CREATE_NOTIFY_RECORD" @change="changeSwitch" border="none" slot="right"
inputAlign="right"></u-switch>
<u-switch inactiveColor="rgb(230, 230, 230)" size="24" space="4" v-model="model.CREATE_NOTIFY_RECORD" @change="changeSwitch" border="none" slot="right" inputAlign="right"></u-switch>
</u-form-item>
<u-form-item required label="记录人员" prop="Nav_RecordUser.NAME" borderBottom
@click="handleChange('Nav_RecordUser','')">
<u--input v-if="model.Nav_RecordUser" v-model="model.Nav_RecordUser.NAME" placeholder="记录人员"
border="none" inputAlign="right" disabled disabledColor="#fff"></u--input>
<u-form-item required label="记录人员" prop="Nav_RecordUser.NAME" borderBottom @click="handleChange('Nav_RecordUser','')">
<u--input v-if="model.Nav_RecordUser" v-model="model.Nav_RecordUser.NAME" placeholder="记录人员" border="none" inputAlign="right" disabled disabledColor="#fff"></u--input>
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
</u-icon>
</u-form-item>
<view class="upload-title">附件</view>
<full-upload v-model="model.Nav_Files" :isShowBtn='true' :listProp='listPropUpload'
:listPropVal='listPropValUpload'></full-upload>
<full-upload v-model="model.Nav_Files" :isShowBtn='true' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
<u-form-item required label="培训人员">
<u-icon name="man-add" @click="handleShowUserSelector()" size="24" color="#3d9cff"
slot="right"></u-icon>
<u-icon name="man-add" @click="handleShowUserSelector()" size="24" color="#3d9cff" slot="right"></u-icon>
</u-form-item>
<!-- <view v-show="!!model.Nav_TrainUserList.length" class="tag-view">
<uni-tag class="tag" v-for="(i, k) in model.Nav_TrainUserList.filter(i => !i.IS_DELETED)"
:key="k" :inverted="true" :text="i.NAME" type="primary" />
</view> -->
<view v-show="!!model.Nav_TrainUserList.length" class="tag-view">
<uni-tag class="tag" v-for="(i, k) in model.Nav_TrainUserList.filter(i => !i.IS_DELETED)"
:key="k" :inverted="true" :text="i.Nav_User.NAME" type="primary" />
<uni-tag class="tag" v-for="(i, k) in model.Nav_TrainUserList.filter(i => !i.IS_DELETED)" :key="k" :inverted="true" :text="i.Nav_User.NAME" type="primary" />
</view>
</u--form>
</view>
</view>
<query-selector :show="showPopup" :lists="Lists" @close="handleClosePopup" @search="handleSearch"
@select="handleSelected" />
<u-picker :show="comPickerInfo.showSheet" :columns="comPickerInfo.columns" @confirm="onConfirmPicker"
:defaultIndex="[0]" @close="closePicker" @cancel="closePicker" keyName="NAME"></u-picker>
<query-selector :show="showPopup" :lists="Lists" @close="handleClosePopup" @search="handleSearch" @select="handleSelected" />
<u-picker :show="comPickerInfo.showSheet" :columns="comPickerInfo.columns" @confirm="onConfirmPicker" :defaultIndex="[0]" @close="closePicker" @cancel="closePicker" keyName="NAME"></u-picker>
<view class="bottom-button">
</view>
<u-datetime-picker :show="dateTimePickerInfo.showCheckDate" mode="datetime"
v-model='dateTimePickerInfo.defaultDateTime' :formatter="formatter" @confirm="handleCheckDate"
@close="dateTimePickerInfo.showCheckDate = false;"
@cancel="dateTimePickerInfo.showCheckDate = false;"></u-datetime-picker>
<query-selector :multiple="qsCom.isMultiple" :total="curTotal" :show="qsCom.show" :lists="qsCom.lists"
@close="onCloseQS" @search="onSearchQS" @select="onSelectedQS" :defaultChecked="qsCom.defaultChecked" />
<people-selector :defaultChecked="peopleSelectOption.defaultChecked" :show="peopleSelectOption.showSelector"
@select="handleSelectorPeople" @close="peopleSelectOption.showSelector = false">
<u-datetime-picker :show="dateTimePickerInfo.showCheckDate" mode="datetime" v-model='dateTimePickerInfo.defaultDateTime' :formatter="formatter" @confirm="handleCheckDate"
@close="dateTimePickerInfo.showCheckDate = false;" @cancel="dateTimePickerInfo.showCheckDate = false;"></u-datetime-picker>
<query-selector :multiple="qsCom.isMultiple" :total="curTotal" :show="qsCom.show" :lists="qsCom.lists" @close="onCloseQS" @search="onSearchQS" @select="onSelectedQS" :defaultChecked="qsCom.defaultChecked" />
<people-selector :defaultChecked="peopleSelectOption.defaultChecked" :show="peopleSelectOption.showSelector" @select="handleSelectorPeople" @close="peopleSelectOption.showSelector = false">
</people-selector>
<view class="bottom-button">
<u-button type="primary" @click="submit" color="#3d4b70">提交</u-button>
@ -161,13 +122,15 @@
extendRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
getRequest,
} from '../../../../services/apply/FOServices/FOServices';
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
data() {
@ -305,37 +268,16 @@
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
fetchEnums(enumNames) {
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.enumsText = newd[1]
if (this.isAdd != 1) {
this.loadData();
} else {
@ -345,13 +287,7 @@
this.model.IN_OUT_SHOW = this.enumsData['TrainInOut'][0].name
this.model.IN_OUT = this.enumsData['TrainInOut'][0].code
}
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
}
})
},
changeSwitch(e) {
this.model.CREATE_NOTIFY_RECORD = e;

54
pages/apply/subPages/SE/1trainNotifyList.vue
View File

@ -62,10 +62,12 @@
import {
extendInclude,
extendRule,
initFilter
initFilter,
transformData
} from '../../../../utils/common'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
@ -93,45 +95,17 @@
this.fetchEnums(['SETrainNotifyStatus', 'PlanCheckType']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
handleSearch(obj) {
this.keyword = obj.value

109
pages/apply/subPages/SE/1trainNotifyShow.vue
View File

@ -3,64 +3,48 @@
<view class="card">
<view class="background"></view>
<view>
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="model"
class="demo-ruleForm">
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="model" class="demo-ruleForm">
<u-form-item label="培训名称：" prop="NAME" borderBottom>
<u--input v-model="model.NAME" border="none" slot="right" inputAlign="right" disabled
disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-model="model.NAME" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="编号：" prop="CODE" borderBottom>
<u--input v-model="model.CODE" border="none" slot="right" inputAlign="right" disabled
disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-model="model.CODE" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="发起时间：" prop="LAUNCH_TIME" borderBottom>
<u--input v-model="model.LAUNCH_TIME" border="none" slot="right" inputAlign="right" disabled
disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-model="model.LAUNCH_TIME" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="发起部门：" prop="Nav_LaunchDepartment.NAME" borderBottom>
<u--input v-if="model.Nav_LaunchDepartment" v-model="model.Nav_LaunchDepartment.NAME"
border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff"
fontSize="14px"></u--input>
<u--input v-if="model.Nav_LaunchDepartment" v-model="model.Nav_LaunchDepartment.NAME" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="发起人员：" prop="Nav_LaunchUser.NAME" borderBottom>
<u--input v-if="model.Nav_LaunchUser" v-model="model.Nav_LaunchUser.NAME" border="none"
slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-if="model.Nav_LaunchUser" v-model="model.Nav_LaunchUser.NAME" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="培训类型：" prop="Nav_LaunchUser.NAME" borderBottom>
<u--input v-if="model.Nav_TrainType" v-model="model.Nav_TrainType.NAME" border="none"
slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-if="model.Nav_TrainType" v-model="model.Nav_TrainType.NAME" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="培训级别：" prop="LEVEL" borderBottom>
<u--input v-model="model.LEVEL_SHOW" border="none" slot="right" inputAlign="right" disabled
disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-model="model.LEVEL_SHOW" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="开始时间：" prop="TRAIN_START_TIME" borderBottom>
<u--input v-model="model.TRAIN_START_TIME" border="none" inputAlign="right" disabled
disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-model="model.TRAIN_START_TIME" border="none" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="结束时间：" prop="TRAIN_END_TIME" borderBottom>
<u--input v-model="model.TRAIN_END_TIME" border="none" inputAlign="right" disabled
disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-model="model.TRAIN_END_TIME" border="none" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="培训地点：" prop="TRAIN_ADDR" borderBottom>
<u--input v-model="model.TRAIN_ADDR" border="none" slot="right" inputAlign="right" disabled
disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-model="model.TRAIN_ADDR" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="培训学时：" prop="HOURS" borderBottom>
<u--input v-model="model.HOURS" border="none" slot="right" inputAlign="right" disabled
disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-model="model.HOURS" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="培训老师：" prop="TRAIN_TEACHER" borderBottom>
<u--input v-model="(model.Nav_UserTeacher||{}).NAME" border="none" slot="right"
inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-model="(model.Nav_UserTeacher||{}).NAME" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="培训形式：" prop="" borderBottom>
<u--input v-model="model.TRAINTYPE_SHOW" border="none" inputAlign="right" disabled
disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-model="model.TRAINTYPE_SHOW" border="none" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="考核方式：" prop="Nav_TrainCheckType.NAME" borderBottom>
<u--input v-model="model.CHECKTYPE_SHOW" border="none" slot="right" inputAlign="right" disabled
disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-model="model.CHECKTYPE_SHOW" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="培训课件：" prop='model.Nav_ListCour_Show' borderBottom>
</u-form-item>
@ -75,8 +59,7 @@
</u-form-item>
<rich-text v-html="model.users" border="none" disabled style="font-size: 14px;"></rich-text>
<view class="upload-title">附件</view>
<full-upload v-model="model.Nav_Files" :listProp='listPropUpload' :listPropVal='listPropValUpload'
:isShowBtn="false"></full-upload>
<full-upload v-model="model.Nav_Files" :listProp='listPropUpload' :listPropVal='listPropValUpload' :isShowBtn="false"></full-upload>
</u--form>
</view>
@ -87,10 +70,8 @@
<u--textarea height='3em' v-model="LEAVE_REASON" placeholder="请输入请假理由"></u--textarea>
</view>
<view class="buttons">
<u-button type="primary" color="#3d4b70" class="btn first-btn" @click="onChargeUserAgree(1)"
text="参加"></u-button>
<u-button color="#3d4b70" :plain="true" type="warning" @click="onChargeUserAgree(2)"
text="请假"></u-button>
<u-button type="primary" color="#3d4b70" class="btn first-btn" @click="onChargeUserAgree(1)" text="参加"></u-button>
<u-button color="#3d4b70" :plain="true" type="warning" @click="onChargeUserAgree(2)" text="请假"></u-button>
</view>
</view>
</u--form>
@ -104,7 +85,8 @@
initFilter,
extendRule,
extendInclude,
getArryPropShow
getArryPropShow,
transformData
} from '../../../../utils/common'
import {
getRequest,
@ -113,7 +95,8 @@
import color from '../../../../uni_modules/uview-ui/libs/config/color'
import config from '../../../../config/common'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
data() {
@ -139,45 +122,17 @@
this.fetchEnums(['TrainType', 'PlanCheckType', 'FMDepartmentType', 'TrainInOut', 'SETrainNeedSuvey']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
const json = initFilter(this.orgId, "", "CODE", 1)

160
pages/apply/subPages/SE/2trainRecordEdit.vue
View File

@ -3,61 +3,44 @@
<view class="card">
<view class="background"></view>
<view>
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="model" :rules="rules"
ref="wForm" errorType="border-bottom" class="demo-ruleForm">
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="model" :rules="rules" ref="wForm" errorType="border-bottom" class="demo-ruleForm">
<u-form-item required label="培训名称：" prop="Nav_Notify.NAME" borderBottom>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.NAME" border="none" slot="right"
inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.NAME" border="none" slot="right" inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="培训类型：" prop="Nav_TrainType.NAME" borderBottom>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.Nav_TrainType.NAME"
placeholder="培训类型" border="none" inputAlign="right" disabled disabledColor="#fff"
fontSize="14px"></u--input>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.Nav_TrainType.NAME" placeholder="培训类型" border="none" inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
</u-icon>
</u-form-item>
<u-form-item label="培训级别：" prop="LEVEL" borderBottom>
<u--input v-if="model.Nav_Notify" :value="model.Nav_Notify.LEVEL_SHOW" border="none"
inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
<u--input v-if="model.Nav_Notify" :value="model.Nav_Notify.LEVEL_SHOW" border="none" inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="组织部门：" prop="LEVEL" borderBottom>
<u--input v-if="model.Nav_Notify" :value="model.Nav_Notify.Nav_LaunchDepartment.NAME"
border="none" inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
<u--input v-if="model.Nav_Notify" :value="model.Nav_Notify.Nav_LaunchDepartment.NAME" border="none" inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="开始时间" required prop="Nav_Notify.TRAIN_START_TIME"
@click="showCheckDate({ name: 'TRAIN_START_TIME'})" borderBottom>
<u--input v-if="model.Nav_Notify" disabledColor="#fff"
v-model="model.Nav_Notify.TRAIN_START_TIME" disabled placeholder="请选择开始时间"
suffixIcon="arrow-down" suffixIconStyle="font-size:12px" fontSize="14px" border="none"
customStyle="margin:0px;display:flex;padding:3px 0px" inputAlign="right">
<u-form-item label="开始时间" required prop="Nav_Notify.TRAIN_START_TIME" @click="showCheckDate({ name: 'TRAIN_START_TIME'})" borderBottom>
<u--input v-if="model.Nav_Notify" disabledColor="#fff" v-model="model.Nav_Notify.TRAIN_START_TIME" disabled placeholder="请选择开始时间" suffixIcon="arrow-down" suffixIconStyle="font-size:12px"
fontSize="14px" border="none" customStyle="margin:0px;display:flex;padding:3px 0px" inputAlign="right">
</u--input>
</u-form-item>
<u-form-item label="结束时间" required prop="Nav_Notify.TRAIN_END_TIME"
@click="showCheckDate({name: 'TRAIN_END_TIME'})" borderBottom>
<u--input v-if="model.Nav_Notify" disabledColor="#fff" v-model="model.Nav_Notify.TRAIN_END_TIME"
border="none" disabled placeholder="请选择结束时间" suffixIcon="arrow-down"
suffixIconStyle="font-size:12px" fontSize="14px"
customStyle="margin:0px;display:flex;padding:3px 0px" inputAlign="right">
<u-form-item label="结束时间" required prop="Nav_Notify.TRAIN_END_TIME" @click="showCheckDate({name: 'TRAIN_END_TIME'})" borderBottom>
<u--input v-if="model.Nav_Notify" disabledColor="#fff" v-model="model.Nav_Notify.TRAIN_END_TIME" border="none" disabled placeholder="请选择结束时间" suffixIcon="arrow-down"
suffixIconStyle="font-size:12px" fontSize="14px" customStyle="margin:0px;display:flex;padding:3px 0px" inputAlign="right">
</u--input>
</u-form-item>
<u-form-item label="培训地点：" prop="TRAIN_ADDR" borderBottom>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.TRAIN_ADDR" border="none"
slot="right" inputAlign="right" fontSize="14px"></u--input>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.TRAIN_ADDR" border="none" slot="right" inputAlign="right" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="培训学时：" prop="HOURS" borderBottom>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.HOURS" type="number" border="none"
slot="right" inputAlign="right" fontSize="14px"></u--input>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.HOURS" type="number" border="none" slot="right" inputAlign="right" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="培训老师：" prop="TRAIN_TEACHER" borderBottom>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.TRAIN_TEACHER" border="none"
slot="right" inputAlign="right" fontSize="14px"></u--input>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.TRAIN_TEACHER" border="none" slot="right" inputAlign="right" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="培训形式：" prop="TRAIN_MODEL" borderBottom>
<u--input v-if="model.Nav_Notify" :value="model.Nav_Notify.TRAINTYPE_SHOW" border="none"
inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
<u--input v-if="model.Nav_Notify" :value="model.Nav_Notify.TRAINTYPE_SHOW" border="none" inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="考核方式：" prop="Nav_TrainCheckType.NAME" borderBottom>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.CHECKTYPE_SHOW" border="none"
inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.CHECKTYPE_SHOW" border="none" inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item class="custom-form-item" label="培训课件：" prop="Nav_ListCour_Show" :borderBottom="false">
</u-form-item>
@ -66,58 +49,45 @@
</u-form-item>
<u-textarea v-html="model.Nav_TrainContentList_SHOW" style="font-size: 14px;"></u-textarea>
<view class="upload-title">附件：</view>
<full-upload v-model="model.Nav_Files" :isShowBtn='true' :listProp='listPropUpload'
:listPropVal='listPropValUpload'></full-upload>
<full-upload v-model="model.Nav_Files" :isShowBtn='true' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
</u--form>
</view>
</view>
<u-sticky offset-top="20">
<view class="sub-form">
<view class="sub-form-wrap">
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" errorType="border-bottom"
ref="sForm">
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" errorType="border-bottom" ref="sForm">
<!-- 线上考核 只有参与与否是可以编辑的
线下考核 需要填写 是否合格 成绩 考卷等 -->
<view v-if="model.Nav_Notify.CHECKTYPE==56||model.Nav_Notify.CHECKTYPE==81"
style="margin-bottom: 16px;" v-for="(item, index) in model.Nav_Users">
<view v-if="model.Nav_Notify.CHECKTYPE==56||model.Nav_Notify.CHECKTYPE==81" style="margin-bottom: 16px;" v-for="(item, index) in model.Nav_Users">
<!-- 状态 STATUS SETrainRecordUserStatusEnum 考核结果 EXAMINATION_RESULTS SEExaminationResultsEnum 分数 SCORE 附件 Nav_Files -->
<!-- 参与 = 0, 请假 = 1, 缺席 = 2, item.Nav_User.STATUS==1?'请假':(item.Nav_User.STATUS==2:'缺席':'参与')-->
<uni-card style="margin-bottom: 16px;" margin="0" spacing="0" :is-shadow="false">
<uni-collapse-item :title="(index+1)+'. '+ item.Nav_User.NAME +'（'+item.STATUS_SHOW+'）'"
name="1">
<u-form-item required label="参加状态" prop="STATUS" borderBottom
@click="handleShowSheet({title: '参加状态选择', name: 'STATUS',itemData:item})">
<u--input v-model="item.STATUS_SHOW" placeholder="请选择参加状态" border="none"
inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
<uni-collapse-item :title="(index+1)+'. '+ item.Nav_User.NAME +'（'+item.STATUS_SHOW+'）'" name="1">
<u-form-item required label="参加状态" prop="STATUS" borderBottom @click="handleShowSheet({title: '参加状态选择', name: 'STATUS',itemData:item})">
<u--input v-model="item.STATUS_SHOW" placeholder="请选择参加状态" border="none" inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
</u-icon>
</u-form-item>
<u-form-item required label="考核结果" prop="EXAMINATION_RESULTS" borderBottom
@click="handleShowSheet({title: '考核结果选择', name: 'EXAMINATION_RESULTS',itemData:item})">
<u--input v-model="item.EXAMINATION_RESULTS_SHOW" placeholder="请选择考核结果"
border="none" inputAlign="right" disabled disabledColor="#fff"
fontSize="14px"></u--input>
<u-form-item required label="考核结果" prop="EXAMINATION_RESULTS" borderBottom @click="handleShowSheet({title: '考核结果选择', name: 'EXAMINATION_RESULTS',itemData:item})">
<u--input v-model="item.EXAMINATION_RESULTS_SHOW" placeholder="请选择考核结果" border="none" inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
</u-icon>
</u-form-item>
<u-form-item label="分数" prop="SCORE" borderBottom>
<u--input disabledColor="#fff" v-model="item.SCORE" border="none"
inputAlign="right"></u--input>
<u--input disabledColor="#fff" v-model="item.SCORE" border="none" inputAlign="right"></u--input>
</u-form-item>
<view class="upload-title">附件：</view>
<full-upload v-model="item.Nav_Files" :isShowBtn='true'
:listProp='listSubPropUpload'
:listPropVal='item.listSubPropValUpload'></full-upload>
<full-upload v-model="item.Nav_Files" :isShowBtn='true' :listProp='listSubPropUpload' :listPropVal='item.listSubPropValUpload'></full-upload>
</uni-collapse-item>
</uni-card>
</view>
<uni-collapse v-else :border="false" accordion>
<u-form-item :label="(index+1)+'. '+ item.Nav_User.NAME">
<u-subsection activeColor="#0eacf5" mode="subsection" :list="list"
:current="item.STATUS" @change="sectionChange($event,item)"></u-subsection>
<u-subsection activeColor="#0eacf5" mode="subsection" :list="list" :current="item.STATUS" @change="sectionChange($event,item)"></u-subsection>
</u-form-item>
</uni-collapse>
@ -127,20 +97,16 @@
</u-sticky>
<!-- <query-selector :show="showPopup" :lists="Lists" @close="handleClosePopup" @search="handleSearch"
@select="handleSelected" /> -->
<u-picker :show="comPickerInfo.showSheet" :columns="comPickerInfo.columns" @confirm="onConfirmPicker"
@close="closePicker" @cancel="closePicker" keyName="NAME"></u-picker>
<u-datetime-picker :show="dateTimePickerInfo.showCheckDate" mode="datetime"
v-model='dateTimePickerInfo.defaultDateTime' :formatter="formatter" @confirm="handleCheckDate"
@close="dateTimePickerInfo.showCheckDate = false;"
@cancel="dateTimePickerInfo.showCheckDate = false;"></u-datetime-picker>
<u-picker :show="comPickerInfo.showSheet" :columns="comPickerInfo.columns" @confirm="onConfirmPicker" @close="closePicker" @cancel="closePicker" keyName="NAME"></u-picker>
<u-datetime-picker :show="dateTimePickerInfo.showCheckDate" mode="datetime" v-model='dateTimePickerInfo.defaultDateTime' :formatter="formatter" @confirm="handleCheckDate"
@close="dateTimePickerInfo.showCheckDate = false;" @cancel="dateTimePickerInfo.showCheckDate = false;"></u-datetime-picker>
<!--
<query-selector :show="selectorInfo.showPopup" :defaultChecked="selectorInfo.defaultChecked"
:title="selectorInfo.title" :lists="selectorInfo.dataLists" @search="handleSearch" @select="handleSelected"
@close="selectorInfo.showPopup=false" :total="selectorInfo.totalCount" /> -->
<u-picker :show="selectorInfo.showPopup" :columns="selectorInfo.dataLists" @confirm="onConfirmPicker"
:defaultIndex="[0]" @close="closePicker" @cancel="closePicker" keyName="NAME"></u-picker>
<u-picker :show="selectorInfo.showPopup" :columns="selectorInfo.dataLists" @confirm="onConfirmPicker" :defaultIndex="[0]" @close="closePicker" @cancel="closePicker" keyName="NAME"></u-picker>
<view class="bottom-button">
<u-button type="primary" @click="submit" color="#3d4b70">提交</u-button>
@ -158,7 +124,8 @@
guid,
initFilter,
initFilterGroup,
getArryPropShow
getArryPropShow,
transformData
} from '../../../../utils/common'
import {
getRequest,
@ -244,60 +211,17 @@
]);
},
methods: {
async fetchEnums(enumNames) {
try {
// // 存储所有枚举请求的Promise
// const enumPromises = enumNames.map(name => {
// return getEnum({
// name
// }).then(res => {
// // 统一处理枚举格式：添加name/code字段，便于后续映射
// return {
// enumName: name,
// data: res.map(item => ({
// ...item,
// name: item.NAME, // 统一显示名称字段
// code: item.ID // 统一值字段
// }))
// };
// });
// });
// // 等待所有枚举请求完成
// const results = await Promise.all(enumPromises);
// // 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
// results.forEach(({
// enumName,
// data
// }) => {
// this.enumsData[enumName] = data;
// // 生成文本列表（如需要）
// this.enumsText[enumName] = data.map(item => item.name);
// });
// // 所有枚举获取完成后，执行loadData
// this.loadData();
GetEnumAnyOrder({
name: 'TrainType|PlanCheckType|FMDepartmentType|SETrainRecordUserStatusEnum|SEExaminationResultsEnum'
}).then(res => {
res.forEach((e, index) => {
var dataTemp = e.map(sube => ({
...sube,
name: sube.NAME, // 统一显示名称字段
code: sube.ID // 统一值字段
}));
this.enumsData[enumNames[index]] = dataTemp
this.enumsText[enumNames[index]] = dataTemp.map(item => item.name);
})
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
}
},
sectionChange(index, item) {
item.STATUS = index;

54
pages/apply/subPages/SE/2trainRecordList.vue
View File

@ -62,10 +62,12 @@
import {
extendInclude,
extendRule,
initFilter
initFilter,
transformData
} from '../../../../utils/common'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
@ -94,45 +96,17 @@
this.fetchEnums(['SETrainRecordStatus', 'PlanCheckType']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
handleSearch(obj) {
this.keyword = obj.value

107
pages/apply/subPages/SE/2trainRecordShow.vue
View File

@ -3,52 +3,39 @@
<view class="card">
<view class="background"></view>
<view>
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="model"
class="demo-ruleForm">
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="model" class="demo-ruleForm">
<u-form-item label="培训名称：" prop="NAME" borderBottom>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.NAME" border="none" slot="right"
inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.NAME" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="培训编号：" prop="CODE" borderBottom>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.CODE" border="none" slot="right"
inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.CODE" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="培训类型：" prop="Nav_LaunchUser.NAME" borderBottom>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.Nav_TrainType.NAME" border="none"
slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.Nav_TrainType.NAME" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="培训级别：" prop="LEVEL" borderBottom>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.LEVEL_SHOW" border="none"
slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.LEVEL_SHOW" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="组织部门：" prop="Nav_Notify.Nav_LaunchDepartment.NAME" borderBottom>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.Nav_LaunchDepartment.NAME"
border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff"
fontSize="14px"></u--input>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.Nav_LaunchDepartment.NAME" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="培训时间：" prop="TRAIN_TIME" borderBottom>
<u--input v-model="model.TRAIN_TIME" border="none" inputAlign="right" disabled
disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-model="model.TRAIN_TIME" border="none" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="培训地点：" prop="Nav_Notify.TRAIN_ADDR" borderBottom>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.TRAIN_ADDR" border="none"
slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.TRAIN_ADDR" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="培训学时：" prop="Nav_Notify.HOURS" borderBottom>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.HOURS" border="none" slot="right"
inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.HOURS" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="培训老师：" prop="Nav_Notify.TRAIN_TEACHER" borderBottom>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.TRAIN_TEACHER" border="none"
slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.TRAIN_TEACHER" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="培训形式：" prop="" borderBottom>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.TRAINTYPE_SHOW" border="none"
inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.TRAINTYPE_SHOW" border="none" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="考核方式：" prop="Nav_TrainCheckType.NAME" borderBottom>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.CHECKTYPE_SHOW" border="none"
slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-if="model.Nav_Notify" v-model="model.Nav_Notify.CHECKTYPE_SHOW" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="培训课件：" prop="trainCour" borderBottom>
<u-textarea autoHeight v-html="model.trainCour" border="none" disabled></u-textarea>
@ -57,11 +44,9 @@
<u-textarea autoHeight v-html="model.TRAINCONTENT" border="none" disabled></u-textarea>
</u-form-item>
<view class="upload-title">附件</view>
<full-upload v-model="model.Nav_Files" :listProp='listPropUpload' :listPropVal='listPropValUpload'
:isShowBtn="false"></full-upload>
<full-upload v-model="model.Nav_Files" :listProp='listPropUpload' :listPropVal='listPropValUpload' :isShowBtn="false"></full-upload>
<u-form-item label="审阅意见：" prop="TRAIN_PLAN" borderBottom>
<u--input v-model="model.STATUS>2?'已阅':''" border="none" slot="right" inputAlign="right"
disabled disabledColor="#ffffff" fontSize="14px"></u--input>
<u--input v-model="model.STATUS>2?'已阅':''" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
</u-form-item>
<u-form-item label="请假人员：" prop="LeaveUsers" borderBottom>
<u-textarea autoHeight v-html="model.LeaveUsers" border="none" disabled></u-textarea>
@ -71,19 +56,15 @@
</u-form-item>
<u-form-item label="培训人员：" prop="Users">
</u-form-item>
<rich-text autoHeight v-html="model.Users" border="none" disabled
style="font-size: 14px;"></rich-text>
<rich-text autoHeight v-html="model.Users" border="none" disabled style="font-size: 14px;"></rich-text>
<view style="margin-top: 10px;">
<u-button type="primary" class="bottom"
v-if='isLoadOK&&tableKey!=1&&model.Nav_Notify.CHECKTYPE == 51'
@click="openTest(model.ID)">查看试卷</u-button>
<u-button type="primary" class="bottom" v-if='isLoadOK&&tableKey!=1&&model.Nav_Notify.CHECKTYPE == 51' @click="openTest(model.ID)">查看试卷</u-button>
</view>
</u--form>
</view>
<view class="bottom-button" v-if='isLoadOK&&tableKey==1&&model.STATUS==1'>
<u-button type="primary" class="bottom" color="#3d4b70" @click="onTableBtnAgree"
:disabled="isAgree">签到</u-button>
<u-button type="primary" class="bottom" color="#3d4b70" @click="onTableBtnAgree" :disabled="isAgree">签到</u-button>
</view>
<view class="bottom-button" v-if='isLoadOK&&tableKey==1&&model.STATUS==2'>
<u-button type="primary" class="bottom" color="#3d4b70" @click="onTableBtnAudit">审核</u-button>
@ -96,7 +77,8 @@
initFilter,
extendRule,
extendInclude,
getArryPropShow
getArryPropShow,
transformData
} from '../../../../utils/common'
import {
getRequest,
@ -105,7 +87,8 @@
import color from '../../../../uni_modules/uview-ui/libs/config/color'
import config from '../../../../config/common'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
data() {
@ -130,45 +113,17 @@
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
const json = initFilter(this.ORG_ID, "", "", 1)

54
pages/apply/subPages/SK/SK003List.vue
View File

@ -69,7 +69,8 @@
initFilter,
extendRule,
extendInclude,
extendOrder
extendOrder,
transformData
} from '../../../../utils/common'
import {
MineTypeIndex,
@ -79,7 +80,8 @@
GetSKEnterpriseLibrary
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
import UniSearchBar from '../../../../uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue'
export default {
@ -113,45 +115,17 @@
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
handleSearch() {
this.pageIndex = 0

54
pages/apply/subPages/SK/SK003Show.vue
View File

@ -132,7 +132,8 @@
extendIgnoreDataRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -147,7 +148,8 @@
} from '../../../../services/apply/FOServices/FOServices';
import stepTitle from '@/components/custom/step-title.vue'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -234,45 +236,17 @@
]);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
// const json = {}

55
pages/apply/subPages/SK/checkContentEdit.vue
View File

@ -103,7 +103,8 @@
extendIgnoreDataRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -125,7 +126,8 @@
import stepTitle from '@/components/custom/step-title.vue'
import swipeActionItem from '../../../../uni_modules/uview-ui/libs/config/props/swipeActionItem';
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -230,46 +232,17 @@
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
getNotNew() {
const orgId = uni.getStorageSync('orgId')

54
pages/apply/subPages/SK/enterprise/checkList.vue
View File

@ -82,10 +82,12 @@
initFilter,
extendRule,
extendInclude,
extendIgnoreDataRule
extendIgnoreDataRule,
transformData
} from '../../../../../utils/common'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../../services/common';
import {
GetSKCheckType,
@ -127,45 +129,17 @@
// this.loadData()
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
handleSearch() {
this.initData()

54
pages/apply/subPages/SK/enterprise/jobList.vue
View File

@ -98,13 +98,15 @@
// getEnum
// } from '../../services/common.js'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../../services/common';
import config from '../../../../../config/common'
import {
initFilter,
extendRule,
extendFilterGroupGroupRules
extendFilterGroupGroupRules,
transformData
} from '../../../../../utils/common'
export default {
data() {
@ -173,45 +175,17 @@
// this.$refs.uForm.setRules(this.rules)
// },
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
const json = initFilter(this.OrgId, "", "")

54
pages/apply/subPages/SK/enterprise/summary.vue
View File

@ -95,7 +95,8 @@
import {
initFilter,
extendRule,
extendInclude
extendInclude,
transformData
} from '../../../../../utils/common'
import {
MineTypeIndex,
@ -105,7 +106,8 @@
SKOrderEntities
} from '../../../../../services/apply/subPages/SK/SKServices.js'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../../services/common';
export default {
data() {
@ -127,45 +129,17 @@
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
const orgId = uni.getStorageSync('orgId')

55
pages/apply/subPages/SK/riskContentEdit.vue
View File

@ -103,7 +103,8 @@
extendIgnoreDataRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -125,7 +126,8 @@
import stepTitle from '@/components/custom/step-title.vue'
import swipeActionItem from '../../../../uni_modules/uview-ui/libs/config/props/swipeActionItem';
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -230,46 +232,17 @@
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
getNotNew() {
const orgId = uni.getStorageSync('orgId')

54
pages/apply/subPages/SK/riskDouPreEditNew.vue
View File

@ -346,7 +346,8 @@
initFilter,
initFilterGroup,
handleOriginalArray,
extendFilterGroupGroupRules
extendFilterGroupGroupRules,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -384,7 +385,8 @@
import swipeActionItem from '../../../../uni_modules/uview-ui/libs/config/props/swipeActionItem';
import formItem from '../../../../uni_modules/uview-ui/libs/config/props/formItem';
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -493,45 +495,17 @@
this.fetchEnums(['SKHiddenLevel', 'SKProductionUnit', 'SKEvaluateLevelEnum', 'SKPLANCHECKFREQUENCYEnum', 'SKDepartmentTypeEnum']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
// const json = {}

63
pages/apply/subPages/SK/riskDouPreShow.vue
View File

@ -273,7 +273,8 @@
guid,
initFilter,
initFilterGroup,
handleOriginalArray
handleOriginalArray,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -286,7 +287,8 @@
MineTypeName
} from '../../../../utils/enums.js'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
import {
DouPreGet,
@ -433,45 +435,17 @@
this.fetchEnums(['SKHiddenLevel', 'SKProductionUnit', 'SKEvaluateLevelEnum', 'SKPLANCHECKFREQUENCYEnum', 'SKDepartmentTypeEnum']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
// const json = {}
@ -550,8 +524,10 @@
}
if (item2.Nav_DetailMeasureContentPosts && item2.Nav_DetailMeasureContentPosts.length > 0) {
item2.Nav_DetailMeasureContentPosts.map(item3 => {
item3.CHECK_CYCLEName = item3.CHECK_CYCLE !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item4 => item4.code === item3.CHECK_CYCLE).name : '';
item3.CHECK_TYPEName = item3.CHECK_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item4 => item4.code === item3.CHECK_TYPE).name : '';
item3.CHECK_CYCLEName = item3.CHECK_CYCLE !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item4 => item4.code === item3
.CHECK_CYCLE).name : '';
item3.CHECK_TYPEName = item3.CHECK_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item4 => item4.code === item3
.CHECK_TYPE).name : '';
if (item3.Nav_DetailPosts && item3.Nav_DetailPosts.length > 0) {
let areaShow = ''
item3.Nav_DetailPosts.map(o => { //检查岗位
@ -568,7 +544,8 @@
item3.Nav_Question = item3.Nav_Question ? item3.Nav_Question : {
DESCREPTION: ''
},
item3.HIDDEN_LEVELName = item3.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item4 => item4.code === item3.HIDDEN_LEVEL).name : '';
item3.HIDDEN_LEVELName = item3.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item4 => item4.code === item3
.HIDDEN_LEVEL).name : '';
})
}

54
pages/apply/subPages/SK/riskHandelEditNew.vue
View File

@ -55,7 +55,8 @@
extendIgnoreDataRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -75,7 +76,8 @@
import config from '../../../../config/common.js'
import stepTitle from '@/components/custom/step-title.vue'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -186,45 +188,17 @@
}
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
if (this.ID == undefined || this.ID == '') {

54
pages/apply/subPages/SK/riskHandelList.vue
View File

@ -70,7 +70,8 @@
import {
initFilter,
extendRule,
extendInclude
extendInclude,
transformData
} from '../../../../utils/common'
import {
MineTypeIndex,
@ -80,7 +81,8 @@
GetHiddenHandelListInfo
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
import UniSearchBar from '../../../../uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue'
export default {
@ -114,45 +116,17 @@
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
handleSearch() {
this.pageIndex = 0

57
pages/apply/subPages/SK/riskHandelShow.vue
View File

@ -60,7 +60,8 @@
extendIgnoreDataRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
MineTypeIndex,
@ -71,7 +72,8 @@
} from '../../../../services/apply/subPages/SK/SKServices.js'
import stepTitle from '@/components/custom/step-title.vue'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -116,49 +118,20 @@
this.model.ID = option.ID ? option.ID : '';
this.tableKey = option.tableKey ? option.tableKey : '0'
this.isAudit = option.isAudit
this.fetchEnums(['SKProductionUnit'
]);
this.fetchEnums(['SKProductionUnit']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
const orgId = uni.getStorageSync('orgId')

54
pages/apply/subPages/SK/riskRectifyDeferredEditNew.vue
View File

@ -84,7 +84,8 @@
extendIgnoreDataRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -101,7 +102,8 @@
} from '../../../../services/apply/subPages/SK/SKServices.js'
import stepTitle from '@/components/custom/step-title.vue'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -187,45 +189,17 @@
// this.loadData()
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
if (this.ID == undefined || this.ID == '') {

54
pages/apply/subPages/SK/riskRectifyDeferredList.vue
View File

@ -70,7 +70,8 @@
import {
initFilter,
extendRule,
extendInclude
extendInclude,
transformData
} from '../../../../utils/common'
import {
MineTypeIndex,
@ -80,7 +81,8 @@
GetDelayListInfo
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
import UniSearchBar from '../../../../uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue'
export default {
@ -114,45 +116,17 @@
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
handleSearch() {
this.pageIndex = 0

54
pages/apply/subPages/SK/riskRectifyEditNew.vue
View File

@ -163,7 +163,8 @@
guid,
initFilter,
initFilterGroup,
getRealIndex
getRealIndex,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -188,7 +189,8 @@
import stepTitle from '@/components/custom/step-title.vue'
import swipeActionItem from '../../../../uni_modules/uview-ui/libs/config/props/swipeActionItem';
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -351,45 +353,17 @@
this.fetchEnums(['SKProductionUnit', 'SKPLANCHECKFREQUENCYEnum', 'SKDepartmentTypeEnum', 'SKHiddenLevel']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
// this.getCheckType()

54
pages/apply/subPages/SK/riskRectifyList.vue
View File

@ -70,7 +70,8 @@
import {
initFilter,
extendRule,
extendInclude
extendInclude,
transformData
} from '../../../../utils/common'
import {
MineTypeIndex,
@ -80,7 +81,8 @@
GetRectifyListInfo
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
import UniSearchBar from '../../../../uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue'
export default {
@ -114,45 +116,17 @@
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
handleSearch() {
this.pageIndex = 0

54
pages/apply/subPages/SK/riskRectifyRecordEditNew.vue
View File

@ -124,7 +124,8 @@
extendIgnoreDataRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -148,7 +149,8 @@
import stepTitle from '@/components/custom/step-title.vue'
import swipeActionItem from '../../../../uni_modules/uview-ui/libs/config/props/swipeActionItem';
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -241,45 +243,17 @@
this.fetchEnums(['SKProductionUnit', 'SKHiddenLevel', 'SKAcceptResultEnum']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
// const json = {}

54
pages/apply/subPages/SK/riskRectifyRecordList.vue
View File

@ -70,7 +70,8 @@
import {
initFilter,
extendRule,
extendInclude
extendInclude,
transformData
} from '../../../../utils/common'
import {
MineTypeIndex,
@ -80,7 +81,8 @@
GetRectifyRecordListInfo
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
import UniSearchBar from '../../../../uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue'
export default {
@ -114,45 +116,17 @@
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
handleSearch() {
this.pageIndex = 0

54
pages/apply/subPages/SK/riskRectifyRecordShow.vue
View File

@ -116,10 +116,12 @@
extendIgnoreDataRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
import {
MineTypeIndex,
@ -197,45 +199,17 @@
this.fetchEnums(['SKProductionUnit', 'SKHiddenLevel', 'SKAcceptResultEnum']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
const orgId = uni.getStorageSync('orgId')

65
pages/apply/subPages/SK/riskRectifyShow.vue
View File

@ -77,8 +77,7 @@
</u-textarea>
<!-- <u--textarea v-model="item.Nav_Question.DESCREPTION" disabled placeholder="请选择隐患描述" maxlength="-1"></u--textarea> -->
<u-form-item label="隐患等级" prop="HIDDEN_LEVEL" border-bottom>
<u--input v-model="item.HIDDEN_LEVELName" disabled disabledColor="#ffffff" inputAlign="right"
fontSize="14px" border="none">
<u--input v-model="item.HIDDEN_LEVELName" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input>
</u-form-item>
<u-form-item label="隐患地点" prop="HIDDEN_PLACE" border-bottom>
@ -95,13 +94,11 @@
</u--input>
</u-form-item>
<u-form-item label="整改落实人" prop="HIDDEN_PLACE" border-bottom>
<u--input v-model="(item.Nav_ImplementUser||{}).NAME" disabled disabledColor="#ffffff"
inputAlign="right" fontSize="14px" border="none">
<u--input v-model="(item.Nav_ImplementUser||{}).NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input>
</u-form-item>
<u-form-item label="验收人" prop="HIDDEN_PLACE" border-bottom>
<u--input v-model="(item.Nav_AcceptUser||{}).NAME" disabled disabledColor="#ffffff"
inputAlign="right" fontSize="14px" border="none">
<u--input v-model="(item.Nav_AcceptUser||{}).NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input>
</u-form-item>
<u-form-item label="隐患照片" prop="CHECKSTANDARD">
@ -132,7 +129,8 @@
extendIgnoreDataRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
MineTypeIndex,
@ -144,7 +142,8 @@
} from '../../../../services/apply/subPages/SK/SKServices.js'
import stepTitle from '@/components/custom/step-title.vue'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -207,45 +206,17 @@
this.fetchEnums(['SKProductionUnit', 'SKPLANCHECKFREQUENCYEnum', 'SKDepartmentTypeEnum', 'SKHiddenLevel']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
// const json = {}
@ -291,6 +262,4 @@
<style scoped>
@import url("../../../../style/css/newTemplate.css");
</style>

54
pages/apply/subPages/SK/riskReportEditNew.vue
View File

@ -163,7 +163,8 @@
guid,
initFilter,
initFilterGroup,
getRealIndex
getRealIndex,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -190,7 +191,8 @@
import stepTitle from '@/components/custom/step-title.vue'
import swipeActionItem from '../../../../uni_modules/uview-ui/libs/config/props/swipeActionItem';
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -343,45 +345,17 @@
this.fetchEnums(['SKProductionUnit', 'SKPLANCHECKFREQUENCYEnum', 'SKDepartmentTypeEnum', 'SKHiddenLevel']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
// const json = {}

54
pages/apply/subPages/SK/riskReportList.vue
View File

@ -70,7 +70,8 @@
import {
initFilter,
extendRule,
extendInclude
extendInclude,
transformData
} from '../../../../utils/common'
import {
MineTypeIndex,
@ -80,7 +81,8 @@
GetHiddenDangerListInfo
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
import UniSearchBar from '../../../../uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue'
export default {
@ -114,45 +116,17 @@
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
handleSearch() {
this.pageIndex = 0

54
pages/apply/subPages/SK/riskReportShow.vue
View File

@ -125,7 +125,8 @@
extendIgnoreDataRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -141,7 +142,8 @@
} from '../../../../services/apply/FOServices/FOServices';
import stepTitle from '@/components/custom/step-title.vue'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -216,45 +218,17 @@
this.fetchEnums(['SKProductionUnit', 'SKPLANCHECKFREQUENCYEnum', 'SKDepartmentTypeEnum', 'SKHiddenLevel'])
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
// const json = {}

54
pages/apply/subPages/SK/riskSafeEvaSumShow.vue
View File

@ -166,7 +166,8 @@
guid,
initFilter,
initFilterGroup,
handleOriginalArray
handleOriginalArray,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -191,7 +192,8 @@
getRequest,
} from '../../../../services/apply/FOServices/FOServices';
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
import stepTitle from '@/components/custom/step-title.vue'
import swipeActionItem from '../../../../uni_modules/uview-ui/libs/config/props/swipeActionItem';
@ -275,45 +277,17 @@
this.fetchEnums(['SKProductionUnit', 'SKEvaluateLevelEnum', 'SKDepartmentTypeEnum']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
// const json = {}

57
pages/apply/subPages/SK/riskSafeEvaluateEditNew.vue
View File

@ -213,7 +213,8 @@
guid,
initFilter,
initFilterGroup,
handleOriginalArray
handleOriginalArray,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -239,7 +240,8 @@
GetScorec
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
import {
getRequest,
@ -350,45 +352,17 @@
this.fetchEnums(['SKProductionUnit', 'SKEvaluateLevelEnum', 'SKDepartmentTypeEnum']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
// const json = {}
@ -775,7 +749,8 @@
} else {
this.model.Nav_Details[realIndex].EVALUATE_LEVELName = "低风险";
}
this.model.Nav_Details[realIndex].EVALUATE_LEVEL = this.model.Nav_Details[realIndex].EVALUATE_LEVELName !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.name === this.model.Nav_Details[
this.model.Nav_Details[realIndex].EVALUATE_LEVEL = this.model.Nav_Details[realIndex].EVALUATE_LEVELName !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.name === this.model
.Nav_Details[
realIndex].EVALUATE_LEVELName).code : ''
this.$forceUpdate()

54
pages/apply/subPages/SK/riskSafeEvaluateShow.vue
View File

@ -168,7 +168,8 @@
guid,
initFilter,
initFilterGroup,
handleOriginalArray
handleOriginalArray,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -190,7 +191,8 @@
GetDepartmentInfo
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
import {
getRequest,
@ -278,45 +280,17 @@
this.fetchEnums(['SKProductionUnit', 'SKEvaluateLevelEnum', 'SKDepartmentTypeEnum']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
// const json = {}

54
pages/apply/subPages/SK/riskVerifyEditNew.vue
View File

@ -126,7 +126,8 @@
extendIgnoreDataRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -152,7 +153,8 @@
import stepTitle from '@/components/custom/step-title.vue'
import swipeActionItem from '../../../../uni_modules/uview-ui/libs/config/props/swipeActionItem';
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -255,45 +257,17 @@
]);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
goRiskDes() {
if (!this.model.CHECK_CONTENTS_ID) {

54
pages/apply/subPages/SK/riskVerifyList.vue
View File

@ -70,7 +70,8 @@
import {
initFilter,
extendRule,
extendInclude
extendInclude,
transformData
} from '../../../../utils/common'
import {
MineTypeIndex,
@ -80,7 +81,8 @@
GetHiddenConfirmListInfo
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
import UniSearchBar from '../../../../uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue'
export default {
@ -114,45 +116,17 @@
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
handleSearch() {
this.pageIndex = 0

54
pages/apply/subPages/SK/riskVerifyShow.vue
View File

@ -118,7 +118,8 @@
extendIgnoreDataRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
MineTypeIndex,
@ -129,7 +130,8 @@
SKHiddenDangerIdentityUpdate
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
import stepTitle from '@/components/custom/step-title.vue'
export default {
@ -209,45 +211,17 @@
// this.loadData()
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
const orgId = uni.getStorageSync('orgId')

57
pages/apply/subPages/SK/safeCheckEditNew.vue
View File

@ -138,7 +138,8 @@
guid,
initFilter,
initFilterGroup,
extendIgnoreDataRule
extendIgnoreDataRule,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -155,7 +156,8 @@
CheckTypeNewOrderPaged
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
import {
getRequest,
@ -236,45 +238,17 @@
this.fetchEnums(['SKProductionUnit', 'SKPLANCHECKFREQUENCYEnum', 'SKDepartmentTypeEnum']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
@ -616,8 +590,7 @@
} else if (this.selectorInfo.name == 'Nav_Contents') {
this.model.Nav_CheckNoticeDetails[realIndex].Nav_Contents = e;
this.model.Nav_CheckNoticeDetails[realIndex].CHECK_CONTENTS_ID = e.ID;
}
else if (this.selectorInfo.name == 'Nav_CheckType') {
} else if (this.selectorInfo.name == 'Nav_CheckType') {
this.model.Nav_CheckType = e;
this.model.CHECK_TYPE_ID = e.ID;
}

54
pages/apply/subPages/SK/safeCheckList.vue
View File

@ -70,7 +70,8 @@
import {
initFilter,
extendRule,
extendInclude
extendInclude,
transformData
} from '../../../../utils/common'
import {
MineTypeIndex,
@ -80,7 +81,8 @@
GetSafeCheckListInfo
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
import UniSearchBar from '../../../../uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue'
export default {
@ -114,45 +116,17 @@
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
handleSearch() {
this.pageIndex = 0

54
pages/apply/subPages/SK/safeCheckRecordEditNew.vue
View File

@ -175,7 +175,8 @@
extendIgnoreDataRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -198,7 +199,8 @@
import swipeActionItem from '../../../../uni_modules/uview-ui/libs/config/props/swipeActionItem';
import checkListPage from '../../../../pages/apply/subPages/SK/checkListPage.vue'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -318,45 +320,17 @@
]);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {

54
pages/apply/subPages/SK/safeCheckRecordList.vue
View File

@ -70,7 +70,8 @@
import {
initFilter,
extendRule,
extendInclude
extendInclude,
transformData
} from '../../../../utils/common'
import {
MineTypeIndex,
@ -80,7 +81,8 @@
GetSafeCheckRecordListInfo
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
import UniSearchBar from '../../../../uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue'
export default {
@ -114,45 +116,17 @@
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
handleSearch() {
this.pageIndex = 0

54
pages/apply/subPages/SK/safeCheckRecordShow.vue
View File

@ -125,7 +125,8 @@
extendIgnoreDataRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -140,7 +141,8 @@
} from '../../../../services/apply/FOServices/FOServices';
import stepTitle from '@/components/custom/step-title.vue'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -227,45 +229,17 @@
]);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
// const json = {}

54
pages/apply/subPages/SK/safeCheckRecordSummaryEditNew.vue
View File

@ -172,7 +172,8 @@
extendIgnoreDataRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -197,7 +198,8 @@
import stepTitle from '@/components/custom/step-title.vue'
import swipeActionItem from '../../../../uni_modules/uview-ui/libs/config/props/swipeActionItem';
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -314,45 +316,17 @@
]);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {

54
pages/apply/subPages/SK/safeCheckRecordSummaryList.vue
View File

@ -70,7 +70,8 @@
import {
initFilter,
extendRule,
extendInclude
extendInclude,
transformData
} from '../../../../utils/common'
import {
MineTypeIndex,
@ -80,7 +81,8 @@
GetSafeCheckRecordSummaryListInfo
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
import UniSearchBar from '../../../../uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue'
export default {
@ -114,45 +116,17 @@
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
handleSearch() {
this.pageIndex = 0

65
pages/apply/subPages/SK/safeCheckRecordSummaryShow.vue
View File

@ -40,16 +40,7 @@
</u-form-item>
<!-- 修改检查人员显示部分的代码 -->
<u-form-item label="检查人员：" prop="UserNames"></u-form-item>
<rich-text
style="line-height: 30px;"
autoHeight
type="textarea"
v-html="formattedCheckUsers"
border="none"
inputAlign="right"
disabled
class="richtext"
></rich-text>
<rich-text style="line-height: 30px;" autoHeight type="textarea" v-html="formattedCheckUsers" border="none" inputAlign="right" disabled class="richtext"></rich-text>
<view class="upload-title">附件：</view>
<full-upload v-model="model.Nav_CheckRecordFiles" :isShowBtn='false' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
</u--form>
@ -138,7 +129,8 @@
extendIgnoreDataRule,
guid,
initFilter,
initFilterGroup
initFilterGroup,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -154,7 +146,8 @@
} from '../../../../services/apply/FOServices/FOServices';
import stepTitle from '@/components/custom/step-title.vue'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -237,45 +230,17 @@
]);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {
// const json = {}

65
pages/apply/subPages/SK/safeCheckShow.vue
View File

@ -45,16 +45,7 @@
</u-form-item> -->
<u-form-item label="检查人员：" prop="UserNames">
</u-form-item>
<rich-text
style="line-height: 30px;"
autoHeight
type="textarea"
v-html="formattedCheckUsers"
border="none"
inputAlign="right"
disabled
class="richtext"
></rich-text>
<rich-text style="line-height: 30px;" autoHeight type="textarea" v-html="formattedCheckUsers" border="none" inputAlign="right" disabled class="richtext"></rich-text>
<view class="upload-title">附件：</view>
<full-upload v-model="model.Nav_CheckNoticeFiles" :isShowBtn='false' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
@ -123,7 +114,8 @@
guid,
initFilter,
initFilterGroup,
extendIgnoreDataRule
extendIgnoreDataRule,
transformData
} from '../../../../utils/common'
import {
FMProductionUnit,
@ -138,7 +130,8 @@
} from '../../../../services/apply/subPages/SK/SKServices.js'
import stepTitle from '@/components/custom/step-title.vue'
import {
getEnum
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
export default {
components: {
@ -197,45 +190,17 @@
this.fetchEnums(['SKProductionUnit', 'SKPLANCHECKFREQUENCYEnum', 'SKDepartmentTypeEnum']);
},
methods: {
async fetchEnums(enumNames) {
try {
// 存储所有枚举请求的Promise
const enumPromises = enumNames.map(name => {
return getEnum({
name
}).then(res => {
// 统一处理枚举格式：添加name/code字段，便于后续映射
return {
enumName: name,
data: res.map(item => ({
...item,
name: item.NAME, // 统一显示名称字段
code: item.ID // 统一值字段
}))
};
});
});
// 等待所有枚举请求完成
const results = await Promise.all(enumPromises);
// 存储枚举结果到data中（键为枚举名称，值为处理后的数据）
results.forEach(({
enumName,
data
}) => {
this.enumsData[enumName] = data;
// 生成文本列表（如需要）
this.enumsText[enumName] = data.map(item => item.name);
});
// 所有枚举获取完成后，执行loadData
this.loadData();
} catch (error) {
console.error('枚举请求失败:', error);
uni.showToast({
title: '枚举数据加载失败',
icon: 'none'
});
fetchEnums(enumNames) {
var dataParm = {
'name': enumNames.join('|')
}
GetEnumAnyOrder(dataParm).then(res => {
let newd = transformData(res, enumNames)
this.enumsData = newd[0];
// 生成文本列表（如需要）
this.enumsText = newd[1]
this.loadData();
})
},
loadData() {

22
utils/common.js
View File

@ -71,6 +71,28 @@ export const dateFormat = (fmt, date) => {
};
return fmt
}
export function transformData(input, keys) {
// 创建结果对象
const result = {};
const results = {}
// 遍历输入数组
input.forEach((array, index) => {
// 获取对应的键名
const key = keys[index];
// 转换数组中的每个对象
result[key] = array.map(item => ({
NAME: item.NAME,
ID: item.ID,
name: item.NAME,
code: item.ID
}));
results[key] = array.map(item => item.NAME);
});
return [result,results];
}
export function formatSeconds(seconds) {
const hours = Math.floor(seconds / 3600);
const minutes = Math.floor((seconds % 3600) / 60);