Merge branch 'preview' into dev

epmet-oper-web/src/views/modules/customer/manage/customer-add-or-update.vue

@@ -12,7 +12,7 @@
       @keyup.enter.native="dataFormSubmitHandle()"
       :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'"
     >
-      <el-form-item label="客户名称" prop="paCustomer.customerName">
+      <el-form-item label="客户名称" prop="customerName">
         <el-input
           v-model="dataForm.paCustomer.customerName"
           placeholder="客户名称"
@@ -110,13 +110,19 @@
       <el-form-item label="联系方式" prop="paUser.phone">
         <el-input
           v-model="dataForm.paUser.phone"
-          placeholder="联系方式"
+          placeholder="超级管理员联系方式"
         ></el-input>
       </el-form-item>
-      <el-form-item label="证件号" prop="paUser.idCard">
+      <el-form-item label="超级管理员证件号" prop="paUser.idCard">
         <el-input
           v-model="dataForm.paUser.idCard"
-          placeholder="证件号"
+          placeholder="超级管理员证件号"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="电子门牌uri前缀" prop="houseQrcodePre">
+        <el-input
+          v-model="dataForm.houseQrcodePre"
+          placeholder="电子门牌uri前缀"
         ></el-input>
       </el-form-item>
     </el-form>
@@ -142,6 +148,7 @@ export default {
       visible: false,
       dataForm: {
         id: "",
+        houseQrcodePre: "",
         paAgency: {
           logo: "",
           agencyName: "",
@@ -192,37 +199,28 @@ export default {
       ],
 
       functionList: [],
-    };
+
-  },
+      // 校验规则
-  components: {
+      dataRule: {
-    CForm,
+        "logo": [
-    CDialog,
-  },
-  created() {
-    this.queryFunctionList();
-  },
-  computed: {
-    dataRule() {
-      return {
-        logo: [
           {
             required: false,
             message: this.$t("validate.required"),
             trigger: "blur",
           },
         ],
-        "paCustomer.customerName": [
+        "customerName": [
           {
             required: true,
             message: "客户名称必填",
-            trigger: "blue",
+            trigger: "blur",
           },
         ],
         "paAgency.agencyName": [
             {
                 required: true,
                 message: '根级组织名称必填',
-                trigger: 'blue'
+                trigger: 'blur'
             }
         ],
         "paAgency.level": [
@@ -236,46 +234,63 @@ export default {
             {
                 required: true,
                 message: '组织地区码必填',
-                trigger: 'blue'
+                trigger: 'blur'
             }
         ],
         "paAgency.province": [
             {
                 required: true,
                 message: '组织省份必填',
-                trigger: 'blue'
+                trigger: 'blur'
             }
         ],
         "paUser.realName": [
             {
                 required: true,
                 message: '管理员姓名必填',
-                trigger: 'blue'
+                trigger: 'blur'
             }
         ],
         "paUser.phone": [
             {
                 required: true,
                 message: '管理员电话必填',
-                trigger: 'blue'
+                trigger: 'blur'
             }
         ],
         "paUser.idCard": [
             {
                 required: true,
                 message: '管理员证件号必填',
-                trigger: 'blue'
+                trigger: 'blur'
             }
         ],
         "paAgency.validityTime": [
             {
                 required: true,
-                message: '必填',
+                message: '有效期必填',
-                trigger: 'change'
+                trigger: 'blur'
+            }
+        ],
+        "houseQrcodePre": [
+            {
+                required: true,
+                message: '二维码uri前缀必填',
+                trigger: 'blur'
             }
         ]
+      }
     };
   },
+  components: {
+    CForm,
+    CDialog,
+  },
+  created() {
+    // this.queryFunctionList();
+  },
+  computed: {
+    
   },
   methods: {
     // 上传logo成功
@@ -319,11 +334,6 @@ export default {
             return false;
           }
 
-          if (true) {
-            this.$message.info("成功");
-            return;
-          }
-
           console.log(this.dataForm);
           this.$http["post"]("/oper/crm/customer/initLocally", this.dataForm)
             .then(({ data: res }) => {