Merge branch 'feature_20241120_首页提示类指标数字添加千分位,汇报页面优化'

src/views/home/hintTabPage/hintDetail.vue

@@ -61,6 +61,9 @@
             v-if="item.childredColumn"
             v-for="(val, ind) in item.childredColumn"
             :key="ind">
+            <template slot-scope="scope">
+              <span>{{ Micrometer(scope.row[val.prop]) }}</span>
+            </template>
           </el-table-column>
         </el-table-column>
       </el-table>

src/views/home/hintTabPage/index.vue

@@ -119,22 +119,22 @@
                   <div class="firstItem item">
                     <div class="left">
                       <div class="lebel">已领用：</div>
-                      <div class="value">{{ val.ywyylyNum }}本</div>
+                      <div class="value">{{ Micrometer(val.ywyylyNum) }}本</div>
                     </div>
                     <div class="right">
                       <div class="lebel">已发放门店：</div>
-                      <div class="value">{{ val.ywyyffNum }}本</div>
+                      <div class="value">{{ Micrometer(val.ywyyffNum) }}本</div>
                     </div>
                   </div>
                   <div class="secondItem item">
                     <div class="left">
                       <div class="lebel">门店未签收：</div>
-                      <div class="value">{{ val.mdwqsNum }}本</div>
+                      <div class="value">{{ Micrometer(val.mdwqsNum) }}本</div>
                     </div>
                     <div class="right">
                       <div class="lebel">门店未签收：</div>
                       <div class="value valueIsClick" @click="pantoneClick(val, key)">
-                        {{ val.wqsmdNum }}家
+                        {{ Micrometer(val.wqsmdNum) }}家
                       </div>
                     </div>
                   </div>
@@ -148,22 +148,22 @@
                   <div class="firstItem item">
                     <div class="left">
                       <div class="lebel">直发销售部数：</div>
-                      <div class="value">{{ val.zfxsbNum }}本</div>
+                      <div class="value">{{ Micrometer(val.zfxsbNum) }}本</div>
                     </div>
                     <div class="right">
                       <div class="lebel">业务员已领用：</div>
-                      <div class="value">{{ val.ywyylyNum }}本</div>
+                      <div class="value">{{ Micrometer(val.ywyylyNum) }}本</div>
                     </div>
                   </div>
                   <div class="secondItem item">
                     <div class="left">
                       <div class="lebel">业务员已发放：</div>
-                      <div class="value">{{ val.ywyyffNum }}本</div>
+                      <div class="value">{{ Micrometer(val.ywyyffNum) }}本</div>
                     </div>
                     <div class="right">
                       <div class="lebel">门店未签收：</div>
                       <div class="value valueIsClick" @click="pantoneClick(val, key)">
-                        {{ val.mdwqsNum }}本
+                        {{ Micrometer(val.mdwqsNum) }}本
                       </div>
                     </div>
                   </div>
@@ -513,7 +513,7 @@ export default {
   /* padding: 10px; */
   .itemTab {
     /* background: #fff; */
-    padding: 8px;
+    padding: 4px;
     /* padding: 10px; */
     /* margin-bottom: 10px; */
     border-radius: 5px;
@@ -620,11 +620,11 @@ export default {
 .hintTabPage {
   .itemTab {
     .van-cell {
-      padding: 0 8px;
+      padding: 0 4px;
       align-items: center;
     }
     .van-collapse-item__content {
-      padding: 0 8px;
+      padding: 0 4px;
     }
   }
 }

src/views/home/hintTabPage/visitPage.vue

@@ -7,14 +7,22 @@
           <div class="itemLeft">
             <div class="label">{{ list.leftTable }}</div>
             <div class="label">
-              {{ resData[item.titleProp][list.leftProp]
-              }}<span class="unit" v-if="fromType == 'createStore'">{{ list.leftUnit }}</span>
+              <template v-if="fromType == 'noVisit'">
+                {{ resData[item.titleProp][list.leftProp] }}
+              </template>
+              <template v-if="fromType == 'createStore'">
+                {{ Micrometer(resData[item.titleProp][list.leftProp]) }}
+                <span class="unit">{{ list.leftUnit }}</span>
+              </template>
             </div>
           </div>
           <div class="itemRight" :style="{ width: fromType == 'noVisit' ? '130px' : '140px' }">
             <div class="label">{{ list.rightTable }}</div>
             <div class="label" :style="labelStyle(list)" @click="onClick(item, list)">
-              {{ resData[item.titleProp][list.rightProp] }}{{ list.rightUnit }}
+              <span v-if="list.rightProp">
+                {{ Micrometer(resData[item.titleProp][list.rightProp]) }}
+              </span>
+              {{ list.rightUnit }}
             </div>
           </div>
         </div>

src/views/week/dailyDetails.vue

@@ -511,11 +511,15 @@
       <div class="contentContainer" v-if="reportTarget.reportRemarks != null">
         <div>
           <div v-for="(item, index) in reportTarget.reportRemarks" :key="index">
-            <p class="contentContainerTitle">{{ item.postName }}-{{ item.nickName }}点评</p>
+            <p class="contentContainerTitle">
+              <template v-if="item.deptName">{{ item.deptName }}-</template>{{ item.postName }}-{{
+                item.nickName
+              }}点评
+            </p>
             <div style="padding: 10px 0">
               <van-field v-model="item.remarkContent" rows="4" autosize readonly type="textarea" />
             </div>
-            <p style="text-align: right">点评时间：{{ item.createTime }}</p>
+            <!-- <p style="text-align: right">点评时间：{{ item.createTime }}</p> -->
           </div>
         </div>
       </div>

src/views/week/dailyHistoricalDetails.vue

@@ -513,7 +513,11 @@
       <div class="contentContainer" v-if="reportTarget.reportRemarks != null">
         <div>
           <div v-for="(item, index) in reportTarget.reportRemarks" :key="index">
-            <p class="contentContainerTitle">{{ item.postName }}-{{ item.nickName }}的点评</p>
+            <p class="contentContainerTitle">
+              <template v-if="item.deptName">{{ item.deptName }}-</template>{{ item.postName }}-{{
+                item.nickName
+              }}的点评
+            </p>
             <div style="padding: 10px 0">
               <van-field
                 v-model="item.remarkContent"
@@ -523,7 +527,7 @@
                 type="textarea"
                 placeholder="请输入评语" />
             </div>
-            <p style="text-align: right">点评时间：{{ item.createTime }}</p>
+            <!-- <p style="text-align: right">点评时间：{{ item.createTime }}</p> -->
           </div>
         </div>
       </div>

src/views/week/doubleHistoricalWeeklyDetils.vue

@@ -331,7 +331,11 @@
       <div class="contentContainer" v-if="reportTarget.reportRemarks != null">
         <div>
           <div v-for="(item, index) in reportTarget.reportRemarks" :key="index">
-            <p class="contentContainerTitle">{{ item.postName }}-{{ item.nickName }}的点评</p>
+            <p class="contentContainerTitle">
+              <template v-if="item.deptName">{{ item.deptName }}-</template>{{ item.postName }}-{{
+                item.nickName
+              }}的点评
+            </p>
             <div style="padding: 10px 0">
               <van-field
                 v-model="item.remarkContent"
@@ -341,7 +345,7 @@
                 type="textarea"
                 placeholder="请输入评语" />
             </div>
-            <p style="text-align: right">点评时间：{{ item.createTime }}</p>
+            <!-- <p style="text-align: right">点评时间：{{ item.createTime }}</p> -->
           </div>
         </div>
       </div>

src/views/week/doubleWeeklyDetils.vue

@@ -333,7 +333,11 @@
         <div class="contentContainer" v-if="reportTarget.reportRemarks != null">
           <div>
             <div v-for="(item, index) in reportTarget.reportRemarks" :key="index">
-              <p class="contentContainerTitle">{{ item.postName }}-{{ item.nickName }}的点评</p>
+              <p class="contentContainerTitle">
+                <template v-if="item.deptName">{{ item.deptName }}-</template>{{ item.postName }}-{{
+                  item.nickName
+                }}的点评
+              </p>
               <div style="padding: 10px 0">
                 <van-field
                   v-model="item.remarkContent"
@@ -343,7 +347,7 @@
                   type="textarea"
                   placeholder="请输入评语" />
               </div>
-              <p style="text-align: right">点评时间：{{ item.createTime }}</p>
+              <!-- <p style="text-align: right">点评时间：{{ item.createTime }}</p> -->
             </div>
           </div>
         </div>

src/views/week/weeklyApprovalDetils.vue

@@ -365,7 +365,11 @@
           v-if="reportTarget.status > 1 || reportTarget.reportRemarks != null">
           <div>
             <div v-for="(item, index) in reportTarget.reportRemarks" :key="index">
-              <p class="contentContainerTitle">{{ item.postName }}-{{ item.nickName }}点评</p>
+              <p class="contentContainerTitle">
+                <template v-if="item.deptName">{{ item.deptName }}-</template>{{ item.postName }}-{{
+                  item.nickName
+                }}点评
+              </p>
               <div style="padding: 10px 0">
                 <van-field
                   v-model="item.remarkContent"
@@ -375,7 +379,7 @@
                   type="textarea"
                   placeholder="请输入评语" />
               </div>
-              <p style="text-align: right">点评时间：{{ item.createTime }}</p>
+              <!-- <p style="text-align: right">点评时间：{{ item.createTime }}</p> -->
             </div>
           </div>
         </div>

src/views/week/weeklyHistoricalDetils.vue

@@ -358,11 +358,14 @@
       <div class="contentContainer" v-if="reportTarget.reportRemarks != null">
         <div>
           <div v-for="(item, index) in reportTarget.reportRemarks" :key="index">
-            <p class="contentContainerTitle">{{ item.postName }} - {{ item.nickName }}的点评</p>
+            <p class="contentContainerTitle">
+              <template v-if="item.deptName">{{ item.deptName }}-</template>{{ item.postName }} -
+              {{ item.nickName }}的点评
+            </p>
             <div style="padding: 10px 0">
               <van-field v-model="item.remarkContent" rows="4" autosize readonly type="textarea" />
             </div>
-            <p style="text-align: right">点评时间：{{ item.createTime }}</p>
+            <!-- <p style="text-align: right">点评时间：{{ item.createTime }}</p> -->
           </div>
         </div>
       </div>