Merge remote-tracking branch 'origin/master'

src/views/system/config/config.vue

@@ -3398,6 +3398,7 @@ import { listCompany } from '@/api/company/company'
 import { getStoreProductColumns } from '@/api/hisStore/storeProduct'
 import { getStoreColumns } from '@/api/hisStore/store'
 import{ getSignProjectName } from '@/api/course/qw/courseWatchLog'
+import { listQwCompany } from '@/api/qw/qwCompany'
 
 export default {
   name: 'Config',

src/views/system/config/integralConfig.vue

@@ -240,7 +240,22 @@
           </el-radio-group>
         </div>
       </el-form-item>
-
+      <el-form-item label="积分兑换佣金积分类型" prop="integralTypes">
+        <el-select
+          v-model="form11.integralTypes"
+          clearable filterable
+          placeholder="请选择积分类型"
+          multiple
+          size="small">
+          <el-option
+            v-for="item in integralLogTypeOptions"
+            :key="item.dictValue"
+            :label="item.dictLabel"
+            :value="item.dictValue"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-divider content-position="left">积分类型展示端配置</el-divider>
       <el-table :data="logTypeDisplayRows" border size="small" style="margin-bottom: 20px;">
         <el-table-column label="类型值" prop="code" width="80" />