From f7964ebe60f3c0753e7bfd7362b0f77ab68252e9 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 16 Aug 2022 10:49:10 +0800
Subject: [PATCH] 30832 30821

---
 .../components/gridScoreManage.vue             | 13 ++++++++-----
 .../components/gridScoreRules.vue              | 18 +++++++++++++++---
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
index 969e3754..3de1a713 100644
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
@@ -135,7 +135,7 @@ export default {
     colConfigs() {
       return [
         { prop: "userName", label: '姓名', align: "left",  },
-        { prop: "girdName", label: '所属网格', align: "center",  },
+        { prop: "girdName", label: '所属网格' },
         { slot: "integral", label: '积分余额', align: "center", },
         { slot: "totalIntegral", label: '累计积分', align: "center", },
         { slot: "usedIntegral", label: '已用积分', align: "center", },
@@ -148,7 +148,7 @@ export default {
         eventDesc: [{required: true, message: '请输入调整说明', trigger: 'blur'}],
         integralCalcType: [{required: true, message: '请选择类型', trigger: 'change'}],
         integral: [{required: true, message: '请输入积分', trigger: 'blur' },
-        {pattern: /^([1-9]\d*|0)(\.\d{1,2})?$/, message: '请输入正数且最多只能保留两位小数'}],
+        {pattern: /(^[1-9]{1}[0-9]*$)|(^[0-9]*\.[0-9]{2}$)/, message: '请输入正数且最多只能保留两位小数'}],
       }
     },
   },
@@ -315,9 +315,7 @@ export default {
     overflow-y: hidden;
   }
 
-  ::v-deep .selectCont .pagination {
-    width: 100%;
-  }
+  
 
   .userlist {
     display: inline-block;
@@ -371,5 +369,10 @@ export default {
       text-overflow: ellipsis;
     }
   }
+
+  ::v-deep .aipersonselect .ai-personselect .selectCont .pagination {
+    width: 100%!important;
+    background: pink;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue
index b7a80d2d..6ca28640 100644
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue
@@ -198,7 +198,7 @@ export default {
         integral: [
           {
             required: true,
-            pattern: /^([1-9]\d*|0)(\.\d{1,2})?$/,
+            pattern: /(^[1-9]{1}[0-9]*$)|(^[0-9]*\.[0-9]{2}$)/,
             message: "请输入积分分值,最多保留两位小数",
           },
         ],
@@ -234,6 +234,7 @@ export default {
         this.getList();
         this.getRulesList();
         this.beforeSelectTree();
+        this.getList12()
       });
   },
   methods: {
@@ -442,8 +443,10 @@ export default {
     // el-tree懒加载
     loadNode(node, resolve) {
       if (node.level === 0) {
-        this.instance.post('').then((res) => {
-          
+        this.instance.post('/app/appgirdinfo/listBy12').then((res) => {
+          if(res?.data) {
+            console.log(this.girdToTree(res.data))
+          }
         })
         let arr = node.childNodes;
         return resolve(arr);
@@ -454,6 +457,15 @@ export default {
       }
     },
 
+    // 加载一二级数据
+    getList12() {
+      this.instance.post('/app/appgirdinfo/listBy12').then((res) => {
+        if(res?.data) {
+          console.log(this.girdToTree(res.data))
+        }
+      })
+    },
+
     onCheckChange(e) {
       this.girdInfoList.forEach((v) => {
         if(v == e.id) {