Merge branch 'feature_20251009_金牌店档案填写校验' into uat(dev)

# Conflicts:
#	src/views/storeManagement/JPattributeEditor.vue

src/views/storeManagement/JPattributeEditor.vue

@@ -51,18 +51,18 @@
           v-model="detail.totalSalesAmount"
           type="number"
           :error-message="totalSalesAmountMsg"
-          label="门店24年总进货额（含所有品牌品类）" />
+          label="门店24年总进货额(含所有品牌品类，单位:万元)" />
         <van-field
           v-model="detail.performanceRatio"
           type="number"
           :error-message="performanceRatioMsg"
-          label="门店立邦业绩占比(%)" />
+          label="门店立邦业绩占比(单位:%)" />
         <van-field
           v-model="detail.mainBrand"
           autosize
           type="textarea"
           :error-message="mainBrandMsg"
-          label="门店主营TOP3品牌" />
+          label="门店主营TOP3品牌(请填写具体品牌名称，非产品名称，比如:立邦，品牌之间用;隔开)" />
         <van-field label="是否有工地资源（支持工地配送，承接工地双包等）">
           <template #input>
             <van-radio-group
@@ -162,6 +162,10 @@ export default {
     };
   },
   activated() {
+    this.ownerNameMsg = '';
+    this.totalSalesAmountMsg = '';
+    this.performanceRatioMsg = '';
+    this.mainBrandMsg = '';
     this.detail = null;
     this.verificationVal = '';
     if (this.time) clearInterval(this.time);

src/views/storeManagement/storeDetail.vue

@@ -355,17 +355,17 @@
                 autosize
                 type="textarea"
                 v-model="list.storeArchives.totalSalesAmount"
-                label="门店24年总进货额（含所有品牌品类）" />
+                label="门店24年总进货额(含所有品牌品类，单位:万元)" />
               <van-field
                 readonly
                 v-model="list.storeArchives.performanceRatio"
-                label="门店立邦业绩占比(%)" />
+                label="门店立邦业绩占比(单位:%)" />
               <van-field
                 readonly
                 autosize
                 type="textarea"
                 v-model="list.storeArchives.mainBrand"
-                label="门店主营TOP3品牌" />
+                label="门店主营TOP3品牌(请填写具体品牌名称，非产品名称，比如:立邦，品牌之间用;隔开)" />
               <van-field
                 readonly
                 v-model="list.storeArchives.constructionResource"