|
|
@@ -94,14 +94,18 @@
|
|
|
</div>
|
|
|
<div class="itemHtml" v-html="item.displayInstructions"></div>
|
|
|
</div>
|
|
|
- <div class="itemBottom" v-if="insert == '0'">
|
|
|
- <img
|
|
|
+ <div class="itemBottom" v-if="insert == '0'" @click="openDialog">
|
|
|
+ <van-button round type="primary" v-if="item.taskPhotoConditionPassed == 1"
|
|
|
+ >通过</van-button
|
|
|
+ >
|
|
|
+ <van-button round type="danger" v-else>不通过</van-button>
|
|
|
+ <!-- <img
|
|
|
@click="openDialog"
|
|
|
:src="
|
|
|
item.taskPhotoConditionPassed == 1
|
|
|
? require('@/assets/taskPhotoSu.png')
|
|
|
: require('@/assets/taskPhotoErr.png')
|
|
|
- " />
|
|
|
+ " /> -->
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -200,7 +204,7 @@ export default {
|
|
|
this.pos = 0;
|
|
|
} else {
|
|
|
// 判断当前值是否与上一行的【名称】相等，相等则进行合并
|
|
|
- if (data[i].conditionIdentifyNum === data[i - 1].conditionIdentifyNum) {
|
|
|
+ if (data[i].conditionDetailId === data[i - 1].conditionDetailId) {
|
|
|
this.spanArr[this.pos] += 1; // 合并单元格：合并的行数 +1
|
|
|
this.spanArr.push(0); // 0代表单元格是不需要显示, 已经被合并的单元格
|
|
|
} else {
|
|
|
@@ -367,12 +371,18 @@ export default {
|
|
|
}
|
|
|
.itemBottom {
|
|
|
align-items: center;
|
|
|
- width: 35px;
|
|
|
+ width: 60px;
|
|
|
margin-left: 5px;
|
|
|
img {
|
|
|
width: 100%;
|
|
|
height: 30px;
|
|
|
}
|
|
|
+ button {
|
|
|
+ width: 55px;
|
|
|
+ height: 25px;
|
|
|
+ padding: 0;
|
|
|
+ font-size: 12px;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -386,14 +396,12 @@ export default {
|
|
|
}
|
|
|
</style>
|
|
|
<style lang="scss">
|
|
|
-// .perfectStoreTask {
|
|
|
-// .itenHtml {
|
|
|
-// overflow: hidden;
|
|
|
-// img {
|
|
|
-// width: 100%;
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
+.perfectStoreTask {
|
|
|
+ .van-button--danger {
|
|
|
+ background-color: #ee0a24 !important;
|
|
|
+ border: 1px solid #ee0a24 !important;
|
|
|
+ }
|
|
|
+}
|
|
|
.identifyResultdialog {
|
|
|
width: vw(690) !important;
|
|
|
margin-top: 1vh !important;
|
