Merge remote-tracking branch 'origin/master'

8 months ago · 7d0076ff58
25 changed files with 1262 additions and 169 deletions
--- a/anrui-buscenter/anrui-buscenter-ui/src/api/fleetManagement/fleetManagement.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/fleetManagement/fleetManagement.js
@ -0,0 +1,62 @@
+import request from '@/utils/request'
+//  车队管理
+export default {
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      url: '/buscenter/v1/fleetManagement/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  saveOrUpdate: function(data) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      url: '/buscenter/v1/fleetManagement/saveOrUpdate',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  saveBusiness: function(data) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      url: '/buscenter/v1/fleetManagement/saveBusiness',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  init: function(data) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      url: '/buscenter/v1/fleetManagement/gteInitBySid/' + data,
+      method: 'get',
+
+    })
+  },
+
+  deleteBySids: function(data) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      url: '/buscenter/v1/fleetManagement/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+}
--- a/anrui-buscenter/anrui-buscenter-ui/src/api/vehicleBusinessFileManagement/vehicleBusinessFileManagement.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/vehicleBusinessFileManagement/vehicleBusinessFileManagement.js
@ -0,0 +1,25 @@
+import request from '@/utils/request'
+//  车辆业务档案管理
+export default {
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      url: '/buscenter/v1/vehicleBusinessFileManagement/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  init: function(data) {
+    return request({
+      baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      url: '/buscenter/v1/vehicleBusinessFileManagement/gteInitBySid/' + data,
+      method: 'get',
+    })
+  },
+
+}
--- a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js
@ -7,8 +7,7 @@ import codemenu from './modules/codemenu'

 Vue.use(Router)

-export const constantRoutes = [
-  {
+export const constantRoutes = [{
    path: '/redirect',
    component: Layout,
    hidden: true,
@ -77,20 +76,25 @@ export const constantRoutes = [
    meta: {
      title: '特殊审批'
    },
-    children: [
-      {
+    children: [{
        path: '/teshushenpi/qiankuanticheguanli',
        component: () =>
          import('@/views/teshushenpi/qiankuanticheguanli/qiankuanticheguanli.vue'),
        name: 'qiankuanticheguanli',
-        meta: { title: '欠款提车', noCache: true }
+        meta: {
+          title: '欠款提车',
+          noCache: true
+        }
      },
      {
        path: '/teshushenpi/debtrelease',
        component: () =>
          import('@/views/teshushenpi/debtrelease/debtrelease.vue'),
        name: 'QianKuanChuKu',
-        meta: { title: '欠款出库', noCache: true }
+        meta: {
+          title: '欠款出库',
+          noCache: true
+        }
      }
    ]
  },
@ -102,15 +106,16 @@ export const constantRoutes = [
    meta: {
      title: '客户管理'
    },
-    children: [
-      {
-        path: '/kehuguanli/kehudangan',
-        component: () =>
-          import('@/views/kehuguanli/kehudangan/kehudangan.vue'),
-        name: 'kehudangan',
-        meta: { title: '客户档案', noCache: true }
+    children: [{
+      path: '/kehuguanli/kehudangan',
+      component: () =>
+        import('@/views/kehuguanli/kehudangan/kehudangan.vue'),
+      name: 'kehudangan',
+      meta: {
+        title: '客户档案',
+        noCache: true
      }
-    ]
+    }]
  },
  // 客户查询
  {
@ -120,14 +125,16 @@ export const constantRoutes = [
    meta: {
      title: '客户查询'
    },
-    children: [
-      {
-        path: '/kehuguanli/kehuchaxun',
-        component: () =>
-          import('@/views/kehuguanli/kehuchaxun/kehuchaxun.vue'),
-        name: 'kehuchaxun',
-        meta: { title: '客户查询', noCache: true }
-      }]
+    children: [{
+      path: '/kehuguanli/kehuchaxun',
+      component: () =>
+        import('@/views/kehuguanli/kehuchaxun/kehuchaxun.vue'),
+      name: 'kehuchaxun',
+      meta: {
+        title: '客户查询',
+        noCache: true
+      }
+    }]
  },
  // 出库管理
  {
@ -137,15 +144,16 @@ export const constantRoutes = [
    meta: {
      title: '出库管理'
    },
-    children: [
-      {
-        path: '/chukuguanli/chukubanli',
-        component: () =>
-          import('@/views/chukuguanli/chukubanli/chukushenqing.vue'),
-        name: 'chukushenqing',
-        meta: { title: '出库办理', noCache: true }
+    children: [{
+      path: '/chukuguanli/chukubanli',
+      component: () =>
+        import('@/views/chukuguanli/chukubanli/chukushenqing.vue'),
+      name: 'chukushenqing',
+      meta: {
+        title: '出库办理',
+        noCache: true
      }
-    ]
+    }]
  },
  // 销售管理
  {
@ -183,7 +191,8 @@ export const constantRoutes = [
          import('@/views/xiaoshouguanli/xiaoshoudingdantuiche/salesorderbycar.vue'),
        name: 'XiaoShouDingDanTuiChe',
        meta: {
-          title: '销售订单退车', noCache: true
+          title: '销售订单退车',
+          noCache: true
        }
      },
      {
@ -210,7 +219,8 @@ export const constantRoutes = [
          import('@/views/xiaoshouguanli/dingdanchaxun/xiaoshoudingdanchaxun.vue'),
        name: 'XiaoShouDingDanChaXun',
        meta: {
-          title: '销售订单查询', noCache: true
+          title: '销售订单查询',
+          noCache: true
        }
      },
      {
@ -218,14 +228,20 @@ export const constantRoutes = [
        component: () =>
          import('@/views/xiaoshouguanli/suicheziliaojiaojie/cardatatobehandedover.vue'),
        name: 'DaiJiaoJieSuiCheZiLiao',
-        meta: { title: '随车资料交接管理', noCache: true }
+        meta: {
+          title: '随车资料交接管理',
+          noCache: true
+        }
      },
      {
        path: '/xiaoshouguanli/suicheziliaoguanli',
        component: () =>
          import('@/views/xiaoshouguanli/suicheziliaoguanli/datapreparation.vue'),
        name: 'JiaoCheCheZiLiao',
-        meta: { title: '交车资料管理', noCache: true }
+        meta: {
+          title: '交车资料管理',
+          noCache: true
+        }
      },
      // 车辆交付
      {
@ -233,7 +249,10 @@ export const constantRoutes = [
        component: () =>
          import('@/views/xiaoshouguanli/cheliangjiaofu/cheliangjiaofu.vue'),
        name: 'CheLiangJiaoFu',
-        meta: { title: '车辆交付', noCache: true }
+        meta: {
+          title: '车辆交付',
+          noCache: true
+        }
      },
      // 客户登记单
      {
@ -265,20 +284,25 @@ export const constantRoutes = [
    meta: {
      title: '合同管理'
    },
-    children: [
-      {
+    children: [{
        path: '/hetongguanli/hetongdanganguanli',
        component: () =>
          import('@/views/hetongguanli/hetongdanganguanli/hetongdanganguanli.vue'),
        name: 'HeTongDangAnGuanLi',
-        meta: { title: '合同审核管理', noCache: true }
+        meta: {
+          title: '合同审核管理',
+          noCache: true
+        }
      },
      {
        path: '/hetongguanli/hetongshenheguanli',
        component: () =>
          import('@/views/hetongguanli/hetongshenheguanli/hetongshenheguanli.vue'),
        name: 'HeTongShenHeGuanLi',
-        meta: { title: '合同档案管理', noCache: true }
+        meta: {
+          title: '合同档案管理',
+          noCache: true
+        }
      },
      // 模板
      {
@ -286,7 +310,10 @@ export const constantRoutes = [
        component: () =>
          import('@/views/hetongguanli/hetongmobanguanli/hetongmobanguanli.vue'),
        name: 'HeTongMoBanGuanLi',
-        meta: { title: '合同模板管理', noCache: true }
+        meta: {
+          title: '合同模板管理',
+          noCache: true
+        }
      }
    ]
  },
@ -298,17 +325,15 @@ export const constantRoutes = [
    meta: {
      title: '车型简介'
    },
-    children: [
-      {
-        path: '/chexingchaxun/modelinquire',
-        component: () =>
-          import('@/views/chexingchaxun/modelinquire/modellibrary.vue'),
-        name: 'chexingchaxun',
-        meta: {
-          title: '车型简介'
-        }
+    children: [{
+      path: '/chexingchaxun/modelinquire',
+      component: () =>
+        import('@/views/chexingchaxun/modelinquire/modellibrary.vue'),
+      name: 'chexingchaxun',
+      meta: {
+        title: '车型简介'
      }
-    ]
+    }]
  },
  // 盖章管理
  {
@ -318,17 +343,15 @@ export const constantRoutes = [
    meta: {
      title: '盖章管理'
    },
-    children: [
-      {
-        path: '/gaizhangguanli/gaizhangshenqingguanli',
-        component: () =>
-          import('@/views/gaizhanggunali/gaizhangshenqingguanli/gaizhangguanli.vue'),
-        name: 'gaizhangguanli',
-        meta: {
-          title: '盖章申请管理'
-        }
+    children: [{
+      path: '/gaizhangguanli/gaizhangshenqingguanli',
+      component: () =>
+        import('@/views/gaizhanggunali/gaizhangshenqingguanli/gaizhangguanli.vue'),
+      name: 'gaizhangguanli',
+      meta: {
+        title: '盖章申请管理'
      }
-    ]
+    }]
  },

  // 正常开票管理
@ -339,17 +362,16 @@ export const constantRoutes = [
    meta: {
      title: '企业开票信息管理'
    },
-    children: [
-      {
-        path: '/kaipiaoguanli/qiyekaipiaoxinxi',
-        component: () =>
-          import('@/views/kaipiaoguanli/qiyekaipiaoxinxi/kaipiaoxinxiguanli.vue'),
-        name: 'kaipiaoxinxiguanli',
-        meta: {
-          title: '企业开票信息管理', noCache: true
-        }
+    children: [{
+      path: '/kaipiaoguanli/qiyekaipiaoxinxi',
+      component: () =>
+        import('@/views/kaipiaoguanli/qiyekaipiaoxinxi/kaipiaoxinxiguanli.vue'),
+      name: 'kaipiaoxinxiguanli',
+      meta: {
+        title: '企业开票信息管理',
+        noCache: true
      }
-    ]
+    }]
  },
  // 优惠包
  {
@ -359,15 +381,16 @@ export const constantRoutes = [
    meta: {
      title: '优惠包申请'
    },
-    children: [
-      {
-        path: '/discountpackage',
-        component: () =>
-          import('@/views/discountpackage/discountpackage.vue'),
-        name: 'YouHuiBaoShenQing',
-        meta: { title: '优惠包申请', noCache: true }
+    children: [{
+      path: '/discountpackage',
+      component: () =>
+        import('@/views/discountpackage/discountpackage.vue'),
+      name: 'YouHuiBaoShenQing',
+      meta: {
+        title: '优惠包申请',
+        noCache: true
      }
-    ]
+    }]
  },
  // 交车准备
  {
@ -377,15 +400,16 @@ export const constantRoutes = [
    meta: {
      title: '交车准备'
    },
-    children: [
-      {
-        path: '/xiaoshouguanli/jiaochezhunbei',
-        component: () =>
-          import('@/views/xiaoshouguanli/jiaochezhunbei/readyfordelivery.vue'),
-        name: 'DaiJiaoCheZhunBei',
-        meta: { title: '交车准备', noCache: true }
+    children: [{
+      path: '/xiaoshouguanli/jiaochezhunbei',
+      component: () =>
+        import('@/views/xiaoshouguanli/jiaochezhunbei/readyfordelivery.vue'),
+      name: 'DaiJiaoCheZhunBei',
+      meta: {
+        title: '交车准备',
+        noCache: true
      }
-    ]
+    }]
  },
  // 交车准备
  {
@ -395,15 +419,16 @@ export const constantRoutes = [
    meta: {
      title: '交车办理'
    },
-    children: [
-      {
-        path: '/xiaoshouguanli/jiaochebanli',
-        component: () =>
-          import('@/views/xiaoshouguanli/jiaochebanli/cartobedelivered.vue'),
-        name: 'DaiJiaoChe',
-        meta: { title: '交车办理', noCache: true }
+    children: [{
+      path: '/xiaoshouguanli/jiaochebanli',
+      component: () =>
+        import('@/views/xiaoshouguanli/jiaochebanli/cartobedelivered.vue'),
+      name: 'DaiJiaoChe',
+      meta: {
+        title: '交车办理',
+        noCache: true
      }
-    ]
+    }]
  },
  {
    path: '/fapiaoneibujieshou',
@ -412,15 +437,16 @@ export const constantRoutes = [
    meta: {
      title: '发票内部接收管理'
    },
-    children: [
-      {
-        path: '/fapiaoneibujieshou',
-        component: () =>
-          import('@/views/fapiaoneibujieshou/Internalinvoicetobereceived.vue'),
-        name: 'fapiaoneibudaijieshou',
-        meta: { title: '发票内部接收管理', noCache: true }
+    children: [{
+      path: '/fapiaoneibujieshou',
+      component: () =>
+        import('@/views/fapiaoneibujieshou/Internalinvoicetobereceived.vue'),
+      name: 'fapiaoneibudaijieshou',
+      meta: {
+        title: '发票内部接收管理',
+        noCache: true
      }
-    ]
+    }]
  },
  {
    path: '/discountpackagehandover',
@ -429,15 +455,16 @@ export const constantRoutes = [
    meta: {
      title: '优惠包交接'
    },
-    children: [
-      {
-        path: '/discountpackagehandover',
-        component: () =>
-          import('@/views/discountpackagehandover/discountpackagetobehandover.vue'),
-        name: 'YouHuiBaoDaiJiaoJie',
-        meta: { title: '优惠包交接', noCache: true }
+    children: [{
+      path: '/discountpackagehandover',
+      component: () =>
+        import('@/views/discountpackagehandover/discountpackagetobehandover.vue'),
+      name: 'YouHuiBaoDaiJiaoJie',
+      meta: {
+        title: '优惠包交接',
+        noCache: true
      }
-    ]
+    }]
  },
  {
    path: '/valuablecustomer',
@ -446,15 +473,16 @@ export const constantRoutes = [
    meta: {
      title: '价值客户备案'
    },
-    children: [
-      {
-        path: '/valuablecustomer/valuablecustomer',
-        component: () =>
-          import('@/views/valuablecustomer/valuablecustomer.vue'),
-        name: 'ValuableCustomer',
-        meta: { title: '价值客户备案', noCache: true }
+    children: [{
+      path: '/valuablecustomer/valuablecustomer',
+      component: () =>
+        import('@/views/valuablecustomer/valuablecustomer.vue'),
+      name: 'ValuableCustomer',
+      meta: {
+        title: '价值客户备案',
+        noCache: true
      }
-    ]
+    }]
  },
  {
    path: '/financialschememodification',
@ -463,16 +491,57 @@ export const constantRoutes = [
    meta: {
      title: '金融方案变更'
    },
-    children: [
-      {
-        path: '/financialschememodification/financialschememodification',
-        component: () =>
-          import('@/views/financialschememodification/financialschememodification.vue'),
-        name: 'FinancialSchemeModification',
-        meta: { title: '金融方案变更', noCache: true }
+    children: [{
+      path: '/financialschememodification/financialschememodification',
+      component: () =>
+        import('@/views/financialschememodification/financialschememodification.vue'),
+      name: 'FinancialSchemeModification',
+      meta: {
+        title: '金融方案变更',
+        noCache: true
      }
-    ]
+    }]
  },
+
+  {
+    path: '/fleetManagement',
+    component: Layout,
+    redirect: '/fleetManagement',
+    meta: {
+      title: '车队管理'
+    },
+    children: [{
+      path: '/fleetManagement/fleetManagement',
+      component: () =>
+        import('@/views/fleetManagement/fleetManagement.vue'),
+      name: 'FleetManagement',
+      meta: {
+        title: '车队管理',
+        noCache: true
+      }
+    }]
+  },
+
+  {
+    path: '/vehicleBusinessFileManagement',
+    component: Layout,
+    redirect: '/vehicleBusinessFileManagement',
+    meta: {
+      title: '车辆业务档案管理'
+    },
+    children: [{
+      path: '/vehicleBusinessFileManagement/vehicleBusinessFileManagement',
+      component: () =>
+        import('@/views/vehicleBusinessFileManagement/vehicleBusinessFileManagement.vue'),
+      name: 'VehicleBusinessFileManagement',
+      meta: {
+        title: '车辆业务档案管理',
+        noCache: true
+      }
+    }]
+  },
+
+
  // 流程所需页面路径
  // 订金收取审批、发起人详情页面
  {
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/fleetManagement/fleetManagement.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/fleetManagement/fleetManagement.vue
@ -0,0 +1,480 @@
+<template>
+  <div class="app-container">
+    <!--列表页面-->
+    <div v-show="viewState == 1">
+      <button-bar view-title="车队信息管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <!--Start查询列表部分-->
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.orgName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="车队名称">
+                <el-input v-model="listQuery.params.fleetName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="挂靠日期">
+                <el-date-picker v-model="listQuery.params.attachmentStartDate" value-format="yyyy-MM-dd"
+                  format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.attachmentEndDate" value-format="yyyy-MM-dd"
+                  format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--End查询列表部分-->
+        <div class="listtop">
+          <div class="tit">车队列表</div>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;"
+            @selection-change="handleSelectionChange">
+            <el-table-column type="selection" align="center" width="50" />
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+            <el-table-column label="操作" width="80" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toInfo(scope.row)">详情</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="createOrgName" label="分公司" align="center" />
+            <el-table-column prop="fleetName" label="车队名称" align="center" />
+            <el-table-column prop="contacts" label="联系人" align="center" />
+            <el-table-column prop="contactNumber" label="联系电话" align="center" />
+            <el-table-column prop="carNum" label="车辆台数" align="center" />
+            <el-table-column prop="attachmentStartDate" label="挂靠开始日期" align="center" />
+            <el-table-column prop="attachmentEndDate" label="挂靠结束日期" align="center" />
+          </el-table>
+        </div>
+        <!--End 主页面主要部分-->
+        <div class="pages">
+          <div class="tit" />
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+            :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
+        </div>
+        <!--End查询列表部分-->
+      </div>
+    </div>
+    <!--新增及修改 -->
+    <fleetManagementAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState"
+      @reloadlist="getList" />
+    <!--详情-->
+    <fleetManagementInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
+
+    <el-dialog title="相关业务信息" :visible.sync="dialogVisible" :before-close="handleClose">
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02" style="margin-top: -30px">
+        <el-row style="border-top: 1px solid #e0e3eb">
+          <el-col :span="8">
+            <div class="span-sty">车队名称</div>
+            <el-form-item> <span class="addinputInfo">{{ formobj.fleetName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">车辆保险情况</div>
+            <el-form-item><el-input v-model="formobj.insurance" clearable placeholder=""
+                class="addinputInfo addinputw" /></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">车辆违章情况</div>
+            <el-form-item><el-input v-model="formobj.illegally" clearable placeholder=""
+                class="addinputInfo addinputw" /></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+            <el-form-item><el-input v-model="formobj.remarks" clearable placeholder=""
+                class="addinputInfo addinputw" /></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">附件</div>
+            <el-form-item>
+              <upload-img ref="uploadImg" class="addinputw addinputInfo" v-model="imgList" :limit="1" bucket="map"
+                :upload-data="{ type: '0001' }" @change="backData" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
+        <el-button type="primary" style="margin-top: 20px;" @click="saveResults">确 定</el-button>
+      </div>
+
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import ButtonBar from '@/components/ButtonBar'
+  import req from '@/api/fleetManagement/fleetManagement'
+  import fleetManagementAdd from './fleetManagementAdd'
+  import fleetManagementInfo from './fleetManagementInfo'
+  import uploadImg from '@/components/uploadFile/uploadImg'
+
+  export default {
+    name: 'FleetManagement',
+    components: {
+      Pagination,
+      pageye,
+      ButtonBar,
+      uploadImg,
+      fleetManagementAdd,
+      fleetManagementInfo
+
+    },
+    data() {
+      return {
+        btndisabled: false,
+        dialogVisible: false,
+        btnList: [{
+            type: 'primary',
+            size: 'small',
+            // icon: 'plus',
+            btnKey: 'toAdd',
+            btnLabel: '新增'
+          },
+          {
+            type: 'primary',
+            size: 'small',
+            // icon: 'plus',
+            btnKey: 'toEdit',
+            btnLabel: '编辑'
+          },
+          {
+            type: 'primary',
+            size: 'small',
+            // icon: 'plus',
+            btnKey: 'toBusiness',
+            btnLabel: '相关业务'
+          },
+          {
+            type: 'danger',
+            size: 'small',
+            icon: 'del',
+            btnKey: 'doDel',
+            btnLabel: '删除'
+          },
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
+        tableKey: 0,
+        list: [],
+        sids: [], // 用于导出的时候保存已选择的SIDs
+        FormLoading: false,
+        listLoading: false,
+        // 翻页
+        listQuery: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            "userSid": "",
+            "menuUrl": "",
+            "orgPath": "",
+            "orgName": "",
+            "fleetName": "",
+            "attachmentStartDate": "",
+            "attachmentEndDate": ""
+          }
+        },
+        sids: [],
+        selectionList: [],
+        formobj: {
+          sid: '',
+          fleetName: '',
+          insurance: '',
+          illegally: '',
+          remarks: '',
+          urls: [],
+          userSid: window.sessionStorage.getItem('userSid'),
+        },
+        rules: {
+          result: [{
+            required: true,
+            message: '审计结果不能为空',
+            trigger: 'blur'
+          }],
+        },
+        imgList: []
+      }
+    },
+    created() {
+      // 初始化变量
+      this.getList()
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    methods: {
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+        switch (btnKey) {
+          case 'toAdd':
+            this.toAdd()
+            break
+          case 'toEdit':
+            this.toEdit()
+            break
+          case 'toBusiness':
+            this.toBusiness()
+            break
+          case 'doDel':
+            this.doDel()
+            break
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      handleSelectionChange(val) {
+
+        this.selectionList = val
+
+        const aa = []
+        val.forEach(element => {
+          aa.push(element.sid)
+        })
+        this.sids = aa
+      },
+
+      // 表中序号
+      indexMethod(index) {
+        var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      // 查询列表信息
+      getList() {
+        this.listLoading = true
+        this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+        this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.listQuery.params.menuUrl = this.$route.path
+        req.listPage(this.listQuery).then(response => {
+          this.listLoading = false
+          if (response.success) {
+            this.list = response.data.records
+            this.listQuery.total = response.data.total
+          } else {
+            this.list = []
+            this.listQuery.total = 0
+          }
+        })
+      },
+      // 查询按钮
+      handleFilter() {
+        this.listQuery.current = 1
+        this.getList()
+      },
+      // 点击重置
+      handleReset() {
+        this.listQuery = {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            "userSid": "",
+            "menuUrl": "",
+            "orgPath": "",
+            "orgName": "",
+            "fleetName": "",
+            "attachmentStartDate": "",
+            "attachmentEndDate": ""
+          }
+        }
+        this.getList()
+      },
+      toAdd() {
+        this.viewState = 2
+        this.$refs['divAdd'].showAdd()
+      },
+      toEdit() {
+
+        if (this.sids.length != 1) {
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '请选择一条记录进行操作'
+          })
+          return
+        }
+
+        this.viewState = 3
+        this.$refs['divAdd'].showEdit(this.sids[0])
+      },
+      toBusiness() {
+
+        if (this.sids.length != 1) {
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '请选择一条记录进行操作'
+          })
+          return
+        }
+        this.dialogVisible = true
+        this.formobj.sid = this.selectionList[0].sid
+        this.formobj.fleetName = this.selectionList[0].fleetName
+
+      },
+      backData(value) {
+
+        console.log('backData》》》》', value)
+
+        this.formobj.urls = []
+        for (var i = 0; i < value.length; i++) {
+          this.formobj.urls.push(value[i].url)
+        }
+
+      },
+      handleClose() {
+        this.dialogVisible = false
+        this.imgList = []
+        this.formobj = {
+          sid: '',
+          fleetName: '',
+          insurance: '',
+          illegally: '',
+          remarks: '',
+          urls: [],
+          userSid: window.sessionStorage.getItem('userSid'),
+        }
+      },
+      saveResults() {
+
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+            req.saveBusiness(this.formobj).then((res) => {
+              if (res.success) {
+                this.getList()
+                this.handleClose()
+              }
+            })
+
+          }
+        })
+
+
+      },
+      doDel() {
+        if (this.sids.length === 0) {
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '请选择至少一条记录进行删除操作'
+          })
+          return
+        }
+        const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          req.deleteBySids(this.sids).then(resp => {
+            if (resp.success) {
+              this.$message({
+                type: 'success',
+                message: resp.msg,
+                showClose: true
+              })
+            }
+            this.getList()
+            loading.close()
+          }).catch(e => {
+            loading.close()
+          })
+        }).catch(() => {})
+      },
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      },
+      toInfo(row) {
+
+        this.viewState = 4
+        this.$refs['divInfo'].showDetail(row.sid)
+      },
+      resetState() {
+        this.viewState = 1
+      },
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+    align-items: center;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+    display: inline;
+    line-height: 1px;
+    vertical-align: middle;
+  }
+</style>
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/fleetManagement/fleetManagementAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/fleetManagement/fleetManagementAdd.vue
@ -0,0 +1,252 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>{{ viewTitle }}</div>
+      <div>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+    </div>
+    <div class="listconadd">
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+        <el-row style="border-top: 1px solid #e0e3eb">
+          <el-col :span="8">
+            <div class="span-sty"><span class="must">*</span> 车队名称</div>
+            <el-form-item prop="fleetName"><el-input v-model="formobj.fleetName" clearable placeholder=""
+                class="addinputInfo addinputw" /></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">联系人</div>
+            <el-form-item><el-input v-model="formobj.contacts" clearable placeholder=""
+                class="addinputInfo addinputw" /></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">联系电话</div>
+            <el-form-item><el-input v-model="formobj.contactNumber" clearable placeholder=""
+                class="addinputInfo addinputw" /></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">车辆台数</div>
+            <el-form-item><el-input v-model="formobj.carNum" clearable placeholder=""
+                class="addinputInfo addinputw" /></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">挂靠开始日期</div>
+            <el-form-item> <el-date-picker v-model="formobj.attachmentStartDate" value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd" type="date" class="addinputInfo addinputw"
+                placeholder="选择日期"></el-date-picker></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">挂靠结束日期</div>
+            <el-form-item> <el-date-picker v-model="formobj.attachmentEndDate" value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd" type="date" class="addinputInfo addinputw"
+                placeholder="选择日期"></el-date-picker></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+            <el-form-item><el-input v-model="formobj.remarks" clearable placeholder=""
+                class="addinputInfo addinputw" /></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">挂靠协议</div>
+            <el-form-item>
+              <upload-img ref="uploadImg" class="addinputw addinputInfo" v-model="imgList" :limit="1" bucket="map"
+                :upload-data="{ type: '0001' }" @change="backData" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/fleetManagement/fleetManagement'
+  import uploadImg from '@/components/uploadFile/uploadImg'
+  import {
+    getOrgSidByPath,
+    fetchBySid
+  } from '@/api/dictcommons/dictcommons'
+
+  export default {
+    name: 'AuditSupervisionAdd',
+    components: {
+      uploadImg
+    },
+    data() {
+      return {
+        viewTitle: '',
+        submitdisabled: false,
+        formobj: {
+          "sid": "",
+          "fleetName": "",
+          "contacts": "",
+          "contactNumber": "",
+          "carNum": "",
+          "attachmentStartDate": "",
+          "attachmentEndDate": "",
+          "remarks": "",
+          "urls": [],
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createByName": window.sessionStorage.getItem('name'),
+          "createOrgSid": "",
+          "createOrgName": ""
+        },
+        rules: {
+          fleetName: [{
+            required: true,
+            message: '车队名称不能为空',
+            trigger: 'blur'
+          }],
+
+        },
+        imgList: []
+      }
+    },
+    methods: {
+
+      init() {
+
+        getOrgSidByPath({
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
+        }).then((resp) => {
+          if (resp.success) {
+            this.formobj.createOrgSid = resp.data
+            fetchBySid(resp.data).then((respsone) => {
+              if (respsone.success) {
+                this.formobj.createOrgName = respsone.data.name
+              }
+            })
+          }
+        })
+      },
+      backData(value) {
+
+        console.log('backData》》》》', value)
+
+        this.formobj.urls = []
+        for (var i = 0; i < value.length; i++) {
+          this.formobj.urls.push(value[i].url)
+        }
+
+      },
+      showAdd() {
+        this.viewTitle = '【新增】车队信息'
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+        this.init()
+      },
+      showEdit(sid) {
+        this.viewTitle = '【编辑】车队信息'
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+        this.init()
+        req.init(sid).then((res) => {
+          if (res.success) {
+            this.formobj = res.data
+            this.imgList = []
+            for (var i = 0; i < this.formobj.urls.length; i++) {
+              this.imgList.push({
+                url: this.formobj.urls[i]
+              })
+            }
+          }
+        })
+      },
+
+      saveOrUpdate() {
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+            this.submitdisabled = true
+            req.saveOrUpdate(this.formobj).then((res) => {
+              if (res.success) {
+                this.$message({
+                  showClose: true,
+                  type: 'success',
+                  message: '保存成功'
+                })
+                this.handleReturn('true')
+              } else {
+                this.submitdisabled = false
+              }
+            }).catch(() => {
+              this.submitdisabled = false
+            })
+          }
+        })
+      },
+
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+          "sid": "",
+          "fleetName": "",
+          "contacts": "",
+          "contactNumber": "",
+          "carNum": "",
+          "attachmentStartDate": "",
+          "attachmentEndDate": "",
+          "remarks": "",
+          "urls": [],
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createByName": window.sessionStorage.getItem('name'),
+          "createOrgSid": "",
+          "createOrgName": ""
+        }
+        this.submitdisabled = false
+        this.imgList = []
+        this.$emit('doback')
+      },
+    }
+  }
+</script>
+
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+    align-items: center;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+    display: inline;
+    line-height: 1px;
+    vertical-align: middle;
+  }
+</style>
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/fleetManagement/fleetManagementInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/fleetManagement/fleetManagementInfo.vue
@ -0,0 +1,144 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>{{ viewTitle }}</div>
+      <div>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+    </div>
+    <div class="listconadd">
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <el-row style="border-top: 1px solid #e0e3eb">
+          <el-col :span="8">
+            <div class="span-sty">车队名称</div>
+            <el-form-item> <span class="addinputInfo">{{ formobj.fleetName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">联系人</div>
+            <el-form-item> <span class="addinputInfo">{{ formobj.contacts }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">联系电话</div>
+            <el-form-item> <span class="addinputInfo">{{ formobj.contactNumber }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">车辆台数</div>
+            <el-form-item> <span class="addinputInfo">{{ formobj.carNum }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">挂靠开始日期</div>
+            <el-form-item> <span class="addinputInfo">{{ formobj.attachmentStartDate }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">挂靠结束日期</div>
+            <el-form-item> <span class="addinputInfo">{{ formobj.attachmentEndDate }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">挂靠协议</div>
+            <el-form-item>
+              <template slot-scope="scope">
+                <span v-for="(item,index) in formobj.urls" :key="index" class="addinputInfo">
+                  <el-popover placement="left" trigger="click" width="300">
+                    <img :src="item" width="100%" />
+                    <img slot="reference" :src="item" :alt="item"
+                      style="max-height: 70px;max-width: 70px; padding: 5px" />
+                  </el-popover>
+                </span>
+              </template>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">车辆保险情况</div>
+            <el-form-item> <span class="addinputInfo">{{ formobj.businessInsurance }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">车辆违章情况</div>
+            <el-form-item> <span class="addinputInfo">{{ formobj.businessillegally }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">相关业务备注</div>
+            <el-form-item> <span class="addinputInfo">{{ formobj.businessRemarks }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">相关业务附件</div>
+            <el-form-item>
+              <template slot-scope="scope">
+                <span v-for="(item,index) in formobj.businessUrls" :key="index" class="addinputInfo">
+                  <el-popover placement="left" trigger="click" width="300">
+                    <img :src="item" width="100%" />
+                    <img slot="reference" :src="item" :alt="item"
+                      style="max-height: 70px;max-width: 70px; padding: 5px" />
+                  </el-popover>
+                </span>
+              </template>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/fleetManagement/fleetManagement'
+
+  export default {
+    name: 'AuditSupervisionAdd',
+    components: {},
+    data() {
+      return {
+        viewTitle: '',
+        submitdisabled: false,
+        formobj: {},
+      }
+    },
+    methods: {
+      showDetail(sid) {
+        this.viewTitle = '车队信息详情'
+        req.init(sid).then((res) => {
+          if (res.success) {
+            this.formobj = res.data
+          }
+        })
+      },
+
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+
+        }
+        this.submitdisabled = false
+        this.$emit('doback')
+      },
+    }
+  }
+</script>
+
+<style scoped>
+  .span-sty {
+    width: 160px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 150px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 150px !important;
+    width: calc(100% - 145px);
+  }
+</style>
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/vehicleBusinessFileManagement/vehicleBusinessFileManagement.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/vehicleBusinessFileManagement/vehicleBusinessFileManagement.vue
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/vehicleBusinessFileManagement/vehicleBusinessFileManagementInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/vehicleBusinessFileManagement/vehicleBusinessFileManagementInfo.vue
@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json
@ -4,6 +4,9 @@
    "FNumber": "@KD_FACCOUNTID"
  },
  "FDetailID": {
+    "FDETAILID__FF100003": {
+      "FNumber": "@KD_FF100003"
+    },
    "FDETAILID__FFLEX5": {
      "FNumber": "@KD_FFLEX5"
    },
@ -24,4 +27,4 @@
  "FAMOUNTFOR": "",
  "FDEBIT": "@KD_FDEBIT",
  "FCREDIT": "@KD_FCREDIT"
-}
+}
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
@ -2303,13 +2303,13 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                voucherDetail1.setSubjectNo("1201.02.02");
                voucherDetail1.setDimensionDept(deptCode);
                voucherDetail1.setDimensionCustom(customerNumber);
-                voucherDetail1.setDebit("-" + bbjDDMoney.toString());
+                voucherDetail1.setDebit("-" + fund.toString());
                resultDetails.add(voucherDetail1);
                Voucher.VoucherResultDetailDto voucherDetail2 = new Voucher.VoucherResultDetailDto();
                voucherDetail2.setSummary("公司逾期利息减免");
                voucherDetail2.setSubjectNo("2191.05.00");
                voucherDetail2.setDimensionDept(deptCode);
-                voucherDetail2.setDebit(bbjDDMoney.toString());
+                voucherDetail2.setDebit(fund.toString());
                resultDetails.add(voucherDetail2);
            }
            //剩余贷款保证金结转
--- a/yxt-as-ui/src/views/maintenanceReceive/index.vue
+++ b/yxt-as-ui/src/views/maintenanceReceive/index.vue
@ -15,10 +15,10 @@
                  <el-option v-for="item in repairTypeList" :key="item.sid" :label="item.name" :value="item.name" />
                </el-select>
              </el-form-item>
-              <el-form-item label="工单编号">
+              <el-form-item label="维修单号">
                <el-input v-model="queryParams.params.billNo" placeholder="" clearable />
              </el-form-item>
-              <el-form-item label="工单类型">
+              <el-form-item label="维修单类型">
                <el-select v-model="queryParams.params.billType" filterable clearable placeholder="请选择"
                  style="width:100%">
                  <el-option v-for="item in billTypeList" :key="item.dictKey" :label="item.dictValue"
@ -74,14 +74,14 @@
            <el-table-column fixed width="50" type="selection" align="center" />
            <el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
            <el-table-column prop="repairState" label="维修状态" align="center" />
-            <el-table-column label="工单编号" width="180" align="center">
+            <el-table-column label="维修单编号" width="180" align="center">
              <template slot-scope="scope">
                <div style="color: #1890FF; text-decoration: underline ;" @click="showResult(scope.row)">
                  {{ scope.row.billNo }}
                </div>
              </template>
            </el-table-column>
-            <el-table-column prop="billTypeValue" label="工单类型" align="center" />
+            <el-table-column prop="billTypeValue" label="维修单类型" align="center" />
            <el-table-column prop="subjectValue" label="科目" align="center" />
            <el-table-column prop="isGoOut" label="是否外出" align="center" />
            <el-table-column prop="customerName" label="客户名称" align="center" />
--- a/yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue
+++ b/yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue
@ -217,7 +217,7 @@
              </template>
            </el-table-column>
            <el-table-column label="领料人" prop="receivePer" width="120" align="center" />
-            <el-table-column label="领料时间" prop="receiveTimes" width="120" align="center" />
+            <el-table-column label="接收时间" prop="receiveTimes" width="120" align="center" />
          </el-table>

        </el-form>
--- a/yxt-as-ui/src/views/storage/deliveryNotice/index.vue
+++ b/yxt-as-ui/src/views/storage/deliveryNotice/index.vue
@ -483,7 +483,7 @@
        }

        if (this.selectionList[0].busTypeValue == '采购入库' &&
-          this.selectionList[0].manufactorBillNo != '') {
+          this.selectionList[0].manufactorBillNo == '') {
          this.$message({
            type: 'warning',
            message: "厂家订单号不能为空",
--- a/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/index.vue
+++ b/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/index.vue
@ -234,31 +234,31 @@

      toBuild() {
        // if (this.sids.length > 0) {
-          const loading = this.$loading({
-            lock: true,
-            text: 'Loading',
-            spinner: 'el-icon-loading',
-            background: 'rgba(0, 0, 0, 0.7)'
-          })
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })


-          req.exportExcel(this.queryParams.params).then((resp) => {
-            loading.close()
-            const blob = new Blob([resp], {
-              type: 'application/vnd.ms-excel'
-            })
-            const fileName = '旧件出入库记录' + '.xls'
-            const elink = document.createElement('a')
-            elink.download = fileName
-            elink.style.display = 'nonde'
-            elink.href = URL.createObjectURL(blob)
-            document.body.appendChild(elink)
-            elink.click()
-            URL.revokeObjectURL(elink.href)
-            document.body.removeChild(elink)
-          }).catch(() => {
-            loading.close()
+        req.exportExcel(this.queryParams.params).then((resp) => {
+          loading.close()
+          const blob = new Blob([resp], {
+            type: 'application/vnd.ms-excel'
          })
+          const fileName = '旧件出入库记录' + '.xls'
+          const elink = document.createElement('a')
+          elink.download = fileName
+          elink.style.display = 'nonde'
+          elink.href = URL.createObjectURL(blob)
+          document.body.appendChild(elink)
+          elink.click()
+          URL.revokeObjectURL(elink.href)
+          document.body.removeChild(elink)
+        }).catch(() => {
+          loading.close()
+        })
        // } else {
        //   this.$message({
        //     type: "warning",
--- a/yxt-as-ui/src/views/storage/outStorage/outStorageAdd.vue
+++ b/yxt-as-ui/src/views/storage/outStorage/outStorageAdd.vue
@ -240,9 +240,9 @@
      //     }
      //   })
      // },
-      // commodityDelete(index) {
-      //   this.formobj.detailsList.splice(index, 1)
-      // },
+      commodityDelete(index) {
+        this.formobj.detailsList.splice(index, 1)
+      },
      // commodityCurrentChange(value, row) {
      //   console.log("commodityCurrentChange》》》》", value)
      //   console.log("commodityCurrentChange》》》》", row)
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemVo.java
@ -85,5 +85,7 @@ public class AsServiceItemVo implements Vo {
    private String isClean;
    @ApiModelProperty("排序号")
    private String sortNo;
+    @ApiModelProperty("科目")
+    private String subjectName;

 }
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java
@ -63,4 +63,6 @@ public interface AsBusrepairBillMapper extends BaseMapper<AsBusrepairBill> {

    @Update("update as_busrepair_bill set oldIsReclaim = '1' where billNo = #{billNo}")
    ResultBean updateOldIsReclaim(String billNo);
+
+    String selLastTaxRateByUseOrgSid(@Param("createOrgSid") String createOrgSid);
 }
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
@ -312,4 +312,7 @@
            ${ew.sqlSegment}
        </where>
    </select>
+    <select id="selLastTaxRateByUseOrgSid" resultType="java.lang.String">
+        SELECT parameterValue FROM anrui_portal.sys_parameter as s WHERE s.useOrgSid LIKE concat('%', #{createOrgSid}, '%') AND S.parameterNo = 'SHXSZDSL'
+    </select>
 </mapper>
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
@ -1232,6 +1232,22 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                    }
                }
            }
+            //如果开发票含税其中税率不能低于财务中心设置的最低税率
+            InvoiceVo invoiceVo = dto.getInvoiceVo();
+            if (null != invoiceVo) {
+                if (StringUtils.isNotBlank(invoiceVo.getTaxRate())) {
+                    String taxRate = invoiceVo.getTaxRate();
+                    String createOrgSid = dto.getCreateOrgSid();
+                    String lastRate = baseMapper.selLastTaxRateByUseOrgSid(createOrgSid);
+                    if (StringUtils.isNotBlank(lastRate)) {
+                        BigDecimal a = new BigDecimal(taxRate);
+                        BigDecimal b = new BigDecimal(lastRate);
+                        if (a.compareTo(b) < 0) {
+                            return rb.setMsg("其中税率不能低于财务中心设置的最低税率！");
+                        }
+                    }
+                }
+            }
        }
        ResultBean<String> resultBean = saveBill(dto);
        if (resultBean.getSuccess()) {
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java
@ -226,10 +226,10 @@ public class AsCustomerVehicleService extends MybatisBaseService<AsCustomerVehic
            // 0代表保险维修，显示所有客户（不传值也查询所有）；
            // 1欠款月结显示已备案且在有效期内的定点维修客户；
            // 2常规维修显示非定点维修客户
-            if (query.getBillType().equals("1")) {
+            if (query.getBillType().equals("欠款月结")) {
                qw.apply("\tc.isDesignatedEnterprise = 1 \n" +
                        "\tAND c.filingIndate >= CURDATE()");
-            } else if (query.getBillType().equals("2")) {
+            } else if (query.getBillType().equals("常规维修")) {
                qw.ne("isDesignatedEnterprise","1");
            }
        }
@ -237,7 +237,9 @@ public class AsCustomerVehicleService extends MybatisBaseService<AsCustomerVehic
            qw.like("v.vehMark", query.getVehMark());
        }
        if (StringUtils.isNotBlank(query.getVinNo())) {
-            qw.like("v.vinNo", query.getVinNo());
+            if (query.getVinNo().length() > 4) {
+                qw.like("v.vinNo", query.getVinNo());
+            }
        }
        qw.orderByDesc("v.id");
        IPage<AsCustomerVehicle> page = PagerUtil.queryToPage(pq);
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java
@ -71,4 +71,6 @@ public interface AsServiceGroupMapper extends BaseMapper<AsServiceGroup> {

 	@Select("select * from as_service_group where sid = #{sid} and isDelete = '0'")
 	AsServiceGroup fetchIsDeleteBySid(String sid);
+
+    String selTitleNameByUserSid(@Param("userSid") String userSid);
 }
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml
@ -15,4 +15,15 @@
        where useOrgSid = #{useOrgSid}
        and isDelete = '0'
    </select>
+    <select id="selTitleNameByUserSid" resultType="java.lang.String">
+        SELECT
+            d.titleNameValue
+        FROM
+            as_tech_title_detail AS d
+                LEFT JOIN as_tech_title_apply AS a ON d.mainSid = a.sid
+                LEFT JOIN as_tech_title AS t ON t.sid = d.titleSid
+        WHERE d.techSid = #{userSid} AND a.nodeState = '已办结' AND t.state = '0'
+        ORDER BY a.finishTime DESC
+            LIMIT 1
+    </select>
 </mapper>
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java
@ -229,7 +229,13 @@ public class AsServiceGroupService extends MybatisBaseService<AsServiceGroupMapp
                    for (int i = 0; i < splitSid.length; i++) {
                        MemberVo memberVo = new MemberVo();
                        memberVo.setMemberSid(splitSid[i]);
-                        memberVo.setMemberName(splitName[i]);
+                        //查询有无职称
+                        String titleName = baseMapper.selTitleNameByUserSid(splitSid[i]);
+                        if (StringUtils.isNotBlank(titleName)) {
+                            memberVo.setMemberName(splitName[i] + "-" + titleName);
+                        } else {
+                            memberVo.setMemberName(splitName[i]);
+                        }
                        members.add(memberVo);
                    }
                    vo.setMembers(members);
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java
@ -702,7 +702,7 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
            }
            createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
        }
-        String shelvesId = dto.getShelvesSid();
+        String shelvesId = dto.getSid();
        WmsShelfBill wmsShelfBill = fetchBySid(shelvesId);
        String sourceBillSid = wmsShelfBill.getSourceBillSid();
        List<AppSaveBillRecordDto.AppSaveBillRecordDetailsDto> goodsList = dto.getGoodsList();
@ -728,7 +728,10 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                WmsGoodsTag wmsGoodsTag = wmsGoodsTagService.selByBillSidAndGoodsID(sourceBillSid, goodsID);
                String goodsSkuCode = wmsGoodsTag.getGoodsSkuCode();
                WmsShelfBillDetail shelfBillGoods = wmsShelfBillDetailService.selByBillSidAndSkuCode(shelvesId, goodsSkuCode);
-                BigDecimal actualCount = shelfBillGoods.getActualCount();
+                BigDecimal actualCount = BigDecimal.ZERO;
+                if (null != shelfBillGoods.getActualCount()) {
+                    actualCount = shelfBillGoods.getActualCount();
+                }
                BigDecimal subtract = shelfBillGoods.getCount().subtract(actualCount);
                if (subtract.compareTo(map.get(goodsID)) < 0) {
                    return rb.setMsg("请勿超过商品上架最大数量");
@ -741,7 +744,10 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                WmsGoodsTag wmsGoodsTag = wmsGoodsTagService.selByBillSidAndGoodsID(sourceBillSid, goodsID);
                String goodsSkuCode = wmsGoodsTag.getGoodsSkuCode();
                WmsShelfBillDetail shelfBillGoods = wmsShelfBillDetailService.selByBillSidAndSkuCode(shelvesId, goodsSkuCode);
-                BigDecimal actualCount = shelfBillGoods.getActualCount();
+                BigDecimal actualCount = BigDecimal.ZERO;
+                if (null != shelfBillGoods.getActualCount()) {
+                    actualCount = shelfBillGoods.getActualCount();
+                }
                BigDecimal add = actualCount.add(new BigDecimal(count));
                shelfBillGoods.setActualCount(add);
                wmsShelfBillDetailService.updateById(shelfBillGoods);
@ -810,7 +816,7 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                }
                wmsInventoryRecordService.saveRecord(recordDto);
            }
-            List<WmsShelfBillDetail> vos = wmsShelfBillDetailService.selectByMainSid(dto.getShelvesSid());
+            List<WmsShelfBillDetail> vos = wmsShelfBillDetailService.selectByMainSid(dto.getSid());
            if (!vos.isEmpty()) {
                HashSet<Integer> integers = new HashSet<>();
                for (WmsShelfBillDetail vo : vos) {
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppSaveBillRecordDto.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppSaveBillRecordDto.java
@ -21,7 +21,7 @@ public class AppSaveBillRecordDto implements Dto {
    /**
     * 上架单sid
     */
-    private String shelvesSid;
+    private String sid;
    private String userSid;

    @Data