Merge branch 'feature_20260319_质感服务商拜访任务' into uat(dev)

src/views/storeManagement/FSQStoreEdit.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="FSQStoreDetail">
+  <div class="FSQStoreDetailCont">
     <div class="header">
       <van-nav-bar
         class="navBar"
@@ -269,8 +269,8 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-.FSQStoreDetail {
+<style lang="scss">
+.FSQStoreDetailCont {
   display: flex;
   flex-direction: column;
   width: 100%;
@@ -296,6 +296,15 @@ export default {
     flex: 1;
     overflow-y: auto;
   }
+  .myTab {
+    height: 100%;
+    .van-tabs__content {
+      height: 100%;
+      .van-tab__pane {
+        height: 100%;
+      }
+    }
+  }
   .myTab .van-tabs__nav--card {
     margin: 0 !important;
     border-left: 0;
@@ -308,7 +317,7 @@ export default {
   }
 
   .myTab .van-tab {
-    line-height: 40px;
+    // line-height: 40px;
   }
 
   .van-f-red {

src/views/storeManagement/FSQattributeEdit.vue

@@ -1,12 +1,12 @@
 <template>
-  <div class="FSQattributeEdit">
+  <div class="FSQattributeEdit" v-if="detail">
     <div class="content">
       <van-form ref="tabstoreVal" @submit="onSubmit" @failed="onFailed">
         <van-field
           v-model="detail.estimateSalesYearTarget"
           type="number"
-          :rules="[{ required: true, message: '请输入年预估销额目标/干元' }]"
-          label="年预估销额目标/干元:">
+          :rules="[{ required: true, message: '请输入年预估销额目标/千元' }]"
+          label="年预估销额目标/千元:">
           <template #left-icon>
             <span class="van-f-red">*</span>
           </template>
@@ -46,20 +46,16 @@
           v-if="detail.operateCompetitor == '是'"
           v-model="detail.mainCompetitorBrand"
           label="主营竞品品牌:"
-          rows="1"
           autosize
-          :rules="[{ required: true, message: '请输入主营竞品品牌' }]"
+          rows="2"
           type="textarea">
-          <template #left-icon>
-            <span class="van-f-red">*</span>
-          </template>
         </van-field>
         <van-field
           v-if="detail.operateCompetitor == '是'"
           v-model="detail.mainCompetitorSalesYear"
           type="number"
-          :rules="[{ required: true, message: '请输入主营竞品年销售额/干元' }]"
-          label="主营竞品年销售额/干元:">
+          :rules="[{ required: true, message: '请输入主营竞品年销售额/千元' }]"
+          label="主营竞品年销售额/千元:">
           <template #left-icon>
             <span class="van-f-red">*</span>
           </template>
@@ -83,7 +79,7 @@ export default {
   },
   data() {
     return {
-      detail: {},
+      detail: null,
     };
   },
   watch: {
@@ -151,5 +147,8 @@ export default {
       width: 7em;
     }
   }
+  .van-form {
+    // height: 100%;
+  }
 }
 </style>