admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-05-12 18:23:26 +08:00
parent a1cdeb83d1
commit 6a610b192d
18 changed files with 538 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/doc/h5Entry/index.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>人员录入</title><link href=/doc/h5Entry/static/css/app.c931b0ebe9ac910383137a7b7f60d832.css rel=stylesheet></head><body><div id=app></div><script>var host = window.location.origin; <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>人员录入</title><link href=/doc/h5Entry/static/css/app.bdbf875f8ad6da6d6fae8c605f407326.css rel=stylesheet></head><body><div id=app></div><script>var host = window.location.origin;
var rootURL = host + "/"; var rootURL = host + "/";
// var rootURL = "http://192.168.34.221:28888/"; // var rootURL = "http://192.168.34.221:28888/";
// var rootURL = "http://192.168.34.221:9111/"; //本地 // var rootURL = "http://192.168.34.221:9111/"; //本地
@ -16,4 +16,4 @@
// rootURL = "http://192.168.34.155:19111/" //本地 // rootURL = "http://192.168.34.155:19111/" //本地
// locationURL=rootURL+'doc/h5Entry/index.html?userId=4&projectSn=a2ef0238b59146aa814b93f47710dbf2#/' // locationURL=rootURL+'doc/h5Entry/index.html?userId=4&projectSn=a2ef0238b59146aa814b93f47710dbf2#/'
locationURL=rootURL+'doc/h5Entry/index.html?userId=1779721457571291137&projectSn=BD3137498CB84BF0969979E0342CDBCA&educationId=1666278624304615426#/' locationURL=rootURL+'doc/h5Entry/index.html?userId=1779721457571291137&projectSn=BD3137498CB84BF0969979E0342CDBCA&educationId=1666278624304615426#/'
}</script><script type=text/javascript src=/doc/h5Entry/static/js/manifest.3dd7fa638d0b235ef366.js></script><script type=text/javascript src=/doc/h5Entry/static/js/vendor.08fb8d13d88c906352f9.js></script><script type=text/javascript src=/doc/h5Entry/static/js/app.9abf58dc6ce00cb9831b.js></script></body></html> }</script><script type=text/javascript src=/doc/h5Entry/static/js/manifest.e219210fd38a31a4ad17.js></script><script type=text/javascript src=/doc/h5Entry/static/js/vendor.08fb8d13d88c906352f9.js></script><script type=text/javascript src=/doc/h5Entry/static/js/app.c6b3cb802133ea2879cb.js></script></body></html>

2
public/doc/h5Entry/static/css/app.bdbf875f8ad6da6d6fae8c605f407326.css Normal file
View File

File diff suppressed because one or more lines are too long

1
public/doc/h5Entry/static/css/app.bdbf875f8ad6da6d6fae8c605f407326.css.map Normal file
View File

File diff suppressed because one or more lines are too long

2
public/doc/h5Entry/static/js/1.f197bda3a590ee95a483.js
View File

File diff suppressed because one or more lines are too long

2
public/doc/h5Entry/static/js/1.f197bda3a590ee95a483.js.map
View File

File diff suppressed because one or more lines are too long

2
public/doc/h5Entry/static/js/4.c52430ef4f6e74b5b49a.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/doc/h5Entry/static/js/4.c52430ef4f6e74b5b49a.js.map Normal file
View File

File diff suppressed because one or more lines are too long

2
public/doc/h5Entry/static/js/manifest.e219210fd38a31a4ad17.js Normal file
View File

@ -0,0 +1,2 @@
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(n&&n(r,a,c);l.length;)l.shift()();if(c)for(s=0;s<c.length;s++)f=o(o.s=c[s]);return f};var r={},t={8:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"fbf64467c6abbbc1eb98",1:"f197bda3a590ee95a483",2:"71d89ea01849e20a56e5",3:"4dbc61fae8f9d7188195",4:"c52430ef4f6e74b5b49a",5:"ef7329314c5270b36976"}[e]+".js";var i=setTimeout(u,12e4);function u(){c.onerror=c.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=u,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="/doc/h5Entry/",o.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.e219210fd38a31a4ad17.js.map

1
public/doc/h5Entry/static/js/manifest.e219210fd38a31a4ad17.js.map Normal file
View File

File diff suppressed because one or more lines are too long

14
src/assets/i18n/langs/cn/laborManage/personManage.js
View File

@ -320,6 +320,13 @@ export default {
//管理人员 录入校验 //管理人员 录入校验
personFormRules: { personFormRules: {
personMail: [
{
message: "请输入正确的邮箱格式",
type: "email",
trigger: "blur",
},
],
workerName: [ workerName: [
{ {
required: true, required: true,
@ -575,6 +582,13 @@ export default {
//施工人员 录入校验 //施工人员 录入校验
personFormRules2: { personFormRules2: {
personMail: [
{
message: "请输入正确的邮箱格式",
type: "email",
trigger: "blur",
},
],
workerName: [ workerName: [
{ {
required: true, required: true,

24
src/views/projectFront/configManage/personnelAccess.vue
View File

@ -98,6 +98,11 @@
:label="$t('message.personnelAccess.Labname')" :label="$t('message.personnelAccess.Labname')"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column
prop="personMail"
label="邮箱"
align="center"
></el-table-column>
<el-table-column <el-table-column
prop="roleName" prop="roleName"
:label="$t('message.personnelAccess.Labjuese')" :label="$t('message.personnelAccess.Labjuese')"
@ -266,6 +271,7 @@
v-model="addEditForm.workerId" v-model="addEditForm.workerId"
filterable filterable
:placeholder="$t('message.projectInfo.pleaseChoosePeople')" :placeholder="$t('message.projectInfo.pleaseChoosePeople')"
@change="workerSelect"
> >
<el-option <el-option
v-for="item in personList" v-for="item in personList"
@ -276,6 +282,14 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 邮箱 -->
<el-form-item label="邮箱"
prop="personMail">
<el-input
disabled
v-model="addEditForm.personMail"
></el-input>
</el-form-item>
<!-- 外部登录标识 --> <!-- 外部登录标识 -->
<el-form-item <el-form-item
:label="$t('message.projectInfo.externalAccount')" :label="$t('message.projectInfo.externalAccount')"
@ -626,6 +640,16 @@ export default {
// } // }
// } // }
// }, // },
workerSelect(){
let findItem = this.personList.find(item => {
return item.id == this.addEditForm.workerId
})
if(findItem){
this.addEditForm.personMail = findItem.personMail
} else {
this.addEditForm.personMail = ""
}
},
getTreeList() { getTreeList() {
getTreeGroupApi({ getTreeGroupApi({
projectSn: this.$store.state.projectSn, projectSn: this.$store.state.projectSn,

741
src/views/projectFront/laborManage/personDetails.vue
View File

File diff suppressed because it is too large Load Diff

9
src/views/projectFront/laborManage/personModule/administration.vue
View File

@ -1297,6 +1297,14 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="personMail">
<el-input
v-model="personForm.personMail"
placeholder="请输入邮箱"
></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -2149,6 +2157,7 @@ export default {
payRollBankName: "", payRollBankName: "",
payRollBankNumber: "", payRollBankNumber: "",
locationCardno: "", locationCardno: "",
personMail: ""
}, },
//人员录入校验 //人员录入校验
personFormRules: this.$t("message.laborMange.personFormRules"), personFormRules: this.$t("message.laborMange.personFormRules"),

9
src/views/projectFront/laborManage/personModule/laborComponent.vue
View File

@ -1581,6 +1581,14 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="personMail">
<el-input
v-model="personForm.personMail"
placeholder="请输入邮箱"
></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
<div class="type-change"> <div class="type-change">
<el-radio-group v-model="typeRadio"> <el-radio-group v-model="typeRadio">
@ -2434,6 +2442,7 @@ export default {
ufaceDevGroupId: [], ufaceDevGroupId: [],
personSerial: "", personSerial: "",
locationCardno: "", //人员定位标签号 locationCardno: "", //人员定位标签号
personMail: ""
}, },
//人员录入校验 //人员录入校验
personFormRules: this.$t("message.laborMange.personFormRules2"), personFormRules: this.$t("message.laborMange.personFormRules2"),

25
src/views/projectFront/progressManagementAg/projectProgressDetail.vue
View File

@ -346,7 +346,7 @@
<el-radio :label="0">否</el-radio> <el-radio :label="0">否</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="延期误工原因" prop="delayEventReason"> <el-form-item label="延期误工原因" prop="delayEventReason" v-if="workerInfo.hasDelayEvent == 1">
<el-input <el-input
type="textarea" type="textarea"
:rows="2" :rows="2"
@ -355,7 +355,7 @@
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="延期原因类型" prop="delayEventType"> <el-form-item label="延期原因类型" prop="delayEventType" v-if="workerInfo.hasDelayEvent == 1">
<el-checkbox-group v-model="workerInfo.delayEventType"> <el-checkbox-group v-model="workerInfo.delayEventType">
<el-checkbox :label="1">人为因素</el-checkbox> <el-checkbox :label="1">人为因素</el-checkbox>
<el-checkbox :label="2">环境因素</el-checkbox> <el-checkbox :label="2">环境因素</el-checkbox>
@ -435,6 +435,27 @@ export default {
trigger: "blur", trigger: "blur",
}, },
], ],
hasDelayEvent: [
{
required: true,
message: this.$t("请选择"),
trigger: "change",
}
],
delayEventReason: [
{
required: true,
message: this.$t("请输入"),
trigger: "blur",
}
],
delayEventType: [
{
required: true,
message: this.$t("请选择"),
trigger: "change",
}
]
}, },
workerInfo: { workerInfo: {
//进度反馈信息 //进度反馈信息

2
src/views/projectFront/projectSummary/baseInfo.vue
View File

@ -59,7 +59,7 @@
}}</span> }}</span>
<span class="width_65" <span class="width_65"
>{{ projectDetail.provinceName >{{ projectDetail.provinceName
}}{{ projectDetail.areaName }}</span }}{{projectDetail.cityName}}{{ projectDetail.areaName }}</span
> >
</div> </div>
<div class="flex3"> <div class="flex3">

41
src/views/projectFront/quality/inspectionLedger.vue
View File

@ -2327,6 +2327,7 @@ export default {
isShow: false, isShow: false,
videoName: "", videoName: "",
unitEnterpriseId: "", unitEnterpriseId: "",
unitRegionId: ""
}; };
}, },
created() { created() {
@ -2442,11 +2443,14 @@ export default {
} }
// 逻辑结束 // 逻辑结束
console.log(this.addForm1, "我的我的我的"); console.log(this.addForm1, "我的我的我的");
// 责任人数据处理
this.unitEnterpriseId = obj.enterpriseId
this.unitRegionId = obj.regionId
this.getPositionList(); this.getPositionList();
this.getDescribeClassifyList(); this.getDescribeClassifyList();
this.getPeopleList(); this.getPeopleList();
this.getReviewPeopleList(); this.getReviewPeopleList();
// this.getPeopleUpdateList(); this.getPeopleUpdateList();
this.getRoutineInspect(); this.getRoutineInspect();
this.rectifyRecordList = []; this.rectifyRecordList = [];
// 默认选择核验人逻辑 // 默认选择核验人逻辑
@ -2769,18 +2773,23 @@ export default {
}, },
changeRegion(val) { changeRegion(val) {
// console.log(val,this.checkPointList,this.$refs['formRegion1'].getCheckedNodes()[0]) // console.log(val,this.checkPointList,this.$refs['formRegion1'].getCheckedNodes()[0])
if (this.$refs["formRegion1"].getCheckedNodes().length == 0) { if(this.recordType == 1){
if (this.recordType == 1) { if (this.$refs["formRegion1"].getCheckedNodes().length == 0) {
this.addForm1.enterpriseSn = ""; this.addForm1.enterpriseSn = "";
this.addForm1.enterpriseName = ""; this.addForm1.enterpriseName = "";
this.addForm1.changeId = ""; this.addForm1.changeId = "";
} else { this.subcontractList = [];
this.crewUpdateList = [];
return;
}
} else {
if (this.$refs["addFormRegion2"].getCheckedNodes().length == 0) {
this.addForm2.enterpriseSn = ""; this.addForm2.enterpriseSn = "";
this.addForm2.enterpriseName = ""; this.addForm2.enterpriseName = "";
this.subcontractList = [];
this.crewUpdateList = [];
return;
} }
this.subcontractList = [];
this.crewUpdateList = [];
return;
} }
if (this.recordType == 1) { if (this.recordType == 1) {
this.addForm1.enterpriseSn = ""; this.addForm1.enterpriseSn = "";
@ -2856,18 +2865,23 @@ export default {
}, },
editChangeRegion() { editChangeRegion() {
// console.log(val,this.checkPointList,this.$refs['formRegion1'].getCheckedNodes()[0]) // console.log(val,this.checkPointList,this.$refs['formRegion1'].getCheckedNodes()[0])
if (this.$refs["formRegion1"].getCheckedNodes().length == 0) { if(this.recordType == 1){
if (this.recordType == 1) { if (this.$refs["formRegion1"].getCheckedNodes().length == 0) {
this.addForm1.enterpriseSn = ""; this.addForm1.enterpriseSn = "";
this.addForm1.enterpriseName = ""; this.addForm1.enterpriseName = "";
this.addForm1.changeId = ""; this.addForm1.changeId = "";
} else { this.subcontractList = [];
this.crewUpdateList = [];
return;
}
} else {
if (this.$refs["addFormRegion2"].getCheckedNodes().length == 0) {
this.addForm2.enterpriseSn = ""; this.addForm2.enterpriseSn = "";
this.addForm2.enterpriseName = ""; this.addForm2.enterpriseName = "";
this.subcontractList = [];
this.crewUpdateList = [];
return;
} }
this.subcontractList = [];
this.crewUpdateList = [];
return;
} }
if (this.recordType == 1) { if (this.recordType == 1) {
let pathLabels = let pathLabels =
@ -3206,6 +3220,7 @@ export default {
let data = { let data = {
projectSn: this.projectSn, projectSn: this.projectSn,
enterpriseId: this.unitEnterpriseId, enterpriseId: this.unitEnterpriseId,
qualityRegionId: this.unitRegionId
}; };
getProjectChilderSystemUserListApi(data).then((res) => { getProjectChilderSystemUserListApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {

42
src/views/projectFront/safeSame/inspectionLedger.vue
View File

@ -2312,6 +2312,7 @@ export default {
isShow: false, isShow: false,
videoName: "", videoName: "",
unitEnterpriseId: "", unitEnterpriseId: "",
unitRegionId: ""
}; };
}, },
created() { created() {
@ -2427,12 +2428,15 @@ export default {
} else if(obj.recordType == 2){ } else if(obj.recordType == 2){
this.addForm2 = {...obj}; this.addForm2 = {...obj};
} }
// 责任人数据处理
this.unitEnterpriseId = obj.enterpriseId
this.unitRegionId = obj.regionId
// 逻辑结束 // 逻辑结束
this.getPositionList(); this.getPositionList();
this.getDescribeClassifyList(); this.getDescribeClassifyList();
this.getPeopleList(); this.getPeopleList();
this.getReviewPeopleList(); this.getReviewPeopleList();
// this.getPeopleUpdateList(); this.getPeopleUpdateList();
this.getRoutineInspect(); this.getRoutineInspect();
this.rectifyRecordList = []; this.rectifyRecordList = [];
// 默认选择核验人逻辑 // 默认选择核验人逻辑
@ -2727,20 +2731,24 @@ export default {
} }
}, },
changeRegion(val) { changeRegion(val) {
console.log(val,666777)
// console.log(val,this.checkPointList,this.$refs['formRegion1'].getCheckedNodes()[0]) // console.log(val,this.checkPointList,this.$refs['formRegion1'].getCheckedNodes()[0])
if (this.$refs["formRegion1"].getCheckedNodes().length == 0) { if(this.recordType == 1){
if (this.recordType == 1) { if (this.$refs["formRegion1"].getCheckedNodes().length == 0) {
this.addForm1.enterpriseSn = ""; this.addForm1.enterpriseSn = "";
this.addForm1.enterpriseName = ""; this.addForm1.enterpriseName = "";
this.addForm1.changeId = ""; this.addForm1.changeId = "";
} else { this.subcontractList = [];
this.crewUpdateList = [];
return;
}
} else {
if (this.$refs["addFormRegion2"].getCheckedNodes().length == 0) {
this.addForm2.enterpriseSn = ""; this.addForm2.enterpriseSn = "";
this.addForm2.enterpriseName = ""; this.addForm2.enterpriseName = "";
this.subcontractList = [];
this.crewUpdateList = [];
return;
} }
this.subcontractList = [];
this.crewUpdateList = [];
return;
} }
if (this.recordType == 1) { if (this.recordType == 1) {
this.addForm1.enterpriseSn = ""; this.addForm1.enterpriseSn = "";
@ -2816,18 +2824,23 @@ export default {
}, },
editChangeRegion() { editChangeRegion() {
// console.log(val,this.checkPointList,this.$refs['formRegion1'].getCheckedNodes()[0]) // console.log(val,this.checkPointList,this.$refs['formRegion1'].getCheckedNodes()[0])
if (this.$refs["formRegion1"].getCheckedNodes().length == 0) { if(this.recordType == 1){
if (this.recordType == 1) { if (this.$refs["formRegion1"].getCheckedNodes().length == 0) {
this.addForm1.enterpriseSn = ""; this.addForm1.enterpriseSn = "";
this.addForm1.enterpriseName = ""; this.addForm1.enterpriseName = "";
this.addForm1.changeId = ""; this.addForm1.changeId = "";
} else { this.subcontractList = [];
this.crewUpdateList = [];
return;
}
} else {
if (this.$refs["addFormRegion2"].getCheckedNodes().length == 0) {
this.addForm2.enterpriseSn = ""; this.addForm2.enterpriseSn = "";
this.addForm2.enterpriseName = ""; this.addForm2.enterpriseName = "";
this.subcontractList = [];
this.crewUpdateList = [];
return;
} }
this.subcontractList = [];
this.crewUpdateList = [];
return;
} }
if (this.recordType == 1) { if (this.recordType == 1) {
let pathLabels = let pathLabels =
@ -3163,6 +3176,7 @@ export default {
let data = { let data = {
projectSn: this.projectSn, projectSn: this.projectSn,
enterpriseId: this.unitEnterpriseId, enterpriseId: this.unitEnterpriseId,
qualityRegionId: this.unitRegionId
}; };
getProjectChilderSystemUserListApi(data).then((res) => { getProjectChilderSystemUserListApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {