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

增加关联检查内容

Browse Source
This commit is contained in:
yunkexin 2026-07-23 16:53:29 +08:00
parent 0c2bbe81b1
commit f0236c116a
6 changed files with 51 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,7 @@
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12"> <u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
</u-icon> </u-icon>
</u-form-item> </u-form-item>
<u-form-item label="检查人员" @click="handleShowUserSelector(item,index)"> <u-form-item label="检查人员" @click="handleShowUserSelector(item)">
<u-icon name="man-add" size="24" color="#3d9cff" slot="right"></u-icon> <u-icon name="man-add" size="24" color="#3d9cff" slot="right"></u-icon>
</u-form-item> </u-form-item>
<view class="tag-view" v-if="item.Nav_CheckNoticeDetailUsers"> <view class="tag-view" v-if="item.Nav_CheckNoticeDetailUsers">
@ -99,9 +99,9 @@
</u-form-item> </u-form-item>
<u--textarea v-model="item.Nav_CheckNoticeDetailBasicsName" disabled maxlength="-1"></u--textarea> <u--textarea v-model="item.Nav_CheckNoticeDetailBasicsName" disabled maxlength="-1"></u--textarea>
<u-form-item borderBottom label="判定标准" prop="HIDDEN_PLACE" border-bottom> <u-form-item borderBottom label="判定标准" prop="HIDDEN_PLACE" border-bottom>
<u--input v-model="item.CHECKSTANDARD" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input>
</u-form-item> </u-form-item>
<u--textarea v-model="item.CHECKSTANDARD" disabled maxlength="-1"></u--textarea>
</view> </view>
@ -343,7 +343,29 @@
}) })
return return
} }
this.stepsPageList = this.stepsPageList + 1 let json = {
CHECK_TYPE_ID: this.model.CHECK_TYPE_ID,
DEPARTMENT_TYPE: this.model.DEPARTMENT_TYPE,
ID: this.model.ID,
ORG_ID: this.ORG_ID,
PLANCHECKFREQUENCY: this.model.PLANCHECKFREQUENCY,
PRODUCTION_UNIT_ID: this.model.PRODUCTION_UNIT_ID,
Nav_ApplyDepartment: {
NAME: uni.getStorageSync('appInfo').User.Nav_Department.NAME
},
Nav_ApplyUser: {
NAME: uni.getStorageSync('appInfo').User.NAME
}
}
getRequest(json, "/SK/SKSecurityInspectionNotice/GetCheckContentsNew").then(res => {
console.log(res, '9999')
if (res) {
this.model.Nav_CheckNoticeDetails = res
}
this.stepsPageList = this.stepsPageList + 1
})
}, },
stepReduce() { stepReduce() {
this.stepsPageList = this.stepsPageList - 1 this.stepsPageList = this.stepsPageList - 1
@ -402,10 +424,7 @@
this.showPopupDate = false this.showPopupDate = false
}, },
handleSelectorPeople(e) { handleSelectorPeople(e) {
const { this.peopleSelectOption.value.Nav_CheckNoticeDetailUsers = e.map(i => {
index: key
} = this.peopleSelectOption
this.model.Nav_CheckNoticeDetails[key].Nav_CheckNoticeDetailUsers = e.map(i => {
return { return {
USER_ID: i.USER_ID, USER_ID: i.USER_ID,
IS_DELETED: i.IS_DELETED, IS_DELETED: i.IS_DELETED,
@ -417,11 +436,10 @@
} }
}) })
}, },
handleShowUserSelector(item, index) { handleShowUserSelector(item) {
this.peopleSelectOption = { this.peopleSelectOption = {
showSelector: true, showSelector: true,
value: item, value: item,
index,
defaultChecked: item.Nav_CheckNoticeDetailUsers?.map(i => { defaultChecked: item.Nav_CheckNoticeDetailUsers?.map(i => {
return { return {
...i, ...i,
@ -540,7 +558,7 @@
if (p.val) { if (p.val) {
extendRule(json, 'CHECKCONTENT', 9, p.val); extendRule(json, 'CHECKCONTENT', 9, p.val);
} }
if(this.model.PRODUCTION_UNIT_ID){ if (this.model.PRODUCTION_UNIT_ID) {
extendRule(json, 'PRODUCTION_UNIT_ID', 1, this.model.PRODUCTION_UNIT_ID); extendRule(json, 'PRODUCTION_UNIT_ID', 1, this.model.PRODUCTION_UNIT_ID);
} }
dataSelect = await GetNewCheckContentsInfo(json).then(res => { dataSelect = await GetNewCheckContentsInfo(json).then(res => {
@ -632,21 +650,21 @@
submit() { submit() {
console.log(this.model) console.log(this.model)
for (let item of this.model.Nav_CheckNoticeDetails.filter(i => !i.IS_DELETED)) { for (let item of this.model.Nav_CheckNoticeDetails.filter(i => !i.IS_DELETED)) {
if (item.Nav_CheckNoticeDetailUsers.length == 0) { if (!item.Nav_CheckNoticeDetailUsers || item.Nav_CheckNoticeDetailUsers.length == 0) {
uni.showToast({ uni.showToast({
title: '请选择检查人员', title: '请选择检查人员',
icon: 'none' icon: 'none'
}) })
return return
} }
if (!item.Nav_Contents.CHECKCONTENT) { if (!item.Nav_Contents || !item.Nav_Contents.CHECKCONTENT) {
uni.showToast({ uni.showToast({
title: '请选择检查内容', title: '请选择检查内容',
icon: 'none' icon: 'none'
}) })
return return
} }
if (!item.Nav_RiskArea.NAME) { if (!item.Nav_RiskArea || !item.Nav_RiskArea.NAME) {
uni.showToast({ uni.showToast({
title: '请选择检查区域', title: '请选择检查区域',
icon: 'none' icon: 'none'

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

@ -9,11 +9,11 @@
</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 required label="生产单元：" prop="Product_Unit" @click="handleChange('SKProductionUnit')"> <u-form-item label="生产单元：" prop="Product_Unit" >
<u--input v-model="(model.Nav_ProductionUnit||{}).NAME" 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> -->
</u-form-item> </u-form-item>
<u-form-item label="检查类型：" prop="Check_Type" > <u-form-item label="检查类型：" prop="Check_Type" >
<u--input v-model="(model.Nav_CheckType||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"></u--input> <u--input v-model="(model.Nav_CheckType||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"></u--input>
@ -81,7 +81,7 @@
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12"> <u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
</u-icon> </u-icon>
</u-form-item> </u-form-item>
<u-form-item required label="检查人员" @click="handleShowUserSelector(item,index)"> <u-form-item required label="检查人员" @click="handleShowUserSelector(item)">
<u-icon name="man-add" size="24" color="#3d9cff" slot="right"></u-icon> <u-icon name="man-add" size="24" color="#3d9cff" slot="right"></u-icon>
</u-form-item> </u-form-item>
<view class="tag-view" v-if="item.Nav_CheckRecordDetailUsers"> <view class="tag-view" v-if="item.Nav_CheckRecordDetailUsers">
@ -96,9 +96,9 @@
</u-form-item> </u-form-item>
<u--textarea v-model="item.Nav_CheckRecordDetailBasicsName" disabled maxlength="-1"></u--textarea> <u--textarea v-model="item.Nav_CheckRecordDetailBasicsName" disabled maxlength="-1"></u--textarea>
<u-form-item borderBottom label="判定标准" prop="HIDDEN_PLACE" border-bottom> <u-form-item borderBottom label="判定标准" prop="HIDDEN_PLACE" border-bottom>
<u--input v-model="item.CHECKSTANDARD" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input>
</u-form-item> </u-form-item>
<u--textarea v-model="item.CHECKSTANDARD" disabled maxlength="-1"></u--textarea>
<u-form-item required label="检查情况" prop="Product_Unit" @click="handleChange('SKCheckResultEnum',item)" borderBottom> <u-form-item required label="检查情况" prop="Product_Unit" @click="handleChange('SKCheckResultEnum',item)" borderBottom>
<u--input v-model="item.CHECK_RESULTName" disabled disabledColor="#ffffff" placeholder="请选择检查情况" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="item.CHECK_RESULTName" disabled disabledColor="#ffffff" placeholder="请选择检查情况" border="none" inputAlign="right" fontSize="14px">
</u--input> </u--input>
@ -447,10 +447,7 @@
this.showPopupDate = false this.showPopupDate = false
}, },
handleSelectorPeople(e) { handleSelectorPeople(e) {
const { this.peopleSelectOption.value.Nav_CheckRecordDetailUsers = e.map(i => {
index: key
} = this.peopleSelectOption
this.model.Nav_CheckRecordDetails[key].Nav_CheckRecordDetailUsers = e.map(i => {
return { return {
USER_ID: i.USER_ID, USER_ID: i.USER_ID,
IS_DELETED: i.IS_DELETED, IS_DELETED: i.IS_DELETED,
@ -462,11 +459,10 @@
} }
}) })
}, },
handleShowUserSelector(item, index) { handleShowUserSelector(item) {
this.peopleSelectOption = { this.peopleSelectOption = {
showSelector: true, showSelector: true,
value: item, value: item,
index,
defaultChecked: item.Nav_CheckRecordDetailUsers.map(i => { defaultChecked: item.Nav_CheckRecordDetailUsers.map(i => {
return { return {
...i, ...i,

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

@ -83,9 +83,9 @@
</u-form-item> </u-form-item>
<u--textarea v-model="item.Nav_CheckRecordDetailBasicsName" disabled maxlength="-1"></u--textarea> <u--textarea v-model="item.Nav_CheckRecordDetailBasicsName" disabled maxlength="-1"></u--textarea>
<u-form-item borderBottom label="判定标准" prop="HIDDEN_PLACE" border-bottom> <u-form-item borderBottom label="判定标准" prop="HIDDEN_PLACE" border-bottom>
<u--input v-model="item.CHECKSTANDARD" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input>
</u-form-item> </u-form-item>
<u--textarea v-model="item.CHECKSTANDARD" disabled maxlength="-1"></u--textarea>
<u-form-item label="检查情况" prop="Product_Unit" borderBottom> <u-form-item label="检查情况" prop="Product_Unit" borderBottom>
<u--input v-model="item.CHECK_RESULTName" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="item.CHECK_RESULTName" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
</u--input> </u--input>

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

@ -99,9 +99,10 @@
</u-form-item> </u-form-item>
<u--textarea v-model="item.Nav_CheckRecordDetailBasicsName" disabled maxlength="-1"></u--textarea> <u--textarea v-model="item.Nav_CheckRecordDetailBasicsName" disabled maxlength="-1"></u--textarea>
<u-form-item borderBottom label="判定标准" prop="HIDDEN_PLACE" border-bottom> <u-form-item borderBottom label="判定标准" prop="HIDDEN_PLACE" border-bottom>
<u--input v-model="item.CHECKSTANDARD" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none"> <!-- <u--input v-model="item.CHECKSTANDARD" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input> </u--input> -->
</u-form-item> </u-form-item>
<u--textarea v-model="item.CHECKSTANDARD" disabled maxlength="-1"></u--textarea>
<u-form-item required label="检查情况" prop="Product_Unit" @click="handleChange('SKCheckResultEnum',item)" borderBottom> <u-form-item required label="检查情况" prop="Product_Unit" @click="handleChange('SKCheckResultEnum',item)" borderBottom>
<u--input v-model="item.CHECK_RESULTName" disabled disabledColor="#ffffff" placeholder="请选择检查情况" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="item.CHECK_RESULTName" disabled disabledColor="#ffffff" placeholder="请选择检查情况" border="none" inputAlign="right" fontSize="14px">
</u--input> </u--input>

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

@ -84,9 +84,10 @@
</u-form-item> </u-form-item>
<u--textarea v-model="item.Nav_CheckRecordDetailBasicsName" disabled maxlength="-1"></u--textarea> <u--textarea v-model="item.Nav_CheckRecordDetailBasicsName" disabled maxlength="-1"></u--textarea>
<u-form-item borderBottom label="判定标准" prop="HIDDEN_PLACE" border-bottom> <u-form-item borderBottom label="判定标准" prop="HIDDEN_PLACE" border-bottom>
<u--input v-model="item.CHECKSTANDARD" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none"> <!-- <u--input v-model="item.CHECKSTANDARD" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input> </u--input> -->
</u-form-item> </u-form-item>
<u--textarea v-model="item.CHECKSTANDARD" disabled maxlength="-1"></u--textarea>
<u-form-item label="检查情况" prop="Product_Unit" borderBottom> <u-form-item label="检查情况" prop="Product_Unit" borderBottom>
<u--input v-model="item.CHECK_RESULTName" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px"> <u--input v-model="item.CHECK_RESULTName" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
</u--input> </u--input>

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

@ -90,9 +90,10 @@
</u-form-item> </u-form-item>
<u--textarea v-model="item.Nav_CheckNoticeDetailBasicsName" disabled maxlength="-1"></u--textarea> <u--textarea v-model="item.Nav_CheckNoticeDetailBasicsName" disabled maxlength="-1"></u--textarea>
<u-form-item borderBottom label="判定标准" prop="HIDDEN_PLACE" border-bottom> <u-form-item borderBottom label="判定标准" prop="HIDDEN_PLACE" border-bottom>
<u--input v-model="item.CHECKSTANDARD" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none"> <!-- <u--input v-model="item.CHECKSTANDARD" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
</u--input> </u--input> -->
</u-form-item> </u-form-item>
<u--textarea v-model="item.CHECKSTANDARD" disabled maxlength="-1"></u--textarea>
</view> </view>