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

Merge branch 'main' of http://121.41.2.71:3000/ykx/jy-safe-app

Browse Source
This commit is contained in:
wyw 2026-04-16 15:06:58 +08:00
commit 0d96842248
38 changed files with 314 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/common.js
View File

@ -138,7 +138,7 @@ if (process.env.CUSTOM_PLATFORM === "dev") {
uni_app_web_video_source_url: APP_ENV === 'release' ? "http://124.117.209.78:5199" : uni_app_web_video_source_url: APP_ENV === 'release' ? "http://124.117.209.78:5199" :
"https://sps.cxtc.com:3199", // 视频资源地址 "https://sps.cxtc.com:3199", // 视频资源地址
uni_app_web_local_api_url: APP_ENV === 'release' ? "http://124.117.209.78" : uni_app_web_local_api_url: APP_ENV === 'release' ? "http://124.117.209.78" :
"http://localhost" //打包测试： 121.41.2.71 开发可 localhost "http://121.41.2.71" //打包测试： 121.41.2.71 开发可 localhost
} }

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "矿山安全生产标准化系统", "name" : "矿山安全生产标准化系统",
"appid" : "__UNI__DE7034E", //BBB1077 "appid" : "__UNI__DE7034E", //BBB1077
"description" : "厦钨矿山安全app", "description" : "厦钨矿山安全app",
"versionName" : "1.0.002", "versionName" : "1.0.005",
"versionCode" : 10002, "versionCode" : 10005,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {

2
pages/apply/subPages/FO/jobFireList.vue
View File

@ -149,7 +149,7 @@
}, },
showDetail(id) { showDetail(id) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/apply/subPages/FO/FO041Show?ID=' + id url: '/pages/apply/subPages/FO/jobFireShow?ID=' + id
}) })
}, },
handleShowPicker(p) { handleShowPicker(p) {

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

@ -184,7 +184,7 @@
</view> </view>
</uni-collapse> </uni-collapse>
</u--form> </u--form>
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="model" class="demo-ruleForm" style="margin-top: 20px;"> <u--form v-if="model.STATUS==30||model.FIRE_STATUS>15" labelPosition="left" labelWidth="auto" labelAlign="center" :model="model" class="demo-ruleForm" style="margin-top: 20px;">
<view style="position: relative;"> <view style="position: relative;">
<view style="position: absolute;left: -10px;color: #3d4b70;top: -3px;">*</view> <view style="position: absolute;left: -10px;color: #3d4b70;top: -3px;">*</view>
</view> </view>

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

@ -10,7 +10,7 @@
</view> </view>
<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view> <view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view>
<u-form-item label="生产单元：" border-bottom> <u-form-item label="生产单元：" border-bottom>
<u--input v-model="model.Product_Unit" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
</u--input> </u--input>
</u-form-item> </u-form-item>
@ -259,7 +259,6 @@
this.stepLoad = false this.stepLoad = false
this.model = res; this.model = res;
this.model.ID = this.ID this.model.ID = this.ID
this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.MineType).name : '';
this.model.EVALUATE_LEVELName = res.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item => item.code === res.EVALUATE_LEVEL).name : ''; this.model.EVALUATE_LEVELName = res.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item => item.code === res.EVALUATE_LEVEL).name : '';
this.model.ENABLE_STATUSName = res.ENABLE_STATUS !== undefined ? this.enumsData['FMEnableStatusEnum'].find(item => item.code === res.ENABLE_STATUS).name : ''; this.model.ENABLE_STATUSName = res.ENABLE_STATUS !== undefined ? this.enumsData['FMEnableStatusEnum'].find(item => item.code === res.ENABLE_STATUS).name : '';
if (this.model.Nav_Departs && this.model.Nav_Departs.length > 0) { if (this.model.Nav_Departs && this.model.Nav_Departs.length > 0) {

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

@ -11,7 +11,7 @@
<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view> <view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view>
<u-form-item required label="生产单元：" prop="Product_Unit" @click="handleChange('SKProductionUnit')"> <u-form-item required label="生产单元：" prop="Product_Unit" @click="handleChange('SKProductionUnit')">
<u--input v-model="model.Product_Unit" disabled disabledColor="#ffffff" placeholder="请选择生产单元" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.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">
</u-icon> </u-icon>
@ -256,7 +256,6 @@
GetCheckContentsNew(json).then(res => { GetCheckContentsNew(json).then(res => {
this.stepLoad = false this.stepLoad = false
this.model = res this.model = res
this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.MineType).name : '';
if (this.model.Nav_ListCheckQuestion && this.model.Nav_ListCheckQuestion.length > 0) { if (this.model.Nav_ListCheckQuestion && this.model.Nav_ListCheckQuestion.length > 0) {
this.model.Nav_ListCheckQuestion = this.model.Nav_ListCheckQuestion.sort((a, b) => a.NUM - b.NUM); this.model.Nav_ListCheckQuestion = this.model.Nav_ListCheckQuestion.sort((a, b) => a.NUM - b.NUM);
this.model.Nav_ListCheckQuestion.map(item => { this.model.Nav_ListCheckQuestion.map(item => {
@ -344,11 +343,14 @@
}, },
handleChange(name, item) { handleChange(name, item) {
if (name == 'SKProductionUnit') { if (name == 'SKProductionUnit') {
this.comPickerInfo = { const json = initFilter(this.ORG_ID)
showSheet: true, getRequest(json, "/FM/UserProductionUnitSet/OrderPaged").then(res => {
columns: [this.enumsText['SKProductionUnit']], this.comPickerInfo = {
name: name showSheet: true,
} columns: [res],
name: name
}
})
} else if (name == 'SKHiddenLevel') { } else if (name == 'SKHiddenLevel') {
this.comPickerInfo = { this.comPickerInfo = {
showSheet: true, showSheet: true,
@ -361,8 +363,8 @@
}, },
onConfirmPicker(e) { onConfirmPicker(e) {
if (this.comPickerInfo.name == 'SKProductionUnit') { if (this.comPickerInfo.name == 'SKProductionUnit') {
this.model.Product_Unit = e.value[0] this.model.Nav_ProductionUnit = e.value[0]
this.model.MineType = this.enumsData['SKProductionUnit'][e.indexs[0]].code this.model.PRODUCTION_UNIT_ID = e.value[0].ID
this.comPickerInfo = { this.comPickerInfo = {
showSheet: false, showSheet: false,
columns: [], columns: [],

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

@ -11,7 +11,7 @@
<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view> <view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view>
<u-form-item required label="生产单元：" prop="Product_Unit"> <u-form-item required label="生产单元：" prop="Product_Unit">
<u--input v-model="model.Product_Unit" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" 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">
</u-icon> --> </u-icon> -->
@ -256,7 +256,7 @@
GetCheckContentsNew(json).then(res => { GetCheckContentsNew(json).then(res => {
this.stepLoad = false this.stepLoad = false
this.model = res this.model = res
this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.MineType).name : '';
if (this.model.Nav_ListCheckQuestion && this.model.Nav_ListCheckQuestion.length > 0) { if (this.model.Nav_ListCheckQuestion && this.model.Nav_ListCheckQuestion.length > 0) {
this.model.Nav_ListCheckQuestion = this.model.Nav_ListCheckQuestion.sort((a, b) => a.NUM - b.NUM); this.model.Nav_ListCheckQuestion = this.model.Nav_ListCheckQuestion.sort((a, b) => a.NUM - b.NUM);
this.model.Nav_ListCheckQuestion.map(item => { this.model.Nav_ListCheckQuestion.map(item => {
@ -280,7 +280,7 @@
}, },
stepAdd() { stepAdd() {
if (!this.model.Product_Unit) { if (!this.model.PRODUCTION_UNIT_ID) {
uni.showToast({ uni.showToast({
title: '请选择生产单元', title: '请选择生产单元',
icon: 'none' icon: 'none'
@ -344,11 +344,14 @@
}, },
handleChange(name, item) { handleChange(name, item) {
if (name == 'SKProductionUnit') { if (name == 'SKProductionUnit') {
this.comPickerInfo = { const json = initFilter(this.ORG_ID)
showSheet: true, getRequest(json, "/FM/UserProductionUnitSet/OrderPaged").then(res => {
columns: [this.enumsText['SKProductionUnit']], this.comPickerInfo = {
name: name showSheet: true,
} columns: [res],
name: name
}
})
} else if (name == 'SKHiddenLevel') { } else if (name == 'SKHiddenLevel') {
this.comPickerInfo = { this.comPickerInfo = {
showSheet: true, showSheet: true,
@ -361,8 +364,8 @@
}, },
onConfirmPicker(e) { onConfirmPicker(e) {
if (this.comPickerInfo.name == 'SKProductionUnit') { if (this.comPickerInfo.name == 'SKProductionUnit') {
this.model.Product_Unit = e.value[0] this.model.Nav_ProductionUnit = e.value[0]
this.model.MineType = this.enumsData['SKProductionUnit'][e.indexs[0]].code this.model.PRODUCTION_UNIT_ID = e.value[0].ID
this.comPickerInfo = { this.comPickerInfo = {
showSheet: false, showSheet: false,
columns: [], columns: [],

16
pages/apply/subPages/SK/riskDouPreEdit.vue
View File

@ -1166,20 +1166,20 @@
}) })
return return
} }
// if (!item.RISK_NAME) { if (!item.RISK_NAME) {
// uni.showToast({
// title: '顺序'+i+'风险名称不能为空',
// icon: 'none'
// })
// return
// }
if (!item.Nav_RiskName.NAME) {
uni.showToast({ uni.showToast({
title: '顺序'+i+'风险名称不能为空', title: '顺序'+i+'风险名称不能为空',
icon: 'none' icon: 'none'
}) })
return return
} }
// if (!item.Nav_RiskName.NAME) {
// uni.showToast({
// title: '顺序'+i+'风险名称不能为空',
// icon: 'none'
// })
// return
// }
if (!item.RISK_DESCRIPTION) { if (!item.RISK_DESCRIPTION) {
uni.showToast({ uni.showToast({
title: '顺序'+i+'风险描述不能为空', title: '顺序'+i+'风险描述不能为空',

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

@ -71,7 +71,7 @@
</u-form-item> </u-form-item>
<view v-if="item.showPack==true"> <view v-if="item.showPack==true">
<u-form-item label="生产单元：" @click="handleChangeUnit('SKProductionUnit',item)" border-bottom> <u-form-item label="生产单元：" @click="handleChangeUnit('SKProductionUnit',item)" border-bottom>
<u--input v-model="item.MineTypeName" 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">
</u-icon> </u-icon>
@ -556,7 +556,7 @@
item.Nav_SCOREC = item.Nav_SCOREC ? item.Nav_SCOREC : { item.Nav_SCOREC = item.Nav_SCOREC ? item.Nav_SCOREC : {
SCORE: '' SCORE: ''
} }
item.MineTypeName = item.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item4 => item4.code === item.MineType).name : '';
item.EVALUATE_LEVELName = item.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item4 => item4.code === item.EVALUATE_LEVEL).name : ''; item.EVALUATE_LEVELName = item.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item4 => item4.code === item.EVALUATE_LEVEL).name : '';
item.Nav_DetailPosts.map(item1 => { item.Nav_DetailPosts.map(item1 => {
@ -784,14 +784,28 @@
this.showPopupUnit = false this.showPopupUnit = false
}, },
handleChangeUnit(name, item, index) { handleChangeUnit(name, item, index) {
// this.fetchEnums(['SKHiddenLevel', 'SKProductionUnit', 'SKEvaluateLevelEnum', 'SKDepartmentTypeEnum', 'SKPLANCHECKFREQUENCYEnum']); if (name == 'SKProductionUnit') {
this.comPickerInfo = { const json = initFilter(this.ORG_ID)
showSheet: true, getRequest(json, "/FM/UserProductionUnitSet/OrderPaged").then(res => {
columns: [this.enumsText[name]], this.comPickerInfo = {
dataItem: item, showSheet: true,
name: name, columns: [res],
index: index dataItem: item,
name: name,
index: index
}
})
} else {
this.comPickerInfo = {
showSheet: true,
columns: [this.enumsText[name]],
dataItem: item,
name: name,
index: index
}
} }
// this.fetchEnums(['SKHiddenLevel', 'SKProductionUnit', 'SKEvaluateLevelEnum', 'SKDepartmentTypeEnum', 'SKPLANCHECKFREQUENCYEnum']);
}, },
onConfirmPicker(e) { onConfirmPicker(e) {
if (this.comPickerInfo.name == 'SKHiddenLevel') { if (this.comPickerInfo.name == 'SKHiddenLevel') {
@ -804,8 +818,8 @@
} }
} else if (this.comPickerInfo.name == 'SKProductionUnit') { } else if (this.comPickerInfo.name == 'SKProductionUnit') {
this.comPickerInfo.dataItem.MineTypeName = e.value[0] this.comPickerInfo.dataItem.Nav_ProductionUnit = e.value[0]
this.comPickerInfo.dataItem.MineType = this.enumsData['SKProductionUnit'][e.indexs[0]].code this.comPickerInfo.dataItem.PRODUCTION_UNIT_ID = e.value[0].ID
} else if (this.comPickerInfo.name == 'SKEvaluateLevelEnum') { } else if (this.comPickerInfo.name == 'SKEvaluateLevelEnum') {
this.comPickerInfo.dataItem.EVALUATE_LEVELName = e.value[0] this.comPickerInfo.dataItem.EVALUATE_LEVELName = e.value[0]
@ -860,7 +874,10 @@
handleNewCheckContent() { handleNewCheckContent() {
this.model.Nav_DoubleDetails.push({ this.model.Nav_DoubleDetails.push({
showPack: false, showPack: false,
MineType: '', Nav_ProductionUnit: {
NAME: ''
},
PRODUCTION_UNIT_ID:'',
Nav_Area: { Nav_Area: {
NAME: '' NAME: ''
}, },
@ -1045,8 +1062,8 @@
this.nowName == 'Dep' || this.nowName == 'RecDep' || this.nowName == 'CheckThreeDep' ? this.nowName == 'Dep' || this.nowName == 'RecDep' || this.nowName == 'CheckThreeDep' ?
GetDepartmentInfo : this.nowName == 'RiskName' ? GetRiskNameInfo : getUserLists GetDepartmentInfo : this.nowName == 'RiskName' ? GetRiskNameInfo : getUserLists
if (this.nowName == 'CheckThreeType') { if (this.nowName == 'CheckThreeType') {
if (this.model.Nav_DoubleDetails[this.nowIndex[0]].MineType !== undefined && this.model.Nav_DoubleDetails[this.nowIndex[0]].MineType !== null) { if (this.model.Nav_DoubleDetails[this.nowIndex[0]].PRODUCTION_UNIT_ID !== undefined && this.model.Nav_DoubleDetails[this.nowIndex[0]].PRODUCTION_UNIT_ID !== null) {
extendRule(json, 'MineType', 1, String(this.model.Nav_DoubleDetails[this.nowIndex[0]].MineType)); extendRule(json, 'PRODUCTION_UNIT_ID', 1, String(this.model.Nav_DoubleDetails[this.nowIndex[0]].PRODUCTION_UNIT_ID));
} }
} }
@ -1269,7 +1286,7 @@
submit() { submit() {
let i = 1 let i = 1
for (let item of this.model.Nav_DoubleDetails) { for (let item of this.model.Nav_DoubleDetails) {
if (!item.MineTypeName) { if (!item.PRODUCTION_UNIT_ID) {
uni.showToast({ uni.showToast({
title: '顺序' + i + '生产单元不能为空', title: '顺序' + i + '生产单元不能为空',
icon: 'none' icon: 'none'

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

@ -74,7 +74,7 @@
</u-form-item> </u-form-item>
<view v-if="item.showPack==true"> <view v-if="item.showPack==true">
<u-form-item label="生产单元：" border-bottom> <u-form-item label="生产单元：" border-bottom>
<u--input v-model="item.MineType" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(item.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
</u--input> </u--input>
</u-form-item> </u-form-item>
@ -478,7 +478,7 @@
item['isShowControl'] = false item['isShowControl'] = false
item['isShowCheck'] = false item['isShowCheck'] = false
item['curNow'] = 0 item['curNow'] = 0
item.MineTypeName = item.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item4 => item4.code === item.MineType).name : '';
item.EVALUATE_LEVELName = item.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item4 => item4.code === item.EVALUATE_LEVEL).name : ''; item.EVALUATE_LEVELName = item.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item4 => item4.code === item.EVALUATE_LEVEL).name : '';
item.Nav_RiskName = item.Nav_RiskName ? item.Nav_RiskName : { item.Nav_RiskName = item.Nav_RiskName ? item.Nav_RiskName : {
NAME: '' NAME: ''

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

@ -10,7 +10,7 @@
<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view> <view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view>
<u-form-item required label="生产单元：" prop="Product_Unit" @click="handleChange('minetype')"> <u-form-item required label="生产单元：" prop="Product_Unit" @click="handleChange('minetype')">
<u--input v-model="model.Product_Unit" disabled disabledColor="#ffffff" placeholder="请选择生产单元" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.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">
</u-icon> </u-icon>
@ -93,10 +93,13 @@
model: { model: {
ORG_ID: uni.getStorageSync('orgId'), ORG_ID: uni.getStorageSync('orgId'),
Nav_ReportFiles: [], Nav_ReportFiles: [],
MineType: '',
Nav_RiskArea: { Nav_RiskArea: {
NAME: '' NAME: ''
}, },
Nav_ProductionUnit:{
NAME: ''
},
PRODUCTION_UNIT_ID:'',
HIDDEN_PLACE: '', HIDDEN_PLACE: '',
HIDDEN_DESCRIPTION: '', HIDDEN_DESCRIPTION: '',
}, },
@ -204,9 +207,6 @@
if (this.ID == undefined || this.ID == '') { if (this.ID == undefined || this.ID == '') {
this.model.ID = guid() this.model.ID = guid()
this.isNew = true this.isNew = true
let mint = Number(uni.getStorageSync('appInfo').User.MineType)
this.model.Product_Unit = this.enumsData['SKProductionUnit'].find(item => item.code === mint).name;
this.model.MineType = this.enumsData['SKProductionUnit'].find(item => item.code === mint).code;
this.isLoadOK = false this.isLoadOK = false
this.$forceUpdate() this.$forceUpdate()
} else { } else {
@ -217,7 +217,6 @@
GetRiskHandleReport(json).then(res => { GetRiskHandleReport(json).then(res => {
this.model = res; this.model = res;
this.model.ID = this.ID this.model.ID = this.ID
this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.MineType).name : '';
this.stepsPage = res.STATUS == 0 ? 0 : 1 this.stepsPage = res.STATUS == 0 ? 0 : 1
}) })
@ -240,11 +239,14 @@
} }
} }
} else { } else {
this.comPickerInfo = { const json = initFilter(this.ORG_ID)
showSheet: true, getRequest(json, "/FM/UserProductionUnitSet/OrderPaged").then(res => {
columns: [this.enumsData['SKProductionUnit']], this.comPickerInfo = {
name: name showSheet: true,
} columns: [res],
name: name
}
})
} }
@ -256,8 +258,8 @@
this.model.Product_Unit = e.value[0].name this.model.Product_Unit = e.value[0].name
this.model.MineType = mineTypeStorage[e.indexs[0]].code this.model.MineType = mineTypeStorage[e.indexs[0]].code
} else { } else {
this.model.Product_Unit = e.value[0].name this.model.Nav_ProductionUnit = e.value[0]
this.model.MineType = this.enumsData['SKProductionUnit'][e.indexs[0]].code this.model.PRODUCTION_UNIT_ID = e.value[0].ID
} }
this.comPickerInfo = { this.comPickerInfo = {
@ -301,6 +303,9 @@
this.selectorInfo.totalCount = listAreasInfo.TotalCount this.selectorInfo.totalCount = listAreasInfo.TotalCount
} }
} else { } else {
if(this.model.PRODUCTION_UNIT_ID){
extendRule(json, 'PRODUCTION_UNIT_ID', 1, this.model.PRODUCTION_UNIT_ID);
}
dataSelect = await GetNewRiskAreaInfo(json).then(res => { dataSelect = await GetNewRiskAreaInfo(json).then(res => {
this.selectorInfo.totalCount = res.TotalCount this.selectorInfo.totalCount = res.TotalCount
if (res != undefined && res.Data.length > 0) { if (res != undefined && res.Data.length > 0) {
@ -354,7 +359,7 @@
submit() { submit() {
if (!this.model.Product_Unit) { if (!this.model.PRODUCTION_UNIT_ID) {
uni.showToast({ uni.showToast({
title: '请选择生产单元', title: '请选择生产单元',
icon: 'none' icon: 'none'
@ -371,6 +376,7 @@
if (this.isOnline) { if (this.isOnline) {
this.modelEdit = JSON.parse(JSON.stringify(this.model)) this.modelEdit = JSON.parse(JSON.stringify(this.model))
delete this.modelEdit.Nav_RiskArea delete this.modelEdit.Nav_RiskArea
delete this.modelEdit.Nav_ProductionUnit
if (this.model.ORG_ID == '' || !this.model.ORG_ID) { if (this.model.ORG_ID == '' || !this.model.ORG_ID) {
this.model.ORG_ID = this.ORG_ID this.model.ORG_ID = this.ORG_ID
} }

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

@ -25,7 +25,7 @@
</u-form-item> </u-form-item>
<u-form-item label="生产单元：" prop="Product_Unit"> <u-form-item label="生产单元：" prop="Product_Unit">
<u--input v-model="model.Product_Unit" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
</u--input> </u--input>
</u-form-item> </u-form-item>
@ -118,21 +118,9 @@
this.model.ID = option.ID ? option.ID : ''; this.model.ID = option.ID ? option.ID : '';
this.tableKey = option.tableKey ? option.tableKey : '0' this.tableKey = option.tableKey ? option.tableKey : '0'
this.isAudit = option.isAudit this.isAudit = option.isAudit
this.fetchEnums(['SKProductionUnit']); this.loadData();
}, },
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 orgId = uni.getStorageSync('orgId') const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId, "", "") const json = initFilter(orgId, "", "")
@ -147,7 +135,6 @@
GetHandRiskReportRecord(json).then(res => { GetHandRiskReportRecord(json).then(res => {
this.isLoadOK = true this.isLoadOK = true
this.model = res this.model = res
this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.MineType).name : '';
this.stepsPage = res.STATUS == 0 ? 0 : 1 this.stepsPage = res.STATUS == 0 ? 0 : 1
}) })

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

@ -19,7 +19,7 @@
</u-form-item> </u-form-item>
<view style="background-color: #f5f7fa;padding: 0px 15px;"> <view style="background-color: #f5f7fa;padding: 0px 15px;">
<u-form-item label="生产单元：" prop="Product_Unit"> <u-form-item label="生产单元：" prop="Product_Unit">
<u--input v-model="model.Product_Unit" disabled border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.Nav_ProductionUnit||{}).NAME" disabled border="none" inputAlign="right" fontSize="14px">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="检查区域:"> <u-form-item label="检查区域:">
@ -154,8 +154,6 @@
listPropValUpload: [], listPropValUpload: [],
ORG_ID: uni.getStorageSync('orgId'), ORG_ID: uni.getStorageSync('orgId'),
model: { model: {
Product_Unit: '',
MineType: '',
CODE: '', CODE: '',
Nav_RiskArea: { Nav_RiskArea: {
NAME: '' NAME: ''
@ -219,7 +217,6 @@
GetRectifyDelayApplyReport(json).then(res => { GetRectifyDelayApplyReport(json).then(res => {
this.model = res; this.model = res;
this.model.ID = this.ID this.model.ID = this.ID
this.model.MineType = res.MineType
this.model.HIDDEN_DANGER_RECTIFY_RECORD_ID = res.ID this.model.HIDDEN_DANGER_RECTIFY_RECORD_ID = res.ID
this.model.CODE = res.Nav_RectifyRecord.CODE this.model.CODE = res.Nav_RectifyRecord.CODE
this.model.Nav_RectifyPhotoas = res.Nav_RectifyRecord.Nav_RectifyPhotoas ? res.Nav_RectifyRecord.Nav_RectifyPhotoas : [] this.model.Nav_RectifyPhotoas = res.Nav_RectifyRecord.Nav_RectifyPhotoas ? res.Nav_RectifyRecord.Nav_RectifyPhotoas : []
@ -230,7 +227,6 @@
this.model.RECITIFY_TIME = uni.$u.timeFormat(res.Nav_RectifyRecord.RECITIFY_TIME, 'yyyy-mm-dd') this.model.RECITIFY_TIME = uni.$u.timeFormat(res.Nav_RectifyRecord.RECITIFY_TIME, 'yyyy-mm-dd')
this.model.DELAY_RECITIFY_TIME = uni.$u.timeFormat(res.DELAY_RECITIFY_TIME, 'yyyy-mm-dd') this.model.DELAY_RECITIFY_TIME = uni.$u.timeFormat(res.DELAY_RECITIFY_TIME, 'yyyy-mm-dd')
this.model.HIDDEN_LEVELName = res.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item => item.code === res.Nav_RectifyRecord.HIDDEN_LEVEL).name : ''; this.model.HIDDEN_LEVELName = res.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item => item.code === res.Nav_RectifyRecord.HIDDEN_LEVEL).name : '';
this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.Nav_RectifyRecord.MineType).name : '';
this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : res.STATUS == 21 ? 2 : 3 this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : res.STATUS == 21 ? 2 : 3
}) })
@ -286,6 +282,7 @@
json.Start = (pageIndex - 1) * 20; json.Start = (pageIndex - 1) * 20;
} }
// extendRule(json, 'ID', 1, this.model.ID); // extendRule(json, 'ID', 1, this.model.ID);
extendInclude(json, 'Nav_ProductionUnit');
extendInclude(json, 'Nav_RiskArea'); extendInclude(json, 'Nav_RiskArea');
extendInclude(json, 'Nav_Question'); extendInclude(json, 'Nav_Question');
extendInclude(json, 'Nav_RectifyPhotoas.Nav_ImgFile'); extendInclude(json, 'Nav_RectifyPhotoas.Nav_ImgFile');
@ -309,8 +306,8 @@
}, },
handleSelectedArea(val) { handleSelectedArea(val) {
// this.model = val // this.model = val
this.model.MineType = val.MineType this.model.Nav_ProductionUnit = val.Nav_ProductionUnit
this.model.Product_Unit = val.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === val.MineType).name : ''; this.model.PRODUCTION_UNIT_ID = val.PRODUCTION_UNIT_ID
this.model.HIDDEN_DANGER_RECTIFY_RECORD_ID = val.ID this.model.HIDDEN_DANGER_RECTIFY_RECORD_ID = val.ID
this.model.CODE = val.CODE this.model.CODE = val.CODE
this.model.Nav_RectifyPhotoas = val.Nav_RectifyPhotoas ? val.Nav_RectifyPhotoas : [] this.model.Nav_RectifyPhotoas = val.Nav_RectifyPhotoas ? val.Nav_RectifyPhotoas : []
@ -358,6 +355,7 @@
this.modelEdit = JSON.parse(JSON.stringify(this.model)) this.modelEdit = JSON.parse(JSON.stringify(this.model))
delete this.modelEdit.Nav_RectifyRecord delete this.modelEdit.Nav_RectifyRecord
delete this.modelEdit.Nav_RiskArea delete this.modelEdit.Nav_RiskArea
delete this.modelEdit.Nav_ProductionUnit
if (this.TaskID == null || this.TaskID == '') { if (this.TaskID == null || this.TaskID == '') {
this.modelEdit.TaskID = '00000000-0000-0000-0000-000000000000' this.modelEdit.TaskID = '00000000-0000-0000-0000-000000000000'
} else { } else {

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

@ -10,7 +10,7 @@
<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view> <view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view>
<u-form-item label="生产单元：" prop="Product_Unit"> <u-form-item label="生产单元：" prop="Product_Unit">
<u--input v-model="model.Product_Unit" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" 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">
</u-icon> --> </u-icon> -->
@ -384,7 +384,6 @@
GetDangerRectifyReport(json).then(res => { GetDangerRectifyReport(json).then(res => {
this.model = res; this.model = res;
this.model.ID = this.ID this.model.ID = this.ID
this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.MineType).name : '';
this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : ''; this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : '';
this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : ''; this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : '';
if (this.model.Nav_RectifyDetails && this.model.Nav_RectifyDetails.length > 0) { if (this.model.Nav_RectifyDetails && this.model.Nav_RectifyDetails.length > 0) {
@ -670,6 +669,7 @@
this.modelEdit = JSON.parse(JSON.stringify(this.model)) this.modelEdit = JSON.parse(JSON.stringify(this.model))
delete this.modelEdit.Nav_ApplyDepartment delete this.modelEdit.Nav_ApplyDepartment
delete this.modelEdit.Nav_ProductionUnit
delete this.modelEdit.Nav_ApplyUser delete this.modelEdit.Nav_ApplyUser
delete this.modelEdit.Nav_CheckType delete this.modelEdit.Nav_CheckType
this.modelEdit.Nav_RectifyDetails.map(item => { this.modelEdit.Nav_RectifyDetails.map(item => {

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

@ -13,7 +13,7 @@
</u-form-item> </u-form-item>
<u--textarea style="font-size: 14px;" v-html="model.CONTEXT" border="surround" v-if="model.STATUS==40" disabled></u--textarea> <u--textarea style="font-size: 14px;" v-html="model.CONTEXT" border="surround" v-if="model.STATUS==40" disabled></u--textarea>
<u-form-item required label="生产单元：" prop="Product_Unit" @click="handleChange('SKProductionUnit')"> <u-form-item required label="生产单元：" prop="Product_Unit" @click="handleChange('SKProductionUnit')">
<u--input v-model="model.Product_Unit" disabled disabledColor="#ffffff" placeholder="请选择生产单元" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.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">
</u-icon> </u-icon>
@ -277,7 +277,6 @@
'yyyy-mm-dd') 'yyyy-mm-dd')
this.model.ACCEPT_DATE = uni.$u.timeFormat(res.ACCEPT_DATE, this.model.ACCEPT_DATE = uni.$u.timeFormat(res.ACCEPT_DATE,
'yyyy-mm-dd') 'yyyy-mm-dd')
this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.MineType).name : '';
this.model.HIDDEN_LEVELNAME = res.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item => item.code === res.HIDDEN_LEVEL).name : ''; this.model.HIDDEN_LEVELNAME = res.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item => item.code === res.HIDDEN_LEVEL).name : '';
this.model.ACCEPT_RESULTENAME = res.ACCEPT_RESULTE !== undefined ? this.enumsData['SKAcceptResultEnum'].find(item => item.code === res.ACCEPT_RESULTE).name : ''; this.model.ACCEPT_RESULTENAME = res.ACCEPT_RESULTE !== undefined ? this.enumsData['SKAcceptResultEnum'].find(item => item.code === res.ACCEPT_RESULTE).name : '';
this.stepsPage = res.STATUS == 0 || res.STATUS == 40 ? 0 : res.STATUS == 10 ? 1 : res.STATUS == 20 ? 2 : 3 this.stepsPage = res.STATUS == 0 || res.STATUS == 40 ? 0 : res.STATUS == 10 ? 1 : res.STATUS == 20 ? 2 : 3
@ -313,16 +312,30 @@
}, },
handleChange(name) { handleChange(name) {
this.comPickerInfo = { if (name == 'SKProductionUnit') {
showSheet: true, const json = initFilter(this.ORG_ID)
columns: [this.enumsData[name]], getRequest(json, "/FM/UserProductionUnitSet/OrderPaged").then(res => {
name: name this.comPickerInfo = {
showSheet: true,
columns: [res],
name: name
}
})
} else {
this.comPickerInfo = {
showSheet: true,
columns: [this.enumsData[name]],
name: name
}
} }
}, },
onConfirmPicker(e) { onConfirmPicker(e) {
if (this.comPickerInfo.name == 'SKProductionUnit') { if (this.comPickerInfo.name == 'SKProductionUnit') {
this.model.Product_Unit = e.value[0].name this.model.Nav_ProductionUnit = e.value[0]
this.model.MineType = this.enumsData['SKProductionUnit'][e.indexs[0]].code this.model.PRODUCTION_UNIT_ID = e.value[0].ID
} else if (this.comPickerInfo.name == 'SKHiddenLevel') { } else if (this.comPickerInfo.name == 'SKHiddenLevel') {
this.model.HIDDEN_LEVELNAME = e.value[0].name this.model.HIDDEN_LEVELNAME = e.value[0].name
this.model.HIDDEN_LEVEL = this.enumsData['SKHiddenLevel'][e.indexs[0]].code this.model.HIDDEN_LEVEL = this.enumsData['SKHiddenLevel'][e.indexs[0]].code
@ -471,7 +484,7 @@
submit() { submit() {
if (!this.model.Product_Unit) { if (!this.model.PRODUCTION_UNIT_ID) {
uni.showToast({ uni.showToast({
title: '请选择生产单元', title: '请选择生产单元',
icon: 'none' icon: 'none'
@ -515,6 +528,7 @@
} }
this.modelEdit = JSON.parse(JSON.stringify(this.model)) this.modelEdit = JSON.parse(JSON.stringify(this.model))
delete this.modelEdit.Nav_ProductionUnit
delete this.modelEdit.Nav_AcceptUser delete this.modelEdit.Nav_AcceptUser
delete this.modelEdit.Nav_ApplyDepartment delete this.modelEdit.Nav_ApplyDepartment
delete this.modelEdit.Nav_ApplyUser delete this.modelEdit.Nav_ApplyUser

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

@ -25,7 +25,7 @@
</u-form-item> </u-form-item>
<u-form-item label="生产单元：" prop="Product_Unit"> <u-form-item label="生产单元：" prop="Product_Unit">
<u--input v-model="model.Product_Unit" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
</u--input> </u--input>
</u-form-item> </u-form-item>
@ -102,6 +102,9 @@
</u--form> </u--form>
</view> </view>
<check-action v-if="isLoadOK && tableKey === '1'&&isAudit==='true' " :okApi="okApi" :refuseApi="refuseApi" :dataSource="$store.state.auditModel"></check-action> <check-action v-if="isLoadOK && tableKey === '1'&&isAudit==='true' " :okApi="okApi" :refuseApi="refuseApi" :dataSource="$store.state.auditModel"></check-action>
<view style="padding: 10px 16px;display: flex;flex-direction: row;" class="bottom-button" v-if="isLoadOK&&tableKey==='1'&&!isAudit">
<u-button type="primary" @click="submit" color="#3d4b70">审阅</u-button>
</view>
</view> </view>
</view> </view>
</template> </template>
@ -128,7 +131,8 @@
MineTypeName MineTypeName
} from '../../../../utils/enums.js' } from '../../../../utils/enums.js'
import { import {
GetRiskVerifyRecodrReport, GetRiskVerifyRecodrReport,
HiddenDangerRectifyRecordShow
} from '../../../../services/apply/subPages/SK/SKServices.js' } from '../../../../services/apply/subPages/SK/SKServices.js'
import stepTitle from '@/components/custom/step-title.vue' import stepTitle from '@/components/custom/step-title.vue'
export default { export default {
@ -239,7 +243,6 @@
'yyyy-mm-dd') 'yyyy-mm-dd')
this.model.ACCEPT_DATE = uni.$u.timeFormat(res.ACCEPT_DATE, this.model.ACCEPT_DATE = uni.$u.timeFormat(res.ACCEPT_DATE,
'yyyy-mm-dd') 'yyyy-mm-dd')
this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.MineType).name : '';
this.model.HIDDEN_LEVELNAME = res.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item => item.code === res.HIDDEN_LEVEL).name : ''; this.model.HIDDEN_LEVELNAME = res.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item => item.code === res.HIDDEN_LEVEL).name : '';
this.model.ACCEPT_RESULTENAME = res.ACCEPT_RESULTE !== undefined ? this.enumsData['SKAcceptResultEnum'].find(item => item.code === res.ACCEPT_RESULTE).name : ''; this.model.ACCEPT_RESULTENAME = res.ACCEPT_RESULTE !== undefined ? this.enumsData['SKAcceptResultEnum'].find(item => item.code === res.ACCEPT_RESULTE).name : '';
this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 10 ? 1 : res.STATUS == 20 ? 2 : 3 this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 10 ? 1 : res.STATUS == 20 ? 2 : 3
@ -247,7 +250,17 @@
this.isLoadOK = true this.isLoadOK = true
}, },
submit() {
let json = {};
json.ID = this.model.ID;
json.TaskID = this.TaskID;
HiddenDangerRectifyRecordShow(json).then(res => {
uni.$showMsgFunc('操作成功!', () => {
uni.navigateBack()
},
'success', 1000)
})
}
} }

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

@ -21,7 +21,7 @@
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="生产单元：" prop="Product_Unit"> <u-form-item label="生产单元：" prop="Product_Unit">
<u--input v-model="model.Product_Unit" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="检查类型：" prop="Check_Type"> <u-form-item label="检查类型：" prop="Check_Type">
@ -227,7 +227,6 @@
extendIgnoreDataRule(json) extendIgnoreDataRule(json)
GetDangerRectifyShow(json).then(res => { GetDangerRectifyShow(json).then(res => {
this.model = res this.model = res
this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.MineType).name : '';
this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : ''; this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : '';
this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : ''; this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : '';
if (this.model.Nav_RectifyDetails && this.model.Nav_RectifyDetails.length > 0) { if (this.model.Nav_RectifyDetails && this.model.Nav_RectifyDetails.length > 0) {

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

@ -14,7 +14,7 @@
<u--textarea v-html="model.CONTEXT" border="surround" v-if="model.STATUS==40" disabled></u--textarea> <u--textarea v-html="model.CONTEXT" border="surround" v-if="model.STATUS==40" disabled></u--textarea>
<u-form-item label="生产单元：" prop="Product_Unit"> <u-form-item label="生产单元：" prop="Product_Unit">
<u--input v-model="model.Product_Unit" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" 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">
</u-icon> --> </u-icon> -->
@ -377,7 +377,6 @@
this.stepLoad = false this.stepLoad = false
this.model = res; this.model = res;
this.model.ID = this.ID this.model.ID = this.ID
this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.MineType).name : '';
this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : ''; this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : '';
this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : ''; this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : '';
if (this.model.Nav_ReportDetails && this.model.Nav_ReportDetails.length > 0) { if (this.model.Nav_ReportDetails && this.model.Nav_ReportDetails.length > 0) {

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

@ -21,7 +21,7 @@
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="生产单元：" prop="Product_Unit"> <u-form-item label="生产单元：" prop="Product_Unit">
<u--input v-model="model.Product_Unit" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="检查类型：" prop="Check_Type"> <u-form-item label="检查类型：" prop="Check_Type">
@ -239,7 +239,6 @@
extendIgnoreDataRule(json) extendIgnoreDataRule(json)
GetHiddenDangerReportNew(json).then(res => { GetHiddenDangerReportNew(json).then(res => {
this.model = res; this.model = res;
this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.MineType).name : '';
this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : ''; this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : '';
this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : ''; this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : '';
if (this.model.Nav_ReportDetails && this.model.Nav_ReportDetails.length > 0) { if (this.model.Nav_ReportDetails && this.model.Nav_ReportDetails.length > 0) {

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

@ -70,7 +70,7 @@
</u-form-item> </u-form-item>
<view v-if="item.showPack==true"> <view v-if="item.showPack==true">
<u-form-item label="生产单元：" border-bottom> <u-form-item label="生产单元：" border-bottom>
<u--input v-model="item.MineTypeName" 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-form-item> </u-form-item>
<u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom> <u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom>
@ -328,7 +328,6 @@
item.Nav_SCOREC = item.Nav_SCOREC ? item.Nav_SCOREC : { item.Nav_SCOREC = item.Nav_SCOREC ? item.Nav_SCOREC : {
SCORE: '' SCORE: ''
} }
item.MineTypeName = item.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item1 => item1.code === item.MineType).name : '';
item.EVALUATE_LEVELName = item.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.code === item.EVALUATE_LEVEL).name : ''; item.EVALUATE_LEVELName = item.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.code === item.EVALUATE_LEVEL).name : '';
item.Nav_DetailDeparts.map(item1 => { item.Nav_DetailDeparts.map(item1 => {
item1.DEPARTMENT_TYPEName = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item2 => item2.code === item1.DEPARTMENT_TYPE).name : ''; item1.DEPARTMENT_TYPEName = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item2 => item2.code === item1.DEPARTMENT_TYPE).name : '';

18
pages/apply/subPages/SK/riskSafeEvaluateEdit.vue
View File

@ -651,20 +651,20 @@
}) })
return return
} }
// if (!item.RISK_NAME) { if (!item.RISK_NAME) {
uni.showToast({
title: '顺序' + i + '风险名称不能为空',
icon: 'none'
})
return
}
// if (!item.Nav_RiskName.NAME) {
// uni.showToast({ // uni.showToast({
// title: '风险名称不能为空', // title: '顺序'+i+'风险名称不能为空',
// icon: 'none' // icon: 'none'
// }) // })
// return // return
// } // }
if (!item.Nav_RiskName.NAME) {
uni.showToast({
title: '顺序'+i+'风险名称不能为空',
icon: 'none'
})
return
}
if (!item.RISK_DESCRIPTION) { if (!item.RISK_DESCRIPTION) {
uni.showToast({ uni.showToast({
title: '顺序'+i+'风险描述不能为空', title: '顺序'+i+'风险描述不能为空',

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

@ -75,7 +75,7 @@
</u-form-item> </u-form-item>
<view v-if="item.showPack==true"> <view v-if="item.showPack==true">
<u-form-item label="生产单元：" @click="handleChangeUnit('SKProductionUnit',item)" border-bottom> <u-form-item label="生产单元：" @click="handleChangeUnit('SKProductionUnit',item)" border-bottom>
<u--input v-model="item.MineTypeName" 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">
</u-icon> </u-icon>
@ -281,7 +281,10 @@
Nav_Files: [], Nav_Files: [],
Nav_Details: [{ Nav_Details: [{
showPack: false, showPack: false,
MineType: '', Nav_ProductionUnit:{
NAME: ''
},
PRODUCTION_UNIT_ID:'',
Nav_Area: { Nav_Area: {
NAME: '' NAME: ''
}, },
@ -400,7 +403,6 @@
item.Nav_SCOREC = item.Nav_SCOREC ? item.Nav_SCOREC : { item.Nav_SCOREC = item.Nav_SCOREC ? item.Nav_SCOREC : {
SCORE: '' SCORE: ''
} }
item.MineTypeName = item.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item1 => item1.code === item.MineType).name : '';
item.EVALUATE_LEVELName = item.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.code === item.EVALUATE_LEVEL).name : ''; item.EVALUATE_LEVELName = item.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.code === item.EVALUATE_LEVEL).name : '';
item.Nav_DetailDeparts.map(item1 => { item.Nav_DetailDeparts.map(item1 => {
item1.DEPARTMENT_TYPEName = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item2 => item2.code === item1.DEPARTMENT_TYPE).name : ''; item1.DEPARTMENT_TYPEName = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item2 => item2.code === item1.DEPARTMENT_TYPE).name : '';
@ -424,18 +426,33 @@
}, },
handleChangeUnit(name, item) { handleChangeUnit(name, item) {
this.comPickerInfo = { if (name == 'SKProductionUnit') {
showSheet: true, const json = initFilter(this.ORG_ID)
columns: [this.enumsText[name]], getRequest(json, "/FM/UserProductionUnitSet/OrderPaged").then(res => {
dataItem: item, this.comPickerInfo = {
name: name showSheet: true,
columns: [res],
dataItem: item,
name: name
}
})
} else {
this.comPickerInfo = {
showSheet: true,
columns: [this.enumsText[name]],
dataItem: item,
name: name
}
} }
}, },
onConfirmPicker(e) { onConfirmPicker(e) {
console.log(this.comPickerInfo.dataItem) console.log(this.comPickerInfo.dataItem)
if (this.comPickerInfo.name == 'SKProductionUnit') { if (this.comPickerInfo.name == 'SKProductionUnit') {
this.comPickerInfo.dataItem.MineTypeName = e.value[0] this.comPickerInfo.dataItem.Nav_ProductionUnit = e.value[0]
this.comPickerInfo.dataItem.MineType = this.enumsData['SKProductionUnit'][e.indexs[0]].code this.comPickerInfo.dataItem.PRODUCTION_UNIT_ID = e.value[0].ID
} else if (this.comPickerInfo.name == 'SKEvaluateLevelEnum') { } else if (this.comPickerInfo.name == 'SKEvaluateLevelEnum') {
this.comPickerInfo.dataItem.EVALUATE_LEVELName = e.value[0] this.comPickerInfo.dataItem.EVALUATE_LEVELName = e.value[0]
@ -470,8 +487,10 @@
handleNewCheckContent() { handleNewCheckContent() {
this.model.Nav_Details.push({ this.model.Nav_Details.push({
showPack: false, showPack: false,
MineType: '', Nav_ProductionUnit:{
MineTypeName: '', NAME: ''
},
PRODUCTION_UNIT_ID:'',
Nav_Area: { Nav_Area: {
NAME: '' NAME: ''
}, },
@ -759,7 +778,7 @@
submit() { submit() {
let i = 1 let i = 1
for (let item of this.model.Nav_Details) { for (let item of this.model.Nav_Details) {
if (!item.MineTypeName) { if (!item.PRODUCTION_UNIT_ID) {
uni.showToast({ uni.showToast({
title: '顺序' + i + '生产单元不能为空', title: '顺序' + i + '生产单元不能为空',
icon: 'none' icon: 'none'

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

@ -70,7 +70,7 @@
</u-form-item> </u-form-item>
<view v-if="item.showPack==true"> <view v-if="item.showPack==true">
<u-form-item label="生产单元：" border-bottom> <u-form-item label="生产单元：" border-bottom>
<u--input v-model="item.MineTypeName" 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-form-item> </u-form-item>
<u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom> <u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom>
@ -331,7 +331,6 @@
item.Nav_SCOREC = item.Nav_SCOREC ? item.Nav_SCOREC : { item.Nav_SCOREC = item.Nav_SCOREC ? item.Nav_SCOREC : {
SCORE: '' SCORE: ''
} }
item.MineTypeName = item.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item1 => item1.code === item.MineType).name : '';
item.EVALUATE_LEVELName = item.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.code === item.EVALUATE_LEVEL).name : ''; item.EVALUATE_LEVELName = item.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item1 => item1.code === item.EVALUATE_LEVEL).name : '';
item.Nav_DetailDeparts.map(item1 => { item.Nav_DetailDeparts.map(item1 => {
item1.DEPARTMENT_TYPEName = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item2 => item2.code === item1.DEPARTMENT_TYPE).name : ''; item1.DEPARTMENT_TYPEName = item1.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item2 => item2.code === item1.DEPARTMENT_TYPE).name : '';

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

@ -71,7 +71,7 @@
</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(index,'MinType')" border-bottom>
<u--input v-model="item.MineType" 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">
</u-icon> </u-icon>
@ -116,7 +116,7 @@
<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" />
@ -284,7 +284,6 @@
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.ENABLE_STATUS = item.ENABLE_STATUS == 0 ? '有效' : '无效'
item.MineType = MineTypeName[item.MineType]
}) })
this.stepLoad = false this.stepLoad = false
@ -300,16 +299,22 @@
}, },
handleChangeUnit(index, name) { handleChangeUnit(index, name) {
this.nowIndex = [index, name] this.nowIndex = [index, name]
if (name == 'MinType') { if (name == 'MinType') {
this.UnitLists = [FMProductionUnit] const json = initFilter(this.ORG_ID)
getRequest(json, "/FM/UserProductionUnitSet/OrderPaged").then(res => {
this.UnitLists = [res]
})
} else { } else {
this.UnitLists = [SKEffective] this.UnitLists = [SKEffective]
} }
this.showPopupUnit = true this.showPopupUnit = true
}, },
confirmUnit(e) { confirmUnit(e) {
console.log(e,'11')
if (this.nowIndex[1] == 'MinType') { if (this.nowIndex[1] == 'MinType') {
this.dataModel.Nav_Details[this.nowIndex[0]].MineType = e.value[0] this.dataModel.Nav_Details[this.nowIndex[0]].Nav_ProductionUnit = e.value[0]
this.dataModel.Nav_Details[this.nowIndex[0]].PRODUCTION_UNIT_ID = e.value[0].ID
} else { } else {
this.dataModel.Nav_Details[this.nowIndex[0]].ENABLE_STATUS = e.value[0] this.dataModel.Nav_Details[this.nowIndex[0]].ENABLE_STATUS = e.value[0]
} }
@ -324,7 +329,10 @@
handleNewCheckContent() { handleNewCheckContent() {
this.dataModel.Nav_Details.push({ this.dataModel.Nav_Details.push({
showPack: false, showPack: false,
MineType: '', Nav_ProductionUnit:{
NAME: ''
},
PRODUCTION_UNIT_ID:'',
Nav_Area: { Nav_Area: {
NAME: '' NAME: ''
}, },
@ -438,50 +446,52 @@
}, },
submit() { submit() {
let i = 1
for (let item of this.dataModel.Nav_Details) { for (let item of this.dataModel.Nav_Details) {
if (!item.MineType) { if (!item.PRODUCTION_UNIT_ID) {
uni.showToast({ uni.showToast({
title: '生产单元不能为空', title: '顺序' + i +'生产单元不能为空',
icon: 'none' icon: 'none'
}) })
return return
} }
if (!item.Nav_Area.NAME) { if (!item.Nav_Area.NAME) {
uni.showToast({ uni.showToast({
title: '辨识区域不能为空', title: '顺序' + i +'辨识区域不能为空',
icon: 'none' icon: 'none'
}) })
return return
} }
// if (!item.RISK_NAME) { if (!item.RISK_NAME) {
uni.showToast({
title: '顺序' + i + '风险名称不能为空',
icon: 'none'
})
return
}
// if (!item.Nav_RiskName.NAME) {
// uni.showToast({ // uni.showToast({
// title: '风险名称不能为空', // title: '风险名称不能为空',
// icon: 'none' // icon: 'none'
// }) // })
// return // return
// } // }
if (!item.Nav_RiskName.NAME) {
uni.showToast({
title: '风险名称不能为空',
icon: 'none'
})
return
}
if (!item.RISK_DESCRIPTION) { if (!item.RISK_DESCRIPTION) {
uni.showToast({ uni.showToast({
title: '风险描述不能为空', title: '顺序' + i +'风险描述不能为空',
icon: 'none' icon: 'none'
}) })
return return
} }
if (!item.Nav_Type.NAME) { if (!item.Nav_Type.NAME) {
uni.showToast({ uni.showToast({
title: '风险类别不能为空', title: '顺序' + i +'风险类别不能为空',
icon: 'none' icon: 'none'
}) })
return return
} }
i++
} }
// this.model = this.dataModel // this.model = this.dataModel
@ -491,7 +501,7 @@
this.dataModel.Nav_Details.map(item => { this.dataModel.Nav_Details.map(item => {
arr.push({ arr.push({
MineType: MineTypeIndex[item.MineType], PRODUCTION_UNIT_ID: item.PRODUCTION_UNIT_ID,
AREA_ID:item.AREA_ID, AREA_ID:item.AREA_ID,
RISK_NAME: item.RISK_NAME, RISK_NAME: item.RISK_NAME,
RISK_NAME_ID: item.RISK_NAME_ID, RISK_NAME_ID: item.RISK_NAME_ID,

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

@ -69,7 +69,7 @@
</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(index,'MinType')" border-bottom>
<u--input v-model="item.MineType" 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">
</u-icon> </u-icon>
@ -309,7 +309,6 @@
item['showPack'] = false item['showPack'] = false
item.ENABLE_STATUS = item.ENABLE_STATUS == 0 ? '有效' : '无效' item.ENABLE_STATUS = item.ENABLE_STATUS == 0 ? '有效' : '无效'
item.MARK = item.MARK == 0 ? '自动带出' : item.MARK == 10 ? '新增' : '修改' item.MARK = item.MARK == 0 ? '自动带出' : item.MARK == 10 ? '新增' : '修改'
item.MineType = MineTypeName[item.MineType]
item.Nav_RiskName = item.Nav_RiskName? item.Nav_RiskName: { item.Nav_RiskName = item.Nav_RiskName? item.Nav_RiskName: {
NAME: ''} NAME: ''}
}) })
@ -328,7 +327,10 @@
handleChangeUnit(index, name) { handleChangeUnit(index, name) {
this.nowIndex = [index, name] this.nowIndex = [index, name]
if (name == 'MinType') { if (name == 'MinType') {
this.UnitLists = [FMProductionUnit] const json = initFilter(this.ORG_ID)
getRequest(json, "/FM/UserProductionUnitSet/OrderPaged").then(res => {
this.UnitLists = [res]
})
} else if (this.nowIndex[1] == 'ENABLE_STATUS') { } else if (this.nowIndex[1] == 'ENABLE_STATUS') {
this.UnitLists = [SKEffective] this.UnitLists = [SKEffective]
} else { } else {
@ -338,7 +340,8 @@
}, },
confirmUnit(e) { confirmUnit(e) {
if (this.nowIndex[1] == 'MinType') { if (this.nowIndex[1] == 'MinType') {
this.dataModel.Nav_Details[this.nowIndex[0]].MineType = e.value[0] this.dataModel.Nav_Details[this.nowIndex[0]].Nav_ProductionUnit = e.value[0]
this.dataModel.Nav_Details[this.nowIndex[0]].PRODUCTION_UNIT_ID = e.value[0].ID
} else if (this.nowIndex[1] == 'ENABLE_STATUS') { } else if (this.nowIndex[1] == 'ENABLE_STATUS') {
this.dataModel.Nav_Details[this.nowIndex[0]].ENABLE_STATUS = e.value[0] this.dataModel.Nav_Details[this.nowIndex[0]].ENABLE_STATUS = e.value[0]
} else { } else {
@ -384,7 +387,10 @@
handleNewCheckContent() { handleNewCheckContent() {
this.dataModel.Nav_Details.push({ this.dataModel.Nav_Details.push({
showPack: false, showPack: false,
MineType: '', Nav_ProductionUnit:{
NAME: ''
},
PRODUCTION_UNIT_ID:'',
Nav_Area: { Nav_Area: {
NAME: '' NAME: ''
}, },
@ -504,7 +510,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) {
if (!item.MineType) { if (!item.PRODUCTION_UNIT_ID) {
uni.showToast({ uni.showToast({
title: '顺序'+i+'生产单元不能为空', title: '顺序'+i+'生产单元不能为空',
icon: 'none' icon: 'none'
@ -518,20 +524,20 @@
}) })
return return
} }
// if (!item.RISK_NAME) { if (!item.RISK_NAME) {
// uni.showToast({
// title: '风险名称不能为空',
// icon: 'none'
// })
// return
// }
if (!item.Nav_RiskName.NAME) {
uni.showToast({ uni.showToast({
title: '顺序'+i+'风险名称不能为空', title: '顺序'+i+'风险名称不能为空',
icon: 'none' icon: 'none'
}) })
return return
} }
// if (!item.Nav_RiskName.NAME) {
// uni.showToast({
// title: '顺序'+i+'风险名称不能为空',
// icon: 'none'
// })
// return
// }
if (!item.RISK_DESCRIPTION) { if (!item.RISK_DESCRIPTION) {
uni.showToast({ uni.showToast({
title: '顺序'+i+'风险描述不能为空', title: '顺序'+i+'风险描述不能为空',
@ -556,7 +562,7 @@
this.dataModel.Nav_Details.map(item => { this.dataModel.Nav_Details.map(item => {
arr.push({ arr.push({
MineType: MineTypeIndex[item.MineType], PRODUCTION_UNIT_ID: item.PRODUCTION_UNIT_ID,
AREA_ID: item.AREA_ID, AREA_ID: item.AREA_ID,
RISK_NAME: item.RISK_NAME, RISK_NAME: item.RISK_NAME,
RISK_NAME_ID: item.RISK_NAME_ID, RISK_NAME_ID: item.RISK_NAME_ID,

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

@ -63,7 +63,7 @@
</u-form-item> </u-form-item>
<view v-if="item.showPack==true"> <view v-if="item.showPack==true">
<u-form-item label="生产单元：" border-bottom> <u-form-item label="生产单元：" border-bottom>
<u--input v-model="item.MineType" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(item.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom> <u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom>
@ -265,7 +265,6 @@
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.ENABLE_STATUS = item.ENABLE_STATUS == 0 ? '有效' : '无效'
item.MineType = MineTypeName[item.MineType]
item.Nav_RiskName = item.Nav_RiskName? item.Nav_RiskName: { item.Nav_RiskName = item.Nav_RiskName? item.Nav_RiskName: {
NAME: ''} NAME: ''}
}) })

3
pages/apply/subPages/SK/riskSafeIdenShow.vue
View File

@ -66,7 +66,7 @@
</u-form-item> </u-form-item>
<view v-if="item.showPack==true"> <view v-if="item.showPack==true">
<u-form-item label="生产单元：" border-bottom> <u-form-item label="生产单元：" border-bottom>
<u--input v-model="item.MineType" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(item.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom> <u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom>
@ -271,7 +271,6 @@
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.ENABLE_STATUS = item.ENABLE_STATUS == 0 ? '有效' : '无效'
item.MineType = MineTypeName[item.MineType]
}) })
this.stepLoad = false this.stepLoad = false

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

@ -63,7 +63,7 @@
</u-form-item> </u-form-item>
<view v-if="item.showPack==true"> <view v-if="item.showPack==true">
<u-form-item label="生产单元：" border-bottom> <u-form-item label="生产单元：" border-bottom>
<u--input v-model="item.MineType" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(item.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom> <u-form-item label="风险名称" prop="CHECKSTANDARD" border-bottom>
@ -265,7 +265,6 @@
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.ENABLE_STATUS = item.ENABLE_STATUS == 0 ? '有效' : '无效'
item.MineType = MineTypeName[item.MineType]
item.Nav_RiskName = item.Nav_RiskName? item.Nav_RiskName: { item.Nav_RiskName = item.Nav_RiskName? item.Nav_RiskName: {
NAME: ''} NAME: ''}
}) })

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

@ -13,7 +13,7 @@
</u-form-item> </u-form-item>
<u--textarea v-html="model.CONTEXT" border="surround" v-if="model.STATUS==40" disabled></u--textarea> <u--textarea v-html="model.CONTEXT" border="surround" v-if="model.STATUS==40" disabled></u--textarea>
<u-form-item required label="生产单元：" prop="Product_Unit" @click="handleChange('SKProductionUnit')"> <u-form-item required label="生产单元：" prop="Product_Unit" @click="handleChange('SKProductionUnit')">
<u--input v-model="model.Product_Unit" disabled disabledColor="#ffffff" placeholder="请选择生产单元" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.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">
</u-icon> </u-icon>
@ -308,7 +308,6 @@
this.model.RECITIFY_TIME = uni.$u.timeFormat(res.RECITIFY_TIME, this.model.RECITIFY_TIME = uni.$u.timeFormat(res.RECITIFY_TIME,
'yyyy-mm-dd') 'yyyy-mm-dd')
this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : res.STATUS == 10 ? 2 : 3 this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : res.STATUS == 10 ? 2 : 3
this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.MineType).name : '';
this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : ''; this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : '';
this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : ''; this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : '';
this.model.HIDDEN_LEVELName = res.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item => item.code === res.HIDDEN_LEVEL).name : ''; this.model.HIDDEN_LEVELName = res.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item => item.code === res.HIDDEN_LEVEL).name : '';
@ -330,17 +329,31 @@
this.showPopupRecitifyDate = false this.showPopupRecitifyDate = false
}, },
handleChange(name) { handleChange(name) {
this.comPickerInfo = { if (name == 'SKProductionUnit') {
const json = initFilter(this.ORG_ID)
getRequest(json, "/FM/UserProductionUnitSet/OrderPaged").then(res => {
this.comPickerInfo = {
showSheet: true,
columns: [res],
name: name
}
})
}else{
this.comPickerInfo = {
showSheet: true, showSheet: true,
columns: [this.enumsText[name]], columns: [this.enumsText[name]],
name: name name: name
} }
}
}, },
onConfirmPicker(e) { onConfirmPicker(e) {
if (this.comPickerInfo.name == 'SKProductionUnit') { if (this.comPickerInfo.name == 'SKProductionUnit') {
this.model.Product_Unit = e.value[0] this.model.Nav_ProductionUnit = e.value[0]
this.model.MineType = this.enumsData['SKProductionUnit'][e.indexs[0]].code this.model.PRODUCTION_UNIT_ID = e.value[0].ID
} else if (this.comPickerInfo.name == 'SKHiddenLevel') { } else if (this.comPickerInfo.name == 'SKHiddenLevel') {
this.model.HIDDEN_LEVELName = e.value[0] this.model.HIDDEN_LEVELName = e.value[0]
this.model.HIDDEN_LEVEL = this.enumsData['SKHiddenLevel'][e.indexs[0]].code this.model.HIDDEN_LEVEL = this.enumsData['SKHiddenLevel'][e.indexs[0]].code
@ -424,8 +437,8 @@
}) })
} else if (p.name == 'Nav_CheckType') { } else if (p.name == 'Nav_CheckType') {
if (this.model.MineType !== undefined && this.model.MineType !== null) { if (this.model.PRODUCTION_UNIT_ID) {
extendRule(json, 'MineType', 1, String(this.model.MineType)); extendRule(json, 'PRODUCTION_UNIT_ID', 1, this.model.PRODUCTION_UNIT_ID);
} }
dataSelect = await CheckTypeNewOrderPaged(json).then(res => { dataSelect = await CheckTypeNewOrderPaged(json).then(res => {
this.selectorInfo.totalCount = res.TotalCount this.selectorInfo.totalCount = res.TotalCount

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

@ -25,7 +25,7 @@
</u-form-item> </u-form-item>
<u-form-item label="生产单元：" prop="Product_Unit"> <u-form-item label="生产单元：" prop="Product_Unit">
<u--input v-model="model.Product_Unit" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
</u--input> </u--input>
</u-form-item> </u-form-item>
@ -252,7 +252,6 @@
this.model.CONTEXT = res.CONTEXT ? res.CONTEXT : '' this.model.CONTEXT = res.CONTEXT ? res.CONTEXT : ''
this.model.RECITIFY_TIME = uni.$u.timeFormat(res.RECITIFY_TIME, this.model.RECITIFY_TIME = uni.$u.timeFormat(res.RECITIFY_TIME,
'yyyy-mm-dd') 'yyyy-mm-dd')
this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.MineType).name : '';
this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : ''; this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : '';
this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : ''; this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : '';
this.model.HIDDEN_LEVELName = res.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item => item.code === res.HIDDEN_LEVEL).name : ''; this.model.HIDDEN_LEVELName = res.HIDDEN_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item => item.code === res.HIDDEN_LEVEL).name : '';

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

@ -13,7 +13,7 @@
</u-form-item> </u-form-item>
<u--textarea v-html="model.CONTEXT" border="surround" v-if="model.STATUS==40" disabled></u--textarea> <u--textarea v-html="model.CONTEXT" border="surround" v-if="model.STATUS==40" disabled></u--textarea>
<u-form-item label="生产单元：" prop="Product_Unit" @click="handleChange('SKProductionUnit')"> <u-form-item label="生产单元：" prop="Product_Unit" @click="handleChange('SKProductionUnit')">
<u--input v-model="model.Product_Unit" placeholder="请选择生产单元" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.Nav_ProductionUnit||{}).NAME" placeholder="请选择生产单元" disabled disabledColor="#ffffff" 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">
</u-icon> </u-icon>
@ -181,7 +181,6 @@
ORG_ID: uni.getStorageSync('orgId'), ORG_ID: uni.getStorageSync('orgId'),
model: { model: {
Nav_CheckNoticeFiles: [], Nav_CheckNoticeFiles: [],
Product_Unit: '',
Check_Type: '', Check_Type: '',
PLANCHECKFREQUENCYName: '', PLANCHECKFREQUENCYName: '',
DEPARTMENT_TYPEName: '', DEPARTMENT_TYPEName: '',
@ -278,7 +277,6 @@
this.model = res this.model = res
this.model.ID = this.ID this.model.ID = this.ID
this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : res.STATUS == 10 ? 2 : 3 this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : res.STATUS == 10 ? 2 : 3
this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.MineType).name : '';
this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : ''; this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : '';
this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : ''; this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : '';
} }
@ -288,7 +286,7 @@
} }
}, },
stepAdd() { stepAdd() {
if (!this.model.Product_Unit) { if (!this.model.PRODUCTION_UNIT_ID) {
uni.showToast({ uni.showToast({
title: '请选择生产单元', title: '请选择生产单元',
icon: 'none' icon: 'none'
@ -329,17 +327,31 @@
this.stepsPageList = this.stepsPageList - 1 this.stepsPageList = this.stepsPageList - 1
}, },
handleChange(name) { handleChange(name) {
console.log(this.enumsData[name], 'mnn') if (name == 'SKProductionUnit') {
this.comPickerInfo = { const json = initFilter(this.ORG_ID)
showSheet: true, getRequest(json, "/FM/UserProductionUnitSet/OrderPaged").then(res => {
columns: [this.enumsData[name]], this.comPickerInfo = {
name: name showSheet: true,
columns: [res],
name: name
}
})
} else {
this.comPickerInfo = {
showSheet: true,
columns: [this.enumsData[name]],
name: name
}
} }
}, },
onConfirmPicker(e) { onConfirmPicker(e) {
console.log(e,'1111')
if (this.comPickerInfo.name == 'SKProductionUnit') { if (this.comPickerInfo.name == 'SKProductionUnit') {
this.model.Product_Unit = e.value[0].name this.model.Nav_ProductionUnit = e.value[0]
this.model.MineType = this.enumsData['SKProductionUnit'][e.indexs[0]].code this.model.PRODUCTION_UNIT_ID = e.value[0].ID
} else if (this.comPickerInfo.name == 'SKPLANCHECKFREQUENCYEnum') { } else if (this.comPickerInfo.name == 'SKPLANCHECKFREQUENCYEnum') {
this.model.PLANCHECKFREQUENCYName = e.value[0].name this.model.PLANCHECKFREQUENCYName = e.value[0].name
this.model.PLANCHECKFREQUENCY = this.enumsData['SKPLANCHECKFREQUENCYEnum'][e.indexs[0]].code this.model.PLANCHECKFREQUENCY = this.enumsData['SKPLANCHECKFREQUENCYEnum'][e.indexs[0]].code
@ -533,8 +545,8 @@
if (p.val) { if (p.val) {
extendRule(json, 'NAME', 9, p.val); extendRule(json, 'NAME', 9, p.val);
} }
if (this.model.MineType !== undefined && this.model.MineType !== null) { if (this.model.PRODUCTION_UNIT_ID) {
extendRule(json, 'MineType', 1, String(this.model.MineType)); extendRule(json, 'PRODUCTION_UNIT_ID', 1, this.model.PRODUCTION_UNIT_ID);
} }
dataSelect = await CheckTypeNewOrderPaged(json).then(res => { dataSelect = await CheckTypeNewOrderPaged(json).then(res => {
@ -598,6 +610,7 @@
}, },
submit() { submit() {
console.log(this.model)
for (let item of this.model.Nav_CheckNoticeDetails) { for (let item of this.model.Nav_CheckNoticeDetails) {
if (item.Nav_CheckNoticeDetailUsers.length == 0) { if (item.Nav_CheckNoticeDetailUsers.length == 0) {
uni.showToast({ uni.showToast({
@ -625,6 +638,7 @@
delete this.modelEdit.Nav_ApplyDepartment delete this.modelEdit.Nav_ApplyDepartment
delete this.modelEdit.Nav_ApplyUser delete this.modelEdit.Nav_ApplyUser
delete this.modelEdit.Nav_CheckType delete this.modelEdit.Nav_CheckType
delete this.modelEdit.Nav_ProductionUnit
this.modelEdit.Nav_CheckNoticeDetails.map(item => { this.modelEdit.Nav_CheckNoticeDetails.map(item => {
item.PUBLISH = 'SaveAndNotify' item.PUBLISH = 'SaveAndNotify'

5
pages/apply/subPages/SK/safeCheckRecordEdit.vue
View File

@ -10,7 +10,7 @@
<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view> <view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view>
<u-form-item label="生产单元：" prop="Product_Unit" > <u-form-item label="生产单元：" prop="Product_Unit" >
<u--input v-model="dataModel.Product_Unit" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" 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">
</u-icon> --> </u-icon> -->
@ -330,8 +330,6 @@
this.dataModel.Nav_Files = res.Nav_CheckRecordFiles this.dataModel.Nav_Files = res.Nav_CheckRecordFiles
this.dataModel.Check_Date = res.CHECK_TIME this.dataModel.Check_Date = res.CHECK_TIME
this.dataModel.UserNames = res.CHECK_PERSON this.dataModel.UserNames = res.CHECK_PERSON
this.dataModel.Product_Unit = MineTypeName[res.MineType]
this.stepsPage = res.STATUS == 0 ? 0 : 1 this.stepsPage = res.STATUS == 0 ? 0 : 1
this.dataModel.Nav_CheckRecordDetails = res.Nav_CheckRecordDetails ? res.Nav_CheckRecordDetails : [] this.dataModel.Nav_CheckRecordDetails = res.Nav_CheckRecordDetails ? res.Nav_CheckRecordDetails : []
if (this.dataModel.Nav_CheckRecordDetails.length > 0) { if (this.dataModel.Nav_CheckRecordDetails.length > 0) {
@ -827,7 +825,6 @@
this.model.DEPARTMENT_TYPE = level //检查层级 this.model.DEPARTMENT_TYPE = level //检查层级
this.model.SECURITY_INSPECTION_NOTICE_ID = this.dataModel.SECURITY_INSPECTION_NOTICE_ID this.model.SECURITY_INSPECTION_NOTICE_ID = this.dataModel.SECURITY_INSPECTION_NOTICE_ID
this.model.CHECK_TIME = this.dataModel.Check_Date //检查时间 this.model.CHECK_TIME = this.dataModel.Check_Date //检查时间
this.model.MineType = MineTypeIndex[this.dataModel.Product_Unit]
let arr = [] let arr = []
this.dataModel.Nav_CheckRecordDetails.map(item => { this.dataModel.Nav_CheckRecordDetails.map(item => {
item.Nav_DetailContents.map(item1 => { item.Nav_DetailContents.map(item1 => {

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

@ -10,7 +10,7 @@
<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view> <view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view>
<u-form-item label="生产单元：" prop="Product_Unit"> <u-form-item label="生产单元：" prop="Product_Unit">
<u--input v-model="model.Product_Unit" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" 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">
</u-icon> --> </u-icon> -->
@ -139,7 +139,7 @@
</uni-collapse> </uni-collapse>
<view style="padding: 10px 16px;display: flex;flex-direction: row;"> <view style="padding: 10px 16px;display: flex;flex-direction: row;">
<u-button type="primary" @click="handleNewCheckArea" color="#3d4b70" :plain="true" style="margin-right: 5px;">新增检查区域</u-button> <u-button type="primary" @click="handleNewCheckArea" color="#3d4b70" :plain="true" style="margin-right: 5px;">新增检查区域</u-button>
<u-button type="primary" @click="handleNewCheckList" color="#3d4b70" style="margin-left: 5px;">检查清单</u-button> <!-- <u-button type="primary" @click="handleNewCheckList" color="#3d4b70" style="margin-left: 5px;">检查清单</u-button> -->
</view> </view>
</u--form> </u--form>
@ -355,7 +355,6 @@
this.model = res; this.model = res;
this.model.ID = this.ID this.model.ID = this.ID
this.stepsPage = res.STATUS == 0 ? 0 : 1 this.stepsPage = res.STATUS == 0 ? 0 : 1
this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.MineType).name : '';
this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : ''; this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : '';
this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : ''; this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : '';
this.model.Nav_CheckRecordDetails.map((item => { this.model.Nav_CheckRecordDetails.map((item => {

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

@ -21,7 +21,7 @@
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="生产单元：" prop="Product_Unit"> <u-form-item label="生产单元：" prop="Product_Unit">
<u--input v-model="model.Product_Unit" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="检查类型：" prop="Check_Type"> <u-form-item label="检查类型：" prop="Check_Type">
@ -253,7 +253,6 @@
this.model = res; this.model = res;
this.model.ID = this.ID this.model.ID = this.ID
this.model.CREATE_TIME = uni.$u.timeFormat(this.model.CREATE_TIME, 'yyyy-mm-dd') this.model.CREATE_TIME = uni.$u.timeFormat(this.model.CREATE_TIME, 'yyyy-mm-dd')
this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.MineType).name : '';
this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : ''; this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : '';
this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : ''; this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : '';
if (this.model.Nav_CheckRecordDetails && this.model.Nav_CheckRecordDetails.length > 0) { if (this.model.Nav_CheckRecordDetails && this.model.Nav_CheckRecordDetails.length > 0) {

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

@ -10,7 +10,7 @@
<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view> <view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view>
<u-form-item label="生产单元：" prop="Product_Unit"> <u-form-item label="生产单元：" prop="Product_Unit">
<u--input v-model="model.Product_Unit" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" 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">
</u-icon> --> </u-icon> -->
@ -351,8 +351,6 @@
this.model.SECURITY_INSPECTION_RECORD_ID = res.SECURITY_INSPECTION_RECORD_ID this.model.SECURITY_INSPECTION_RECORD_ID = res.SECURITY_INSPECTION_RECORD_ID
this.model = res; this.model = res;
this.model.ID = this.ID this.model.ID = this.ID
this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.MineType).name : '';
this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : ''; this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : '';
this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : ''; this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : '';
if (this.model.Nav_CheckRecordDetails && this.model.Nav_CheckRecordDetails.length > 0) { if (this.model.Nav_CheckRecordDetails && this.model.Nav_CheckRecordDetails.length > 0) {

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

@ -21,7 +21,7 @@
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="生产单元：" prop="Product_Unit"> <u-form-item label="生产单元：" prop="Product_Unit">
<u--input v-model="model.Product_Unit" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="检查类型：" prop="Check_Type"> <u-form-item label="检查类型：" prop="Check_Type">
@ -254,7 +254,6 @@
this.model = res; this.model = res;
this.model.ID = this.ID this.model.ID = this.ID
this.model.CREATE_TIME = uni.$u.timeFormat(this.model.CREATE_TIME, 'yyyy-mm-dd') this.model.CREATE_TIME = uni.$u.timeFormat(this.model.CREATE_TIME, 'yyyy-mm-dd')
this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.MineType).name : '';
this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : ''; this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : '';
this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : ''; this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : '';
if (this.model.Nav_CheckRecordDetails && this.model.Nav_CheckRecordDetails.length > 0) { if (this.model.Nav_CheckRecordDetails && this.model.Nav_CheckRecordDetails.length > 0) {

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

@ -22,7 +22,7 @@
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="生产单元：" prop="Product_Unit"> <u-form-item label="生产单元：" prop="Product_Unit">
<u--input v-model="model.Product_Unit" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="(model.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="检查类型：" prop="Check_Type"> <u-form-item label="检查类型：" prop="Check_Type">
@ -214,7 +214,7 @@
this.model = res this.model = res
this.model.ID = this.ID this.model.ID = this.ID
this.model.CREATE_TIME = uni.$u.timeFormat(this.model.CREATE_TIME, 'yyyy-mm-dd') this.model.CREATE_TIME = uni.$u.timeFormat(this.model.CREATE_TIME, 'yyyy-mm-dd')
this.model.Product_Unit = res.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === res.MineType).name : '';
this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : ''; this.model.PLANCHECKFREQUENCYName = res.PLANCHECKFREQUENCY !== undefined ? this.enumsData['SKPLANCHECKFREQUENCYEnum'].find(item => item.code === res.PLANCHECKFREQUENCY).name : '';
this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : ''; this.model.DEPARTMENT_TYPEName = res.DEPARTMENT_TYPE !== undefined ? this.enumsData['SKDepartmentTypeEnum'].find(item => item.code === res.DEPARTMENT_TYPE).name : '';
this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : res.STATUS == 10 ? 2 : 3 this.stepsPage = res.STATUS == 0 ? 0 : res.STATUS == 20 ? 1 : res.STATUS == 10 ? 2 : 3

15
services/apply/subPages/SK/SKServices.js
View File

@ -222,7 +222,7 @@ export function DouPreGet(params) {
} }
export function SKEnterpriseLibrary(params) { export function SKEnterpriseLibrary(params) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
request.post("/SK/SKEnterpriseLibrary/GetCheckList", params).then((result) => { request.post("/SK/SKEnterpriseLibrary/GetCheckListNew", params).then((result) => {
if (result.IsSuccessful) { if (result.IsSuccessful) {
resolve(result.Data); resolve(result.Data);
} }
@ -451,6 +451,17 @@ export function SKRectifyNoticeShow(params) {
reject(error) reject(error)
}) })
}) })
}
export function HiddenDangerRectifyRecordShow(params) {
return new Promise((resolve, reject) => {
request.post("/SK/SKHiddenDangerRectifyRecord/IdentityUpdate", params).then((result) => {
if (result.IsSuccessful) {
resolve(result.Data);
}
}).catch((error) => {
reject(error)
})
})
} }
export function SKRectifyDelayApplyShow(params) { export function SKRectifyDelayApplyShow(params) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@ -897,7 +908,7 @@ export function GetEvaluationInfo(params) {
} }
export function GetRiskCodeInfo(params) { export function GetRiskCodeInfo(params) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
request.post("/SK/HiddenDangerRectifyRecord/OrderPaged", params).then((result) => { request.post("/SK/SKHiddenDangerRectifyDelayApply/RecordOrderPaged", params).then((result) => {
if (result.IsSuccessful) { if (result.IsSuccessful) {
resolve(result); resolve(result);
} }