|
@@ -100,22 +100,22 @@
|
|
@click="removeProData(index)">
|
|
@click="removeProData(index)">
|
|
</el-button>
|
|
</el-button>
|
|
<el-form-item label="选择项目" prop="contractSection" label-width="120px">
|
|
<el-form-item label="选择项目" prop="contractSection" label-width="120px">
|
|
- <el-select v-model="form.projectName" placeholder="请选择项目" @change="changeProject" clearable style="width: 100%;">
|
|
|
|
|
|
+ <el-select v-model="item.projectName" placeholder="请选择项目" @change="changeProject" clearable style="width: 100%;">
|
|
<el-option
|
|
<el-option
|
|
- v-for="item in projectList1"
|
|
|
|
- :key="item.id"
|
|
|
|
- :label="item.projectName"
|
|
|
|
- :value="item.id">
|
|
|
|
|
|
+ v-for="item1 in projectList1"
|
|
|
|
+ :key="item1.id"
|
|
|
|
+ :label="item1.projectName"
|
|
|
|
+ :value="item1.id">
|
|
</el-option>
|
|
</el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="选择合同段" prop="contractSection" label-width="120px" >
|
|
<el-form-item label="选择合同段" prop="contractSection" label-width="120px" >
|
|
- <el-select v-model="form.contractSection" placeholder="请选择合同段" clearable multiple class="multiple-select">
|
|
|
|
|
|
+ <el-select v-model="item.contractSection" placeholder="请选择合同段" clearable multiple class="multiple-select">
|
|
<el-option
|
|
<el-option
|
|
- v-for="item in contractList"
|
|
|
|
- :key="item.id"
|
|
|
|
- :label="item.contractName"
|
|
|
|
- :value="item.id">
|
|
|
|
|
|
+ v-for="item2 in contractList"
|
|
|
|
+ :key="item2.id"
|
|
|
|
+ :label="item2.contractName"
|
|
|
|
+ :value="item2.id">
|
|
</el-option>
|
|
</el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -321,6 +321,18 @@ export default {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
let subArr=[]
|
|
let subArr=[]
|
|
|
|
+ let projectList=[]
|
|
|
|
+ let proData=this.proData
|
|
|
|
+ console.log(proData,'proData');
|
|
|
|
+
|
|
|
|
+ if(proData.length>0&&proData[0].projectName){
|
|
|
|
+ proData.forEach(item=>{
|
|
|
|
+ projectList.push({
|
|
|
|
+ projectId:item.projectName,
|
|
|
|
+ contractId:item.contractSection.join(','),
|
|
|
|
+ })
|
|
|
|
+ })
|
|
|
|
+ }
|
|
if(selectedElement.length>0){
|
|
if(selectedElement.length>0){
|
|
selectedElement.forEach(item=>{
|
|
selectedElement.forEach(item=>{
|
|
subArr.push({
|
|
subArr.push({
|
|
@@ -328,6 +340,7 @@ export default {
|
|
parameterId: this.params.id,
|
|
parameterId: this.params.id,
|
|
type:this.form.type,
|
|
type:this.form.type,
|
|
elementName:item.eName,
|
|
elementName:item.eName,
|
|
|
|
+ projectList:this.form.type===2?projectList:[]
|
|
})
|
|
})
|
|
})
|
|
})
|
|
}else if(this.form.elementName){
|
|
}else if(this.form.elementName){
|
|
@@ -336,16 +349,21 @@ export default {
|
|
parameterId: this.params.id,
|
|
parameterId: this.params.id,
|
|
type:this.form.type,
|
|
type:this.form.type,
|
|
elementName:this.form.elementName,
|
|
elementName:this.form.elementName,
|
|
|
|
+ projectList:this.form.type===2?projectList:[]
|
|
})
|
|
})
|
|
}
|
|
}
|
|
|
|
+ console.log(subArr,'subArr');
|
|
|
|
+ console.log(this.proData,'proData');
|
|
|
|
+
|
|
|
|
+
|
|
submitElement(subArr).then((res) => {
|
|
submitElement(subArr).then((res) => {
|
|
if(res.data.code==200){
|
|
if(res.data.code==200){
|
|
-
|
|
|
|
this.$message.success(res.data.msg)
|
|
this.$message.success(res.data.msg)
|
|
-
|
|
|
|
|
|
+ this.addDialogVisible=false
|
|
}else{
|
|
}else{
|
|
this.$message.error(res.data.msg)
|
|
this.$message.error(res.data.msg)
|
|
}
|
|
}
|
|
|
|
+ this.addDialogVisible=false
|
|
this.getTableData()
|
|
this.getTableData()
|
|
});
|
|
});
|
|
},
|
|
},
|