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

This commit is contained in:
super_liu
2022-06-09 10:43:56 +08:00
@@ -344,7 +344,7 @@
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standName scope.row.standName
}}</a> }}</a>
<a v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ <a v-if="scope.row.standStatusShow === '参考' " style="color: #98E165" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standName scope.row.standName
}}</a> }}</a>
<a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -360,7 +360,7 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" >{{scope.row.dtqbbhbuss}}</span> <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" >{{scope.row.dtqbbhbuss}}</span>
<span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" class="table-jump">{{scope.row.dtqbbhbuss}}</span> <span v-if="scope.row.standStatusShow === '参考' " style="color: #98E165" class="table-jump">{{scope.row.dtqbbhbuss}}</span>
<span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" class="table-jump">{{ <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" class="table-jump">{{
scope.row.dtqbbhbuss scope.row.dtqbbhbuss
}}</span> }}</span>
@@ -376,7 +376,7 @@
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{ <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{
scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : '' scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''
}}</span> }}</span>
<span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">{{ <span v-if="scope.row.standStatusShow === '参考' " style="color: #98E165">{{
scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : '' scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''
}}</span> }}</span>
<span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{ <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{
@@ -394,7 +394,7 @@
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{ <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{
scope.row.putTime ? scope.row.putTime.slice(0, 10) : '' scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''
}}</span> }}</span>
<span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{ <span v-if="scope.row.standStatusShow === '参考'" style="color: #98E165">{{
scope.row.putTime ? scope.row.putTime.slice(0, 10) : '' scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''
}}</span> }}</span>
<span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{ <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{
@@ -414,7 +414,7 @@
<span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C"> <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
{{ scope.row.standStatusShow }} {{ scope.row.standStatusShow }}
</span> </span>
<span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C"> <span v-if="scope.row.standStatusShow === '参考'" style="color: #98E165">
{{ scope.row.standStatusShow }} {{ scope.row.standStatusShow }}
</span> </span>
<span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'"> <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">