update: dist

src/assets/style/base/reset.scss

@@ -256,6 +256,9 @@ a:hover {
 .w250{
   width: 250px!important;
 }
+.w260{
+  width: 260px!important;
+}
 .w280{
   width: 280px!important;
 }

src/views/ai/ai-data-active-data.vue

@@ -10,18 +10,28 @@
       </div>
     </div>
     <div class="searchWarp">
-      <el-form inline="true" class="table-page-search-wrapper" size="small">
+      <el-form inline="true" class="table-page-search-wrapper" size="small" v-show="dimension == '门店维度'">
         <el-form-item>
-          <el-input placeholder="请输入门店名称/code" v-model="form.search" class="input-with-select" @change="handleSearch" v-show="dimension == '门店维度'" clearable> </el-input>
-          <el-select v-model="form.storeGroupLevel" v-show="dimension == '分组维度'" @change="handleSearch">
-            <el-option v-for="item in selectOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-          </el-select>
+          <el-input placeholder="请输入门店名称/code" v-model="form.search" class="input-with-select" @change="handleSearch" clearable> </el-input>
         </el-form-item>
         <el-form-item>
           <vue-gic-select-tree :options="options" @change="onChange"></vue-gic-select-tree>
         </el-form-item>
         <el-button icon="iconfont icon-cp-xiazai" class="fr" type="primary" @click="exportAiStoreTransfer" :disabled="!total"> 查询结果导出</el-button>
       </el-form>
+      <el-form inline="true" class="table-page-search-wrapper" size="small" v-show="dimension == '分组维度'">
+        <el-form-item>
+          <el-select v-model="selectVal" class="w100">
+            <el-option label="分组层级" :value="1"></el-option>
+            <el-option label="分组名称" :value="2"></el-option>
+          </el-select>
+          <el-select v-model="form.storeGroupLevel" @change="handleSearch" v-show="selectVal == 1" class="w260">
+            <el-option v-for="item in selectOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+          </el-select>
+          <vue-gic-select-tree :options="options" v-show="selectVal == 2" @change="onChange"></vue-gic-select-tree>
+        </el-form-item>
+        <el-button icon="iconfont icon-cp-xiazai" class="fr" type="primary" @click="exportAiStoreOutbound" :disabled="!total"> 查询结果导出</el-button>
+      </el-form>
     </div>
     <div class="cardContent">
       <el-row :gutter="20">
@@ -138,7 +148,7 @@ export default {
         pageSize: 20
       },
       dimension: '门店维度',
-      select: '1',
+      selectVal: 1,
       tableData: [],
       selectOptions: [
         {
@@ -286,7 +296,7 @@ export default {
                 }
                 break;
               case 'moneyNum':
-                item.value = numFormat(value) + '元';
+                item.value = value == 0 ? '--' : numFormat(value) + '元';
                 break;
               case 'rate':
                 item.value = value == null ? '--' : value;
@@ -359,8 +369,10 @@ export default {
       this.tableHeader = [head, ...tableHead];
       this.loading = true;
       const { activityId, storeGroupLevel, storeGroupId, pageNum, pageSize } = this.form;
+      const params = { activityId, storeGroupLevel, storeGroupId };
+      this.selectVal == 1 ? delete params.storeGroupId : delete params.storeGroupLevel;
       try {
-        const { result } = await aiStoreGroupTransfer({ activityId, storeGroupLevel, storeGroupId }, `&pageNum=${pageNum}&pageSize=${pageSize}`);
+        const { result } = await aiStoreGroupTransfer(params, `&pageNum=${pageNum}&pageSize=${pageSize}`);
         if (!result) return;
         this.tableData = result.result || [];
         this.total = result.totalCount;
@@ -394,6 +406,7 @@ export default {
         this.aiStoreTransferStatistics();
       } else if (data == '分组维度') {
         this.form.storeGroupLevel = 1;
+        this.selectVal = 1;
         // 分组维度列表+统计数据
         this.aiStoreGroupTransfer();
         this.aiStoreGroupTransferStatistics();
@@ -455,8 +468,10 @@ export default {
   .cardContent {
     margin: -14px 0 20px 0;
   }
-  /deep/ .input-with-select .el-input-group__prepend {
-    background-color: #fff;
+  .table-page-search-wrapper {
+    /deep/ .el-form-item__content {
+      display: flex;
+    }
   }
 }
 </style>

src/views/ai/ai-data-aiCall.vue

@@ -10,18 +10,28 @@
       </div>
     </div>
     <div class="searchWarp">
-      <el-form inline="true" class="table-page-search-wrapper" size="small">
+      <el-form inline="true" class="table-page-search-wrapper" size="small" v-show="dimension == '门店维度'">
         <el-form-item>
-          <el-input placeholder="请输入门店名称/code" v-model="form.search" class="input-with-select" @change="handleSearch" v-show="dimension == '门店维度'" clearable> </el-input>
-          <el-select v-model="form.storeGroupLevel" v-show="dimension == '分组维度'" @change="handleSearch">
-            <el-option v-for="item in selectOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-          </el-select>
+          <el-input placeholder="请输入门店名称/code" v-model="form.search" class="input-with-select" @change="handleSearch" clearable> </el-input>
         </el-form-item>
         <el-form-item>
           <vue-gic-select-tree :options="options" @change="onChange"></vue-gic-select-tree>
         </el-form-item>
         <el-button icon="iconfont icon-cp-xiazai" class="fr" type="primary" @click="exportAiStoreOutbound" :disabled="!total"> 查询结果导出</el-button>
       </el-form>
+      <el-form inline="true" class="table-page-search-wrapper" size="small" v-show="dimension == '分组维度'">
+        <el-form-item>
+          <el-select v-model="selectVal" class="w100">
+            <el-option label="分组层级" :value="1"></el-option>
+            <el-option label="分组名称" :value="2"></el-option>
+          </el-select>
+          <el-select v-model="form.storeGroupLevel" @change="handleSearch" v-show="selectVal == 1" class="w260">
+            <el-option v-for="item in selectOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+          </el-select>
+          <vue-gic-select-tree :options="options" v-show="selectVal == 2" @change="onChange"></vue-gic-select-tree>
+        </el-form-item>
+        <el-button icon="iconfont icon-cp-xiazai" class="fr" type="primary" @click="exportAiStoreOutbound" :disabled="!total"> 查询结果导出</el-button>
+      </el-form>
     </div>
     <div class="cardContent">
       <el-row :gutter="20">
@@ -138,7 +148,7 @@ export default {
         pageSize: 20
       },
       dimension: '门店维度',
-      select: '1',
+      selectVal: 1,
       tableData: [],
       selectOptions: [
         {
@@ -165,7 +175,7 @@ export default {
       options: {
         selectOptions: {
           allCheckText: '全部选中111',
-          width: 220,
+          width: 260,
           placeholder: '请选择'
           // data: []
         },
@@ -363,8 +373,10 @@ export default {
       this.tableHeader = [head, ...tableHead];
       this.loading = true;
       const { activityId, storeGroupLevel, storeGroupId, pageNum, pageSize } = this.form;
+      const params = { activityId, storeGroupLevel, storeGroupId };
+      this.selectVal == 1 ? delete params.storeGroupId : delete params.storeGroupLevel;
       try {
-        const { result } = await aiStoreGroupOutboundRank({ activityId, storeGroupLevel, storeGroupId }, `&pageNum=${pageNum}&pageSize=${pageSize}`);
+        const { result } = await aiStoreGroupOutboundRank(params, `&pageNum=${pageNum}&pageSize=${pageSize}`);
         if (!result) return;
         this.tableData = result.result || [];
         this.total = result.totalCount;
@@ -404,6 +416,7 @@ export default {
         this.aiStoreOutboundStatistics();
       } else if (data == '分组维度') {
         this.form.storeGroupLevel = 1;
+        this.selectVal = 1;
         // 分组维度列表+统计数据
         this.aiStoreGroupOutboundRank();
         this.aiStoreGroupOutboundStatistics();
@@ -465,8 +478,10 @@ export default {
   .cardContent {
     margin: -14px 0 20px 0;
   }
-  /deep/ .input-with-select .el-input-group__prepend {
-    background-color: #fff;
+  .table-page-search-wrapper {
+    /deep/ .el-form-item__content {
+      display: flex;
+    }
   }
 }
 </style>