Merge branch 'blueBranch' into allTestUrgent

src/Form/salerPrivatecustomer/add.vue

@@ -642,6 +642,12 @@ export default {
             trigger: "change",
           },
         ],
+        customergrade: [
+          { required:JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY'?true:false, message: this.$t('请选择客户分类'), trigger: 'change' },
+        ],
+        industry: [
+          { required:JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY'?true:false, message: this.$t('请选择客户行业'), trigger: 'change' },
+        ],
       },
       customerParam: {
         id: 20220920083901,

src/Form/salerPrivatecustomer/edit.vue

@@ -100,7 +100,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('客户分类') + ':'">
+              <el-form-item :label="$t('客户分类') + ':'" prop="customergrade">
                 <el-select
                   v-model="form.customergrade"
                   :placeholder="$t('请选择客户分类')"
@@ -124,7 +124,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('客户行业') + ':'">
+              <el-form-item :label="$t('客户行业') + ':'" prop="industry">
                 <el-select
                   ref="sle"
                   style="width: 100%"
@@ -625,6 +625,12 @@ export default {
             trigger: "change",
           },
         ],
+        customergrade: [
+          { required:JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY'?true:false, message: this.$t('请选择客户分类'), trigger: 'change' },
+        ],
+        industry: [
+          { required:JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY'?true:false, message: this.$t('请选择客户行业'), trigger: 'change' },
+        ],
       },
       areaCode: "",
       telephone: "",

src/SManagement/orderclue_detail/components/changeCustomer.vue

@@ -347,6 +347,12 @@ export default {
           { required: true, message: this.$t('请输入座机电话'), trigger: 'change' },
           { pattern:/^0\d{2,3}-\d{7,8}$/, message: this.$t('请输入正确座机电话'),trigger: 'change' }
         ],
+        customergrade: [
+          { required:JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY'?true:false, message: this.$t('请选择客户分类'), trigger: 'change' },
+        ],
+        industry: [
+          { required:JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY'?true:false, message: this.$t('请选择客户行业'), trigger: 'change' },
+        ],
       },
       form:{
         "sat_orderclueid": '',