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"
@@ -149,7 +151,7 @@
                 <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>
@@ -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">
@@ -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" },
+        {slot: "selection", label: "", align: "center"},
-        { prop: "merchandiseName", label: "商品名", align: "left", width: 350 },
+        {prop: "merchandiseName", label: "商品名", align: "left", width: 350},
-        { prop: "costIntegral", label: "单价", align: "left" },
+        {prop: "costIntegral", label: "单价", align: "left"},
-        { prop: "inventoryNumber", align: "center", label: "库存" },
+        {prop: "inventoryNumber", align: "center", label: "库存"},
       ];
     },
     allIntegral() {
@@ -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) => {
@@ -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 = [];
           }
@@ -544,10 +535,10 @@ export default {
       })
       .then((res) => {
         if (res.code == 0) {
-            this.detailInfo = { ...res.data };
+          this.detailInfo = {...res.data};
           this.detailInfo.merchandiseList.map((e) => {
             let arr = JSON.parse(e.merchandisePhoto);
-              e.merchandisePhoto = [{ ...arr[0] }];
+            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,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"
@@ -215,7 +213,7 @@
 </template>
 
 <script>
-  export default {
+export default {
   name: "orderManagement",
   props: {
     instance: Function,
@@ -448,11 +446,11 @@
       });
     },
   },
-  };
+};
 </script>
 
 <style lang="scss" scoped>
-  .order_management {
+.order_management {
   height: 100%;
   overflow: auto;
   background: #f3f6f9;
@@ -488,5 +486,5 @@
     color: #e75555;
     padding: 0 8px;
   }
-  }
+}
 </style>

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>