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-16 11:01:33 +08:00
parent d85b1bd101
commit 6a9cf77b76
2 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pages/apply/subPages/FO/1preShiftMeetingEdit.vue
View File

@ -9,13 +9,13 @@
customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right"> customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="上班时间" prop="CHECKDATETIME" borderBottom @click="showCheckDate(1)"> <u-form-item label="上班时间" prop="CHECKDATETIME" borderBottom >
<u--input disabled disabledColor="#fff" v-model="model.START_TIME" placeholder="请选择上班时间" border="none" inputAlign="right" fontSize="14px"></u--input> <u--input disabled disabledColor="#fff" v-model="model.START_TIME" border="none" inputAlign="right" fontSize="14px"></u--input>
<u-icon style="margin-left: 4px;" name="arrow-down" size="12"></u-icon>
</u-form-item> </u-form-item>
<u-form-item label="下班时间" prop="ENDTIME" borderBottom @click="showCheckDate(2)"> <u-form-item label="下班时间" prop="ENDTIME" borderBottom >
<u--input disabled disabledColor="#fff" v-model="model.END_TIME" placeholder="请选择下班时间" border="none" inputAlign="right" fontSize="14px"></u--input> <u--input disabled disabledColor="#fff" v-model="model.END_TIME" border="none" inputAlign="right" fontSize="14px"></u--input>
<u-icon style="margin-left: 4px;" name="arrow-down" size="12"></u-icon>
</u-form-item> </u-form-item>
<u-form-item label="主持人：" prop="Nav_User.NAME" @click="handleChangeMonitor('Nav_User')" borderBottom> <u-form-item label="主持人：" prop="Nav_User.NAME" @click="handleChangeMonitor('Nav_User')" borderBottom>
<u--input disabledColor="#fff" v-model="(model.Nav_User||{}).NAME" disabled placeholder="请选择主持人" suffixIcon="arrow-right" suffixIconStyle="font-size:12px" fontSize="14px" <u--input disabledColor="#fff" v-model="(model.Nav_User||{}).NAME" disabled placeholder="请选择主持人" suffixIcon="arrow-right" suffixIconStyle="font-size:12px" fontSize="14px"
@ -199,8 +199,7 @@
this.loadData(); this.loadData();
} else { } else {
this.isAdd = 1; this.isAdd = 1;
this.model.START_TIME = uni.$u.timeFormat(Date(), 'yyyy-mm-dd hh:MM:ss');
this.model.END_TIME = uni.$u.timeFormat(Date(), 'yyyy-mm-dd hh:MM:ss');
this.model.ID = guid(); this.model.ID = guid();
this.loadTeamUsers(); this.loadTeamUsers();
} }

34
pages/apply/subPages/FO2/jobEdit.vue
View File

@ -120,14 +120,14 @@
<u--input disabled disabledColor="#fff" placeholder="请选择人员证件" v-model="item['Nav_User'].CODE" fontSize="14px" border="none" <u--input disabled disabledColor="#fff" placeholder="请选择人员证件" v-model="item['Nav_User'].CODE" fontSize="14px" border="none"
customStyle="margin:0px;display:flex;padding:3px 9px;"></u--input> customStyle="margin:0px;display:flex;padding:3px 9px;"></u--input>
</u-form-item> </u-form-item>
<u-form-item v-if="OrgId!== '8b3c41aa-51b1-7ce9-1879-248a038c1b5c'&& OrgId!== 'd9871ba8-0eec-9e4a-bb87-7d5a540d8913'" label="证件类型" prop="CERTIFICATE_TYPE_SHOW" <!-- <u-form-item v-if="OrgId!== '8b3c41aa-51b1-7ce9-1879-248a038c1b5c'&& OrgId!== 'd9871ba8-0eec-9e4a-bb87-7d5a540d8913'" label="证件类型" prop="CERTIFICATE_TYPE_SHOW"
@click="handleShowSheet({title: '证件类型', name: 'certificateType', dataIndex: index,userId:item.USER_ID})"> @click="handleShowSheet({title: '证件类型', name: 'certificateType', dataIndex: index,userId:item.USER_ID})">
<u--input disabled disabledColor="#fff" v-model="item.CERTIFICATE_TYPE_SHOW" placeholder="请选择证件类型" suffixIcon="arrow-right" suffixIconStyle="font-size:12px" fontSize="14px" <u--input disabled disabledColor="#fff" v-model="item.CERTIFICATE_TYPE_SHOW" placeholder="请选择证件类型" suffixIcon="arrow-right" suffixIconStyle="font-size:12px" fontSize="14px"
customStyle="margin:0px;display:flex;padding:3px 9px" border="none"></u--input> customStyle="margin:0px;display:flex;padding:3px 9px" border="none"></u--input>
</u-form-item> </u-form-item>
<u-form-item v-if="OrgId!== '8b3c41aa-51b1-7ce9-1879-248a038c1b5c'&& OrgId!== 'd9871ba8-0eec-9e4a-bb87-7d5a540d8913'" label="身份证号" prop="JOB_DOCUMENT"> <u-form-item v-if="OrgId!== '8b3c41aa-51b1-7ce9-1879-248a038c1b5c'&& OrgId!== 'd9871ba8-0eec-9e4a-bb87-7d5a540d8913'" label="身份证号" prop="JOB_DOCUMENT">
<u--input disabledColor="#fff" placeholder="请选择证件类型" fontSize="14px" customStyle="margin:0px;display:flex;padding:3px 9px" v-model="item.JOB_DOCUMENT" border="none"></u--input> <u--input disabledColor="#fff" placeholder="请选择证件类型" fontSize="14px" customStyle="margin:0px;display:flex;padding:3px 9px" v-model="item.JOB_DOCUMENT" border="none"></u--input>
</u-form-item> </u-form-item> -->
<u-form-item label="证件名称" prop="certificateName" @click="handleShowSheet({title: '证件名称', name: 'certificateName', dataIndex: index,userId:item.USER_ID})"> <u-form-item label="证件名称" prop="certificateName" @click="handleShowSheet({title: '证件名称', name: 'certificateName', dataIndex: index,userId:item.USER_ID})">
<u--input disabled disabledColor="#fff" v-model="item['Nav_Train'].CERTIFICATE_NAME" placeholder="请选择人员证件" suffixIcon="arrow-right" suffixIconStyle="font-size:12px" fontSize="14px" <u--input disabled disabledColor="#fff" v-model="item['Nav_Train'].CERTIFICATE_NAME" placeholder="请选择人员证件" suffixIcon="arrow-right" suffixIconStyle="font-size:12px" fontSize="14px"
customStyle="margin:0px;display:flex;padding:3px 9px" border="none"></u--input> customStyle="margin:0px;display:flex;padding:3px 9px" border="none"></u--input>
@ -573,25 +573,25 @@
if (item['Nav_User'].NAME == '') { if (item['Nav_User'].NAME == '') {
return return
} }
if (!item.JOB_DOCUMENT && item['Nav_Train'].length == 0 && this.OrgId !== '8b3c41aa-51b1-7ce9-1879-248a038c1b5c' && this.OrgId !== 'd9871ba8-0eec-9e4a-bb87-7d5a540d8913') { // if (!item.JOB_DOCUMENT && item['Nav_Train'].length == 0 && this.OrgId !== '8b3c41aa-51b1-7ce9-1879-248a038c1b5c' && this.OrgId !== 'd9871ba8-0eec-9e4a-bb87-7d5a540d8913') {
return // return
} // }
if (!item.JOB_DOCUMENT && item['Nav_Train'].CERTIFICATE_CODE == '' && this.OrgId !== '8b3c41aa-51b1-7ce9-1879-248a038c1b5c' && this.OrgId !== 'd9871ba8-0eec-9e4a-bb87-7d5a540d8913') { // if (!item.JOB_DOCUMENT && item['Nav_Train'].CERTIFICATE_CODE == '' && this.OrgId !== '8b3c41aa-51b1-7ce9-1879-248a038c1b5c' && this.OrgId !== 'd9871ba8-0eec-9e4a-bb87-7d5a540d8913') {
return // return
} // }
if (item.JOB_DOCUMENT == '' && item['Nav_Train'].length == 0 && this.OrgId !== '8b3c41aa-51b1-7ce9-1879-248a038c1b5c' && this.OrgId !== 'd9871ba8-0eec-9e4a-bb87-7d5a540d8913') { // if (item.JOB_DOCUMENT == '' && item['Nav_Train'].length == 0 && this.OrgId !== '8b3c41aa-51b1-7ce9-1879-248a038c1b5c' && this.OrgId !== 'd9871ba8-0eec-9e4a-bb87-7d5a540d8913') {
return // return
} // }
if (item.JOB_DOCUMENT == '' && item['Nav_Train'].CERTIFICATE_CODE == '' && this.OrgId !== '8b3c41aa-51b1-7ce9-1879-248a038c1b5c' && this.OrgId !== 'd9871ba8-0eec-9e4a-bb87-7d5a540d8913') { // if (item.JOB_DOCUMENT == '' && item['Nav_Train'].CERTIFICATE_CODE == '' && this.OrgId !== '8b3c41aa-51b1-7ce9-1879-248a038c1b5c' && this.OrgId !== 'd9871ba8-0eec-9e4a-bb87-7d5a540d8913') {
return // return
} // }
this.numY = this.numY + 1; this.numY = this.numY + 1;
}) })
if (this.numY == this.dataModel.Nav_CrucialLicensePerson.length) { if (this.numY == this.dataModel.Nav_CrucialLicensePerson.length) {
this.stepsPage = this.stepsPage + 1 this.stepsPage = this.stepsPage + 1
} else { } else {
uni.$showErrorInfo('作业人员及人员证件都不能为空') uni.$showErrorInfo('作业人员不能为空')
} }
}, },
stepAddThree() { stepAddThree() {
@ -714,12 +714,12 @@
this.dataModel.Nav_MonitorUser = {} this.dataModel.Nav_MonitorUser = {}
} }
if (res.JOB_DATE) { if (res.JOB_DATE) {
res.JOB_DATE = uni.$u.timeFormat(res.JOB_DATE, 'yyyy-mm-dd') res.JOB_DATE = uni.$u.timeFormat(res.JOB_DATE, 'yyyy-mm-dd hh:MM')
} else { } else {
res.JOB_DATE = uni.$u.timeFormat(new Date(), 'yyyy-mm-dd hh:MM') res.JOB_DATE = uni.$u.timeFormat(new Date(), 'yyyy-mm-dd hh:MM')
} }
if (res.JOB_END_DATE) { if (res.JOB_END_DATE) {
res.JOB_END_DATE = uni.$u.timeFormat(res.JOB_END_DATE, 'yyyy-mm-dd') res.JOB_END_DATE = uni.$u.timeFormat(res.JOB_END_DATE, 'yyyy-mm-dd hh:MM')
} else { } else {
res.JOB_END_DATE = uni.$u.timeFormat(new Date(), 'yyyy-mm-dd hh:MM') res.JOB_END_DATE = uni.$u.timeFormat(new Date(), 'yyyy-mm-dd hh:MM')
} }