feature_20260203_完美门店

src/views/deviceWithin/taskPhotoTaking.vue

@@ -172,7 +172,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 {

src/views/historicalVisit/hisvistdeils.vue

@@ -456,7 +456,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 {

src/views/historicalVisit/perfectStoreTask.vue

@@ -94,7 +94,7 @@
             </div>
             <div class="itemHtml" v-html="item.displayInstructions"></div>
           </div>
-          <div class="itemBottom" v-if="insert == '0'">
+          <div class="itemBottom" v-if="insert == '0'" @click="openDialog">
             <van-button round type="primary" v-if="item.taskPhotoConditionPassed == 1"
               >通过</van-button
             >
@@ -204,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 {