Merge branch 'feature_20250722_门店建议订单' into release

src/views/deviceOutside/index.vue

@@ -115,7 +115,7 @@
                     </div>
                     <div
                       class="visitStoreIco"
-                      v-if="item.storeLabels.zysslNums"
+                      v-if="item.storeLabels.zysslNums !== false"
                       style="background-color: #fff; position: relative"
                       slot="reference">
                       <p
@@ -908,7 +908,7 @@ export default {
     linkList(val) {
       this.$router.push({
         path: '/pItem',
-        query: { id: val.storeCode, detilId: 'a' },
+        query: { id: val.storeId, detilId: 'a', from: 'outPlan',storeCode: val.storeCode },
       });
     },
     linkimg(val) {

src/views/deviceOutside/productItem.vue

@@ -1,8 +1,9 @@
 <template>
-  <div class="bgcolor">
-    <div class="navBarTOP" >
-      <van-nav-bar class="navBar" title="产品列表"   left-arrow @click-left="onClickLeft">
+  <div class="bgcolor productItem">
+    <div class="navBarTOP">
+      <van-nav-bar class="navBar" title="产品列表" left-arrow @click-left="onClickLeft">
         <template #right>
+          <span style="color: #0057ba" @click="placeOrderFn"> 去下单 </span>
         </template>
       </van-nav-bar>
     </div>
@@ -11,42 +12,129 @@
     <div class="lineGrey"></div>
     <div class="lineGrey"></div>
     <div class="lineGrey"></div>
-    <div class="container" style="width: 100%; margin: 0 auto;">
-      <div v-for="item  in  list">
-        <p style="font-weight: bold;font-size: 14px">&nbsp;&nbsp;&nbsp;{{item.m01Name}}</p>
-        <el-table :data="item.productDetailList" border  style="width: 100%"   >
-          <el-table-column label="物料名称" prop="productName" />
-          <el-table-column label="规格" prop="productSku" />
+    <div class="container" style="width: 100%; margin: 0 auto">
+      <van-tabs class="myTab" type="card" v-model="tabVal" color="#0057ba" @change="tabChange">
+        <van-tab :title="timeData + '下单SKU'" name="0"></van-tab>
+        <van-tab title="建议下单SKU" name="1"></van-tab>
+      </van-tabs>
+      <div class="tips" v-if="tabVal == '1'">
+        <p style="font-weight: bold; font-size: 16px">建议下单规则:</p>
+        <p>①计算该店所在销售部同店型门店:滚动3个月DIS/OMS下单的TOP产品</p>
+        <p>②已售品项 VS TOP产品，输出未下单产品TOP50如下</p>
+      </div>
+      <div
+        v-for="item in list"
+        v-if="list.length"
+        style="display: flex; flex-direction: column; align-items: center">
+        <p
+          style="
+            font-weight: bold;
+            font-size: 16px;
+            text-align: center;
+            background: #d6eaff;
+            margin: 0;
+            padding: 10px 0;
+            width: 94%;
+          ">
+          &nbsp;&nbsp;&nbsp;{{ item.m01Name }}
+        </p>
+        <el-table class="table-headermd1" :data="item.productDetailList" border>
+          <el-table-column label="物料名称" prop="productName" align="center" />
+          <el-table-column label="规格" prop="productSku" align="center" width="120px" />
         </el-table>
       </div>
+      <van-empty v-if="list.length == 0" />
     </div>
   </div>
 </template>
 
 <script>
-import {getItemList} from "@/api";
+import { getItemList, buryingPoint } from '@/api';
+import { getOrderUrlByStoreId } from '@/api/inventory';
 export default {
   data() {
     return {
-      list: []
-    }
+      list: [],
+      tabVal: '0',
+      detail: null,
+      timeData: '',
+    };
   },
-  created() {
-    this.getMyInventoryList()
-  },
-  watch: {
-    $route(to, from) {
-      if (to.path == "/pItem") {
-        this.getMyInventoryList()
-      }
-    }
+  activated() {
+    buryingPoint({
+      systemModel: '门店列表',
+      buryingPointType: 6,
+      buryingPointValue: '门店拜访-下单SKU数',
+      buryingPointName: this.tabVal == '0' ? '滚动三个月下单SKU' : '建议下单SKU',
+      buryingPointPosition: '门店ICON',
+    });
+    this.getMonth();
+    this.getMyInventoryList();
   },
   methods: {
+    getMonth() {
+      // 获取当前日期
+      var currentDate = new Date();
+
+      // 获取当前月份
+      var currentMonth = currentDate.getMonth();
+
+      // 获取当前年份
+      // var currentYear = currentDate.getFullYear();
+
+      var previousMonthDate1 = new Date();
+      if (currentDate.getDate() == 1) {
+        previousMonthDate1.setMonth(currentMonth - 1);
+      } else {
+      }
+      var previousMonth1 = previousMonthDate1.getMonth();
+      var previousYear1 = previousMonthDate1.getFullYear();
+
+      // 计算前三个月的年份和月份
+      var previousMonthDate = new Date();
+      if (currentDate.getDate() == 1) {
+        previousMonthDate.setMonth(currentMonth - 3);
+      } else {
+        previousMonthDate.setMonth(currentMonth - 2);
+      }
+      1;
+      var previousMonth = previousMonthDate.getMonth();
+      var previousYear = previousMonthDate.getFullYear();
+
+      //前三个月
+      if (previousYear1 == previousYear) {
+        var formattedPreviousMonth1 = previousYear1 + '-' + (previousMonth1 + 1);
+        // 格式化年份和月份
+        var formattedPreviousMonth = previousYear + '-' + (previousMonth + 1);
+        this.timeData =
+          formattedPreviousMonth.split('-')[1] + '-' + formattedPreviousMonth1.split('-')[1] + '月';
+      } else {
+        var formattedPreviousMonth1 = previousYear1 + '年' + (previousMonth1 + 1) + '月';
+        // .toString().padStart(2, '0');
+        // 格式化年份和月份
+        var formattedPreviousMonth = previousYear + '年' + (previousMonth + 1) + '月';
+        this.timeData = formattedPreviousMonth + '-' + formattedPreviousMonth1;
+      }
+    },
+    tabChange(name) {
+      this.tabVal = name;
+      buryingPoint({
+        systemModel: '门店列表',
+        buryingPointType: 6,
+        buryingPointValue: '门店拜访-下单SKU数',
+        buryingPointName: name == '0' ? '滚动三个月下单SKU' : '建议下单SKU',
+        buryingPointPosition: '门店ICON',
+      });
+      this.setListData();
+      // this.getMyInventoryList();
+    },
     onSelect(action) {
-      this.$router.push({path: "/material", query: {
-          tabVal:action
-        }
-      })
+      this.$router.push({
+        path: '/material',
+        query: {
+          tabVal: action,
+        },
+      });
     },
     getMyInventoryList() {
       let loading1 = this.$toast.loading({
@@ -54,19 +142,141 @@ export default {
         message: '加载中...',
         forbidClick: true,
       });
-      getItemList({storeCode:this.$route.query.id}).then(res => {
-        loading1.clear()
+      getItemList({ storeCode: this.$route.query.storeCode }).then((res) => {
+        loading1.clear();
         if (res.code == 200) {
           this.loading = false;
-          this.list = res.data
+          this.detail = res.data;
+          this.setListData();
         } else {
-          this.$toast.fail(res.msg)
+          this.$toast.fail(res.msg);
         }
-      })
+      });
+    },
+    setListData() {
+      this.list = this.tabVal == '0' ? this.detail.threeMonthItemList : this.detail.adviceItemList;
+    },
+    placeOrderFn() {
+      buryingPoint({
+        systemModel: '门店列表',
+        buryingPointType: 6,
+        buryingPointValue: '门店拜访-下单SKU数',
+        buryingPointName: '去下单',
+        buryingPointPosition: '门店ICON',
+      });
+      let loading1 = this.$toast.loading({
+        duration: 0,
+        message: '加载中...',
+        forbidClick: true,
+      });
+      getOrderUrlByStoreId({
+        storeId: this.$route.query.id,
+        from: this.$route.query.from || '',
+      }).then((res) => {
+        loading1.clear();
+        if (res.code == 200 && res.data) {
+          window.location.href = res.data;
+        } else {
+          this.Toast({
+            message: res.msg,
+            duration: 5000,
+          });
+        }
+      });
     },
     onClickLeft() {
-      this.$router.go(-1)
+      this.$router.go(-1);
     },
+  },
+};
+</script>
+
+<style lang="scss">
+.productItem {
+  .container {
+    background-color: #fff;
+    padding-bottom: 30px;
+    .myTab {
+      margin-bottom: 10px;
+      .van-tabs__nav--card {
+        margin: 0 !important;
+        border-left: 0;
+        border-right: 0;
+      }
+      .van-tabs__wrap,
+      .van-tabs__nav--card {
+        height: 39px;
+      }
+      .van-tab {
+        line-height: 40px;
+      }
+    }
+    .myList {
+      .van-cell {
+        padding: 0;
+        &:after {
+          border-bottom: none;
+        }
+      }
+    }
+    .tips {
+      width: 94% !important;
+      margin: 0 auto;
+      padding-bottom: 10px;
+      p {
+        line-height: 25px;
+        margin: 0;
+      }
+    }
   }
 }
-</script>
+</style>
+<style lang="scss">
+.productItem {
+  .table-headermd1 {
+    font-size: 16px;
+    text-align: center;
+    position: initial;
+    width: 94% !important;
+    margin: 0 auto;
+  }
+
+  .table-headermd1 .el-table__header,
+  .table-headermd1 .el-table__body {
+    width: 100% !important;
+  }
+
+  // .table-headermd1 col {
+  //   width: 5.8rem;
+  // }
+
+  .table-headermd1 col:nth-child(2),
+  .table-headermd1 col:nth-child(4),
+  // .table-headermd1 col:nth-child(3) {
+  //   width: 5rem;
+  // }
+
+  .table-headermd1 .van-cell {
+    padding: 0 4px;
+    height: 100%;
+  }
+
+  .table-headermd1 th.el-table__cell > .cell {
+    padding: 0 4px;
+  }
+
+  .table-headermd1 th.el-table__cell {
+    background-color: #f3f9ff;
+    color: #000;
+  }
+
+  .table-headermd1 .el-table__cell {
+    padding: 4px 0;
+  }
+  .el-table__body {
+    .cell {
+      font-size: 14px;
+    }
+  }
+}
+</style>

src/views/deviceOutside/rangeStore.vue

@@ -257,7 +257,7 @@
                   </div>
                   <div
                     class="visitStoreIco"
-                    v-if="info.storeLabels.zysslNums"
+                    v-if="info.storeLabels.zysslNums !== false"
                     style="background-color: #fff; position: relative"
                     slot="reference">
                     <p
@@ -934,7 +934,7 @@ export default {
     linkList(val) {
       this.$router.push({
         path: '/pItem',
-        query: { id: val.storeCode, detilId: 'a' },
+        query: { id: val.storeId, detilId: 'a', from: 'outPlan', storeCode: val.storeCode },
       });
     },
     linkimg(val) {

src/views/deviceOutside/topStore.vue

@@ -153,7 +153,7 @@
                       </div>
                       <div
                         class="visitStoreIco"
-                        v-if="item.storeLabels.zysslNums"
+                        v-if="item.storeLabels.zysslNums !== false"
                         style="background-color: #fff; position: relative"
                         slot="reference">
                         <p
@@ -1039,7 +1039,7 @@ export default {
     linkList(val) {
       this.$router.push({
         path: '/pItem',
-        query: { id: val.storeCode, detilId: 'a' },
+        query: { id: val.storeId, detilId: 'a', from: 'topStore', storeCode: val.storeCode },
       });
     },
     linkimg(val) {

src/views/deviceWithin/addStoreVisit.vue

@@ -2866,7 +2866,7 @@ export default {
     this.putInCode = this.$route.query.putInCode;
     this.equipmentCode = this.$route.query.equipmentCode;
     this.inspectionType = this.$route.query.inspectionType;
-    this.photoIdentifyType = this.$route.query.photoIdentifyType;
+    // this.photoIdentifyType = this.$route.query.photoIdentifyType;
     this.storeGroupId = this.$route.query.storeGroupId + '';
     if (this.$route.query.photoType != null) {
       this.indexselect = 0;
@@ -2900,7 +2900,7 @@ export default {
     this.putInCode = this.$route.query.putInCode;
     this.equipmentCode = this.$route.query.equipmentCode;
     this.inspectionType = this.$route.query.inspectionType;
-    this.photoIdentifyType = this.$route.query.photoIdentifyType;
+    // this.photoIdentifyType = this.$route.query.photoIdentifyType;
     this.storeGroupId = this.$route.query.storeGroupId + '';
     if (this.$route.query.photoType != null) {
       this.indexselect = 0;
@@ -3363,6 +3363,7 @@ export default {
       console.log(params.id);
       getCollectionInfos(params).then((res) => {
         loading1.clear();
+        this.photoIdentifyType = res.data.photoIdentifyType || null;
         this.productTitles = res.data.productTitles; //产品类型表头数据
         var checkUnManage = res.data;
         var collectionItemLists = res.data.collectionItemList;
@@ -4918,90 +4919,92 @@ export default {
   font-size: 16px;
 }
 </style>
-<style>
-.table-headermd {
-  font-size: 12px;
-  text-align: center;
-  position: initial;
-  width: 98% !important;
-  margin: 0 auto;
-  border-right: 0;
-}
-.table-headermd .el-table__header,
-.table-headermd .el-table__body {
-  width: 100% !important;
-}
-.table-headermd col:nth-child(4) {
-  width: 5.6rem;
-}
-.table-headermd col:nth-child(2),
-.table-headermd col:nth-child(3) {
-  width: 4.6rem;
-}
-.table-headermdwl col:nth-child(2) {
-  width: auto;
-}
-.table-headermdwl col:nth-child(3) {
-  width: 4.6rem;
-}
-.table-headermd .van-cell {
-  padding: 0 4px;
-  height: 100%;
-}
-.table-headermd th.el-table__cell > .cell {
-  padding: 0 4px;
-  text-align: center;
-}
-.table-headermd th.el-table__cell:first-child > .cell {
-  text-align: left;
-}
-.table-headermd th.el-table__cell {
-  background-color: #1989fa;
-  color: #fff;
-}
-.table-headermd .el-table__cell {
-  padding: 4px 0;
-}
-.table-headermd.el-table .cell {
-  padding: 0;
-}
-.table-headermd .tipTitle {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
-}
-.table-headermd::before {
-  height: 0;
-}
-.xing {
-  color: red;
-  padding-left: 4px;
-}
-.formLabel .van-radio__label,
-.formLabel .van-checkbox__label {
-  font-size: 1.4rem;
-}
-.table-headermd .cell,
-.el-table--border .el-table__cell:first-child .cell {
-  padding: 0 4px;
-}
-.isTableMust {
-  padding: 4px;
-  color: #999;
-  margin: 0;
-  margin-top: -10px;
-}
-.mobile-input .van-field__control {
-  font-size: 12px;
-  color: #999;
-  border: 0;
-}
-.formLabel .mobile-input {
-  border: 0 !important;
-}
-.addStoreVisit .van-dialog {
-  overflow: visible;
+<style lang="scss">
+.addStoreVisit {
+  .table-headermd {
+    font-size: 12px;
+    text-align: center;
+    position: initial;
+    width: 98% !important;
+    margin: 0 auto;
+    border-right: 0;
+  }
+  .table-headermd .el-table__header,
+  .table-headermd .el-table__body {
+    width: 100% !important;
+  }
+  .table-headermd col:nth-child(4) {
+    width: 5.6rem;
+  }
+  .table-headermd col:nth-child(2),
+  .table-headermd col:nth-child(3) {
+    width: 4.6rem;
+  }
+  .table-headermdwl col:nth-child(2) {
+    width: auto;
+  }
+  .table-headermdwl col:nth-child(3) {
+    width: 4.6rem;
+  }
+  .table-headermd .van-cell {
+    padding: 0 4px;
+    height: 100%;
+  }
+  .table-headermd th.el-table__cell > .cell {
+    padding: 0 4px;
+    text-align: center;
+  }
+  .table-headermd th.el-table__cell:first-child > .cell {
+    text-align: left;
+  }
+  .table-headermd th.el-table__cell {
+    background-color: #1989fa;
+    color: #fff;
+  }
+  .table-headermd .el-table__cell {
+    padding: 4px 0;
+  }
+  .table-headermd.el-table .cell {
+    padding: 0;
+  }
+  .table-headermd .tipTitle {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+  }
+  .table-headermd::before {
+    height: 0;
+  }
+  .xing {
+    color: red;
+    padding-left: 4px;
+  }
+  .formLabel .van-radio__label,
+  .formLabel .van-checkbox__label {
+    font-size: 1.4rem;
+  }
+  .table-headermd .cell,
+  .el-table--border .el-table__cell:first-child .cell {
+    padding: 0 4px;
+  }
+  .isTableMust {
+    padding: 4px;
+    color: #999;
+    margin: 0;
+    margin-top: -10px;
+  }
+  .mobile-input .van-field__control {
+    font-size: 12px;
+    color: #999;
+    border: 0;
+  }
+  .formLabel .mobile-input {
+    border: 0 !important;
+  }
+  .addStoreVisit .van-dialog {
+    overflow: visible;
+  }
 }
 </style>

src/views/deviceWithin/index.vue

@@ -139,7 +139,7 @@
                   </div>
                   <div
                     class="visitStoreIco"
-                    v-if="item.storeLabels.zysslNums"
+                    v-if="item.storeLabels.zysslNums !== false"
                     style="background-color: #fff; position: relative"
                     slot="reference">
                     <p
@@ -619,7 +619,7 @@ export default {
     linkList(val) {
       this.$router.push({
         path: '/pItem',
-        query: { id: val.storeCode, detilId: 'a' },
+        query: { id: val.storeId, detilId: 'a', from: 'inPlan', storeCode: val.storeCode },
       });
     },
     linkimg(val) {

src/views/historicalVisit/hisvistdeils.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="hisvistdeils">
     <!--        顶部条-->
     <van-nav-bar class="navBar" title="拜访任务详情" left-arrow @click-left="onClickLeft" />
     <!--right-text="保存"-->
@@ -553,83 +553,85 @@ export default {
   top: 50px;
 }
 </style>
-<style>
-.table-headermd {
-  font-size: 1.2rem;
-  text-align: center;
-  position: initial;
-  width: 94% !important;
-  margin: 0 auto;
-  border-right: 0;
-}
+<style lang="scss">
+.hisvistdeils {
+  .table-headermd {
+    font-size: 1.2rem;
+    text-align: center;
+    position: initial;
+    width: 94% !important;
+    margin: 0 auto;
+    border-right: 0;
+  }
 
-.table-headermd .el-table__header,
-.table-headermd .el-table__body {
-  width: 100% !important;
-}
+  .table-headermd .el-table__header,
+  .table-headermd .el-table__body {
+    width: 100% !important;
+  }
 
-.table-headermd col {
-  width: 5.8rem;
-}
+  .table-headermd col {
+    width: 5.8rem;
+  }
 
-.table-headermd col:nth-child(2),
-.table-headermd col:nth-child(4),
-.table-headermd col:nth-child(3) {
-  width: 5rem;
-}
+  .table-headermd col:nth-child(2),
+  .table-headermd col:nth-child(4),
+  .table-headermd col:nth-child(3) {
+    width: 5rem;
+  }
 
-.table-headermd .van-cell {
-  padding: 0 4px;
-  height: 100%;
-}
+  .table-headermd .van-cell {
+    padding: 0 4px;
+    height: 100%;
+  }
 
-.table-headermd th.el-table__cell > .cell {
-  padding: 0 4px;
-}
+  .table-headermd th.el-table__cell > .cell {
+    padding: 0 4px;
+  }
 
-.table-headermd th.el-table__cell {
-  background-color: #1989fa;
-  color: #fff;
-}
+  .table-headermd th.el-table__cell {
+    background-color: #1989fa;
+    color: #fff;
+  }
 
-.table-headermd .el-table__cell {
-  padding: 4px 0;
-}
+  .table-headermd .el-table__cell {
+    padding: 4px 0;
+  }
 
-.table-headermd .tipTitle {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
-}
+  .table-headermd .tipTitle {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+  }
 
-.table-headermd::before {
-  height: 0;
-}
+  .table-headermd::before {
+    height: 0;
+  }
 
-.f-right {
-  text-align: right;
-  margin: 0;
-}
+  .f-right {
+    text-align: right;
+    margin: 0;
+  }
 
-.mg0 {
-  margin: 6px 10px;
-  color: #909090;
-  font-size: 14px;
-}
+  .mg0 {
+    margin: 6px 10px;
+    color: #909090;
+    font-size: 14px;
+  }
 
-.selesetText {
-  margin-bottom: 16px;
-}
+  .selesetText {
+    margin-bottom: 16px;
+  }
 
-.z-cells .van-cell__title {
-  font-weight: bold;
-  color: #4a4a4a;
-}
+  .z-cells .van-cell__title {
+    font-weight: bold;
+    color: #4a4a4a;
+  }
 
-.z-cells .van-cell {
-  padding-bottom: 0;
+  .z-cells .van-cell {
+    padding-bottom: 0;
+  }
 }
 </style>
 <style>

src/views/home/ABtarget.vue

@@ -843,7 +843,7 @@ export default {
   white-space: nowrap;
 }
 </style>
-<style>
+<style lang="scss">
 .myTab .van-tabs__nav--card {
   margin: 0 !important;
   border-left: 0;
@@ -945,71 +945,73 @@ export default {
   border-top-left-radius: 60px;
   color: #fff;
 }
-.table-headermd {
-  font-size: 12px;
-  text-align: center;
-  position: initial;
-  width: 98% !important;
-  margin: 0 auto;
-  border-right: 0;
-}
-.table-headermdhome {
-  font-size: 14px;
-}
-.table-headermdhome th.el-table__cell > .cell {
-  white-space: pre;
-}
-.table-headermd .el-table__header,
-.table-headermd .el-table__body {
-  width: 100% !important;
-}
-.table-headermdhome.van-cell {
-  padding: 0 6px;
-  height: 100%;
-}
+.ABtarage {
+  .table-headermd {
+    font-size: 12px;
+    text-align: center;
+    position: initial;
+    width: 98% !important;
+    margin: 0 auto;
+    border-right: 0;
+  }
+  .table-headermdhome {
+    font-size: 14px;
+  }
+  .table-headermdhome th.el-table__cell > .cell {
+    white-space: pre;
+  }
+  .table-headermd .el-table__header,
+  .table-headermd .el-table__body {
+    width: 100% !important;
+  }
+  .table-headermdhome.van-cell {
+    padding: 0 6px;
+    height: 100%;
+  }
 
-.table-headermd th.el-table__cell > .cell {
-  padding: 0 4px;
-  text-align: center;
-}
+  .table-headermd th.el-table__cell > .cell {
+    padding: 0 4px;
+    text-align: center;
+  }
 
-.table-headermdhometh.el-table__cell:first-child > .cell {
-  text-align: left;
-}
+  .table-headermdhometh.el-table__cell:first-child > .cell {
+    text-align: left;
+  }
 
-.table-headermd th.el-table__cell {
-  background-color: #1989fa;
-  color: #fff;
-}
-.table-headermdhome th.el-table__cell {
-  background-color: #fff;
-  color: #444;
-}
-.table-headermd .el-table__cell {
-  padding: 4px 0;
-}
+  .table-headermd th.el-table__cell {
+    background-color: #1989fa;
+    color: #fff;
+  }
+  .table-headermdhome th.el-table__cell {
+    background-color: #fff;
+    color: #444;
+  }
+  .table-headermd .el-table__cell {
+    padding: 4px 0;
+  }
 
-.table-headermdhome.el-table .cell {
-  padding: 0 4px;
-  text-align: center;
-}
+  .table-headermdhome.el-table .cell {
+    padding: 0 4px;
+    text-align: center;
+  }
 
-.table-headermdhome .tipTitle {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
-  text-align: center;
-}
+  .table-headermdhome .tipTitle {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    text-align: center;
+  }
 
-.table-headermd::before {
-  height: 0;
-}
+  .table-headermd::before {
+    height: 0;
+  }
 
-.table-headermd .cell,
-.el-table--border .el-table__cell:first-child .cell {
-  padding: 0 4px;
+  .table-headermd .cell,
+  .el-table--border .el-table__cell:first-child .cell {
+    padding: 0 4px;
+  }
 }
 .colBack {
   width: 100%;

src/views/home/hintTabPage/unCreateStore.vue

@@ -80,7 +80,7 @@
                           </div>
                           <div
                             class="visitStoreIco"
-                            v-if="item.storeLabels.zysslNums"
+                            v-if="item.storeLabels.zysslNums !== false"
                             style="background-color: #fff; position: relative"
                             slot="reference">
                             <p
@@ -345,7 +345,7 @@ export default {
     linkList(val) {
       this.$router.push({
         path: '/pItem',
-        query: { id: val.storeCode, detilId: 'a' },
+        query: { id: val.storeId, detilId: 'a', storeCode: val.storeCode },
       });
     },
     linkimg(val) {

src/views/my/material.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="bgcolor">
+  <div class="bgcolor material">
     <div class="navBarTOP">
       <!--        顶部条-->
       <van-nav-bar class="navBar" :title="title" left-arrow @click-left="onClickLeft">
@@ -256,106 +256,108 @@ export default {
   padding-bottom: 50px;
 }
 </style>
-<style>
-.table-headermd {
-  font-size: 12px;
-  text-align: center;
-  position: initial;
-  width: 98% !important;
-  margin: 0 auto;
-  border-right: 0;
-}
+<style lang="scss">
+.material {
+  .table-headermd {
+    font-size: 12px;
+    text-align: center;
+    position: initial;
+    width: 98% !important;
+    margin: 0 auto;
+    border-right: 0;
+  }
 
-.table-headermd .el-table__header,
-.table-headermd .el-table__body {
-  width: 100% !important;
-}
-.table-headermd col:nth-child(4) {
-  width: 5.6rem;
-}
+  .table-headermd .el-table__header,
+  .table-headermd .el-table__body {
+    width: 100% !important;
+  }
+  .table-headermd col:nth-child(4) {
+    width: 5.6rem;
+  }
 
-.table-headermd col:nth-child(3) {
-  width: 4.6rem;
-}
+  .table-headermd col:nth-child(3) {
+    width: 4.6rem;
+  }
 
-.table-headermd .van-cell {
-  padding: 0 4px;
-  height: 100%;
-}
+  .table-headermd .van-cell {
+    padding: 0 4px;
+    height: 100%;
+  }
 
-.table-headermd th.el-table__cell > .cell {
-  padding: 0 4px;
-  text-align: center;
-}
+  .table-headermd th.el-table__cell > .cell {
+    padding: 0 4px;
+    text-align: center;
+  }
 
-.table-headermd th.el-table__cell:first-child > .cell {
-  text-align: left;
-}
+  .table-headermd th.el-table__cell:first-child > .cell {
+    text-align: left;
+  }
 
-.table-headermd th.el-table__cell {
-  background-color: #1989fa;
-  color: #fff;
-}
+  .table-headermd th.el-table__cell {
+    background-color: #1989fa;
+    color: #fff;
+  }
 
-.table-headermd .el-table__cell {
-  padding: 4px 0;
-}
+  .table-headermd .el-table__cell {
+    padding: 4px 0;
+  }
 
-.table-headermd.el-table .cell {
-  padding: 0;
-}
+  .table-headermd.el-table .cell {
+    padding: 0;
+  }
 
-.table-headermd .tipTitle {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
-}
+  .table-headermd .tipTitle {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+  }
 
-.table-headermd::before {
-  height: 0;
-}
+  .table-headermd::before {
+    height: 0;
+  }
 
-.xing {
-  color: red;
-  padding-left: 4px;
-}
+  .xing {
+    color: red;
+    padding-left: 4px;
+  }
 
-.formLabel .van-radio__label,
-.formLabel .van-checkbox__label {
-  font-size: 1.4rem;
-}
+  .formLabel .van-radio__label,
+  .formLabel .van-checkbox__label {
+    font-size: 1.4rem;
+  }
 
-.table-headermd .cell,
-.el-table--border .el-table__cell:first-child .cell {
-  padding: 0 4px;
-}
+  .table-headermd .cell,
+  .el-table--border .el-table__cell:first-child .cell {
+    padding: 0 4px;
+  }
 
-.van-dialog__confirm,
-.van-dialog__confirm:active {
-  color: #1989fa;
-}
+  .van-dialog__confirm,
+  .van-dialog__confirm:active {
+    color: #1989fa;
+  }
 
-.navBarTOP {
-  position: fixed;
-  width: 100%;
-  z-index: 2;
-  top: 0;
-}
+  .navBarTOP {
+    position: fixed;
+    width: 100%;
+    z-index: 2;
+    top: 0;
+  }
 
-.isTableMust {
-  padding: 4px;
-  color: #999;
-  margin: 0;
-  margin-top: -10px;
-}
-.mobile-input .van-field__control {
-  font-size: 12px;
-  color: #999;
-  border: 0;
-}
-.formLabel .mobile-input {
-  border: 0 !important;
+  .isTableMust {
+    padding: 4px;
+    color: #999;
+    margin: 0;
+    margin-top: -10px;
+  }
+  .mobile-input .van-field__control {
+    font-size: 12px;
+    color: #999;
+    border: 0;
+  }
+  .formLabel .mobile-input {
+    border: 0 !important;
+  }
 }
 </style>

src/views/storeManagement/index.vue

@@ -157,7 +157,7 @@
                     </div>
                     <div
                       class="visitStoreIco"
-                      v-if="item.storeLabels.zysslNums"
+                      v-if="item.storeLabels.zysslNums !== false"
                       style="background-color: #fff; position: relative"
                       slot="reference">
                       <p
@@ -535,7 +535,7 @@ export default {
       localStorage.setItem('tabVal', this.tabVal);
       this.$router.push({
         path: '/pItem',
-        query: { id: val.storeCode, detilId: 'a' },
+        query: { id: val.storeId, detilId: 'a', storeCode: val.storeCode },
       });
     },
     linkimg(val) {

src/views/storeManagement/storeAddress.vue

@@ -123,7 +123,7 @@ export default {
     linkList(val) {
       this.$router.push({
         path: '/pItem',
-        query: { id: val.storeCode, detilId: 'a' },
+        query: { id: val.storeId, detilId: 'a', storeCode: val.storeCode },
       });
     },
     onLoad() {

src/views/week/SUPTaskApproval/SUPTaskApprovalDetail.vue

@@ -367,82 +367,84 @@ export default {
 }
 </style>
 <style lang="scss">
-.table-headermd {
-  font-size: 1.2rem;
-  text-align: center;
-  position: initial;
-  width: 94% !important;
-  margin: 0 auto;
-  border-right: 0;
-}
+.SUPTaskApprovalDetail {
+  .table-headermd {
+    font-size: 1.2rem;
+    text-align: center;
+    position: initial;
+    width: 94% !important;
+    margin: 0 auto;
+    border-right: 0;
+  }
 
-.table-headermd .el-table__header,
-.table-headermd .el-table__body {
-  width: 100% !important;
-}
+  .table-headermd .el-table__header,
+  .table-headermd .el-table__body {
+    width: 100% !important;
+  }
 
-.table-headermd col {
-  width: 5.8rem;
-}
+  .table-headermd col {
+    width: 5.8rem;
+  }
 
-.table-headermd col:nth-child(2),
-.table-headermd col:nth-child(4),
-.table-headermd col:nth-child(3) {
-  width: 5rem;
-}
+  .table-headermd col:nth-child(2),
+  .table-headermd col:nth-child(4),
+  .table-headermd col:nth-child(3) {
+    width: 5rem;
+  }
 
-.table-headermd .van-cell {
-  padding: 0 4px;
-  height: 100%;
-}
+  .table-headermd .van-cell {
+    padding: 0 4px;
+    height: 100%;
+  }
 
-.table-headermd th.el-table__cell > .cell {
-  padding: 0 4px;
-}
+  .table-headermd th.el-table__cell > .cell {
+    padding: 0 4px;
+  }
 
-.table-headermd th.el-table__cell {
-  background-color: #1989fa;
-  color: #fff;
-}
+  .table-headermd th.el-table__cell {
+    background-color: #1989fa;
+    color: #fff;
+  }
 
-.table-headermd .el-table__cell {
-  padding: 4px 0;
-}
+  .table-headermd .el-table__cell {
+    padding: 4px 0;
+  }
 
-.table-headermd .tipTitle {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
-}
+  .table-headermd .tipTitle {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+  }
 
-.table-headermd::before {
-  height: 0;
-}
+  .table-headermd::before {
+    height: 0;
+  }
 
-.f-right {
-  text-align: right;
-  margin: 0;
-}
+  .f-right {
+    text-align: right;
+    margin: 0;
+  }
 
-.mg0 {
-  margin: 6px 10px;
-  color: #909090;
-  font-size: 14px;
-}
+  .mg0 {
+    margin: 6px 10px;
+    color: #909090;
+    font-size: 14px;
+  }
 
-.selesetText {
-  margin-bottom: 16px;
-}
+  .selesetText {
+    margin-bottom: 16px;
+  }
 
-.z-cells .van-cell__title {
-  font-weight: bold;
-  color: #4a4a4a;
-}
+  .z-cells .van-cell__title {
+    font-weight: bold;
+    color: #4a4a4a;
+  }
 
-.z-cells .van-cell {
-  padding-bottom: 0;
+  .z-cells .van-cell {
+    padding-bottom: 0;
+  }
 }
 .SUPTaskApprovalDetail {
   .newCarList {

src/views/week/SUPTaskApproval/detailItem.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="componVisitSummary">
+  <div class="componVisitSummary detailItem">
     <van-form ref="tabstoreVal">
       <div v-for="(item, index) in collectionItemList" :key="index">
         <div v-if="item.answerType == 'sz'" class="formLabel z-cell">
@@ -801,69 +801,70 @@ export default {
     text-align: right;
   }
 }
-.table-headermd {
-  font-size: 12px;
-  text-align: center;
-  position: initial;
-  width: 98% !important;
-  margin: 0 auto;
-  border-right: 0;
-}
+.detailItem {
+  .table-headermd {
+    font-size: 12px;
+    text-align: center;
+    position: initial;
+    width: 98% !important;
+    margin: 0 auto;
+    border-right: 0;
+  }
 
-.table-headermd .el-table__header,
-.table-headermd .el-table__body {
-  width: 100% !important;
-}
+  .table-headermd .el-table__header,
+  .table-headermd .el-table__body {
+    width: 100% !important;
+  }
 
-/*.table-headermd col {width: 6.8rem;}*/
-.table-headermd col:nth-child(4) {
-  width: 5.6rem;
-}
+  /*.table-headermd col {width: 6.8rem;}*/
+  .table-headermd col:nth-child(4) {
+    width: 5.6rem;
+  }
 
-.table-headermd col:nth-child(2),
-.table-headermd col:nth-child(3) {
-  width: 4.6rem;
-}
+  .table-headermd col:nth-child(2),
+  .table-headermd col:nth-child(3) {
+    width: 4.6rem;
+  }
 
-.table-headermd .van-cell {
-  padding: 0 4px;
-  height: 100%;
-}
+  .table-headermd .van-cell {
+    padding: 0 4px;
+    height: 100%;
+  }
 
-.table-headermd th.el-table__cell > .cell {
-  padding: 0 4px;
-  text-align: center;
-}
+  .table-headermd th.el-table__cell > .cell {
+    padding: 0 4px;
+    text-align: center;
+  }
 
-.table-headermd th.el-table__cell:first-child > .cell {
-  text-align: left;
-}
+  .table-headermd th.el-table__cell:first-child > .cell {
+    text-align: left;
+  }
 
-.table-headermd th.el-table__cell {
-  background-color: #1989fa;
-  color: #fff;
-}
+  .table-headermd th.el-table__cell {
+    background-color: #1989fa;
+    color: #fff;
+  }
 
-.table-headermd .el-table__cell {
-  padding: 4px 0;
-}
+  .table-headermd .el-table__cell {
+    padding: 4px 0;
+  }
 
-.table-headermd.el-table .cell {
-  padding: 0;
-}
+  .table-headermd.el-table .cell {
+    padding: 0;
+  }
 
-.table-headermd .tipTitle {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
-}
+  .table-headermd .tipTitle {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+  }
 
-.table-headermd::before {
-  height: 0;
+  .table-headermd::before {
+    height: 0;
+  }
 }
-
 .xing {
   color: red;
   padding-left: 4px;