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

一键下发

Browse Source
This commit is contained in:
骆乐 2022-07-02 18:56:35 +08:00
parent 7e125332ed
commit 14da9285c0
5 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/assets/js/http.js
View File

@ -40,8 +40,9 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://36.137.53.203:9090/'; // 南昌地铁 17512009894 123456789 gdjt 123456789
// axios.defaults.baseURL = 'http://124.71.178.44:100/'
axios.defaults.baseURL = 'http://192.168.34.148:6023/'
// tag: 本地
axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1
// axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1
// axios.defaults.baseURL = 'http://139.9.66.234:40001/'; //南昌二期
// axios.defaults.baseURL = 'http://120.196.217.6:7000/';
// axios.defaults.baseURL = 'http://139.9.66.234:8/';

2
src/components/account.vue
View File

@ -15,7 +15,7 @@
<div style="margin-left:10px">
<p>{{ $store.state.userInfo.companyName }}</p>
<!-- 横琴和鹤洲不需要客服电话-->
<p>客服电话：{{$store.state.userInfo.customerServicePhone}}</p>
<!-- <p>客服电话：{{$store.state.userInfo.customerServicePhone}}</p> -->
</div>
</div>
<!-- <div class="flex2" style="margin-top:20px">

2
src/views/projectFront/epidemicPrevention/visitorsManage.vue
View File

@ -496,7 +496,7 @@ export default {
pageSize: this.pageSize,
visitName: this.visitName,
// enterDate:this.enterDate,
// userEnterpriseId: this.$store.state.userInfo.userEnterpriseId,
userEnterpriseId: this.$store.state.userInfo.userEnterpriseId,
codeState:this.codeState
};
visitorManageRecordApi(data).then((res) => {

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

@ -344,7 +344,7 @@
type="primary"
:disabled="checkedWorker.length == 0"
@click="issuePersonFn"
v-if="!key"
v-if="key"
>{{ $t("message.laborMange.aKeyIssued") }}</el-button
>
</el-form-item>
@ -494,11 +494,11 @@
type="primary"
size="mini"
@click="issuePersonOneFn(scope.row.id)"
v-if="!key"
v-if="key"
>{{ $t("message.laborMange.aKeyIssued") }}</el-button
>
</div>
<div v-if="!key">
<div v-if="key">
<el-checkbox
v-model="scope.row.isUploadHousing"
:checked="scope.row.isUploadHousing == 1 ? true : false"
@ -2412,7 +2412,7 @@ export default {
// })
// },
// 新增 || 编辑 人员录入 保存按钮
// 新增 || 编辑 人员录入 保存按钮
savePersonFn(formName) {
console.log("企业id", this.checkedId);
if (!IdentityCodeValid(this.personForm.idCard)) {
@ -2485,6 +2485,7 @@ export default {
//编辑
} else {
let data = this.personForm;
console.log('dadadaa',data)
if (this.personForm.ufaceDevId.length > 0) {
data.ufaceDevId = this.personForm.ufaceDevId.join(",");
} else {
@ -3387,6 +3388,7 @@ export default {
isUploadHousing: value ? 1 : 0,
id: id,
};
console.log('data',json)
updateByIdWorkerInfo(json).then((res) => {
// if (res.code == 200) {
// this.$message.success(this.$t("message.laborMange.modifySuccess"));

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

@ -336,7 +336,7 @@
type="primary"
:disabled="checkedWorker.length == 0"
@click="issuePersonFn"
v-if="key"
v-if="!key"
>{{ $t("message.laborMange.aKeyIssued") }}</el-button
>
</el-form-item>
@ -428,6 +428,7 @@
<el-table-column prop="address" width="270px">
<template slot-scope="scope">
<div class="tableBtns">
<!-- 退场 -->
<el-button
size="medium"
type="text"
@ -448,6 +449,7 @@
/>
<span>{{ $t("message.laborMange.edit") }}</span>
</div> -->
<!-- 再次进场 -->
<el-button
size="medium"
type="text"
@ -477,7 +479,7 @@
type="primary"
size="mini"
@click="issuePersonOneFn(scope.row.id)"
v-if="key"
v-if="!key"
>{{ $t("message.laborMange.aKeyIssued") }}</el-button
>
</div>
@ -497,7 +499,7 @@
</div> -->
<div
class="personItemBottom"
v-if="key"
v-if="!key"
>
<el-checkbox
v-model="scope.row.isUploadHousing"
@ -1892,6 +1894,7 @@
size="medium"
>{{ $t("message.laborMange.cancel") }}</el-button
>
<!-- 确定按钮 -->
<el-button
type="primary"
icon="el-icon-circle-check"
@ -2378,6 +2381,7 @@ export default {
enterDate: "",
nation: "",
nativePlace: "",
isUploadHousing:'',
issuingAuthorityForIdcard: "",
idCardEndDate: "",
longTerm: false,
@ -3182,7 +3186,8 @@ export default {
// 新增 || 编辑 人员录入 保存按钮
savePersonFn(formName) {
console.log(this.personForm);
this.personForm.isUploadHousing = this.personForm.isUploadHousing ? 1 : 0
console.log('进场确定参数',this.personForm);
if (!IdentityCodeValid(this.personForm.idCard)) {
this.$message.error(this.$t("message.laborMange.correctCellIdCard"));
return;
@ -3269,8 +3274,11 @@ export default {
let data = this.personForm;
data.longTerm = this.personForm.longTerm ? 1 : 0;
data.registerType = 1;
// 跟杨珊对接需要再再次进场时多传入一个新的字段
data.reEntry = 1
data.userId = this.$store.state.userInfo.userId;
if (this.personForm.ufaceDevId.length > 0) {
console.log('this.personForm.ufaceDevId',this.personForm.ufaceDevId)
data.ufaceDevId = this.personForm.ufaceDevId.join(",");
} else {
data.ufaceDevId = "";
@ -3311,6 +3319,7 @@ export default {
isUploadHousing: value ? 1 : 0,
id: id,
};
console.log('isUploadHousing',json)
updateByIdWorkerInfo(json).then((res) => {
// if (res.code == 200) {
// this.$message.success(this.$t("message.laborMange.modifySuccess"));
@ -3328,14 +3337,11 @@ export default {
//编辑 人员信息 按钮
editWorkerInfo(value, type) {
console.log('当前行',value)
// 点击再次进场同时再发一个请求
axios({
method:"GET",
originId : value.id,
url:'http://192.168.34.148:8080/workerReEntry'
}).then((res)=>{
console.log('调用成功了吗',res)
})
if(value.isUploadHousing){
this.personForm.isUploadHousing = 1
}else{
this.personForm.isUploadHousing = 0
}
this.personDialogTitle = this.$t("message.laborMange.editCrewInfo");
this.titleType = "edit";
this.personForm = {
@ -3352,7 +3358,7 @@ export default {
phoneNumber: "",
emergentPerson: "",
emergentPhone: "",
inserviceType: 1,
inserviceType: 2,
politicsStatus: "",
marry: "",
payRollBankName: "",