先合并需求池208 解决冲突

src/directives/index.js

@@ -1,2 +1,3 @@
 export * from './modules/buttonPermisson'
-export * from './modules/select-scroll'
+export * from './modules/select-scroll'
+export * from './modules/overflow-tooltip'

src/directives/modules/overflow-tooltip.js

@@ -0,0 +1,46 @@
+// 长度溢出显示ToolTip 请绑定的标签元素包裹住 element-plus的el-tooltip。
+/**
+ * binding.value 为长度溢出的元素的css选择器，没有请设置
+ */
+import { ElMessage } from 'element-plus'
+
+let mainElement 
+let tooltipNode
+export const overflowTooltip={
+  created(el,binding,vnode) {
+    try {
+      let {value} = binding
+      tooltipNode = vnode.children.find((childrenCmpt) => childrenCmpt.component?.type.name == 'ElTooltip')
+      setTimeout(()=>{
+        mainElement = el.querySelector(value)
+        if(!mainElement){
+          throw new Error('找不到指定css选择器的元素')
+        }
+        if(mainElement?.scrollWidth > mainElement?.clientWidth){
+          // 超出
+          tooltipNode.component.props.disabled=false
+        }else{
+          tooltipNode.component.props.disabled=true
+        }
+      },0)
+      if(!value){
+        throw new Error('请设置长度溢出的元素的css选择器')
+      }
+      console.log(tooltipNode);
+      if(!tooltipNode){
+        throw new Error('找不到el-tooltip组件')
+      }
+    } catch (error) {
+      ElMessage.error(error.message)
+      // console.log(error.message);
+    }
+  },
+  updated() {
+    if(mainElement?.scrollWidth > mainElement?.clientWidth){
+      // 超出
+      tooltipNode.component.props.disabled=false
+    }else{
+      tooltipNode.component.props.disabled=true
+    }
+  },
+}

src/views/financialManagement/components/permissionQyDia.vue

@@ -84,6 +84,10 @@
  
   const submit=()=>{
     permissionDia.permissionChecked=[]
+    if(props.serviceType==1 && !permissionDia.qyBigService){
+      ElMessage.warning('请选择权益大套餐品种')
+      return 
+    }
     if(props.serviceType==2){
       props.permissionData.map(item =>{
         permissionDia.permissionChecked=[...permissionDia.permissionChecked,...item.check_list]

src/views/financialManagement/contractProgress.vue

@@ -63,9 +63,10 @@
       end_date:'',
       contract_amount:'',
       contract_type:'',
+      has_payment:'',
+      actual_pay_companies:'',
       relate_contract_code:'',
       relate_contract_main_code:'',
-      actual_pay_companies:'',
       sign_date:'',
       agreed_pay_time:'',
       // 套餐金额
@@ -312,18 +313,16 @@
     }
   }
 
-  const elMessageDom=ref(null)
+  let elMessageDom=null
 
-  const selectVisible=(value,that,selectRef)=>{
+  const selectVisible=(value)=>{
     if(value){
-      if(!elMessageDom.value){
-        elMessageDom.value=ElMessage.warning('请选择套餐类型')
+      if(!elMessageDom){
+        elMessageDom=ElMessage.warning('请选择套餐类型')
         setTimeout(()=>{
-          elMessageDom.value=null
+          elMessageDom=null
         },1000)
       }
-      // 加上下面这个，直接额外触发4次selectVisible，不知道为啥。
-      that.$refs[selectRef].blur()
     }
   }
 
@@ -488,9 +487,10 @@
       end_date:'',
       contract_amount:'',
       contract_type:'',
+      has_payment:'',
+      actual_pay_companies:'',
       relate_contract_code:'',
       relate_contract_main_code:'',
-      actual_pay_companies:'',
       sign_date:'',
       agreed_pay_time:'',
       services:[],
@@ -668,14 +668,15 @@
     contractInfo.contractValidityDate=[selectItem.start_date,selectItem.end_date]
     contractInfo.form.contract_amount=selectItem.price
     contractInfo.form.seller_id=selectItem.seller_id
+    contractInfo.form.has_payment=selectItem.contract_business_type_int-1
+    contractInfo.form.actual_pay_companies=selectItem.actual_pay_companies
     contractInfo.form.seller_ids=selectItem.seller_id+''
-    contractInfo.form.contract_type=selectItem.contract_type_key
-    contractInfo.form.has_payment = selectItem.actual_pay_companies?1:0
+    // selectItem.contract_type_int 1-新签 2-续约 3-补充
+    // contractInfo.form.contract_type 1-新签 2-续约 4-补充
+    contractInfo.form.contract_type=selectItem.contract_type_int==3?4:selectItem.contract_type_int
     contractInfo.form.relate_contract_code=contractInfo.form.has_payment?selectItem.relate_contract_code:''
     contractInfo.form.relate_contract_main_code=contractInfo.form.contract_type==3?selectItem.relate_contract_main_code:''
-    contractInfo.form.actual_pay_companies=contractInfo.form.has_payment?selectItem.actual_pay_companies:''
     contractInfo.contractTypeCheck = [contractInfo.form.has_payment,contractInfo.form.contract_type]
-    console.log(contractInfo.contractTypeCheck);
     contractInfoForm.value && 
     contractInfoForm.value.validateField([
       'contract_code','company_name','contract_type','seller_ids',
@@ -686,6 +687,7 @@
     contractInfo.showServiceQy = selectItem.product_id == 2
 
   }
+
   // 销售选中
   const selectSeller=(value)=>{
     contractInfo.form.seller_ids=value+''
@@ -1017,6 +1019,10 @@
         }
         // contractInfo.form.service_amount = [{product_id:1,service_amount:contractInfo.form.services_amount},
         // {product_id:2,service_amount:contractInfo.form.services_Qy_amount}]
+        if(!contractInfo.form.has_payment){
+          contractInfo.form.has_payment=0
+          contractInfo.form.actual_pay_companies=''
+        }
         console.log(contractInfo.form);
         // 检验合同名称或者合同有效期是否重复
         if(contractInfo.form.contract_register_id){
@@ -1243,9 +1249,9 @@
         end_date:res.data.end_date,
         contract_amount:res.data.contract_amount,
         contract_type:res.data.contract_type,
+        actual_pay_companies:res.data.actual_pay_companies,
         relate_contract_code:res.data.relate_contract_code,
         relate_contract_main_code:res.data.relate_contract_main_code,
-        actual_pay_companies:res.data.actual_pay_companies,
         sign_date:res.data.sign_date,
         agreed_pay_time:res.data.agreed_pay_time,
         service_remark:res.data.service_remark,
@@ -1577,9 +1583,13 @@
                         <el-input v-model="contractInfo.form.relate_contract_main_code" 
                         placeholder="请输入关联主合同" />
                       </el-form-item>
-                      <el-form-item label="代付方" prop="actual_pay_companies" v-if="contractInfo.form.has_payment">
-                        <el-input v-model="contractInfo.form.actual_pay_companies" 
-                        placeholder="请输入代付方" />
+                      <el-form-item label="代付方" prop="actual_pay_companies" v-if="contractInfo.form.has_payment==1">
+                        <div v-overflowTooltip="'#overflow-input'">
+                          <el-tooltip placement="top" :content="contractInfo.form.actual_pay_companies" >
+                            <el-input v-model="contractInfo.form.actual_pay_companies"
+                            placeholder="请输入代付方信息" id="overflow-input" />
+                          </el-tooltip>
+                        </div>
                       </el-form-item>
                       <el-form-item label="关联合同" prop="relate_contract_code" v-if="contractInfo.form.has_payment">
                         <el-input v-model="contractInfo.form.relate_contract_code" 
@@ -1848,7 +1858,7 @@
                               </el-select>
                               <el-select v-model="row.seller_id" style="width: 124px;" :ref='`invoiceData-service_product_id${$index}`'
                               placeholder="请选择销售" v-else
-                                @visible-change="(value)=>selectVisible(value,this,`invoiceData-service_product_id${$index}`)">
+                                @visible-change="selectVisible">
                               </el-select>
                             </el-form-item>
                             <span v-else>{{ row.seller_name || '--' }}</span>

src/views/financialManagement/placementPre.vue

@@ -38,9 +38,7 @@ const router = useRouter()
     title:'',
     editPreForm:{
       company_name:'',
-      new_company:0,
-      seller_id:'',
-      seller_name:'',
+      payment_date:'',
       amount:'',
       currency_unit:'CNY',
       start_date:'',
@@ -49,7 +47,7 @@ const router = useRouter()
     },
     rules:{
       company_name:{required:true,message:'客户名称不能为空',trigger:'blur'},
-      seller_id:{required:true,message:'销售不能为空',trigger:'change'},
+      payment_date:{required:true,message:'到款日不能为空',trigger:'blur'},
       amount:[{required:true,message:'到款金额不能为空',trigger:'blur'},
       {
         validator:(rule,value,callback)=>{
@@ -65,12 +63,9 @@ const router = useRouter()
     },
     validityDate:[]
   })
-  // 是否是新公司的复选框勾选判断
-  const is_new_company=ref(false)
 
   // 监听
   watch(()=>placemenetPre.createtime,(newVal)=>{
-    console.log(newVal);
     if(!newVal){
       placemenetPre.searchParams.start_date=''
       placemenetPre.searchParams.end_date=''
@@ -81,16 +76,7 @@ const router = useRouter()
     searchPlacementPre()
   })
 
-  watch(()=>dialog.editPreForm.new_company,(newVal)=>{
-    if(newVal==1){
-      is_new_company.value=true
-    }else{
-      is_new_company.value=false
-    }
-  })
-
   watch(()=>dialog.validityDate,(newVal)=>{
-    console.log(newVal);
     if(!newVal){
       dialog.editPreForm.start_date=''
       dialog.editPreForm.end_date=''
@@ -108,10 +94,6 @@ const router = useRouter()
       sellerList.value=res.data || []
     })
   }
-  // 销售选中
-  const selectSeller=(value)=>{
-    dialog.editPreForm.seller_name=sellerList.value.find(item => item.admin_id==value).real_name
-  }
 
   // 获取货币列表
   const getCurrencyListFun=()=>{
@@ -125,7 +107,7 @@ const router = useRouter()
     getPrePlacementList(placemenetPre.searchParams).then(res=>{
       placemenetPre.tableData=res.data.list || []
       placemenetPre.total=res.data.page?.total || 0
-      console.log(res);
+      // console.log(res);
     })
   }
   // 切换每页的数量
@@ -154,11 +136,8 @@ const router = useRouter()
     router.push({path:'/financial/list/contractProgress',query:{
       supplementaryId:row.pre_pay_id,
       company_name:row.company_name,
-      seller_id:row.seller_id,
-      seller_name:row.seller_name,
-      amount_unit:row.currency_unit,
+      currency_unit:row.currency_unit,
       placement_amount:row.origin_amount,
-      new_company:row.new_company,
       start_date:row.start_date,
       end_date:row.end_date
     }})
@@ -173,9 +152,7 @@ const router = useRouter()
   const editPre=(row)=>{
     dialog.editPreForm.pre_pay_id = row.pre_pay_id
     dialog.editPreForm.company_name=row.company_name
-    dialog.editPreForm.new_company=row.new_company
-    dialog.editPreForm.seller_id=row.seller_id
-    dialog.editPreForm.seller_name=row.seller_name
+    dialog.editPreForm.payment_date=row.payment_date
     dialog.editPreForm.amount=row.origin_amount
     dialog.editPreForm.currency_unit=row.currency_unit
     dialog.editPreForm.remark=row.remark
@@ -188,9 +165,7 @@ const router = useRouter()
   const dialogClosed=()=>{
     dialog.editPreForm.pre_pay_id = ''
     dialog.editPreForm.company_name=''
-    dialog.editPreForm.new_company=0
-    dialog.editPreForm.seller_id=''
-    dialog.editPreForm.seller_name=''
+    dialog.editPreForm.payment_date=''
     dialog.editPreForm.amount=''
     dialog.editPreForm.currency_unit='CNY'
     dialog.editPreForm.remark=''
@@ -239,7 +214,7 @@ const router = useRouter()
   }
 
   //  ---------------------created
-  getSellerListFun()
+  // getSellerListFun()
   getCurrencyListFun()
   placementPreList()
 </script>
@@ -249,11 +224,11 @@ const router = useRouter()
     <!-- 顶部区域 -->
     <div class="placemenetPre-top-zone">
       <div class="placemenetPre-top-search-zone">
-        <el-input v-model="placemenetPre.searchParams.keyword" placeholder="客户姓名/销售" :prefix-icon="Search"
+        <el-input v-model="placemenetPre.searchParams.keyword" placeholder="客户姓名" :prefix-icon="Search"
         style="width: 340px;margin-right: 30px;" @input="searchPlacementPre" clearable />
-        <el-date-picker v-model="placemenetPre.createtime" start-placeholder="开始日期"
+        <!-- <el-date-picker v-model="placemenetPre.createtime" start-placeholder="开始日期"
         end-placeholder="结束日期" style="max-width: 240px;"
-        value-format="YYYY-MM-DD" type="daterange"></el-date-picker>
+        value-format="YYYY-MM-DD" type="daterange"></el-date-picker> -->
       </div>
       <!-- 按钮区域 -->
       <div class="placemenetPre-top-option-zone" v-permission="'financial:placementPre:add'">
@@ -263,20 +238,12 @@ const router = useRouter()
     </div>
     <div class="placemenetPre-table-zone">
       <!-- 表格 -->
-      <el-table :data="placemenetPre.tableData" border max-height="695px" @sort-change="sortChange"
+      <el-table :data="placemenetPre.tableData" border max-height="695px"
       size="default" style="position: sticky;"> 
         <el-table-column label="客户名称" prop="company_name"
         show-overflow-tooltip min-width="120"></el-table-column>
-        <el-table-column label="是否新客户" prop="new_company" width="100">
-          <template #default="{row}">
-            {{ row.new_company==1?'是':'否' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="销售" width="90" prop="seller_name">
-          <!-- <template #default="{row}">
-            
-          </template> -->
-        </el-table-column>
+        <el-table-column label="到款日" prop="payment_date"
+        show-overflow-tooltip min-width="110"></el-table-column>
         <el-table-column label="到款金额" prop="origin_amount" width="120"></el-table-column>
         <el-table-column label="金额单位" prop="unit_name" width="90">
         </el-table-column>
@@ -286,7 +253,7 @@ const router = useRouter()
           </template>
         </el-table-column>
         <el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
-        <el-table-column label="创建时间" prop="create_time" width="165" sortable="custom"></el-table-column>
+        <!-- <el-table-column label="创建时间" prop="create_time" width="165" sortable="custom"></el-table-column> -->
         <el-table-column label="创建人" width="90" prop="admin_name"></el-table-column>
         <el-table-column label="操作" fixed="right" 
         v-permission="['financial:placementPre:supplementary','financial:placementPre:edit','financial:placementPre:delete']">
@@ -327,15 +294,12 @@ const router = useRouter()
         :rules="dialog.rules" style="margin-top: 10px;">
           <el-form-item label="客户名称" prop="company_name">
             <el-input v-model="dialog.editPreForm.company_name"
-            placeholder="请输入客户名称" style="width:260px" />
-            <el-checkbox v-model="is_new_company" label="新客户" style="margin-left: 20px;min-width: 100px;"
-            size="large" @change="(value) => dialog.editPreForm.new_company = value?1:0" />
+            placeholder="请输入客户名称" style="width:346px" />
           </el-form-item>
-          <el-form-item label="销售" prop="seller_id">
-            <el-select v-model="dialog.editPreForm.seller_id" placeholder="请选择销售" style="width: 346px;"
-            filterable @change="selectSeller">
-              <el-option :label="item.real_name" :value="item.admin_id" v-for="item in sellerList" :key="item.admin_id"></el-option>
-            </el-select>
+          <el-form-item label="到款日" prop="payment_date">
+            <el-date-picker v-model="dialog.editPreForm.payment_date" placeholder="请选择到款日" 
+            :clearable="false" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+            ></el-date-picker>
           </el-form-item>
           <el-form-item label="到款金额" id="contractInfo-contractAmount"
           prop="amount">
@@ -411,7 +375,7 @@ const router = useRouter()
     }
     .el-date-editor{
       .el-input__wrapper{
-        width: 286px;
+        width: 346px;
       }
     }
   }

src/views/financialStatistics/commodityPayment.vue

@@ -7,6 +7,7 @@ import {getSimpleServiceList} from '@/api/financialMana'
 import {downloadByFlow} from '@/utils/common-methods'
 
 const moment = inject('$moment')
+  const timeTypeData=[{label:'开票日期',value:1},{label:'到款日期',value:2},{label:'开票日期&到款日期',value:3}]
   const dateButtonData=[{text:'近1月',tabId:1},{text:'近2月',tabId:2},{text:'近3月',tabId:3}]
 
   // const groupList=ref([])
@@ -20,8 +21,8 @@ const moment = inject('$moment')
     service_types:'',
     start_date:moment().startOf('year').format('YYYY-MM-DD') || '',
     end_date:moment(new Date()).format('YYYY-MM-DD') || '',
-    // 1-开票时间 2-到款时间
-    // time_type:1,
+    // 1-开票日期&到款日期 2-开票日期 3-到款日期
+    time_type:"",
     // 1-已开票
     has_invoice:'',
     // 1-已到款
@@ -310,6 +311,10 @@ const moment = inject('$moment')
             :class="[index==0?'first-button':index==(dateButtonData.length-1)?'last-button':'inner-button',currentDateTab==item.tabId?'selectTab':'']" 
             @click="changeDateType(item.tabId)">{{ item.text }}</el-button>
           </div>
+          <el-select v-model="searchParams.time_type" placeholder="请选择日期类型" @change="searchCommodityP"
+          style="width: 200px;" clearable>
+            <el-option :label="item.label" :value="item.value" v-for="item in timeTypeData" :key="item.value"></el-option>
+          </el-select>
         </div>
         <el-select v-model="searchParams.has_invoice" placeholder="请选择开票状态" clearable 
          class="search-item" @change="searchCommodityP" >
@@ -504,7 +509,6 @@ const moment = inject('$moment')
       display: flex;
       align-items: center;
       flex-wrap: wrap;
-      
       .search-item{
         width: 200px;
         margin: 0 0 8px 30px;
@@ -514,6 +518,7 @@ const moment = inject('$moment')
         align-items: center;
         margin: 0 0 8px 30px;
         .composition-button-tabs{
+          margin-right: 20px;
 
           .date-button{
             height: 40px;