Prechádzať zdrojové kódy

Merge branch 'feature_20251107_质感销售专员首页' into uat(dev)

sunny 3 týždňov pred
rodič
commit
6b8cc08086

+ 1 - 0
src/views/clew/clewent.vue

@@ -242,6 +242,7 @@
                   style="width: 100%; position: relative; left: -10px">
                   <el-table-column
                     v-for="(item, index) in JSON.parse(item.answerValue).title"
+                    :key="index"
                     :prop="item.prop"
                     :label="item.label"
                     align="center">

+ 1 - 0
src/views/clew/complaintDetail/radioGroup.vue

@@ -128,6 +128,7 @@
         <el-table :data="val.tableData.data" style="width: 100%; position: relative; left: -10px">
           <el-table-column
             v-for="(item, index) in val.tableData.title"
+            :key="index"
             :prop="item.prop"
             :label="item.label"
             align="center">

+ 7 - 5
src/views/home/HomeTarget.vue

@@ -62,7 +62,7 @@
                 <div v-for="(item, idx) in category.children" :key="idx">
                   <van-col :span="idx == 0 ? 24 : 12">
                     <p>
-                      {{ item.name }}:<span class="colorbalck">{{ Micrometer(item.indicatorValue) }}{{
+                      {{ item.name }}:<span :style="labelStyle(item.clickable)" @click="onClick(item.clickable)" class="colorbalck">{{ Micrometer(item.indicatorValue) }}{{
                         item.indicatorUnit }}</span>
                     </p>
                   </van-col>
@@ -77,7 +77,7 @@
                 <div v-for="(item, idx) in category.children" :key="idx">
                   <van-col :span="idx == 0 ? 24 : 12">
                     <p>
-                      {{ item.name }}:<span :style="labelStyle(item.clickable)" @click="onClick()" class="colorbalck">{{ Micrometer(item.indicatorValue) }}{{
+                      {{ item.name }}:<span :style="labelStyle(item.clickable)" @click="onClick(item.clickable)" class="colorbalck">{{ Micrometer(item.indicatorValue) }}{{
                         item.indicatorUnit }}</span>
                     </p>
                   </van-col>
@@ -196,9 +196,11 @@ export default {
       };
     },
     // 跳转详情
-    onClick() {
-      store.dispatch('setActivaTypeStore', 'FuWuShang');
-      this.$router.push({ path: '/noVisit' });
+    onClick(val) {
+      if(val==1){
+        store.dispatch('setActivaTypeStore', 'FuWuShang');
+        this.$router.push({ path: '/noVisit' });
+      }
     },
     initData() {
       console.log(this.tabVal);

+ 1 - 1
src/views/home/bottomBtn.vue

@@ -234,7 +234,7 @@ export default {
         color: #99443b;
         font-weight: bold;
         display: flex;
-        align-items: end;
+        align-items: flex-end;
         padding-top: 40px;
         position: relative;
         img {

+ 1 - 1
src/views/week/dailyDetails.vue

@@ -921,7 +921,7 @@ export default {
       display: flex;
       flex-direction: column;
       justify-content: center;
-      align-items: start;
+      align-items: flex-start;
       z-index: 999999;
       span {
         line-height: 17px;

+ 1 - 1
src/views/week/dailyHistoricalDetails.vue

@@ -1124,7 +1124,7 @@ export default {
       display: flex;
       flex-direction: column;
       justify-content: center;
-      align-items: start;
+      align-items: flex-start;
       z-index: 999999;
       span {
         line-height: 17px;