Commit b071736e by gao_yingdong

冲突解决

parent fdd36dbf
......@@ -680,6 +680,7 @@
v-if="
pageBs == 'queryUser' ||
pageBs == 'queryRole' ||
pageBs == 'queryFzth' ||
pageBs == 'queryZdjyhd' ||
pageBs == 'zdxxgl' ||
pageBs == 'zdryGl' ||
......@@ -1060,6 +1061,7 @@
pageBs == 'queryXcystrCase' ||
pageBs == 'queryXcystrPeople' ||
pageBs == 'queryXcrx' ||
pageBs == 'queryFzth' ||
pageBs == 'queryXczj' ||
pageBs == 'shrzList' ||
pageBs == 'gnsyrzList' ||
......@@ -1557,7 +1559,7 @@
</template>
</el-table-column>
<el-table-column
v-if="pageASs == 'queryZj'"
v-if="pageASs == 'queryZj' || pageBs == 'queryFzth'"
:width="
pageBs == 'zdxxgl' || pageBs == 'gzrygl'
? '460'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment