2 Achegas a16f9272d7 ... 9a4ef58ed9

Autor SHA1 Mensaxe Data
  zhujindu 9a4ef58ed9 Merge branch 'feature_20260417_拜访页面任务序号优化' into uat(dev) hai 4 horas
  zhujindu b2ca28a211 feature_20260417_拜访页面任务序号优化 hai 4 horas
Modificáronse 2 ficheiros con 25 adicións e 121 borrados
  1. 25 5
      src/utils/index.js
  2. 0 116
      src/views/historicalVisit/perfectStore.vue

+ 25 - 5
src/utils/index.js

@@ -327,10 +327,30 @@ export function shareVedioLinks() {
 }
 }
 
 
 export function convertToChinese(num) {
 export function convertToChinese(num) {
+  if (num === 0) return '零';
   const digitMap = ['零', '一', '二', '三', '四', '五', '六', '七', '八', '九'];
   const digitMap = ['零', '一', '二', '三', '四', '五', '六', '七', '八', '九'];
-  return num
-    .toString()
-    .split('')
-    .map((digit) => digitMap[parseInt(digit)])
-    .join('');
+  const units = ['', '十', '百', '千'];
+  const bigUnits = ['', '万', '亿'];
+  let str = num.toString();
+  let result = '';
+  let len = str.length;
+  for (let i = 0; i < len; i++) {
+    let digit = parseInt(str[i]);
+    let pos = len - 1 - i;
+    if (digit !== 0) {
+      result += digitMap[digit] + units[pos % 4];
+    } else if (result && result[result.length - 1] !== '零') {
+      result += '零';
+    }
+    if (pos % 4 === 0 && pos > 0) {
+      result += bigUnits[Math.floor(pos / 4)];
+    }
+  }
+  // 清理多余的零
+  result = result.replace(/零+/g, '零').replace(/^零|零$/g, '');
+  // 特殊处理:如果以"一十"开头,去掉"一"
+  if (result.startsWith('一十')) {
+    result = result.substring(1);
+  }
+  return result;
 }
 }

+ 0 - 116
src/views/historicalVisit/perfectStore.vue

@@ -53,46 +53,6 @@
         </template>
         </template>
         <div class="subtitle" v-if="updateTimeShow">更新时间:{{ list.updateTime }}</div>
         <div class="subtitle" v-if="updateTimeShow">更新时间:{{ list.updateTime }}</div>
       </div>
       </div>
-      <!-- <p
-        style="padding: 0 10px; font-size: 14px; color: #222; font-weight: bold"
-        v-if="list.visitSource != 2 && ListHistoryList.length > 0">
-        审批历史
-      </p> -->
-      <!-- <div
-        v-for="(item1, index1) in ListHistoryList"
-        :key="index1"
-        style="background-color: white; padding-top: 14px">
-        <p style="padding: 0 16px; font-size: 14px; color: #222; margin: 0">
-          流程名称:{{ item1.modelName }}
-        </p>
-        <van-steps direction="vertical" :active="item1.processList.length">
-          <van-step v-for="(item, index) in item1.processList" :key="index">
-            <h3 style="font-size: 14px">{{ item.activityName }} &nbsp;{{ item.assigneeName }}</h3>
-            <p>{{ item.comment }}</p>
-          </van-step>
-        </van-steps>
-        <div style="border-bottom: 2px solid #f5f5f5; margin: 0 16px 16px"></div>
-      </div> -->
-      <!-- <van-collapse
-        v-model="active"
-        class="fontWeit"
-        v-if="managerRemarkContents != null && managerRemarkContents.length > 0">
-        <van-collapse-item name="1" title="点评">
-          <p>
-            {{ managerRemarkContents[0].deptName }} - {{ managerRemarkContents[0].postName }} -
-            {{ managerRemarkContents[0].nickName }}的点评
-          </p>
-          <p class="contern">
-            <van-field
-              v-model="managerRemarkContents[0].remarkContent"
-              rows="4"
-              autosize
-              readonly
-              type="textarea" />
-          </p>
-          <p style="text-align: right">点评时间:{{ managerRemarkContents[0].createTime }}</p>
-        </van-collapse-item>
-      </van-collapse> -->
       <!-- 特殊任务展示 -->
       <!-- 特殊任务展示 -->
       <!-- 店招 -->
       <!-- 店招 -->
       <div class="shopSign specialTask" v-if="shopSignDetail && shopSignDetail.qualifiedState">
       <div class="shopSign specialTask" v-if="shopSignDetail && shopSignDetail.qualifiedState">
@@ -168,8 +128,6 @@
               <van-button round type="danger" v-if="value.taskPhotoConditionPassed == 0"
               <van-button round type="danger" v-if="value.taskPhotoConditionPassed == 0"
                 >不通过</van-button
                 >不通过</van-button
               >
               >
-              <!-- <van-icon name="success" color="#07c160" v-if="value.taskPhotoConditionPassed == 1" />
-              <van-icon name="cross" color="#ee0a24" v-else /> -->
               <div class="jiantou">
               <div class="jiantou">
                 <van-icon name="arrow" />
                 <van-icon name="arrow" />
               </div>
               </div>
@@ -227,80 +185,6 @@
           </p>
           </p>
         </div>
         </div>
       </div>
       </div>
-      <!-- <div v-if="list.visitSource == 2" style="background-color: #fff">
-        <van-cell title="异常事由" :value="selectDictLabel(typeList, list.abnormalReason)" />
-        <van-cell title="异常信息照" />
-        <div style="padding: 10px 16px 0">
-          <delete-upload-img :imgs="imgs"></delete-upload-img>
-        </div>
-        <van-cell title="异常信息" :value="list.remark" />
-      </div> -->
-
-      <!-- <div style="padding: 10px 16px; font-size: 16px; font-weight: bold">更多记录</div>
-      <van-cell-group>
-        <van-cell v-for="(item1, index1) in list.visitsMore" :key="index1">
-          <template #title>
-            <van-row>
-              <van-col span="6">拜访人:</van-col>
-              <van-col span="18" class="custom-titles">{{ item1.userName }}</van-col>
-            </van-row>
-          </template>
-          <template #right-icon>
-            <span>{{ item1.visitTime }}</span>
-          </template>
-        </van-cell>
-      </van-cell-group> -->
-      <!-- 业务员拜访记录回显部主管反馈内容 -->
-      <!-- <template v-if="list.sfaPhotoApproveList && list.sfaPhotoApproveList.length">
-        <div
-          class="sfaPhotoApproveList"
-          v-for="(item, index) in list.sfaPhotoApproveList"
-          :key="item.identifyType">
-          <template v-if="item.identifyType == 1 || item.identifyType == 3">
-            <div style="padding: 10px 16px; font-size: 16px; font-weight: bold">
-              {{ filterTitle(item.identifyType) }}
-            </div>
-            <template v-if="item.historyFeedback == '0'">
-              <van-cell-group>
-                <van-cell> AI识别结果: {{ item.resultCorrect == 1 ? '正确' : '不正确' }} </van-cell>
-                <van-cell>
-                  拜访照异常原因及解决方案: {{ item.feedbackError || item.reasonsSolutions }}
-                </van-cell>
-              </van-cell-group>
-            </template>
-            <template v-if="item.historyFeedback == '1'">
-              <van-cell-group>
-                <van-cell v-if="item.identifyType == 1">
-                  店招异常原因: {{ resultCorrect(item.resultCorrect) }}
-                </van-cell>
-                <van-cell> 反馈: {{ item.feedbackError || item.reasonsSolutions }} </van-cell>
-              </van-cell-group>
-            </template>
-          </template>
-        </div>
-      </template>
-      <div
-        style="padding: 10px 16px; font-size: 16px; font-weight: bold"
-        v-if="managerRemarkContents == null && remarkShow">
-        点评
-      </div>
-      <div class="comment" v-if="managerRemarkContents == null && remarkShow">
-        <van-field
-          v-model="dataform.remarkContent"
-          rows="4"
-          autosize
-          maxlength="800"
-          show-word-limit
-          type="textarea"
-          :formatter="formatter" />
-        <br />
-        <br />
-        <div class="contentborder">
-          <van-button type="info" size="small" plain class="Btn1" @click="submint"
-            >提交点评</van-button
-          >
-        </div>
-      </div> -->
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>