|
@@ -1147,7 +1147,7 @@
|
|
|
</el-dialog>
|
|
|
|
|
|
<el-dialog title="设置分组预估工时" v-if="modGroupManDayDialog" :visible.sync="modGroupManDayDialog" :close-on-click-modal="false" customClass="customWidth" width="500px">
|
|
|
- <el-table :data="groupList" size="small" :key="Math.random()" :height="'400px'" show-summary="true">
|
|
|
+ <el-table :data="groupList" :key="modGroupManDayKey" size="small" :height="'400px'" show-summary="true">
|
|
|
<el-table-column prop="name" label="分组名称">
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="manDay" width="200" label="预估工时" >
|
|
@@ -1516,7 +1516,9 @@
|
|
|
|
|
|
changeBudgetDig:false,
|
|
|
groupBudgetData:{},
|
|
|
- nowManDay:0
|
|
|
+ nowManDay:0,
|
|
|
+
|
|
|
+ modGroupManDayKey: 1
|
|
|
};
|
|
|
|
|
|
},
|
|
@@ -3147,6 +3149,7 @@
|
|
|
this.setInchargerDialog = true;
|
|
|
},
|
|
|
setManDay(item) {
|
|
|
+ this.modGroupManDayKey++
|
|
|
this.groupForm = JSON.parse(JSON.stringify(item));
|
|
|
this.modGroupManDayDialog = true;
|
|
|
},
|
|
@@ -3364,14 +3367,15 @@
|
|
|
if (res.code == "ok") {
|
|
|
const { companyId } = this.user
|
|
|
this.allGroupData = res.data;
|
|
|
- // if(companyId == '3092') {
|
|
|
+ if(companyId == '3092') {
|
|
|
res.data.forEach(item => {
|
|
|
item.disabled = Boolean(item.manDay);
|
|
|
});
|
|
|
this.groupList = res.data;
|
|
|
- // } else {
|
|
|
- // this.groupList = res.data;
|
|
|
- // }
|
|
|
+ } else {
|
|
|
+ this.groupList = res.data;
|
|
|
+ }
|
|
|
+ console.log(this.groupList, '返回的数据')
|
|
|
console.log(this.groupList,'grouplist');
|
|
|
if (this.groupList.length > 0) {
|
|
|
this.defaultGroupId = this.groupList[0].id;
|