Merge branch 'feature_20241010_拜访任务调色机扫码结果展示bug'

src/components/zRadio.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="zSelect">
     <div class="checkbox">
-      <van-radio-group v-model="zradioc" @change="radiofn">
+      <van-radio-group v-model="zradioc" @change="radiofn" :disabled="relevancyItem">
         <van-radio
           :name="item.collectionOptionId + ''"
           :disabled="item.unableChoose"
@@ -34,6 +34,7 @@ export default {
     childindex7: '',
     childindex8: '',
     childindex9: '',
+    relevancyItem: false, //当前单选框是否为禁用状态,特殊情况（扫描识别结果是否一致）根据扫描结果匹配选择项，禁止手动选择
   },
   data() {
     return {
@@ -76,6 +77,7 @@ export default {
       this.$emit('zSelectVal', datalist);
     },
     radioclick(val) {
+      if (this.relevancyItem) return;
       if (!val) {
         if (!this.radioChange) {
           this.zradioc = '';

src/views/deviceWithin/addStoreVisit.vue

@@ -433,7 +433,8 @@
                 childIndex4="B"
                 :zRadiocolumns="item.collectionOptionList"
                 :childindex="index"
-                @zSelectVal="zSelectVal"></z-radio>
+                @zSelectVal="zSelectVal"
+                :relevancyItem="item.relevancyItem"></z-radio>
               <delete-upload-img :imgs="item.fileInfoList"></delete-upload-img>
               <div v-for="(child, indexc) in item.collectionOptionList" :key="indexc">
                 <div v-if="child.isCheck == 1">
@@ -779,7 +780,8 @@
                           childIndex4="A"
                           :childindex2="childIndex"
                           :zRadiocolumns="childitem.collectionOptionList"
-                          @zSelectVal="zSelectVal"></z-radio>
+                          @zSelectVal="zSelectVal"
+                          :relevancyItem="childitem.relevancyItem"></z-radio>
                         <delete-upload-img :imgs="childitem.fileInfoList"></delete-upload-img>
                         <div
                           v-for="(child1, indexc1) in childitem.collectionOptionList"
@@ -1082,7 +1084,8 @@
                                     :childindex5="childIndex1"
                                     childIndex4="D"
                                     :zRadiocolumns="childitem1.collectionOptionList"
-                                    @zSelectVal="zSelectVal"></z-radio>
+                                    @zSelectVal="zSelectVal"
+                                    :relevancyItem="childitem1.relevancyItem"></z-radio>
                                   <delete-upload-img
                                     :imgs="childitem1.fileInfoList"></delete-upload-img>
                                   <div
@@ -1674,7 +1677,8 @@
                                               :childindex7="child33Index1"
                                               childIndex4="E"
                                               :zRadiocolumns="child33item1.collectionOptionList"
-                                              @zSelectVal="zSelectVal"></z-radio>
+                                              @zSelectVal="zSelectVal"
+                                              :relevancyItem="child33item1.relevancyItem"></z-radio>
                                             <delete-upload-img
                                               :imgs="child33item1.fileInfoList"></delete-upload-img>
                                             <div
@@ -2342,7 +2346,10 @@
                                                         :zRadiocolumns="
                                                           child44item1.collectionOptionList
                                                         "
-                                                        @zSelectVal="zSelectVal"></z-radio>
+                                                        @zSelectVal="zSelectVal"
+                                                        :relevancyItem="
+                                                          child44item1.relevancyItem
+                                                        "></z-radio>
                                                       <delete-upload-img
                                                         :imgs="
                                                           child44item1.fileInfoList
@@ -2556,6 +2563,8 @@
             :visitModel="1 + ''"
             :visitsId="visitId"
             :childIndex="childIndex"
+            :deviceCode="deviceCode"
+            :putInCode="putInCode"
             @newimgarr="newimgarr1"
             @typeshow="typeshow"></upload-img>
         </template>