|
|
@@ -66,6 +66,7 @@
|
|
|
</div>
|
|
|
<el-table
|
|
|
:data="formData.taskPhotoRecognitionResult"
|
|
|
+ :span-method="taskObjectSpanMethod"
|
|
|
border
|
|
|
class="table-headermd1"
|
|
|
style="width: 100%">
|
|
|
@@ -85,6 +86,13 @@
|
|
|
prop="identifyTheNumberOfCards"
|
|
|
align="center"
|
|
|
width="50"></el-table-column>
|
|
|
+ <el-table-column label="要求" prop="conditionIdentifyNum" align="center" width="60px">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span :style="{ color: scope.row.meetTheStandard == 1 ? '#07c160' : 'red' }">
|
|
|
+ {{ scope.row.conditionIdentifyNum }}
|
|
|
+ </span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
<div class="dataList" v-if="dataList">
|
|
|
@@ -99,7 +107,7 @@
|
|
|
</div>
|
|
|
<div class="itemHtml" v-html="item.displayInstructions"></div>
|
|
|
</div>
|
|
|
- <div class="itemBottom" v-if="insert == '0'" @click="openDialog">
|
|
|
+ <div class="itemBottom" v-if="insert == '0'">
|
|
|
<van-button round type="primary" v-if="item.taskPhotoConditionPassed == 1"
|
|
|
>通过</van-button
|
|
|
>
|
