From e4bd56c82c6709bdd9f86bf7869a0efc978d0e39 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 16 May 2024 15:34:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/operation/repairbill/repairbill.vue | 14 ++++++-------
 .../operation/repairbill/repairbillAdd.vue    | 20 +++++++++----------
 .../repairbill/repairbillBYLeaveFactory.vue   | 12 +++++------
 .../repairbill/repairbillByBeCompleted.vue    | 12 +++++------
 .../repairbill/repairbillByMaintain.vue       | 12 +++++------
 .../repairbill/repairbillBySendWork.vue       | 12 +++++------
 .../repairbill/repairbillBySettleAccounts.vue | 12 +++++------
 .../operation/repairbill/repairbillInfo.vue   | 12 +++++------
 8 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbill.vue b/yxt-as-ui/src/views/operation/repairbill/repairbill.vue
index a13e7c4361..5370560fa4 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbill.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbill.vue
@@ -8,7 +8,7 @@
         <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 ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
               <el-form-item label="分公司">
                 <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
               </el-form-item>
@@ -28,7 +28,7 @@
               </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 v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -36,14 +36,14 @@
                 <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>
+                <el-date-picker v-model="listQuery.params.entryStartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" 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-date-picker v-model="listQuery.params.entryEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" 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>
+                <el-date-picker v-model="listQuery.params.finishStartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" 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-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期"></el-date-picker>
               </el-form-item>
               <el-form-item label="客户名称">
                 <el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
@@ -120,7 +120,7 @@
                 <span>{{ scope.row.isInvoicing == '1' ? '是' : scope.row.isInvoicing == '0' ? '否' : '' }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="nodeTime" label="备注" align="center" min-width="200" />
+            <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
           </el-table>
         </div>
         <!--End 主页面主要部分-->
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
index e4ab7f1c08..e75958ee83 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
@@ -53,11 +53,11 @@
           <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-form-item><el-date-picker class="addinputInfo" v-model="formobj.entryTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" 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-form-item><el-date-picker class="addinputInfo" v-model="formobj.estimatedFinishTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -132,15 +132,15 @@
               </el-row>
               <el-row>
                 <el-col :span="8">
-                  <div class="span-sty">行驶里程</div>
+                  <div class="span-sty">行驶里程(Km)</div>
                   <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>
+                  <div class="span-sty">油量(L)</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>
+                  <div class="span-sty">当前里程(Km)</div>
                   <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.currentMileage" clearable placeholder="" /></el-form-item>
                 </el-col>
               </el-row>
@@ -262,7 +262,7 @@
                   <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>
+                  <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>
@@ -310,7 +310,7 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="维修人" width="200" align="center">
+            <el-table-column label="维修人" width="300" align="center">
               <template slot-scope="scope">
                 <el-select v-model="scope.row.staffList" placeholder="请选择" @change="userChange(scope.row, scope.row.staffList)" clearable filterable multiple>
                   <el-option v-for="item in user_list" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
@@ -417,13 +417,13 @@
           </el-table>
           <el-row>
             <el-col :span="24">
-              <div class="span-sty">合计金额</div>
+              <div class="span-sty" style="border-right: 0px">合计金额：</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>
+              <div class="span-sty" style="border-right: 0px">应收金额：</div>
               <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>
@@ -737,7 +737,7 @@ export default {
           this.accidentType_list = res.data
         }
       })
-      typeValues({ type: 'invoiceType' }).then((res) => {
+      typeValues({ type: 'billingType' }).then((res) => {
         if (res.success) {
           this.invoiceType_list = res.data
         }
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue
index d6a35ca46c..3d61ca153c 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue
@@ -28,7 +28,7 @@
               </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 v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -36,14 +36,14 @@
                 <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>
+                <el-date-picker v-model="listQuery.params.entryStartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" 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-date-picker v-model="listQuery.params.entryEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" 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>
+                <el-date-picker v-model="listQuery.params.finishStartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" 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-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期"></el-date-picker>
               </el-form-item>
               <el-form-item label="客户名称">
                 <el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
@@ -120,7 +120,7 @@
                 <span>{{ scope.row.isInvoicing == '1' ? '是' : '否' }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="nodeTime" label="备注" align="center" min-width="200" />
+            <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
           </el-table>
         </div>
         <!--End 主页面主要部分-->
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue
index f8e9399dc8..8326f7421d 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue
@@ -28,7 +28,7 @@
               </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 v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -36,14 +36,14 @@
                 <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>
+                <el-date-picker v-model="listQuery.params.entryStartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" 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-date-picker v-model="listQuery.params.entryEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" 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>
+                <el-date-picker v-model="listQuery.params.finishStartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" 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-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期"></el-date-picker>
               </el-form-item>
               <el-form-item label="客户名称">
                 <el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
@@ -120,7 +120,7 @@
                 <span>{{ scope.row.isInvoicing == '1' ? '是' : '否' }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="nodeTime" label="备注" align="center" min-width="200" />
+            <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
           </el-table>
         </div>
         <!--End 主页面主要部分-->
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillByMaintain.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillByMaintain.vue
index 658d316334..fadd1956b5 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillByMaintain.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillByMaintain.vue
@@ -28,7 +28,7 @@
               </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 v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -36,14 +36,14 @@
                 <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>
+                <el-date-picker v-model="listQuery.params.entryStartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" 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-date-picker v-model="listQuery.params.entryEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" 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>
+                <el-date-picker v-model="listQuery.params.finishStartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" 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-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期"></el-date-picker>
               </el-form-item>
               <el-form-item label="客户名称">
                 <el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
@@ -120,7 +120,7 @@
                 <span>{{ scope.row.isInvoicing == '1' ? '是' : '否' }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="nodeTime" label="备注" align="center" min-width="200" />
+            <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
           </el-table>
         </div>
         <!--End 主页面主要部分-->
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillBySendWork.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillBySendWork.vue
index 7496012378..ea44626fb8 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillBySendWork.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillBySendWork.vue
@@ -28,7 +28,7 @@
               </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 v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -36,14 +36,14 @@
                 <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>
+                <el-date-picker v-model="listQuery.params.entryStartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" 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-date-picker v-model="listQuery.params.entryEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" 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>
+                <el-date-picker v-model="listQuery.params.finishStartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" 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-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期"></el-date-picker>
               </el-form-item>
               <el-form-item label="客户名称">
                 <el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
@@ -120,7 +120,7 @@
                 <span>{{ scope.row.isInvoicing == '1' ? '是' : '否' }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="nodeTime" label="备注" align="center" min-width="200" />
+            <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
           </el-table>
         </div>
         <!--End 主页面主要部分-->
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue
index 34d0cbe26a..76f8458428 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue
@@ -28,7 +28,7 @@
               </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 v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -36,14 +36,14 @@
                 <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>
+                <el-date-picker v-model="listQuery.params.entryStartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" 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-date-picker v-model="listQuery.params.entryEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" 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>
+                <el-date-picker v-model="listQuery.params.finishStartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" 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-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期"></el-date-picker>
               </el-form-item>
               <el-form-item label="客户名称">
                 <el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
@@ -120,7 +120,7 @@
                 <span>{{ scope.row.isInvoicing == '1' ? '是' : '否' }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="nodeTime" label="备注" align="center" min-width="200" />
+            <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
           </el-table>
         </div>
         <!--End 主页面主要部分-->
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
index 1071c960d0..f95b079a74 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
@@ -108,15 +108,15 @@
               </el-row>
               <el-row>
                 <el-col :span="8">
-                  <div class="span-sty">行驶里程</div>
+                  <div class="span-sty">行驶里程(Km)</div>
                   <el-form-item><span class="addinputInfo">{{ formobj.mileage }}</span></el-form-item>
                 </el-col>
                 <el-col :span="8">
-                  <div class="span-sty">油量</div>
+                  <div class="span-sty">油量(L)</div>
                   <el-form-item><span class="addinputInfo">{{ formobj.oil }}</span></el-form-item>
                 </el-col>
                 <el-col :span="8">
-                  <div class="span-sty">当前里程</div>
+                  <div class="span-sty">当前里程(Km)</div>
                   <el-form-item><span class="addinputInfo">{{ formobj.currentMileage }}</span></el-form-item>
                 </el-col>
               </el-row>
@@ -212,7 +212,7 @@
                   <el-form-item><span class="addinputInfo">{{ formobj.invoiceVo.invoiceCode }}</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.invoiceVo.taxRate }}</span></el-form-item>
                 </el-col>
               </el-row>
@@ -259,13 +259,13 @@
           </el-table>
           <el-row>
             <el-col :span="24">
-              <div class="span-sty">合计金额</div>
+              <div class="span-sty" style="border-right: 0px">合计金额：</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>
+              <div class="span-sty" style="border-right: 0px">应收金额：</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>