From 61217e07b8c2ca7bf3d473e5b5a70f1090a9ea40 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 19 May 2022 17:52:51 +0800
Subject: [PATCH] BUG 29673

---
 .../scoreSupermarket/components/addOrder.vue  | 372 ++++-----
 .../scoreSupermarket/orderManagement.vue      | 716 +++++++++---------
 .../creditScore/scoreSysUser/ssuDetail.vue    |   2 +-
 3 files changed, 546 insertions(+), 544 deletions(-)

diff --git a/packages/conv/creditScore/scoreSupermarket/components/addOrder.vue b/packages/conv/creditScore/scoreSupermarket/components/addOrder.vue
index c314f437..80d63c6c 100644
--- a/packages/conv/creditScore/scoreSupermarket/components/addOrder.vue
+++ b/packages/conv/creditScore/scoreSupermarket/components/addOrder.vue
@@ -9,45 +9,47 @@
           <template #content>
             <div class="form_div">
               <el-form
-                ref="rules"
-                :model="forms"
-                :rules="formRules"
-                size="small"
-                label-suffix="："
-                label-width="100px">
+                  ref="rules"
+                  :model="forms"
+                  :rules="formRules"
+                  size="small"
+                  label-suffix="："
+                  label-width="100px">
                 <el-form-item label="店铺名称" prop="shopId">
                   <el-select
-                    v-model="forms.shopId"
-                    placeholder="请选择..."
-                    @change="(forms.merchandiseList = []), (goodIntegral = {})"
-                    clearable>
+                      v-model="forms.shopId"
+                      placeholder="请选择..."
+                      @change="(forms.merchandiseList = []), (goodIntegral = {})"
+                      clearable>
                     <el-option
-                      v-for="(item, i) in shopList"
-                      :key="i"
-                      :label="item.shopName"
-                      :value="item.id">
+                        v-for="(item, i) in shopList"
+                        :key="i"
+                        :label="item.shopName"
+                        :value="item.id">
                     </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item label="兑换家庭" prop="name">
                   <el-row type="flex" :gutter="8">
                     <el-col
-                      ><el-input v-model="forms.name" disabled clearable
-                    /></el-col>
+                    >
+                      <el-input v-model="forms.name" disabled clearable
+                      />
+                    </el-col>
                     <el-col>
                       <ai-person-select
-                        :instance="instance"
-                        url="/app/appvillagerintegralfamilymember/list"
-                        headerTitle="家庭列表"
-                        dialogTitle="选择家庭"
-                        @selectPerson="getSelect"
+                          :instance="instance"
+                          url="/app/appvillagerintegralfamilymember/list"
+                          headerTitle="家庭列表"
+                          dialogTitle="选择家庭"
+                          @selectPerson="getSelect"
                       >
                         <template name="option" v-slot:option="{ item }">
                           <span class="iconfont iconProlife">{{ item.name }}</span>
                           <ai-id
-                            mode="show"
-                            :show-eyes="false"
-                            :value="item.idNumber"
+                              mode="show"
+                              :show-eyes="false"
+                              :value="item.idNumber"
                           />
                           <span>{{ item.phone }}</span>
                         </template>
@@ -65,40 +67,40 @@
                   <el-button @click="showGoodsList()" :disabled="!forms.shopId || !forms.name">选择商品</el-button>
                 </el-form-item>
                 <ai-table
-                  :tableData="forms.merchandiseList"
-                  :col-configs="colConfigs"
-                  :isShowPagination="false">
+                    :tableData="forms.merchandiseList"
+                    :col-configs="colConfigs"
+                    :isShowPagination="false">
                   <el-table-column
-                    label="商品图"
-                    slot="photo"
-                    align="center"
-                    width="150">
+                      label="商品图"
+                      slot="photo"
+                      align="center"
+                      width="150">
                     <template v-slot="{ row }">
                       <ai-uploader
-                        :disabled="true"
-                        :instance="instance"
-                        v-model="row.photo"
-                        :limit="9">
+                          :disabled="true"
+                          :instance="instance"
+                          v-model="row.photo"
+                          :limit="9">
                       </ai-uploader>
                     </template>
                   </el-table-column>
                   <el-table-column
-                    label="兑换数量"
-                    width="180"
-                    slot="merchandiseNumber"
-                    align="center">
+                      label="兑换数量"
+                      width="180"
+                      slot="merchandiseNumber"
+                      align="center">
                     <template v-slot="{ row }">
                       <el-input-number
-                        :min="1"
-                        :max="row.inventoryNumber"
-                        size="mini"
-                        v-model="merchandiseNumbers[row.id]"
-                        @change="
+                          :min="1"
+                          :max="row.inventoryNumber"
+                          size="mini"
+                          v-model="merchandiseNumbers[row.id]"
+                          @change="
                           (currentValue, oldValue) =>
                             changeNumber(currentValue, oldValue, row)
                         "
-                        :step="1"
-                        step-strictly
+                          :step="1"
+                          step-strictly
                       ></el-input-number>
                     </template>
                   </el-table-column>
@@ -108,18 +110,18 @@
                     </template>
                   </el-table-column>
                   <el-table-column
-                    slot="options"
-                    label="操作"
-                    align="center"
-                    width="60"
+                      slot="options"
+                      label="操作"
+                      align="center"
+                      width="60"
                   >
                     <template slot-scope="row">
                       <el-button
-                        type="text"
-                        class="icon-color89B"
-                        icon="iconfont iconDelete"
-                        title="删除"
-                        @click="deleteGood(row)"
+                          type="text"
+                          class="icon-color89B"
+                          icon="iconfont iconDelete"
+                          title="删除"
+                          @click="deleteGood(row)"
                       />
                     </template>
                   </el-table-column>
@@ -149,33 +151,33 @@
                 <ai-info-item label="店铺名"><span>{{ detailInfo.shopName }}</span></ai-info-item>
                 <ai-info-item label="状态">
                   <span :style="{ color: dict.getColor('integralOrderStatus', detailInfo.orderStatus)}">
-                    {{ dict.getLabel("integralOrderStatus", detailInfo.orderStatus)}}
+                    {{ dict.getLabel("integralOrderStatus", detailInfo.orderStatus) }}
                   </span>
                 </ai-info-item>
               </ai-wrapper>
               <ai-table
-                :tableData="detailInfo.merchandiseList"
-                :col-configs="colConfigs"
-                :isShowPagination="false">
+                  :tableData="detailInfo.merchandiseList"
+                  :col-configs="colConfigs"
+                  :isShowPagination="false">
                 <el-table-column
-                  label="商品图"
-                  slot="photo"
-                  align="center"
-                  width="150">
+                    label="商品图"
+                    slot="photo"
+                    align="center"
+                    width="150">
                   <template v-slot="{ row }">
                     <ai-uploader
-                      :disabled="true"
-                      :instance="instance"
-                      v-model="row.merchandisePhoto"
-                      :limit="9">
+                        :disabled="true"
+                        :instance="instance"
+                        v-model="row.merchandisePhoto"
+                        :limit="9">
                     </ai-uploader>
                   </template>
                 </el-table-column>
                 <el-table-column
-                  label="兑换数量"
-                  width="200"
-                  slot="merchandiseNumber"
-                  align="center">
+                    label="兑换数量"
+                    width="200"
+                    slot="merchandiseNumber"
+                    align="center">
                   <template v-slot="{ row }">
                     {{ row.merchandiseNumber }}
                   </template>
@@ -227,47 +229,34 @@
       </template>
     </ai-detail>
     <ai-dialog
-      title="选择商品"
-      :visible.sync="showGoods"
-      :customFooter="true"
-      :destroyOnClose="true"
-      class="goods"
-      @close="init"
-      border
-      width="780px">
+        title="选择商品"
+        :visible.sync="showGoods"
+        :customFooter="true"
+        :destroyOnClose="true"
+        class="goods"
+        @close="init"
+        border
+        width="780px">
       <div class="border_div">
         <header>
           <span>商品列表</span>
           <el-input
-            v-model="keyWord"
-            size="mini"
-            placeholder="商品关键字"
-            @keyup.enter.native="showGoodsList()"
-            clearable
-            style="width: 220px"
-            suffix-icon="iconfont iconSearch"
+              v-model="keyWord"
+              size="mini"
+              placeholder="商品关键字"
+              @keyup.enter.native="showGoodsList()"
+              clearable
+              style="width: 220px"
+              suffix-icon="iconfont iconSearch"
           />
         </header>
         <ai-table
-          :tableData="goodList"
-          :col-configs="goodsConfig"
-          :isShowPagination="false"
-          @selection-change="handleSelectionChange"
+            :tableData="goodList"
+            :col-configs="goodsConfig"
+            :isShowPagination="false"
+            @selection-change="handleSelectionChange"
         >
-          <el-table-column
-            slot="selection"
-            type="selection"
-            width="55"
-            :selectable="
-              (row, index) => {
-                if (Number(row.inventoryNumber) > 0) {
-                  return true;
-                } else {
-                  return false;
-                }
-              }
-            "
-          ></el-table-column>
+          <el-table-column slot="selection" type="selection" width="55" :selectable="(row)=>Number(row.inventoryNumber)>0"/>
         </ai-table>
       </div>
       <div class="dialog-footer" slot="footer">
@@ -279,7 +268,8 @@
 </template>
 
 <script>
-import { mapState } from "vuex";
+import {mapState} from "vuex";
+
 export default {
   name: "addOrder",
   props: {
@@ -316,18 +306,18 @@ export default {
     ...mapState(["user"]),
     formRules() {
       return {
-        shopId: [{ required: true, message: "请选择店铺", trigger: "change" }],
+        shopId: [{required: true, message: "请选择店铺", trigger: "change"}],
         name: [
-          { required: true, message: "请选择兑换家庭", trigger: "change" },
+          {required: true, message: "请选择兑换家庭", trigger: "change"},
         ],
         merchandiseList: [
-          { required: true, message: "请选择商品", trigger: "change" },
+          {required: true, message: "请选择商品", trigger: "change"},
         ],
       };
     },
     colConfigs() {
       return [
-        { slot: "photo", prop: "photo", label: "商品图", align: "center" },
+        {slot: "photo", prop: "photo", label: "商品图", align: "center"},
         {
           prop: "merchandiseName",
           label: "商品名",
@@ -360,15 +350,15 @@ export default {
           label: "消耗积分",
           align: "center",
         },
-        { slot: "options", label: "操作", align: "center" },
+        {slot: "options", label: "操作", align: "center"},
       ];
     },
     goodsConfig() {
       return [
-        { slot: "selection", label: "", align: "center" },
-        { prop: "merchandiseName", label: "商品名", align: "left", width: 350 },
-        { prop: "costIntegral", label: "单价", align: "left" },
-        { prop: "inventoryNumber", align: "center", label: "库存" },
+        {slot: "selection", label: "", align: "center"},
+        {prop: "merchandiseName", label: "商品名", align: "left", width: 350},
+        {prop: "costIntegral", label: "单价", align: "left"},
+        {prop: "inventoryNumber", align: "center", label: "库存"},
       ];
     },
     allIntegral() {
@@ -424,13 +414,14 @@ export default {
       this.$confirm("是否删除该商品？", {
         type: "error",
       })
-        .then(() => {
-          this.forms.merchandiseList.splice(row.$index, 1);
-          this.$delete(this.goodIntegral, row.row.id);
-          this.$delete(this.merchandiseNumbers, row.row.id);
-          return this.$message.success("删除成功");
-        })
-        .catch(() => {});
+      .then(() => {
+        this.forms.merchandiseList.splice(row.$index, 1);
+        this.$delete(this.goodIntegral, row.row.id);
+        this.$delete(this.merchandiseNumbers, row.row.id);
+        return this.$message.success("删除成功");
+      })
+      .catch(() => {
+      });
     },
     selectGoodsInit(val) {
       return new Promise((reslove) => {
@@ -441,7 +432,7 @@ export default {
           this.$set(this.goodIntegral, e.id, Number(e.costIntegral));
           if (e.photo) {
             e.merchandisePhoto = e.photo;
-            e.photo = [{ ...JSON.parse(e.photo)[0] }];
+            e.photo = [{...JSON.parse(e.photo)[0]}];
           } else {
             e.photo = [];
           }
@@ -454,51 +445,51 @@ export default {
     },
     showGoodsList() {
       this.instance
-        .post(`/app/appvillagerintegralmerchandise/list`, null, {
-          params: {
-            size: 100000,
-            shopId: this.forms.shopId,
-            merchandiseName: this.keyWord,
-            status: "1",
-          },
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            if (this.forms.merchandiseList.length > 0) {
-              this.forms.merchandiseList.forEach((e1, index1) => {
-                res.data.records.forEach((e2, index2) => {
-                  if (e1.id == e2.id) {
-                    res.data.records.splice(index2, 1);
-                  }
-                });
+      .post(`/app/appvillagerintegralmerchandise/list`, null, {
+        params: {
+          size: 100000,
+          shopId: this.forms.shopId,
+          merchandiseName: this.keyWord,
+          status: "1",
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          if (this.forms.merchandiseList.length > 0) {
+            this.forms.merchandiseList.forEach((e1, index1) => {
+              res.data.records.forEach((e2, index2) => {
+                if (e1.id == e2.id) {
+                  res.data.records.splice(index2, 1);
+                }
               });
-            }
-            this.goodList = res.data.records;
-            this.showGoods = true;
+            });
           }
-        });
+          this.goodList = res.data.records;
+          this.showGoods = true;
+        }
+      });
     },
     changeNumber(currentValue, oldValue, row) {
       console.log(currentValue, oldValue, row);
       this.$set(
-        this.goodIntegral,
-        row.id,
-        Number(currentValue) * Number(row.costIntegral)
+          this.goodIntegral,
+          row.id,
+          Number(currentValue) * Number(row.costIntegral)
       );
     },
     getShopList() {
       this.instance
-        .post(`/app/appvillagerintegralshop/listForOperator`, null, {
-          params: {
-            size: 100000,
-            areaId: this.areaId,
-          },
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            this.shopList = res.data.records;
-          }
-        });
+      .post(`/app/appvillagerintegralshop/listForOperator`, null, {
+        params: {
+          size: 100000,
+          areaId: this.areaId,
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.shopList = res.data.records;
+        }
+      });
     },
     save(formName) {
       this.$refs[formName].validate((valid) => {
@@ -507,13 +498,13 @@ export default {
             Object.keys(this.merchandiseNumbers).forEach((e2, index2) => {
               if (e1.id == e2) {
                 this.forms.merchandiseList[
-                  index1
-                ].merchandiseNumber = this.merchandiseNumbers[e2];
+                    index1
+                    ].merchandiseNumber = this.merchandiseNumbers[e2];
               }
             });
           });
           this.instance
-            .post(
+          .post(
               `/app/appvillagerintegralshoporder/addOrder`,
               {
                 ...this.forms,
@@ -521,15 +512,15 @@ export default {
                 orderIntegral: this.allIntegral,
               },
               null
-            )
-            .then((res) => {
-              if (res.code == 0) {
-                this.$message.success("提交成功");
-                this.$emit("goBack");
-              } else {
-                return this.$message.error(res.msg);
-              }
-            });
+          )
+          .then((res) => {
+            if (res.code == 0) {
+              this.$message.success("提交成功");
+              this.$emit("goBack");
+            } else {
+              return this.$message.error(res.msg);
+            }
+          });
         } else {
           return false;
         }
@@ -537,20 +528,20 @@ export default {
     },
     searchDetail(id) {
       this.instance
-        .post(`/app/appvillagerintegralshoporder/queryDetailById`, null, {
-          params: {
-            id,
-          },
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            this.detailInfo = { ...res.data };
-            this.detailInfo.merchandiseList.map((e) => {
-              let arr = JSON.parse(e.merchandisePhoto);
-              e.merchandisePhoto = [{ ...arr[0] }];
-            });
-          }
-        });
+      .post(`/app/appvillagerintegralshoporder/queryDetailById`, null, {
+        params: {
+          id,
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.detailInfo = {...res.data};
+          this.detailInfo.merchandiseList.map((e) => {
+            let arr = JSON.parse(e.merchandisePhoto);
+            e.merchandisePhoto = [{...arr[0]}];
+          });
+        }
+      });
     },
   },
 };
@@ -559,31 +550,39 @@ export default {
 <style lang="scss" scoped>
 .add_order {
   height: 100%;
+
   .form_div {
     padding: 16px 0;
   }
+
   .goods {
     ::v-deep .el-table td {
       border-bottom: none;
       padding: 2px 0;
     }
+
     ::v-deep .el-table th {
       padding: 2px 0;
     }
   }
+
   .total {
     width: 100%;
     padding: 32px 0;
+
     p {
       text-align: right;
       font-size: 14px;
     }
+
     .num {
       font-size: 14px;
       color: #333333;
+
       span:nth-child(1) {
         color: #999999;
       }
+
       span:nth-child(2) {
         color: #999999;
         color: #2266ff;
@@ -591,14 +590,17 @@ export default {
         font-weight: bold;
       }
     }
+
     .tip {
       color: #ff4466;
     }
   }
+
   .border_div {
     overflow: hidden;
     border-radius: 2px;
     border: 1px solid #d0d4dc;
+
     header {
       height: 40px;
       background: #f5f5f5;
@@ -608,14 +610,16 @@ export default {
       justify-content: space-between;
       align-items: center;
       border-bottom: 1px solid #d0d4dc;
+
       span {
         color: #333333;
         font-size: 12px;
       }
     }
   }
+
   .info {
     padding: 16px 0;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/packages/conv/creditScore/scoreSupermarket/orderManagement.vue b/packages/conv/creditScore/scoreSupermarket/orderManagement.vue
index 21f90219..78c3294d 100644
--- a/packages/conv/creditScore/scoreSupermarket/orderManagement.vue
+++ b/packages/conv/creditScore/scoreSupermarket/orderManagement.vue
@@ -5,61 +5,60 @@
         <ai-search-bar>
           <template slot="left">
             <el-select
-              size="small"
-              v-model="searchObj.shopId"
-              placeholder="请选择店铺"
-              clearable
-              @change="(page.current = 1), getList()">
+                size="small"
+                v-model="searchObj.shopId"
+                placeholder="请选择店铺"
+                clearable
+                @change="(page.current = 1), getList()">
               <el-option
-                v-for="(item, i) in shopList"
-                :key="i"
-                :label="item.shopName"
-                :value="item.id">
+                  v-for="(item, i) in shopList"
+                  :key="i"
+                  :label="item.shopName"
+                  :value="item.id">
               </el-option>
             </el-select>
             <el-select
-              size="small"
-              v-model="searchObj.orderStatus"
-              placeholder="请选择状态"
-              clearable
-              @change="(page.current = 1), getList()">
+                size="small"
+                v-model="searchObj.orderStatus"
+                placeholder="请选择状态"
+                clearable
+                @change="(page.current = 1), getList()">
               <el-option
-                v-for="(item, i) in dict.getDict('integralOrderStatus')"
-                :key="i"
-                :label="item.dictName"
-                :value="item.dictValue">
+                  v-for="(item, i) in dict.getDict('integralOrderStatus')"
+                  :key="i"
+                  :label="item.dictName"
+                  :value="item.dictValue">
               </el-option>
             </el-select>
-            <div class="times_div">
-              <p class="times">创建时间</p>
+            <ai-search label="创建时间">
               <el-date-picker
-                v-model="searchObj.createTimeStart"
-                type="date"
-                size="small"
-                @change="(page.current = 1), getList()"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="开始日期">
+                  v-model="searchObj.createTimeStart"
+                  type="date"
+                  size="small"
+                  @change="(page.current = 1), getList()"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="开始日期">
               </el-date-picker>
               <el-date-picker
-                v-model="searchObj.createTimeEnd"
-                type="date"
-                size="small"
-                @change="(page.current = 1), getList()"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="结束日期">
+                  v-model="searchObj.createTimeEnd"
+                  type="date"
+                  size="small"
+                  @change="(page.current = 1), getList()"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="结束日期">
               </el-date-picker>
-            </div>
+            </ai-search>
           </template>
 
           <template slot="right">
             <el-input
-              v-model="searchObj.name"
-              size="small"
-              placeholder="订单号/商品名/兑换家庭"
-              v-throttle="() => {page.current = 1, getList()}"
-              @clear="page.current = 1, searchObj.name = '', getList()"
-              clearable
-              suffix-icon="iconfont iconSearch"
+                v-model="searchObj.name"
+                size="small"
+                placeholder="订单号/商品名/兑换家庭"
+                v-throttle="() => {page.current = 1, getList()}"
+                @clear="page.current = 1, searchObj.name = '', getList()"
+                clearable
+                suffix-icon="iconfont iconSearch"
             />
           </template>
         </ai-search-bar>
@@ -67,18 +66,18 @@
           <template slot="left">
             <!-- <el-button type="primary" icon="iconfont iconAdd" @click="add()">添加</el-button> -->
             <ai-download
-              :instance="instance"
-              url="/app/appvillagerintegralshoporder/listExport"
-              :params="{ ...searchObj, areaId: areaId, ids: ids.join(',') }"
-              fileName="订单管理"
-              v-if="$permissions('app_appvillagerintegralshoporder_export')">
+                :instance="instance"
+                url="/app/appvillagerintegralshoporder/listExport"
+                :params="{ ...searchObj, areaId: areaId, ids: ids.join(',') }"
+                fileName="订单管理"
+                v-if="$permissions('app_appvillagerintegralshoporder_export')">
             </ai-download>
             <el-dropdown @command="handleCommand">
               <el-button type="primary">
                 变更状态<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="1">批量完成</el-dropdown-item>
+                <el-dropdown-item command="1">批量兑换</el-dropdown-item>
                 <el-dropdown-item command="2">批量取消</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -86,30 +85,29 @@
           <template slot="right"></template>
         </ai-search-bar>
         <ai-table
-          :tableData="tableData"
-          :col-configs="colConfigs"
-          :total="page.total"
-          ref="aitableex"
-          :current.sync="page.current"
-          @select="onRowClick"
-          @select-all="onRowClick"
-          row-key="id"
-          :default-expand-all="false"
-          :tree-props="{ children: 'merchandiseList' }"
-          :size.sync="page.size"
-          @getList="getList">
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="page.total"
+            :current.sync="page.current"
+            @select="onRowClick"
+            @select-all="onRowClick"
+            row-key="id"
+            :default-expand-all="false"
+            :tree-props="{ children: 'merchandiseList' }"
+            :size.sync="page.size"
+            @getList="getList">
           <el-table-column
-            align="center"
-            type="selection"
-            :selectable="(row,index)=>row.orderStatus==0"
-            width="55"
-            slot="selection">
+              align="center"
+              type="selection"
+              :selectable="(row,index)=>row.orderStatus==0"
+              width="55"
+              slot="selection">
           </el-table-column>
           <el-table-column
-            label="订单号/创建时间"
-            slot="orderCode"
-            align="center"
-            width="150">
+              label="订单号/创建时间"
+              slot="orderCode"
+              align="center"
+              width="150">
             <template v-slot="{ row }">
               <el-row>
                 <el-col>{{ row.orderCode }}</el-col>
@@ -118,16 +116,16 @@
             </template>
           </el-table-column>
           <el-table-column
-            label="商品图"
-            slot="merchandisePhoto"
-            align="center"
-            width="130">
+              label="商品图"
+              slot="merchandisePhoto"
+              align="center"
+              width="130">
             <template v-slot="{ row }">
               <ai-uploader
-                :disabled="true"
-                :instance="instance"
-                v-model="row.merchandisePhoto"
-                :limit="9">
+                  :disabled="true"
+                  :instance="instance"
+                  v-model="row.merchandisePhoto"
+                  :limit="9">
               </ai-uploader>
             </template>
           </el-table-column>
@@ -144,30 +142,30 @@
               <el-row>
                 <el-col style="width: 100%">{{ row.createUserName }}</el-col>
                 <el-col style="color: #999999">{{
-                  row.createUserPhone
+                    row.createUserPhone
                   }}
                 </el-col>
               </el-row>
             </template>
           </el-table-column>
           <el-table-column
-            label="订单状态"
-            slot="orderStatus"
-            align="center"
-            width="130"
-            fixed="right">
+              label="订单状态"
+              slot="orderStatus"
+              align="center"
+              width="130"
+              fixed="right">
             <template v-slot="{ row }">
               <el-row v-if="row.isParent">
                 <el-col
-                  style="width: 100%"
-                  :style="{
+                    style="width: 100%"
+                    :style="{
                     color: dict.getColor(
                       'integralOrderStatus',
                       row.orderStatus
                     ),
                   }"
                 >{{
-                  dict.getLabel("integralOrderStatus", row.orderStatus)
+                    dict.getLabel("integralOrderStatus", row.orderStatus)
                   }}
                 </el-col
                 >
@@ -177,11 +175,11 @@
                 >
                 <el-col style="color: #2266ff; width: 100%" v-if="row.remark">
                   <el-tooltip
-                    :disabled="!row.remark"
-                    class="item"
-                    effect="light"
-                    :content="row.remark"
-                    placement="left-end"
+                      :disabled="!row.remark"
+                      class="item"
+                      effect="light"
+                      :content="row.remark"
+                      placement="left-end"
                   >
                     <el-link type="primary">备注</el-link>
                   </el-tooltip>
@@ -190,19 +188,19 @@
             </template>
           </el-table-column>
           <el-table-column
-            label="操作"
-            slot="options"
-            align="center"
-            width="120"
-            fixed="right">
+              label="操作"
+              slot="options"
+              align="center"
+              width="120"
+              fixed="right">
             <template v-slot="{ row }">
               <div class="table-options">
                 <el-button
-                  v-if="row.orderCode"
-                  type="text"
-                  @click="goDetail(row)"
-                  title="详情"
-                  :disabled="!$permissions('app_appvillagerintegralshoporder_detail')">
+                    v-if="row.orderCode"
+                    type="text"
+                    @click="goDetail(row)"
+                    title="详情"
+                    :disabled="!$permissions('app_appvillagerintegralshoporder_detail')">
                   详情
                 </el-button>
               </div>
@@ -215,278 +213,278 @@
 </template>
 
 <script>
-  export default {
-    name: "orderManagement",
-    props: {
-      instance: Function,
-      dict: Object,
-      permissions: Function,
-      areaId: String,
-    },
-    data() {
-      return {
-        searchObj: {
-          name: "",
-          orderStatus: "",
-          createTimeStart: null,
-          createTimeEnd: null,
-          shopId: "",
-        },
-        page: {
-          size: 10,
-          current: 1,
-          total: 0,
-        },
-        tableData: [],
-        shopList: [],
-        ids: [],
-      };
-    },
-    computed: {
-      colConfigs() {
-        let _ = this;
-        return [
-          {slot: "selection"},
-          {
-            prop: "orderCode",
-            align: "center",
-            slot: "orderCode",
-            label: "订单号/创建时间",
-          },
-          {
-            prop: "merchandisePhoto",
-            slot: "merchandisePhoto",
-            align: "center",
-            label: "商品图",
-          },
-          {
-            prop: "merchandiseName",
-            align: "left",
-            label: "商品名",
-            width: 180,
-            "show-overflow-tooltip": false,
-          },
-          {
-            prop: "costIntegral",
-            align: "center",
-            label: "单价",
-            width: 100,
-          },
-          {
-            prop: "merchandiseNumber",
-            align: "center",
-            label: "数量",
-          },
-          {
-            prop: "allCostIntegral",
-            align: "center",
-            label: "消耗积分",
-          },
-          {
-            prop: "familyName",
-            align: "center",
-            label: "兑换家庭",
-            slot: "familyName",
-          },
-          {
-            prop: "createUserName",
-            align: "center",
-            label: "操作人",
-            slot: "createUserName",
-          },
-          {
-            prop: "orderStatus",
-            align: "center",
-            label: "订单状态",
-            fixed: "right",
-            slot: "orderStatus",
-            // render(h, {row}) {
-            //     return h('span', {style: {color: _.dict.getColor('integralOrderStatus', row.orderStatus)}}, _.dict.getLabel('integralOrderStatus', row.orderStatus))
-            // }
-          },
-        ];
+export default {
+  name: "orderManagement",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function,
+    areaId: String,
+  },
+  data() {
+    return {
+      searchObj: {
+        name: "",
+        orderStatus: "",
+        createTimeStart: null,
+        createTimeEnd: null,
+        shopId: "",
       },
-    },
-    created() {
-      this.getList();
-      this.dict.load("integralOrderStatus");
-      this.getShopList();
-    },
-    methods: {
-      onRowClick(row) {
-        this.ids = row.map(e => e.id)
+      page: {
+        size: 10,
+        current: 1,
+        total: 0,
       },
-      handleCommand(val) {
-        if (this.ids.length == 0) {
-          return this.$message.error("请选择商品")
+      tableData: [],
+      shopList: [],
+      ids: [],
+    };
+  },
+  computed: {
+    colConfigs() {
+      let _ = this;
+      return [
+        {slot: "selection"},
+        {
+          prop: "orderCode",
+          align: "center",
+          slot: "orderCode",
+          label: "订单号/创建时间",
+        },
+        {
+          prop: "merchandisePhoto",
+          slot: "merchandisePhoto",
+          align: "center",
+          label: "商品图",
+        },
+        {
+          prop: "merchandiseName",
+          align: "left",
+          label: "商品名",
+          width: 180,
+          "show-overflow-tooltip": false,
+        },
+        {
+          prop: "costIntegral",
+          align: "center",
+          label: "单价",
+          width: 100,
+        },
+        {
+          prop: "merchandiseNumber",
+          align: "center",
+          label: "数量",
+        },
+        {
+          prop: "allCostIntegral",
+          align: "center",
+          label: "消耗积分",
+        },
+        {
+          prop: "familyName",
+          align: "center",
+          label: "兑换家庭",
+          slot: "familyName",
+        },
+        {
+          prop: "createUserName",
+          align: "center",
+          label: "操作人",
+          slot: "createUserName",
+        },
+        {
+          prop: "orderStatus",
+          align: "center",
+          label: "订单状态",
+          fixed: "right",
+          slot: "orderStatus",
+          // render(h, {row}) {
+          //     return h('span', {style: {color: _.dict.getColor('integralOrderStatus', row.orderStatus)}}, _.dict.getLabel('integralOrderStatus', row.orderStatus))
+          // }
+        },
+      ];
+    },
+  },
+  created() {
+    this.getList();
+    this.dict.load("integralOrderStatus");
+    this.getShopList();
+  },
+  methods: {
+    onRowClick(row) {
+      this.ids = row.map(e => e.id)
+    },
+    handleCommand(val) {
+      if (this.ids.length == 0) {
+        return this.$message.error("请选择商品")
+      }
+      this.instance.post(`/app/appvillagerintegralshoporder/changeOrderStatus`, null, {
+        params: {
+          ids: this.ids.join(","),
+          status: val
         }
-        this.instance.post(`/app/appvillagerintegralshoporder/changeOrderStatus`, null, {
-          params: {
-            ids: this.ids.join(","),
-            status: val
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.$message.success(`批量${val == 1 ? '完成' : '取消'}成功`)
-            this.getList()
-          }
-        })
-      },
-      getList() {
-        this.instance
-          .post(`/app/appvillagerintegralshoporder/list`, null, {
-            params: {
-              ...this.searchObj,
-              ...this.page,
-              areaId: this.areaId,
-            },
-          })
-          .then((res) => {
-            if (res.code == 0) {
-              this.tableData = res.data.records;
-              this.tableData.map((e) => {
-                e.merchandiseName = e.merchandiseList[0].merchandiseName;
-                e.merchandiseNumber = e.merchandiseList[0].merchandiseNumber;
-                e.merchandisePhoto = [
-                  {...JSON.parse(e.merchandiseList[0].merchandisePhoto)[0]},
-                ];
-                e.idForWeb = e.merchandiseList[0].idForWeb;
-                e.costIntegral = e.merchandiseList[0].costIntegral;
-                e.allCostIntegral =
-                  Number(e.merchandiseList[0].costIntegral) *
-                  Number(e.merchandiseNumber);
-                e.merchandiseList.splice(0, 1);
-                e.isParent = true;
-                if (e.merchandiseList.length > 0) {
-                  e.merchandiseList.map((e2) => {
-                    e2.createTime = "";
-                    let arr = JSON.parse(e2.merchandisePhoto);
-                    e2.merchandisePhoto = [{...arr[0]}];
-                    e2.allCostIntegral =
-                      Number(e2.costIntegral) * Number(e2.merchandiseNumber);
-                    e2.isParent = false;
-                    // e2.id = e2.orderId
-                  });
-                }
+      }).then(res => {
+        if (res.code == 0) {
+          this.$message.success(`批量${val == 1 ? '完成' : '取消'}成功`)
+          this.getList()
+        }
+      })
+    },
+    getList() {
+      this.instance
+      .post(`/app/appvillagerintegralshoporder/list`, null, {
+        params: {
+          ...this.searchObj,
+          ...this.page,
+          areaId: this.areaId,
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.tableData = res.data.records;
+          this.tableData.map((e) => {
+            e.merchandiseName = e.merchandiseList[0].merchandiseName;
+            e.merchandiseNumber = e.merchandiseList[0].merchandiseNumber;
+            e.merchandisePhoto = [
+              {...JSON.parse(e.merchandiseList[0].merchandisePhoto)[0]},
+            ];
+            e.idForWeb = e.merchandiseList[0].idForWeb;
+            e.costIntegral = e.merchandiseList[0].costIntegral;
+            e.allCostIntegral =
+                Number(e.merchandiseList[0].costIntegral) *
+                Number(e.merchandiseNumber);
+            e.merchandiseList.splice(0, 1);
+            e.isParent = true;
+            if (e.merchandiseList.length > 0) {
+              e.merchandiseList.map((e2) => {
+                e2.createTime = "";
+                let arr = JSON.parse(e2.merchandisePhoto);
+                e2.merchandisePhoto = [{...arr[0]}];
+                e2.allCostIntegral =
+                    Number(e2.costIntegral) * Number(e2.merchandiseNumber);
+                e2.isParent = false;
+                // e2.id = e2.orderId
               });
-              this.page.total = res.data.total;
             }
           });
-      },
-      getShopList() {
-        return new Promise((reslove) => {
-          this.instance
-            .post(`/app/appvillagerintegralshop/list`, null, {
-              params: {
-                size: 100000,
-                areaId: this.areaId,
-              },
-            })
-            .then((res) => {
-              if (res.code == 0) {
-                this.shopList = res.data.records;
-                reslove();
-              }
-            });
-        });
-      },
-      reset() {
-        Object.keys(this.searchObj).forEach((e) => {
-          this.searchObj[e] = "";
-        });
-        this.searchObj.createTimeStart = null;
-        this.searchObj.createTimeEnd = null;
-        this.getList();
-      },
-      add() {
-        this.$emit("showDetail", {isAdd: true});
-      },
-      goDetail(row) {
-        console.log(row);
-        this.$emit("showDetail", {isAdd: false, ...row});
-      },
-      finishOrder(row) {
-        this.$confirm(`是否完成此订单？`, {
-          type: "error",
-        })
-          .then(() => {
-            this.instance
-              .post(`/app/appvillagerintegralshoporder/FinishOrder`, null, {
-                params: {
-                  orderId: row.id,
-                },
-              })
-              .then((res) => {
-                if (res.code == 0) {
-                  this.$message.success("已完成！");
-                  this.getList();
-                }
-              });
-          })
-          .catch(() => {
-          });
-      },
-      overOrder(row) {
-        this.$confirm(`是否结束此订单？`, {
-          type: "error",
-        })
-          .then(() => {
-            this.instance
-              .post(`/app/appvillagerintegralshoporder/overOrder`, null, {
-                params: {
-                  orderId: row.id,
-                },
-              })
-              .then((res) => {
-                if (res.code == 0) {
-                  this.$message.success("已结束！");
-                  this.getList();
-                }
-              });
-          })
-          .catch(() => {
-          });
-      },
+          this.page.total = res.data.total;
+        }
+      });
     },
-  };
+    getShopList() {
+      return new Promise((reslove) => {
+        this.instance
+        .post(`/app/appvillagerintegralshop/list`, null, {
+          params: {
+            size: 100000,
+            areaId: this.areaId,
+          },
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            this.shopList = res.data.records;
+            reslove();
+          }
+        });
+      });
+    },
+    reset() {
+      Object.keys(this.searchObj).forEach((e) => {
+        this.searchObj[e] = "";
+      });
+      this.searchObj.createTimeStart = null;
+      this.searchObj.createTimeEnd = null;
+      this.getList();
+    },
+    add() {
+      this.$emit("showDetail", {isAdd: true});
+    },
+    goDetail(row) {
+      console.log(row);
+      this.$emit("showDetail", {isAdd: false, ...row});
+    },
+    finishOrder(row) {
+      this.$confirm(`是否完成此订单？`, {
+        type: "error",
+      })
+      .then(() => {
+        this.instance
+        .post(`/app/appvillagerintegralshoporder/FinishOrder`, null, {
+          params: {
+            orderId: row.id,
+          },
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            this.$message.success("已完成！");
+            this.getList();
+          }
+        });
+      })
+      .catch(() => {
+      });
+    },
+    overOrder(row) {
+      this.$confirm(`是否结束此订单？`, {
+        type: "error",
+      })
+      .then(() => {
+        this.instance
+        .post(`/app/appvillagerintegralshoporder/overOrder`, null, {
+          params: {
+            orderId: row.id,
+          },
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            this.$message.success("已结束！");
+            this.getList();
+          }
+        });
+      })
+      .catch(() => {
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  .order_management {
-    height: 100%;
-    overflow: auto;
-    background: #f3f6f9;
+.order_management {
+  height: 100%;
+  overflow: auto;
+  background: #f3f6f9;
 
-    .times_div {
-      display: flex;
-      align-items: center;
+  .times_div {
+    display: flex;
+    align-items: center;
 
-      .times {
-        display: block;
-        width: 72px;
-        height: 30px;
-        line-height: 30px;
-        margin: 0;
-        text-align: center;
-        background: #f5f5f5;
-        border-radius: 2px 0px 0px 2px;
-        border: 1px solid #d0d4dc;
-        font-size: 14px;
-        color: #666666;
-      }
-    }
-
-    .iconfont {
-      cursor: pointer;
-    }
-
-    .iconCorrect {
-      color: #53b43b;
-    }
-
-    .iconReject {
-      color: #e75555;
-      padding: 0 8px;
+    .times {
+      display: block;
+      width: 72px;
+      height: 30px;
+      line-height: 30px;
+      margin: 0;
+      text-align: center;
+      background: #f5f5f5;
+      border-radius: 2px 0px 0px 2px;
+      border: 1px solid #d0d4dc;
+      font-size: 14px;
+      color: #666666;
     }
   }
+
+  .iconfont {
+    cursor: pointer;
+  }
+
+  .iconCorrect {
+    color: #53b43b;
+  }
+
+  .iconReject {
+    color: #e75555;
+    padding: 0 8px;
+  }
+}
 </style>
diff --git a/packages/conv/creditScore/scoreSysUser/ssuDetail.vue b/packages/conv/creditScore/scoreSysUser/ssuDetail.vue
index d1d1dda4..00c8115b 100644
--- a/packages/conv/creditScore/scoreSysUser/ssuDetail.vue
+++ b/packages/conv/creditScore/scoreSysUser/ssuDetail.vue
@@ -55,7 +55,7 @@
         </el-form-item>
         <el-form-item label="选择人员" prop="userId" v-if="form.objectType">
           <ai-person-select v-if="form.objectType==1" :instance="instance" url="/admin/user/userIntegralList" customClicker
-                            @selectPerson="handleResidentSelect"/>
+                            @selectPerson="handleResidentSelect" headerTitle="员工列表"/>
           <ai-person-select v-if="form.objectType==0" :instance="instance" :url="`/app/appresident/list?areaId=${user.info.areaId}`"
                             @selectPerson="handleResidentSelect" customClicker/>
         </el-form-item>