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

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

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-09-22 17:18:18 +08:00
parent 7326ea519a b530f5af54
commit 9bc5acba9c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/searchCenter/pages/standardSearch.vue
+4 -3
View File
@@ -114,8 +114,8 @@
:label="$t('m.putTime')" :label="$t('m.putTime')"
width="130"> width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="selectIndex === 'stand' ? (scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== '') : (scope.row.putTime !== null && scope.row.putTime !== undefined && scope.row.putTime !== '')"> <div v-if="selectIndex === 'stand' || selectIndex === 'bussstand' ? (scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== '') : (scope.row.putTime !== null && scope.row.putTime !== undefined && scope.row.putTime !== '')">
{{ $dateFormat(new Date((selectIndex === 'stand') ? scope.row.SSRQ : scope.row.putTime), "yyyy-MM-dd") }} {{ $dateFormat(new Date((selectIndex === 'stand' || (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN')) ? scope.row.SSRQ : scope.row.putTime), "yyyy-MM-dd") }}
</div> </div>
<div v-else></div> <div v-else></div>
</template> </template>
@@ -129,7 +129,7 @@
<span v-if="selectIndex === 'laws'">{{ getLawsState(scope.row.statecode) }}</span> <span v-if="selectIndex === 'laws'">{{ getLawsState(scope.row.statecode) }}</span>
<div v-else :class="selectIndex === 'enterprise' ? (scope.row.textStatusBussName === '参考' ? 'yellowClass' : <div v-else :class="selectIndex === 'enterprise' ? (scope.row.textStatusBussName === '参考' ? 'yellowClass' :
(scope.row.textStatusBussName === '作废' || scope.row.textStatusBussName === '被代替' ? 'redClass' : '')) : ''"> (scope.row.textStatusBussName === '作废' || scope.row.textStatusBussName === '被代替' ? 'redClass' : '')) : ''">
{{ selectIndex === 'stand' ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}</div> {{ selectIndex === 'stand'|| (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN') ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -1277,6 +1277,7 @@
} }
if(condition.selectIndex === 'enterprise'){ if(condition.selectIndex === 'enterprise'){
condition.selectIndex='bussstand' condition.selectIndex='bussstand'
condition.standType = 'bussstand'
condition.textStatusBuss = condition.BUSSSTATE condition.textStatusBuss = condition.BUSSSTATE
condition.QCDW = condition.ORGLIST condition.QCDW = condition.ORGLIST
} }