Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

packages/conv/creditScore/AppGridMemberScore/components/gridScoreRules.vue

@@ -78,11 +78,11 @@
           </el-form-item> -->
 
           <el-form-item label="周期范围" prop="scoringCycle">
-            <ai-select v-model="form.scoringCycle" :selectList="$dict.getDict('integralRuleScoringCycle')"/>
+            <ai-select v-model="form.scoringCycle" :selectList="$dict.getDict('integralRuleScoringCycle')" :disabled="isOneAndTen"/>
           </el-form-item>
 
           <el-form-item label="奖励次数">
-            <el-input type="number" placeholder="请输入,周期范围内,不填写表示不限制" v-model.number="form.numberLimit" clearable/>
+            <el-input type="number" placeholder="请输入,周期范围内,不填写表示不限制" v-model.number="form.numberLimit" clearable :disabled="isOneAndTen"/>
           </el-form-item>
 
           <el-form-item label="积分分值" prop="integral">
@@ -241,6 +241,7 @@ export default {
       rulueType: "0",
       girdNameList: [],
       list: [],
+      isOneAndTen: false,
     };
   },
   created() {
@@ -352,6 +353,15 @@ export default {
     },
     handleTypeForm(v) {
       if (this.dialog) {
+        if(v[0] == '1' || v[0]== '10') {
+          this.form.scoringCycle = '0'
+          this.form.numberLimit = '1'
+          this.isOneAndTen = true
+        } else {
+          this.form.scoringCycle = ''
+          this.form.numberLimit = ''
+          this.isOneAndTen = false
+        }
         this.form.systemRuleId = v?.[v.length - 1];
       }
     },
@@ -367,7 +377,7 @@ export default {
     },
     getRulesList() {
       this.instance
-      .post(`/app/appintegralsystemrule/list?current=1&sizes=3000`)
+      .post(`/app/appintegralsystemrule/list?current=1&size=3000`)
       .then((res) => {
         if (res?.data) {
           this.rulesOps = this.toTree(res.data.records);

packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue

@@ -30,7 +30,7 @@
         </div>
         <div class="card">
           <h2>消耗积分</h2>
-          <p class="color1">{{ data.reduceIntegral || 0 }}</p>
+          <p class="color1">{{ Math.abs(data.reduceIntegral) || 0 }}</p>
         </div>
       </div>
       <div class="echertsBox">