BUG 29673

packages/conv/creditScore/scoreSupermarket/components/addOrder.vue

@@ -32,8 +32,10 @@
                 <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"
@@ -254,20 +256,7 @@
             :isShowPagination="false"
             @selection-change="handleSelectionChange"
         >
-          <el-table-column
+          <el-table-column slot="selection" type="selection" width="55" :selectable="(row)=>Number(row.inventoryNumber)>0"/>
-            slot="selection"
-            type="selection"
-            width="55"
-            :selectable="
-              (row, index) => {
-                if (Number(row.inventoryNumber) > 0) {
-                  return true;
-                } else {
-                  return false;
-                }
-              }
-            "
-          ></el-table-column>
         </ai-table>
       </div>
       <div class="dialog-footer" slot="footer">
@@ -280,6 +269,7 @@
 
 <script>
 import {mapState} from "vuex";
+
 export default {
   name: "addOrder",
   props: {
@@ -430,7 +420,8 @@ export default {
         this.$delete(this.merchandiseNumbers, row.row.id);
         return this.$message.success("删除成功");
       })
-        .catch(() => {});
+      .catch(() => {
+      });
     },
     selectGoodsInit(val) {
       return new Promise((reslove) => {
@@ -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,12 +610,14 @@ export default {
       justify-content: space-between;
       align-items: center;
       border-bottom: 1px solid #d0d4dc;
+
       span {
         color: #333333;
         font-size: 12px;
       }
     }
   }
+
   .info {
     padding: 16px 0;
   }

packages/conv/creditScore/scoreSupermarket/orderManagement.vue

@@ -30,8 +30,7 @@
                   :value="item.dictValue">
               </el-option>
             </el-select>
-            <div class="times_div">
+            <ai-search label="创建时间">
-              <p class="times">创建时间</p>
               <el-date-picker
                   v-model="searchObj.createTimeStart"
                   type="date"
@@ -48,7 +47,7 @@
                   value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="结束日期">
               </el-date-picker>
-            </div>
+            </ai-search>
           </template>
 
           <template slot="right">
@@ -78,7 +77,7 @@
                 变更状态<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>
@@ -89,7 +88,6 @@
             :tableData="tableData"
             :col-configs="colConfigs"
             :total="page.total"
-          ref="aitableex"
             :current.sync="page.current"
             @select="onRowClick"
             @select-all="onRowClick"

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>