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

src/views/storeManagement/FSQattributeDetail.vue

@@ -3,9 +3,9 @@
     <van-field
       readonly
       v-model="storeArchives.estimateSalesYearTarget"
-      label="年预估销额目标/千元:" />
+      label="年预估销额目标（单位：千元）:" />
     <van-field readonly v-model="storeArchives.zgwqWorkerNum" label="旗下质感外墙工人数量:" />
-    <van-field readonly v-model="storeArchives.projectYearNum" label="年承接项目数量:" />
+    <van-field readonly v-model="storeArchives.projectYearNum" label="年预估承接项目数量:" />
     <van-field
       readonly
       autosize
@@ -25,7 +25,7 @@
       v-if="storeArchives.operateCompetitor == '是'"
       readonly
       v-model="storeArchives.mainCompetitorSalesYear"
-      label="主营竞品年销售额/千元:" />
+      label="竞品年销额（单位：千元）:" />
   </div>
 </template>
 <script>

src/views/storeManagement/FSQattributeEdit.vue

@@ -5,8 +5,14 @@
         <van-field
           v-model="detail.estimateSalesYearTarget"
           type="number"
-          :rules="[{ required: true, message: '请输入年预估销额目标/千元' }]"
-          label="年预估销额目标/千元:">
+          :rules="[
+            {
+              validator: estimateSalesYearTargetValidator,
+              required: true,
+              message: '年预估销额目标必须大于或等于30',
+            },
+          ]"
+          label="年预估销额目标（单位：千元）:">
           <template #left-icon>
             <span class="van-f-red">*</span>
           </template>
@@ -14,7 +20,13 @@
         <van-field
           v-model="detail.zgwqWorkerNum"
           type="number"
-          :rules="[{ required: true, message: '请输入旗下质感外墙工人数量' }]"
+          :rules="[
+            {
+              validator: zgwqWorkerNumValidator,
+              required: true,
+              message: '旗下质感外墙工人数量必须大于0',
+            },
+          ]"
           label="旗下质感外墙工人数量:">
           <template #left-icon>
             <span class="van-f-red">*</span>
@@ -23,8 +35,14 @@
         <van-field
           v-model="detail.projectYearNum"
           type="number"
-          :rules="[{ required: true, message: '请输入年承接项目数量' }]"
-          label="年承接项目数量:">
+          :rules="[
+            {
+              validator: zgwqWorkerNumValidator,
+              required: true,
+              message: '年预估承接项目数量必须大于0',
+            },
+          ]"
+          label="年预估承接项目数量:">
           <template #left-icon>
             <span class="van-f-red">*</span>
           </template>
@@ -48,14 +66,27 @@
           label="主营竞品品牌:"
           autosize
           rows="2"
+          :rules="[
+            {
+              validator: mainCompetitorBrandValidator,
+              required: true,
+              message: '至少一个汉字',
+            },
+          ]"
           type="textarea">
         </van-field>
         <van-field
           v-if="detail.operateCompetitor == '是'"
           v-model="detail.mainCompetitorSalesYear"
           type="number"
-          :rules="[{ required: true, message: '请输入主营竞品年销售额/千元' }]"
-          label="主营竞品年销售额/千元:">
+          :rules="[
+            {
+              validator: zgwqWorkerNumValidator,
+              required: true,
+              message: '竞品年销额必须大于0',
+            },
+          ]"
+          label="竞品年销额（单位：千元）:">
           <template #left-icon>
             <span class="van-f-red">*</span>
           </template>
@@ -92,6 +123,15 @@ export default {
     },
   },
   methods: {
+    estimateSalesYearTargetValidator(val) {
+      return val >= 30;
+    },
+    zgwqWorkerNumValidator(val) {
+      return val >= 0;
+    },
+    mainCompetitorBrandValidator(val) {
+      return /[\u4e00-\u9fa5]/.test(val);
+    },
     onSubmit(value) {
       this.toastLoading(0, '加载中...', true);
       let params = {