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

Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev

Browse Source
This commit is contained in:
Vce 2024-04-28 02:52:04 +08:00
commit 3e5ca1a401
10 changed files with 4223 additions and 2294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/assets/js/api/laborPerson.js
View File

@ -24,6 +24,7 @@ export const sendBatchWokerApi = data => post('xmgl/ufaceDev/sendBatchWokerDev',
export const pullMemberDataApi = data => post('xmgl/hikvision/getDoorEvents', data); // 拉取人员通行数据
export const importImgDataApi = data => post('xmgl/workerInfo/uploadWorkerInfoImgs', data); // 导入照片数据
export const xmglXzHikvisionSyncGetNewestList = data => post('xmgl/xzHikvisionSync/getNewestList', data); // 导入照片数据
export const xmglXzHikvisionSyncRetryAPI = data => post('xmgl/xzHikvisionSync/retry', data); // 导入照片数据
//详情

12
src/router/index.js
View File

@ -522,11 +522,17 @@ const routes2 = [
component: () =>
import("@/views/projectFront/laborManage/LEDBigScreen/addLED.vue"),
},
//劳务管理--花名册
{
//劳务管理--花名册（正常版本）
// {
// path: "/project/labor/roster",
// name: "劳务管理_花名册1",
// component: () => import("@/views/projectFront/laborManage/roster.vue"),
// },
//劳务管理--花名册（颜色版本）
{
path: "/project/labor/roster",
name: "劳务管理_花名册1",
component: () => import("@/views/projectFront/laborManage/roster.vue"),
component: () => import("@/views/projectFront/laborManage/rosterNew.vue"),
},
//劳务管理--宿舍管理
{

2
src/views/companyAdmin/qualityAndSafety/hiddenDangerLibrary.vue
View File

@ -409,7 +409,7 @@
</el-form-item>
<!-- 扣分数 -->
<el-form-item label="扣分" prop="deductScore">
<el-input-number v-model="dialogdata.deductScore" :min="0" ></el-input-number>
<el-input-number v-model="dialogdata.deductScore" :min="0" :max="100"></el-input-number>
</el-form-item>
<!-- 备注 -->
<el-form-item :label="$t('message.safeMangeCheck.remark')">

2
src/views/projectFront/aiAnalysis/warningList.vue
View File

@ -139,7 +139,7 @@
</el-select>
</el-form-item>
<el-form-item label="扣分" prop="deductScore" v-if="addEditForm.handleResult != 2">
<el-input-number v-model="addEditForm.deductScore" :min="0" :placeholder="'请输入'"></el-input-number>
<el-input-number v-model="addEditForm.deductScore" :min="0" :max="100" :placeholder="'请输入'"></el-input-number>
</el-form-item>
<div class="dialog-footer" v-if="!isDetail">
<el-button class="cancleBtn" icon="el-icon-circle-close" size="medium" @click="recordShow = false">取消 </el-button>

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

16
src/views/projectFront/laborManage/personRegisterDetails.vue
View File

@ -3440,14 +3440,14 @@ export default {
//type == 1 证书 2 体检报告 3 保险 4 合同 5 基本信息 6 详细信息
let data = JSON.parse(JSON.stringify(this.originalData));
// console.log('取消',index,this.physicalsList)
console.log(data,111222)
if (type == 1) {
//获取证书附件
if (this.isNew == true) {
this.certificateList.splice(index, 1)
} else {
if (data.certificateList.length > 0) {
data.certificateList.forEach((item) => {
if (data.workerInfo.certificateList) {
JSON.parse(data.workerInfo.certificateList).forEach((item) => {
item.certificateState = false; //设置可编辑状态
if (item.photoUrl) {
let arr = item.photoUrl.split("*");
@ -3473,21 +3473,21 @@ export default {
}
} else if (type == 4) {
//获取合同照片
if (data.contractList.length > 0) {
let arr = data.contractList[0]
? data.contractList[0].imageUrl.split(",")
if (data.workerInfo.contractList) {
let arr = JSON.parse(data.contractList)[0]
? JSON.parse(data.contractList)[0].imageUrl.split(",")
: "";
let fileList = [];
arr.forEach((item) => {
let valArr = item.split("*");
fileList.push({ name: valArr[0], url: valArr[1] });
});
data.contractList[0].fileList = fileList;
JSON.parse(data.contractList)[0].fileList = fileList;
} else {
data.contractList = [];
}
this.pactInfoStatus = false;
this.contractList = data.contractList; //合同信息
this.contractList = JSON.parse(data.contractList); //合同信息
} else if (type == 5) {
this.workerInfo = this.originalData.workerInfo;
this.getWorkerInfo();

4
src/views/projectFront/laborManage/roster.vue
View File

@ -1233,8 +1233,8 @@ export default {
},
//切换数量
handleSizeChange(value) {
// this.pageSize = value;
// this.getInfoList();
this.pageSize = value;
this.getInfoList();
},
handleCurrentChange(value) {
this.page = value;

1649
src/views/projectFront/laborManage/rosterNew.vue Normal file
View File

File diff suppressed because it is too large Load Diff

65
src/views/projectFront/safeManage/v2/checkStandingBook.vue
View File

@ -964,6 +964,27 @@
>
</el-input>
</el-form-item>
<!-- 整改单位 -->
<el-form-item
v-if="formData.status == 2"
:label="$t('message.safeMangeCheck.changeCompany')"
props="enterpriseSn"
required
>
<el-select
v-model="formData.enterpriseSn"
:placeholder="$t('message.safeMangeCheck.pleaseChoose')"
@change="enterpriseChange"
>
<el-option
v-for="(item, index) in subcontractList"
:key="index"
:label="item.enterpriseName"
:value="item.enterpriseSn"
>
</el-option>
</el-select>
</el-form-item>
<!-- 整改责任人 -->
<el-form-item
v-if="formData.status == 2"
@ -989,24 +1010,6 @@
</el-option>
</el-select>
</el-form-item>
<!-- 整改单位 -->
<el-form-item
v-if="formData.status == 2"
:label="$t('message.safeMangeCheck.changeCompany')"
>
<el-select
v-model="formData.enterpriseSn"
:placeholder="$t('message.safeMangeCheck.pleaseChoose')"
>
<el-option
v-for="(item, index) in subcontractList"
:key="index"
:label="item.enterpriseName"
:value="item.enterpriseSn"
>
</el-option>
</el-select>
</el-form-item>
<!-- 要求完成时间 -->
<el-form-item
v-if="formData.status == 2"
@ -1285,6 +1288,15 @@ export default {
trigger: "change",
},
],
enterpriseSn: [
{
// 请选择整改单位
required: true,
message:
this.$t("message.safeMangeCheck.pleaseChoose"),
trigger: "change",
},
],
changeUser: [
{
// 请选择整改责任人
@ -1298,7 +1310,8 @@ export default {
},
],
},
checkProjectIdList: []
checkProjectIdList: [],
enterpriseId: ""
};
},
created() {
@ -1311,7 +1324,6 @@ export default {
this.getInspectTypeList();
this.getinspectHiddenDangerLibraryList();
this.getEnterprise();
this.getPeopleList();
this.getPositionList();
},
mounted() {
@ -1336,6 +1348,18 @@ export default {
},
},
methods: {
// 整改单位切换
enterpriseChange(){
this.formData.enterpriseSn
if(this.formData.enterpriseSn){
let findItem = this.subcontractList.find(item => {
return item.enterpriseSn == this.formData.enterpriseSn
})
console.log(findItem)
this.enterpriseId = findItem.id
this.getPeopleList();
}
},
//获取新增弹窗-- 检查部位下拉
getPositionList() {
let data = {
@ -1534,6 +1558,7 @@ export default {
getPeopleList() {
let data = {
projectSn: this.projectSn,
enterpriseId: this.enterpriseId
};
getProjectChilderSystemUserListApi(data).then((res) => {
if (res.code == 200) {