feat：修改人员管理全选切换失效
This commit is contained in:
parent
5bcdc09641
commit
8cb03692de
@ -172,21 +172,21 @@ if (process.env.NODE_ENV == "development") {
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
|
||||
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
|
||||
axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
|
||||
// axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
|
||||
// axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程
|
||||
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
|
||||
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
|
||||
// axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
|
||||
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
|
||||
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
|
||||
// axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
|
||||
// axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
|
||||
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
|
||||
// axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
|
||||
// axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
|
||||
axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程
|
||||
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
|
||||
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
|
||||
// axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
|
||||
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
|
||||
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
|
||||
// axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
|
||||
// axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
|
||||
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
|
||||
// axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
|
||||
// axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
|
||||
} else if (process.env.NODE_ENV == "debug") {
|
||||
axios.defaults.baseURL = "https://www.ceshi.com";
|
||||
} else if (process.env.NODE_ENV == "production") {
|
||||
|
||||
@ -487,11 +487,13 @@
|
||||
style="width: 100%; color: #737996"
|
||||
@selection-change="handleCheckedCitiesChange"
|
||||
:show-header="false"
|
||||
row-key="id"
|
||||
:row-class-name="tableRowClassName"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
:reserve-selection="true"
|
||||
:selectable="selectEnable"
|
||||
></el-table-column>
|
||||
<el-table-column prop="workerName">
|
||||
@ -2925,6 +2927,8 @@ export default {
|
||||
data.userEnterpriseId = this.$store.state.userInfo.userEnterpriseId;
|
||||
getWorkerInfoList(data).then((res) => {
|
||||
if (res.code == 200) {
|
||||
console.log(333333, this.tableListData);
|
||||
debugger;
|
||||
this.tableListData = res.result.records;
|
||||
let boole = true;
|
||||
for (let i in res.result.records) {
|
||||
|
||||
@ -202,9 +202,10 @@
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;color:#737996;"
|
||||
@selection-change="handleCheckedCitiesChange"
|
||||
row-key="id"
|
||||
:show-header="false"
|
||||
>
|
||||
<el-table-column type="selection" width="55" :selectable="selectEnable"></el-table-column>
|
||||
<el-table-column type="selection" width="55" :reserve-selection="true" :selectable="selectEnable"></el-table-column>
|
||||
<el-table-column prop="workerName">
|
||||
<template slot-scope="scope">
|
||||
<div class="flex2">
|
||||
|
||||
@ -290,7 +290,7 @@
|
||||
size="medium"
|
||||
@click="passEquipment()"
|
||||
type="primary"
|
||||
style="margin-left: 5px;"
|
||||
style="margin-left: 5px"
|
||||
:disabled="checkedWorker.length <= 0"
|
||||
>下发通行设备</el-button
|
||||
>
|
||||
@ -303,7 +303,7 @@
|
||||
size="medium"
|
||||
@click="checkAllFn()"
|
||||
type="primary"
|
||||
style="margin-left: 5px;"
|
||||
style="margin-left: 5px"
|
||||
>全选</el-button
|
||||
>
|
||||
<br />
|
||||
@ -312,23 +312,23 @@
|
||||
:model="tableParameter"
|
||||
size="medium"
|
||||
class="demo-form-inline"
|
||||
style="margin-top: 5px;"
|
||||
style="margin-top: 5px"
|
||||
>
|
||||
<el-form-item label="人员下发状态" v-if="isIscDevice">
|
||||
<el-select
|
||||
size="medium"
|
||||
v-model="tableParameter.sendSuccessStatus"
|
||||
placeholder="请选择"
|
||||
style="width: 120px"
|
||||
>
|
||||
<el-option
|
||||
v-for="(item, index) in sendStatusArr"
|
||||
:key="index"
|
||||
:label="item.name"
|
||||
:value="item.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="人员下发状态" v-if="isIscDevice">
|
||||
<el-select
|
||||
size="medium"
|
||||
v-model="tableParameter.sendSuccessStatus"
|
||||
placeholder="请选择"
|
||||
style="width: 120px"
|
||||
>
|
||||
<el-option
|
||||
v-for="(item, index) in sendStatusArr"
|
||||
:key="index"
|
||||
:label="item.name"
|
||||
:value="item.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('message.laborMange.workingState')">
|
||||
<el-select
|
||||
v-model="tableParameter.inserviceType"
|
||||
@ -449,11 +449,13 @@
|
||||
style="width: 100%; color: #737996"
|
||||
@selection-change="handleCheckedCitiesChange"
|
||||
:show-header="false"
|
||||
row-key="id"
|
||||
:row-class-name="tableRowClassName"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
:reserve-selection="true"
|
||||
:selectable="selectEnable"
|
||||
></el-table-column>
|
||||
<el-table-column prop="workerName">
|
||||
@ -541,7 +543,8 @@
|
||||
'valuesColor',
|
||||
row.sendSuccessStatus === 1
|
||||
? 'green'
|
||||
: row.sendSuccessStatus === 2 || row.sendSuccessStatus === 4
|
||||
: row.sendSuccessStatus === 2 ||
|
||||
row.sendSuccessStatus === 4
|
||||
? 'red'
|
||||
: row.sendSuccessStatus === 3
|
||||
? 'yellow'
|
||||
@ -554,7 +557,8 @@
|
||||
: row.sendSuccessStatus === 2
|
||||
? "失败"
|
||||
: row.sendSuccessStatus === 3
|
||||
? "部分成功" : row.sendSuccessStatus === 4
|
||||
? "部分成功"
|
||||
: row.sendSuccessStatus === 4
|
||||
? "未下发"
|
||||
: ""
|
||||
}}</span
|
||||
@ -2820,11 +2824,11 @@ export default {
|
||||
projectSn: this.projectSn,
|
||||
personType: "1",
|
||||
userId: this.$store.state.userInfo.userId,
|
||||
enterpriseId: this.checkedId
|
||||
}
|
||||
if(this.checkedWorker.length > 0){
|
||||
enterpriseId: this.checkedId,
|
||||
};
|
||||
if (this.checkedWorker.length > 0) {
|
||||
const ids = this.checkedWorker.map((item) => item.id).join(",");
|
||||
requestData.workerIds = ids
|
||||
requestData.workerIds = ids;
|
||||
}
|
||||
sendBatchWokerApi(requestData).then((res) => {
|
||||
if (res.code == 200) {
|
||||
@ -3479,6 +3483,9 @@ export default {
|
||||
data.enterpriseId = this.checkedId;
|
||||
getWorkerInfoList(data).then((res) => {
|
||||
if (res.code == 200) {
|
||||
console.log(111111111, this.tableListData);
|
||||
debugger;
|
||||
|
||||
this.tableListData = res.result.records;
|
||||
console.log("------------", res.result.records);
|
||||
let boole = true;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user