Merge branch 'feature_20250219_首页指标修改' into uat(dev)

src/views/home/ABtarget.vue

@@ -157,47 +157,47 @@
           <van-collapse-item
             v-if="powerGrade != 1 && !JZQuota && !GZdata"
             name="27"
-            title="乳胶漆中高端(千元)">
+            title="内墙中高端(千元)">
             <van-row>
               <van-col span="12"><span class="leftTitle">本月业绩</span></van-col>
               <van-col span="12"><span class="rightTitle">本季业绩</span></van-col>
               <van-col span="12"
                 ><p>
                   实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.rjqSapMonthAct)
+                    Micrometer(reportTargetAll.nwqSapMonthAct)
                   }}</span>
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
                   实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.rjqSapQuarterAct)
+                    Micrometer(reportTargetAll.nwqSapQuarterAct)
                   }}</span>
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
                   达成率:<span class="colorbalck"
-                    >{{ reportTargetAll.rjqSapMonthSuccessRate }}%</span
+                    >{{ reportTargetAll.nwqSapMonthSuccessRate }}%</span
                   >
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
                   达成率:<span class="colorbalck"
-                    >{{ reportTargetAll.rjqSapQuarterSuccessRate }}%</span
+                    >{{ reportTargetAll.nwqSapQuarterSuccessRate }}%</span
                   >
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
-                  成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthGrowRate }}%</span>
+                  成长率:<span class="colorbalck">{{ reportTargetAll.nwqSapMonthGrowRate }}%</span>
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
                   成长率:<span class="colorbalck"
-                    >{{ reportTargetAll.rjqSapQuarterGrowRate }}%</span
+                    >{{ reportTargetAll.nwqSapQuarterGrowRate }}%</span
                   >
                 </p></van-col
               >

src/views/week/doubleHistoricalWeeklyDetils.vue

@@ -23,44 +23,44 @@
         <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
           <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
         </van-collapse-item>
-        <van-collapse-item name="27" title="乳胶漆中高端(千元)">
+        <van-collapse-item name="27" title="内墙中高端(千元)">
           <van-row>
             <van-col span="12"><span class="leftTitle">本月业绩</span></van-col>
             <van-col span="12"><span class="rightTitle">本季业绩</span></van-col>
             <van-col span="12"
               ><p>
                 实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.rjqSapMonthAct)
+                  Micrometer(reportTargetAll.nwqSapMonthAct)
                 }}</span>
               </p></van-col
             >
             <van-col span="12"
               ><p>
                 实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.rjqSapQuarterAct)
+                  Micrometer(reportTargetAll.nwqSapQuarterAct)
                 }}</span>
               </p></van-col
             >
             <van-col span="12"
               ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthSuccessRate }}%</span>
+                达成率:<span class="colorbalck">{{ reportTargetAll.nwqSapMonthSuccessRate }}%</span>
               </p></van-col
             >
             <van-col span="12"
               ><p>
                 达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.rjqSapQuarterSuccessRate }}%</span
+                  >{{ reportTargetAll.nwqSapQuarterSuccessRate }}%</span
                 >
               </p></van-col
             >
             <van-col span="12"
               ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthGrowRate }}%</span>
+                成长率:<span class="colorbalck">{{ reportTargetAll.nwqSapMonthGrowRate }}%</span>
               </p></van-col
             >
             <van-col span="12"
               ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapQuarterGrowRate }}%</span>
+                成长率:<span class="colorbalck">{{ reportTargetAll.nwqSapQuarterGrowRate }}%</span>
               </p></van-col
             >
           </van-row>

src/views/week/doubleWeekly.vue

@@ -36,44 +36,44 @@
         <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
           <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
         </van-collapse-item>
-        <van-collapse-item name="27" title="乳胶漆中高端(千元)">
+        <van-collapse-item name="27" title="内墙中高端(千元)">
           <van-row>
             <van-col span="12"><span class="leftTitle">本月业绩</span></van-col>
             <van-col span="12"><span class="rightTitle">本季业绩</span></van-col>
             <van-col span="12"
               ><p>
                 实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.rjqSapMonthAct)
+                  Micrometer(reportTargetAll.nwqSapMonthAct)
                 }}</span>
               </p></van-col
             >
             <van-col span="12"
               ><p>
                 实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.rjqSapQuarterAct)
+                  Micrometer(reportTargetAll.nwqSapQuarterAct)
                 }}</span>
               </p></van-col
             >
             <van-col span="12"
               ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthSuccessRate }}%</span>
+                达成率:<span class="colorbalck">{{ reportTargetAll.nwqSapMonthSuccessRate }}%</span>
               </p></van-col
             >
             <van-col span="12"
               ><p>
                 达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.rjqSapQuarterSuccessRate }}%</span
+                  >{{ reportTargetAll.nwqSapQuarterSuccessRate }}%</span
                 >
               </p></van-col
             >
             <van-col span="12"
               ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthGrowRate }}%</span>
+                成长率:<span class="colorbalck">{{ reportTargetAll.nwqSapMonthGrowRate }}%</span>
               </p></van-col
             >
             <van-col span="12"
               ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapQuarterGrowRate }}%</span>
+                成长率:<span class="colorbalck">{{ reportTargetAll.nwqSapQuarterGrowRate }}%</span>
               </p></van-col
             >
           </van-row>

src/views/week/doubleWeeklyApproval.vue

@@ -22,44 +22,44 @@
         <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
           <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
         </van-collapse-item>
-        <van-collapse-item name="27" title="乳胶漆中高端(千元)">
+        <van-collapse-item name="27" title="内墙中高端(千元)">
           <van-row>
             <van-col span="12"><span class="leftTitle">本月业绩</span></van-col>
             <van-col span="12"><span class="rightTitle">本季业绩</span></van-col>
             <van-col span="12"
               ><p>
                 实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.rjqSapMonthAct)
+                  Micrometer(reportTargetAll.nwqSapMonthAct)
                 }}</span>
               </p></van-col
             >
             <van-col span="12"
               ><p>
                 实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.rjqSapQuarterAct)
+                  Micrometer(reportTargetAll.nwqSapQuarterAct)
                 }}</span>
               </p></van-col
             >
             <van-col span="12"
               ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthSuccessRate }}%</span>
+                达成率:<span class="colorbalck">{{ reportTargetAll.nwqSapMonthSuccessRate }}%</span>
               </p></van-col
             >
             <van-col span="12"
               ><p>
                 达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.rjqSapQuarterSuccessRate }}%</span
+                  >{{ reportTargetAll.nwqSapQuarterSuccessRate }}%</span
                 >
               </p></van-col
             >
             <van-col span="12"
               ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthGrowRate }}%</span>
+                成长率:<span class="colorbalck">{{ reportTargetAll.nwqSapMonthGrowRate }}%</span>
               </p></van-col
             >
             <van-col span="12"
               ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapQuarterGrowRate }}%</span>
+                成长率:<span class="colorbalck">{{ reportTargetAll.nwqSapQuarterGrowRate }}%</span>
               </p></van-col
             >
           </van-row>

src/views/week/doubleWeeklyDetils.vue

@@ -23,44 +23,44 @@
         <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
           <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
         </van-collapse-item>
-        <van-collapse-item name="27" title="乳胶漆中高端(千元)">
+        <van-collapse-item name="27" title="内墙中高端(千元)">
           <van-row>
             <van-col span="12"><span class="leftTitle">本月业绩</span></van-col>
             <van-col span="12"><span class="rightTitle">本季业绩</span></van-col>
             <van-col span="12"
               ><p>
                 实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.rjqSapMonthAct)
+                  Micrometer(reportTargetAll.nwqSapMonthAct)
                 }}</span>
               </p></van-col
             >
             <van-col span="12"
               ><p>
                 实际:<span class="colorbalck">{{
-                  Micrometer(reportTargetAll.rjqSapQuarterAct)
+                  Micrometer(reportTargetAll.nwqSapQuarterAct)
                 }}</span>
               </p></van-col
             >
             <van-col span="12"
               ><p>
-                达成率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthSuccessRate }}%</span>
+                达成率:<span class="colorbalck">{{ reportTargetAll.nwqSapMonthSuccessRate }}%</span>
               </p></van-col
             >
             <van-col span="12"
               ><p>
                 达成率:<span class="colorbalck"
-                  >{{ reportTargetAll.rjqSapQuarterSuccessRate }}%</span
+                  >{{ reportTargetAll.nwqSapQuarterSuccessRate }}%</span
                 >
               </p></van-col
             >
             <van-col span="12"
               ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthGrowRate }}%</span>
+                成长率:<span class="colorbalck">{{ reportTargetAll.nwqSapMonthGrowRate }}%</span>
               </p></van-col
             >
             <van-col span="12"
               ><p>
-                成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapQuarterGrowRate }}%</span>
+                成长率:<span class="colorbalck">{{ reportTargetAll.nwqSapQuarterGrowRate }}%</span>
               </p></van-col
             >
           </van-row>

src/views/week/weekly.vue

@@ -38,47 +38,47 @@
           <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
             <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
           </van-collapse-item>
-          <van-collapse-item name="27" title="乳胶漆中高端(千元)">
+          <van-collapse-item name="27" title="内墙中高端(千元)">
             <van-row>
               <van-col span="12"><span class="leftTitle">本月业绩</span></van-col>
               <van-col span="12"><span class="rightTitle">本季业绩</span></van-col>
               <van-col span="12"
                 ><p>
                   实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.rjqSapMonthAct)
+                    Micrometer(reportTargetAll.nwqSapMonthAct)
                   }}</span>
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
                   实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.rjqSapQuarterAct)
+                    Micrometer(reportTargetAll.nwqSapQuarterAct)
                   }}</span>
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
                   达成率:<span class="colorbalck"
-                    >{{ reportTargetAll.rjqSapMonthSuccessRate }}%</span
+                    >{{ reportTargetAll.nwqSapMonthSuccessRate }}%</span
                   >
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
                   达成率:<span class="colorbalck"
-                    >{{ reportTargetAll.rjqSapQuarterSuccessRate }}%</span
+                    >{{ reportTargetAll.nwqSapQuarterSuccessRate }}%</span
                   >
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
-                  成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthGrowRate }}%</span>
+                  成长率:<span class="colorbalck">{{ reportTargetAll.nwqSapMonthGrowRate }}%</span>
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
                   成长率:<span class="colorbalck"
-                    >{{ reportTargetAll.rjqSapQuarterGrowRate }}%</span
+                    >{{ reportTargetAll.nwqSapQuarterGrowRate }}%</span
                   >
                 </p></van-col
               >

src/views/week/weeklyApproval.vue

@@ -23,47 +23,47 @@
           <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
             <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
           </van-collapse-item>
-          <van-collapse-item name="27" title="乳胶漆中高端(千元)">
+          <van-collapse-item name="27" title="内墙中高端(千元)">
             <van-row>
               <van-col span="12"><span class="leftTitle">本月业绩</span></van-col>
               <van-col span="12"><span class="rightTitle">本季业绩</span></van-col>
               <van-col span="12"
                 ><p>
                   实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.rjqSapMonthAct)
+                    Micrometer(reportTargetAll.nwqSapMonthAct)
                   }}</span>
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
                   实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.rjqSapQuarterAct)
+                    Micrometer(reportTargetAll.nwqSapQuarterAct)
                   }}</span>
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
                   达成率:<span class="colorbalck"
-                    >{{ reportTargetAll.rjqSapMonthSuccessRate }}%</span
+                    >{{ reportTargetAll.nwqSapMonthSuccessRate }}%</span
                   >
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
                   达成率:<span class="colorbalck"
-                    >{{ reportTargetAll.rjqSapQuarterSuccessRate }}%</span
+                    >{{ reportTargetAll.nwqSapQuarterSuccessRate }}%</span
                   >
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
-                  成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthGrowRate }}%</span>
+                  成长率:<span class="colorbalck">{{ reportTargetAll.nwqSapMonthGrowRate }}%</span>
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
                   成长率:<span class="colorbalck"
-                    >{{ reportTargetAll.rjqSapQuarterGrowRate }}%</span
+                    >{{ reportTargetAll.nwqSapQuarterGrowRate }}%</span
                   >
                 </p></van-col
               >

src/views/week/weeklyApprovalDetils.vue

@@ -23,47 +23,47 @@
           <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
             <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
           </van-collapse-item>
-          <van-collapse-item name="27" title="乳胶漆中高端(千元)">
+          <van-collapse-item name="27" title="内墙中高端(千元)">
             <van-row>
               <van-col span="12"><span class="leftTitle">本月业绩</span></van-col>
               <van-col span="12"><span class="rightTitle">本季业绩</span></van-col>
               <van-col span="12"
                 ><p>
                   实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.rjqSapMonthAct)
+                    Micrometer(reportTargetAll.nwqSapMonthAct)
                   }}</span>
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
                   实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.rjqSapQuarterAct)
+                    Micrometer(reportTargetAll.nwqSapQuarterAct)
                   }}</span>
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
                   达成率:<span class="colorbalck"
-                    >{{ reportTargetAll.rjqSapMonthSuccessRate }}%</span
+                    >{{ reportTargetAll.nwqSapMonthSuccessRate }}%</span
                   >
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
                   达成率:<span class="colorbalck"
-                    >{{ reportTargetAll.rjqSapQuarterSuccessRate }}%</span
+                    >{{ reportTargetAll.nwqSapQuarterSuccessRate }}%</span
                   >
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
-                  成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthGrowRate }}%</span>
+                  成长率:<span class="colorbalck">{{ reportTargetAll.nwqSapMonthGrowRate }}%</span>
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
                   成长率:<span class="colorbalck"
-                    >{{ reportTargetAll.rjqSapQuarterGrowRate }}%</span
+                    >{{ reportTargetAll.nwqSapQuarterGrowRate }}%</span
                   >
                 </p></van-col
               >

src/views/week/weeklyHistoricalDetils.vue

@@ -24,47 +24,47 @@
           <van-collapse-item title="业绩目标SAP(千元)" name="1" v-if="type != 3 && type != 4">
             <performanceSAP :reportTargetAll="reportTargetAll" :JZQuota="JZQuota"></performanceSAP>
           </van-collapse-item>
-          <van-collapse-item name="27" title="乳胶漆中高端(千元)">
+          <van-collapse-item name="27" title="内墙中高端(千元)">
             <van-row>
               <van-col span="12"><span class="leftTitle">本月业绩</span></van-col>
               <van-col span="12"><span class="rightTitle">本季业绩</span></van-col>
               <van-col span="12"
                 ><p>
                   实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.rjqSapMonthAct)
+                    Micrometer(reportTargetAll.nwqSapMonthAct)
                   }}</span>
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
                   实际:<span class="colorbalck">{{
-                    Micrometer(reportTargetAll.rjqSapQuarterAct)
+                    Micrometer(reportTargetAll.nwqSapQuarterAct)
                   }}</span>
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
                   达成率:<span class="colorbalck"
-                    >{{ reportTargetAll.rjqSapMonthSuccessRate }}%</span
+                    >{{ reportTargetAll.nwqSapMonthSuccessRate }}%</span
                   >
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
                   达成率:<span class="colorbalck"
-                    >{{ reportTargetAll.rjqSapQuarterSuccessRate }}%</span
+                    >{{ reportTargetAll.nwqSapQuarterSuccessRate }}%</span
                   >
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
-                  成长率:<span class="colorbalck">{{ reportTargetAll.rjqSapMonthGrowRate }}%</span>
+                  成长率:<span class="colorbalck">{{ reportTargetAll.nwqSapMonthGrowRate }}%</span>
                 </p></van-col
               >
               <van-col span="12"
                 ><p>
                   成长率:<span class="colorbalck"
-                    >{{ reportTargetAll.rjqSapQuarterGrowRate }}%</span
+                    >{{ reportTargetAll.nwqSapQuarterGrowRate }}%</span
                   >
                 </p></van-col
               >