Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/finance/audit.vue

@@ -168,10 +168,18 @@
         <el-table :data="firstData" :height="tableHeight"
           style="width: 100%; margin-top: 20px;" highlight-current-row>
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
-          <el-table-column prop="attrType" label="业务员类型" width="120"></el-table-column>
+          <el-table-column prop="attrType" label="业务员类型" width="120">
+            <template #default="scope">
+              <el-tag :type="attrTypeTag(scope.row.attrType)">{{ scope.row.attrType }}</el-tag>
+            </template>
+          </el-table-column>
           <el-table-column prop="mobile" label="业务员手机号" width="120"></el-table-column>
           <el-table-column prop="name" label="业务员" width="120"></el-table-column>
-          <el-table-column prop="orderType" label="订单类型" width="120"></el-table-column>
+          <el-table-column prop="orderType" label="订单类型" width="120">
+            <template #default="scope">
+              <el-tag :type="orderTypeTag(scope.row.orderType)">{{ scope.row.orderType }}</el-tag>
+            </template>
+          </el-table-column>
           <el-table-column prop="agreementName" label="出单协议" width="120"></el-table-column>
           <el-table-column prop="companyALlName" label="保险公司" width="120"></el-table-column>
           <el-table-column prop="partnerCompanyName" label="保险机构" width="220"></el-table-column>
@@ -378,10 +386,18 @@
         <el-table :data="secondData" :height="tableHeight" style="width: 100%; margin-top: 20px;"
           highlight-current-row>
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
-          <el-table-column prop="attrType" label="业务员类型" width="120"></el-table-column>
+          <el-table-column prop="attrType" label="业务员类型" width="120">
+            <template #default="scope">
+              <el-tag :type="attrTypeTag(scope.row.attrType)">{{ scope.row.attrType }}</el-tag>
+            </template>
+          </el-table-column>
           <el-table-column prop="mobile" label="业务员手机号" width="120"></el-table-column>
           <el-table-column prop="name" label="业务员" width="120"></el-table-column>
-          <el-table-column prop="orderType" label="订单类型" width="120"></el-table-column>
+          <el-table-column prop="orderType" label="订单类型" width="120">
+            <template #default="scope">
+              <el-tag :type="orderTypeTag(scope.row.orderType)">{{ scope.row.orderType }}</el-tag>
+            </template>
+          </el-table-column>
           <el-table-column prop="agreementName" label="出单协议" width="120"></el-table-column>
           <el-table-column prop="companyALlName" label="保险公司" width="120"></el-table-column>
           <el-table-column prop="partnerCompanyName" label="保险机构" width="220"></el-table-column>
@@ -484,7 +500,11 @@
         <el-table :data="thirdData" :height="tableHeight" style="width: 100%; margin-top: 20px;"
           highlight-current-row>
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
-          <el-table-column prop="attrType" label="业务员类型" width="120"></el-table-column>
+          <el-table-column prop="attrType" label="业务员类型" width="120">
+              <template #default="scope">
+              <el-tag :type="attrTypeTag(scope.row.attrType)">{{ scope.row.attrType }}</el-tag>
+            </template>
+          </el-table-column>
           <el-table-column prop="mobile" label="业务员手机号" width="120"></el-table-column>
           <el-table-column prop="name" label="业务员" width="120"></el-table-column>
           <el-table-column prop="companyALlName" label="保险公司" width="120"></el-table-column>
@@ -610,17 +630,15 @@
           highlight-current-row>
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型" width="120">
-            <template #default="scope">
-              {{ scope.row.attrType == '5' ? '团队' : scope.row.attrType == '6' ? '个代' : scope.row.attrType ==
-                '7' ? '渠道' : scope.row.attrType == '8' ? '电销组' : '--' }}
+             <template #default="scope">
+              <el-tag :type="attrTypeTag(scope.row.attrType)">{{ scope.row.attrType }}</el-tag>
             </template>
           </el-table-column>
           <el-table-column prop="mobile" label="业务员手机号" width="120"></el-table-column>
           <el-table-column prop="name" label="业务员" width="120"></el-table-column>
           <el-table-column prop="orderType" label="订单类型" width="120">
-            <template #default="scope">
-              {{ scope.row.orderType == '1' ? '车险录入' : scope.row.orderType == '2' ? '代客录单' : scope.row.orderType ==
-                '3' ? '补录订单' : '--' }}
+             <template #default="scope">
+              <el-tag :type="orderTypeTag(scope.row.orderType)">{{ scope.row.orderType }}</el-tag>
             </template>
           </el-table-column>
           <el-table-column prop="agreementName" label="出单协议" width="120"></el-table-column>
@@ -681,6 +699,29 @@ const formRefMap: Record<string, Ref<FormInstance | undefined>> = {
   '2': formRef2,
   '3': formRef3,
 }
+// 人员类型匹配
+const attrTypeTag = (name: string) => {
+  const map: any = {
+    '个代': 'primary',
+    '渠道': 'success',
+    '团队': 'warning',
+    '电销': 'danger',
+    '工作室管理员': 'info',
+    '合伙人': 'info',
+    '后线人员': 'info',
+    '前线人员': 'info',
+  }
+  return map[name] || 'info'
+}
+// 订单类型匹配
+const orderTypeTag = (name: string) => {
+  const map: any = {
+    '车险录入': 'primary',
+    '补录订单': 'success',
+    '代客录单': 'warning',
+  }
+  return map[name] || 'info'
+}
 const tableHeight = ref(); // 初始化表格高度
 
 const myRouter = useRouter()

src/views/finance/modules/auditDetail.vue

@@ -818,7 +818,7 @@
               </th>
               <th>
                 <el-input-number v-model="detailData.costRatio.jyInletRatio" controls-position="right" v-if="costShow"
-                  style="width: 80px" :min="0" :max="100" />
+                  style="width: 80px" :min="0" :max="1000" />
                 <div v-else>{{ detailData?.costRatio?.jyInletRatio }}%</div>
               </th>
               <th>

src/views/payCredit/index.vue

@@ -207,16 +207,6 @@
         </template>
         <el-form :model="firstForm" label-width="100">
           <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item label="业务员">
-                <el-input v-model="firstForm.salesman" placeholder="请输入" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="业务员工号">
-                <el-input v-model="firstForm.mobile" placeholder="请输入" clearable></el-input>
-              </el-form-item>
-            </el-col>
             <el-col :span="8">
               <el-form-item label="业务员类型">
                 <el-select v-model="firstForm.attrType" placeholder="请选择" clearable>
@@ -231,23 +221,48 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="业务员">
+                <el-input v-model="firstForm.salesman" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="业务员工号">
+                <el-input v-model="firstForm.mobile" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="管理人">
+                <el-input v-model="firstForm.managerName" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="提现时间">
                 <el-date-picker v-model="firstForm.createTime" type="daterange" range-separator="至"
                   start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="提现金额">
+                <el-input v-model="firstForm.amount" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="审核人">
                 <el-input v-model="firstForm.auditingUser" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="审核时间">
-                <el-date-picker v-model="firstForm.auditTime" type="daterange" range-separator="至"
+              <el-form-item label="支付时间（待开发）">
+                <el-date-picker v-model="firstForm.paymentTime" type="daterange" range-separator="至"
                   start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="付款账户（待开发）">
+                <el-input v-model="firstForm.xxxxxxx" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24" style="display: flex; align-items: center; justify-content: flex-end">
               <el-button plain @click="handleExport">数据导出</el-button>
               <el-button type="primary" @click="handleSearch">搜索</el-button>
@@ -260,8 +275,6 @@
         </el-form>
         <el-table :data="firstData2" height="calc(100% - 218px)" style="width: 100%; margin-top: 20px;"
           highlight-current-row>
-          <el-table-column prop="name" label="业务员"></el-table-column>
-          <el-table-column prop="mobile" label="业务员工号"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型">
             <template #default="scope">
               {{ scope.row.attrType == '1' ? '前线人员' : scope.row.attrType == '2' ? '后线人员' : scope.row.attrType ==
@@ -270,16 +283,21 @@
                   '6' ? '个代' : scope.row.attrType == '7' ? '电销' : scope.row.attrType == '8' ? '渠道' : '' }}
             </template>
           </el-table-column>
+          <el-table-column prop="mobile" label="业务员手机号"></el-table-column>
+          <el-table-column prop="name" label="业务员"></el-table-column>
           <el-table-column prop="managerName" label="管理人"></el-table-column>
           <el-table-column prop="amount" label="提现金额"></el-table-column>
           <el-table-column prop="balanceAmount" label="账户余额"></el-table-column>
+          <el-table-column prop="cardHolderName" label="姓名"></el-table-column>
           <el-table-column prop="bankCardNum" label="银行卡号"></el-table-column>
           <el-table-column prop="bankName" label="银行"></el-table-column>
-          <el-table-column prop="cardHolderName" label="姓名"></el-table-column>
           <el-table-column prop="bankNum" label="开户行"></el-table-column>
           <el-table-column prop="createTime" label="提现时间" width="180"></el-table-column>
           <el-table-column prop="paymentTime" label="支付时间" width="180"></el-table-column>
+          <el-table-column prop="xxxxxx" label="审核人（待开发）" width="180"></el-table-column>
           <el-table-column prop="payAccountName" label="付款账户"></el-table-column>
+          <el-table-column prop="xxxxxx" label="凭证号（待开发）"></el-table-column>
+          <el-table-column prop="xxxxxx" label="回单资料（待开发）"></el-table-column>
         </el-table>
         <div class="pagination">
           <el-pagination v-model:current-page="pages" v-model:page-size="size" :page-sizes="[10, 20, 30, 40]"
@@ -438,7 +456,7 @@ const DrawRef = ref<FormInstance>()
 let AccountRef = ref()
 let RefusePopover = ref()
 const type = ref('3')
-let activeName = ref('0')
+let activeName = ref('1')
 const handleClick = (e) => {
   console.log(e.props.name)
   pages.value = 1

src/views/payCredit/myTask.vue

@@ -105,12 +105,7 @@
         </template>
         <el-form v-model="queryInfo" label-width="100">
           <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item label="业务员">
-                <el-input v-model="queryInfo.salesman" placeholder="请输入" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
+             <el-col :span="8">
               <el-form-item label="业务员类型">
                 <el-select v-model="queryInfo.attrType" placeholder="请选择" clearable>
                   <el-option label="前线人员" value="1"></el-option>
@@ -123,12 +118,43 @@
                   <el-option label="渠道" value="8"></el-option>
                 </el-select>
               </el-form-item>
+            </el-col>
+             <el-col :span="8">
+              <el-form-item label="业务员手机号">
+                <el-input v-model="queryInfo.mobile" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="业务员">
+                <el-input v-model="queryInfo.salesman" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+  <el-col :span="8">
+              <el-form-item label="管理人（待开发）">
+                <el-input v-model="queryInfo.managerName" placeholder="请输入" clearable></el-input>
+              </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="提现时间">
                 <el-date-picker v-model="time1" type="daterange" range-separator="至" start-placeholder="开始时间"
                   end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
+            </el-col>
+             <el-col :span="8">
+              <el-form-item label="提现金额">
+                <el-input v-model="queryInfo.amount" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="支付时间（待开发）">
+                <el-date-picker v-model="queryInfo.paymentTime" type="daterange" range-separator="至"
+                  start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="付款账户（待开发）">
+                <el-input v-model="queryInfo.xxxxxxx" placeholder="请输入" clearable></el-input>
+              </el-form-item>
             </el-col>
             <el-col :span="8"></el-col>
             <el-col :span="8"></el-col>
@@ -143,7 +169,6 @@
         <div style="font-size: 14px; color: #606266">应付总额：￥{{ totalAmount }}</div>
 
         <el-table :data="firstData2" height="calc(100% - 164px)" style="width: 100%; margin-top: 20px;">
-          <el-table-column prop="name" label="业务员" width="120"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型" width="120">
             <template #default="scope">
               {{ scope.row.attrType === '1' ? '前线人员' : scope.row.attrType === '2' ? '后线人员' : scope.row.attrType === '3'
@@ -151,18 +176,23 @@
                   === '6' ? '个代' : scope.row.attrType === '7' ? '电销' : scope.row.attrType === '8' ? '渠道' : '' }}
             </template>
           </el-table-column>
+          <el-table-column prop="mobile" label="业务员手机号" width="120"></el-table-column>
+
+          <el-table-column prop="name" label="业务员" width="120"></el-table-column>
+
           <el-table-column prop="managerName" label="管理人"></el-table-column>
           <el-table-column prop="amount" label="提现金额"></el-table-column>
           <el-table-column prop="balanceAmount" label="账户余额"></el-table-column>
+          <el-table-column prop="cardHolderName" label="姓名"></el-table-column>
+
           <el-table-column prop="bankCardNum" label="银行卡号" width="200"></el-table-column>
           <el-table-column prop="bankName" label="银行" width="120"></el-table-column>
-          <el-table-column prop="cardHolderName" label="姓名"></el-table-column>
           <el-table-column prop="bankNum" label="开户行"></el-table-column>
-          <el-table-column prop="withdrawalRequester" label="提现人"></el-table-column>
           <el-table-column prop="withdrawalRequestTime" label="提现时间" width="180"></el-table-column>
-          <el-table-column prop="auditingTime" label="审核时间" width="180"></el-table-column>
+          <el-table-column prop="auditingTime" label="支付时间 （待开发）" width="180"></el-table-column>
           <el-table-column prop="voucherId" label="凭证号"></el-table-column>
           <el-table-column prop="payAccountName" label="付款账户"></el-table-column>
+          <el-table-column prop="xxxxxx" label="回单资料 （待开发）"></el-table-column>
           <el-table-column label="操作" fixed="right" width="120" align="center">
             <template #default="scope">
               <el-button link type="primary" size="small" @click="handleModifyAccount(scope.row)">修改账户</el-button>

src/views/receivable/documentary/documentaryRecord.vue

@@ -54,6 +54,11 @@
               format="YYYY-MM-DD HH:mm:ss" />
           </el-form-item>
         </el-col>
+          <el-col :span="8">
+              <el-form-item prop="signMonth" label="月份">
+                <el-date-picker v-model="form.signMonth" style="width: 100%;" type="month" format="YYYY-MM" value-format="YYYY-MM" />
+              </el-form-item>
+            </el-col>
         <el-col :span="8">
           <el-form-item label="保险分支公司">
             <el-cascader filterable clearable placeholder="请选择" v-model="form.partnerCompanyId" :options="companyList1"

src/views/receivable/documentary/documentaryReport.vue

@@ -50,11 +50,7 @@
                   value-format="YYYY-MM" />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item prop="signMonth" label="月份">
-                <el-date-picker v-model="recordForm.signMonth" style="width: 100%;" type="month" format="YYYY-MM" value-format="YYYY-MM" />
-              </el-form-item>
-            </el-col>
+
             <el-col :span="24" style="height: 50px; display: flex; align-items: start; justify-content: flex-end">
               <el-button type="primary" @click="handleSearch(1)">查询</el-button>
               <el-button plain type="primary" @click="handleReset(1)">重置</el-button>
@@ -150,6 +146,11 @@
               <el-form-item prop="invoiceId" label="开票记录编号">
                 <el-input v-model="recordForm1.invoiceId"></el-input>
               </el-form-item>
+            </el-col>
+              <el-col :span="8">
+              <el-form-item prop="signMonth" label="月份">
+                <el-date-picker v-model="recordForm1.signMonth" style="width: 100%;" type="month" format="YYYY-MM" value-format="YYYY-MM" />
+              </el-form-item>
             </el-col>
             <el-col :span="8" style="display: flex; justify-content: flex-end">
               <el-button type="primary" @click="handleSearch(2)">查询</el-button>
@@ -630,7 +631,6 @@ const handleReset = (type) => {
   switch (type) {
     case 1:
       recordForm.value = {
-        signMonth: '',
         companyId: '',
         time: [],
         status: ''
@@ -658,7 +658,7 @@ const handleReset = (type) => {
 const handleSettlementDetail = (row) => {
   activeName.value = '2'
   recordForm1.value.partnerCompanyId = row.partnerCompanyId
-  recordForm1.value.signMonth = row.month
+  recordForm1.value.signMonth = row.signMonth
   if (row.invoiceType == '2') {
     recordForm1.value.invoiceRiskType = '10'
   } else {
@@ -673,7 +673,7 @@ const handleInvoiceRecord = (row) => {
     query: {
       partnerCompanyId: row.partnerCompanyId,
       invoiceType: row.invoiceType,
-      signMonth: row.month,
+      signMonth: row.signMonth,
     }
   })
 }