From 6bbc40ef410f34c6c4b856a968ca4a3ef01aa62e Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 22 Mar 2022 19:39:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=BB=A7=E7=BB=AD=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../creditScore/scoreManage/pointsAppeal.vue  |  15 +-
 .../scoreManage/pointsDeclaration.vue         |  15 +-
 .../creditScore/scoreManage/pointsDetails.vue | 154 +++++++++---------
 .../creditScore/scoreManage/scoreChange.vue   |   2 +-
 .../scoreSupermarket/components/addOrder.vue  |  16 +-
 .../scoreSupermarket/orderManagement.vue      |  13 +-
 6 files changed, 110 insertions(+), 105 deletions(-)

diff --git a/project/xiushan/apps/creditScore/scoreManage/pointsAppeal.vue b/project/xiushan/apps/creditScore/scoreManage/pointsAppeal.vue
index 3457f1eb..47b06f7b 100644
--- a/project/xiushan/apps/creditScore/scoreManage/pointsAppeal.vue
+++ b/project/xiushan/apps/creditScore/scoreManage/pointsAppeal.vue
@@ -38,13 +38,12 @@
           </template>
           <template slot="right">
             <el-input
-                v-model="search.familyName"
+                v-model="search.portalUserPhone"
                 class="search-input"
                 size="mini"
                 placeholder="申诉人/申诉对象/..."
                 clearable
-                v-throttle="() => {page.current = 1, getList()}"
-                @clear="page.current = 1, getList()"
+                @change="page.current = 1, getList()"
                 suffix-icon="iconfont iconSearch"/>
           </template>
         </ai-search-bar>
@@ -144,8 +143,8 @@
             <span class="form_value">{{ rowInfo.declareObjName }}</span>
           </div>
           <div>
-            <span class="form_label">户主：</span>
-            <span class="form_value">{{ rowInfo.familyName }}</span>
+            <span class="form_label">用户账号：</span>
+            <span class="form_value">{{ rowInfo.portalUserPhone }}</span>
           </div>
         </div>
         <div class="form_info">
@@ -260,7 +259,7 @@ export default {
     return {
       search: {
         status: '',
-        familyName: '',
+        portalUserPhone: '',
         declareTimeStart: null,
         declareTimeEnd: null
       },
@@ -274,8 +273,8 @@ export default {
         {prop: "declareName", label: "申诉人", align: "center"},
         {prop: "declareObjName", label: "申诉对象", align: "center", hide: this.bizType == 1},
         {
-          prop: "familyName",
-          label: "户主",
+          prop: "portalUserPhone",
+          label: "用户账号",
         },
         {
           prop: "declareDescription",
diff --git a/project/xiushan/apps/creditScore/scoreManage/pointsDeclaration.vue b/project/xiushan/apps/creditScore/scoreManage/pointsDeclaration.vue
index d97cc066..25d15d1b 100644
--- a/project/xiushan/apps/creditScore/scoreManage/pointsDeclaration.vue
+++ b/project/xiushan/apps/creditScore/scoreManage/pointsDeclaration.vue
@@ -38,13 +38,12 @@
           </template>
           <template slot="right">
             <el-input
-                v-model="search.familyName"
+                v-model="search.portalUserPhone"
                 class="search-input"
                 size="mini"
                 placeholder="申诉人/申诉对象/..."
                 clearable
-                v-throttle="() => {page.current = 1, getList()}"
-                @clear="page.current = 1, getList()"
+                @change="page.current = 1, getList()"
                 suffix-icon="iconfont iconSearch"/>
           </template>
         </ai-search-bar>
@@ -138,8 +137,8 @@
             <span class="form_value">{{ rowInfo.declareObjName }}</span>
           </div>
           <div>
-            <span class="form_label">户主：</span>
-            <span class="form_value">{{ rowInfo.familyName }}</span>
+            <span class="form_label">用户账号：</span>
+            <span class="form_value">{{ rowInfo.portalUserPhone }}</span>
           </div>
         </div>
         <div class="form_info">
@@ -254,7 +253,7 @@ export default {
     return {
       search: {
         status: '',
-        familyName: '',
+        portalUserPhone: '',
         declareTimeStart: null,
         declareTimeEnd: null
       },
@@ -268,8 +267,8 @@ export default {
         {prop: "declareName", label: "申报人", align: "center"},
         {prop: "declareObjName", label: "申报对象", align: "center", hide: this.bizType == 1},
         {
-          prop: "familyName",
-          label: "户主",
+          prop: "portalUserPhone",
+          label: "用户账号",
         },
         {
           prop: "declareDescription",
diff --git a/project/xiushan/apps/creditScore/scoreManage/pointsDetails.vue b/project/xiushan/apps/creditScore/scoreManage/pointsDetails.vue
index c6d5e97d..f53784ea 100644
--- a/project/xiushan/apps/creditScore/scoreManage/pointsDetails.vue
+++ b/project/xiushan/apps/creditScore/scoreManage/pointsDetails.vue
@@ -4,35 +4,36 @@
       <template slot="content">
         <ai-search-bar bottomBorder>
           <template slot="left">
-            <el-date-picker size="small" v-model="searchDotime" type="daterange"  range-separator="至" @change="timeChange"
-              start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
+            <el-date-picker size="small" v-model="searchDotime" type="daterange" range-separator="至"
+                            @change="timeChange"
+                            start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss"
+                            format="yyyy-MM-dd"></el-date-picker>
           </template>
           <template slot="right">
             <el-input
-              v-model="search.familyName"
-              class="search-input"
-              size="small"
-              placeholder="对象、户主、事件类型"
-              clearable
-              v-throttle="() => {search.current = 1, getList()}"
-              @clear="search.current = 1, getList()"
-              suffix-icon="iconfont iconSearch" />
+                v-model="search.portalUserPhone"
+                class="search-input"
+                size="small"
+                placeholder="对象、用户账号、事件类型"
+                clearable
+                @change="search.current = 1, getList()"
+                suffix-icon="iconfont iconSearch"/>
           </template>
         </ai-search-bar>
         <ai-table
-          :tableData="tableData"
-          :col-configs="colConfigs"
-          :total="total"
-          ref="aitableex"
-          :current.sync="search.current"
-          :size.sync="search.size"
-          @getList="getList">
-          <el-table-column slot="changeIntegral" label="积分" align= "center">
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="total"
+            ref="aitableex"
+            :current.sync="search.current"
+            :size.sync="search.size"
+            @getList="getList">
+          <el-table-column slot="changeIntegral" label="积分" align="center">
             <template slot-scope="{ row }">
-              <span>{{row.changeIntegral > 0 ? '+' : ''}}{{row.changeIntegral}}</span>
+              <span>{{ row.changeIntegral > 0 ? '+' : '' }}{{ row.changeIntegral }}</span>
             </template>
           </el-table-column>
-          <el-table-column slot="doType" label="类型" align= "center">
+          <el-table-column slot="doType" label="类型" align="center">
             <template slot-scope="{ row }">
               <span>{{ dict.getLabel('integralDetailType', row.bizType) }}</span>
             </template>
@@ -40,10 +41,10 @@
           <el-table-column slot="options" label="操作" align="center" fixed="right" width="120">
             <template slot-scope="{ row }">
               <el-button
-                type="text"
-                title="详情"
-                :disabled="!$permissions('app_appvillagerintegraldetail_detail')"
-                @click="viewItem(row)">
+                  type="text"
+                  title="详情"
+                  :disabled="!$permissions('app_appvillagerintegraldetail_detail')"
+                  @click="viewItem(row)">
                 详情
               </el-button>
             </template>
@@ -52,25 +53,26 @@
       </template>
     </ai-list>
     <ai-dialog
-      title="详情"
-      :visible.sync="dialog.visible"
-      :customFooter="true"
-      :destroyOnClose="true"
-      width="720px"
+        title="详情"
+        :visible.sync="dialog.visible"
+        :customFooter="true"
+        :destroyOnClose="true"
+        width="720px"
     >
       <div class="form_content">
         <div class="form_info">
-          <span class="form_label">户主：</span>
-          <span class="form_value">{{dialogInfo.familyName}}</span>
+          <span class="form_label">用户账号：</span>
+          <span class="form_value">{{ dialogInfo.portalUserPhone }}</span>
         </div>
         <div class="form_info">
           <span class="form_label">事项：</span>
-          <span class="form_value">{{dialogInfo.ruleName}}</span>
+          <span class="form_value">{{ dialogInfo.ruleName }}</span>
         </div>
         <div class="form_flex form_info">
           <div>
             <span class="form_label">积分：</span>
-            <span class="form_value">{{dialogInfo.changeIntegral >= 0 ? '增加' : '减少'}}<span style="color:#2266FF">{{Math.abs(dialogInfo.changeIntegral)}}</span>分</span>
+            <span class="form_value">{{ dialogInfo.changeIntegral >= 0 ? '增加' : '减少' }}<span
+                style="color:#2266FF">{{ Math.abs(dialogInfo.changeIntegral) }}</span>分</span>
           </div>
           <!-- <div>
             <span class="form_label">途径：</span>
@@ -105,7 +107,7 @@ export default {
   props: {
     instance: Function,
     dict: Object,
-    areaId:String
+    areaId: String
   },
 
   data() {
@@ -114,24 +116,23 @@ export default {
       search: {
         current: 1,
         size: 10,
-        familyName: '',
+        portalUserPhone: '',
         doTimeStart: null,
         doTimeEnd: null
       },
       total: 10,
       colConfigs: [
-        { prop: "residentName", label: "对象", width:160 },
-        { prop: "familyName", label: "户主", align: "center", width:160 },
+        {prop: "portalUserPhone", label: "用户账号", align: "center", width: 160},
         {
           prop: "ruleName",
           label: "事件类型",
           "show-overflow-tooltip": true,
-          width:420
+          width: 420
         },
         {
           prop: "doTime",
           label: "时间",
-          width:200
+          width: 200
         },
         // {
         //   prop: "doType",
@@ -148,8 +149,8 @@ export default {
         //     );
         //   },
         // },
-        { slot: "doType", label: "类型", width: 100},
-        { slot: "changeIntegral", label: "积分", width: 100},
+        {slot: "doType", label: "类型", width: 100},
+        {slot: "changeIntegral", label: "积分", width: 100},
         // {
         //   prop: "bizType",
         //   label: "途径",
@@ -158,7 +159,7 @@ export default {
         //   formart: (bizType) =>
         //   this.$dict.getLabel("integralDetailBizType", bizType) || '-',
         // },
-        { slot: "options", label: "操作", align: "center" },
+        {slot: "options", label: "操作", align: "center"},
       ],
       tableData: [],
       dialog: {
@@ -170,39 +171,39 @@ export default {
 
   mounted() {
     this.$dict
-      .load([
-        "integralDeclareDoType",
-        "integralDetailType",
-        "integralDetailBizType"
-      ])
-      .then(() => {
-        this.getList();
-      });
+    .load([
+      "integralDeclareDoType",
+      "integralDetailType",
+      "integralDetailBizType"
+    ])
+    .then(() => {
+      this.getList();
+    });
   },
 
   methods: {
     getList() {
       this.instance
-        .post(`/app/appvillagerintegraldetail/list`, null, {
-          params: {
-            ...this.search,
-            areaId: this.areaId,
-          },
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            this.tableData = res.data.records;
-            this.total = res.data.total;
-          }
-        });
+      .post(`/app/appvillagerintegraldetail/list`, null, {
+        params: {
+          ...this.search,
+          areaId: this.areaId,
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.tableData = res.data.records;
+          this.total = res.data.total;
+        }
+      });
     },
 
     timeChange() {
-      if(this.searchDotime) {
-        this.search.doTimeStart =  this.searchDotime[0]
+      if (this.searchDotime) {
+        this.search.doTimeStart = this.searchDotime[0]
         this.search.doTimeEnd = this.searchDotime[1]
-      }else {
-        this.search.doTimeStart =  null
+      } else {
+        this.search.doTimeStart = null
         this.search.doTimeEnd = null
       }
       this.search.current = 1
@@ -212,18 +213,18 @@ export default {
     viewItem(row) {
       this.dialog.visible = true
       this.instance.post(`/app/appvillagerintegraldetail/queryDetailById?id=${row.id}`, null, {}).then((res) => {
-          if (res.code == 0) {
-            this.dialogInfo = res.data
-            console.log(this.dialogInfo)
-          }
-        });
+        if (res.code == 0) {
+          this.dialogInfo = res.data
+          console.log(this.dialogInfo)
+        }
+      });
     },
 
     onReset() {
       this.search.current = 1
-      this.search.doTimeStart =  null
+      this.search.doTimeStart = null
       this.search.doTimeEnd = null
-      this.search.familyName = ''
+      this.search.portalUserPhone = ''
       this.searchDotime = []
       this.getList();
     },
@@ -236,16 +237,20 @@ export default {
   height: 100%;
   background: #f3f6f9;
   overflow: auto;
+
   .form_content {
     .form_flex {
       display: flex;
+
       div {
         flex: 1;
       }
     }
+
     .form_info {
       margin-bottom: 8px;
     }
+
     .form_label {
       display: inline-block;
       color: #999;
@@ -253,6 +258,7 @@ export default {
       width: 70px;
       text-align: right;
     }
+
     .form_value {
       display: inline-block;
       color: #333;
@@ -264,10 +270,12 @@ export default {
       // }
     }
   }
+
   .form_div {
     padding-top: 24px;
     border-top: 1px solid #eee;
   }
+
   .status-0 {
     color: #FF4466;
   }
diff --git a/project/xiushan/apps/creditScore/scoreManage/scoreChange.vue b/project/xiushan/apps/creditScore/scoreManage/scoreChange.vue
index abfc0dc2..990785e1 100644
--- a/project/xiushan/apps/creditScore/scoreManage/scoreChange.vue
+++ b/project/xiushan/apps/creditScore/scoreManage/scoreChange.vue
@@ -102,7 +102,7 @@ export default {
     },
     colConfigs() {
       return [
-        {prop: "residentName", label: "姓名"},
+        {prop: "portalUserPhone", label: "用户账号"},
         {prop: "description", label: "调整说明"},
         {
           prop: "changeIntegral", label: "类型", align: "center",
diff --git a/project/xiushan/apps/creditScore/scoreSupermarket/components/addOrder.vue b/project/xiushan/apps/creditScore/scoreSupermarket/components/addOrder.vue
index 3f578d18..9bb3ef2b 100644
--- a/project/xiushan/apps/creditScore/scoreSupermarket/components/addOrder.vue
+++ b/project/xiushan/apps/creditScore/scoreSupermarket/components/addOrder.vue
@@ -203,8 +203,8 @@
           <template #content>
             <div class="info">
               <ai-wrapper label-width="70px" :columnsNumber="2">
-                <ai-info-item label="户主"><span>{{ detailInfo.familyName }}</span></ai-info-item>
-                <ai-info-item label="联系方式"><span>{{ detailInfo.familyPhone || "-" }}</span></ai-info-item>
+                <ai-info-item label="用户账号"><span>{{ detailInfo.portalUserPhone }}</span></ai-info-item>
+                <ai-info-item label="联系方式"><span>{{ detailInfo.portalUserPhone || "-" }}</span></ai-info-item>
               </ai-wrapper>
               <ai-wrapper label-width="70px" :columnsNumber="1">
                 <ai-info-item label="备注"><span>{{ detailInfo.remark || "-" }}</span></ai-info-item>
@@ -290,8 +290,8 @@ export default {
     return {
       forms: {
         shopId: "",
-        familyId: "",
-        familyName: "",
+        portalUserId: "",
+        portalUserPhone: "",
         name: "",
         memberId: "",
         merchandiseList: [],
@@ -389,15 +389,15 @@ export default {
   methods: {
     getSelect(val) {
       if (val) {
-        this.forms.familyName = val.familyName;
-        this.forms.familyId = val.familyId;
+        this.forms.portalUserPhone = val.portalUserPhone;
+        this.forms.portalUserId = val.portalUserId;
         this.forms.name = val.name;
         this.forms.memberId = val.id;
         this.forms.phone = val.phone;
         this.integral = val.integral;
       } else {
-        this.forms.familyName = "";
-        this.forms.familyId = "";
+        this.forms.portalUserPhone = "";
+        this.forms.portalUserId = "";
         this.forms.name = "";
         this.forms.memberId = "";
         this.forms.phone = "";
diff --git a/project/xiushan/apps/creditScore/scoreSupermarket/orderManagement.vue b/project/xiushan/apps/creditScore/scoreSupermarket/orderManagement.vue
index 796bbb8e..40a6988c 100644
--- a/project/xiushan/apps/creditScore/scoreSupermarket/orderManagement.vue
+++ b/project/xiushan/apps/creditScore/scoreSupermarket/orderManagement.vue
@@ -56,8 +56,7 @@
               v-model="searchObj.name"
               size="small"
               placeholder="订单号/商品名/兑换家庭"
-              v-throttle="() => {page.current = 1, getList()}"
-              @clear="page.current = 1, searchObj.name = '', getList()"
+              @change="page.current = 1, searchObj.name = '', getList()"
               clearable
               suffix-icon="iconfont iconSearch"
             />
@@ -131,11 +130,11 @@
               </ai-uploader>
             </template>
           </el-table-column>
-          <el-table-column label="兑换家庭" slot="familyName" align="left">
+          <el-table-column label="兑换家庭" slot="portalUserPhone" align="left">
             <template v-slot="{ row }">
               <el-row>
-                <el-col style="width: 100%">{{ row.familyName }}</el-col>
-                <el-col style="color: #999999">{{ row.familyPhone }}</el-col>
+                <el-col style="width: 100%">{{ row.portalUserPhone }}</el-col>
+                <el-col style="color: #999999">{{ row.portalUserPhone }}</el-col>
               </el-row>
             </template>
           </el-table-column>
@@ -282,10 +281,10 @@
             label: "消耗积分",
           },
           {
-            prop: "familyName",
+            prop: "portalUserPhone",
             align: "center",
             label: "兑换家庭",
-            slot: "familyName",
+            slot: "portalUserPhone",
           },
           {
             prop: "createUserName",