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

.env.production

@@ -2,6 +2,8 @@
 VITE_APP_SETTING = false
 # 页面标题
 VITE_APP_TITLE = 生产环境
+# 静态资源基础路径 nginx目录名
+VITE_BASE_PATH = /
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = https://sxzgkj.baoxianzhanggui.com/web-api
 # VITE_APP_API_BASEURL = http://192.168.0.250:8001

.env.test

@@ -2,9 +2,11 @@
 VITE_APP_SETTING = false
 # 页面标题
 VITE_APP_TITLE = 测试环境
+# 静态资源基础路径  nginx目录名
+VITE_BASE_PATH = /jzg_tennat_test/
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://test-tennat.baoxianzhanggui.com/api
-VITE_APP_API_BASEURL = http://192.168.0.250:8001  #测试环境
+VITE_APP_API_BASEURL = https://tennat.baoxianzhanggui.com/test_api
+# VITE_APP_API_BASEURL = http://192.168.0.250:8001  #测试环境
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 # 是否禁用开发者工具，可防止被调试
@@ -17,4 +19,4 @@ VITE_BUILD_SOURCEMAP = true
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS =
 # 是否在打包后生成存档，支持 zip 和 tar
-VITE_BUILD_ARCHIVE =
+VITE_BUILD_ARCHIVE =

src/views/platform/index.vue

@@ -193,7 +193,7 @@
           <el-table-column prop="jySuperviseCostsProportion" label="非车手续费比例" width="150"></el-table-column>
           <el-table-column prop="jyTotalProportion" label="非车总比例" width="150"></el-table-column>
           <el-table-column prop="jyOtherCostsProportion" label="非车跟单比例" width="150"></el-table-column>
-          <el-table-column prop="jyReceivablePremium" label="非车应收金额" width="150"></el-table-column>
+          <el-table-column prop="jyTotalPremiums" label="非车应收金额" width="150"></el-table-column>
           <!-- <el-table-column prop="sySuperviseCostsProportion" label="非车入口比例" width="120">
             <template #default="scope">
               {{ scope.row.insFeeOrders?.jyInletRatio || '-' }}

src/views/receivable/documentary/documentaryRecord.vue

@@ -90,9 +90,9 @@
               </span>
               <template #dropdown>
                 <el-dropdown-menu>
-                  <el-dropdown-item :disabled="scope.row.settlementStatus == '未结算'"
+                  <el-dropdown-item
                     @click="handleCountRecord(scope.row)">结算记录</el-dropdown-item>
-                  <el-dropdown-item :disabled="scope.row.settlementStatus == '未结算'"
+                  <el-dropdown-item
                     @click="handleInvoiceDetail(scope.row)">开票明细</el-dropdown-item>
                 </el-dropdown-menu>
               </template>

src/views/receivable/documentary/documentaryReport.vue

@@ -66,7 +66,7 @@
                   <template #dropdown>
                     <el-dropdown-menu>
                       <el-dropdown-item @click="handleSettlementDetail(scope.row)">结算明细</el-dropdown-item>
-                      <el-dropdown-item @click="handleInvoiceRecord(scope.row)">开票明细</el-dropdown-item>
+                      <!-- <el-dropdown-item @click="handleInvoiceRecord(scope.row)">开票明细</el-dropdown-item> -->
                     </el-dropdown-menu>
                   </template>
                 </el-dropdown>
@@ -328,7 +328,7 @@ import { useRouter, useRoute } from 'vue-router'
 
 const router = useRouter()
 const route = useRoute()
-let activeName = ref('1')
+const   activeName = ref('1')
 const handleClick = (e) => {
   activeName.value = e.props.name
   pages.value = 1
@@ -380,6 +380,7 @@ const handleCompanyChange = (e) => {
       recordForm3.value.companyId = e[e.length - 1] || ''
       break;
   }
+
 }
 // 分页
 let pages = ref(1)
@@ -749,7 +750,9 @@ const initOption = () => {
 }
 
 onMounted(() => {
-  activeName.value = route.query.activeName;
+  if (route.query.activeName) {
+    activeName.value = route.query.activeName;
+  }
   if (route.query.activeName == "2") {
     recordForm1.value.invoiceId = route.query.id
     initData2();
@@ -782,4 +785,4 @@ onMounted(() => {
   color: var(--el-color-primary);
   cursor: pointer;
 }
-</style>
+</style>

src/views/receivable/documentary/index.vue

@@ -353,7 +353,11 @@
             </template>
           </el-table-column>
           <!--                    <el-table-column prop="a" label="非车险不含税保费" width="100"></el-table-column>-->
-          <el-table-column prop="jyOtherCostsProportion" label="非车险跟单费比例" width="100"></el-table-column>
+          <el-table-column prop="jyOtherCostsProportion" label="非车险跟单费比例" width="100">
+            <template #default="scope">
+              {{ Number(scope.row.jyOtherCostsProportion) || ' ' }}
+            </template>
+          </el-table-column>
           <el-table-column prop="jyPolicyNo" label="非车险保单号" width="100"></el-table-column>
           <el-table-column prop="jqStartDate" label="交强险起保日期" width="150"></el-table-column>
           <el-table-column prop="syStartDate" label="商业险起保日期" width="150"></el-table-column>
@@ -848,7 +852,10 @@ let invoiceShow = ref(false)
 let invoiceRadio = ref(null)
 const handleInvoiceSubmit = () => {
   myRouter.push({
-    name: 'documentaryTicket'
+    name: 'documentaryTicket',
+    query: {
+        invoiceType: activeName.value == '1' ? '2' : activeName.value == '2' ? '4' : ''
+      }
   })
 }
 
@@ -1052,7 +1059,6 @@ const search = () => {
   }
   if (activeName.value == '2') {
     getJyOtherReceivableList()
-    getreceivedAmountTotal()
   }
 }
 const reset = () => {
@@ -1082,6 +1088,7 @@ const getOtherReceivableList = () => {
     jqEndDate: receivableForm.value?.jqDate?.[1],
     syStartDate: receivableForm.value?.syDate?.[0],
     syEndDate: receivableForm.value?.syDate?.[1],
+    invoiceType:'2'
   }
   api.financeApi.getOtherReceivableList({
     ...params,
@@ -1122,6 +1129,7 @@ const getJyOtherReceivableList = () => {
     jqEndDate: receivableForm.value?.jqDate?.[1],
     syStartDate: receivableForm.value?.syDate?.[0],
     syEndDate: receivableForm.value?.syDate?.[1],
+    invoiceType:'4'
   }
   api.financeApi.getJyOtherReceivableList({
     ...params,

src/views/receivable/documentary/ticket.vue

@@ -168,6 +168,7 @@ import { useRoute, useRouter } from 'vue-router'
 import { ElMessage } from "element-plus";
 
 let router = useRouter()
+let route = useRoute()
 const selectedList = ref([])//选中的应收单据
 const companyList = ref()//保险公司
 const year = new Date().getFullYear() + ''
@@ -380,7 +381,7 @@ const handelComfirm = async () => {
     details: selectedList.value,
     ...countForm.value,
     attachmentIds,
-    invoiceType: "2"
+    invoiceType: route.query.invoiceType,
 
   }
   let apiFn = api.financeApi.followInvoicing
@@ -390,7 +391,7 @@ const handelComfirm = async () => {
       invoiceVO: params,
       ...countForm.value,
       attachmentIds,
-      invoiceType: "2"
+      invoiceType: route.query.invoiceType,
     }
   }
   apiFn(params).then((sub: any) => {
@@ -410,6 +411,7 @@ const initData = () => {
   const params = {
     searchList: searchList.value,
     logicJudge: logicJudge.value,
+    invoiceType: route.query.invoiceType,
   }
   api.financeApi.followInvoicePageList(params).then((res: any) => {
     if (res.code == 200) {

src/views/receivable/handingFee/index.vue

@@ -355,6 +355,7 @@
           <el-table-column prop="jyPremium" label="非车险保费" width="100"></el-table-column>
           <el-table-column prop="jySuperviseCostsProportion" label="非车险手续费比例" width="100"></el-table-column>
           <el-table-column prop="jyPolicyNo" label="非车险保单号" width="150"></el-table-column>
+          <el-table-column prop="jySuperviseCostsPremiums" label="非车手续费金额" width="150"></el-table-column>
           <el-table-column prop="jqStartDate" label="交强险起保日期" width="150"></el-table-column>
           <el-table-column prop="syStartDate" label="商业险起保日期" width="150"></el-table-column>
           <el-table-column prop="updateBy" label="修改人" width="100"></el-table-column>
@@ -364,7 +365,7 @@
             <template #default="scope">
               <el-button link type="primary" @click="toEdit(scope.row)">编辑</el-button>
               <el-button link type="primary" @click="toDelete([scope.row.id])">删除</el-button>
-              <el-dropdown class="width-100" trigger="click" placement="bottom" @command="dropdownCommand">
+              <!-- <el-dropdown class="width-100" trigger="click" placement="bottom" @command="dropdownCommand">
                 <el-button class="radius-2px width-100">
                   更多&nbsp;&nbsp;<el-icon>
                     <ArrowDown />
@@ -375,7 +376,7 @@
                     <el-dropdown-item command="数据导入">数据导入</el-dropdown-item>
                   </el-dropdown-menu>
                 </template>
-              </el-dropdown>
+              </el-dropdown> -->
             </template>
           </el-table-column>
         </el-table>
@@ -473,16 +474,16 @@
           <el-form :model="editForm">
             <el-radio v-model="feeRate">手续费比例</el-radio>
             <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="交强险手续费比例">
-                  <el-input v-model="editForm.jqInsurance">
+              <el-col :span="12" v-if="activeName === '1'">
+                <el-form-item label="驾意险手续费比例">
+                  <el-input v-model="editForm.jySuperviseCostsProportion">
                     <template #append>%</template>
                   </el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="商业险手续费比例">
-                  <el-input v-model="editForm.syInsurance">
+              <el-col :span="12" v-if="activeName === '2'">
+                <el-form-item label="驾意跟单费比例">
+                  <el-input v-model="editForm.jyOtherCostsProportion">
                     <template #append>%</template>
                   </el-input>
                 </el-form-item>
@@ -569,7 +570,7 @@ const handleTabsClick = (e) => {
   isTrue.value = false
   receivableForm.value = {}
   selectedList.value = []
-  activeName.value = e
+  activeName.value = e.props.name
 }
 const companyIdprops = {
   expandTrigger: 'hover' as const,
@@ -1086,6 +1087,7 @@ const getCommissionReceivableList = () => {
     jqEndDate: receivableForm.value?.jqDate?.[1],
     syStartDate: receivableForm.value?.syDate?.[0],
     syEndDate: receivableForm.value?.syDate?.[1],
+    invoiceType:'1'
   }
   api.financeApi.getCommissionReceivableList({
     ...params,
@@ -1126,6 +1128,7 @@ const getJyReceivableList = () => {
     jqEndDate: receivableForm.value?.jqDate?.[1],
     syStartDate: receivableForm.value?.syDate?.[0],
     syEndDate: receivableForm.value?.syDate?.[1],
+    invoiceType:'3'
   }
   api.financeApi.getJyCommissionReceivableList({
     ...params,

src/views/receivable/handingFee/ticket.vue

@@ -352,6 +352,7 @@ const handleSearch = () => {
   // router
   api.financeApi.getSelectedReceivableList({
     companyId: route.query.id,
+    invoiceType: route.query.invoiceType,
     orderNos: selectedList.value.map(item => item.orderNo),
     searchList: searchList.value,
     logicJudge: logicJudge.value,

vite.config.ts

@@ -17,6 +17,8 @@ export default defineConfig(({ mode, command }) => {
     }
   })
   return {
+    // 静态资源基础路径
+    base: env.VITE_BASE_PATH || '/',
     // 开发服务器选项 https://cn.vitejs.dev/config/server-options
     server: {
       open: true,