{{ $t("message.laborMange.essential") }}
-
+ {{
+ basicInfoStatus
+ ? $t("message.laborMange.save")
+ : $t("message.laborMange.edit")
+ }}
+ {{ $t("message.laborMange.cancel") }}
- ![]()
+ ![]()
-
+ :beforeUpload="(file) => handleBeforeUpload(file, 1)" :show-file-list="false" name="files"
+ accept=".jpg, .jpeg">
{{
$t("message.laborMange.updateOnsitePhotos")
}}
-
- ![]()
+ ![]()
-
+
{{
$t("message.laborMange.update") +
$t("message.laborMange.IdCardHead")
@@ -99,12 +63,8 @@
@@ -162,42 +118,21 @@
+
-
+
-
+
-
-
{{ $t("message.laborMange.recordDate") }}:
@@ -123,12 +83,8 @@
{{ $t("message.laborMange.jobNumber") }}：
-
{{ $t("message.laborMange.detailMessage") }}
-
+ {{
+ detailInfoStatus
+ ? $t("message.laborMange.save")
+ : $t("message.laborMange.edit")
+ }}
+ {{ $t("message.laborMange.cancel") }}
-
- ![]()
- 
+ " />
+
-
+
{{
$t("message.laborMange.update")
}}
+ " />
+
-
- ![]()
- 
+ " />
+
-
+
{{
$t("message.laborMange.update")
}}
@@ -288,14 +194,8 @@
-
-
+
+
{{
$t("message.laborMange.man")
}}
@@ -305,22 +205,15 @@
{{
workerInfo.sex == 1
- ? $t("message.laborMange.man")
- : $t("message.laborMange.female")
+ ? $t("message.laborMange.man")
+ : $t("message.laborMange.female")
}}
-
-
+
@@ -354,40 +247,20 @@
-
-
+
+
{{ workerInfo.birthday }}
-
-
-
+
+
+
{{ workerInfo.nation }}
@@ -397,30 +270,18 @@
-
-
+
-
-
+
{{
workerInfo.issuingAuthorityForIdcard
}}
@@ -430,27 +291,20 @@
-
-
-
+
+
{{
workerInfo.longTerm == 1
- ? "长期"
- : workerInfo.idCardEndDate
+ ? "长期"
+ : workerInfo.idCardEndDate
}}
@@ -458,12 +312,11 @@
-
+
{{
workerInfo.enterpriseName || ""
}}
@@ -471,12 +324,13 @@
-
+
{{ workerInfo.teamName || "" }}
@@ -484,23 +338,16 @@
-
-
@@ -508,20 +355,25 @@
-
+
+
+
+
+ {{
+ workerInfo.personType
+ ? personTypeList[workerInfo.personType - 1].title
+ : ""
}}
@@ -998,7 +850,7 @@
-->
-
+
-
+
- {{ $t("message.laborMange.checkAll") }}
-
-
+ {{ $t("message.laborMange.checkAll") }}
+
+
{{ item.devName }}
- {{ $t("message.laborMange.checkAll") }}
-
-
+ {{ $t("message.laborMange.checkAll") }}
+
+
{{ item.name }}
-
+
-
+
{{
$t("message.laborMange.notSigned")
}}
@@ -1137,81 +935,48 @@
{{
scope.row.signState == 1
- ? $t("message.laborMange.signed")
- : $t("message.laborMange.notSigned")
+ ? $t("message.laborMange.signed")
+ : $t("message.laborMange.notSigned")
}}
-
+
-
-
+
-
-
+
{{
scope.row.contractType == 1
- ? $t("message.laborMange.paperContract")
- : scope.row.contractType == 2
+ ? $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.fixedTermContract")
+ : scope.row.laborContractType == 2
? $t("message.laborMange.certainAmountOfWork")
: ""
}}
@@ -1221,133 +986,67 @@
prop="address"
:label="$t('message.laborMange.effectiveDate')"
> -->
-
+
-
+
{{ scope.row.contractBeginDate }}
-
+
-
+
{{ scope.row.contractEndDate }}
-
+
-
-
+
{{
scope.row.wagesVerificationType == 1
- ? $t("message.laborMange.perDiem")
- : scope.row.wagesVerificationType == 2
+ ? $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.perMensem")
+ : scope.row.wagesVerificationType == 4
+ ? $t("message.laborMange.byThePiece")
+ : ""
}}
-
+
-
-
+
-
+
{{
$t("message.laborMange.clickOnTheUpload")
}}
-
+ " />
+
-
-
+
{{ item }}
@@ -1056,34 +889,18 @@
-
+
{{ item }}
@@ -1097,37 +914,18 @@
{{ $t("message.laborMange.contractInfo") }}
- {{
- pactInfoStatus
- ? $t("message.laborMange.save")
- : $t("message.laborMange.edit")
- }}
- {{ $t("message.laborMange.cancel") }}
+ {{
+ pactInfoStatus
+ ? $t("message.laborMange.save")
+ : $t("message.laborMange.edit")
+ }}
+ {{ $t("message.laborMange.cancel") }}
-
+
+
-
+
-
-
+
{{ scope.row.certificateTypeName }}
-
+
-
-
+
-
-
+
{{
scope.row.skillLevel == 1
- ? $t("message.laborMange.generalWorker")
- : scope.row.skillLevel == 2
+ ? $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")
- : ""
+ ? $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 }}
-
+
-
-
+
-
-
+
-
+ " :on-success="
+ (file) =>
+ handleSuccess({ file: file, index: scope.$index }, 5)
+" :limit="5" name="files" :file-list="scope.row.fileList">
{{
$t("message.laborMange.clickOnTheUpload")
}}
-
{{ item.name }}
@@ -1360,208 +1059,105 @@
{{ $t("message.laborMange.credentials") }}
- {{ $t("message.laborMange.add") }}
+ {{
+ $t("message.laborMange.add") }}
-
+
+
- {{ $t("message.laborMange.save") }}
- {{ $t("message.laborMange.edit") }}
- {{ $t("message.laborMange.cancel") }}
- {{ $t("message.laborMange.delete") }}
+ {{ $t("message.laborMange.save") }}
+ {{
+ $t("message.laborMange.edit") }}
+ {{ $t("message.laborMange.cancel") }}
+ {{ $t("message.laborMange.delete") }}
@@ -1772,194 +1348,102 @@
-
+
-
+
{{ scope.row.insuranceTime }}
-
+
-
+
{{ scope.row.expireTime }}
-
+
-
-
+
{{
scope.row.state == 1
- ? $t("message.laborMange.unpurchased")
- : scope.row.state == 2
+ ? $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.no")
+ : scope.row.medicalInsurance == 2
? $t("message.laborMange.yes")
: ""
}}
-
+
-
-
+
{{
scope.row.endowmentInsurance == 1
- ? $t("message.laborMange.no")
- : scope.row.endowmentInsurance == 2
+ ? $t("message.laborMange.no")
+ : scope.row.endowmentInsurance == 2
? $t("message.laborMange.yes")
: ""
}}
-
+
-
+ " :on-success="
+ (file) =>
+ handleSuccess({ file: file, index: scope.$index }, 7)
+" :limit="5" name="files" :file-list="scope.row.fileList">
{{
$t("message.laborMange.clickOnTheUpload")
}}
-
{{ item.name }}
@@ -1571,34 +1167,14 @@
{{ $t("message.laborMange.insuranceInfo") }}
- {{ $t("message.laborMange.add") }}
+ {{
+ $t("message.laborMange.add") }}
-
+
+
- {{ $t("message.laborMange.save") }}
- {{ $t("message.laborMange.edit") }}
- {{ $t("message.laborMange.cancel") }}
- {{ $t("message.laborMange.delete") }}
+ {{ $t("message.laborMange.save") }}
+ {{
+ $t("message.laborMange.edit") }}
+ {{ $t("message.laborMange.cancel") }}
+ {{ $t("message.laborMange.delete") }}
@@ -2203,28 +1667,16 @@
{{ item.name }}
@@ -1969,34 +1453,14 @@
-
+
+
-
+
-
+
-
+
{{ $t("message.laborMange.essential") }}
-
+
+
-->
-
{{ $t("message.laborMange.detailMessage") }}
-
+
-
{{ $t("message.laborMange.contractInfo") }}
-
+
-->
-
{{ $t("message.laborMange.credentials") }}
@@ -2234,10 +1686,7 @@
>
{{ $t('message.laborMange.physicalInfo') }}
+
{{ $t("message.laborMange.insuranceInfo") }}
@@ -2264,39 +1713,20 @@
-
@@ -2310,83 +1740,48 @@
-
- *{{
+ *{{
$t("message.laborMange.pleaseChoose") +
$t("message.laborMange.picture")
}}:
- {{ $t("message.laborMange.confirm") }}
+ {{ $t("message.laborMange.confirm")
+ }}
{{
$t("message.laborMange.cancel")
}}
@@ -2421,8 +1816,10 @@ import {
getGroupListApi,
checkImgLibraryApi,
updateMemberDetailDataList,
+ getTeamInfoList
} from "@/assets/js/api/laborPerson.js";
import { getProjectConfigListApi } from "@/assets/js/api/project.js";
+import { isJSON } from "@/util/nowDate/index";
import { selectUserDevAuthorityByUserIdApi } from "@/assets/js/api/configManage";
import QRCode from "qrcodejs2";
import { VueCropper } from "vue-cropper";
@@ -2432,6 +1829,20 @@ export default {
},
data() {
return {
+ personTypeList: [
+ {
+ id: 1,
+ title: "施工人员",
+ },
+ {
+ id: 2,
+ title: "管理人员",
+ },
+ {
+ id: 3,
+ title: "临时人员",
+ },
+ ],
cropperEditTitle: "",
dateOfIssue: "",
radio: "",
@@ -2512,14 +1923,14 @@ export default {
this.getProjectConfig();
},
mounted() {
- new QRCode("workerQRcode", {
- width: 100,
- height: 100, // 高度
- text: this.userId, // 二维码内容
- render: "canvas", // 设置渲染方式（有两种方式 table和canvas，默认是canvas）
- // background: '#f0f',
- // foreground: '#ff0'
- });
+ // new QRCode("workerQRcode", {
+ // width: 100,
+ // height: 100, // 高度
+ // text: this.userId, // 二维码内容
+ // render: "canvas", // 设置渲染方式（有两种方式 table和canvas，默认是canvas）
+ // // background: '#f0f',
+ // // foreground: '#ff0'
+ // });
},
methods: {
devTypeChange(e) {
@@ -2754,7 +2165,8 @@ export default {
//fixed 改成字符串
// this.workerInfo.ufaceDevId.push(arr[i]);
// console.log(this.workerInfo.ufaceDevId)
- id = parseInt(arr[i]);
+ id = parseInt(arr[i]);
+ console.log(1111, id);
for (let j = 0; j < this.ufaceDevAllList.length; j++) {
// console.log(this.ufaceDevAllList[j].id, id)
if (this.ufaceDevAllList[j].id == id) {
@@ -2777,7 +2189,6 @@ export default {
console.log("arr", arr);
this.workerInfo.ufaceDevGroupId = arr;
let id = "";
-
for (let i = 0; i < arr.length; i++) {
id = parseInt(arr[i]);
for (let j = 0; j < this.uGroupAllList.length; j++) {
@@ -2849,7 +2260,7 @@ export default {
};
});
// item.fileList = [{ }];
- } else if(item.photoUrl.indexOf("*") != -1) {
+ } else if (item.photoUrl.indexOf("*") != -1) {
item.fileList = item.photoUrl.split("*").map((item) => {
return {
name: item,
@@ -2899,7 +2310,7 @@ export default {
};
});
// item.fileList = [{ }];
- } else if(item.photoUrl.indexOf("*") != -1) {
+ } else if (item.photoUrl.indexOf("*") != -1) {
item.fileList = item.photoUrl.split("*").map((item) => {
return {
name: item,
@@ -2944,8 +2355,8 @@ export default {
//获取管理人员 职务类型 所属企业下拉
if (data.workerInfo.personType == 2) {
this.selectJobList();
- this.getProjectList();
}
+ this.getProjectList();
} else {
this.$message.error(res.message);
}
@@ -2969,12 +2380,32 @@ export default {
getEnterpriseInfoList(data).then((res) => {
if (res.code == 200) {
this.enterpriseListData = res.result;
+ this.getTeamList()
} else {
this.$message.error(this.$t("message.laborMange.queryFails"));
}
});
},
-
+ //获取企业的 - 班组列表
+ getTeamList() {
+ let data = {
+ enterpriseId: this.workerInfo.enterpriseId,
+ projectSn: this.projectSn,
+ };
+ getTeamInfoList(data).then((res) => {
+ this.teamListData = res.result.list;
+ // console.log(res.result.list)
+ const find = res.result.list.find(item => item.id == this.workerInfo.teamId);
+ if(find){
+ this.workerInfo.teamId = find.id;
+ this.workerInfo.teamName = find.teamName;
+ } else {
+ this.workerInfo.teamId = "";
+ this.workerInfo.teamName = "";
+ }
+
+ });
+ },
//返回上一页
goBack() {
this.$router.go(-1);
@@ -3002,7 +2433,12 @@ export default {
data.ufaceDevGroupId = "";
}
delete data.addTime;
- editWorkerInfo(data).then((res) => {
+ updateMemberDetailDataList({
+ ...data,
+ contractInfo: JSON.stringify(this.contractList),
+ insuranceInfo: JSON.stringify(this.insuranceInfo),
+ specialCertificateInfo: JSON.stringify(this.specialCertificateInfo),
+ }).then((res) => {
if (res.code == 200) {
this.$message.success(this.$t("message.laborMange.editSuccess"));
this.basicInfoStatus = false;
@@ -3042,13 +2478,22 @@ export default {
} else if (this.workerInfo.devType == 2) {
data.ufaceDevGroupId = this.workerInfo.ufaceDevGroupId.join(",");
data.ufaceDevId = "";
+ } else {
+ data.ufaceDevGroupId = "";
+ data.ufaceDevId = "";
}
delete data.addTime;
if (data.ruleId == "") {
data.ruleId = 0;
}
+
console.log("------------------2");
- editWorkerInfo(data).then((res) => {
+ updateMemberDetailDataList({
+ ...data,
+ contractInfo: JSON.stringify(this.contractList),
+ insuranceInfo: JSON.stringify(this.insuranceInfo),
+ specialCertificateInfo: JSON.stringify(this.specialCertificateInfo),
+ }).then((res) => {
if (res.code == 200) {
this.$message.success(this.$t("message.laborMange.editSuccess"));
this.detailInfoStatus = false;
@@ -3623,7 +3068,8 @@ export default {
data.contractList = [];
}
this.pactInfoStatus = false;
- this.contractList = JSON.parse(data.contractList); //合同信息
+ console.log(222222, data.contractList)
+ this.contractList = isJSON(data.contractList) ? JSON.parse(data.contractList) : data.contractList; //合同信息
} else if (type == 5) {
this.workerInfo = this.originalData.workerInfo;
this.getWorkerInfo();
@@ -3660,13 +3106,16 @@ export default {
if (this.certificateList[index].certificateType == "") {
this.$message.error(
this.$t("message.laborMange.pleaseChoose") +
- this.$t("message.laborMange.certificateType")
+ this.$t("message.laborMange.certificateType")
);
return;
}
- let findItem = this.certificateTypeList.find(item => item.id == this.certificateList[index].certificateType);
- if(findItem){
- this.certificateList[index].certificateTypeName = findItem.dictionaryName
+ let findItem = this.certificateTypeList.find(
+ (item) => item.id == this.certificateList[index].certificateType
+ );
+ if (findItem) {
+ this.certificateList[index].certificateTypeName =
+ findItem.dictionaryName;
}
let requestData = {
...this.workerInfo,
@@ -3731,7 +3180,7 @@ export default {
if (this.insuranceList[index].state == "") {
this.$message.error(
this.$t("message.laborMange.pleaseChoose") +
- this.$t("message.laborMange.insurancePurchaseStatus")
+ this.$t("message.laborMange.insurancePurchaseStatus")
);
return;
}
@@ -4038,7 +3487,7 @@ export default {
},
//处罚记录 切换
- handleClick() {},
+ handleClick() { },
//滚动事件
handleScroll(e) {
@@ -4067,14 +3516,17 @@ export default {
display: flex;
align-items: center;
}
+
.flex3 {
display: flex;
align-items: center;
justify-content: space-between;
}
+
.flex2 {
display: flex;
}
+
.personDetails {
width: 100%;
height: 100%;
@@ -4097,9 +3549,11 @@ export default {
// margin-bottom: 50px;
padding: 0 40px;
box-sizing: border-box;
+
.img_wrap {
text-align: center;
margin-right: 30px;
+
// height: 146px;
img {
width: 105px;
@@ -4108,6 +3562,7 @@ export default {
}
}
}
+
.table {
margin-bottom: 40px;
}
@@ -4117,18 +3572,23 @@ export default {
font-size: 28px;
font-weight: 600;
}
+
.time {
line-height: 28px;
}
+
.workType {
line-height: 28px;
}
+
.team1 {
line-height: 28px;
}
+
.team2 {
line-height: 28px;
}
+
.number {
line-height: 28px;
}
@@ -4154,43 +3614,52 @@ export default {
height: 100%;
text-align: center;
border-left: 1px solid #bbbbbb;
+
div {
height: 40px;
line-height: 40px;
cursor: pointer;
}
}
+
.checkedClass {
color: #5181f6;
}
+
.hide {
width: 90%;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
+
.img-list {
.form-label {
margin-bottom: 20px;
+
span {
color: #f56c6c;
}
}
+
.radio-box {
padding: 0 30px;
}
+
/deep/.el-radio {
display: inline-flex;
align-items: center;
margin-right: 30px;
margin-bottom: 20px;
}
+
.btn-box {
margin-top: 30px;
display: flex;
justify-content: space-around;
}
}
+
::v-deep .el-input__inner {
line-height: 1px !important;
}