营销费用管理调整

src/Form/marketingExpenseMag/add.vue

@@ -14,7 +14,7 @@
           <el-form :model="form" :rules="rules" ref="form" label-width="100px" label-position="right" size="mini">
             <el-col :span="24">
               <el-form-item label="业务员:" prop="hrid">
-                <popoverTable ref="salerRef"  :tablecols="tablecols" :param="salerParam" placeholder="请选择业务员" :isInput="false" @rowClick="rowClick"></popoverTable>
+                <popoverTable ref="salerRef"  :tablecols="tablecols" :param="salerParam" placeholder="请选择业务员" :isInput="false" @rowClick="rowClick" height="calc(100vh - 300px)"></popoverTable>
               </el-form-item>
             </el-col>
             <el-col :span="24">

src/HDrpManagement/marketingExpenseMag/components/expenseDetail.vue

@@ -22,7 +22,7 @@
               @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
     </el-input>
     <el-button type="primary"  @click="clickAdd" size="small">添加</el-button>
-    <el-button type="primary" class="inline-16" @click="clickDel" size="small">删除</el-button>
+    <el-button :type="delSelect.length == 0?'':'primary'" class="inline-16" @click="clickDel" size="small" :disabled="delSelect.length == 0">删除</el-button>
     <exportFile class="inline-16" :param="param" :columns="tablecols" fileName="营销费用明细"></exportFile>
     <div style="margin-top: 15px">
       <table-new-layout :layout="tablecols" :data="list"  :opwidth="200" :custom="true" :width="true" :customHeader="true"  fixedName="operation" :checkbox="true" @selectionChange="selectionChange" height="calc(100vh - 340px)">
@@ -85,28 +85,33 @@
       <div class="drawer__panel" style="margin-bottom: 0;padding-bottom: 0">
         <addTemplate ref="addRef" :param="followParam" :tablecols="tablecolsAdd" height="calc(100vh - 180px)" :hrid="data.hrid" @addSuccess="addSuccess">
           <template v-slot:operation="scope">
-            <label class="search__label">归属应用:</label>
-            <el-select v-model="followParam.content.where.ownertable" placeholder="请选择归属应用" class="inline-16" size="small" @change="$refs.addRef.listData($refs.addRef.param.content.pageNumber = 1)" clearable >
-              <el-option
-                  v-for="item in applicationList"
-                  :key="item.value"
-                  :label="item.remarks"
-                  :value="item.value">
-              </el-option>
-            </el-select>
-            <label class="search__label">跟进时间:</label>
-            <el-date-picker
-                style="margin-right: 10px"
-                size="small"
-                v-model="followDate"
-                @change="selectDate"
-                format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期">
-            </el-date-picker>
+            <div class="mt-10 inline-16">
+              <label class="search__label">归属应用:</label>
+              <el-select v-model="followParam.content.where.ownertable" placeholder="请选择归属应用" class="inline-16" size="small" @change="$refs.addRef.listData($refs.addRef.param.content.pageNumber = 1)" clearable >
+                <el-option
+                    v-for="item in applicationList"
+                    :key="item.value"
+                    :label="item.remarks"
+                    :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
+            <div class="mt-10 inline-16">
+              <label class="search__label">跟进时间:</label>
+              <el-date-picker
+                  style="margin-right: 10px"
+                  size="small"
+                  v-model="followDate"
+                  @change="selectDate"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期">
+              </el-date-picker>
+            </div>
+
           </template>
         </addTemplate>
       </div>
@@ -266,15 +271,17 @@ export default {
               "sa_salesfeesdetailid": data.sa_salesfeesdetailid,
               "ownerid": data.ownerid,
               "ownertable": data.ownertable,
-              "feestype": data.feestype,
+              "feestype": data.feestypefullname,
               "amount": data.amount,
               "followupdate": data.followupdate
             }
           ]
         }
       })
+      this.listData()
     },
     async amountChange(data){
+      console.log(data,'data金额调整')
       const res = await this.$api.requested({
         "id": "20240611093004",
         "content": {

src/template/addTemplate/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
-    <el-button type="primary"  size="small" @click="addData" :loading="addLoad">添加</el-button>
-    <el-button size="small" class="inline-16" @click="addAll" :loading="allLoad">一键全选</el-button>
+    <el-button :type="selectData.length == 0?'':'primary'"  size="small" @click="addData" :loading="addLoad" :disabled="selectData.length == 0" class="mt-10 inline-16">添加</el-button>
+    <el-button size="small" class="inline-16 mt-10" @click="addAll" :loading="allLoad">一键全选</el-button>
     <slot name="operation"></slot>
-    <el-input style="width:200px;" placeholder="搜索" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+    <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel mt-10" clearable>
     </el-input>
     <table-new-layout style="margin-top: 10px" :layout="tablecols" :data="list" :custom="true" :width="true" :checkbox="true" :height="height" @selectionChange="selectionChange">
       <template v-slot:customcol="scope">

src/template/popoverTable/index.vue

@@ -5,7 +5,9 @@
         width="900"
         v-model="show"
         trigger="click">
-      <tableTemplate ref="tableRef" :layout="tablecols" :param="param" :custom="true" :width="true" height="260px" :isInput="isInput" :isPagination="true"
+      <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel mt-10" clearable>
+      </el-input>
+      <tableTemplate ref="tableRef" :layout="tablecols" :param="param" :custom="true" :width="true" :height="height" :isInput="isInput" :isPagination="true"
       @selectionChange="selectionChange" @rowClick="rowClick">
         <template v-slot:customcol="scope">
           <div>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</div>
@@ -20,7 +22,7 @@
 import tableTemplate from './table'
 export default {
   name: "index",
-  props:['tablecols','param','disabled','placeholder','isInput'],
+  props:['tablecols','param','disabled','placeholder','isInput','height'],
   components:{tableTemplate},
   data(){
     return {