Merge branch 'feature_20250815_拜访任务和主管任务界面优化' into release

src/views/week/SUPTaskApproval/detailItem.vue

@@ -5,7 +5,9 @@
         <div v-if="item.answerType == 'sz'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <van-field
@@ -21,7 +23,9 @@
         <div v-if="item.answerType == 'rq'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <van-field
@@ -39,7 +43,9 @@
         <div v-if="item.answerType == 'zp'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <van-row gutter="10" style="margin-bottom: 10px">
@@ -66,7 +72,9 @@
         <div v-if="item.answerType == 'wb'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <van-field
@@ -85,7 +93,8 @@
           v-if="item.answerType == 'gs' || item.answerType == 'dq' || item.answerType == 'xsb'">
           <van-cell>
             <template #title>
-              {{ index + 1 }}.{{ item.customName }}
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
               <!-- <span
                 style="color: #444; font-size: 12px; margin: 0; padding: 10px 0; text-align: right">
                 {{ item.remark }}
@@ -97,7 +106,9 @@
         <div v-if="item.answerType == 'duox'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <z-checkbox
@@ -112,7 +123,9 @@
         <div v-if="item.answerType == 'dx'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <z-radio
@@ -127,7 +140,9 @@
         <div v-if="item.answerType == 'jxs'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <div class="jxsBox">

src/views/week/VisitSummaryAdd.vue

@@ -19,22 +19,26 @@
           <div v-if="item.answerType == 'sz'" class="formLabel z-cell">
             <van-cell>
               <template #title>
-                <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+                <span v-if="item.isMust == 0" class="van-f-red">*</span>
+                {{ 1 + index + '.' }}
+                {{ item.customName }}
               </template>
             </van-cell>
             <van-field
               v-model="item.answerValue"
-              :placeholder="item.customName"
+              :placeholder="item.remark"
               type="number"
               @input="numberFn(item, index)"></van-field>
-            <p style="color: #444; font-size: 12px; margin: 0; padding: 10px 0; text-align: right">
+            <!-- <p style="color: #444; font-size: 12px; margin: 0; padding: 10px 0; text-align: right">
               {{ item.remark }}
-            </p>
+            </p> -->
           </div>
           <div v-if="item.answerType == 'rq'" class="formLabel z-cell">
             <van-cell>
               <template #title>
-                <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+                <span v-if="item.isMust == 0" class="van-f-red">*</span>
+                {{ 1 + index + '.' }}
+                {{ item.customName }}
               </template>
             </van-cell>
             <van-field
@@ -51,7 +55,9 @@
           <div v-if="item.answerType == 'zp'" class="formLabel z-cell">
             <van-cell>
               <template #title>
-                <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+                <span v-if="item.isMust == 0" class="van-f-red">*</span>
+                {{ 1 + index + '.' }}
+                {{ item.customName }}
               </template>
             </van-cell>
             <van-row gutter="10" style="margin-bottom: 10px">
@@ -73,7 +79,9 @@
           <div v-if="item.answerType == 'wb'" class="formLabel z-cell">
             <van-cell>
               <template #title>
-                <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+                <span v-if="item.isMust == 0" class="van-f-red">*</span>
+                {{ 1 + index + '.' }}
+                {{ item.customName }}
               </template>
             </van-cell>
             <van-field
@@ -81,15 +89,17 @@
               :formatter="formatter"
               autosize
               type="textarea"
-              :placeholder="item.customName"></van-field>
-            <p style="color: #444; font-size: 12px; margin: 0; padding: 10px 0; text-align: right">
+              :placeholder="item.remark"></van-field>
+            <!-- <p style="color: #444; font-size: 12px; margin: 0; padding: 10px 0; text-align: right">
               {{ item.remark }}
-            </p>
+            </p> -->
           </div>
           <div v-if="item.answerType == 'gs'" class="formLabel z-cell" @click="regionClick(index)">
             <van-cell>
               <template #title>
-                <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+                <span v-if="item.isMust == 0" class="van-f-red">*</span>
+                {{ 1 + index + '.' }}
+                {{ item.customName }}
               </template>
             </van-cell>
             <van-field
@@ -107,7 +117,9 @@
             @click="SalesRegionClick(index)">
             <van-cell>
               <template #title>
-                <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+                <span v-if="item.isMust == 0" class="van-f-red">*</span>
+                {{ 1 + index + '.' }}
+                {{ item.customName }}
               </template>
             </van-cell>
             <van-field
@@ -125,7 +137,9 @@
             @click="SalesDepartmentClick(index)">
             <van-cell>
               <template #title>
-                <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+                <span v-if="item.isMust == 0" class="van-f-red">*</span>
+                {{ 1 + index + '.' }}
+                {{ item.customName }}
               </template>
             </van-cell>
             <van-field
@@ -140,7 +154,9 @@
           <div v-if="item.answerType == 'duox'" class="formLabel z-cell">
             <van-cell>
               <template #title>
-                <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+                <span v-if="item.isMust == 0" class="van-f-red">*</span>
+                {{ 1 + index + '.' }}
+                {{ item.customName }}
               </template>
             </van-cell>
             <z-checkbox
@@ -154,7 +170,9 @@
           <div v-if="item.answerType == 'dx'" class="formLabel z-cell">
             <van-cell>
               <template #title>
-                <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+                <span v-if="item.isMust == 0" class="van-f-red">*</span>
+                {{ 1 + index + '.' }}
+                {{ item.customName }}
               </template>
             </van-cell>
             <z-radio
@@ -168,7 +186,9 @@
           <div v-if="item.answerType == 'jxs'" class="formLabel z-cell">
             <van-cell>
               <template #title>
-                <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+                <span v-if="item.isMust == 0" class="van-f-red">*</span>
+                {{ 1 + index + '.' }}
+                {{ item.customName }}
               </template>
             </van-cell>
             <div class="jxsBox">

src/views/week/allowWriteAgainSummary.vue

@@ -5,26 +5,30 @@
         <div v-if="item.answerType == 'sz'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <!-- allowWriteAgain 是否允许补填 true/false -->
           <van-field
             v-model="item.answerValue"
-            :placeholder="item.customName"
+            :placeholder="item.remark"
             type="number"
             :disabled="!item.allowWriteAgain"
             @input="numberFn(item, index)"></van-field>
-          <p
+          <!-- <p
             v-if="item.allowWriteAgain"
             style="color: #444; font-size: 12px; margin: 0; padding: 10px 0; text-align: right">
             {{ item.remark }}
-          </p>
+          </p> -->
         </div>
         <div v-if="item.answerType == 'rq'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <van-field
@@ -44,7 +48,9 @@
         <div v-if="item.answerType == 'zp'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <van-row gutter="10" style="margin-bottom: 10px">
@@ -71,7 +77,9 @@
         <div v-if="item.answerType == 'wb'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <van-field
@@ -80,19 +88,20 @@
             :formatter="formatter"
             autosize
             type="textarea"
-            :placeholder="item.customName"></van-field>
-          <p
+            :placeholder="item.remark"></van-field>
+          <!-- <p
             v-if="item.allowWriteAgain"
             style="color: #444; font-size: 12px; margin: 0; padding: 10px 0; text-align: right">
             {{ item.remark }}
-          </p>
+          </p> -->
         </div>
         <div
           class="formLabel z-cell z-cells z-celly"
           v-if="item.answerType == 'gs' || item.answerType == 'dq' || item.answerType == 'xsb'">
           <van-cell>
-            <template #title
-              >{{ index + 1 }}.{{ item.customName }}
+            <template #title>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
               <span
                 v-if="item.allowWriteAgain"
                 style="color: #444; font-size: 12px; margin: 0; padding: 10px 0; text-align: right"
@@ -105,7 +114,9 @@
         <div v-if="item.answerType == 'duox'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <z-checkbox
@@ -120,7 +131,9 @@
         <div v-if="item.answerType == 'dx'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <z-radio
@@ -135,7 +148,9 @@
         <div v-if="item.answerType == 'jxs'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <div class="jxsBox">

src/views/week/componVisitSummary.vue

@@ -5,22 +5,26 @@
         <div v-if="item.answerType == 'sz'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <van-field
             v-model="item.answerValue"
-            :placeholder="item.customName"
+            :placeholder="item.remark"
             type="number"
             @input="numberFn(item, index)"></van-field>
-          <p style="color: #444; font-size: 12px; margin: 0; padding: 10px 0; text-align: right">
+          <!-- <p style="color: #444; font-size: 12px; margin: 0; padding: 10px 0; text-align: right">
             {{ item.remark }}
-          </p>
+          </p> -->
         </div>
         <div v-if="item.answerType == 'rq'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <van-field
@@ -37,7 +41,9 @@
         <div v-if="item.answerType == 'zp'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <van-row gutter="10" style="margin-bottom: 10px">
@@ -59,7 +65,9 @@
         <div v-if="item.answerType == 'wb'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <van-field
@@ -67,15 +75,17 @@
             :formatter="formatter"
             autosize
             type="textarea"
-            :placeholder="item.customName"></van-field>
-          <p style="color: #444; font-size: 12px; margin: 0; padding: 10px 0; text-align: right">
+            :placeholder="item.remark"></van-field>
+          <!-- <p style="color: #444; font-size: 12px; margin: 0; padding: 10px 0; text-align: right">
             {{ item.remark }}
-          </p>
+          </p> -->
         </div>
         <div v-if="item.answerType == 'gs'" class="formLabel z-cell" @click="regionClick(index)">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <van-field
@@ -93,7 +103,9 @@
           @click="SalesRegionClick(index)">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <van-field
@@ -111,7 +123,9 @@
           @click="SalesDepartmentClick(index)">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <van-field
@@ -126,7 +140,9 @@
         <div v-if="item.answerType == 'duox'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <z-checkbox
@@ -140,7 +156,9 @@
         <div v-if="item.answerType == 'dx'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <z-radio
@@ -154,7 +172,9 @@
         <div v-if="item.answerType == 'jxs'" class="formLabel z-cell">
           <van-cell>
             <template #title>
-              <span v-if="item.isMust == 0" class="van-f-red">*</span>{{ item.customName }}
+              <span v-if="item.isMust == 0" class="van-f-red">*</span>
+              {{ 1 + index + '.' }}
+              {{ item.customName }}
             </template>
           </van-cell>
           <div class="jxsBox">
@@ -272,7 +292,7 @@ import uploadImg from '@/components/uploadVTask';
 import deleteUploadImg from '@/components/deleteUploadImg2';
 
 export default {
-  name: 'MyHistoricalWeekly',
+  name: 'componVisitSummary',
   components: { zRadio, zCheckbox, uploadImg, deleteUploadImg },
   props: {
     collectionItemLists: {