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-06-15 18:12:11 +08:00
parent 0536100366
commit 937c3d5351
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"
@ -541,7 +541,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 +555,8 @@
: row.sendSuccessStatus === 2
? "失败"
: row.sendSuccessStatus === 3
? "部分成功" : row.sendSuccessStatus === 4
? "部分成功"
: row.sendSuccessStatus === 4
? "未下发"
: ""
}}</span
@ -2820,11 +2822,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) {