Merge branch 'feature_20260413_陈列照片提交后修改' into release

# Conflicts:
#	src/views/deviceWithin/taskPhotoTaking.vue

src/views/deviceWithin/taskPhotoTaking.vue

@@ -76,14 +76,28 @@
             <div class="itemHtml" v-html="item.displayInstructions"></div>
           </div>
           <div class="itemBottom" v-if="insert == 'false'">
-            <img
+            <van-button
+              round
+              type="primary"
+              @click="openDialog(item)"
+              v-if="item.taskPhotoConditionPassed == 1"
+              >通过</van-button
+            >
+            <van-button
+              round
+              type="danger"
+              @click="openDialog(item)"
+              v-if="item.taskPhotoConditionPassed == 0"
+              >不通过</van-button
+            >
+            <!-- <img
               v-if="item.taskPhotoConditionPassed == 1"
               @click="openDialog(item)"
               :src="require('@/assets/taskPhotoSu.png')" />
             <img
               v-if="item.taskPhotoConditionPassed == 0"
               @click="openDialog(item)"
-              :src="require('@/assets/taskPhotoErr.png')" />
+              :src="require('@/assets/taskPhotoErr.png')" /> -->
           </div>
         </div>
       </div>
@@ -161,6 +175,7 @@ export default {
       mediaIds: [],
       mediaInfos: [],
       editFlag: true,
+      mediaInfos: [],
     };
   },
   activated() {
@@ -303,7 +318,7 @@ export default {
         storeGroupId: this.$route.query.storeGroupId,
         visitsId: this.visitsId,
         taskList: this.taskIds.split(',').map((val) => Number(val)),
-        insert: true,
+        insert: this.insert,
         collectionAnswers: [],
         checkUnManage: 'N',
         deviceCode: '',
@@ -469,7 +484,7 @@ export default {
       }
       .itemBottom {
         align-items: center;
-        width: 35px;
+        width: 60px;
         margin-left: 5px;
         img {
           width: 100%;
@@ -487,14 +502,12 @@ export default {
 }
 </style>
 <style lang="scss">
-// .taskPhotoTaking {
-//   .itenHtml {
-//     overflow: hidden;
-//     img {
-//       width: 100%;
-//     }
-//   }
-// }
+.taskPhotoTaking {
+  .van-button--danger {
+    background-color: #ee0a24 !important;
+    border: 1px solid #ee0a24 !important;
+  }
+}
 .identifyResultdialog {
   width: vw(690) !important;
   margin-top: 1vh !important;