|
@@ -551,7 +551,7 @@
|
|
|
label-width="80px">
|
|
label-width="80px">
|
|
|
<el-form-item label="选择协议">
|
|
<el-form-item label="选择协议">
|
|
|
<el-select v-model="productcopyItemPageRequest.agreementId" placeholder="请选择协议">
|
|
<el-select v-model="productcopyItemPageRequest.agreementId" placeholder="请选择协议">
|
|
|
- <el-option v-for="(item, index) in protocolpageResult" :key="index" :label="item.agreementName"
|
|
|
|
|
|
|
+ <el-option v-for="(item, index) in protocolpageResult" :key="index" :label="`${item.agreementName}-${item.businessDescription}-${item.jobDescription}`"
|
|
|
:value="item.id"></el-option>
|
|
:value="item.id"></el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -1241,6 +1241,12 @@ export default {
|
|
|
this.$api.insCompany.getAllAgreement(this.productpageRequest.agreementId).then((res) => {
|
|
this.$api.insCompany.getAllAgreement(this.productpageRequest.agreementId).then((res) => {
|
|
|
if (res.code == 200) {
|
|
if (res.code == 200) {
|
|
|
this.protocolpageResult = res.data;
|
|
this.protocolpageResult = res.data;
|
|
|
|
|
+ this.protocolpageResult.forEach(item => {
|
|
|
|
|
+ item.agreementName == null ? item.agreementName='' : item.agreementName,
|
|
|
|
|
+ item.businessDescription == null ? item.businessDescription='' : item.businessDescription,
|
|
|
|
|
+ item.jobDescription == null ? item.jobDescription='' : item.jobDescription
|
|
|
|
|
+ });
|
|
|
|
|
+ console.log(this.protocolpageResult);
|
|
|
} else {
|
|
} else {
|
|
|
this.$message.error(res.msg);
|
|
this.$message.error(res.msg);
|
|
|
}
|
|
}
|