update: update

src/assets/theme/index.css

@@ -15762,7 +15762,7 @@
     color: #606266;
     display: inline-block;
     font-size: inherit;
-    height: 32px;
+    height: 32px !important;
     line-height: 32px;
     outline: none;
     padding: 0 15px;

src/components/store/store-group.vue

@@ -190,14 +190,8 @@ export default {
     removeSelect(item, index) {
       // item.disabled = false;
       // this.$set(this.leftList, 'item', false);
-      this.selectRightList.splice(
-        copy(this.selectRightList).findIndex(i => i.storeGroupId === item.storeGroupId),
-        1
-      );
-      this.selectLeftList.splice(
-        this.selectLeftList.findIndex(i => i.storeGroupId === item.storeGroupId),
-        1
-      );
+      this.selectRightList.splice(copy(this.selectRightList).findIndex(i => i.storeGroupId === item.storeGroupId), 1);
+      this.selectLeftList.splice(this.selectLeftList.findIndex(i => i.storeGroupId === item.storeGroupId), 1);
       this.selectIdList = [];
       for (let item of this.selectLeftList) {
         this.selectIdList.push(item.storeGroupId);

src/components/store/store-part.vue

@@ -186,10 +186,7 @@ export default {
     // 移除
     removeItem(item, index) {
       this.selectRightList.splice(index, 1);
-      this.selectLeftList.splice(
-        this.selectLeftList.findIndex(i => i.integralMallPickUpPointId === item.integralMallPickUpPointId),
-        1
-      );
+      this.selectLeftList.splice(this.selectLeftList.findIndex(i => i.integralMallPickUpPointId === item.integralMallPickUpPointId), 1);
       //取消表格选中数据
       let obj = this.tableData.find(i => {
         return i.integralMallPickUpPointId === item.integralMallPickUpPointId;

src/views/activities/flashSale/detail.vue

@@ -120,7 +120,9 @@
                     </template>
                   </el-table-column>
                   <el-table-column label="原价" v-if="!isEdit">
-                    <template slot-scope="{ row }">{{ row.integralCost }}积分+{{ row.cashCost }}元</template>
+                    <template slot-scope="{ row }"
+                      >{{ row.integralCost }}积分+{{ row.cashCost }}元</template
+                    >
                   </el-table-column>
                   <el-table-column label="当前库存" v-if="!isEdit">
                     <template slot-scope="{ row }">{{ row.virtualStock }}</template>

src/views/activities/flashSale/list.vue

@@ -45,7 +45,9 @@
               </template>
             </el-table-column>
             <el-table-column label="状态" prop="activityStatus">
-              <template slot-scope="{ row }"> <span :class="[row.activityStatus === 0 ? 'dm-status--warning' : row.activityStatus === 1 ? 'dm-status--primary--flash' : 'dm-status--info']"> </span>{{ row.activityStatus === 0 ? '未开始' : row.activityStatus === 1 ? '进行中' : '已结束' }} </template>
+              <template slot-scope="{ row }">
+                <span :class="[row.activityStatus === 0 ? 'dm-status--warning' : row.activityStatus === 1 ? 'dm-status--primary--flash' : 'dm-status--info']"> </span>{{ row.activityStatus === 0 ? '未开始' : row.activityStatus === 1 ? '进行中' : '已结束' }}
+              </template>
             </el-table-column>
             <el-table-column label="商品数量">
               <template slot-scope="{ row }">

src/views/goods/coupon/info.vue

@@ -46,7 +46,9 @@
                 </template>
               </el-table-column>
               <el-table-column label="领取限制">
-                <template slot-scope="scope"> {{ scope.row.cardLimit }}张/人 </template>
+                <template slot-scope="scope">
+                  {{ scope.row.cardLimit }}张/人
+                </template>
               </el-table-column>
               <el-table-column label="适用门店">
                 <template slot-scope="scope">
@@ -428,10 +430,7 @@ export default {
       couponRules: {
         integralCost: [{ required: true, message: '请输入积分费用', trigger: 'blur' }],
         cashCost: [{ required: true, message: '请输入现金费用', trigger: 'blur' }],
-        virtualStock: [
-          { required: true, message: '请输入库存', trigger: 'blur' },
-          { validator: stockValidator, trigger: 'blur' }
-        ],
+        virtualStock: [{ required: true, message: '请输入库存', trigger: 'blur' }, { validator: stockValidator, trigger: 'blur' }],
         gradeType: [{ required: true, message: '请选择适用会员', trigger: 'change' }],
         memberGrade: [{ required: true, message: '请选择适用会员', trigger: 'change' }],
         exchangeFixDate: [{ required: true, message: '请选择时间', trigger: 'change' }],

src/views/goods/gift/gift.vue

@@ -42,6 +42,13 @@
               </el-select>
             </div>
             <div class="search-item">
+              <el-select v-model="category" placeholder="礼品分类" class="w-140" clearable @change="getListCurr">
+                <el-option v-for="(v, i) in categoryOptions" :key="i" :label="v.categoryName" :value="v.integralMallCategoryId">
+                  <span class="fl">{{ v.categoryName }}</span>
+                </el-option>
+              </el-select>
+            </div>
+            <div class="search-item">
               <el-checkbox v-model="showSelfStatus" label="仅看本人" border @change="getListCurr" v-if="showFlag"></el-checkbox>
             </div>
           </div>
@@ -77,6 +84,9 @@
                 </div>
               </template>
             </el-table-column>
+            <el-table-column prop="giftCategoryName" label="礼品分类" min-width="110px">
+              <template slot-scope="scope">{{ scope.row.giftCategoryName ? scope.row.giftCategoryName : '--' }}</template>
+            </el-table-column>
             <el-table-column prop="integralCost" label="积分费用" sortable="custom" min-width="110px">
               <template slot-scope="scope">
                 <p class="intergral-edit">
@@ -229,6 +239,7 @@ export default {
       giftType: '', //商品类型
       sortColumn: '',
       sortType: '',
+      category: '', // 礼品分类
       showSelfStatus: false,
       showFlag: false,
       openFlag: false,
@@ -284,6 +295,7 @@ export default {
         id: ''
         // show: false
       },
+      categoryOptions: [],
       ladderDialogVisible: false,
       stockDialog: false,
       enterpriseId: '',
@@ -307,6 +319,7 @@ export default {
     this.getStatus();
     this.getList();
     this.getUserId();
+    this.getCategoryOptions();
   },
   methods: {
     // 阶梯价定制，判断达摩测试环境与地素环境
@@ -396,9 +409,10 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         sortType: this.sortType,
-        sortColumn: this.sortColumn,
+        category: this.category,
         giftName: this.searchValue.trim(),
         giftType: this.giftType ? this.giftType : -1,
+        sortColumn: this.sortColumn,
         shelf: this.shelf ? this.shelf : -1, //上架状态
         stockStatus: this.stockStatus ? this.stockStatus : -1,
         goodsType: this.goodsType, //商品类型
@@ -797,6 +811,20 @@ export default {
     },
     selectInit(row, index) {
       return row.canEdit;
+    },
+    //获取礼品分类数据
+    getCategoryOptions() {
+      request.post('/api-integral-mall/load-category').then(res => {
+        if (res.data.errorCode === 0) {
+          if (res.data.result) {
+            this.categoryOptions = res.data.result;
+          } else {
+            this.categoryOptions = [];
+          }
+        } else {
+          this.$message.error(res.data.message);
+        }
+      });
     }
   },
   components: {

src/views/goods/gift/info.vue

@@ -337,7 +337,9 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="领取限制">
-                  <template slot-scope="scope">{{ scope.row.cardLimit }}张/人</template>
+                  <template slot-scope="scope"
+                    >{{ scope.row.cardLimit }}张/人</template
+                  >
                 </el-table-column>
                 <el-table-column label="适用门店">
                   <template slot-scope="scope">{{ scope.row.storeMode === 0 ? '所有门店' : scope.row.storeMode === 1 ? '部分分组' : '部分门店' }}</template>

src/views/order/agreeRefund.vue

@@ -59,14 +59,8 @@ export default {
       refundPoint: '',
       refundMoney: '',
       modalRules: {
-        refundPoint: [
-          { required: true, message: '请输入积分', trigger: 'blur' },
-          { validator: refundPointValidator, trigger: 'blur' }
-        ],
-        refundMoney: [
-          { required: true, message: '请输入金额', trigger: 'blur' },
-          { validator: refundMoneyValidator, trigger: 'blur' }
-        ]
+        refundPoint: [{ required: true, message: '请输入积分', trigger: 'blur' }, { validator: refundPointValidator, trigger: 'blur' }],
+        refundMoney: [{ required: true, message: '请输入金额', trigger: 'blur' }, { validator: refundMoneyValidator, trigger: 'blur' }]
       },
       submitLoading: false //按钮禁止重复提交
     };

src/views/setting/deliverSet.vue

@@ -33,7 +33,7 @@
           <div class="operate-top">
             <div class="fl">
               <div class="search-item">
-                <el-input v-model="searchValue" placeholder="请输入自提点名称进行搜索" prefix-icon="el-icon-search" clearable class="w-280" @keyup.enter.native="getSearchList" @clear="getSearchList"> </el-input>
+                <el-input v-model="searchValue" placeholder="请输入自提点名称/code" prefix-icon="el-icon-search" clearable class="w-280" @keyup.enter.native="getSearchList" @clear="getSearchList"> </el-input>
               </div>
               <div class="search-item">
                 <el-select v-model="isValid" placeholder="自提点状态" clearable class="w-140" @change="getSearchList">
@@ -41,6 +41,11 @@
                   <el-option label="正常" :value="1"></el-option>
                 </el-select>
               </div>
+              <div class="search-item">
+                <el-autocomplete class="inline-input" :value="creatorName" :select-when-unmatched="true" @select="selectCreator" clearable :fetch-suggestions="querySearch" placeholder="请输入创建人" :trigger-on-focus="false">
+                  <template slot-scope="{ item }">{{ item.creatorName }}</template>
+                </el-autocomplete>
+              </div>
             </div>
             <div class="fr">
               <el-button plain @click="exportData"><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出自提点</el-button>
@@ -52,6 +57,7 @@
             <el-table ref="multipleTable" :data="tableDate" style="width: 100%" @selection-change="handleSelectAll">
               <el-table-column type="selection" width="55"> </el-table-column>
               <el-table-column prop="pickUpPointName" label="自提点名称" min-width="200px"> </el-table-column>
+              <el-table-column prop="storeCode" label="自提点code" min-width="100"> </el-table-column>
               <el-table-column prop="pickUpPointAddress" label="自提点地址" min-width="200px"> </el-table-column>
               <el-table-column prop="pickUpPointPhone" label="联系电话"> </el-table-column>
               <el-table-column prop="canChooseTime" label="自提时间可选">
@@ -64,6 +70,7 @@
                   <span>{{ scope.row.isValid === 1 ? '正常' : '失效' }}</span>
                 </template>
               </el-table-column>
+              <el-table-column prop="creatorName" label="创建人"> </el-table-column>
               <el-table-column label="操作">
                 <template slot-scope="scope">
                   <div>
@@ -116,6 +123,8 @@ export default {
     return {
       searchValue: '',
       isValid: '',
+      creatorId: '',
+      creatorName: '',
       currentPage: 1,
       pageSizes: [20, 40, 60, 80],
       pageSize: 20,
@@ -125,11 +134,13 @@ export default {
       loading: false,
       selectList: [], //复选框选中的数据
       tableDate: [],
+      creatorOptions: [],
       pickedForm: {
         dialogVisible: false,
         selectIdList: [], //复选框选中的数据的id
         list: [{ timeRange: [] }] //初始数据
       },
+      creatorLoading: false,
       enableAccessControl: false,
       // 导出
       dialogVisible: false,
@@ -154,6 +165,28 @@ export default {
     this.getStatus();
   },
   methods: {
+    selectCreator(v) {
+      this.creatorName = v.creatorName;
+      this.creatorId = v.creatorId;
+      this.getSearchList();
+    },
+    querySearch(v, cb) {
+      this.creatorLoading = true;
+      let params = {
+        creatorName: v
+      };
+      request.get('/api-integral-mall/list-creator', { params }).then(res => {
+        if (res.data.errorCode === 0) {
+          if (res.data.result) {
+            cb(res.data.result);
+          } else {
+            cb([]);
+          }
+        } else {
+          this.$message.error(res.data.message);
+        }
+      });
+    },
     getAccessControl() {
       let params = {
         requestProject: 'integral-mall'
@@ -281,7 +314,8 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         search: this.searchValue,
-        isValid: this.isValid
+        isValid: this.isValid,
+        creatorId: this.creatorId
       };
       this.loading = true;
       request.post('/api-integral-mall/page-pick-up-points', qs.stringify(params)).then(res => {
@@ -346,6 +380,9 @@ export default {
 .w-140 {
   width: 140px;
 }
+.w-280 {
+  width: 280px;
+}
 .section {
   background: #fff;
   margin: 24px;

src/views/setting/editDeliver.vue

@@ -277,14 +277,8 @@ export default {
         timeHours: [{ validator: timeHoursValidator, trigger: 'blur' }],
         timeMinuter: [{ validator: timeMinuterValidator, trigger: 'blur' }],
         timeDay: [{ validator: timeDayValidator, trigger: 'blur' }],
-        orderTimeHours: [
-          { required: true, message: '请输入时间', trigger: 'blur' },
-          { validator: orderTimeHoursValidator, trigger: 'blur' }
-        ],
-        overTime: [
-          { required: true, message: '请输入提货有效期', trigger: 'blur' },
-          { validator: overTimeValidator, trigger: 'blur' }
-        ]
+        orderTimeHours: [{ required: true, message: '请输入时间', trigger: 'blur' }, { validator: orderTimeHoursValidator, trigger: 'blur' }],
+        overTime: [{ required: true, message: '请输入提货有效期', trigger: 'blur' }, { validator: overTimeValidator, trigger: 'blur' }]
       },
       validateTime,
       // 门店控件
@@ -641,6 +635,11 @@ export default {
       request.post(url, params).then(res => {
         if (res.data.errorCode === 0) {
           this.submitLoading = false;
+          if (this.integralMallPickUpPointId === '-1') {
+            this.$message.success(res.data.result);
+          } else {
+            this.$message.success('保存成功');
+          }
           this.$router.push({
             name: 'deliverSet'
           });

src/views/setting/pickedAuto.vue

@@ -218,14 +218,8 @@ export default {
         timeHours: [{ validator: timeHoursValidator, trigger: 'blur' }],
         timeMinuter: [{ validator: timeMinuterValidator, trigger: 'blur' }],
         timeDay: [{ validator: timeDayValidator, trigger: 'blur' }],
-        orderTimeHours: [
-          { required: true, message: '请输入时间', trigger: 'blur' },
-          { validator: orderTimeHoursValidator, trigger: 'blur' }
-        ],
-        overTime: [
-          { required: true, message: '请输入提货有效期', trigger: 'blur' },
-          { validator: overTimeValidator, trigger: 'blur' }
-        ]
+        orderTimeHours: [{ required: true, message: '请输入时间', trigger: 'blur' }, { validator: orderTimeHoursValidator, trigger: 'blur' }],
+        overTime: [{ required: true, message: '请输入提货有效期', trigger: 'blur' }, { validator: overTimeValidator, trigger: 'blur' }]
       },
       submitLoading: false,
       clearableBtn: false,