|
@@ -430,17 +430,17 @@
|
|
@change="selectProject(domain, index)"
|
|
@change="selectProject(domain, index)"
|
|
:disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)" popper-class="projectSelectPopperClass">
|
|
:disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)" popper-class="projectSelectPopperClass">
|
|
|
|
|
|
- <!-- <el-option v-for="item in fillProjectList" :disabled="item.status!=1 && item.status!=4" :key="item.id" :label="item.projectName + '\u3000' + item.projectCode" :value="item.id">
|
|
|
|
|
|
+ <el-option v-for="item in fillProjectList" :disabled="item.status!=1 && item.status!=4" :key="item.id" :label="item.projectName + '\u3000' + item.projectCode" :value="item.id">
|
|
<span style="float: left; color: #8492a6; font-size: 13px;">{{ item.projectCode }}</span>
|
|
<span style="float: left; color: #8492a6; font-size: 13px;">{{ item.projectCode }}</span>
|
|
<span style="float: right;">{{ item.projectName }}</span>
|
|
<span style="float: right;">{{ item.projectName }}</span>
|
|
- </el-option> -->
|
|
|
|
|
|
+ </el-option>
|
|
|
|
|
|
- <el-option-group v-for="group in integrationProjectList" :key="group.label" :label="group.label">
|
|
|
|
|
|
+ <!-- <el-option-group v-for="group in integrationProjectList" :key="group.label" :label="group.label">
|
|
<el-option v-for="item in group.peojectList" :key="item.id" :label="item.projectName + '\u3000' + item.projectCode" :value="item.id" :disabled="item.status!=1 && item.status!=4">
|
|
<el-option v-for="item in group.peojectList" :key="item.id" :label="item.projectName + '\u3000' + item.projectCode" :value="item.id" :disabled="item.status!=1 && item.status!=4">
|
|
<span style="float: left; color: #8492a6; font-size: 13px;">{{ item.projectCode }}</span>
|
|
<span style="float: left; color: #8492a6; font-size: 13px;">{{ item.projectCode }}</span>
|
|
<span style="float: right;">{{ item.projectName }}</span>
|
|
<span style="float: right;">{{ item.projectName }}</span>
|
|
</el-option>
|
|
</el-option>
|
|
- </el-option-group>
|
|
|
|
|
|
+ </el-option-group> -->
|
|
|
|
|
|
</el-select>
|
|
</el-select>
|
|
<template v-if="user.timeType.mainProjectState != 1">
|
|
<template v-if="user.timeType.mainProjectState != 1">
|
|
@@ -593,17 +593,17 @@
|
|
<el-select v-model="domain.projectId" :placeholder="$t('defaultText.pleaseSelectSnItem')" style="width:200px;" clearable="true" filterable="true" value-key="id"
|
|
<el-select v-model="domain.projectId" :placeholder="$t('defaultText.pleaseSelectSnItem')" style="width:200px;" clearable="true" filterable="true" value-key="id"
|
|
@change="selectProject(domain, index)"
|
|
@change="selectProject(domain, index)"
|
|
:disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)" popper-class="projectSelectPopperClass">
|
|
:disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)" popper-class="projectSelectPopperClass">
|
|
- <!-- <el-option v-for="item in fillProjectList" :disabled="item.status!=1 && item.status!=4" :key="item.id" :label="item.projectName + '\u3000' + item.projectCode" :value="item.id">
|
|
|
|
|
|
+ <el-option v-for="item in fillProjectList" :disabled="item.status!=1 && item.status!=4" :key="item.id" :label="item.projectName + '\u3000' + item.projectCode" :value="item.id">
|
|
<span style="float: left; color: #8492a6; font-size: 13px;">{{ item.projectCode }}</span>
|
|
<span style="float: left; color: #8492a6; font-size: 13px;">{{ item.projectCode }}</span>
|
|
<span style="float: right;">{{ item.projectName }}</span>
|
|
<span style="float: right;">{{ item.projectName }}</span>
|
|
- </el-option> -->
|
|
|
|
|
|
+ </el-option>
|
|
|
|
|
|
- <el-option-group v-for="group in integrationProjectList" :key="group.label" :label="group.label">
|
|
|
|
|
|
+ <!-- <el-option-group v-for="group in integrationProjectList" :key="group.label" :label="group.label">
|
|
<el-option v-for="item in group.peojectList" :key="item.id" :label="item.projectName + '\u3000' + item.projectCode" :value="item.id" :disabled="item.status!=1 && item.status!=4">
|
|
<el-option v-for="item in group.peojectList" :key="item.id" :label="item.projectName + '\u3000' + item.projectCode" :value="item.id" :disabled="item.status!=1 && item.status!=4">
|
|
<span style="float: left; color: #8492a6; font-size: 13px;">{{ item.projectCode }}</span>
|
|
<span style="float: left; color: #8492a6; font-size: 13px;">{{ item.projectCode }}</span>
|
|
<span style="float: right;">{{ item.projectName }}</span>
|
|
<span style="float: right;">{{ item.projectName }}</span>
|
|
</el-option>
|
|
</el-option>
|
|
- </el-option-group>
|
|
|
|
|
|
+ </el-option-group> -->
|
|
|
|
|
|
</el-select>
|
|
</el-select>
|
|
<template v-if="user.timeType.mainProjectState != 1">
|
|
<template v-if="user.timeType.mainProjectState != 1">
|
|
@@ -2056,7 +2056,7 @@
|
|
that.dataLoading = that.$store.state.dataLoading
|
|
that.dataLoading = that.$store.state.dataLoading
|
|
}, 1000)
|
|
}, 1000)
|
|
}
|
|
}
|
|
- this.getRecentlyProject() // 近期选择的项目
|
|
|
|
|
|
+ // this.getRecentlyProject() // 近期选择的项目
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
...mapMutations(['upDataLoading']),
|
|
...mapMutations(['upDataLoading']),
|