Bladeren bron

Merge branch 'feature_20260115_直发类色卡销售发放时必须拍照' into uat(dev)

zhujindu 1 week geleden
bovenliggende
commit
a760c45dc0
2 gewijzigde bestanden met toevoegingen van 6680 en 3 verwijderingen
  1. 6670 0
      src/views/deviceWithin/addStoreVisit copy.vue
  2. 10 3
      src/views/deviceWithin/addStoreVisit.vue

File diff suppressed because it is too large
+ 6670 - 0
src/views/deviceWithin/addStoreVisit copy.vue


+ 10 - 3
src/views/deviceWithin/addStoreVisit.vue

@@ -46,7 +46,6 @@
         </van-radio-group>
         <div class="containerRight" style="padding-top: 7px">
           <span class="van-f-red" v-if="needIssuePhoto == '1'" style="position: absolute">*</span>
-          <!-- <van-icon color="#666" name="photograph" size="24" @click="imgClick" /> -->
           <uploadWLImg
             :imgArr="wuliaoPhotoImg"
             @uploadWLImgClick="uploadWLImgClick"
@@ -97,7 +96,7 @@
           /></template>
         </el-table-column>
       </el-table>
-      <div class="wuliaoPhotoImg">
+      <div class="wuliaoPhotoImg" style="margin-top: 10px" v-if="wuliaoMust">
         <deleteUploadImg :imgs="wuliaoPhotoImg"></deleteUploadImg>
       </div>
     </div>
@@ -4653,7 +4652,6 @@ export default {
       console.log(params.id);
       getCollectionInfos(params).then((res) => {
         loading1.clear();
-        this.infoData = res.data;
         this.photoIdentifyType = res.data.photoIdentifyType || null;
         this.productTitles = res.data.productTitles; //产品类型表头数据
         var checkUnManage = res.data;
@@ -5758,6 +5756,15 @@ export default {
           checkUnManage: checkUnManage,
           wuliaoMust: this.wuliaoMust,
         };
+        if (this.wuliaoMust) {
+          let fafangValue = this.tableData1.filter((val) => val.value);
+          if (fafangValue.length && this.needIssuePhoto == '1') {
+            if (!this.wuliaoPhotoImg || !this.wuliaoPhotoImg.length) {
+              this.$toast('请上传图片');
+              return false;
+            }
+          }
+        }
       } else {
         formData = {
           storeId: this.storeId,