FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_20230829_change' into dev_20230829_change

Browse Source
This commit is contained in:
wangzhijiang
2023-11-14 17:09:31 +08:00
parent feda1f165a ed55c47131
commit feed84827d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/meetingDetail/index.vue
+1
View File
@@ -20,6 +20,7 @@
</template>
<div class="modular-content">
<p style="" class="half"><label style=" margin-right: 132px;">会议名称</label><span>{{ form.meetingName || '-' }}</span></p>
<p style="" class="half"><label style=" margin-right: 132px;">课题名称</label><span>{{ form.topicName || '-' }}</span></p>
<p style="" class="half"><label style=" margin-right: 100px;">会议主办单位</label><span>{{ form.meetingOrganizer || '-' }}</span></p>
<p style="" class="half"><label style=" margin-right: 132px;">会议时间</label><span>{{ form.meetingTime || '-' }}</span></p>
<p style="" class="half"><label style=" margin-right: 132px;">会议地点</label><span>{{ form.meetingAddress || '-' }}</span></p>
src/pages/phone/domesticStand.vue
+3 -2
View File
@@ -30,8 +30,9 @@
<div v-else-if="!loading && standList.length" class="card-content" v-for="item in standList" :key="item.id" @click="jumpDetails(item)">
<div class="standTitle">
<div v-if="titleType === 'POLICY'" class="title">{{item.lawsNumber}}</div>
<div v-else-if="titleType !== 'POLICY' && item.standYear" class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber + '-' + item.standYear }}</div>
<div v-else class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber }}</div>
<!--<div v-else-if="titleType !== 'POLICY' && item.standYear" class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber + '-' + item.standYear }}</div>-->
<!--<div v-else class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber }}</div>-->
<div v-else class="title">{{ item.stand_code || item.numbershow }}</div>
</div>
<div class="standContent">
<!--<div class="standState">{{item.standName && item.standName !== '' ? item.standName : item.standEnName !== '' ? item.standEnName : item.nameshow }}</div>-->