Merge remote-tracking branch 'origin/dev' into dev

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

@@ -4,7 +4,7 @@
       <template #content>
         <ai-search-bar>
           <template #left>
-            <el-button type="primary" size="small" icon="iconfont iconAdd" @click="dialog = true">批量调整积分</el-button>
+            <el-button type="primary" size="small" icon="iconfont iconAdd" @click="changeIntegral('',0)">批量调整积分</el-button>
             <el-cascader ref="cascader1" clearable v-model="search.girdId" :options="girdOptions" placeholder="所属网格" size="small" 
               :props="defaultProps" :show-all-levels="false" @change="gridChange"></el-cascader>
           </template>
@@ -37,7 +37,7 @@
           </el-table-column>
           <el-table-column slot="options" label="操作"  align="center">
             <template slot-scope="{ row }">
-              <el-button type="text" @click="dialog = true">调整积分</el-button>
+              <el-button type="text" @click="changeIntegral(row,1)">调整积分</el-button>
               <el-button type="text" @click="toDetail(row.id)">详情</el-button>
             </template>
           </el-table-column>
@@ -45,15 +45,15 @@
       </template>
     </ai-list>
     <ai-dialog
-        title="添加积分调整"
+        title="调整积分"
         :visible.sync="dialog"
         :destroyOnClose="true"
         width="720px"
         @onConfirm="onConfirm"
-        @closed="form={}">
+        @closed="form={},chooseUserList=[]">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="选择人员" prop="residentId">
-          <ai-person-select :instance="instance" :customClicker="true"
+          <ai-person-select :instance="instance" :customClicker="true" :chooseUserList="chooseUserList"
                             :url="'/app/appgirdmemberinfo/list?size=10'"
                             :isMultiple="true" dialogTitle="选择" @selectPerson="selectPerson">
             <template name="option" v-slot:option="{ item }">
@@ -119,6 +119,7 @@ export default {
         value: 'id',
         checkStrictly: true,
       },
+      chooseUserList: []
     }
   },
   created() {
@@ -154,7 +155,7 @@ export default {
           ...this.page,
           ...this.search,
           current: this.current,
-          
+
         }
       }).then(res => {
         if(res?.data) {
@@ -167,6 +168,7 @@ export default {
     selectPerson(val) {
       this.personList = val
       this.form.ids = this.personList.map(e => e.id)
+      // .concat(this.chooseUserList.map(v=>v.id))
       // if (val) {
       //   this.form.residentId = val.id
       //   this.personList = [{...val}]
@@ -175,6 +177,19 @@ export default {
       //   this.personList = []
       // }
     },
+    changeIntegral(row,type) {
+      console.log(row);
+      if(type==0) {
+        this.dialog = true
+      } else if(type ==1) {
+        this.chooseUserList = [{
+          id: row.id,
+          name: row.userName
+        }]
+        // this.personList = this.chooseUserList.map(e => e.id)
+        this.dialog = true
+      }
+    },
     getGridList() {
       this.instance.post(`/app/appgirdinfo/listAll3`).then((res) => {
         if (res.code == 0) {
@@ -211,7 +226,7 @@ export default {
     },
 
     changeTableSort(col) {
-      // console.log(col);
+      console.log(col);
       if(col.prop === 'integral') { // 剩余积分
         // col.order === 'ascending' &&
         // col.order === 'descending' &&

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

@@ -431,13 +431,13 @@ export default {
         .post(`/app/appgirdinfo/listAll3`, null, null)
         .then((res) => {
           if (res.code == 0) {
-            res.data.forEach((item)=>{
-              const isChecked = this.girdInfoList.find((checkedId)=>{
-                return item.id === checkedId
-              })
-              if(isChecked) item.checkType = true
-            })
-            console.log(res.data)
+            // res.data.forEach((item)=>{
+            //   const isChecked = this.girdInfoList.find((checkedId)=>{
+            //     return item.id === checkedId
+            //   })
+            //   if(isChecked) item.checkType = true
+            // })
+            // console.log(res.data)
 
             this.treeObj.treeList = this.girdToTree(res.data);
             this.girdInfoList.map((e) => {

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

@@ -97,7 +97,7 @@
             <ai-info-item label="积分变动">{{ details.integralCalcType==0? '-' : '+' }}{{ details.changeIntegral }}</ai-info-item>
             <ai-info-item label="积分余额" :value="details.nowIntegral"/>
             <ai-info-item label="凭证" isLine v-if="fileDownLoad.length">
-              <ai-file-list :fileList="fileDownLoad" style="width: 200px;" :fileOps="fileOps"></ai-file-list>
+              <ai-file-list :fileList="fileDownLoad" style="width: 200px;" :fileOps="{name: 'name'}"></ai-file-list>
             </ai-info-item>
           </ai-wrapper>
         </template>
@@ -168,9 +168,6 @@ export default {
       userSortListY: [],
       girdSortListX: [],
       girdSortListY: [],
-      fileOps: {
-        name: ''
-      },
     }
   },
   computed: {
@@ -450,9 +447,11 @@ export default {
         if(res?.data) {
           this.details = res.data
           if(res.data.enclosure) {
-            this.fileDownLoad = [{ url:res.data.enclosure }]
             let str = res.data.enclosure.split('/')
-            this.fileOps.name = str?.[str.length - 1]
+            this.fileDownLoad = [{ 
+              url:res.data.enclosure,
+              name: str?.[str.length - 1]
+            }]
           }
         }
       })