测试bug修复

src/views/financialManagement/composition/common.js

@@ -0,0 +1,15 @@
+
+export default function financialCommon() {
+  // 合同类型
+  const contractTypeArray=[{value:0,label:"自付合同",
+  children:[{value:1,label:"新签",children:null},{value:2,label:"续约",children:null},{value:4,label:"补充协议",children:null}]},
+  {value:1,label:"代付合同",
+  children:[{value:1,label:"新签",children:null},{value:2,label:"续约",children:null},{value:4,label:"补充协议",children:null}]}]
+  // 合同状态
+  const contractStatusArray=[{id:1,label:"已审批"},{id:2,label:"单章寄出"},{id:3,label:"已签回"},{id:4,label:"已终止"},{id:5,label:"邮件备案"}]
+
+  return {
+    contractTypeArray,
+    contractStatusArray
+  }
+}

src/views/financialManagement/contractProgress-component/Compliance.vue

@@ -6,15 +6,13 @@
   import {getContractSearchList,getServiceDetail} from '@/api/crm'
   import {registerAdd,registerEdit,contractRegisterCheck} from '@/api/financialMana'
   import {intervalDataRequest} from '@/utils/common-methods'
+  import financialCommon from '../composition/common'
 
   const contractSourceArray=['非CRM合同导入','CRM合同导入']
   // 合同状态数组
-  const contractStatusArray=[{id:1,label:"已审批"},{id:2,label:"单章寄出"},{id:3,label:"已签回"},{id:4,label:"已终止"},{id:5,label:"邮件备案"}]
+  const contractStatusArray=financialCommon().contractStatusArray
   // 合同类型数组
-  const contractTypeArray=[{value:0,label:"自付合同",
-  children:[{value:1,label:"新签",children:null},{value:2,label:"续约",children:null},{value:4,label:"补充协议",children:null}]},
-  {value:1,label:"代付合同",
-  children:[{value:1,label:"新签",children:null},{value:2,label:"续约",children:null},{value:4,label:"补充协议",children:null}]}]
+  const contractTypeArray=financialCommon().contractTypeArray
 
   const props=defineProps({
     // 权限类型

src/views/financialManagement/financialList.vue

@@ -4,12 +4,13 @@ import {useRouter,useRoute} from 'vue-router'
 import {getSimpleServiceList,getRegisterList,updateRegisterStatus,
   registerDelete,registerListExport,importDataApi} from '@/api/financialMana'
 import {downloadByFlow} from '@/utils/common-methods'
+import financialCommon from './composition/common'
 
 const router = useRouter()
 const route = useRoute()
 const changeStatusForm=ref(null)
-const contractTypeArray=[{id:1,label:"新签合同"},{id:2,label:"续约合同"},{id:3,label:"代付合同"},{id:4,label:"补充协议"}]
-const contractStatusArray=[{id:1,label:"已审批"},{id:2,label:"单章寄出"},{id:3,label:"已签回"},{id:4,label:"已终止"},{id:5,label:"邮件备案"}]
+const contractTypeArray=financialCommon().contractTypeArray
+const contractStatusArray=financialCommon().contractStatusArray
 const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
 
   const financial=reactive({
@@ -89,6 +90,16 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
     financial.searchParams.current = pageNo
     financialList()
   }
+  // 合同类型筛选项
+  const contractTypeChange=(value)=>{
+    if(!value) financial.searchParams.contract_type=''
+    let contractTypeParam=[]
+    value.map(item => {
+      contractTypeParam.push(item.join(''))
+    })
+    financial.searchParams.contract_type=contractTypeParam.join(',')
+    searchFinancial()
+  }
 
   const serviceTypeChange=(value)=>{
     financial.searchParams.service_types=value.join(',')
@@ -218,20 +229,19 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
             <el-date-picker v-model="financial.createtime" start-placeholder="登记日期-开始"
             end-placeholder="登记日期-结束" style="margin-right: 30px;max-width: 240px;margin-bottom: 8px;"
             value-format="YYYY-MM-DD" type="daterange"></el-date-picker>
-            <!-- <el-select v-model="financial.searchParams.service_type" placeholder="请选择套餐类型" clearable
-            @change="searchFinancial" style="width: 286px;margin-bottom: 8px;">
-              <el-option v-for="item in financial.serviceTypeArray" :key="item.service_template_id"
-              :label="item.title" :value="item.service_template_id"></el-option>
-            </el-select> -->
             <el-cascader :options="financial.serviceTypeArray" style="width: 240px;margin-bottom: 8px;margin-right: 30px;"
               @change="serviceTypeChange"
              placeholder="请选择套餐" clearable collapse-tags :show-all-levels="false"
             :props="{multiple:true,label:'title',value:'service_template_id',children:'children',emitPath:false}">
             </el-cascader>
-            <el-select v-model="financial.searchParams.contract_type" placeholder="请选择合同类型" clearable
+            <!-- <el-select v-model="financial.searchParams.contract_type" placeholder="请选择合同类型" clearable
             @change="searchFinancial" style="width: 240px;margin-bottom: 8px;">
               <el-option :label="item.label" :value="item.id" v-for="item in contractTypeArray" :key="item.id"></el-option>
-            </el-select>
+            </el-select> -->
+            <el-cascader :options="contractTypeArray" style="width: 240px;margin-bottom: 8px;margin-right: 30px;z-index: 100;"
+              @change="contractTypeChange" placeholder="请选择合同类型" clearable collapse-tags collapse-tags-tooltip
+               :props="{multiple:true}">
+            </el-cascader>
             <el-select v-model="financial.searchParams.register_status" placeholder="请选择登记状态" clearable
             @change="searchFinancial" style="width: 240px;margin-bottom: 8px;">
               <el-option :label="item.label" :value="item.id" v-for="item in statusArray" :key="item.id"></el-option>