zhujindu 7 mēneši atpakaļ
vecāks
revīzija
242748a4df
2 mainītis faili ar 59 papildinājumiem un 18 dzēšanām
  1. 33 11
      src/components/share.vue
  2. 26 7
      src/views/week/dailyHistoricalDetails.vue

+ 33 - 11
src/components/share.vue

@@ -10,19 +10,29 @@
         </div>
       </div>
       <!-- 点评 -->
-      <template v-for="item in reportTarget.reportRemarks">
-        <div class="comment summaryDay">
-          <div class="title-box">
-            <div class="title">
-              <div class="name">{{ item.nickName }}点评</div>
-              <div class="date">
-                {{ item.createTime ? formatChineseDate(item.createTime.split(' ')[0]) : '' }}
-              </div>
+      <!-- <template v-for="item in reportTarget.reportRemarks"> -->
+      <div class="comment summaryDay" v-if="reportRemarksIndex != -1">
+        <div class="title-box">
+          <div class="title">
+            <div class="name">
+              {{ reportTarget.reportRemarks[reportRemarksIndex].nickName }}点评
+            </div>
+            <div class="date">
+              {{
+                reportTarget.reportRemarks[reportRemarksIndex].createTime
+                  ? formatChineseDate(
+                      reportTarget.reportRemarks[reportRemarksIndex].createTime.split(' ')[0]
+                    )
+                  : ''
+              }}
             </div>
           </div>
-          <div class="commentMessage">{{ item.remarkContent }}</div>
         </div>
-      </template>
+        <div class="commentMessage">
+          {{ reportTarget.reportRemarks[reportRemarksIndex].remarkContent }}
+        </div>
+      </div>
+      <!-- </template> -->
       <!-- 内容 -->
       <div class="summaryDay">
         <div class="title-box">
@@ -94,15 +104,22 @@ import { getReportImg } from '@/api/index';
 export default {
   name: 'share',
   props: {
+    // 日报数据
     reportTarget: {
       type: Object,
       default() {
         return {};
       },
     },
+    //日报id
     reportId: {
       type: [String, Number],
     },
+    // 点评数据
+    reportRemarksIndex: {
+      type: Number,
+      default: -1,
+    },
   },
   data() {
     return {
@@ -112,6 +129,7 @@ export default {
     };
   },
   created() {
+    console.log(this.reportRemarksIndex);
     this.canvasImageUrl = '';
   },
   mounted() {
@@ -215,8 +233,12 @@ export default {
     },
     creatQrCode() {
       // let proText = 'https://suishenbang.nipponpaint.com.cn';
+      let path =
+        process.env.VUE_APP_Target +
+          '/mobile/dailyHistoricalDetails?source=share&reportId=' +
+          this.reportId || '';
       var qrcode = new QRCode(this.$refs.QRcodes, {
-        text: process.env.VUE_APP_SSB_LINK + '/homeIndex?reportId=' + this.reportId || '', // 需要转换为二维码的内容
+        text: process.env.VUE_APP_SSB_LINK + '/homeIndex?path=' + path, // 需要转换为二维码的内容
         colorDark: '#000000',
         colorLight: '#ffffff',
         correctLevel: QRCode.CorrectLevel.H,

+ 26 - 7
src/views/week/dailyHistoricalDetails.vue

@@ -5,7 +5,7 @@
       <div class="navBarTOP">
         <van-nav-bar class="navBar" title="日报详情" left-arrow @click-left="onClickLeft">
           <template #right>
-            <div class="shareBtn" @click="setShareFlag = true" v-if="source != 'share'">
+            <div class="shareBtn" @click="clickShareFlag(-1)" v-if="source != 'share'">
               <van-icon name="share" />
             </div>
           </template>
@@ -462,11 +462,15 @@
         <div class="contentContainer" v-if="reportTarget.reportRemarks != null">
           <div>
             <div v-for="(item, index) in reportTarget.reportRemarks" :key="index">
-              <p class="contentContainerTitle">
-                <template v-if="item.deptName">{{ item.deptName }}-</template>{{ item.postName }}-{{
-                  item.nickName
-                }}的点评
-              </p>
+              <div class="contentContainerTitle redisplay">
+                <div class="nameTitle">
+                  <template v-if="item.deptName">{{ item.deptName }}-</template
+                  >{{ item.postName }}-{{ item.nickName }}的点评
+                </div>
+                <div class="shareBtn" @click="clickShareFlag(index)" v-if="source != 'share'">
+                  <van-icon name="share" />
+                </div>
+              </div>
               <div style="padding: 10px 0">
                 <van-field
                   v-model="item.remarkContent"
@@ -523,7 +527,8 @@
       v-if="setShareFlag"
       :reportTarget="reportTarget"
       :reportId="$route.query.reportId"
-      @setShareImg="setShareImg"></share>
+      @setShareImg="setShareImg"
+      :reportRemarksIndex="reportRemarksIndex"></share>
   </div>
 </template>
 
@@ -613,6 +618,7 @@ export default {
       saptitle: '业绩目标SAP(千元)',
       setShareFlag: false,
       source: '',
+      reportRemarksIndex: -1,
       //
     };
   },
@@ -645,6 +651,11 @@ export default {
     setShareImg(flag) {
       this.setShareFlag = flag;
     },
+    // 打开分享
+    clickShareFlag(index = -1) {
+      this.setShareFlag = true;
+      this.reportRemarksIndex = index;
+    },
     pviewFn(val, imgVal) {
       var imgList = [];
       var photos = this.reportTarget.photos[val].photos;
@@ -962,6 +973,14 @@ export default {
   padding: 0 4px;
   border-radius: 2px;
 }
+.redisplay {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  .nameTitle {
+    flex: 1;
+  }
+}
 </style>
 <style>
 .linep .van-cell__title {