Browse Source

Merge branch 'feature_20250704_陈列SKU图片识别' into uat(dev)

# Conflicts:
#	src/views/week/dailyDetails.vue
#	src/views/week/dailyHistoricalDetails.vue
zhujindu 4 months ago
parent
commit
cf4f2ed2e7

+ 9 - 0
src/api/index.js

@@ -1048,3 +1048,12 @@ export function sendAndCheckVerCode(query) {
     params: query,
   });
 }
+
+// sku识别信息接口
+export function getSkuDetailById(query) {
+  return request({
+    url: '/mobile/reportMobile/getSkuDetailById',
+    method: 'get',
+    params: query,
+  });
+}

+ 3 - 3
src/views/historicalVisit/skuRecognize.vue

@@ -29,7 +29,7 @@
           :data="detail.skuList"
           style="width: 100%; border-radius: 10px"
           border
-          class="table-headermd">
+          class="table-headermd1">
           <el-table-column label="序号" type="index" align="center" width="40"> </el-table-column>
           <el-table-column
             label="品类"
@@ -264,7 +264,7 @@ export default {
 </style>
 <style lang="scss">
 .skuDeatil {
-  .table-headermd {
+  .table-headermd1 {
     font-size: 14px;
     text-align: center;
     position: initial;
@@ -286,7 +286,7 @@ export default {
       }
     }
   }
-  .table-headermd th.el-table__cell {
+  .table-headermd1 th.el-table__cell {
     background-color: #f5f5f5;
   }
 }

+ 59 - 3
src/views/week/daily.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="daily">
     <!--        顶部条-->
     <div class="navBarTOP">
       <van-nav-bar class="navBar" title="填写日报" left-arrow @click-left="onClickLeft">
@@ -380,6 +380,25 @@
             </van-col>
           </van-row>
         </van-collapse-item>
+        <!-- 生动化陈列 sku -->
+        <div v-if="photoSkuImgSummaryeList && photoSkuImgSummaryeList.length" class="SKUTable">
+          <p style="padding: 10px 0; font-size: 14px; color: #1e5398; font-weight: 500">
+            SKU陈列照识别结果
+          </p>
+          <el-table
+            :data="photoSkuImgSummaryeList"
+            border
+            class="table-headermd1"
+            style="width: 100%">
+            <el-table-column label="序号" type="index" width="50px" align="center" />
+            <el-table-column label="门店名称(编号)" prop="name" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.storeName }}({{ scope.row.storeCode }})
+              </template>
+            </el-table-column>
+            <el-table-column label="SKU数量" prop="count" width="80px" align="center" />
+          </el-table>
+        </div>
       </van-collapse>
       <div class="contentContainer">
         <div v-if="GZQuota">
@@ -454,6 +473,7 @@ import {
   getDetailById,
   tsContents,
   buryingPoint,
+  getSkuDetailById,
 } from '@/api/index';
 import visitedRealTime from '@/views/componentsTarget/visitedRealTime';
 import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
@@ -549,6 +569,7 @@ export default {
       YFQuota: false, //应用服务
       titlejz: '',
       notVisitReason: '', //今日拜访0家店的原因;
+      photoSkuImgSummaryeList: null,
     };
   },
   created() {
@@ -651,6 +672,7 @@ export default {
             this.reportTarget = res.data;
             this.notVisitReason = this.reportTarget.notVisitReason;
           }
+          this.getskuDetailByIdFun();
         } else {
           this.$toast(res.msg);
         }
@@ -828,13 +850,24 @@ export default {
         } else {
           this.saptitle = '业绩目标SAP(千元)';
         }
-        if (res.data.reportContents.length > 0) {
+        if (res.data.reportContents && res.data.reportContents.length > 0) {
           this.reportContents = res.data.reportContents;
           if (res.data.reportContents.length > 2) {
             this.projectFollowNum = res.data.reportContents[2].projectFollowNum;
             this.tucReportingSuccessNum = res.data.reportContents[3].tucReportingSuccessNum;
           }
         }
+        this.getskuDetailByIdFun();
+      });
+    },
+    getskuDetailByIdFun() {
+      if (this.reportTarget.reportPostType != 'fx') return;
+      getSkuDetailById({ reportId: this.reportTarget.id }).then((res) => {
+        if (res.code == 200) {
+          this.photoSkuImgSummaryeList = res.data;
+        } else {
+          this.photoSkuImgSummaryeList = null;
+        }
       });
     },
     userTodayPlanNum() {
@@ -856,7 +889,7 @@ export default {
 };
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .container {
   margin: 10px;
 }
@@ -910,6 +943,29 @@ export default {
 }
 </style>
 <style lang="scss">
+.daily {
+  .SKUTable {
+    padding-bottom: 10px;
+    .table-headermd1 {
+      font-size: 12px;
+      text-align: center;
+      position: initial;
+      width: 98% !important;
+      margin: 0 auto;
+      border-right: 0;
+      border-radius: 10px;
+      .el-table__cell {
+        padding: 6px 0 !important;
+      }
+      thead {
+        .el-table__cell {
+          background-color: #1989fa;
+          color: #fff;
+        }
+      }
+    }
+  }
+}
 .linepAdd .van-cell__title {
   color: #1e5398;
   font-weight: 500;

+ 43 - 51
src/views/week/dailyApproval.vue

@@ -10,7 +10,7 @@
     <div class="lineGrey"></div>
     <div style="height: 4px"></div>
     <!--        主体内容-->
-    <div class="container linep">
+    <div class="container linep" v-if="reportTargetAll">
       <van-collapse v-model="activeNames" v-if="!YFQuota">
         <!-- YFQuota:应用服务平台 不显示各项指标 -->
         <van-collapse-item v-if="!GZQuota" title="拜访数据(实时)" name="7">
@@ -365,46 +365,39 @@
             </van-col>
           </van-row>
         </van-collapse-item>
-        <van-collapse-item title="今日拜访照片" name="10" v-if="reportTarget.photos">
-          <div v-for="(item, index) in reportTarget.photos" :key="index">
-            <p style="margin-bottom: 10px; margin-top: 0">{{ item.taskName }}</p>
-            <van-row
-              gutter="10"
-              class="visitIMG1"
-              :style="{
-                overflow: 'hidden',
-                height: item.visitIMG1Flag ? 'auto' : '85px',
-              }">
-              <van-col
-                span="6"
-                style="padding-bottom: 10px"
-                @click="pviewFn(index, indexImg, item)"
-                v-for="(itemImg, indexImg) in item.photos"
-                :key="indexImg">
-                <img :src="itemImg.fileUrl" alt="" />
+        <van-collapse-item title="今日拜访照片" name="10" v-if="reportTarget.photoSummary">
+          <div
+            class="visitIMG1"
+            :style="{
+              overflow: 'hidden',
+              height: visitIMG1Flag ? 'auto' : '85px',
+            }">
+            <template v-for="(item, index) in reportTarget.photoSummary">
+              <van-col span="6" style="padding: 5px" @click="pviewFn(index)" :key="index">
+                <img :src="item.fileUrl" alt="" />
               </van-col>
-            </van-row>
-            <div
-              v-if="item.photos.length > 4"
-              class="arrowIcon"
-              style="
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                padding: 5px 0;
-                font-size: 14px;
-                color: #969799;
-              "
-              @click="setVisitIMG1Flag(item)">
-              <template v-if="item.visitIMG1Flag">
-                <span style="margin-right: 5px">折叠</span>
-                <van-icon size="14" :name="require('@/assets/Icon/arrow-up.png')" />
-              </template>
-              <template v-else>
-                <span style="margin-right: 5px">展开</span>
-                <van-icon size="14" :name="require('@/assets/Icon/arrow-down.png')" />
-              </template>
-            </div>
+            </template>
+          </div>
+          <div
+            v-if="reportTarget.photoSummary.length > 8"
+            class="arrowIcon"
+            style="
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              padding: 5px 0;
+              font-size: 14px;
+              color: #969799;
+            "
+            @click="visitIMG1Flag = !visitIMG1Flag">
+            <template v-if="visitIMG1Flag">
+              <span style="margin-right: 5px">折叠</span>
+              <van-icon size="14" :name="require('@/assets/Icon/arrow-up.png')" />
+            </template>
+            <template v-else>
+              <span style="margin-right: 5px">展开</span>
+              <van-icon size="14" :name="require('@/assets/Icon/arrow-down.png')" />
+            </template>
           </div>
           <!-- 生动化陈列 sku -->
           <template
@@ -414,13 +407,12 @@
             <p style="padding: 10px 0; font-size: 14px; color: #1e5398; font-weight: 500">
               SKU陈列照识别结果
             </p>
-            <!-- <div class="skuNum">SKU识别:{{ reportTarget.num }}个</div> -->
             <el-table
               :data="reportTarget.photoSkuImgSummaryeList"
               border
-              class="table-headermd"
+              class="table-headermd table-headermdhome"
               style="width: 100%">
-              <el-table-column label="序号" type="index" width="50px" />
+              <el-table-column label="序号" type="index" width="50px" align="center" />
               <el-table-column label="门店名称(编号)" prop="name" align="center">
                 <template slot-scope="scope"> {{ scope.row.name }}({{ scope.row.code }}) </template>
               </el-table-column>
@@ -571,7 +563,7 @@ export default {
       Content2: '',
       number: 0,
       powerGrade: '',
-      reportTargetAll: {},
+      reportTargetAll: null,
       saptitle: '业绩目标SAP(千元)',
       failContent: '',
       successContent: '',
@@ -585,6 +577,7 @@ export default {
       GZQuota: false,
       YFQuota: false,
       titlejz: '',
+      visitIMG1Flag: false,
       //
     };
   },
@@ -610,13 +603,13 @@ export default {
     buryingPoint(val) {
       buryingPoint(val);
     },
-    pviewFn(val, imgVal, datai) {
+    pviewFn(index) {
       var imgList = [];
-      var photos = this.reportTarget.photos[val].photos;
+      var photos = this.reportTarget.photoSummary;
       for (let i = 0; i < photos.length; i++) {
         imgList.push(photos[i].fileUrl);
       }
-      ImagePreview({ images: imgList, startPosition: imgVal });
+      ImagePreview({ images: imgList, startPosition: index });
       this.buryingPoint({
         systemModel: '日报审核',
         buryingPointType: 2,
@@ -752,10 +745,9 @@ export default {
             }
           }
           var imgList = [];
-          if (res.data.photos != null) {
-            for (var k = 0; k < res.data.photos.length; k++) {
-              res.data.photos[k].visitIMG1Flag = false;
-              imgList.push(res.data.photos[k].fileUrl + '');
+          if (res.data.photoSummary != null) {
+            for (var k = 0; k < res.data.photoSummary.length; k++) {
+              imgList.push(res.data.photoSummary[k].fileUrl + '');
             }
           }
           this.imgList = imgList;

+ 58 - 65
src/views/week/dailyDetails.vue

@@ -385,46 +385,39 @@
               </van-col>
             </van-row>
           </van-collapse-item>
-          <van-collapse-item title="今日拜访照片" name="10" v-if="reportTarget.photos">
-            <div v-for="(item, index) in reportTarget.photos" :key="index">
-              <p style="margin-bottom: 10px">{{ item.taskName }}</p>
-              <van-row
-                gutter="10"
-                class="visitIMG1"
-                :style="{
-                  overflow: 'hidden',
-                  height: item.visitIMG1Flag ? 'auto' : '85px',
-                }">
-                <van-col
-                  span="6"
-                  style="padding-bottom: 10px"
-                  @click="pviewFn(index, indexImg)"
-                  v-for="(itemImg, indexImg) in item.photos"
-                  :key="indexImg">
-                  <img :src="itemImg.fileUrl" alt="" />
+          <van-collapse-item title="今日拜访照片" name="10" v-if="reportTarget.photoSummary">
+            <div
+              class="visitIMG1"
+              :style="{
+                overflow: 'hidden',
+                height: visitIMG1Flag ? 'auto' : '85px',
+              }">
+              <template v-for="(item, index) in reportTarget.photoSummary">
+                <van-col span="6" style="padding: 5px" @click="pviewFn(index)" :key="index">
+                  <img :src="item.fileUrl" alt="" />
                 </van-col>
-              </van-row>
-              <div
-                v-if="item.photos.length > 4"
-                class="arrowIcon"
-                style="
-                  display: flex;
-                  align-items: center;
-                  justify-content: center;
-                  padding: 5px 0;
-                  font-size: 14px;
-                  color: #969799;
-                "
-                @click="setVisitIMG1Flag(item)">
-                <template v-if="item.visitIMG1Flag">
-                  <span style="margin-right: 5px">折叠</span>
-                  <van-icon size="14" :name="require('@/assets/Icon/arrow-up.png')" />
-                </template>
-                <template v-else>
-                  <span style="margin-right: 5px">展开</span>
-                  <van-icon size="14" :name="require('@/assets/Icon/arrow-down.png')" />
-                </template>
-              </div>
+              </template>
+            </div>
+            <div
+              v-if="reportTarget.photoSummary.length > 8"
+              class="arrowIcon"
+              style="
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                padding: 5px 0;
+                font-size: 14px;
+                color: #969799;
+              "
+              @click="visitIMG1Flag = !visitIMG1Flag">
+              <template v-if="visitIMG1Flag">
+                <span style="margin-right: 5px">折叠</span>
+                <van-icon size="14" :name="require('@/assets/Icon/arrow-up.png')" />
+              </template>
+              <template v-else>
+                <span style="margin-right: 5px">展开</span>
+                <van-icon size="14" :name="require('@/assets/Icon/arrow-down.png')" />
+              </template>
             </div>
             <!-- 生动化陈列 sku -->
             <template
@@ -439,13 +432,13 @@
                 border
                 class="table-headermd table-headermdhome"
                 style="width: 100%">
-                <el-table-column label="序号" type="index" width="50px" />
+                <el-table-column label="序号" type="index" width="50px" align="center" />
                 <el-table-column label="门店名称(编号)" prop="name" align="center">
                   <template slot-scope="scope">
                     {{ scope.row.name }}({{ scope.row.code }})
                   </template>
                 </el-table-column>
-                <el-table-column label="数量" prop="count" width="80px" align="center" />
+                <el-table-column label="SKU数量" prop="count" width="80px" align="center" />
               </el-table>
             </template>
           </van-collapse-item>
@@ -568,16 +561,15 @@
       :close-on-click-modal="false"
       @close="wuliaoTableClose"
       custom-class="shareImgFlag">
-      <div v-if="reportTarget.photos">
+      <div v-if="reportTarget.photoSummary">
         <p style="margin-bottom: 10px; margin-top: 0; display: flex">
           今日总结&明日规划的文本内容<van-checkbox
             v-model="checkedPlan"
             style="margin-left: 10px"></van-checkbox>
         </p>
-        <div v-for="(item, index) in reportTarget.photos" :key="index">
-          <p style="margin-bottom: 10px">{{ item.taskName }}</p>
-          <div class="shareVisitImg">
-            <div v-for="(itemImg, indexImg) in item.photos" :key="indexImg">
+        <div class="shareVisitImg">
+          <template v-for="(itemImg, indexImg) in reportTarget.photoSummary">
+            <div>
               <img :src="itemImg.fileUrl" alt="" @click="selectImg(itemImg)" />
               <van-icon
                 @click.stop
@@ -596,7 +588,7 @@
                 "
                 v-if="itemImg.checked" />
             </div>
-          </div>
+          </template>
         </div>
       </div>
       <span slot="footer" class="footer-btn">
@@ -702,6 +694,8 @@ export default {
       sourceType: '',
       checkedPlan: true, //今日总结&明日规划
       shareVisible: true,
+      visitIMG1Flag: false,
+      //
     };
   },
   created() {
@@ -731,7 +725,7 @@ export default {
   },
   methods: {
     setVisitIMG1Flag(item) {
-      this.$set(item, 'visitIMG1Flag', !item.visitIMG1Flag);
+      // this.$set(item, 'visitIMG1Flag', !item.visitIMG1Flag);
       this.$forceUpdate();
     },
     setDailyDetailsBox(flag) {
@@ -751,12 +745,12 @@ export default {
       });
       this.urlList = [];
       this.reportRemarksIndex = index;
-      if (this.reportTarget.photos && this.reportTarget.photos.length) {
+      if (this.reportTarget.photoSummary && this.reportTarget.photoSummary.length) {
         // 重置分享图片状态
-        this.reportTarget.photos.forEach((item) => {
-          item.photos.forEach((val) => {
-            this.$set(val, 'checked', false);
-          });
+        this.reportTarget.photoSummary.forEach((item) => {
+          // item.photos.forEach((val) => {
+          this.$set(item, 'checked', false);
+          // });
         });
         // 选择分享的图片
         this.shareImgFlag = true;
@@ -766,10 +760,10 @@ export default {
     },
     // 确认分享
     confirmShare() {
-      this.reportTarget.photos.forEach((item) => {
-        item.photos.forEach((val) => {
-          if (val.checked) this.urlList.push(val.fileUrl);
-        });
+      this.reportTarget.photoSummary.forEach((item) => {
+        // item.photos.forEach((val) => {
+        if (item.checked) this.urlList.push(item.fileUrl);
+        // });
       });
       if (this.urlList.length == 0 && !this.checkedPlan) {
         this.$notify({ type: 'warning', message: '请选择分享内容!', className: 'notifyIndex' });
@@ -785,13 +779,13 @@ export default {
       this.shareImgFlag = false;
       this.setShareFlag = true;
     },
-    pviewFn(val, imgVal) {
+    pviewFn(index) {
       var imgList = [];
-      var photos = this.reportTarget.photos[val].photos;
+      var photos = this.reportTarget.photoSummary;
       for (let i = 0; i < photos.length; i++) {
         imgList.push(photos[i].fileUrl);
       }
-      ImagePreview({ images: imgList, startPosition: imgVal });
+      ImagePreview({ images: imgList, startPosition: index });
     },
     submint() {
       this.$router.push({
@@ -846,13 +840,12 @@ export default {
         }
         this.reportContents = res.data.reportContents;
         var imgList = [];
-        if (res.data.photos != null) {
-          for (var k = 0; k < res.data.photos.length; k++) {
-            res.data.photos[k].visitIMG1Flag = false;
-            imgList.push(res.data.photos[k].fileUrl + '');
+        if (res.data.photoSummary != null) {
+          for (var k = 0; k < res.data.photoSummary.length; k++) {
+            imgList.push(res.data.photoSummary[k].fileUrl + '');
           }
         }
-        console.log(res.data.photos);
+        console.log(res.data.photoSummary);
         this.imgList = imgList;
         if (this.sourceType == 'daily') {
           this.$nextTick(() => {

+ 64 - 71
src/views/week/dailyHistoricalDetails.vue

@@ -30,7 +30,7 @@
       <div class="lineGrey"></div>
       <div class="lineGrey"></div>
       <!--        主体内容-->
-      <div class="container linep">
+      <div class="container linep" v-if="reportTargetAll">
         <p style="font-size: 16px; margin: 10px 0">
           {{ title }}
         </p>
@@ -398,48 +398,41 @@
               </van-col>
             </van-row>
           </van-collapse-item>
-          <van-collapse-item title="今日拜访照片" name="10" v-if="reportTarget.photos">
-            <div v-for="(item, index) in reportTarget.photos" :key="index">
-              <p style="margin-bottom: 10px; margin-top: 0">{{ item.taskName }}</p>
-              <van-row
-                gutter="10"
-                class="visitIMG1"
-                :style="{
-                  overflow: 'hidden',
-                  height: item.visitIMG1Flag ? 'auto' : '85px',
-                }">
-                <van-col
-                  span="6"
-                  style="padding-bottom: 10px"
-                  @click="pviewFn(index, indexImg, item)"
-                  v-for="(itemImg, indexImg) in item.photos"
-                  :key="indexImg">
-                  <img :src="itemImg.fileUrl" alt="" />
+          <van-collapse-item title="今日拜访照片" name="10" v-if="reportTarget.photoSummary">
+            <div
+              class="visitIMG1"
+              :style="{
+                overflow: 'hidden',
+                height: visitIMG1Flag ? 'auto' : '85px',
+              }">
+              <template v-for="(item, index) in reportTarget.photoSummary">
+                <van-col span="6" style="padding: 5px" @click="pviewFn(index)" :key="index">
+                  <img :src="item.fileUrl" alt="" />
                 </van-col>
-              </van-row>
-              <div
-                v-if="item.photos.length > 4"
-                class="arrowIcon"
-                style="
-                  display: flex;
-                  align-items: center;
-                  justify-content: center;
-                  padding: 5px 0;
-                  font-size: 14px;
-                  color: #969799;
-                "
-                @click="setVisitIMG1Flag(item)">
-                <template v-if="item.visitIMG1Flag">
-                  <span style="margin-right: 5px">折叠</span>
-                  <van-icon size="14" :name="require('@/assets/Icon/arrow-up.png')" />
-                </template>
-                <template v-else>
-                  <span style="margin-right: 5px">展开</span>
-                  <van-icon size="14" :name="require('@/assets/Icon/arrow-down.png')" />
-                </template>
-              </div>
+              </template>
+            </div>
+            <div
+              v-if="reportTarget.photoSummary.length > 8"
+              class="arrowIcon"
+              style="
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                padding: 5px 0;
+                font-size: 14px;
+                color: #969799;
+              "
+              @click="visitIMG1Flag = !visitIMG1Flag">
+              <template v-if="visitIMG1Flag">
+                <span style="margin-right: 5px">折叠</span>
+                <van-icon size="14" :name="require('@/assets/Icon/arrow-up.png')" />
+              </template>
+              <template v-else>
+                <span style="margin-right: 5px">展开</span>
+                <van-icon size="14" :name="require('@/assets/Icon/arrow-down.png')" />
+              </template>
             </div>
-            <!-- 生动化陈列 sku   -->
+            <!-- 生动化陈列 sku -->
             <template
               v-if="
                 reportTarget.photoSkuImgSummaryeList && reportTarget.photoSkuImgSummaryeList.length
@@ -450,15 +443,15 @@
               <el-table
                 :data="reportTarget.photoSkuImgSummaryeList"
                 border
-                class="table-headermd"
+                class="table-headermd table-headermdhome"
                 style="width: 100%">
-                <el-table-column label="序号" type="index" width="50px" />
+                <el-table-column label="序号" type="index" width="50px" align="center" />
                 <el-table-column label="门店名称(编号)" prop="name" align="center">
                   <template slot-scope="scope">
                     {{ scope.row.name }}({{ scope.row.code }})
                   </template>
                 </el-table-column>
-                <el-table-column label="数量" prop="count" width="80px" align="center" />
+                <el-table-column label="SKU数量" prop="count" width="80px" align="center" />
               </el-table>
             </template>
           </van-collapse-item>
@@ -611,16 +604,15 @@
       :close-on-click-modal="false"
       @close="wuliaoTableClose"
       custom-class="shareImgFlag">
-      <div v-if="reportTarget.photos">
+      <div v-if="reportTarget.photoSummary">
         <p style="margin-bottom: 10px; margin-top: 0; display: flex">
           今日总结&明日规划的文本内容<van-checkbox
             v-model="checkedPlan"
             style="margin-left: 10px"></van-checkbox>
         </p>
-        <div v-for="(item, index) in reportTarget.photos" :key="index">
-          <p style="margin-bottom: 10px">{{ item.taskName }}</p>
-          <div class="shareVisitImg">
-            <div v-for="(itemImg, indexImg) in item.photos" :key="indexImg">
+        <div class="shareVisitImg">
+          <template v-for="(itemImg, indexImg) in reportTarget.photoSummary">
+            <div>
               <img :src="itemImg.fileUrl" alt="" @click="selectImg(itemImg)" />
               <van-icon
                 @click.stop
@@ -639,7 +631,7 @@
                 "
                 v-if="itemImg.checked" />
             </div>
-          </div>
+          </template>
         </div>
       </div>
       <span slot="footer" class="footer-btn">
@@ -724,7 +716,7 @@ export default {
       powerGrade: '',
       Content: '',
       Content2: '',
-      reportTargetAll: {},
+      reportTargetAll: null,
       reportContents: [{ dayContent: '' }],
       reportTarget: {},
       successContent: '',
@@ -748,6 +740,7 @@ export default {
       reportId: '',
       checkedPlan: true, //今日总结&明日规划
       setDailyDetailsBoxFlag: true,
+      visitIMG1Flag: false,
       //
     };
   },
@@ -804,12 +797,12 @@ export default {
       });
       this.urlList = [];
       this.reportRemarksIndex = index;
-      if (this.reportTarget.photos && this.reportTarget.photos.length) {
+      if (this.reportTarget.photoSummary && this.reportTarget.photoSummary.length) {
         // 重置分享图片状态
-        this.reportTarget.photos.forEach((item) => {
-          item.photos.forEach((val) => {
-            this.$set(val, 'checked', false);
-          });
+        this.reportTarget.photoSummary.forEach((item) => {
+          // item.photos.forEach((val) => {
+          this.$set(item, 'checked', false);
+          // });
         });
         // 选择分享的图片
         this.shareImgFlag = true;
@@ -819,10 +812,10 @@ export default {
     },
     // 确认分享
     confirmShare() {
-      this.reportTarget.photos.forEach((item) => {
-        item.photos.forEach((val) => {
-          if (val.checked) this.urlList.push(val.fileUrl);
-        });
+      this.reportTarget.photoSummary.forEach((item) => {
+        // item.photos.forEach((val) => {
+        if (item.checked) this.urlList.push(item.fileUrl);
+        // });
       });
       if (this.urlList.length == 0 && !this.checkedPlan) {
         this.$notify({ type: 'warning', message: '请选择分享内容!', className: 'notifyIndex' });
@@ -838,13 +831,13 @@ export default {
       this.shareImgFlag = false;
       this.setShareFlag = true;
     },
-    pviewFn(val, imgVal) {
+    pviewFn(index) {
       var imgList = [];
-      var photos = this.reportTarget.photos[val].photos;
+      var photos = this.reportTarget.photoSummary;
       for (let i = 0; i < photos.length; i++) {
         imgList.push(photos[i].fileUrl);
       }
-      ImagePreview({ images: imgList, startPosition: imgVal });
+      ImagePreview({ images: imgList, startPosition: index });
     },
     openEnterpriseChatv() {
       this.$dialog
@@ -1042,20 +1035,20 @@ export default {
           }
           this.reportContents = res.data.reportContents;
           var imgList = [];
-          if (res.data.photos != null) {
-            for (var k = 0; k < res.data.photos.length; k++) {
-              res.data.photos[k].visitIMG1Flag = false;
-              imgList.push(res.data.photos[k].fileUrl + '');
+          if (res.data.photoSummary != null) {
+            for (var k = 0; k < res.data.photoSummary.length; k++) {
+              imgList.push(res.data.photoSummary[k].fileUrl + '');
             }
           }
           this.imgList = imgList;
         }
         this.reportContents = res.data.reportContents;
         var imgList = [];
-        if (res.data.photos != null) {
-          for (var k = 0; k < res.data.photos.length; k++) {
-            res.data.photos[k].visitIMG1Flag = false;
-            imgList.push(res.data.photos[k].fileUrl + '');
+        if (res.data.photoSummary != null) {
+          if (res.data.photoSummary != null) {
+            for (var k = 0; k < res.data.photoSummary.length; k++) {
+              imgList.push(res.data.photoSummary[k].fileUrl + '');
+            }
           }
         }
         this.imgList = imgList;