+
+
{{ $t('message.laborMange.punishmentRecord') }}
@@ -2049,6 +2062,44 @@
+
+
+
+ 安全扣分详情
+
+ 重置
+
+
@@ -2267,6 +2318,8 @@ import {
ufaceDevList,
getGroupListApi,
checkImgLibraryApi,
+ safeReduceDetailList,
+ resetScoreApi
} from "@/assets/js/api/laborPerson.js";
import { getProjectConfigListApi } from "@/assets/js/api/project.js";
import { selectUserDevAuthorityByUserIdApi } from "@/assets/js/api/configManage";
@@ -2299,6 +2352,7 @@ export default {
physicalsList: [], //体检
safeEducationList: [], //安全教育
workExperienceList: [], //从业信息
+ reduceScoreList: [], //安全扣分详情
badList: [], //奖罚 --不良记录
rewardList: [], //奖罚 --奖励记录
nationList: this.$t("message.laborMange.nationList"), //民族
@@ -2354,6 +2408,7 @@ export default {
this.getUfaceDevList();
this.getUGroupDevList();
this.getWorkerInfo();
+ this.getSafeScoreDetail();
this.getAttendRuleList();
this.getProjectConfig();
},
@@ -2368,6 +2423,18 @@ export default {
});
},
methods: {
+ scoreReset(){
+ let requestData = {
+ id: this.workerInfo.id,
+ safeScore: 100
+ }
+ resetScoreApi(requestData).then(res => {
+ if(res.code == 200){
+ this.$message.success("操作成功");
+ this.getWorkerInfo();
+ }
+ })
+ },
devTypeChange(e){
if(e == 1){
this.getUfaceDevList();
@@ -2716,7 +2783,16 @@ export default {
}
});
},
-
+ // 获取安全扣分详情
+ getSafeScoreDetail(){
+ safeReduceDetailList({ projectSn: this.$store.state.projectSn, workerId: this.userId }).then(
+ (result) => {
+ console.log(result,666777)
+ this.reduceScoreList = result.result;
+ // this.attendRulesList = result.result;
+ }
+ );
+ },
//查询管理人员的职务类型和职务列表
selectJobList() {
selectJobListApi().then((res) => {
diff --git a/src/views/projectFront/laborManage/personRegisterDetails.vue b/src/views/projectFront/laborManage/personRegisterDetails.vue
new file mode 100644
index 00000000..2d6e4d36
--- /dev/null
+++ b/src/views/projectFront/laborManage/personRegisterDetails.vue
@@ -0,0 +1,4045 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/projectFront/laborManage/visitRecord.vue b/src/views/projectFront/laborManage/visitRecord.vue
new file mode 100644
index 00000000..ecc7d28c
--- /dev/null
+++ b/src/views/projectFront/laborManage/visitRecord.vue
@@ -0,0 +1,349 @@
+
+
+
+
+
+
+
+
+
+ {{ $t('message.laborMange.essential') }}
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+ 
+
+ {{
+ $t('message.laborMange.updateOnsitePhotos')
+ }}
+
+
+
+
+ ![]()
+
+
+
+ {{
+ $t('message.laborMange.update') +
+ $t('message.laborMange.IdCardHead')
+ }}
+
+
+
+
+
+
+
+
+
+
+ {{ $t('message.laborMange.recordDate') }}:
+ {{ workerInfo.enterDate }}
+ {{ $t('message.laborMange.anExitDate') }}:{{
+ workerInfo.exitDate
+ }}
+
+
+ {{ $t('message.laborMange.team') }}：{{ workerInfo.teamName }}
+
+
+ {{ $t('message.laborMange.section') }}：{{
+ workerInfo.departmentName
+ }}
+
+
+ {{ $t('message.laborMange.jobNumber') }}：
+
+
+
+ {{ workerInfo.workerName }}
+
+ {{ $t('message.laborMange.recordDate') }}:
+ {{ workerInfo.enterDate }}
+ {{ $t('message.laborMange.anExitDate') }}:{{
+ workerInfo.exitDate
+ }}
+
+
+ {{ $t('message.laborMange.team') }}：{{ workerInfo.teamName }}
+
+
+ {{ $t('message.laborMange.section') }}：{{
+ workerInfo.departmentName
+ }}
+
+
+ {{ $t('message.laborMange.jobNumber') }}：{{
+ workerInfo.attendanceNumber
+ }}
+
+
+
+
+
+
+
+
+
+ {{ workerInfo.workerName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ $t('message.laborMange.man')
+ }}
+ {{
+ $t('message.laborMange.female')
+ }}
+
+ {{
+ workerInfo.sex == 1
+ ? $t('message.laborMange.man')
+ : $t('message.laborMange.female')
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ workerInfo.birthday }}
+
+
+
+
+
+
+
+
+
+ {{ workerInfo.nation }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 设备
+ 分组
+
+
+
+
+
+
+
+
+ {{ $t('message.laborMange.checkAll') }}
+
+
+ {{ item.devName }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('message.laborMange.checkAll') }}
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('message.laborMange.detailMessage') }}
+
+
+
+
+
+
+ ![]()
+ 
+
+
+ {{
+ $t('message.laborMange.update')
+ }}
+
+
+
+
+
+ ![]()
+ 
+
+
+ {{
+ $t('message.laborMange.update')
+ }}
+
+
+
+
+
+
+ {{ item }}
+
+
+
+
+ {{ item }}
+
+
+
+
+
+
+
+ {{
+ $t('message.laborMange.notSigned')
+ }}
+ {{
+ $t('message.laborMange.signed')
+ }}
+
+ {{
+ scope.row.signState == 1
+ ? $t('message.laborMange.signed')
+ : $t('message.laborMange.notSigned')
+ }}
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.contractType == 1
+ ? $t('message.laborMange.paperContract')
+ : scope.row.contractType == 2
+ ? $t('message.laborMange.electronicContract')
+ : ''
+ }}
+
+
+
+
+
+
+ {{
+ scope.row.laborContractType == 1
+ ? $t('message.laborMange.fixedTermContract')
+ : scope.row.laborContractType == 2
+ ? $t('message.laborMange.certainAmountOfWork')
+ : ''
+ }}
+
+
+
+
+
+
+ {{ scope.row.contractBeginDate }}
+
+
+
+
+
+
+ {{ scope.row.contractEndDate }}
+
+
+
+
+
+
+ {{
+ scope.row.wagesVerificationType == 1
+ ? $t('message.laborMange.perDiem')
+ : scope.row.wagesVerificationType == 2
+ ? $t('message.laborMange.byTheHour')
+ : scope.row.wagesVerificationType == 3
+ ? $t('message.laborMange.perMensem')
+ : scope.row.wagesVerificationType == 4
+ ? $t('message.laborMange.byThePiece')
+ : ''
+ }}
+
+
+
+
+
+
+
+
+ {{
+ $t('message.laborMange.clickOnTheUpload')
+ }}
+
+
+
+
+
+ {{ $t('message.laborMange.contractInfo') }}
+ {{
+ pactInfoStatus
+ ? $t('message.laborMange.save')
+ : $t('message.laborMange.edit')
+ }}
+ {{ $t('message.laborMange.cancel') }}
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ {{ scope.row.certificateTypeName }}
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.skillLevel == 1
+ ? $t('message.laborMange.generalWorker')
+ : scope.row.skillLevel == 2
+ ? $t('message.laborMange.primaryWorkers')
+ : scope.row.skillLevel == 3
+ ? $t('message.laborMange.intermediateLabor')
+ : scope.row.skillLevel == 4
+ ? $t('message.laborMange.seniorWorker')
+ : scope.row.skillLevel == 5
+ ? $t('message.laborMange.technician')
+ : scope.row.skillLevel == 6
+ ? $t('message.laborMange.seniorTechnician')
+ : ''
+ }}
+
+
+
+
+
+
+ {{ scope.row.issueTime }}
+
+
+
+
+
+
+ {{ scope.row.effectTime }}
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ $t('message.laborMange.clickOnTheUpload')
+ }}
+
+
+
+
+ {{ $t('message.laborMange.save') }}
+ {{ $t('message.laborMange.edit') }}
+ {{ $t('message.laborMange.cancel') }}
+ {{ $t('message.laborMange.delete') }}
+
+
+
+
+
+
+
+ {{ $t('message.laborMange.credentials') }}
+ {{ $t('message.laborMange.add') }}
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ {{ scope.row.insuranceTime }}
+
+
+
+
+
+
+ {{ scope.row.expireTime }}
+
+
+
+
+
+
+ {{
+ scope.row.state == 1
+ ? $t('message.laborMange.unpurchased')
+ : scope.row.state == 2
+ ? $t('message.laborMange.haveBought')
+ : ''
+ }}
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.medicalInsurance == 1
+ ? $t('message.laborMange.no')
+ : scope.row.medicalInsurance == 2
+ ? $t('message.laborMange.yes')
+ : ''
+ }}
+
+
+
+
+
+
+
+ {{
+ scope.row.endowmentInsurance == 1
+ ? $t('message.laborMange.no')
+ : scope.row.endowmentInsurance == 2
+ ? $t('message.laborMange.yes')
+ : ''
+ }}
+
+
+
+
+ {{ $t('message.laborMange.save') }}
+ {{ $t('message.laborMange.edit') }}
+ {{ $t('message.laborMange.cancel') }}
+ {{ $t('message.laborMange.delete') }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('message.laborMange.insuranceInfo') }}
+ {{ $t('message.laborMange.add') }}
+
+
+
+
+ {{ $t('message.laborMange.essential') }}
+
+
+ {{ $t('message.laborMange.detailMessage') }}
+
+
+ {{ $t('message.laborMange.contractInfo') }}
+
+
+ {{ $t('message.laborMange.credentials') }}
+
+
+
+
+ {{ $t('message.laborMange.insuranceInfo') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ *{{
+ $t('message.laborMange.pleaseChoose') +
+ $t('message.laborMange.picture')
+ }}:
+
+
+ {{ $t('message.laborMange.confirm') }}
+ {{
+ $t('message.laborMange.cancel')
+ }}
+
+
+
+
+
+
+
diff --git a/src/views/projectFront/materialManage/materialEntryManage.vue b/src/views/projectFront/materialManage/materialEntryManage.vue
new file mode 100644
index 00000000..90eafe0e
--- /dev/null
+++ b/src/views/projectFront/materialManage/materialEntryManage.vue
@@ -0,0 +1,305 @@
+
+
+
+
+
+
+
+
+ {{ $t("message.personnelPosition.beaconManage.query") }}
+
+
+ {{ $t("message.personnelPosition.beaconManage.refresh") }}
+
+
+ {{ $t("message.laborDev.add2") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+ {{
+ $t("message.personnelPosition.beaconManage.table.edit")
+ }}
+
+
+ {{
+ $t("message.personnelPosition.beaconManage.table.edit")
+ }}
+
+ 
+ {{
+ $t("message.personnelPosition.beaconManage.table.delete")
+ }}
+
+
+ {{
+ $t("message.personnelPosition.beaconManage.table.delete")
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/projectFront/progressManagementAg/divisionSubManage.vue b/src/views/projectFront/progressManagementAg/divisionSubManage.vue
index 0b09baa9..72713680 100644
--- a/src/views/projectFront/progressManagementAg/divisionSubManage.vue
+++ b/src/views/projectFront/progressManagementAg/divisionSubManage.vue
@@ -345,7 +345,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 刷新
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+ 查看明细
+
+
+
+ 查看明细
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 总进度
+ {{updateDialogTitle.substring(2)}}