Merge branch 'master' into change0706
# Conflicts: # src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
This commit is contained in:
@@ -817,7 +817,7 @@ export default {
|
|||||||
this.situationInfoLoading = true
|
this.situationInfoLoading = true
|
||||||
this.showMoreInfo = false
|
this.showMoreInfo = false
|
||||||
// 通过id查询项目详情
|
// 通过id查询项目详情
|
||||||
if (!param.situationId) {
|
if (param.situationId) {
|
||||||
queryCommonProjectById({id: param.situationId}).then(res => {
|
queryCommonProjectById({id: param.situationId}).then(res => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
console.log(res.result, 'res.result')
|
console.log(res.result, 'res.result')
|
||||||
|
|||||||
Reference in New Issue
Block a user