合并

src/api/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-21 10:06:23
- * @LastEditTime: 2023-07-04 11:10:40
+ * @LastEditTime: 2023-07-04 14:09:37
  * @LastEditors: 飘泊客
  * @Description: In User Settings Edit
  * @FilePath: /byhl-taomi/src/api/index.js
@@ -1110,7 +1110,7 @@ export function setLogSave(data) {
     data
   })
 }
-export function getCompensateInfo333333333(params) {
+export function getCompensateInfo(params) {
   return request({
     url: baseObj.url + 'api/boost/compensateInfo',
     method: 'get',

src/views/CRM/funnelStatistics/index.vue

@@ -3,7 +3,7 @@
  * @Autor: 飘泊客
  * @Date: 2021-12-02 16:54:53
  * @LastEditors: 飘泊客
- * @LastEditTime: 2023-05-26 14:48:59
+ * @LastEditTime: 2023-07-04 14:05:56
 -->
 <template>
   <div class="app-container">
@@ -175,15 +175,15 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
+        <el-button
+          type="text"
+          @click="allotmentQuantityDialogClose"
+        >取消</el-button>
         <el-button
           :loading="allotmentQuantityDialogSubmitLoading"
           type="primary"
           @click="allotmentQuantitySubmit"
         >生成</el-button>
-        <el-button
-          type="text"
-          @click="allotmentQuantityDialogClose"
-        >取消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/CRM/opportunityPool/adminIndex.vue

@@ -195,6 +195,12 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column :show-overflow-tooltip="true" prop="originTaskName" label="来源任务" width="210">
+            <template slot-scope="scope">
+              <div class="text-hide">{{ scope.row.originTaskName || '-' }}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>

src/views/system/channelLabel/index.vue

@@ -19,7 +19,7 @@
       onkeypress="return event.keyCode != 13;"
       label-width="100px"
     >
-      <el-form-item label="渠道标签: " prop="fieldList" style="display: flex;flex-flow:nowrap;">
+      <el-form-item label="渠道标签: " style="display: flex;flex-flow:nowrap;">
         <el-checkbox-group v-model="channelCustom.fieldList" style="display: flex;flex-flow:row wrap" @change="handleCheckboxChange">
           <el-checkbox
             v-for="item in monitoringModeTwoList"
@@ -69,7 +69,7 @@ export default {
       },
       channelCustomRules: {
         fieldList: [
-          { type: 'array', required: true, message: '请至少选择一种表格类型', trigger: 'change' }
+          { required: true, message: '请输入渠道标签', trigger: 'blur' }
         ]
       },
       inputVisible: false, // 控制输入框的显隐
@@ -108,7 +108,7 @@ export default {
     // 回车/失去焦点
     async handleInputConfirm() {
       const inputValue = this.inputValue
-      if (inputValue) {
+      if (inputValue.trim()) {
         const index = this.monitoringModeTwoList.findIndex(item => item.routeName === inputValue)
         if (index === -1) { // 说明arr中不存在id为objid的对象
           const res = await addChannel({ routeName: inputValue })