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 2025-11-07 09:29:18 +08:00
parent 2c8aca284e
commit af67c253b1
3 changed files with 120 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,13 +118,10 @@
} from '../../../../utils/enums.js'
import {
GetCheckContentsInfo,
GetRecordSummary,
SKCheckContentsFullUpdate,
GetRiskAreaInfo,
GetCheckInspection,
GetHiddenScripList,
GetNewRiskAreaInfo,
CheckTypeNewOrderPaged
GetCheckContentsNew
} from '../../../../services/apply/subPages/SK/SKServices.js'
import {
getRequest,
@ -180,6 +177,7 @@
SECURITY_INSPECTION_RECORD_ID: null,
CHECK_TIME: uni.$u.timeFormat(new Date(), 'yyyy-mm-dd hh:MM:ss'),
Nav_ListCheckQuestion: [],
CHECK_CONTENTS_ID:''
},
selectorInfo: {
name: 'user',
@ -229,9 +227,13 @@
}
},
onLoad(option) {
this.model.CHECK_CONTENTS_ID = option.CHECK_CONTENTS_ID?option.CHECK_CONTENTS_ID:''
this.TaskID = option.taskID ? option.taskID : '';
this.ID = option.ID ? option.ID : '';
this.fetchEnums(['SKProductionUnit', 'SKHiddenLevel']);
if(option.CHECK_CONTENTS_ID){
this.getNotNew()
}
},
methods: {
async fetchEnums(enumNames) {
@ -274,6 +276,26 @@
});
}
},
getNotNew(){
const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId, "", "")
extendRule(json, 'ID', 1, this.model.CHECK_CONTENTS_ID)
extendInclude(json, 'Nav_Area');
extendInclude(json, 'Nav_ContentsBasics');
extendInclude(json, 'Nav_ContentsBasics.Nav_Law');
extendInclude(json, 'Nav_ListCheckQuestion');
extendIgnoreDataRule(json)
GetCheckContentsNew(json).then(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){
this.model.Nav_ListCheckQuestion.map(item=>{
item.QUESTION_LEVELName= item.QUESTION_LEVEL !== undefined ? this.enumsData['SKHiddenLevel'].find(item1 => item1.code === item.QUESTION_LEVEL).name : '';
})
}
})
},
loadData() {
this.model.ID = guid()

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

@ -102,8 +102,9 @@
</u--form>
</view>
<view style="padding: 10px 16px;" class="bottom-button">
<u-button type="primary" @click="submit" :loading="stepLoad" color="#3d4b70">提交</u-button>
<view style="padding: 10px 16px;display: flex;flex-direction: row;" class="bottom-button">
<u-button type="primary" @click="goRiskDes" color="#3d4b70" :plain="true" style="margin-right: 5px;">新增隐患描述</u-button>
<u-button type="primary" @click="submit" :loading="stepLoad" color="#3d4b70" style="margin-left: 5px;">提交</u-button>
</view>
<u-picker :show="comPickerInfo.showSheet" :columns="comPickerInfo.columns" @confirm="onConfirmPicker" @close="comPickerInfo.showSheet=false" @cancel="comPickerInfo.showSheet=false" keyName="NAME"></u-picker>
<u-modal :show="showDelModalIndex >= 0" @confirm="confirmDel" @cancel="cacelDel" :showCancelButton="true" title="确认删除？"></u-modal>
@ -295,6 +296,18 @@
});
}
},
goRiskDes(){
if(!this.model.CHECK_CONTENTS_ID){
uni.showToast({
title: '请先选择检查内容',
icon: 'none'
});
return
}
uni.navigateTo({
url: 'checkContentEdit?CHECK_CONTENTS_ID=' + this.model.CHECK_CONTENTS_ID
})
},
loadData() {
// const json = {}
const orgId = uni.getStorageSync('orgId')

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

@ -55,6 +55,17 @@ export function GetIdentityUserNewRecord(params) {
})
})
}
export function GetSKEnterpriseLibraryRecord(params) {
return new Promise((resolve, reject) => {
request.post("/SK/SKEnterpriseLibrary/SKGet", params).then((result) => {
if (result.IsSuccessful) {
resolve(result.Data);
}
}).catch((error) => {
reject(error)
})
})
}
export function GetHandRiskReportRecord(params) {
return new Promise((resolve, reject) => {
request.post("/SK/HiddenDangerHandReport/Get", params).then((result) => {
@ -220,6 +231,39 @@ export function SKEnterpriseLibrary(params) {
})
})
}
export function GetPostRiskList(params) {
return new Promise((resolve, reject) => {
request.post("/SK/SKEnterpriseLibrary/GetPostRiskList", params).then((result) => {
if (result.IsSuccessful) {
resolve(result);
}
}).catch((error) => {
reject(error)
})
})
}
export function DepartOrderPaged(params) {
return new Promise((resolve, reject) => {
request.post("/SK/SKEnterpriseLibrary/DepartOrderPaged", params).then((result) => {
if (result.IsSuccessful) {
resolve(result);
}
}).catch((error) => {
reject(error)
})
})
}
export function SKEnterpriseLibraryNew(params) {
return new Promise((resolve, reject) => {
request.post("/SK/SKEnterpriseLibrary/GetCheckListNew", params).then((result) => {
if (result.IsSuccessful) {
resolve(result.Data);
}
}).catch((error) => {
reject(error)
})
})
}
export function GetCheckDetailList(params) {
return new Promise((resolve, reject) => {
request.post("/SK/SKEnterpriseLibrary/GetCheckDetailList", params).then((result) => {
@ -618,6 +662,17 @@ export function GetSafeCheckRecordListInfo(params) {
})
})
}
export function GetSKEnterpriseLibrary(params) {
return new Promise((resolve, reject) => {
request.post("/SK/SKEnterpriseLibrary/SKOrderPaged", params).then((result) => {
if (result.IsSuccessful) {
resolve(result);
}
}).catch((error) => {
reject(error)
})
})
}
export function GetHiddenDangerListInfo(params) {
return new Promise((resolve, reject) => {
request.post("/SK/HiddenDangerReport/OrderPaged", params).then((result) => {
@ -718,6 +773,17 @@ export function GetCheckContentsInfo(params) {
})
})
}
export function GetCheckContentsNew(params) {
return new Promise((resolve, reject) => {
request.post("/SK/CheckContents/Get", params).then((result) => {
if (result.IsSuccessful) {
resolve(result.Data);
}
}).catch((error) => {
reject(error)
})
})
}
export function GetHiddenScripList(params) {
return new Promise((resolve, reject) => {
request.post("/SK/SKCheckContents/GetHiddenScripList", params).then((result) => {
@ -875,7 +941,18 @@ export function GetScorec(params) {
}
export function GetSKCheckType(params) {
return new Promise((resolve, reject) => {
request.post("/SK/SKCheckType/OrderPaged", params).then((result) => {
request.post("/SK/SKCheckType/OrderPagedNew", params).then((result) => {
if (result.IsSuccessful) {
resolve(result);
}
}).catch((error) => {
reject(error)
})
})
}
export function SKOrderEntities(params) {
return new Promise((resolve, reject) => {
request.post("/SK/SKEnterpriseLibrary/SKOrderEntities", params).then((result) => {
if (result.IsSuccessful) {
resolve(result);
}
@ -885,3 +962,4 @@ export function GetSKCheckType(params) {
})
}