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-06-24 17:01:58 +08:00
parent 0761ee0bb8
commit 3ae2895d9e
5 changed files with 825 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,11 +249,17 @@
}) })
}, },
loadData() { loadData() {
// const json = {} const json1 = initFilter(this.ORG_ID)
extendRule(json1, 'ID', 1, this.model.ID);
getRequest(json1, "/SK/SKRiskIdentifyResult/GetDetail").then(res => {
const orgId = uni.getStorageSync('orgId') const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId, "", "") const json = initFilter(orgId, "", "")
extendRule(json, 'ID', 1, this.model.ID); extendRule(json, 'PRODUCTION_UNIT_ID', 1, res.PRODUCTION_UNIT_ID);
extendRule(json, 'TASK_ID', 1, this.TaskID); extendRule(json, 'AREA_ID', 1, res.AREA_ID);
extendRule(json, 'TYPE_ID', 1, res.TYPE_ID);
extendRule(json, 'RISK_NAME', 1, res.RISK_NAME);
extendRule(json, 'RISK_DESCRIPTION', 1, res.RISK_DESCRIPTION);
extendIgnoreDataRule(json) extendIgnoreDataRule(json)
GetSKEnterpriseLibraryRecord(json).then(res => { GetSKEnterpriseLibraryRecord(json).then(res => {
this.stepLoad = false this.stepLoad = false
@ -330,6 +336,9 @@
}) })
this.isLoadOK = true this.isLoadOK = true
})
// const json = {}
}, },
gotoCheck(detailData) { gotoCheck(detailData) {
uni.setStorageSync('detailData', detailData); uni.setStorageSync('detailData', detailData);

2
pages/apply/subPages/SK/riskSafeIdenEdit.vue
View File

@ -458,7 +458,7 @@
selectedItems.forEach(enterpriseItem => { selectedItems.forEach(enterpriseItem => {
// 检查是否与现有数据重复 // 检查是否与现有数据重复
const isDuplicate = this.dataModel.Nav_Details.some(existingItem => const isDuplicate = this.dataModel.Nav_Details.filter(i => !i.IS_DELETED).some(existingItem =>
existingItem.AREA_ID === (enterpriseItem.AREA_ID || '') && existingItem.AREA_ID === (enterpriseItem.AREA_ID || '') &&
existingItem.PRODUCTION_UNIT_ID === (enterpriseItem.PRODUCTION_UNIT_ID || '') && existingItem.PRODUCTION_UNIT_ID === (enterpriseItem.PRODUCTION_UNIT_ID || '') &&
existingItem.RISK_NAME === (enterpriseItem.RISK_NAME || '') existingItem.RISK_NAME === (enterpriseItem.RISK_NAME || '')

623
pages/apply/subPages/SK/riskSafeIdenResEdit.vue
View File

@ -28,13 +28,9 @@
<!-- <u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12"> <!-- <u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
</u-icon> --> </u-icon> -->
</u-form-item> </u-form-item>
<u-form-item label="辨识要求:" @click="handleChangeStep('','demand')"> <u-form-item label="辨识要求:">
<u--input v-model="dataModel.Nav_Require.NAME" placeholder="请选择辨识要求" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input>
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
</u-icon>
</u-form-item> </u-form-item>
<u--textarea v-model="dataModel.RequireName" disabled autoHeight></u--textarea> <u--textarea v-model="dataModel.Nav_RequiresName" disabled autoHeight></u--textarea>
<view class="upload-title">附件：</view> <view class="upload-title">附件：</view>
<full-upload v-model="dataModel.Nav_Files" :isShowBtn='true' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload> <full-upload v-model="dataModel.Nav_Files" :isShowBtn='true' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
@ -53,22 +49,22 @@
</view> </view>
<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;margin-top: 20px;">辨识内容</view> <view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;margin-top: 20px;">辨识内容</view>
<view v-for="(item,index) in dataModel.Nav_Details" :key="index" style="border-bottom: #ceccca 1px solid;margin-bottom: 10px;padding-bottom: 10px;"> <view v-for="(item,index) in dataModel.Nav_Details.filter(i => !i.IS_DELETED)" :key="index" style="border-bottom: #ceccca 1px solid;margin-bottom: 10px;padding-bottom: 10px;">
<u-form-item prop="Nav_Contents"> <u-form-item prop="Nav_Contents">
<view style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;flex: 1;"> <view style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;flex: 1;">
<view @click="handleChangeStep(index,'Area')" style="flex: 1;"> <view style="flex: 1;" @click="handleShowSheet({title: '辨识区域', name: 'Nav_Area',itemData:item})">
{{index+1+'.辨识区域：'+item.Nav_Area.NAME}} {{index+1+'.辨识区域：'+item.Nav_Area.NAME}}
</view> </view>
<view class="action" style="display: flex;flex-direction: row;align-items: center;justify-content: space-around;"> <view class="action" style="display: flex;flex-direction: row;align-items: center;justify-content: space-around;">
<u-icon @click="handleDelRowBefore(index)" name="trash" color="#ff4d4f" size="21" style="margin-right: 20px;"></u-icon> <u-icon @click="handleDelRowBefore(item)" name="trash" color="#ff4d4f" size="21" style="margin-right: 20px;"></u-icon>
<u-icon name="arrow-up" size="12" v-if="item.showPack" @click="handlePack(index)"></u-icon> <u-icon name="arrow-up" size="12" v-if="item.showPack" @click="handlePack(item)"></u-icon>
<u-icon name="arrow-down" size="12" v-if="!item.showPack" @click="handlePack(index)"></u-icon> <u-icon name="arrow-down" size="12" v-if="!item.showPack" @click="handlePack(item)"></u-icon>
</view> </view>
</view> </view>
</u-form-item> </u-form-item>
<view v-if="item.showPack==true"> <view v-if="item.showPack==true">
<u-form-item label="生产单元：" @click="handleChangeUnit(index,'MinType')" border-bottom> <u-form-item label="生产单元：" @click="handleChangeUnit(item,'MinType')" border-bottom>
<u--input v-model="(item.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" placeholder="请选择生产单元" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(item.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" placeholder="请选择生产单元" border="none" inputAlign="right" fontSize="14px">
</u--input> </u--input>
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12"> <u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
@ -78,64 +74,94 @@
<u--input v-model="item.RISK_NAME" placeholder="请填写风险名称" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none"> <u--input v-model="item.RISK_NAME" placeholder="请填写风险名称" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input> </u--input>
</u-form-item> </u-form-item>
<!-- <u-form-item label="风险名称" prop="CHECKSTANDARD" @click="handleChangeStep(index,'RiskName')" border-bottom>
<u--input v-model="item.Nav_RiskName.NAME" placeholder="请填写风险名称" suffixIcon="arrow-down" suffixIconStyle="font-size: 12px" disabledColor="#ffffff" inputAlign="right" fontSize="14px"
border="none">
</u--input>
</u-form-item> -->
<u-form-item label="风险描述" prop="HIDDEN_DESCRIPTION"> <u-form-item label="风险描述" prop="HIDDEN_DESCRIPTION">
</u-form-item> </u-form-item>
<u--textarea v-model="item.RISK_DESCRIPTION" placeholder="请填写风险描述" autoHeight maxlength="-1"></u--textarea> <u--textarea v-model="item.RISK_DESCRIPTION" placeholder="请填写风险描述" autoHeight maxlength="-1"></u--textarea>
<u-form-item label="风险类别" prop="HIDDEN_LEVEL" @click="handleChangeStep(index,'Category')" border-bottom> <u-form-item label="风险类别" prop="HIDDEN_LEVEL" @click="handleShowSheet({title: '风险类别', name: 'Nav_Type',itemData:item})" border-bottom>
<u--input v-model="item.Nav_Type.NAME" placeholder="请选择风险类别" disabled suffixIcon="arrow-down" suffixIconStyle="font-size: 12px" disabledColor="#ffffff" inputAlign="right" fontSize="14px" <u--input v-model="item.Nav_Type.NAME" placeholder="请选择风险类别" disabled suffixIcon="arrow-down" suffixIconStyle="font-size: 12px" disabledColor="#ffffff" inputAlign="right" fontSize="14px"
border="none"> border="none">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="辨识层级" prop="HIDDEN_PLACE" border-bottom> <uni-collapse class="collapse" ref="collapse">
<u--input v-model="item.DEPARTMENT_TYPE" placeholder="请填写辨识层级" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input> <uni-collapse-item title="管控措施" name="Variety components">
<u-button type="primary" @click="handleNewMeasures(item)" color="#3d4b70">新增管控措施</u-button>
<view v-if="item.Nav_DetailMeasures&&item.Nav_DetailMeasures.length!==0">
<view v-for="item1 in item.Nav_DetailMeasures.filter(i => !i.IS_DELETED)" style="margin: 5px 5px;padding: 0px 10px;">
<u-form-item label="序号" prop="HIDDEN_DESCRIPTION" border-bottom>
<view slot="right" style="display: flex;flex-direction: row;align-items: center;">
<u-number-box v-model="item1.NUM" integer></u-number-box>
<u-icon @click="handleDelRowMeasures(item,item1)" name="trash" color="#ff4d4f" size="21" style="margin-right: 20px;margin-left: 20px;"></u-icon>
</view>
</u-form-item> </u-form-item>
<u-form-item label="辨识部门" prop="HIDDEN_PLACE" border-bottom> <u-form-item label="措施" prop="HIDDEN_DESCRIPTION">
<u--input v-model="item.IDENTIFY_DEPARTMENT" placeholder="请填写辨识部门" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input>
</u-form-item> </u-form-item>
<u-form-item label="辨识岗位" prop="HIDDEN_PLACE" border-bottom> <u--textarea v-model="item1.MEASURE" placeholder="请填写管控措施" autoHeight></u--textarea>
<u--input v-model="item.IDENTIFY_POST" placeholder="请填写辨识岗位" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none"> </view>
</u--input> </view>
</u-form-item> </uni-collapse-item>
<u-form-item label="管控措施" prop="HIDDEN_PLACE" > <uni-collapse-item title="辨识岗位" name="Docs guide">
<!-- <u--input v-model="item.MEASURE" placeholder="请填写管控措施" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none"> <u-button type="primary" @click="handleNewPost(item)" color="#3d4b70">新增辨识层级</u-button>
<view v-if="item.Nav_DetailPosts&&item.Nav_DetailPosts.length>0">
<view v-for="(item1,index1) in item.Nav_DetailPosts.filter(i => !i.IS_DELETED)" style="padding: 10px;">
<u-form-item :label="(index1+1)+' . '" prop="HIDDEN_PLACE" border-bottom>
<!-- <u--input v-model="index1+1" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input> --> </u--input> -->
<u-icon @click="handleDelRowPost(item,item1)" name="trash" color="#ff4d4f" size="21" style="margin-right: 20px;margin-left: 20px;" slot="right"></u-icon>
</u-form-item> </u-form-item>
<u--textarea v-model="item.MEASURE" placeholder="请填写管控措施" autoHeight maxlength="-1"></u--textarea> <u-form-item label="辨识层级" prop="HIDDEN_PLACE" border-bottom @click="handleChangeUnit(item1,'SKDepartmentTypeEnum')">
<u--input v-model="item1.DEPARTMENT_TYPE_NAME" disabled placeholder="请选择辨识层级" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</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="HIDDEN_PLACE" border-bottom @click="handleShowSheet({title: '辨识部门', name: 'Nav_Department',itemData:item1})">
<u--input v-model="(item1.Nav_Department||{}).NAME" disabled placeholder="请选择辨识部门" disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</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="HIDDEN_PLACE" border-bottom @click="handleShowSheet({title: '辨识岗位', name: 'Nav_ResultPostDets',itemData:item1})">
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
</u-icon>
</u-form-item>
<u-textarea v-model="item1.Nav_ResultPostDetsName" disabled autoHeight placeholder="请选择辨识岗位"></u-textarea>
</view>
</view>
</uni-collapse-item>
</uni-collapse>
<u-form-item label="应急处置" prop="HIDDEN_PLACE" border-bottom> <u-form-item label="应急处置" prop="HIDDEN_PLACE" border-bottom>
</u-form-item> </u-form-item>
<u--textarea v-model="item.EMERGENCY" placeholder="请填写应急处置" autoHeight maxlength="-1"></u--textarea> <u--textarea v-model="item.EMERGENCY" placeholder="请填写应急处置" autoHeight maxlength="-1"></u--textarea>
<u-form-item label="是否有效" prop="HIDDEN_PLACE" @click="handleChangeUnit(index,'ENABLE_STATUS')" border-bottom> <u-form-item label="新增标识" prop="HIDDEN_PLACE" border-bottom>
<u--input v-model="item.ENABLE_STATUS" placeholder="请选择是否有效" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none"> <u--input v-model="item.MARK_NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input> </u--input>
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12"> </u-form-item>
<u-form-item label="操作" prop="HIDDEN_PLACE">
<u-icon style="margin-left: 4px;" slot="right" name="eye" size="16" @click="showDetail(item.ID)">
</u-icon> </u-icon>
</u-form-item> </u-form-item>
<!-- <u-form-item label="新增标识" prop="HIDDEN_PLACE" @click="handleChangeUnit(index,'MARK')">
<u--input v-model="item.MARK" placeholder="请选择新增标识" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input>
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
</u-icon>
</u-form-item> -->
</view> </view>
</view> </view>
<u-button text="新增检查区域" type="primary" @click="handleNewCheckContent"></u-button> <view style="padding: 10px 16px;display: flex;flex-direction: row;">
<u-button type="primary" @click="handleNewCheckContent" color="#3d4b70">新增检查区域</u-button>
<u-button type="primary" @click="handleNewCheckList" color="#3d4b70" style="margin-left: 5px;">导入企业库内容</u-button>
</view>
</u--form> </u--form>
</view> </view>
<view style="padding: 10px 16px;display: flex;flex-direction: row;" v-if="stepsPageList === 1" class="bottom-button"> <view style="padding: 10px 16px;display: flex;flex-direction: row;" v-if="stepsPageList === 1" class="bottom-button">
<u-button type="primary" @click="stepReduce" color="#3d4b70" :plain="true" style="margin-right: 5px;">上一步</u-button> <u-button type="primary" @click="stepReduce" color="#3d4b70" :plain="true" style="margin-right: 5px;">上一步</u-button>
<u-button type="primary" @click="submit" color="#3d4b70" style="margin-left: 5px;">提交</u-button> <u-button type="primary" @click="submit" color="#3d4b70" style="margin-left: 5px;">提交</u-button>
</view> </view>
<u-picker :show="showPopupUnit" :columns="UnitLists" @confirm="confirmUnit" @cancel="cancelUnit" :defaultIndex="UnitDefaultIndex"></u-picker> <u-picker :show="showPopupUnit" :columns="UnitLists" @confirm="confirmUnit" @cancel="cancelUnit" :defaultIndex="UnitDefaultIndex" keyName="NAME"></u-picker>
<u-modal :show="showDelModalIndex >= 0" @confirm="confirmDel" @cancel="cacelDel" :showCancelButton="true" title="确认删除？"></u-modal> <u-modal :show="showDelModalIndex >= 0" @confirm="confirmDel" @cancel="cacelDel" :showCancelButton="true" title="确认删除？"></u-modal>
<u-datetime-picker :show="showPopupRecitifyDate" v-model="dateRecitifyTime" mode="date" @confirm="confirmRecitifyDate" @cancel="cancelRecitifyDate"></u-datetime-picker> <u-datetime-picker :show="showPopupRecitifyDate" v-model="dateRecitifyTime" mode="date" @confirm="confirmRecitifyDate" @cancel="cancelRecitifyDate"></u-datetime-picker>
<query-selector :show="showPopupStep" :total="curTotalStep" :lists="stepLists" :defaultValue="currentOperateStep.NAME" @close="handleClosePopupStep" @search="handleSearchStep" @select="handleSelectedStep" /> <query-selector :show="showPopupStep" :total="curTotalStep" :lists="stepLists" :defaultValue="currentOperateStep.NAME" @close="handleClosePopupStep" @search="handleSearchStep" @select="handleSelectedStep" />
<query-selector :multiple="selectorInfo.isMultiple" :show="selectorInfo.showPopup" :title="selectorInfo.title" :lists="selectorInfo.dataLists" :defaultChecked="selectorInfo.defaultChecked"
@search="handleSearch" @select="handleSelected" @close="selectorInfo.showPopup=false" :total="selectorInfo.totalCount" />
</view> </view>
</view> </view>
</template> </template>
@ -151,7 +177,8 @@
guid, guid,
initFilter, initFilter,
initFilterGroup, initFilterGroup,
handleOriginalArray handleOriginalArray,
transformData
} from '../../../../utils/common' } from '../../../../utils/common'
import { import {
FMProductionUnit, FMProductionUnit,
@ -162,12 +189,18 @@
MineTypeIndex, MineTypeIndex,
MineTypeName MineTypeName
} from '../../../../utils/enums.js' } from '../../../../utils/enums.js'
import {
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
import { import {
EvaIdentifyResGet, EvaIdentifyResGet,
IdentifyResFullUpdate, IdentifyResFullUpdate,
getUserLists, getUserLists,
GetSKRequestInfo, GetSKRequestInfo,
GetRiskAreaInfo, GetRiskAreaInfo,
GetDepartmentInfo,
GetPostOrderPaged,
GetRiskTypeInfo, GetRiskTypeInfo,
GetRiskNameInfo GetRiskNameInfo
} from '../../../../services/apply/subPages/SK/SKServices.js' } from '../../../../services/apply/subPages/SK/SKServices.js'
@ -196,6 +229,19 @@
stepLoad: true, stepLoad: true,
UnitLists: [], UnitLists: [],
UnitDefaultIndex: [0], UnitDefaultIndex: [0],
selectorInfo: {
name: 'user',
isMultiple: false,
showPopup: false,
totalCount: 0,
title: '考核结果选择',
dataItem: {},
index: 0,
columns: [],
dataLists: [],
defaultText: '',
defaultChecked: []
},
dataModel: { dataModel: {
YEAR: '', YEAR: '',
START_DATE: '', START_DATE: '',
@ -214,9 +260,6 @@
NAME: '' NAME: ''
}, },
RISK_NAME: '', RISK_NAME: '',
Nav_RiskName: {
NAME: ''
},
RISK_DESCRIPTION: '', RISK_DESCRIPTION: '',
Nav_Type: { Nav_Type: {
NAME: '' NAME: ''
@ -226,7 +269,6 @@
IDENTIFY_POST: '', IDENTIFY_POST: '',
MEASURE: '', MEASURE: '',
EMERGENCY: '', EMERGENCY: '',
ENABLE_STATUS: '',
MARK: '', MARK: '',
}] }]
}, },
@ -248,9 +290,6 @@
NAME: '' NAME: ''
}, },
RISK_NAME: '', RISK_NAME: '',
Nav_RiskName: {
NAME: ''
},
RISK_DESCRIPTION: '', RISK_DESCRIPTION: '',
Nav_Type: { Nav_Type: {
NAME: '' NAME: ''
@ -260,7 +299,6 @@
IDENTIFY_POST: '', IDENTIFY_POST: '',
MEASURE: '', MEASURE: '',
EMERGENCY: '', EMERGENCY: '',
ENABLE_STATUS: '',
}] }]
}, },
@ -270,22 +308,39 @@
stepsPageList: 0, stepsPageList: 0,
TaskID: '', TaskID: '',
nowName: '', nowName: '',
nowItem: '',
nowIndex: 0, nowIndex: 0,
enumsData: {}, // 存储所有枚举数据（键：枚举名称，值：处理后的枚举列表）
enumsText: {} // 存储枚举文本列表（用于下拉选择等场景）
} }
}, },
onLoad(option) { onLoad(option) {
this.TaskID = option.taskID ? option.taskID : ''; this.TaskID = option.taskID ? option.taskID : '';
this.ID = option.ID ? option.ID : ''; this.ID = option.ID ? option.ID : '';
this.loadData() this.fetchEnums(['SKMarkEnum', 'SKEnableStatusEnum', 'SKDepartmentTypeEnum']);
}, },
methods: { methods: {
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() { loadData() {
// const json = {} // const json = {}
const orgId = uni.getStorageSync('orgId') const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId, "", "") const json = initFilter(orgId, "", "")
extendRule(json, 'ID', 1, this.ID); extendRule(json, 'ID', 1, this.ID);
extendInclude(json, 'Nav_Require'); extendInclude(json, 'Nav_Require');
extendInclude(json, 'Nav_Requires');
extendInclude(json, 'Nav_Requires.Nav_Require');
extendInclude(json, 'Nav_Files.Nav_ImgFile'); extendInclude(json, 'Nav_Files.Nav_ImgFile');
extendInclude(json, 'Nav_Details'); extendInclude(json, 'Nav_Details');
extendInclude(json, 'Nav_Details.Nav_Area'); extendInclude(json, 'Nav_Details.Nav_Area');
@ -300,55 +355,247 @@
this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : 2 this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : 2
this.dataModel.START_DATE = uni.$u.timeFormat(res.START_DATE, 'yyyy-mm-dd') this.dataModel.START_DATE = uni.$u.timeFormat(res.START_DATE, 'yyyy-mm-dd')
this.dataModel.END_DATE = uni.$u.timeFormat(res.END_DATE, 'yyyy-mm-dd') this.dataModel.END_DATE = uni.$u.timeFormat(res.END_DATE, 'yyyy-mm-dd')
this.dataModel.RequireName = res.Nav_Require ? res.Nav_Require.NAME : { let Nav_RequiresName = ''
NAME: '' if (this.dataModel.Nav_Requires && this.dataModel.Nav_Requires.length > 0) {
}, this.dataModel.Nav_Requires.map(item => {
this.dataModel.Nav_Require = res.Nav_Require ? res.Nav_Require : { if (item.Nav_Require && item.Nav_Require.NAME !== null) {
NAME: '' Nav_RequiresName += item.Nav_Require.NAME + ' ';
}, }
})
}
this.dataModel.Nav_RequiresName = Nav_RequiresName
this.dataModel.Nav_Details.map(item => { this.dataModel.Nav_Details.map(item => {
item['showPack'] = false item['showPack'] = false
item.ENABLE_STATUS = item.ENABLE_STATUS == 0 ? '有效' : '无效' item.MARK_NAME = item.MARK !== undefined ? this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name : '';
item.MARK = item.MARK == 0 ? '自动带出' : item.MARK == 10 ? '新增' : '修改'
item.Nav_RiskName = item.Nav_RiskName? item.Nav_RiskName: { if (item.Nav_DetailPosts && item.Nav_DetailPosts.length > 0) {
NAME: ''} item.Nav_DetailPosts.map(item1 => {
item1.DEPARTMENT_TYPE_NAME = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item2 => item2.code === item1.DEPARTMENT_TYPE).name :
'';
if (item1.Nav_ResultPostDets && item1.Nav_ResultPostDets.length > 0) {
let Nav_ResultPostDetsName = ''
if (item1.Nav_ResultPostDets && item1.Nav_ResultPostDets.length > 0) {
item1.Nav_ResultPostDets.map(item2 => {
if (item2.Nav_Post && item2.Nav_Post.NAME !== null) {
Nav_ResultPostDetsName += item2.Nav_Post.NAME + ' ';
}
})
}
item1.Nav_ResultPostDetsName = Nav_ResultPostDetsName
}
})
}
}) })
this.stepLoad = false this.stepLoad = false
}) })
}, },
handlePack(index) { handleDelRowMeasures(item, item1) {
this.dataModel.Nav_Details[index].showPack = this.dataModel.Nav_Details[index].showPack == false ? true : false item1.IS_DELETED = true
this.dataModel.Nav_Details = [...this.dataModel.Nav_Details] this.$forceUpdate()
},
handleDelRowPost(item, item1) {
item1.IS_DELETED = true
this.$forceUpdate()
},
handleNewMeasures(item) {
item.Nav_DetailMeasures.unshift({
NUM: 1,
ID: guid(),
RISK_IDENTIFY_DETAIL_ID: item.ID,
MEASURE: '',
IS_DELETED: false,
})
},
handleNewPost(item) {
item.Nav_DetailPosts.unshift({
DEPARTMENT_TYPE: '',
ID: guid(),
RISK_IDENTIFY_DETAIL_ID: item.ID,
Nav_Department: {
NAME: ''
},
DEPARTMENT_ID: '',
Nav_ResultPostDets: [],
IS_DELETED: false,
})
},
showDetail(id) {
uni.navigateTo({
url: 'SK003Show?ID=' + id + '&taskID=' + this.TaskID
})
},
handlePack(item) {
item.showPack = item.showPack == false ? true : false
this.$forceUpdate()
}, },
cancelUnit() { cancelUnit() {
this.showPopupUnit = false this.showPopupUnit = false
}, },
handleChangeUnit(index, name) { handleChangeUnit(item, name) {
this.nowIndex = [index, name] this.nowName = name
this.nowItem = item
if (name == 'MinType') { if (name == 'MinType') {
const json = initFilter(this.ORG_ID) const json = initFilter(this.ORG_ID)
getRequest(json, "/FM/UserProductionUnitSet/OrderPaged").then(res => { getRequest(json, "/FM/UserProductionUnitSet/OrderPaged").then(res => {
this.UnitLists = [res] this.UnitLists = [res]
}) })
} else if (this.nowIndex[1] == 'ENABLE_STATUS') {
this.UnitLists = [SKEffective]
} else { } else {
this.UnitLists = [SKMarkEnum] this.UnitLists = [this.enumsData[name]]
} }
this.showPopupUnit = true this.showPopupUnit = true
}, },
confirmUnit(e) { confirmUnit(e) {
if (this.nowIndex[1] == 'MinType') { console.log(e, '999')
this.dataModel.Nav_Details[this.nowIndex[0]].Nav_ProductionUnit = e.value[0] if (this.nowName == 'MinType') {
this.dataModel.Nav_Details[this.nowIndex[0]].PRODUCTION_UNIT_ID = e.value[0].ID this.nowItem.Nav_ProductionUnit = e.value[0]
} else if (this.nowIndex[1] == 'ENABLE_STATUS') { this.nowItem.PRODUCTION_UNIT_ID = e.value[0].ID
this.dataModel.Nav_Details[this.nowIndex[0]].ENABLE_STATUS = e.value[0]
} else { } else {
this.dataModel.Nav_Details[this.nowIndex[0]].MARK = e.value[0] this.nowItem.DEPARTMENT_TYPE = e.value[0].code
this.nowItem.DEPARTMENT_TYPE_NAME = e.value[0].name
} }
this.showPopupUnit = false this.showPopupUnit = false
},
async handleShowSheet(p) {
const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId, "", "", 0, p.pageIndex ?? 1)
let dataSelect = []
// this.selectorInfo.defaultChecked = []
var defaultChecked = []
this.selectorInfo.isMultiple = false
if (p.val) {
extendRule(json, 'NAME', 9, p.val);
}
json.Limit = 20
if (p.pageIndex) {
json.Start = (p.pageIndex - 1) * json.Limit;
}
json.Sort = "NAME"
if (p.name == "Nav_Area") {
dataSelect = await GetRiskAreaInfo(json).then(res => {
console.log(res, '99')
this.selectorInfo.totalCount = res.TotalCount
if (res.Data != undefined && res.Data.length > 0) {
for (let i = 0; i < res.Data.length; i++) {
res.Data[i].name = res.Data[i].NAME
}
}
return res.Data
})
} else if (p.name == "Nav_Type") {
dataSelect = await GetRiskTypeInfo(json).then(res => {
if (res.Data != undefined && res.Data.length > 0) {
for (let i = 0; i < res.Data.length; i++) {
res.Data[i].name = res.Data[i].NAME
}
}
return res.Data
})
} else if (p.name == "Nav_Department") {
dataSelect = await GetDepartmentInfo(json).then(res => {
if (res.Data != undefined && res.Data.length > 0) {
for (let i = 0; i < res.Data.length; i++) {
res.Data[i].name = res.Data[i].NAME
}
}
return res.Data
})
} else if (p.name == "Nav_ResultPostDets") {
this.selectorInfo.isMultiple = true
if (p.itemData.DEPARTMENT_ID) {
extendRule(json, 'DEPARTMENT_ID', 1, p.itemData.DEPARTMENT_ID);
}
json.SelectField = ["ID", "NAME", "NAME"]
dataSelect = await GetPostOrderPaged(json).then(res => {
if (res.Data != undefined && res.Data.length > 0) {
for (let i = 0; i < res.length; i++) {
res[i].name = res.Data[i].NAME
res[i].code = res.Data[i].CODE
}
}
return res.Data
})
if (p.itemData.Nav_ResultPostDets && p.itemData.Nav_ResultPostDets.length > 0) {
// this.selectorInfo.defaultChecked = []
p.itemData.Nav_ResultPostDets.filter(i => !i.IS_DELETED).forEach(e => {
if (e.Nav_Post != null && e.Nav_Post.NAME != null)
defaultChecked.push(e.Nav_Post)
})
} else {
defaultChecked = null
}
}
if (defaultChecked == null)
defaultChecked = []
if (dataSelect.length) {
this.selectorInfo = {
itemData: p.itemData != undefined ? p.itemData : this.selectorInfo
.itemData, //itemData: p.itemData, 搜索的时候 p.itemData为空 赋值修改 为 她自己本身 this.selectorInfo.itemData
isMultiple: this.selectorInfo.isMultiple,
totalCount: this.selectorInfo.totalCount,
showPopup: true,
title: p.title,
name: p.name,
dataLists: dataSelect,
defaultChecked: defaultChecked
}
} else {
// 暂无数据
}
},
//数据加载
handleSearch(val, pageIndex) {
var p = {
name: this.selectorInfo.name,
title: this.selectorInfo.title,
val: val,
pageIndex: pageIndex,
index: this.selectorInfo.index
}
this.handleShowSheet(p)
},
handleSelected(e) {
this.selectorInfo.showPopup = false
console.log(e, '999')
if (this.selectorInfo.name == 'Nav_Area') {
this.selectorInfo.itemData.Nav_Area = e
this.selectorInfo.itemData.AREA_ID = e.ID
} else if (this.selectorInfo.name == 'Nav_Type') {
this.selectorInfo.itemData.Nav_Type = e
this.selectorInfo.itemData.TYPE_ID = e.ID
} else if (this.selectorInfo.name == 'Nav_Department') {
this.selectorInfo.itemData.Nav_Department = e
this.selectorInfo.itemData.DEPARTMENT_ID = e.ID
} else if (this.selectorInfo.name == 'Nav_ResultPostDets') {
let listArea = []
let areaShow = ''
if (e.length > 0) {
e.forEach((item, i) => {
if (item.name != null || item.NAME != null) {
if (i > 0) {
areaShow += ' '
}
listArea.push({
ID: guid(),
RISK_IDENTIFY_DETAIL_RESULT_POST_ID: this.selectorInfo.itemData.ID,
POST_ID: item.ID,
ORG_ID: item.ORG_ID,
Nav_Post: item
})
areaShow += item.NAME
}
})
}
this.selectorInfo.itemData.Nav_ResultPostDets = listArea
this.selectorInfo.itemData.Nav_ResultPostDetsName = areaShow
}
}, },
stepAdd() { stepAdd() {
if (!this.dataModel.YEAR) { if (!this.dataModel.YEAR) {
@ -397,9 +644,6 @@
}, },
ORG_ID: this.ORG_ID, ORG_ID: this.ORG_ID,
RISK_NAME: '', RISK_NAME: '',
Nav_RiskName:{
NAME: ''
},
RISK_DESCRIPTION: '', RISK_DESCRIPTION: '',
Nav_Type: { Nav_Type: {
NAME: '' NAME: ''
@ -409,14 +653,143 @@
IDENTIFY_POST: '', IDENTIFY_POST: '',
MEASURE: '', MEASURE: '',
EMERGENCY: '', EMERGENCY: '',
ENABLE_STATUS: '有效', Nav_DetailMeasures: [],
Nav_DetailPosts: [],
MARK: this.enumsData['SKMarkEnum'].find(item1 => item1.name === '新增').code,
MARK_NAME: this.enumsData['SKMarkEnum'].find(item1 => item1.name === '新增').name,
ID: guid()
}) })
this.dataModel.Nav_Details = [...this.dataModel.Nav_Details] this.dataModel.Nav_Details = [...this.dataModel.Nav_Details]
}, },
handleDelRowBefore(index) { handleNewCheckList() {
this.showDelModalIndex = index // 将现有数据传递给选择页面用于去重判断
this.nowIndex = index const existingData = this.dataModel.Nav_Details.map(item => ({
PRODUCTION_UNIT_ID: item.PRODUCTION_UNIT_ID,
AREA_ID: item.AREA_ID,
RISK_NAME: item.RISK_NAME
}))
uni.navigateTo({
url: `/pages/apply/subPages/SK/enterprise/enterpriseLibarary?existingData=${encodeURIComponent(JSON.stringify(existingData))}`,
events: {
// 监听页面返回的数据
confirm: (data) => {
this.handleEnterpriseSelection(data.selectedItems)
}
}
})
},
// 新增处理企业库选择结果的方法
handleEnterpriseSelection(selectedItems) {
if (!selectedItems || selectedItems.length === 0) return
const newDetails = []
const duplicateItems = []
selectedItems.forEach(enterpriseItem => {
// 检查是否与现有数据重复
const isDuplicate = this.dataModel.Nav_Details.filter(i => !i.IS_DELETED).some(existingItem =>
existingItem.AREA_ID === (enterpriseItem.AREA_ID || '') &&
existingItem.PRODUCTION_UNIT_ID === (enterpriseItem.PRODUCTION_UNIT_ID || '') &&
existingItem.RISK_NAME === (enterpriseItem.RISK_NAME || '')
)
if (isDuplicate) {
duplicateItems.push({
生产单元: enterpriseItem.Nav_ProductionUnit?.NAME || '',
辨识区域: enterpriseItem.Nav_Area?.NAME || '',
风险名称: enterpriseItem.RISK_NAME || ''
})
return
}
const convertedMeasures = (enterpriseItem.Nav_Details || [])
.map((item, index) => ({
...item,
MEASURE: item.MEASURES_NAME, // 措施名称
}))
const convertedItem = {
showPack: false,
PRODUCTION_UNIT_ID: enterpriseItem.PRODUCTION_UNIT_ID || '',
Nav_ProductionUnit: enterpriseItem.Nav_ProductionUnit || {
NAME: ''
},
AREA_ID: enterpriseItem.AREA_ID || '',
Nav_Area: enterpriseItem.Nav_Area || {
NAME: ''
},
RISK_NAME: enterpriseItem.RISK_NAME || '',
Nav_DetailMeasures: convertedMeasures,
Nav_DetailPosts: [],
RISK_DESCRIPTION: enterpriseItem.RISK_DESCRIPTION || '',
TYPE_ID: enterpriseItem.TYPE_ID || '',
Nav_Type: enterpriseItem.Nav_Type || {
NAME: ''
},
MEASURE: enterpriseItem.MEASURE || '',
EMERGENCY: enterpriseItem.EMERGENCY || '',
MARK: this.enumsData['SKMarkEnum'].find(item1 => item1.name === '新增').code,
MARK_NAME: this.enumsData['SKMarkEnum'].find(item1 => item1.name === '新增').name,
ORG_ID: this.ORG_ID,
ID: guid()
}
newDetails.push(convertedItem)
})
// 处理重复项提示
if (duplicateItems.length > 0) {
const duplicateCount = duplicateItems.length
let message = ''
if (duplicateCount === 1) {
const dup = duplicateItems[0]
message = `以下数据已存在，无法重复导入：\n生产单元：${dup.生产单元}\n辨识区域：${dup.辨识区域}\n风险名称：${dup.风险名称}`
} else {
message = `有 ${duplicateCount} 条数据已存在，无法重复导入：\n`
duplicateItems.slice(0, 3).forEach((dup, i) => {
message += `${i+1}. ${dup.生产单元} / ${dup.辨识区域} / ${dup.风险名称}\n`
})
if (duplicateCount > 3) {
message += `...等共 ${duplicateCount} 条`
}
}
setTimeout(() => {
uni.showModal({
title: '重复数据提示',
content: message,
showCancel: false,
confirmText: '知道了'
})
}, 100) // 延迟100毫秒
}
if (newDetails.length > 0) {
this.dataModel.Nav_Details.push(...newDetails)
setTimeout(() => {
uni.showToast({
title: `成功导入 ${newDetails.length} 条数据${duplicateItems.length > 0 ? `，跳过 ${duplicateItems.length} 条重复数据` : ''}`,
icon: 'success',
duration: 2000
})
}, 100)
} else if (duplicateItems.length > 0) {
setTimeout(() => {
uni.showToast({
title: `所选数据均重复，未导入任何内容`,
icon: 'none',
duration: 2000
})
}, 100)
}
},
handleDelRowBefore(item) {
item.IS_DELETED = true
this.$forceUpdate()
}, },
@ -449,10 +822,11 @@
this.showPopupRecitifyDate = false this.showPopupRecitifyDate = false
}, },
handleChangeStep(index, name) { handleChangeStep(item, name) {
this.currentOperateStep = {} this.currentOperateStep = {}
this.showPopupStep = true this.showPopupStep = true
this.nowIndex = [index, name] this.nowName = name
this.nowItem = item
this.handleSearchStep('init') this.handleSearchStep('init')
}, },
handleClosePopupStep() { handleClosePopupStep() {
@ -460,7 +834,8 @@
// this.showPopupCertificate = false // this.showPopupCertificate = false
}, },
handleSearchStep(val, pageIndex) { handleSearchStep(val, pageIndex) {
let requestInfo = this.nowIndex[1] == 'demand' ? GetSKRequestInfo : this.nowIndex[1] == 'Area' ? GetRiskAreaInfo : this.nowIndex[1] == 'RiskName' ? GetRiskNameInfo:GetRiskTypeInfo let requestInfo = this.nowName == 'Area' ? GetRiskAreaInfo : this.nowName == 'RiskName' ? GetRiskNameInfo : this.nowName == 'Category' ? GetRiskTypeInfo : this.nowName == 'Nav_ResultPostDets' ?
GetPostOrderPaged : GetDepartmentInfo
const orgId = uni.getStorageSync('orgId') const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId, "", "", 0, pageIndex ?? 1) const json = initFilter(orgId, "", "", 0, pageIndex ?? 1)
json.Limit = 20 json.Limit = 20
@ -489,18 +864,17 @@
}, },
handleSelectedStep(val) { handleSelectedStep(val) {
if (this.nowIndex[1] == 'demand') { if (this.nowName == 'demand') {
this.dataModel.Nav_Require.NAME = val.NAME this.dataModel.Nav_Require.NAME = val.NAME
this.dataModel.REQUIRE_ID = val.ID this.dataModel.REQUIRE_ID = val.ID
this.dataModel.RequireName = val.NAME this.dataModel.RequireName = val.NAME
} else if (this.nowIndex[1] == 'Area') { } else if (this.nowName == 'Area') {
this.dataModel.Nav_Details[this.nowIndex[0]].Nav_Area.NAME = val.NAME this.dataModel.Nav_Details[this.nowIndex[0]].Nav_Area.NAME = val.NAME
this.dataModel.Nav_Details[this.nowIndex[0]].AREA_ID = val.ID this.dataModel.Nav_Details[this.nowIndex[0]].AREA_ID = val.ID
} else if (this.nowIndex[1] == 'RiskName') { } else if (this.nowName == 'RiskName') {
this.dataModel.Nav_Details[this.nowIndex[0]].Nav_RiskName.NAME = val.NAME this.dataModel.Nav_Details[this.nowIndex[0]].Nav_RiskName.NAME = val.NAME
this.dataModel.Nav_Details[this.nowIndex[0]].RISK_NAME_ID = val.ID this.dataModel.Nav_Details[this.nowIndex[0]].RISK_NAME_ID = val.ID
} } else {
else {
this.dataModel.Nav_Details[this.nowIndex[0]].Nav_Type.NAME = val.NAME this.dataModel.Nav_Details[this.nowIndex[0]].Nav_Type.NAME = val.NAME
this.dataModel.Nav_Details[this.nowIndex[0]].TYPE_ID = val.ID this.dataModel.Nav_Details[this.nowIndex[0]].TYPE_ID = val.ID
} }
@ -510,7 +884,7 @@
submit() { submit() {
let i = 1 let i = 1
for (let item of this.dataModel.Nav_Details) { for (let item of this.dataModel.Nav_Details.filter(i => !i.IS_DELETED)) {
if (!item.PRODUCTION_UNIT_ID) { if (!item.PRODUCTION_UNIT_ID) {
uni.showToast({ uni.showToast({
title: '顺序' + i + '生产单元不能为空', title: '顺序' + i + '生产单元不能为空',
@ -555,40 +929,49 @@
} }
i++ i++
} }
console.log(this.dataModel, 'this.dataModel')
// this.model = this.dataModel this.model = this.dataModel
this.model.ORG_ID = this.ORG_ID this.model.ORG_ID = this.ORG_ID
let arr = [] delete this.model.Nav_ApplyDepartment
delete this.model.Nav_ApplyUser
delete this.model.Nav_Require
delete this.model.Nav_RequiresName
this.dataModel.Nav_Details.map(item => { // let arr = []
arr.push({
PRODUCTION_UNIT_ID: item.PRODUCTION_UNIT_ID, this.model.Nav_Details.map(item => {
AREA_ID: item.AREA_ID, delete item.Nav_Area
RISK_NAME: item.RISK_NAME, delete item.Nav_ProductionUnit
RISK_NAME_ID: item.RISK_NAME_ID, delete item.Nav_Type
RISK_DESCRIPTION: item.RISK_DESCRIPTION, delete item.MARK_NAME
TYPE_ID: item.TYPE_ID, delete item.showPack
DEPARTMENT_TYPE:item.DEPARTMENT_TYPE, if (item.Nav_DetailPosts && item.Nav_DetailPosts.length > 0) {
IDENTIFY_DEPARTMENT:item.IDENTIFY_DEPARTMENT, item.Nav_DetailPosts.map(item1 => {
IDENTIFY_POST:item.IDENTIFY_POST, delete item1.Nav_Department
MEASURE: item.MEASURE, delete item1.DEPARTMENT_TYPE_NAME
EMERGENCY: item.EMERGENCY, delete item1.Nav_ResultPostDetsName
ENABLE_STATUS: !item.ENABLE_STATUS ? 0 : item.ENABLE_STATUS == '有效' ? 0 : 10, if (item1.Nav_ResultPostDets && item1.Nav_ResultPostDets.length > 0) {
item1.Nav_ResultPostDets.map(item2 => {
delete item2.Nav_Post
}) })
})
this.model = {
ORG_ID: this.ORG_ID,
YEAR: this.dataModel.YEAR,
START_DATE: this.dataModel.START_DATE,
END_DATE: this.dataModel.END_DATE,
REQUIRE_ID: this.dataModel.REQUIRE_ID,
RequireName: this.dataModel.RequireName,
IDENTIFY_EVALUATION_PLAN_ID:this.dataModel.IDENTIFY_EVALUATION_PLAN_ID,
IDENTIFY_ID:this.dataModel.IDENTIFY_ID,
Nav_Files: this.dataModel.Nav_Files,
Nav_Details: arr
} }
})
}
})
// this.model = {
// ORG_ID: this.ORG_ID,
// YEAR: this.dataModel.YEAR,
// START_DATE: this.dataModel.START_DATE,
// END_DATE: this.dataModel.END_DATE,
// REQUIRE_ID: this.dataModel.REQUIRE_ID,
// RequireName: this.dataModel.RequireName,
// IDENTIFY_EVALUATION_PLAN_ID: this.dataModel.IDENTIFY_EVALUATION_PLAN_ID,
// IDENTIFY_ID: this.dataModel.IDENTIFY_ID,
// Nav_Files: this.dataModel.Nav_Files,
// Nav_Details: arr
// }
this.model.ID = this.ID this.model.ID = this.ID
this.model.TaskID = this.TaskID this.model.TaskID = this.TaskID
this.model.PUBLISH = "SaveAndNotify"; this.model.PUBLISH = "SaveAndNotify";

111
pages/apply/subPages/SK/riskSafeIdenResShow.vue
View File

@ -38,7 +38,7 @@
</u-form-item> </u-form-item>
<u-form-item label="辨识要求"> <u-form-item label="辨识要求">
</u-form-item> </u-form-item>
<u--textarea v-model="dataModel.Nav_Require.NAME" disabled autoHeight></u--textarea> <u--textarea v-model="dataModel.Nav_RequiresName" disabled autoHeight></u--textarea>
<view class="upload-title">附件：</view> <view class="upload-title">附件：</view>
<full-upload v-model="dataModel.Nav_Files" :isShowBtn='false' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload> <full-upload v-model="dataModel.Nav_Files" :isShowBtn='false' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
<view style="margin-top: 20px;"> <view style="margin-top: 20px;">
@ -56,8 +56,8 @@
{{index+1+'.辨识区域：'+item.Nav_Area.NAME}} {{index+1+'.辨识区域：'+item.Nav_Area.NAME}}
</view> </view>
<view class="action" style="display: flex;flex-direction: row;align-items: center;justify-content: space-around;"> <view class="action" style="display: flex;flex-direction: row;align-items: center;justify-content: space-around;">
<u-icon name="arrow-up" size="12" v-if="item.showPack" @click="handlePack(index)"></u-icon> <u-icon name="arrow-up" size="12" v-if="item.showPack" @click="handlePack(item)"></u-icon>
<u-icon name="arrow-down" size="12" v-if="!item.showPack" @click="handlePack(index)"></u-icon> <u-icon name="arrow-down" size="12" v-if="!item.showPack" @click="handlePack(item)"></u-icon>
</view> </view>
</view> </view>
</u-form-item> </u-form-item>
@ -78,26 +78,54 @@
<u--input v-model="item.Nav_Type.NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none"> <u--input v-model="item.Nav_Type.NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input> </u--input>
</u-form-item> </u-form-item>
<uni-collapse class="collapse" ref="collapse">
<uni-collapse-item title="管控措施" name="Variety components">
<view v-if="item.Nav_DetailMeasures&&item.Nav_DetailMeasures.length!==0">
<view v-for="item1 in item.Nav_DetailMeasures" style="margin: 5px 5px;padding: 0px 10px;">
<u-form-item label="序号" prop="HIDDEN_DESCRIPTION" border-bottom>
<view slot="right" style="display: flex;flex-direction: row;align-items: center;">
<u-number-box v-model="item1.NUM" disabled integer></u-number-box>
</view>
</u-form-item>
<u-form-item label="措施" prop="HIDDEN_DESCRIPTION">
</u-form-item>
<u--textarea v-model="item1.MEASURE" disabled autoHeight></u--textarea>
</view>
</view>
</uni-collapse-item>
<uni-collapse-item title="辨识岗位" name="Docs guide">
<view v-if="item.Nav_DetailPosts&&item.Nav_DetailPosts.length>0">
<view v-for="(item1,index1) in item.Nav_DetailPosts" style="padding: 10px;">
<u-form-item label="辨识层级" prop="HIDDEN_PLACE" border-bottom > <u-form-item label="辨识层级" prop="HIDDEN_PLACE" border-bottom >
<u--input v-model="item.DEPARTMENT_TYPE" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none"> <u--input v-model="item1.DEPARTMENT_TYPE_NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="辨识部门" prop="HIDDEN_PLACE" border-bottom > <u-form-item label="辨识部门" prop="HIDDEN_PLACE" border-bottom >
<u--input v-model="item.IDENTIFY_DEPARTMENT" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none"> <u--input v-model="(item1.Nav_Department||{}).NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="辨识岗位" prop="HIDDEN_PLACE" border-bottom > <u-form-item label="辨识岗位" prop="HIDDEN_PLACE" border-bottom >
<u--input v-model="item.IDENTIFY_POST" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input>
</u-form-item> </u-form-item>
<u-form-item label="管控措施" prop="HIDDEN_PLACE" border-bottom> <u-textarea v-model="item1.Nav_ResultPostDetsName" disabled autoHeight ></u-textarea>
</u-form-item> </view>
<u--textarea v-model="item.MEASURE" disabled placeholder="请填写管控措施" autoHeight maxlength="-1"></u--textarea> </view>
</uni-collapse-item>
</uni-collapse>
<u-form-item label="应急处置" prop="HIDDEN_PLACE" border-bottom> <u-form-item label="应急处置" prop="HIDDEN_PLACE" border-bottom>
</u-form-item> </u-form-item>
<u--textarea v-model="item.EMERGENCY" disabled autoHeight maxlength="-1"></u--textarea> <u--textarea v-model="item.EMERGENCY" disabled autoHeight maxlength="-1"></u--textarea>
<u-form-item label="状态" prop="HIDDEN_PLACE"> <u-form-item label="新增标识" prop="HIDDEN_PLACE" border-bottom>
<u--input v-model="item.ENABLE_STATUS" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none"> <u--input v-model="item.MARK_NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input> </u--input>
</u-form-item> </u-form-item>
</view> </view>
@ -121,7 +149,12 @@
extendRule, extendRule,
extendIgnoreDataRule, extendIgnoreDataRule,
initFilter, initFilter,
transformData
} from '../../../../utils/common' } from '../../../../utils/common'
import {
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
import { import {
MineTypeName MineTypeName
} from '../../../../utils/enums.js' } from '../../../../utils/enums.js'
@ -218,6 +251,8 @@
TaskID: '', TaskID: '',
nowName: '', nowName: '',
nowIndex: 0, nowIndex: 0,
enumsData: {}, // 存储所有枚举数据（键：枚举名称，值：处理后的枚举列表）
enumsText: {} // 存储枚举文本列表（用于下拉选择等场景）
} }
}, },
@ -233,9 +268,21 @@
...this.$store.state.auditModel, ...this.$store.state.auditModel,
TaskID: option.taskID ? option.taskID : '' TaskID: option.taskID ? option.taskID : ''
} }
this.loadData() this.fetchEnums(['SKMarkEnum', 'SKEnableStatusEnum', 'SKDepartmentTypeEnum']);
}, },
methods: { methods: {
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() { loadData() {
// const json = {} // const json = {}
const orgId = uni.getStorageSync('orgId') const orgId = uni.getStorageSync('orgId')
@ -262,21 +309,45 @@
this.dataModel.CREATE_TIME = uni.$u.timeFormat(res.CREATE_TIME, 'yyyy-mm-dd') this.dataModel.CREATE_TIME = uni.$u.timeFormat(res.CREATE_TIME, 'yyyy-mm-dd')
this.dataModel.START_DATE = uni.$u.timeFormat(res.START_DATE, 'yyyy-mm-dd') this.dataModel.START_DATE = uni.$u.timeFormat(res.START_DATE, 'yyyy-mm-dd')
this.dataModel.END_DATE = uni.$u.timeFormat(res.END_DATE, 'yyyy-mm-dd') this.dataModel.END_DATE = uni.$u.timeFormat(res.END_DATE, 'yyyy-mm-dd')
this.dataModel.RequireName = res.Nav_Require.NAME let Nav_RequiresName = ''
if (this.dataModel.Nav_Requires && this.dataModel.Nav_Requires.length > 0) {
this.dataModel.Nav_Requires.map(item => {
if (item.Nav_Require && item.Nav_Require.NAME !== null) {
Nav_RequiresName += item.Nav_Require.NAME + ' ';
}
})
}
this.dataModel.Nav_RequiresName = Nav_RequiresName
this.dataModel.Nav_Details.map(item => { this.dataModel.Nav_Details.map(item => {
item['showPack'] = false item['showPack'] = false
item.ENABLE_STATUS = item.ENABLE_STATUS == 0 ? '有效' : '无效' item.MARK_NAME = item.MARK !== undefined ? this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name : '';
item.Nav_RiskName = item.Nav_RiskName? item.Nav_RiskName: { if (item.Nav_DetailPosts && item.Nav_DetailPosts.length > 0) {
NAME: ''} item.Nav_DetailPosts.map(item1 => {
item1.DEPARTMENT_TYPE_NAME = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item2 => item2.code === item1.DEPARTMENT_TYPE).name :
'';
if (item1.Nav_ResultPostDets && item1.Nav_ResultPostDets.length > 0) {
let Nav_ResultPostDetsName = ''
if (item1.Nav_ResultPostDets && item1.Nav_ResultPostDets.length > 0) {
item1.Nav_ResultPostDets.map(item2 => {
if (item2.Nav_Post && item2.Nav_Post.NAME !== null) {
Nav_ResultPostDetsName += item2.Nav_Post.NAME + ' ';
}
})
}
item1.Nav_ResultPostDetsName = Nav_ResultPostDetsName
}
})
}
}) })
this.stepLoad = false this.stepLoad = false
}) })
this.isLoadOK = true this.isLoadOK = true
}, },
handlePack(index) { handlePack(item) {
this.dataModel.Nav_Details[index].showPack = this.dataModel.Nav_Details[index].showPack == false ? true : false item.showPack = item.showPack == false ? true : false
this.dataModel.Nav_Details = [...this.dataModel.Nav_Details] this.$forceUpdate()
}, },
submit() { submit() {

112
pages/apply/subPages/SK/riskSafeIdenSumShow.vue
View File

@ -38,7 +38,7 @@
</u-form-item> </u-form-item>
<u-form-item label="辨识要求"> <u-form-item label="辨识要求">
</u-form-item> </u-form-item>
<u--textarea v-model="dataModel.Nav_Require.NAME" disabled autoHeight></u--textarea> <u--textarea v-model="dataModel.Nav_RequiresName" disabled autoHeight></u--textarea>
<view class="upload-title">附件：</view> <view class="upload-title">附件：</view>
<full-upload v-model="dataModel.Nav_Files" :isShowBtn='false' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload> <full-upload v-model="dataModel.Nav_Files" :isShowBtn='false' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
<view style="margin-top: 20px;"> <view style="margin-top: 20px;">
@ -56,8 +56,8 @@
{{index+1+'.辨识区域：'+item.Nav_Area.NAME}} {{index+1+'.辨识区域：'+item.Nav_Area.NAME}}
</view> </view>
<view class="action" style="display: flex;flex-direction: row;align-items: center;justify-content: space-around;"> <view class="action" style="display: flex;flex-direction: row;align-items: center;justify-content: space-around;">
<u-icon name="arrow-up" size="12" v-if="item.showPack" @click="handlePack(index)"></u-icon> <u-icon name="arrow-up" size="12" v-if="item.showPack" @click="handlePack(item)"></u-icon>
<u-icon name="arrow-down" size="12" v-if="!item.showPack" @click="handlePack(index)"></u-icon> <u-icon name="arrow-down" size="12" v-if="!item.showPack" @click="handlePack(item)"></u-icon>
</view> </view>
</view> </view>
</u-form-item> </u-form-item>
@ -78,26 +78,54 @@
<u--input v-model="item.Nav_Type.NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none"> <u--input v-model="item.Nav_Type.NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input> </u--input>
</u-form-item> </u-form-item>
<uni-collapse class="collapse" ref="collapse">
<uni-collapse-item title="管控措施" name="Variety components">
<view v-if="item.Nav_DetailMeasures&&item.Nav_DetailMeasures.length!==0">
<view v-for="item1 in item.Nav_DetailMeasures" style="margin: 5px 5px;padding: 0px 10px;">
<u-form-item label="序号" prop="HIDDEN_DESCRIPTION" border-bottom>
<view slot="right" style="display: flex;flex-direction: row;align-items: center;">
<u-number-box v-model="item1.NUM" disabled integer></u-number-box>
</view>
</u-form-item>
<u-form-item label="措施" prop="HIDDEN_DESCRIPTION">
</u-form-item>
<u--textarea v-model="item1.MEASURE" disabled autoHeight></u--textarea>
</view>
</view>
</uni-collapse-item>
<uni-collapse-item title="辨识岗位" name="Docs guide">
<view v-if="item.Nav_DetailPosts&&item.Nav_DetailPosts.length>0">
<view v-for="(item1,index1) in item.Nav_DetailPosts" style="padding: 10px;">
<u-form-item label="辨识层级" prop="HIDDEN_PLACE" border-bottom> <u-form-item label="辨识层级" prop="HIDDEN_PLACE" border-bottom>
<u--input v-model="item.DEPARTMENT_TYPE" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none"> <u--input v-model="item1.DEPARTMENT_TYPE_NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="辨识部门" prop="HIDDEN_PLACE" border-bottom> <u-form-item label="辨识部门" prop="HIDDEN_PLACE" border-bottom>
<u--input v-model="item.IDENTIFY_DEPARTMENT" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none"> <u--input v-model="(item1.Nav_Department||{}).NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="辨识岗位" prop="HIDDEN_PLACE" border-bottom> <u-form-item label="辨识岗位" prop="HIDDEN_PLACE" border-bottom>
<u--input v-model="item.IDENTIFY_POST" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input>
</u-form-item> </u-form-item>
<u-form-item label="管控措施" prop="HIDDEN_PLACE" border-bottom> <u-textarea v-model="item1.Nav_ResultPostDetsName" disabled autoHeight></u-textarea>
</u-form-item> </view>
<u--textarea v-model="item.MEASURE" disabled autoHeight maxlength="-1"></u--textarea> </view>
</uni-collapse-item>
</uni-collapse>
<u-form-item label="应急处理" prop="HIDDEN_PLACE" border-bottom> <u-form-item label="应急处理" prop="HIDDEN_PLACE" border-bottom>
</u-form-item> </u-form-item>
<u--textarea v-model="item.EMERGENCY" disabled autoHeight maxlength="-1"></u--textarea> <u--textarea v-model="item.EMERGENCY" disabled autoHeight maxlength="-1"></u--textarea>
<u-form-item label="状态" prop="HIDDEN_PLACE"> <u-form-item label="新增标识" prop="HIDDEN_PLACE" border-bottom>
<u--input v-model="item.ENABLE_STATUS" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none"> <u--input v-model="item.MARK_NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input> </u--input>
</u-form-item> </u-form-item>
</view> </view>
@ -121,10 +149,15 @@
extendRule, extendRule,
extendIgnoreDataRule, extendIgnoreDataRule,
initFilter, initFilter,
transformData
} from '../../../../utils/common' } from '../../../../utils/common'
import { import {
MineTypeName MineTypeName
} from '../../../../utils/enums.js' } from '../../../../utils/enums.js'
import {
getEnum,
GetEnumAnyOrder
} from '../../../../services/common';
import { import {
EvaIdentifySumGet, EvaIdentifySumGet,
} from '../../../../services/apply/subPages/SK/SKServices.js' } from '../../../../services/apply/subPages/SK/SKServices.js'
@ -218,6 +251,8 @@
TaskID: '', TaskID: '',
nowName: '', nowName: '',
nowIndex: 0, nowIndex: 0,
enumsData: {}, // 存储所有枚举数据（键：枚举名称，值：处理后的枚举列表）
enumsText: {} // 存储枚举文本列表（用于下拉选择等场景）
} }
}, },
@ -233,9 +268,21 @@
...this.$store.state.auditModel, ...this.$store.state.auditModel,
TaskID: option.taskID ? option.taskID : '' TaskID: option.taskID ? option.taskID : ''
} }
this.loadData() this.fetchEnums(['SKMarkEnum', 'SKEnableStatusEnum', 'SKDepartmentTypeEnum']);
}, },
methods: { methods: {
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() { loadData() {
// const json = {} // const json = {}
const orgId = uni.getStorageSync('orgId') const orgId = uni.getStorageSync('orgId')
@ -262,21 +309,45 @@
this.dataModel.CREATE_TIME = uni.$u.timeFormat(res.CREATE_TIME, 'yyyy-mm-dd') this.dataModel.CREATE_TIME = uni.$u.timeFormat(res.CREATE_TIME, 'yyyy-mm-dd')
this.dataModel.START_DATE = uni.$u.timeFormat(res.START_DATE, 'yyyy-mm-dd') this.dataModel.START_DATE = uni.$u.timeFormat(res.START_DATE, 'yyyy-mm-dd')
this.dataModel.END_DATE = uni.$u.timeFormat(res.END_DATE, 'yyyy-mm-dd') this.dataModel.END_DATE = uni.$u.timeFormat(res.END_DATE, 'yyyy-mm-dd')
this.dataModel.RequireName = res.Nav_Require.NAME let Nav_RequiresName = ''
if (this.dataModel.Nav_Requires && this.dataModel.Nav_Requires.length > 0) {
this.dataModel.Nav_Requires.map(item => {
if (item.Nav_Require && item.Nav_Require.NAME !== null) {
Nav_RequiresName += item.Nav_Require.NAME + ' ';
}
})
}
this.dataModel.Nav_RequiresName = Nav_RequiresName
this.dataModel.Nav_Details.map(item => { this.dataModel.Nav_Details.map(item => {
item['showPack'] = false item['showPack'] = false
item.ENABLE_STATUS = item.ENABLE_STATUS == 0 ? '有效' : '无效' item.MARK_NAME = item.MARK !== undefined ? this.enumsData['SKMarkEnum'].find(item1 => item1.code === item.MARK).name : '';
item.Nav_RiskName = item.Nav_RiskName? item.Nav_RiskName: { if (item.Nav_DetailPosts && item.Nav_DetailPosts.length > 0) {
NAME: ''} item.Nav_DetailPosts.map(item1 => {
item1.DEPARTMENT_TYPE_NAME = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item2 => item2.code === item1.DEPARTMENT_TYPE).name :
'';
if (item1.Nav_SumPostDets && item1.Nav_SumPostDets.length > 0) {
let Nav_ResultPostDetsName = ''
item1.Nav_SumPostDets.map(item2 => {
if (item2.Nav_Post && item2.Nav_Post.NAME !== null) {
Nav_ResultPostDetsName += item2.Nav_Post.NAME + ' ';
}
})
item1.Nav_ResultPostDetsName = Nav_ResultPostDetsName
}
})
}
}) })
this.stepLoad = false this.stepLoad = false
}) })
this.isLoadOK = true this.isLoadOK = true
}, },
handlePack(index) { handlePack(item) {
this.dataModel.Nav_Details[index].showPack = this.dataModel.Nav_Details[index].showPack == false ? true : false item.showPack = item.showPack == false ? true : false
this.dataModel.Nav_Details = [...this.dataModel.Nav_Details] this.$forceUpdate()
}, },
submit() { submit() {
@ -300,6 +371,7 @@
<style scoped> <style scoped>
@import url("../../../../style/css/newTemplate.css"); @import url("../../../../style/css/newTemplate.css");
.todo-page>>>.u-steps-item__line { .todo-page>>>.u-steps-item__line {
width: 187.6px !important; width: 187.6px !important;
} }