2024.04.09

- 商家选品列表的查询条件的分组列表重新对接接口并传groupId，平台选品列表的查询条件的分组列表重新对接接口；

src/api/selectionCenter/selectionCenter.js

@@ -45,6 +45,15 @@ export function shopSelectionSelectShopLibrary(data) {
   })
 }
 
+// 平台选择商品分组查询
+export function getAdminGroupSelectProduct(data) {
+  return request({
+    url: '/product/getAdminGroupSelect',
+    method: 'post',
+    data
+  })
+}
+
 // 分页查询商家分销定价方案信息表
 export function priceControlGetPage(data) {
   return request({

src/views/selectionCenter/distributionPricingPlan/components/EditModal.vue

@@ -26,6 +26,16 @@
       <el-form-item label="渠道价定价系数" prop="channelPrice">
         <el-input v-model="formData.channelPrice" placeholder="请输入渠道价定价系数" />
       </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-select v-model="formData.type" size="mini" placeholder="请选择板块类型">
+          <!-- 加盟商下有团长、合伙人。代理商下有团长、合伙人、加盟商。 -->
+          <el-option label="平台" :value="0" />
+          <el-option label="团长" :value="1" />
+          <el-option label="合伙人" :value="2" />
+          <el-option label="加盟商" :value="3" />
+          <el-option label="代理商" :value="4" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="活动开始时间" prop="startTime">
         <el-date-picker
           v-model="formData.startTime"
@@ -107,6 +117,9 @@ export default {
           { required: false, message: '请输入渠道价定价系数' },
           { pattern: /^0\.\d{0,2}$|^[1-9]\d*\.\d{0,2}$|^[1-9]\d*$/, message: '数值有误' }
         ],
+        type: [
+          { required: true, message: '请选择定价方案类型' }
+        ],
         startTime: [
           { required: false, message: '请选择活动开始时间' }
         ],
@@ -123,7 +136,7 @@ export default {
     initList() {
     },
     handleOpen(params = {}) {
-      this.modalOptions.title = params.priceId ? '编辑定时任务' : '添加定时任务'
+      this.modalOptions.title = params.priceId ? '编辑定价方案' : '添加定价方案'
       this.visible = true
       this.initList()
       if (params.priceId) {
@@ -162,7 +175,6 @@ export default {
     handleSubmit() {
       this.$refs.formData.validate(async (valid) => {
         if (valid) {
-          await this.$validatorForm('formData')
           const loading = this.$loading({ text: '提交中，请稍候……' })
           try {
             const { ...otps } = this.formData

src/views/selectionCenter/productSelectionList/components/PlatformSelection.vue

@@ -120,8 +120,8 @@
 <script>
 import DetailModal from './DetailModal'
 import SelectionAddModal from './SelectionAddModal'
-import { shopSelectionGetPlatformLibrary } from '@/api/selectionCenter/selectionCenter'
-import { getBrandList, getGroupSelect } from '@/api/commodity'
+import { shopSelectionGetPlatformLibrary, getAdminGroupSelectProduct } from '@/api/selectionCenter/selectionCenter'
+import { getBrandList } from '@/api/commodity'
 import XeUtils from 'xe-utils'
 
 export default {
@@ -184,7 +184,7 @@ export default {
       this.$refs.DetailModal && this.$refs.DetailModal.handleOpen(row)
     },
     async getGroupDataList() {
-      const result = await getGroupSelect({})
+      const result = await getAdminGroupSelectProduct({ shopId: '186' })
       XeUtils.eachTree(result.data, (item) => {
         if (Array.isArray(item.childs) && item.childs.length === 0) {
           item.childs = undefined

src/views/selectionCenter/productSelectionList/index.vue

@@ -16,8 +16,8 @@
         <el-option label="无库存" :value="0" />
       </el-select>
       <el-cascader
-        v-model="listQuery.classifyId" placeholder="请选择商品类型" :options="categoryList"
-        :props="{ checkStrictly: true, expandTrigger: 'hover', label: 'categoryName', value: 'id', children: 'childs' }"
+        v-model="listQuery.groupId" placeholder="请选择分组类型" :options="groupList"
+        :props="{ checkStrictly: true, expandTrigger: 'hover', label: 'groupName', value: 'shopGroupId', children: 'childs' }"
         clearable size="mini" class="filter-item" style="width: 200px;margin-left: 10px;"
       />
       <el-button
@@ -117,10 +117,11 @@
 </template>
 
 <script>
+import { getShopId } from '@/utils/auth'
 import PlatformSelection from './components/PlatformSelection'
 import DetailModal from './components/DetailModal'
 import { shopSelectionGetLibrary } from '@/api/selectionCenter/selectionCenter'
-import { getBrandList, getClassify } from '@/api/commodity'
+import { getBrandList, getGroupSelect } from '@/api/commodity'
 import XeUtils from 'xe-utils'
 
 export default {
@@ -138,15 +139,15 @@ export default {
         page: 1,
         pageSize: 20,
         search: '',
-        classifyId: [],
+        groupId: [],
         stock: ''
       },
-      categoryList: [] // 商品类目-树结构
+      groupList: []
     }
   },
   created() {
     this.getList()
-    this.getCategoryTreeList()
+    this.getGroupDataList()
   },
   methods: {
     async getList() {
@@ -154,7 +155,7 @@ export default {
       try {
         const res = await shopSelectionGetLibrary({
           ...this.listQuery,
-          classifyId: Array.isArray(this.listQuery.classifyId) && this.listQuery.classifyId.length ? this.listQuery.classifyId[this.listQuery.classifyId.length - 1] : ''
+          groupId: Array.isArray(this.listQuery.groupId) && this.listQuery.groupId.length ? this.listQuery.groupId[this.listQuery.groupId.length - 1] : ''
         })
         const { data: brandList } = await getBrandList()
         this.list = res.data.list.map((item) => {
@@ -173,14 +174,14 @@ export default {
     handleDetail(row) {
       this.$refs.DetailModal && this.$refs.DetailModal.handleOpen(row)
     },
-    async getCategoryTreeList() {
-      const res = await getClassify({})
-      XeUtils.eachTree(res.data, (item) => {
+    async getGroupDataList() {
+      const result = await getGroupSelect({ shopId: getShopId() })
+      XeUtils.eachTree(result.data, (item) => {
         if (Array.isArray(item.childs) && item.childs.length === 0) {
           item.childs = undefined
         }
       }, { children: 'childs' })
-      this.categoryList = res.data
+      this.groupList = result.data
     }
   }
 }