From 1442f860ebb8483a7ebf8bce6b3bb0c22a8fcee7 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 30 Apr 2024 09:54:38 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=AE=B6=E8=AE=BF=E5=87=86=E5=A4=87?=
 =?UTF-8?q?=E5=87=86=E5=A4=87=E5=AE=8C=E6=AF=95=E6=9C=AA=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E8=A1=A5=E5=85=85=E4=BF=A1=E6=81=AF=E5=85=B3?=
 =?UTF-8?q?=E8=81=94sid=E7=9A=84=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanHomevisitInvestigateCustomerFeign.java            | 4 ++--
 .../LoanHomevisitInvestigateCustomerFeignFallback.java    | 2 +-
 .../LoanBeCollectionRecordService.java                    | 2 +-
 .../LoanHomevisitInvestigateCustomerMapper.java           | 5 ++++-
 .../LoanHomevisitInvestigateCustomerMapper.xml            | 2 +-
 .../LoanHomevisitInvestigateCustomerRest.java             | 4 ++--
 .../LoanHomevisitInvestigateCustomerService.java          | 8 ++++++--
 .../biz/loanhomevisitprep/LoanHomevisitPrepService.java   | 2 +-
 8 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerFeign.java
index 2edfd064fb..85a2ad0ea8 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerFeign.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerFeign.java
@@ -82,7 +82,7 @@ public interface LoanHomevisitInvestigateCustomerFeign {
     ResultBean<LoanHomevisitInvestigateCustomerDetailsVo> selectByMainSid(@RequestParam("mainSid") String mainSid);
 
     @ApiOperation("根据贷款人sid和销售订单sid查询")
-    @GetMapping("/selectByBorrSid")
+    @GetMapping("/selectByBorrSidAndSaleSid")
     @ResponseBody
-    ResultBean<LoanHomevisitInvestigateCustomerDetailsVo> selectByBorrSid(@RequestParam("borrowerSid") String borrowerSid,@RequestParam("orderSid") String orderSid);
+    ResultBean<LoanHomevisitInvestigateCustomerDetailsVo> selectByBorrSidAndSaleSid(@RequestParam("borrowerSid") String borrowerSid,@RequestParam("orderSid") String orderSid);
 }
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerFeignFallback.java
index a79f600e1f..d4d022eb23 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerFeignFallback.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerFeignFallback.java
@@ -76,7 +76,7 @@ public class LoanHomevisitInvestigateCustomerFeignFallback implements LoanHomevi
 	}
 
 	@Override
-	public ResultBean<LoanHomevisitInvestigateCustomerDetailsVo> selectByBorrSid(String borrowerSid, String orderSid) {
+	public ResultBean<LoanHomevisitInvestigateCustomerDetailsVo> selectByBorrSidAndSaleSid(String borrowerSid, String orderSid) {
 		return null;
 	}
 
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java
index 92e61dbd72..60f05d6456 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java
@@ -192,7 +192,7 @@ public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeColl
 	public LoanBeCollectionRecordInit init(String saleVehSid) {
 		LoanBeCollectionRecordInit loanBeCollectionRecordInit = new LoanBeCollectionRecordInit();
 		BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(saleVehSid).getData();
-		LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(busSalesOrderVehicle.getBorrowerSid(),busSalesOrderVehicle.getSalesOrderSid());
+		LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(busSalesOrderVehicle.getBorrowerSid());
 		loanBeCollectionRecordInit.setBorrowerName(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName());
 		loanBeCollectionRecordInit.setBorrowerMobile(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerMobile());
 		loanBeCollectionRecordInit.setSpouseName(loanHomevisitInvestigateCustomerDetailsVo.getSpouseName());
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerMapper.java
index 6094a9fc5b..f84e9eae28 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerMapper.java
@@ -68,7 +68,7 @@ public interface LoanHomevisitInvestigateCustomerMapper extends BaseMapper<LoanH
 	@Select("select * from loan_homevisit_investigate_customer where mainSid = #{sid}")
     LoanHomevisitInvestigateCustomerDetailsVo selByMainSid(String sid);
 
-    LoanHomevisitInvestigateCustomerDetailsVo fetchByBorrowerSid(@Param("saleOrderBorrowerSid") String saleOrderBorrowerSid,@Param("orderSid") String orderSid);
+    LoanHomevisitInvestigateCustomerDetailsVo selectByBorrSidAndSaleSid(@Param("saleOrderBorrowerSid") String saleOrderBorrowerSid,@Param("orderSid") String orderSid);
 
 	@Update("update loan_homevisit_investigate_customer set mainSid = #{mainSid} where sid = #{sid}")
 	void updateMainSid(@Param("sid") String sid,@Param("mainSid") String mainSid);
@@ -78,4 +78,7 @@ public interface LoanHomevisitInvestigateCustomerMapper extends BaseMapper<LoanH
 
 	@Select("select * from loan_homevisit_investigate_customer where mainSid = #{mainSid}")
 	LoanHomevisitInvestigateCustomerDetailsVo selectByMainSid(String mainSid);
+
+	@Select("select * from loan_homevisit_investigate_customer where borrowerSid = #{saleOrderBorrowerSid}")
+	LoanHomevisitInvestigateCustomerDetailsVo fetchByBorrowerSid(String saleOrderBorrowerSid);
 }
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerMapper.xml
index cce096b68e..e617525baf 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerMapper.xml
@@ -11,7 +11,7 @@
 		SELECT * FROM loan_homevisit_investigate_customer <where> ${ew.sqlSegment} </where>
 	</select>
 
-	<select id="fetchByBorrowerSid"
+	<select id="selectByBorrSidAndSaleSid"
             resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDetailsVo">
 		SELECT
 				lc.*
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerRest.java
index df7e21ff1c..e3691b4153 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerRest.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerRest.java
@@ -106,9 +106,9 @@ public class LoanHomevisitInvestigateCustomerRest implements LoanHomevisitInvest
 	}
 
 	@Override
-	public ResultBean<LoanHomevisitInvestigateCustomerDetailsVo> selectByBorrSid(String borrowerSid,String orderSid) {
+	public ResultBean<LoanHomevisitInvestigateCustomerDetailsVo> selectByBorrSidAndSaleSid(String borrowerSid,String orderSid) {
 		ResultBean rb = ResultBean.fireFail();
-		LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(borrowerSid,orderSid);
+		LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.selectByBorrSidAndSaleSid(borrowerSid,orderSid);
 		return rb.success().setData(loanHomevisitInvestigateCustomerDetailsVo);
 	}
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerService.java
index 613525bdf8..511b49c31a 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerService.java
@@ -112,8 +112,8 @@ public class LoanHomevisitInvestigateCustomerService extends MybatisBaseService<
 		return baseMapper.selByMainSid(sid);
 	}
 
-	public LoanHomevisitInvestigateCustomerDetailsVo fetchByBorrowerSid(String saleOrderBorrowerSid,String orderSid) {
-		return baseMapper.fetchByBorrowerSid(saleOrderBorrowerSid,orderSid);
+	public LoanHomevisitInvestigateCustomerDetailsVo selectByBorrSidAndSaleSid(String saleOrderBorrowerSid,String orderSid) {
+		return baseMapper.selectByBorrSidAndSaleSid(saleOrderBorrowerSid,orderSid);
 	}
 
 	public void updateMainSid(String sid, String mainSid) {
@@ -127,4 +127,8 @@ public class LoanHomevisitInvestigateCustomerService extends MybatisBaseService<
 	public LoanHomevisitInvestigateCustomerDetailsVo selectByMainSid(String mainSid) {
 		return baseMapper.selectByMainSid(mainSid);
 	}
+
+	public LoanHomevisitInvestigateCustomerDetailsVo fetchByBorrowerSid(String saleOrderBorrowerSid) {
+		return baseMapper.fetchByBorrowerSid(saleOrderBorrowerSid);
+	}
 }
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
index d64c838a67..7cfd380545 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
@@ -307,7 +307,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         loanHomevisitInvestigate.setPrepSid(sid);
         loanHomevisitInvestigateService.save(loanHomevisitInvestigate);
         //查询是否已存在客户信息并关联
-        LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(loanHomevisitPrep.getSaleOrderBorrowerSid(),loanHomevisitPrep.getSaleOrderSid());
+        LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(loanHomevisitPrep.getSaleOrderBorrowerSid());
         if (loanHomevisitInvestigateCustomerDetailsVo != null) {
             List<LoanHomeVisitInvestigateInitOtherPeoVo> loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(loanHomevisitInvestigateCustomerDetailsVo.getMainSid());
             if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0) {

From d0a81843af75d2c5cd7cc0553b8228ed6cc25f1e Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 30 Apr 2024 10:21:38 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=99=BB=E8=AE=B0=E3=80=81=E6=B4=BE=E5=B7=A5?=
 =?UTF-8?q?=E3=80=81=E7=BB=B4=E4=BF=AE=E3=80=81=E7=AB=A3=E5=B7=A5=E3=80=81?=
 =?UTF-8?q?=E7=BB=93=E7=AE=97=E3=80=81=E5=87=BA=E5=8E=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-as-ui/src/api/operation/repairbill.js     |  26 +-
 .../views/operation/repairbill/repairbill.vue | 190 +++-
 .../operation/repairbill/repairbillAdd.vue    | 833 ++++++++++++++----
 .../repairbill/repairbillBYLeaveFactory.vue   | 422 +++++++++
 .../repairbill/repairbillByBeCompleted.vue    | 422 +++++++++
 .../repairbill/repairbillByMaintain.vue       | 422 +++++++++
 .../repairbill/repairbillBySendWork.vue       | 422 +++++++++
 .../repairbill/repairbillBySettleAccounts.vue | 422 +++++++++
 .../operation/repairbill/repairbillInfo.vue   | 567 ++++++++++++
 9 files changed, 3513 insertions(+), 213 deletions(-)
 create mode 100644 yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue
 create mode 100644 yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue
 create mode 100644 yxt-as-ui/src/views/operation/repairbill/repairbillByMaintain.vue
 create mode 100644 yxt-as-ui/src/views/operation/repairbill/repairbillBySendWork.vue
 create mode 100644 yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue
 create mode 100644 yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue

diff --git a/yxt-as-ui/src/api/operation/repairbill.js b/yxt-as-ui/src/api/operation/repairbill.js
index eba5ac68e0..865d8dd16a 100644
--- a/yxt-as-ui/src/api/operation/repairbill.js
+++ b/yxt-as-ui/src/api/operation/repairbill.js
@@ -10,14 +10,6 @@ export default {
       headers: { 'Content-Type': 'application/json' }
     })
   },
-  customerListPage: function(params) {
-    return request({
-      url: '/as/v1/AsServiceItem/listPage',
-      method: 'post',
-      data: params,
-      headers: { 'Content-Type': 'application/json' }
-    })
-  },
   saveOrUpdate: function(data) {
     return request({
       url: '/as/v1/AsBusrepairBill/saveBill',
@@ -48,19 +40,13 @@ export default {
       headers: { 'Content-Type': 'application/json' }
     })
   },
-  // 根据分公司全路径sid查询本分公司下的品牌，再根据品牌查询相应的关联车型信息
-  getVehModel: function(data) {
+  // 确认材料费
+  sureMaterialFee: function(data) {
     return request({
-      url: '/as/v1/AsServiceItem/getVehModel',
-      method: 'get',
-      params: data
-    })
-  },
-  getManufacturers: function(data) {
-    return request({
-      url: '/as/v1/AsServiceItem/getManufacturers',
-      method: 'get',
-      params: data
+      url: '/as/v1/AsBusrepairBill/sureMaterialFee',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
     })
   }
 }
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbill.vue b/yxt-as-ui/src/views/operation/repairbill/repairbill.vue
index f61a8ec8c6..fc39b04697 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbill.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbill.vue
@@ -9,22 +9,71 @@
           <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" label-width="100px" class="tab-header">
-              <el-form-item label="客户">
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="制单部门">
+                <el-input v-model="listQuery.params.createDept" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="制单人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="单据编号">
+                <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="制单日期">
+                <el-date-picker v-model="listQuery.params.startTime" 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.endTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="工单类型">
+                <el-select v-model="listQuery.params.billType" clearable placeholder="请选择" filterable>
+                  <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="科目">
+                <el-input v-model="listQuery.params.subject" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="进厂时间">
+                <el-date-picker v-model="listQuery.params.entryStartTime" 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.entryEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="预约完工时间">
+                <el-date-picker v-model="listQuery.params.finishStartTime" 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.finishEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="客户名称">
                 <el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="联系电话">
                 <el-input v-model="listQuery.params.mobile" placeholder="" clearable/>
               </el-form-item>
+              <el-form-item label="客户单位">
+                <el-input v-model="listQuery.params.customerOrg" placeholder="" clearable/>
+              </el-form-item>
               <el-form-item label="车牌号">
                 <el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="车型">
-                <el-input v-model="listQuery.params.vehModel" placeholder="" clearable/>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="创建日期">
-                <el-date-picker v-model="listQuery.params.startTime" 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.endTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              <el-form-item label="服务顾问">
+                <el-input v-model="listQuery.params.waitorName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="班组">
+                <el-input v-model="listQuery.params.groupName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="主修人">
+                <el-input v-model="listQuery.params.mainRepairers" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="是否开票">
+                <el-select v-model="listQuery.params.isInvoicing" clearable placeholder="请选择" filterable>
+                  <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -43,23 +92,35 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border 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="180px" align="center">
+            <el-table-column label="单据编号" align="center" width="130">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="toEdit(scope.row)">办理</el-button>
-                <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
+                <span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.billNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="billNo" label="单据编号" align="center" width="180" />
-            <el-table-column prop="billType" label="单据类型" align="center" width="120" />
-            <el-table-column prop="customerName" label="客户名称" align="center" width="120" />
-            <el-table-column prop="vehMark" label="车牌号" align="center" width="120" />
-            <el-table-column prop="vinNo" label="车架号" align="center" width="120" />
-            <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
-            <el-table-column prop="entryTime" label="进场时间" align="center" width="120" />
-            <el-table-column prop="estimatedFinishTime" label="预计完工时间" align="center" width="100" />
+            <el-table-column prop="nodeName" label="环节" align="center" width="80" />
+            <el-table-column prop="useOrgName" label="分公司" align="center" width="120" />
+            <el-table-column prop="dept" label="制单部门" align="center" width="120" />
+            <el-table-column prop="createByName" label="制单人" align="center" width="120" />
+            <el-table-column prop="createTime" label="制单日期" align="center" width="120" />
+            <el-table-column prop="billType" label="工单类型" align="center" width="120" />
             <el-table-column prop="subject" label="科目" align="center" width="100" />
-            <el-table-column prop="nodeName" label="当前环节" align="center" width="100" />
-            <el-table-column prop="nodeTime" label="进入当前环节时间" align="center" width="160" />
+            <el-table-column prop="entryTime" label="进厂时间" align="center" width="120" />
+            <el-table-column prop="estimatedFinishTime" label="预计完工时间" align="center" width="120" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="160" />
+            <el-table-column prop="mobile" label="联系电话" align="center" width="100" />
+            <el-table-column prop="customerOrg" label="客户单位" align="center" width="100" />
+            <el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
+            <el-table-column prop="vehModel" label="车型" align="center" width="200" />
+            <el-table-column prop="waitorName" label="服务顾问" align="center" width="100" />
+            <el-table-column prop="groupName" label="班组" align="center" width="100" />
+            <el-table-column prop="mainRepairers" label="主修人" align="center" width="100" />
+            <el-table-column prop="nodeTime" label="是否开票" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.isInvoicing == '1' ? '是' : '否' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="nodeTime" label="备注" align="center" min-width="200" />
           </el-table>
         </div>
         <!--End 主页面主要部分-->
@@ -73,6 +134,8 @@
     </div>
     <!--新增及修改 -->
     <repairbillAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+    <!-- 详情 -->
+    <repairbillInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
   </div>
 </template>
 
@@ -82,13 +145,16 @@ import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import req from '@/api/operation/repairbill'
 import repairbillAdd from './repairbillAdd'
+import repairbillInfo from './repairbillInfo'
+
 export default {
   name: 'RepairBill',
   components: {
     Pagination,
     pageye,
     ButtonBar,
-    repairbillAdd
+    repairbillAdd,
+    repairbillInfo
   },
   data() {
     return {
@@ -101,6 +167,13 @@ export default {
           btnKey: 'toAdd',
           btnLabel: '新增'
         },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toEdit',
+          btnLabel: '编辑'
+        },
         {
           type: 'danger',
           size: 'small',
@@ -122,6 +195,30 @@ export default {
       tableKey: 0,
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
+      billType_list: [
+        {
+          dictKey: '0',
+          dictValue: '正常工单'
+        },
+        {
+          dictKey: '1',
+          dictValue: '保险理赔'
+        },
+        {
+          dictKey: '2',
+          dictValue: '协议单位'
+        }
+      ],
+      state_list: [
+        {
+          dictKey: '1',
+          dictValue: '是'
+        },
+        {
+          dictKey: '0',
+          dictValue: '是'
+        }
+      ],
       FormLoading: false,
       listLoading: false,
       // 翻页
@@ -132,12 +229,29 @@ export default {
         params: {
           startTime: '',
           endTime: '',
+          useOrgName: '',
+          dept: '',
+          createByName: '',
+          billNo: '',
+          billType: '',
+          entryStartTime: '',
+          entryEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
           customerName: '',
           mobile: '',
+          customerOrg: '',
           vehMark: '',
-          vehModel: '',
+          vinNo: '',
+          waitorName: '',
+          groupName: '',
+          mainRepairers: '',
+          isInvoicing: '',
+          nodeCode: '',
+          userSid: '',
+          menuUrl: '',
           orgPath: '',
-          nodeCode: ''
+          subject: ''
         }
       }
     }
@@ -165,6 +279,9 @@ export default {
         case 'toAdd':
           this.toAdd()
           break
+        case 'toEdit':
+          this.toEdit()
+          break
         case 'doDel':
           this.doDel()
           break
@@ -193,7 +310,9 @@ export default {
     getList() {
       this.listLoading = true
       this.listQuery.params.nodeCode = '1'
+      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) {
@@ -219,12 +338,29 @@ export default {
         params: {
           startTime: '',
           endTime: '',
+          useOrgName: '',
+          dept: '',
+          createByName: '',
+          billNo: '',
+          billType: '',
+          entryStartTime: '',
+          entryEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
           customerName: '',
           mobile: '',
+          customerOrg: '',
           vehMark: '',
-          vehModel: '',
+          vinNo: '',
+          waitorName: '',
+          groupName: '',
+          mainRepairers: '',
+          isInvoicing: '',
+          nodeCode: '',
+          userSid: '',
+          menuUrl: '',
           orgPath: '',
-          nodeCode: ''
+          subject: ''
         }
       }
       this.getList()
@@ -233,9 +369,9 @@ export default {
       this.viewState = 2
       this.$refs['divAdd'].showAdd()
     },
-    toEdit(row) {
+    toEdit() {
       this.viewState = 3
-      this.$refs['divAdd'].showEdit(row)
+      this.$refs['divAdd'].showEdit()
     },
     toInfo(row) {
       this.viewState = 4
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
index efb2328d4e..4ed5bdc725 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
@@ -4,160 +4,295 @@
       <div class="tab-header webtop">
         <div>{{ viewTitle }}</div>
         <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="selectCustomer()" v-show="formobj.nodeName == '登记' ||formobj.nodeName == ''">选择客户</el-button>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
-          <el-button type="primary" size="small" :disabled="submitdisabled" @click="settleAccounts()">结算</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="settleAccounts()" v-show="formobj.nodeName == '结算'">结算</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="confirmCLF()" v-show="formobj.nodeName == '结算' && formobj.subject == '保外'">确认材料费</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">制单人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">制单部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">制单日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">工单类型</div>
+              <el-form-item>
+                <el-select class="addinputInfo" v-model="formobj.billType" placeholder="请选择" @change="billTypeChange" clearable filterable>
+                  <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">科目</div>
+              <el-form-item>
+                <el-select class="addinputInfo" v-model="formobj.subject" placeholder="请选择" @change="changeSubject" clearable filterable>
+                  <el-option v-for="item in subject_list" :key="item.subjectSid" :label="item.subjectName" :value="item.subjectName"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">环节</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.nodeName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">进厂时间</div>
+              <el-form-item><el-date-picker class="addinputInfo" v-model="formobj.entryTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">预计完工</div>
+              <el-form-item><el-date-picker class="addinputInfo" v-model="formobj.estimatedFinishTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">服务顾问</div>
+              <el-form-item>
+                <el-select class="addinputInfo" v-model="formobj.waitorName" placeholder="请选择" @change="waitorChange" clearable filterable>
+                  <el-option v-for="item in user_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">班组</div>
+              <el-form-item>
+                <el-select class="addinputInfo" v-model="formobj.groupName" placeholder="请选择" @change="groupChange" clearable filterable>
+                  <el-option v-for="item in group_list" :key="item.groupSid" :label="item.groupName" :value="item.groupName"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">主修人</div>
+              <el-form-item>
+                <el-select class="addinputInfo" v-model="formobj.mainRepairers" placeholder="请选择" @change="waitorChange" clearable filterable>
+                  <el-option v-for="item in user_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">快捷备注</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.shotRemarks" clearable placeholder="" /></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">备注(打印)</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.printRemarks" clearable placeholder="" /></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
+            </el-col>
+          </el-row>
           <el-collapse v-model="activeNames">
             <el-collapse-item title="客户信息" name="1">
               <el-row style="border-top: 1px solid #e0e3eb">
-                <el-col :span="24">
-                  <div class="span-sty">客户</div>
-                  <el-form-item>
-                    <el-popover placement="right" width="600" trigger="click">
-                      <div>
-                        <el-table :data="clientData" v-loading="clientLoading" highlight-current-row @current-change="clientCurrentChange">
-                          <el-table-column fixed prop="vehMark" label="车辆拍照" align="center" width="130" />
-                          <el-table-column prop="name" label="客户" align="center" width="100" />
-                          <el-table-column prop="mobile" label="联系方式" align="center" min-width="300" />
-                          <el-table-column prop="orgName" label="客户单位" align="center" width="100" />
-                        </el-table>
-                        <el-pagination :page.sync="clientQuery.current" :page-size="clientQuery.size" layout="total, pager" :total="clientQuery.total" />
-                      </div>
-                      <el-input slot="reference"  class="addinputInfo" style="width: 20%" v-model="formobj.customerName" @input="clientInput(formobj.customerName)" clearable placeholder="车辆牌照"/>
-                    </el-popover>
-                  </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.customerName }}</span></el-form-item>
                 </el-col>
                 <el-col :span="8">
-                  <div class="span-sty">车辆牌照</div>
+                  <div class="span-sty">联系地那话</div>
                   <el-form-item><span class="addinputInfo">{{ formobj.vehMark }}</span></el-form-item>
                 </el-col>
                 <el-col :span="8">
-                  <div class="span-sty">联系电话</div>
+                  <div class="span-sty">客户单位</div>
                   <el-form-item><span class="addinputInfo">{{ formobj.mobile }}</span></el-form-item>
                 </el-col>
               </el-row>
               <el-row>
                 <el-col :span="8">
-                  <div class="span-sty">车架号</div>
+                  <div class="span-sty">车牌号</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.vehMark }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">车架号哦啊</div>
                   <el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
                 </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">车型</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.vehModel }}</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.mileage }}</span></el-form-item>
+                  <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.mileage" clearable placeholder="" /></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">油量</div>
+                  <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.oil" clearable placeholder="" /></el-form-item>
                 </el-col>
                 <el-col :span="8">
-                  <div class="span-sty">单位</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.customerOrg }}</span></el-form-item>
+                  <div class="span-sty">当前里程</div>
+                  <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.currentMileage" clearable placeholder="" /></el-form-item>
                 </el-col>
               </el-row>
-              <el-row>
+            </el-collapse-item>
+            <el-collapse-item title="送修人信息" name="2">
+              <el-row style="border-top: 1px solid #e0e3eb">
                 <el-col :span="8">
-                  <div class="span-sty">车型</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.vehModel }}</span></el-form-item>
+                  <div class="span-sty">送修人姓名</div>
+                  <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.otherVo.senderName" clearable placeholder="" /></el-form-item>
                 </el-col>
                 <el-col :span="8">
-                  <div class="span-sty">会员卡号</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.memberCarNumber }}</span></el-form-item>
+                  <div class="span-sty">送修人电话</div>
+                  <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.otherVo.senderMobile" clearable placeholder="" /></el-form-item>
                 </el-col>
                 <el-col :span="8">
-                  <div class="span-sty">油量</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.oil }}</span></el-form-item>
+                  <div class="span-sty">厂家</div>
+                  <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.otherVo.manufacturer" clearable placeholder="" /></el-form-item>
+                </el-col>
+              </el-row>
+            </el-collapse-item>
+            <el-collapse-item title="保险信息" name="3">
+              <el-row style="border-top: 1px solid #e0e3eb">
+                <el-col :span="8">
+                  <div class="span-sty">责任划分</div>
+                  <el-form-item>
+                    <el-select class="addinputInfo" v-model="formobj.insuranceVo.responsibility" placeholder="请选择" @change="responsibilityChange" clearable filterable>
+                      <el-option v-for="item in responsibility_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="16">
+                  <div class="span-sty">对方险种</div>
+                  <el-form-item>
+                    <el-select class="addinputInfo" v-model="formobj.insuranceVo.otherInsuranceType" placeholder="请选择" @change="otherInsuranceTypeChange" clearable filterable>
+                      <el-option v-for="item in otherInsuranceType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                    </el-select>
+                  </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.currentMileage }}</span></el-form-item>
+                <el-col :span="8">
+                  <div class="span-sty">保险公司1</div>
+                  <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.insuranceVo.insuranceCompany1" clearable placeholder="" /></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">保险公司2</div>
+                  <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.insuranceVo.insuranceCompany2" clearable placeholder="" /></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">保险索赔单号</div>
+                  <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.insuranceVo.claimBillNo" clearable placeholder="" /></el-form-item>
                 </el-col>
               </el-row>
-            </el-collapse-item>
-            <el-collapse-item title="单据信息" name="2">
-              <el-row style="border-top: 1px solid #E0E3EB">
+              <el-row>
                 <el-col :span="8">
-                  <div class="span-sty">单据编号</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
+                  <div class="span-sty">保险人员</div>
+                  <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.insuranceVo.insurer" clearable placeholder="" /></el-form-item>
                 </el-col>
                 <el-col :span="8">
-                  <div class="span-sty">进场时间</div>
-                  <el-form-item><el-date-picker class="addinputInfo" v-model="formobj.entryTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
+                  <div class="span-sty">勘察员</div>
+                  <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.insuranceVo.investigator" clearable placeholder="" /></el-form-item>
                 </el-col>
                 <el-col :span="8">
-                  <div class="span-sty">预计完工</div>
-                  <el-form-item><el-date-picker class="addinputInfo" v-model="formobj.estimatedFinishTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
+                  <div class="span-sty">定损员</div>
+                  <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.insuranceVo.lossAdjuster" clearable placeholder="" /></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.vehModel }}</span></el-form-item>
+                  <div class="span-sty">特殊标志</div>
+                  <el-form-item>
+                    <el-radio-group class="addinputInfo" style="font-size: 1px" v-model="formobj.insuranceVo.isSpecialSign">
+                      <el-radio label="1">是</el-radio>
+                      <el-radio label="0">否</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="16">
+                  <div class="span-sty">出险类型</div>
+                  <el-form-item>
+                    <el-select class="addinputInfo" v-model="formobj.insuranceVo.accidentType" placeholder="请选择" @change="accidentTypeChange" clearable filterable>
+                      <el-option v-for="item in accidentType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-collapse-item>
+            <el-collapse-item title="发票信息" name="4">
+              <el-row style="border-top: 1px solid #e0e3eb">
+                <el-col :span="8">
+                  <div class="span-sty">是否开发票</div>
+                  <el-form-item>
+                    <el-radio-group class="addinputInfo" style="font-size: 1px" v-model="formobj.invoiceVo.isInvoicing">
+                      <el-radio label="1">是</el-radio>
+                      <el-radio label="0">否</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                  <div class="span-sty">服务顾问</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.memberCarNumber }}</span></el-form-item>
+                  <div class="span-sty">发票类型</div>
+                  <el-form-item>
+                    <el-select class="addinputInfo" :disabled="formobj.invoiceVo.isInvoicing != '1'" v-model="formobj.invoiceVo.invoiceType" placeholder="请选择" @change="invoiceTypeChange" clearable filterable>
+                      <el-option v-for="item in invoiceType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                    </el-select>
+                  </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                  <div class="span-sty">快捷备注</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.shotRemarks }}</span></el-form-item>
+                  <div class="span-sty">开票名称</div>
+                  <el-form-item><el-input class="addinputInfo addinputw" :disabled="formobj.invoiceVo.isInvoicing != '1'" v-model="formobj.invoiceVo.invoiceTitle" clearable placeholder="" /></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.printRemarks }}</span></el-form-item>
+                  <div class="span-sty">税号</div>
+                  <el-form-item><el-input class="addinputInfo addinputw" :disabled="formobj.invoiceVo.isInvoicing != '1'" v-model="formobj.invoiceVo.taxpayerNo" clearable placeholder="" /></el-form-item>
                 </el-col>
                 <el-col :span="8">
-                  <div class="span-sty">备注</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+                  <div class="span-sty">发票号码</div>
+                  <el-form-item><el-input class="addinputInfo addinputw" :disabled="formobj.invoiceVo.isInvoicing != '1'" v-model="formobj.invoiceVo.invoiceCode" clearable placeholder="" /></el-form-item>
                 </el-col>
                 <el-col :span="8">
-                  <div class="span-sty">主修人</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.mainRepairers }}</span></el-form-item>
+                  <div class="span-sty">税率</div>
+                  <el-form-item><el-input class="addinputInfo addinputw" :disabled="formobj.invoiceVo.isInvoicing != '1'" @keyup.native="formobj.invoiceVo.taxRate = getNumber(formobj.invoiceVo.taxRate, 2)" v-model="formobj.invoiceVo.taxRate" clearable placeholder="" /></el-form-item>
                 </el-col>
               </el-row>
             </el-collapse-item>
-            <el-collapse-item title="送修人信息" name="3">
-            </el-collapse-item>
-            <el-collapse-item title="保险信息" name="4">
-            </el-collapse-item>
-            <el-collapse-item title="发票信息" name="5">
-            </el-collapse-item>
           </el-collapse>
+          <div class="title titleOne">
+            <div>服务项目</div>
+            <el-button type="primary" size="mini" class="btntopblueline" @click="serviceAdd">添加</el-button>
+          </div>
           <el-table :key="serviceKey" :data="formobj.sitemVos" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column align="center" width="70">
-              <template slot="header">
-                <i class="add-btn-icon el-icon-plus" style="color: red;font-size:20px" @click="serviceAdd"></i>
-              </template>
+            <el-table-column fixed label="操作" align="center" width="70">
               <template slot-scope="scope">
-                <i class="el-icon-delete" @click="serviceDelete(scope.$index)"></i>
+                <el-button type="danger" size="small" @click="serviceDelete(scope.$index)">删除</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="服务项目" align="center" min-width="200">
+            <el-table-column label="服务项目" align="center" width="200">
               <template slot-scope="scope">
                 <el-popover placement="right" width="600" trigger="click">
                   <div>
                     <el-table :data="serviceData" v-loading="serviceLoading" highlight-current-row @current-change="serviceCurrentChange($event, scope.row)">
-                      <el-table-column fixed prop="goodsName" label="商品名称" align="center" width="130" />
-                      <el-table-column prop="goodsCode" label="零件号" align="center" width="100" />
-                      <el-table-column prop="goodsModel" label="车型" align="center" min-width="300" />
-                      <el-table-column prop="warehouse" label="仓库" align="center" width="" />
-                      <el-table-column prop="price" label="销售价" align="center" width="100" />
-                      <el-table-column prop="count" label="数量" align="center" width="100" />
+                      <el-table-column fixed prop="sitemName" label="项目名称" align="center" width="130" />
+                      <el-table-column prop="serviceType" label="工种" align="center" />
+                      <el-table-column prop="hourPrice" label="工时单价" align="center" />
+                      <el-table-column prop="hours" label="工时数" align="center" />
+                      <el-table-column prop="price" label="销售价" align="center" />
                     </el-table>
                     <el-pagination :page.sync="serviceQuery.current" :page-size="serviceQuery.size" layout="total, pager" :total="serviceQuery.total" />
                   </div>
-                  <el-input slot="reference" v-model="scope.row.goodsName" @input="serviceInput(scope.row.goodsName)" clearable placeholder="项目名称、拼音"/>
+                  <el-input slot="reference" v-model="scope.row.serviceItem" @input="serviceInput(scope.row.serviceItem)" clearable placeholder="项目名称、拼音"/>
                 </el-popover>
               </template>
             </el-table-column>
@@ -175,12 +310,19 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="考核工时" align="center" width="130">
+            <el-table-column label="维修人" width="100" align="center">
+              <template slot-scope="scope">
+                <el-select class="addinputInfo" v-model="scope.row.staffList" placeholder="请选择" @change="userChange(scope.row, scope.row.staffList)" clearable filterable>
+                  <el-option v-for="item in user_list" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="考核工时" align="center" width="100">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.examineHourPrice" @keyup.native="scope.row.examineHourPrice = getNumber(scope.row.examineHourPrice, 2)" clearable placeholder="" />
               </template>
             </el-table-column>
-            <el-table-column label="工时单价" align="center" width="130">
+            <el-table-column label="工时单价" align="center" width="150">
               <template slot-scope="scope">
                 <el-input @input="computeXSJ(scope.row)" v-model="scope.row.hourPrice" @keyup.native="scope.row.hourPrice = getNumber(scope.row.hourPrice, 2)" clearable placeholder="" />
               </template>
@@ -190,7 +332,7 @@
                 <el-input @input="computeXSJ(scope.row)" v-model="scope.row.hours" @keyup.native="scope.row.hours = getNumber(scope.row.hours, 2)" clearable placeholder="" />
               </template>
             </el-table-column>
-            <el-table-column label="销售价" align="center" width="100">
+            <el-table-column label="销售价" align="center" width="150">
               <template slot-scope="scope">
                 <el-input @input="computeGSS(scope.row)" v-model="scope.row.price" @keyup.native="scope.row.price = getNumber(scope.row.price, 2)" clearable placeholder="" />
               </template>
@@ -200,23 +342,51 @@
                 <el-input @input="computeYHAndXSJE(scope.row)" v-model="scope.row.discount" @keyup.native="scope.row.discount = getNumber(scope.row.discount, 2)" clearable placeholder="" />
               </template>
             </el-table-column>
-            <el-table-column prop="discountAmount" label="优惠" align="center" width="100" />
-            <el-table-column prop="amount" label="销售金额" align="center" width="100" />
-            <el-table-column label="备注" align="center" width="200">
+            <el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
+            <el-table-column prop="amount" label="销售金额" align="center" width="150" />
+            <el-table-column label="备注" align="center" min-width="300">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.remarks" clearable placeholder="" />
               </template>
             </el-table-column>
           </el-table>
-          <div class="title">附加项目列表</div>
+          <div class="title">商品</div>
+          <el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
+            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+            <el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
+            <el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
+            <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
+            <el-table-column prop="unit" label="单位" width="100" align="center" />
+            <el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
+            <el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
+            <el-table-column label="销售价" align="center" width="150">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.price" @keyup.native="scope.row.price = getNumber(scope.row.price, 2)" clearable placeholder="" />
+              </template>
+            </el-table-column>
+            <el-table-column prop="count" label="数量" width="100" align="center" />
+            <el-table-column label="折扣" align="center" width="100">
+              <template slot-scope="scope">
+                <el-input @input="computeYHAndXSJE(scope.row)" v-model="scope.row.discount" @keyup.native="scope.row.discount = getNumber(scope.row.discount, 2)" clearable placeholder="" />
+              </template>
+            </el-table-column>
+            <el-table-column prop="discountAmount" label="优惠" width="100" align="center" />
+            <el-table-column prop="amount" label="金额" width="100" align="center" />
+            <el-table-column label="备注" align="center" min-width="300">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.remarks" clearable placeholder="" />
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="title titleOne">
+            <div>附加项目</div>
+            <el-button type="primary" size="mini" @click="subjoinAdd">添加</el-button>
+          </div>
           <el-table :key="subjoinKey" :data="formobj.aitemVos" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column align="center" width="70">
-              <template slot="header">
-                <i class="add-btn-icon el-icon-plus" style="color: red;font-size:20px" @click="subjoinAdd"></i>
-              </template>
+            <el-table-column fixed label="操作" align="center" width="70">
               <template slot-scope="scope">
-                <i class="el-icon-delete" @click="subjoinDelete(scope.$index)"></i>
+                <el-button type="danger" size="small" @click="subjoinDelete(scope.$index)">删除</el-button>
               </template>
             </el-table-column>
             <el-table-column label="附加项目" align="center" width="200">
@@ -236,7 +406,7 @@
             </el-table-column>
             <el-table-column label="销售价" align="center" width="150">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.price" clearable placeholder="" />
+                <el-input v-model="scope.row.price" @keyup.native="scope.row.price = getNumber(scope.row.price, 2)" clearable placeholder="" />
               </template>
             </el-table-column>
             <el-table-column label="备注" align="center" min-width="200">
@@ -248,56 +418,77 @@
           <el-row>
             <el-col :span="24">
               <div class="span-sty">合计金额</div>
-              <el-form-item><span class="addinputInfo">{{ jeTotal }} = 工时费：{{ gsfTotal }} + 附加费：{{ fjfTotal }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ jeTotal }} = 工时费：{{ gsfTotal }} + 材料费：{{ clfTotal }} + 附加费：{{ fjfTotal }} + 税额：{{ seTotal }}</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">{{ ysjeTotal }} = 合计金额：{{ jeTotal }} - 优惠：<el-input style="width: 100px" v-model="formobj.discountAmount" clearable placeholder="" /> - 优惠券：<el-input style="width: 100px" v-model="formobj.coupon" clearable placeholder="" /> - 积分抵扣：<el-input style="width: 100px" v-model="formobj.scoreDeduct" clearable placeholder="" /></span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ ysjeTotal }} = 合计金额：{{ jeTotal }} - 优惠：<el-input style="width: 100px" v-model="formobj.discountAmount" @keyup.native="formobj.discountAmount = getNumber(formobj.discountAmount, 2)" clearable placeholder="" /> - 优惠券：<el-input style="width: 100px" v-model="formobj.coupon" @keyup.native="formobj.coupon = getNumber(formobj.coupon, 2)" clearable placeholder="" /> - 积分抵扣：<el-input style="width: 100px" v-model="formobj.scoreDeduct" @keyup.native="formobj.scoreDeduct = getNumber(formobj.scoreDeduct, 2)" clearable placeholder="" /></span></el-form-item>
             </el-col>
           </el-row>
         </el-form>
       </div>
     </div>
+    <!-- 选择客户 -->
+    <customer v-show="viewState == 2" ref="divCus" @backData="backData" @doback="resetState"/>
+    <!-- 结算 -->
     <el-dialog :visible.sync="settleVisible" width="70%">
       <el-form :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.payableAmount }}</span></el-form-item>
+            <div class="span-sty">付款人姓名</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.settleVo.payerName" clearable placeholder="" /></el-form-item>
           </el-col>
-          <el-col :span="16">
-            <div class="span-sty">预付款抵扣</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.prepaymentdeductAmount" clearable placeholder="" /></el-form-item>
+          <el-col :span="8">
+            <div class="span-sty">付款人编号</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.settleVo.payerName" clearable placeholder="" /></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">应收金额</div>
+            <el-form-item><span class="addinputInfo">{{ ysjeTotal }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
-            <div class="span-sty">结算方式</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.settleValue" clearable placeholder="" /></el-form-item>
+            <div class="span-sty">订金抵扣</div>
+            <el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.settleVo.depositdeductAmount = getNumber(formobj.settleVo.depositdeductAmount, 2)" v-model="formobj.settleVo.depositdeductAmount" clearable placeholder="" /></el-form-item>
           </el-col>
           <el-col :span="8">
-            <div class="span-sty">结算金额</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.settleAmount" clearable placeholder="" /></el-form-item>
+            <div class="span-sty">结算方式</div>
+            <el-form-item>
+              <el-select class="addinputInfo" v-model="formobj.settleVo.settleValue" placeholder="请选择" @change="settleChange" clearable filterable>
+                <el-option v-for="item in settle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
           <el-col :span="8">
-            <div class="span-sty">结算时间</div>
-            <el-form-item><el-date-picker class="addinputInfo addinputw" v-model="formobj.settleTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
+            <div class="span-sty">结算金额</div>
+            <el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.settleVo.settleAmount = getNumber(formobj.settleVo.settleAmount, 2)" v-model="formobj.settleVo.settleAmount" clearable placeholder="" /></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <div class="span-sty">其他结算方式</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.otherSettleKey" clearable placeholder="" /></el-form-item>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.settleVo.otherSettleValue" clearable placeholder="" />
+              <el-select class="addinputInfo" v-model="formobj.settleVo.otherSettleValue" placeholder="请选择" @change="otherSettleChange" clearable filterable>
+                <el-option v-for="item in otherSettle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">其他结算金额</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.otherSettleValue" clearable placeholder="" /></el-form-item>
+            <el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.settleVo.otherSettleAmount = getNumber(formobj.settleVo.otherSettleAmount, 2)" v-model="formobj.settleVo.otherSettleAmount" clearable placeholder="" /></el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">欠款金额</div>
-            <el-form-item><span class="addinputInfo">{{ debts }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ qkjeTotal }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">结算时间</div>
+            <el-form-item><el-date-picker class="addinputInfo addinputw" v-model="formobj.settleVo.settleTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -313,31 +504,34 @@
 import req from '@/api/operation/repairbill'
 import maintenanceitem from '@/api/basicinformation/maintenanceitem'
 import additionitem from '@/api/basicinformation/additionitem'
-import { getServiceType, selSubjectInfo } from '@/api/Common/dictcommons'
+import { getServiceType, selAllByOrgSidPath, selSubjectInfo, getGroupList, typeValues } from '@/api/Common/dictcommons'
+import customer from '../../operation/preregistration/relation/customer'
 
 export default {
   name: 'RepairBillAdd',
+  components: {
+    customer
+  },
   data() {
     return {
       viewTitle: '',
       viewState: 1,
       submitdisabled: false,
+      user_list: [], // 服务顾问
+      serviceType_list: [], // 工种
+      subject_list: [], // 科目
+      group_list: [], // 班组
       settleVisible: false, // 结算弹框
+      billType_list: [], // 单据类型
+      responsibility_list: [], // 责任划分
+      otherInsuranceType_list: [], // 对方险种
+      accidentType_list: [], // 出险类型
+      invoiceType_list: [], // 发票类型
+      settle_list: [], // 结算方式
+      otherSettle_list: [], // 其他结算方式
       activeNames: '1',
+      tableKey: 0,
       index: 0,
-      // client客户
-      clientKey: 1,
-      clientLoading: false,
-      clientQuery: {
-        current: 1,
-        size: 2,
-        total: 0,
-        params: {
-          queryName: '',
-          useOrgSid: ''
-        }
-      },
-      clientData: [],
       // service服务
       serviceKey: 1,
       serviceLoading: false,
@@ -370,10 +564,13 @@ export default {
         operator: '',
         billNo: '',
         billType: '',
+        billTypeKey: '',
         entryTime: '',
         estimatedFinishTime: '',
         subjectSid: '',
         subject: '',
+        groupSid: '',
+        groupName: '',
         waitorSid: '',
         waitorName: '',
         mainRepairers: '',
@@ -387,8 +584,6 @@ export default {
         nodeTime: '',
         outDoorState: '',
         outDoorTime: '',
-        useOrgSid: '',
-        createOrgSid: '',
         customerSid: '',
         customerName: '',
         mobile: '',
@@ -404,6 +599,7 @@ export default {
         invoiceVo: {
           isInvoicing: '',
           invoiceType: '',
+          invoiceTypeKey: '',
           invoiceTitle: '',
           taxpayerNo: '',
           invoiceCode: '',
@@ -411,7 +607,9 @@ export default {
         },
         insuranceVo: {
           responsibility: '',
+          responsibilityKey: '',
           otherInsuranceType: '',
+          otherInsuranceTypeKey: '',
           insuranceCompany1: '',
           insuranceCompany2: '',
           insurer: '',
@@ -419,7 +617,8 @@ export default {
           investigator: '',
           lossAdjuster: '',
           isSpecialSign: '',
-          accidentType: ''
+          accidentType: '',
+          accidentTypeKey: ''
         },
         otherVo: {
           manufacturer: '',
@@ -428,25 +627,58 @@ export default {
         },
         sitemVos: [],
         aitemVos: [],
-        goodsDetailsVos: []
+        goodsDetailsVos: [],
+        orgPath: '',
+        createBySid: '',
+        deptSid: '',
+        dept: '',
+        operatorSid: '',
+        nodeCode: '',
+        settleVo: {
+          payerNo: '',
+          payerName: '',
+          receivableAmount: '',
+          depositdeductAmount: '',
+          settleKey: '',
+          settleValue: '',
+          settleAmount: '',
+          otherSettleKey: '',
+          otherSettleValue: '',
+          otherSettleAmount: '',
+          debts: '',
+          settleTime: ''
+        },
+        showReSettleBtn: true
       },
-      serviceType_list: [],
-      subject_list: [],
       rules: {}
     }
   },
   computed: {
+    // 计算工时费 = 服务项目列表中所有销售价之和
     gsfTotal() {
       let gsf = '0'
       if (this.formobj.sitemVos.length > 0) {
         this.formobj.sitemVos.forEach((e) => {
-          if (e.goodsName !== '') {
+          if (e.serviceItem !== '') {
             gsf = Math.round((parseFloat(gsf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
           }
         })
       }
       return gsf
     },
+    // 计算材料费 = 商品列表中所有销售价之和
+    clfTotal() {
+      let clf = '0'
+      if (this.formobj.goodsDetailsVos.length > 0) {
+        this.formobj.goodsDetailsVos.forEach((e) => {
+          if (e.goodsSpuName !== '') {
+            clf = Math.round((parseFloat(clf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+          }
+        })
+      }
+      return clf
+    },
+    // 计算附加费 == 附加项目列表中所有销售价之和
     fjfTotal() {
       let fjf = '0'
       if (this.formobj.aitemVos.length > 0) {
@@ -458,10 +690,16 @@ export default {
       }
       return fjf
     },
-    // 计算合计金额
+    // 计算税额 = 材料费 * 税率
+    seTotal() {
+      let se = '0'
+      se = Math.round((parseFloat(this.clfTotal) * parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0')) * 100) / 100
+      return se
+    },
+    // 计算合计金额 = 工时费 + 材料费 + 附加费 + 税额
     jeTotal() {
       let je = '0'
-      je = Math.round((parseFloat(je) + parseFloat(this.gsfTotal) + parseFloat(this.fjfTotal)) * 100) / 100
+      je = Math.round((parseFloat(je) + parseFloat(this.gsfTotal) + parseFloat(this.clfTotal) + parseFloat(this.fjfTotal) + parseFloat(this.seTotal)) * 100) / 100
       return je
     },
     // 计算应收金额
@@ -469,10 +707,51 @@ export default {
       let ysje = '0'
       ysje = Math.round((parseFloat(ysje) + parseFloat(this.jeTotal) - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') - parseFloat(this.formobj.coupon !== '' ? this.formobj.coupon : '0') - parseFloat(this.formobj.scoreDeduct !== '' ? this.formobj.scoreDeduct : '0')) * 100) / 100
       return ysje
+    },
+    // 结算页面中计算欠款金额 = 应付金额 - 订金抵扣 - 结算金额 - 其他结算金额
+    qkjeTotal() {
+      let qkje = '0'
+      qkje = Math.round((parseFloat(this.ysjeTotal) - parseFloat(this.formobj.settleVo.depositdeductAmount !== '' ? this.formobj.settleVo.depositdeductAmount : '0') - parseFloat(this.formobj.settleVo.settleAmount !== '' ? this.formobj.settleVo.settleAmount : '0') - parseFloat(this.formobj.settleVo.otherSettleAmount !== '' ? this.formobj.settleVo.otherSettleAmount : '0')) * 100) / 100
+      return qkje
     }
   },
   methods: {
     init() {
+      typeValues({ type: 'billType' }).then((res) => {
+        if (res.success) {
+          this.billType_list = res.data
+        }
+      })
+      typeValues({ type: 'responsibility' }).then((res) => {
+        if (res.success) {
+          this.responsibility_list = res.data
+        }
+      })
+      typeValues({ type: 'otherInsuranceType' }).then((res) => {
+        if (res.success) {
+          this.otherInsuranceType_list = res.data
+        }
+      })
+      typeValues({ type: 'accidentType' }).then((res) => {
+        if (res.success) {
+          this.accidentType_list = res.data
+        }
+      })
+      typeValues({ type: 'invoiceType' }).then((res) => {
+        if (res.success) {
+          this.invoiceType_list = res.data
+        }
+      })
+      typeValues({ type: 'settle' }).then((res) => {
+        if (res.success) {
+          this.settle_list = res.data
+        }
+      })
+      typeValues({ type: 'otherSettle' }).then((res) => {
+        if (res.success) {
+          this.otherSettle_list = res.data
+        }
+      })
       getServiceType({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.serviceType_list = resp.data
@@ -483,6 +762,16 @@ export default {
           this.subject_list = resp.data
         }
       })
+      getGroupList({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
+        if (resp.success) {
+          this.group_list = resp.data
+        }
+      })
+      selAllByOrgSidPath({ orgSidPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
+        if (resp.success) {
+          this.user_list = resp.data
+        }
+      })
     },
     getNumber(val, limit) {
       val = val.replace(/[^0-9.]/g, '') // 保留数字
@@ -507,6 +796,18 @@ export default {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
+      this.formobj.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.formobj.createByName = window.sessionStorage.getItem('name')
+      this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+      this.formobj.createDept = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+      this.formobj.createDeptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
+      var nowDate = new Date()
+      var date = {
+        year: nowDate.getFullYear(),
+        month: nowDate.getMonth() + 1,
+        day: nowDate.getDate()
+      }
+      this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
     },
     showEdit() {
       this.viewTitle = '【编辑】维修单'
@@ -514,26 +815,84 @@ export default {
         this.$refs['form_obj'].clearValidate()
       })
     },
-    clientInput(value) {
-      this.clientQuery.params.queryName = value
-      this.clientLoading = true
-      req.customerListPage(this.clientQuery).then((response) => {
-        if (response.success) {
-          this.clientLoading = false
-          this.clientData = response.data.records
-          this.clientQuery.total = response.data.total
-        } else {
-          this.serviceLoading = false
-          this.clientData = []
-          this.clientQuery.total = 0
-        }
-      })
+    selectCustomer() {
+      this.viewState = 2
+      this.$refs['divCus'].getList()
     },
-    clientCurrentChange(value) {
-      // this.formobj.customerName = value.name
-      // this.formobj.vehMark = value.vehMark
-      // this.formobj.mobile = value.mobile
-      document.body.click()
+    backData(value) {
+      this.viewState = 1
+      value = JSON.parse(JSON.stringify(value))
+      this.formobj.customerName = value.name
+      this.formobj.customerSid = value.sid
+      this.formobj.mobile = value.mobile
+      this.formobj.vehMark = value.vehMark
+      this.formobj.vinNo = value.vinNo
+      this.formobj.customerOrg = value.orgName
+      this.formobj.vehModel = value.vehModel
+    },
+    billTypeChange(value) {
+      const choose = this.billType_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.billTypeKey = choose[0].dictKey
+      } else {
+        this.formobj.billTypeKey = ''
+      }
+    },
+    changeSubject(value) {
+      const choose = this.subject_list.filter((item) => item.subjectName === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.subjectSid = choose[0].subjectSid
+      } else {
+        this.formobj.subjectSid = ''
+      }
+    },
+    waitorChange(value) {
+      const choose = this.user_list.filter((item) => item.name === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.waitorSid = choose[0].sid
+      } else {
+        this.formobj.waitorSid = ''
+      }
+    },
+    groupChange(value) {
+      const choose = this.group_list.filter((item) => item.groupName === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.groupSid = choose[0].groupSid
+      } else {
+        this.formobj.groupSid = ''
+      }
+    },
+    responsibilityChange(value) {
+      const choose = this.responsibility_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.insuranceVo.responsibilityKey = choose[0].dictKey
+      } else {
+        this.formobj.insuranceVo.responsibilityKey = ''
+      }
+    },
+    otherInsuranceTypeChange(value) {
+      const choose = this.otherInsuranceType_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.insuranceVo.otherInsuranceTypeKey = choose[0].dictKey
+      } else {
+        this.formobj.insuranceVo.otherInsuranceTypeKey = ''
+      }
+    },
+    accidentTypeChange(value) {
+      const choose = this.accidentType_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.insuranceVo.accidentTypeKey = choose[0].dictKey
+      } else {
+        this.formobj.insuranceVo.accidentTypeKey = ''
+      }
+    },
+    invoiceTypeChange(value) {
+      const choose = this.invoiceType_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.invoiceVo.invoiceTypeKey = choose[0].dictKey
+      } else {
+        this.formobj.invoiceVo.invoiceTypeKey = ''
+      }
     },
     serviceAdd() {
       this.formobj.sitemVos.push({
@@ -550,9 +909,10 @@ export default {
         discount: '',
         discountAmount: '',
         amount: '',
-        repairerSid: '',
-        groupSid: '',
-        groupName: ''
+        remarks: '',
+        repairerName: '',
+        staffList: [],
+        staffNameList: []
       })
     },
     serviceInput(value) {
@@ -571,26 +931,29 @@ export default {
         }
       })
     },
+    userChange(row, list) {
+      const aa = []
+      list.forEach((e) => {
+        this.user_list.forEach((k) => {
+          if (e === k.sid) {
+            aa.push(k.name)
+          }
+        })
+      })
+      row.staffNameList = aa
+    },
     serviceDelete(index) {
       this.formobj.sitemVos.splice(index, 1)
     },
     serviceCurrentChange(value, row) {
-      row.goodsSid = value.goodsSid
-      row.goodsName = value.goodsName
-      row.goodsCode = value.goodsCode
-      row.goodsModelSid = value.goodsModelSid
-      row.goodsModel = value.goodsModel
-      row.unit = value.unit
-      row.warehouse = value.warehouse
-      row.warehouseSid = value.warehouseSid
-      row.subjectSid = ''
-      row.subject = ''
-      row.count = value.count
+      row.serviceItemSid = value.sid
+      row.serviceItem = value.sitemName
+      row.serviceTypeSid = value.serviceType
+      row.serviceType = value.serviceType
+      row.examineHourPrice = value.examineHourPrice
+      row.hourPrice = value.hourPrice
+      row.hours = value.hours
       row.price = value.price
-      row.discount = value.discount
-      row.discountAmount = value.discountAmount
-      row.amount = value.amount
-      row.specification = value.specification
       document.body.click()
     },
     serviceTypeChange(value, row) {
@@ -663,6 +1026,8 @@ export default {
       document.body.click()
     },
     saveOrUpdate() {
+      this.formobj.operator = window.sessionStorage.getItem('name')
+      this.formobj.operatorSid = window.sessionStorage.getItem('userSid')
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
@@ -680,6 +1045,8 @@ export default {
       })
     },
     submit() {
+      this.formobj.operator = window.sessionStorage.getItem('name')
+      this.formobj.operatorSid = window.sessionStorage.getItem('userSid')
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
@@ -700,6 +1067,22 @@ export default {
       this.settleVisible = true
       // this.formobj.payableAmount = this.yfjeTotal
     },
+    settleChange(value) {
+      const choose = this.settle_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.settleVo.settleKey = choose[0].dictKey
+      } else {
+        this.formobj.settleVo.settleKey = ''
+      }
+    },
+    otherSettleChange(value) {
+      const choose = this.otherSettle_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.settleVo.otherSettleKey = choose[0].dictKey
+      } else {
+        this.formobj.settleVo.otherSettleKey = ''
+      }
+    },
     confirm() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
@@ -717,9 +1100,120 @@ export default {
         }
       })
     },
+    confirmCLF() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.sureMaterialFee(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
+          })
+        }
+      })
+    },
+    resetState() {
+      this.viewState = 1
+    },
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
-      this.formobj = {}
+      this.formobj = {
+        sid: '',
+        createByName: '',
+        operator: '',
+        billNo: '',
+        billType: '',
+        billTypeKey: '',
+        entryTime: '',
+        estimatedFinishTime: '',
+        subjectSid: '',
+        subject: '',
+        groupSid: '',
+        groupName: '',
+        waitorSid: '',
+        waitorName: '',
+        mainRepairers: '',
+        barCode: '',
+        shotRemarks: '',
+        printRemarks: '',
+        discountAmount: '',
+        coupon: '',
+        scoreDeduct: '',
+        nodeName: '',
+        nodeTime: '',
+        outDoorState: '',
+        outDoorTime: '',
+        customerSid: '',
+        customerName: '',
+        mobile: '',
+        customerOrg: '',
+        memberCardSid: '',
+        memberCarNumber: '',
+        vehMark: '',
+        vinNo: '',
+        vehModel: '',
+        mileage: '',
+        oil: '',
+        currentMileage: '',
+        invoiceVo: {
+          isInvoicing: '',
+          invoiceType: '',
+          invoiceTypeKey: '',
+          invoiceTitle: '',
+          taxpayerNo: '',
+          invoiceCode: '',
+          taxRate: ''
+        },
+        insuranceVo: {
+          responsibility: '',
+          responsibilityKey: '',
+          otherInsuranceType: '',
+          otherInsuranceTypeKey: '',
+          insuranceCompany1: '',
+          insuranceCompany2: '',
+          insurer: '',
+          claimBillNo: '',
+          investigator: '',
+          lossAdjuster: '',
+          isSpecialSign: '',
+          accidentType: '',
+          accidentTypeKey: ''
+        },
+        otherVo: {
+          manufacturer: '',
+          senderName: '',
+          senderMobile: ''
+        },
+        sitemVos: [],
+        aitemVos: [],
+        goodsDetailsVos: [],
+        orgPath: '',
+        createBySid: '',
+        deptSid: '',
+        dept: '',
+        operatorSid: '',
+        nodeCode: '',
+        settleVo: {
+          payerNo: '',
+          payerName: '',
+          receivableAmount: '',
+          depositdeductAmount: '',
+          settleKey: '',
+          settleValue: '',
+          settleAmount: '',
+          otherSettleKey: '',
+          otherSettleValue: '',
+          otherSettleAmount: '',
+          debts: '',
+          settleTime: ''
+        },
+        showReSettleBtn: true
+      }
       this.submitdisabled = false
       this.$emit('doback')
     }
@@ -738,4 +1232,11 @@ export default {
   margin-left: 120px !important;
   width: calc(100% - 115px);
 }
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
 </style>
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue
new file mode 100644
index 0000000000..a8985f38b3
--- /dev/null
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue
@@ -0,0 +1,422 @@
+<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" label-width="100px" class="tab-header">
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="制单部门">
+                <el-input v-model="listQuery.params.createDept" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="制单人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="单据编号">
+                <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="制单日期">
+                <el-date-picker v-model="listQuery.params.startTime" 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.endTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="工单类型">
+                <el-select v-model="listQuery.params.billType" clearable placeholder="请选择" filterable>
+                  <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="科目">
+                <el-input v-model="listQuery.params.subject" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="进厂时间">
+                <el-date-picker v-model="listQuery.params.entryStartTime" 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.entryEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="预约完工时间">
+                <el-date-picker v-model="listQuery.params.finishStartTime" 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.finishEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="联系电话">
+                <el-input v-model="listQuery.params.mobile" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="客户单位">
+                <el-input v-model="listQuery.params.customerOrg" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="车牌号">
+                <el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="服务顾问">
+                <el-input v-model="listQuery.params.waitorName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="班组">
+                <el-input v-model="listQuery.params.groupName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="主修人">
+                <el-input v-model="listQuery.params.mainRepairers" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="是否开票">
+                <el-select v-model="listQuery.params.isInvoicing" clearable placeholder="请选择" filterable>
+                  <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </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>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border 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="单据编号" align="center" width="130">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.billNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="nodeName" label="环节" align="center" width="80" />
+            <el-table-column prop="useOrgName" label="分公司" align="center" width="120" />
+            <el-table-column prop="dept" label="制单部门" align="center" width="120" />
+            <el-table-column prop="createByName" label="制单人" align="center" width="120" />
+            <el-table-column prop="createTime" label="制单日期" align="center" width="120" />
+            <el-table-column prop="billType" label="工单类型" align="center" width="120" />
+            <el-table-column prop="subject" label="科目" align="center" width="100" />
+            <el-table-column prop="entryTime" label="进厂时间" align="center" width="120" />
+            <el-table-column prop="estimatedFinishTime" label="预计完工时间" align="center" width="120" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="160" />
+            <el-table-column prop="mobile" label="联系电话" align="center" width="100" />
+            <el-table-column prop="customerOrg" label="客户单位" align="center" width="100" />
+            <el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
+            <el-table-column prop="vehModel" label="车型" align="center" width="200" />
+            <el-table-column prop="waitorName" label="服务顾问" align="center" width="100" />
+            <el-table-column prop="groupName" label="班组" align="center" width="100" />
+            <el-table-column prop="mainRepairers" label="主修人" align="center" width="100" />
+            <el-table-column prop="nodeTime" label="是否开票" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.isInvoicing == '1' ? '是' : '否' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="nodeTime" label="备注" align="center" min-width="200" />
+          </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>
+    <!--新增及修改 -->
+    <repairbillAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+    <!-- 详情 -->
+    <repairbillInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/operation/repairbill'
+import repairbillAdd from './repairbillAdd'
+import repairbillInfo from './repairbillInfo'
+
+export default {
+  name: 'RepairBYLeaveFactory',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    repairbillAdd,
+    repairbillInfo
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toEdit',
+          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
+      billType_list: [
+        {
+          dictKey: '0',
+          dictValue: '正常工单'
+        },
+        {
+          dictKey: '1',
+          dictValue: '保险理赔'
+        },
+        {
+          dictKey: '2',
+          dictValue: '协议单位'
+        }
+      ],
+      state_list: [
+        {
+          dictKey: '1',
+          dictValue: '是'
+        },
+        {
+          dictKey: '0',
+          dictValue: '是'
+        }
+      ],
+      FormLoading: false,
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          startTime: '',
+          endTime: '',
+          useOrgName: '',
+          dept: '',
+          createByName: '',
+          billNo: '',
+          billType: '',
+          entryStartTime: '',
+          entryEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          customerName: '',
+          mobile: '',
+          customerOrg: '',
+          vehMark: '',
+          vinNo: '',
+          waitorName: '',
+          groupName: '',
+          mainRepairers: '',
+          isInvoicing: '',
+          nodeCode: '',
+          userSid: '',
+          menuUrl: '',
+          orgPath: '',
+          subject: ''
+        }
+      }
+    }
+  },
+  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 'doDel':
+          this.doDel()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 信息条数 获取点击时当前的sid
+    handleSelectionChange(row) {
+      const aa = []
+      row.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.nodeCode = '6'
+      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: {
+          startTime: '',
+          endTime: '',
+          useOrgName: '',
+          dept: '',
+          createByName: '',
+          billNo: '',
+          billType: '',
+          entryStartTime: '',
+          entryEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          customerName: '',
+          mobile: '',
+          customerOrg: '',
+          vehMark: '',
+          vinNo: '',
+          waitorName: '',
+          groupName: '',
+          mainRepairers: '',
+          isInvoicing: '',
+          nodeCode: '',
+          userSid: '',
+          menuUrl: '',
+          orgPath: '',
+          subject: ''
+        }
+      }
+      this.getList()
+    },
+    toAdd() {
+      this.viewState = 2
+      this.$refs['divAdd'].showAdd()
+    },
+    toEdit() {
+      this.viewState = 3
+      this.$refs['divAdd'].showEdit()
+    },
+    toInfo(row) {
+      this.viewState = 4
+      this.$refs['divInfo'].showInfo(row)
+    },
+    // 删除
+    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(() => {
+      })
+    },
+    // 修改、编辑、详情返回列表页面
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+</style>
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue
new file mode 100644
index 0000000000..f8f0570c55
--- /dev/null
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue
@@ -0,0 +1,422 @@
+<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" label-width="100px" class="tab-header">
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="制单部门">
+                <el-input v-model="listQuery.params.createDept" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="制单人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="单据编号">
+                <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="制单日期">
+                <el-date-picker v-model="listQuery.params.startTime" 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.endTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="工单类型">
+                <el-select v-model="listQuery.params.billType" clearable placeholder="请选择" filterable>
+                  <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="科目">
+                <el-input v-model="listQuery.params.subject" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="进厂时间">
+                <el-date-picker v-model="listQuery.params.entryStartTime" 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.entryEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="预约完工时间">
+                <el-date-picker v-model="listQuery.params.finishStartTime" 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.finishEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="联系电话">
+                <el-input v-model="listQuery.params.mobile" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="客户单位">
+                <el-input v-model="listQuery.params.customerOrg" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="车牌号">
+                <el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="服务顾问">
+                <el-input v-model="listQuery.params.waitorName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="班组">
+                <el-input v-model="listQuery.params.groupName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="主修人">
+                <el-input v-model="listQuery.params.mainRepairers" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="是否开票">
+                <el-select v-model="listQuery.params.isInvoicing" clearable placeholder="请选择" filterable>
+                  <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </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>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border 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="单据编号" align="center" width="130">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.billNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="nodeName" label="环节" align="center" width="80" />
+            <el-table-column prop="useOrgName" label="分公司" align="center" width="120" />
+            <el-table-column prop="dept" label="制单部门" align="center" width="120" />
+            <el-table-column prop="createByName" label="制单人" align="center" width="120" />
+            <el-table-column prop="createTime" label="制单日期" align="center" width="120" />
+            <el-table-column prop="billType" label="工单类型" align="center" width="120" />
+            <el-table-column prop="subject" label="科目" align="center" width="100" />
+            <el-table-column prop="entryTime" label="进厂时间" align="center" width="120" />
+            <el-table-column prop="estimatedFinishTime" label="预计完工时间" align="center" width="120" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="160" />
+            <el-table-column prop="mobile" label="联系电话" align="center" width="100" />
+            <el-table-column prop="customerOrg" label="客户单位" align="center" width="100" />
+            <el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
+            <el-table-column prop="vehModel" label="车型" align="center" width="200" />
+            <el-table-column prop="waitorName" label="服务顾问" align="center" width="100" />
+            <el-table-column prop="groupName" label="班组" align="center" width="100" />
+            <el-table-column prop="mainRepairers" label="主修人" align="center" width="100" />
+            <el-table-column prop="nodeTime" label="是否开票" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.isInvoicing == '1' ? '是' : '否' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="nodeTime" label="备注" align="center" min-width="200" />
+          </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>
+    <!--新增及修改 -->
+    <repairbillAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+    <!-- 详情 -->
+    <repairbillInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/operation/repairbill'
+import repairbillAdd from './repairbillAdd'
+import repairbillInfo from './repairbillInfo'
+
+export default {
+  name: 'RepairBillByCompleted',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    repairbillAdd,
+    repairbillInfo
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toEdit',
+          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
+      billType_list: [
+        {
+          dictKey: '0',
+          dictValue: '正常工单'
+        },
+        {
+          dictKey: '1',
+          dictValue: '保险理赔'
+        },
+        {
+          dictKey: '2',
+          dictValue: '协议单位'
+        }
+      ],
+      state_list: [
+        {
+          dictKey: '1',
+          dictValue: '是'
+        },
+        {
+          dictKey: '0',
+          dictValue: '是'
+        }
+      ],
+      FormLoading: false,
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          startTime: '',
+          endTime: '',
+          useOrgName: '',
+          dept: '',
+          createByName: '',
+          billNo: '',
+          billType: '',
+          entryStartTime: '',
+          entryEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          customerName: '',
+          mobile: '',
+          customerOrg: '',
+          vehMark: '',
+          vinNo: '',
+          waitorName: '',
+          groupName: '',
+          mainRepairers: '',
+          isInvoicing: '',
+          nodeCode: '',
+          userSid: '',
+          menuUrl: '',
+          orgPath: '',
+          subject: ''
+        }
+      }
+    }
+  },
+  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 'doDel':
+          this.doDel()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 信息条数 获取点击时当前的sid
+    handleSelectionChange(row) {
+      const aa = []
+      row.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.nodeCode = '4'
+      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: {
+          startTime: '',
+          endTime: '',
+          useOrgName: '',
+          dept: '',
+          createByName: '',
+          billNo: '',
+          billType: '',
+          entryStartTime: '',
+          entryEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          customerName: '',
+          mobile: '',
+          customerOrg: '',
+          vehMark: '',
+          vinNo: '',
+          waitorName: '',
+          groupName: '',
+          mainRepairers: '',
+          isInvoicing: '',
+          nodeCode: '',
+          userSid: '',
+          menuUrl: '',
+          orgPath: '',
+          subject: ''
+        }
+      }
+      this.getList()
+    },
+    toAdd() {
+      this.viewState = 2
+      this.$refs['divAdd'].showAdd()
+    },
+    toEdit() {
+      this.viewState = 3
+      this.$refs['divAdd'].showEdit()
+    },
+    toInfo(row) {
+      this.viewState = 4
+      this.$refs['divInfo'].showInfo(row)
+    },
+    // 删除
+    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(() => {
+      })
+    },
+    // 修改、编辑、详情返回列表页面
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+</style>
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillByMaintain.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillByMaintain.vue
new file mode 100644
index 0000000000..75809fbae7
--- /dev/null
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillByMaintain.vue
@@ -0,0 +1,422 @@
+<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" label-width="100px" class="tab-header">
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="制单部门">
+                <el-input v-model="listQuery.params.createDept" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="制单人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="单据编号">
+                <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="制单日期">
+                <el-date-picker v-model="listQuery.params.startTime" 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.endTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="工单类型">
+                <el-select v-model="listQuery.params.billType" clearable placeholder="请选择" filterable>
+                  <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="科目">
+                <el-input v-model="listQuery.params.subject" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="进厂时间">
+                <el-date-picker v-model="listQuery.params.entryStartTime" 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.entryEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="预约完工时间">
+                <el-date-picker v-model="listQuery.params.finishStartTime" 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.finishEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="联系电话">
+                <el-input v-model="listQuery.params.mobile" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="客户单位">
+                <el-input v-model="listQuery.params.customerOrg" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="车牌号">
+                <el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="服务顾问">
+                <el-input v-model="listQuery.params.waitorName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="班组">
+                <el-input v-model="listQuery.params.groupName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="主修人">
+                <el-input v-model="listQuery.params.mainRepairers" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="是否开票">
+                <el-select v-model="listQuery.params.isInvoicing" clearable placeholder="请选择" filterable>
+                  <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </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>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border 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="单据编号" align="center" width="130">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.billNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="nodeName" label="环节" align="center" width="80" />
+            <el-table-column prop="useOrgName" label="分公司" align="center" width="120" />
+            <el-table-column prop="dept" label="制单部门" align="center" width="120" />
+            <el-table-column prop="createByName" label="制单人" align="center" width="120" />
+            <el-table-column prop="createTime" label="制单日期" align="center" width="120" />
+            <el-table-column prop="billType" label="工单类型" align="center" width="120" />
+            <el-table-column prop="subject" label="科目" align="center" width="100" />
+            <el-table-column prop="entryTime" label="进厂时间" align="center" width="120" />
+            <el-table-column prop="estimatedFinishTime" label="预计完工时间" align="center" width="120" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="160" />
+            <el-table-column prop="mobile" label="联系电话" align="center" width="100" />
+            <el-table-column prop="customerOrg" label="客户单位" align="center" width="100" />
+            <el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
+            <el-table-column prop="vehModel" label="车型" align="center" width="200" />
+            <el-table-column prop="waitorName" label="服务顾问" align="center" width="100" />
+            <el-table-column prop="groupName" label="班组" align="center" width="100" />
+            <el-table-column prop="mainRepairers" label="主修人" align="center" width="100" />
+            <el-table-column prop="nodeTime" label="是否开票" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.isInvoicing == '1' ? '是' : '否' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="nodeTime" label="备注" align="center" min-width="200" />
+          </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>
+    <!--新增及修改 -->
+    <repairbillAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+    <!-- 详情 -->
+    <repairbillInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/operation/repairbill'
+import repairbillAdd from './repairbillAdd'
+import repairbillInfo from './repairbillInfo'
+
+export default {
+  name: 'RepairBillByMaintain',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    repairbillAdd,
+    repairbillInfo
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toEdit',
+          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
+      billType_list: [
+        {
+          dictKey: '0',
+          dictValue: '正常工单'
+        },
+        {
+          dictKey: '1',
+          dictValue: '保险理赔'
+        },
+        {
+          dictKey: '2',
+          dictValue: '协议单位'
+        }
+      ],
+      state_list: [
+        {
+          dictKey: '1',
+          dictValue: '是'
+        },
+        {
+          dictKey: '0',
+          dictValue: '是'
+        }
+      ],
+      FormLoading: false,
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          startTime: '',
+          endTime: '',
+          useOrgName: '',
+          dept: '',
+          createByName: '',
+          billNo: '',
+          billType: '',
+          entryStartTime: '',
+          entryEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          customerName: '',
+          mobile: '',
+          customerOrg: '',
+          vehMark: '',
+          vinNo: '',
+          waitorName: '',
+          groupName: '',
+          mainRepairers: '',
+          isInvoicing: '',
+          nodeCode: '',
+          userSid: '',
+          menuUrl: '',
+          orgPath: '',
+          subject: ''
+        }
+      }
+    }
+  },
+  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 'doDel':
+          this.doDel()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 信息条数 获取点击时当前的sid
+    handleSelectionChange(row) {
+      const aa = []
+      row.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.nodeCode = '3'
+      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: {
+          startTime: '',
+          endTime: '',
+          useOrgName: '',
+          dept: '',
+          createByName: '',
+          billNo: '',
+          billType: '',
+          entryStartTime: '',
+          entryEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          customerName: '',
+          mobile: '',
+          customerOrg: '',
+          vehMark: '',
+          vinNo: '',
+          waitorName: '',
+          groupName: '',
+          mainRepairers: '',
+          isInvoicing: '',
+          nodeCode: '',
+          userSid: '',
+          menuUrl: '',
+          orgPath: '',
+          subject: ''
+        }
+      }
+      this.getList()
+    },
+    toAdd() {
+      this.viewState = 2
+      this.$refs['divAdd'].showAdd()
+    },
+    toEdit() {
+      this.viewState = 3
+      this.$refs['divAdd'].showEdit()
+    },
+    toInfo(row) {
+      this.viewState = 4
+      this.$refs['divInfo'].showInfo(row)
+    },
+    // 删除
+    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(() => {
+      })
+    },
+    // 修改、编辑、详情返回列表页面
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+</style>
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillBySendWork.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillBySendWork.vue
new file mode 100644
index 0000000000..aebb36169c
--- /dev/null
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillBySendWork.vue
@@ -0,0 +1,422 @@
+<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" label-width="100px" class="tab-header">
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="制单部门">
+                <el-input v-model="listQuery.params.createDept" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="制单人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="单据编号">
+                <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="制单日期">
+                <el-date-picker v-model="listQuery.params.startTime" 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.endTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="工单类型">
+                <el-select v-model="listQuery.params.billType" clearable placeholder="请选择" filterable>
+                  <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="科目">
+                <el-input v-model="listQuery.params.subject" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="进厂时间">
+                <el-date-picker v-model="listQuery.params.entryStartTime" 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.entryEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="预约完工时间">
+                <el-date-picker v-model="listQuery.params.finishStartTime" 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.finishEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="联系电话">
+                <el-input v-model="listQuery.params.mobile" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="客户单位">
+                <el-input v-model="listQuery.params.customerOrg" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="车牌号">
+                <el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="服务顾问">
+                <el-input v-model="listQuery.params.waitorName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="班组">
+                <el-input v-model="listQuery.params.groupName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="主修人">
+                <el-input v-model="listQuery.params.mainRepairers" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="是否开票">
+                <el-select v-model="listQuery.params.isInvoicing" clearable placeholder="请选择" filterable>
+                  <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </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>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border 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="单据编号" align="center" width="130">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.billNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="nodeName" label="环节" align="center" width="80" />
+            <el-table-column prop="useOrgName" label="分公司" align="center" width="120" />
+            <el-table-column prop="dept" label="制单部门" align="center" width="120" />
+            <el-table-column prop="createByName" label="制单人" align="center" width="120" />
+            <el-table-column prop="createTime" label="制单日期" align="center" width="120" />
+            <el-table-column prop="billType" label="工单类型" align="center" width="120" />
+            <el-table-column prop="subject" label="科目" align="center" width="100" />
+            <el-table-column prop="entryTime" label="进厂时间" align="center" width="120" />
+            <el-table-column prop="estimatedFinishTime" label="预计完工时间" align="center" width="120" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="160" />
+            <el-table-column prop="mobile" label="联系电话" align="center" width="100" />
+            <el-table-column prop="customerOrg" label="客户单位" align="center" width="100" />
+            <el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
+            <el-table-column prop="vehModel" label="车型" align="center" width="200" />
+            <el-table-column prop="waitorName" label="服务顾问" align="center" width="100" />
+            <el-table-column prop="groupName" label="班组" align="center" width="100" />
+            <el-table-column prop="mainRepairers" label="主修人" align="center" width="100" />
+            <el-table-column prop="nodeTime" label="是否开票" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.isInvoicing == '1' ? '是' : '否' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="nodeTime" label="备注" align="center" min-width="200" />
+          </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>
+    <!--新增及修改 -->
+    <repairbillAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+    <!-- 详情 -->
+    <repairbillInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/operation/repairbill'
+import repairbillAdd from './repairbillAdd'
+import repairbillInfo from './repairbillInfo'
+
+export default {
+  name: 'RepairBillBySendWork',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    repairbillAdd,
+    repairbillInfo
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toEdit',
+          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
+      billType_list: [
+        {
+          dictKey: '0',
+          dictValue: '正常工单'
+        },
+        {
+          dictKey: '1',
+          dictValue: '保险理赔'
+        },
+        {
+          dictKey: '2',
+          dictValue: '协议单位'
+        }
+      ],
+      state_list: [
+        {
+          dictKey: '1',
+          dictValue: '是'
+        },
+        {
+          dictKey: '0',
+          dictValue: '是'
+        }
+      ],
+      FormLoading: false,
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          startTime: '',
+          endTime: '',
+          useOrgName: '',
+          dept: '',
+          createByName: '',
+          billNo: '',
+          billType: '',
+          entryStartTime: '',
+          entryEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          customerName: '',
+          mobile: '',
+          customerOrg: '',
+          vehMark: '',
+          vinNo: '',
+          waitorName: '',
+          groupName: '',
+          mainRepairers: '',
+          isInvoicing: '',
+          nodeCode: '',
+          userSid: '',
+          menuUrl: '',
+          orgPath: '',
+          subject: ''
+        }
+      }
+    }
+  },
+  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 'doDel':
+          this.doDel()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 信息条数 获取点击时当前的sid
+    handleSelectionChange(row) {
+      const aa = []
+      row.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.nodeCode = '2'
+      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: {
+          startTime: '',
+          endTime: '',
+          useOrgName: '',
+          dept: '',
+          createByName: '',
+          billNo: '',
+          billType: '',
+          entryStartTime: '',
+          entryEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          customerName: '',
+          mobile: '',
+          customerOrg: '',
+          vehMark: '',
+          vinNo: '',
+          waitorName: '',
+          groupName: '',
+          mainRepairers: '',
+          isInvoicing: '',
+          nodeCode: '',
+          userSid: '',
+          menuUrl: '',
+          orgPath: '',
+          subject: ''
+        }
+      }
+      this.getList()
+    },
+    toAdd() {
+      this.viewState = 2
+      this.$refs['divAdd'].showAdd()
+    },
+    toEdit() {
+      this.viewState = 3
+      this.$refs['divAdd'].showEdit()
+    },
+    toInfo(row) {
+      this.viewState = 4
+      this.$refs['divInfo'].showInfo(row)
+    },
+    // 删除
+    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(() => {
+      })
+    },
+    // 修改、编辑、详情返回列表页面
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+</style>
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue
new file mode 100644
index 0000000000..ef629b3ab7
--- /dev/null
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue
@@ -0,0 +1,422 @@
+<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" label-width="100px" class="tab-header">
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="制单部门">
+                <el-input v-model="listQuery.params.createDept" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="制单人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="单据编号">
+                <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="制单日期">
+                <el-date-picker v-model="listQuery.params.startTime" 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.endTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="工单类型">
+                <el-select v-model="listQuery.params.billType" clearable placeholder="请选择" filterable>
+                  <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="科目">
+                <el-input v-model="listQuery.params.subject" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="进厂时间">
+                <el-date-picker v-model="listQuery.params.entryStartTime" 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.entryEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="预约完工时间">
+                <el-date-picker v-model="listQuery.params.finishStartTime" 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.finishEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="联系电话">
+                <el-input v-model="listQuery.params.mobile" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="客户单位">
+                <el-input v-model="listQuery.params.customerOrg" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="车牌号">
+                <el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="服务顾问">
+                <el-input v-model="listQuery.params.waitorName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="班组">
+                <el-input v-model="listQuery.params.groupName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="主修人">
+                <el-input v-model="listQuery.params.mainRepairers" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="是否开票">
+                <el-select v-model="listQuery.params.isInvoicing" clearable placeholder="请选择" filterable>
+                  <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </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>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border 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="单据编号" align="center" width="130">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.billNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="nodeName" label="环节" align="center" width="80" />
+            <el-table-column prop="useOrgName" label="分公司" align="center" width="120" />
+            <el-table-column prop="dept" label="制单部门" align="center" width="120" />
+            <el-table-column prop="createByName" label="制单人" align="center" width="120" />
+            <el-table-column prop="createTime" label="制单日期" align="center" width="120" />
+            <el-table-column prop="billType" label="工单类型" align="center" width="120" />
+            <el-table-column prop="subject" label="科目" align="center" width="100" />
+            <el-table-column prop="entryTime" label="进厂时间" align="center" width="120" />
+            <el-table-column prop="estimatedFinishTime" label="预计完工时间" align="center" width="120" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="160" />
+            <el-table-column prop="mobile" label="联系电话" align="center" width="100" />
+            <el-table-column prop="customerOrg" label="客户单位" align="center" width="100" />
+            <el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
+            <el-table-column prop="vehModel" label="车型" align="center" width="200" />
+            <el-table-column prop="waitorName" label="服务顾问" align="center" width="100" />
+            <el-table-column prop="groupName" label="班组" align="center" width="100" />
+            <el-table-column prop="mainRepairers" label="主修人" align="center" width="100" />
+            <el-table-column prop="nodeTime" label="是否开票" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.isInvoicing == '1' ? '是' : '否' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="nodeTime" label="备注" align="center" min-width="200" />
+          </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>
+    <!--新增及修改 -->
+    <repairbillAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+    <!-- 详情 -->
+    <repairbillInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/operation/repairbill'
+import repairbillAdd from './repairbillAdd'
+import repairbillInfo from './repairbillInfo'
+
+export default {
+  name: 'RepairBillBySettleAccounts',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    repairbillAdd,
+    repairbillInfo
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toEdit',
+          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
+      billType_list: [
+        {
+          dictKey: '0',
+          dictValue: '正常工单'
+        },
+        {
+          dictKey: '1',
+          dictValue: '保险理赔'
+        },
+        {
+          dictKey: '2',
+          dictValue: '协议单位'
+        }
+      ],
+      state_list: [
+        {
+          dictKey: '1',
+          dictValue: '是'
+        },
+        {
+          dictKey: '0',
+          dictValue: '是'
+        }
+      ],
+      FormLoading: false,
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          startTime: '',
+          endTime: '',
+          useOrgName: '',
+          dept: '',
+          createByName: '',
+          billNo: '',
+          billType: '',
+          entryStartTime: '',
+          entryEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          customerName: '',
+          mobile: '',
+          customerOrg: '',
+          vehMark: '',
+          vinNo: '',
+          waitorName: '',
+          groupName: '',
+          mainRepairers: '',
+          isInvoicing: '',
+          nodeCode: '',
+          userSid: '',
+          menuUrl: '',
+          orgPath: '',
+          subject: ''
+        }
+      }
+    }
+  },
+  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 'doDel':
+          this.doDel()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 信息条数 获取点击时当前的sid
+    handleSelectionChange(row) {
+      const aa = []
+      row.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.nodeCode = '5'
+      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: {
+          startTime: '',
+          endTime: '',
+          useOrgName: '',
+          dept: '',
+          createByName: '',
+          billNo: '',
+          billType: '',
+          entryStartTime: '',
+          entryEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          customerName: '',
+          mobile: '',
+          customerOrg: '',
+          vehMark: '',
+          vinNo: '',
+          waitorName: '',
+          groupName: '',
+          mainRepairers: '',
+          isInvoicing: '',
+          nodeCode: '',
+          userSid: '',
+          menuUrl: '',
+          orgPath: '',
+          subject: ''
+        }
+      }
+      this.getList()
+    },
+    toAdd() {
+      this.viewState = 2
+      this.$refs['divAdd'].showAdd()
+    },
+    toEdit() {
+      this.viewState = 3
+      this.$refs['divAdd'].showEdit()
+    },
+    toInfo(row) {
+      this.viewState = 4
+      this.$refs['divInfo'].showInfo(row)
+    },
+    // 删除
+    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(() => {
+      })
+    },
+    // 修改、编辑、详情返回列表页面
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+</style>
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
new file mode 100644
index 0000000000..85c31e525f
--- /dev/null
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
@@ -0,0 +1,567 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <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" :rules="rules" 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.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">制单部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createDept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">制单日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</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.billType }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">科目</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.subject }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">环节</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.nodeName }}</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.entryTime }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">预计完工</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.estimatedFinishTime }}</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.waitorName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">班组</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.groupName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">主修人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.mainRepairers }}</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.shotRemarks }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">备注(打印)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.printRemarks }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-collapse v-model="activeNames">
+            <el-collapse-item title="客户信息" name="1">
+              <el-row style="border-top: 1px solid #e0e3eb">
+                <el-col :span="8">
+                  <div class="span-sty">客户</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">联系地那话</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.vehMark }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">客户单位</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.mobile }}</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.vehMark }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">车架号哦啊</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">车型</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.vehModel }}</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.mileage }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">油量</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.oil }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">当前里程</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.currentMileage }}</span></el-form-item>
+                </el-col>
+              </el-row>
+            </el-collapse-item>
+            <el-collapse-item title="送修人信息" name="2">
+              <el-row style="border-top: 1px solid #e0e3eb">
+                <el-col :span="8">
+                  <div class="span-sty">送修人姓名</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.otherVo.senderName }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">送修人电话</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.otherVo.senderMobile }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">厂家</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.otherVo.manufacturer }}</span></el-form-item>
+                </el-col>
+              </el-row>
+            </el-collapse-item>
+            <el-collapse-item title="保险信息" name="3">
+              <el-row style="border-top: 1px solid #e0e3eb">
+                <el-col :span="8">
+                  <div class="span-sty">责任划分</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.insuranceVo.responsibility }}</span></el-form-item>
+                </el-col>
+                <el-col :span="16">
+                  <div class="span-sty">对方险种</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.insuranceVo.otherInsuranceType }}</span></el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <div class="span-sty">保险公司1</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.insuranceVo.insuranceCompany1 }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">保险公司2</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.insuranceVo.insuranceCompany2 }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">保险索赔单号</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.insuranceVo.claimBillNo }}</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.insuranceVo.insurer }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">勘察员</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.insuranceVo.investigator }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">定损员</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.insuranceVo.lossAdjuster }}</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.insuranceVo.isSpecialSign == '1' ? '是' : '否' }}</span></el-form-item>
+                </el-col>
+                <el-col :span="16">
+                  <div class="span-sty">出险类型</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.insuranceVo.accidentType }}</span></el-form-item>
+                </el-col>
+              </el-row>
+            </el-collapse-item>
+            <el-collapse-item title="发票信息" name="4">
+              <el-row style="border-top: 1px solid #e0e3eb">
+                <el-col :span="8">
+                  <div class="span-sty">是否开发票</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.invoiceVo.isInvoicing == '1' ? '是' : '否' }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">发票类型</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.invoiceVo.invoiceType }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">开票名称</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.invoiceVo.invoiceTitle }}</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.invoiceVo.taxpayerNo }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">发票号码</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.invoiceVo.invoiceCode }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">税率</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.invoiceVo.taxRate }}</span></el-form-item>
+                </el-col>
+              </el-row>
+            </el-collapse-item>
+          </el-collapse>
+          <div class="title">服务项目</div>
+          <el-table :key="serviceKey" :data="formobj.sitemVos" :index="index" border style="width: 100%">
+            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="serviceItem" label="服务项目" align="center" width="200" />
+            <el-table-column prop="serviceType" label="工种" align="center" width="150" />
+            <el-table-column prop="subject" label="科目" align="center" width="150" />
+            <el-table-column prop="repairerName" label="维修人" width="100" align="center" />
+            <el-table-column prop="examineHourPrice" label="考核工时" align="center" width="100" />
+            <el-table-column prop="hourPrice" label="工时单价" align="center" width="150" />
+            <el-table-column prop="hours" label="工时数" align="center" width="100" />
+            <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="discount" label="折扣" align="center" width="100" />
+            <el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
+            <el-table-column prop="amount" label="销售金额" align="center" width="150" />
+            <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
+          </el-table>
+          <div class="title">商品</div>
+          <el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
+            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+            <el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
+            <el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
+            <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
+            <el-table-column prop="unit" label="单位" width="100" align="center" />
+            <el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
+            <el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
+            <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="count" label="数量" width="100" align="center" />
+            <el-table-column prop="discount" label="折扣" align="center" width="100" />
+            <el-table-column prop="discountAmount" label="优惠" width="100" align="center" />
+            <el-table-column prop="amount" label="金额" width="100" align="center" />
+            <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
+          </el-table>
+          <div class="title">附加项目</div>
+          <el-table :key="subjoinKey" :data="formobj.aitemVos" :index="index" border style="width: 100%">
+            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="aitemName" label="附加项目" align="center" width="200" />
+            <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
+          </el-table>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">合计金额</div>
+              <el-form-item><span class="addinputInfo">{{ jeTotal }} = 工时费：{{ gsfTotal }} + 材料费：{{ clfTotal }} + 附加费：{{ fjfTotal }} + 税额：{{ seTotal }}</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">{{ ysjeTotal }} = 合计金额：{{ jeTotal }} - 优惠：<span>{{ formobj.discountAmount }}</span> - 优惠券：<span>{{ formobj.coupon }}</span> - 积分抵扣：<span>{{ formobj.scoreDeduct }}</span></span></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/operation/repairbill'
+
+export default {
+  name: 'RepairBillInfo',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      activeNames: '1',
+      tableKey: 0,
+      index: 0,
+      // service服务
+      serviceKey: 1,
+      // subjoin附加项目
+      subjoinKey: 2,
+      formobj: {
+        sid: '',
+        createByName: '',
+        operator: '',
+        billNo: '',
+        billType: '',
+        billTypeKey: '',
+        entryTime: '',
+        estimatedFinishTime: '',
+        subjectSid: '',
+        subject: '',
+        groupSid: '',
+        groupName: '',
+        waitorSid: '',
+        waitorName: '',
+        mainRepairers: '',
+        barCode: '',
+        shotRemarks: '',
+        printRemarks: '',
+        discountAmount: '',
+        coupon: '',
+        scoreDeduct: '',
+        nodeName: '',
+        nodeTime: '',
+        outDoorState: '',
+        outDoorTime: '',
+        customerSid: '',
+        customerName: '',
+        mobile: '',
+        customerOrg: '',
+        memberCardSid: '',
+        memberCarNumber: '',
+        vehMark: '',
+        vinNo: '',
+        vehModel: '',
+        mileage: '',
+        oil: '',
+        currentMileage: '',
+        invoiceVo: {
+          isInvoicing: '',
+          invoiceType: '',
+          invoiceTypeKey: '',
+          invoiceTitle: '',
+          taxpayerNo: '',
+          invoiceCode: '',
+          taxRate: ''
+        },
+        insuranceVo: {
+          responsibility: '',
+          responsibilityKey: '',
+          otherInsuranceType: '',
+          otherInsuranceTypeKey: '',
+          insuranceCompany1: '',
+          insuranceCompany2: '',
+          insurer: '',
+          claimBillNo: '',
+          investigator: '',
+          lossAdjuster: '',
+          isSpecialSign: '',
+          accidentType: '',
+          accidentTypeKey: ''
+        },
+        otherVo: {
+          manufacturer: '',
+          senderName: '',
+          senderMobile: ''
+        },
+        sitemVos: [],
+        aitemVos: [],
+        goodsDetailsVos: [],
+        orgPath: '',
+        createBySid: '',
+        deptSid: '',
+        dept: '',
+        operatorSid: '',
+        nodeCode: '',
+        settleVo: {
+          payerNo: '',
+          payerName: '',
+          receivableAmount: '',
+          depositdeductAmount: '',
+          settleKey: '',
+          settleValue: '',
+          settleAmount: '',
+          otherSettleKey: '',
+          otherSettleValue: '',
+          debts: '',
+          settleTime: ''
+        },
+        showReSettleBtn: true
+      },
+      rules: {}
+    }
+  },
+  computed: {
+    // 计算工时费 = 服务项目列表中所有销售价之和
+    gsfTotal() {
+      let gsf = '0'
+      if (this.formobj.sitemVos.length > 0) {
+        this.formobj.sitemVos.forEach((e) => {
+          if (e.serviceItem !== '') {
+            gsf = Math.round((parseFloat(gsf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+          }
+        })
+      }
+      return gsf
+    },
+    // 计算材料费 = 商品列表中所有销售价之和
+    clfTotal() {
+      let clf = '0'
+      if (this.formobj.goodsDetailsVos.length > 0) {
+        this.formobj.goodsDetailsVos.forEach((e) => {
+          if (e.goodsSpuName !== '') {
+            clf = Math.round((parseFloat(clf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+          }
+        })
+      }
+      return clf
+    },
+    // 计算附加费 == 附加项目列表中所有销售价之和
+    fjfTotal() {
+      let fjf = '0'
+      if (this.formobj.aitemVos.length > 0) {
+        this.formobj.aitemVos.forEach((e) => {
+          if (e.aitemName !== '') {
+            fjf = Math.round((parseFloat(fjf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+          }
+        })
+      }
+      return fjf
+    },
+    // 计算税额 = 材料费 * 税率
+    seTotal() {
+      let se = '0'
+      se = Math.round((parseFloat(this.clfTotal) * parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0')) * 100) / 100
+      return se
+    },
+    // 计算合计金额 = 工时费 + 材料费 + 附加费 + 税额
+    jeTotal() {
+      let je = '0'
+      je = Math.round((parseFloat(je) + parseFloat(this.gsfTotal) + parseFloat(this.clfTotal) + parseFloat(this.fjfTotal) + parseFloat(this.seTotal)) * 100) / 100
+      return je
+    },
+    // 计算应收金额
+    ysjeTotal() {
+      let ysje = '0'
+      ysje = Math.round((parseFloat(ysje) + parseFloat(this.jeTotal) - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') - parseFloat(this.formobj.coupon !== '' ? this.formobj.coupon : '0') - parseFloat(this.formobj.scoreDeduct !== '' ? this.formobj.scoreDeduct : '0')) * 100) / 100
+      return ysje
+    }
+  },
+  methods: {
+    showInfo(row) {
+      this.viewTitle = '维修工单详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid(row.sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          if (this.formobj.sitemVos.length > 0) {
+            this.formobj.sitemVos.forEach((e) => {
+              if (e.staffNameList.length > 0) {
+                e.repairerName = e.staffNameList.join(',')
+              }
+            })
+          }
+        }
+      })
+    },
+    handleReturn() {
+      this.formobj = {
+        sid: '',
+        createByName: '',
+        operator: '',
+        billNo: '',
+        billType: '',
+        billTypeKey: '',
+        entryTime: '',
+        estimatedFinishTime: '',
+        subjectSid: '',
+        subject: '',
+        groupSid: '',
+        groupName: '',
+        waitorSid: '',
+        waitorName: '',
+        mainRepairers: '',
+        barCode: '',
+        shotRemarks: '',
+        printRemarks: '',
+        discountAmount: '',
+        coupon: '',
+        scoreDeduct: '',
+        nodeName: '',
+        nodeTime: '',
+        outDoorState: '',
+        outDoorTime: '',
+        customerSid: '',
+        customerName: '',
+        mobile: '',
+        customerOrg: '',
+        memberCardSid: '',
+        memberCarNumber: '',
+        vehMark: '',
+        vinNo: '',
+        vehModel: '',
+        mileage: '',
+        oil: '',
+        currentMileage: '',
+        invoiceVo: {
+          isInvoicing: '',
+          invoiceType: '',
+          invoiceTypeKey: '',
+          invoiceTitle: '',
+          taxpayerNo: '',
+          invoiceCode: '',
+          taxRate: ''
+        },
+        insuranceVo: {
+          responsibility: '',
+          responsibilityKey: '',
+          otherInsuranceType: '',
+          otherInsuranceTypeKey: '',
+          insuranceCompany1: '',
+          insuranceCompany2: '',
+          insurer: '',
+          claimBillNo: '',
+          investigator: '',
+          lossAdjuster: '',
+          isSpecialSign: '',
+          accidentType: '',
+          accidentTypeKey: ''
+        },
+        otherVo: {
+          manufacturer: '',
+          senderName: '',
+          senderMobile: ''
+        },
+        sitemVos: [],
+        aitemVos: [],
+        goodsDetailsVos: [],
+        orgPath: '',
+        createBySid: '',
+        deptSid: '',
+        dept: '',
+        operatorSid: '',
+        nodeCode: '',
+        settleVo: {
+          payerNo: '',
+          payerName: '',
+          receivableAmount: '',
+          depositdeductAmount: '',
+          settleKey: '',
+          settleValue: '',
+          settleAmount: '',
+          otherSettleKey: '',
+          otherSettleValue: '',
+          debts: '',
+          settleTime: ''
+        },
+        showReSettleBtn: true
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+</style>

From 52c0b5b50469f58a511f3f8906c70e9c89d2cd5b Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 30 Apr 2024 10:22:32 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E7=99=BB=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/operation/preregistration/preregistrationAdd.vue    | 1 +
 .../src/views/operation/preregistration/relation/customer.vue | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue b/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
index 0f1409574a..e0f796abb2 100644
--- a/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
+++ b/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
@@ -272,6 +272,7 @@ export default {
     },
     selectCustomer() {
       this.viewState = 2
+      this.$refs['divCus'].getList()
     },
     backData(value) {
       this.viewState = 1
diff --git a/yxt-as-ui/src/views/operation/preregistration/relation/customer.vue b/yxt-as-ui/src/views/operation/preregistration/relation/customer.vue
index 07bbc614f5..3b8f69f0ac 100644
--- a/yxt-as-ui/src/views/operation/preregistration/relation/customer.vue
+++ b/yxt-as-ui/src/views/operation/preregistration/relation/customer.vue
@@ -113,10 +113,6 @@ export default {
       }
     }
   },
-  created() {
-    // 初始化变量
-    this.getList()
-  },
   mounted() {
     this.$refs['btnbar'].setButtonList(this.btnList)
   },

From 842bf09fbfb3a5416693ffefffcb22591ba6a126 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 30 Apr 2024 10:22:57 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=AC=E5=85=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-as-ui/src/api/Common/dictcommons.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/yxt-as-ui/src/api/Common/dictcommons.js b/yxt-as-ui/src/api/Common/dictcommons.js
index 4dcc00b4ed..fd1b2e8eb7 100644
--- a/yxt-as-ui/src/api/Common/dictcommons.js
+++ b/yxt-as-ui/src/api/Common/dictcommons.js
@@ -99,7 +99,6 @@ export function getGysTypeByOrgSid(data) {
   })
 }
 
-
 // 根据当前登录用户的全路径查询相应部门下的所有人
 export function selAllByOrgSidPath(data) {
   return request({
@@ -127,6 +126,15 @@ export function selSubjectInfo(data) {
   })
 }
 
+// 分公司全路径sid获取班组
+export function getGroupList(data) {
+  return request({
+    url: '/as/v1/asservicegroup/getGroupList',
+    method: 'post',
+    params: data
+  })
+}
+
 // 查询分页列表 -- 客户列表
 export function customerListPage(params) {
   return request({

From 71d56d2533c2d0739d8cea32b42c18c5a0a84dea Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 30 Apr 2024 10:25:11 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E5=AE=B6=E8=AE=BF=E5=87=86=E5=A4=87?=
 =?UTF-8?q?=E5=87=86=E5=A4=87=E5=AE=8C=E6=AF=95=E6=9C=AA=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E8=A1=A5=E5=85=85=E4=BF=A1=E6=81=AF=E5=85=B3?=
 =?UTF-8?q?=E8=81=94sid=E7=9A=84=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/base/biz/basevehicleout/BaseVehicleOutService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
index 3908caa5d6..16d8db60e6 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
@@ -2443,7 +2443,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             //电话
             baseQuotationVo.setMobile(busSalesOrderBorrowerDetailsVo.getMobile());
             //查询贷款人信息
-            LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerFeign.selectByBorrSid(busSalesOrderLoancontractDetailsVo.getBorrowerSid(),busSalesOrder.getSid()).getData();
+            LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerFeign.selectByBorrSidAndSaleSid(busSalesOrderLoancontractDetailsVo.getBorrowerSid(),busSalesOrder.getSid()).getData();
             //地址
             baseQuotationVo.setAddress(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerDomAddress());
             //挂靠公司名称

From 770e2eaad09124c8c2045363fcd251008d4a0a8b Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 30 Apr 2024 10:30:50 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E8=82=A1=E4=B8=9C=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gsgddwdbjy.ftl                                            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/工作内容需要的文档/单据模板/公司股东会对外担保决议打印模板/gsgddwdbjy.ftl b/工作内容需要的文档/单据模板/公司股东会对外担保决议打印模板/gsgddwdbjy.ftl
index 3df45d2211..df1e1c6abf 100644
--- a/工作内容需要的文档/单据模板/公司股东会对外担保决议打印模板/gsgddwdbjy.ftl
+++ b/工作内容需要的文档/单据模板/公司股东会对外担保决议打印模板/gsgddwdbjy.ftl
@@ -876,7 +876,7 @@
                                 <w:u w:val="single" w:color="auto"/>
                                 <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                             </w:rPr>
-                            <w:t xml:space="preserve">            </w:t>
+                            <w:t xml:space="preserve">____________</w:t>
                         </w:r>
                         <w:r>
                             <w:rPr>
@@ -910,7 +910,7 @@
                                 <w:u w:val="single" w:color="auto"/>
                                 <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                             </w:rPr>
-                            <w:t xml:space="preserve">         </w:t>
+                            <w:t xml:space="preserve">____________</w:t>
                         </w:r>
                         <w:r>
                             <w:rPr>

From faefcd28d8ec039090ae6dbeca134e956d0646b4 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 30 Apr 2024 10:47:54 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/busdeliveredapply/BusDeliveredApplyService.java         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index 475dc5c0bf..4a7eb3d733 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -1240,6 +1240,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 } catch (Exception e) {
                     e.printStackTrace();
                     log.error("推送数据失败=========================" + e.getMessage());
+                    StackTraceElement stackTraceElement= e.getStackTrace()[0];
+                    System.out.println("系统出错，错误信息:"+e.toString()+" at "+stackTraceElement.getClassName()+"."+stackTraceElement.getMethodName()+":"+stackTraceElement.getLineNumber());
                     return rb.setMsg("推送数据失败");
                 }
                 //根据车辆sid和合同编码修改开票管理中对应的领票状态为是

From fa4deabefaee5762049c5d12299ba9a26a4ec22c Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 30 Apr 2024 10:48:26 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/busdeliveredapply/BusDeliveredApplyService.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index 4a7eb3d733..7a152d69a9 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -1241,7 +1241,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     e.printStackTrace();
                     log.error("推送数据失败=========================" + e.getMessage());
                     StackTraceElement stackTraceElement= e.getStackTrace()[0];
-                    System.out.println("系统出错，错误信息:"+e.toString()+" at "+stackTraceElement.getClassName()+"."+stackTraceElement.getMethodName()+":"+stackTraceElement.getLineNumber());
+                    log.error("系统出错，错误信息:"+e.toString()+" at "+stackTraceElement.getClassName()+"."+stackTraceElement.getMethodName()+":"+stackTraceElement.getLineNumber());
                     return rb.setMsg("推送数据失败");
                 }
                 //根据车辆sid和合同编码修改开票管理中对应的领票状态为是

From 991c03990a45bc0ab246067b3806dcfb62ec3d91 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 30 Apr 2024 10:57:45 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=B7=BB=E5=8A=A0hikari?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-test.yml                   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-test.yml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-test.yml
index 957c48757c..6fdb5437dc 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-test.yml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-test.yml
@@ -4,6 +4,10 @@ spring:
     url: jdbc:mysql://172.18.0.4:3306/anrui_riskcenter?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
     username: root
     password: yxt_mysql_138
+    hikari:
+      minimum-idle: 3
+      max-lifetime: 30000
+      maximum-pool-size: 10
   cloud:
     nacos:
       discovery: