From e88ca25ab99429f8b5e212eae8378c6e33ebbdf6 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 7 Jun 2023 15:19:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=9A=8F=E8=BD=A6=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E4=BA=A4=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../suicheziliaojiaojie/cardatahandedover.vue | 34 +++++++++++++++----
 .../cardatahandedoverAdd.vue                  |  2 +-
 .../cardatahandedoverTwoAdd.vue               | 10 +++---
 .../cardatatobehandedover.vue                 |  8 ++---
 4 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/suicheziliaojiaojie/cardatahandedover.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/suicheziliaojiaojie/cardatahandedover.vue
index 2feafd07cf..b1c6e726ab 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/suicheziliaojiaojie/cardatahandedover.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/suicheziliaojiaojie/cardatahandedover.vue
@@ -15,12 +15,20 @@
               <el-form-item label="车架号">
                 <el-input v-model="listQuery.params.vinNo" clearable placeholder="" class="addinputw"></el-input>
               </el-form-item>
+              <el-form-item label="车型">
+                <el-input v-model="listQuery.params.model" clearable placeholder="" class="addinputw"></el-input>
+              </el-form-item>
               <el-form-item label="合同编号">
                 <el-input v-model="listQuery.params.contractNo" clearable placeholder="" class="addinputw"></el-input>
               </el-form-item>
               <el-form-item label="客户名称">
                 <el-input v-model="listQuery.params.customerName" clearable placeholder="" class="addinputw"></el-input>
               </el-form-item>
+              <el-form-item label="完成状态">
+                <el-select v-model="listQuery.params.completeState" class="filter-item" clearable placeholder="请选择">
+                  <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
@@ -41,9 +49,9 @@
                 <el-button type="primary" size="mini" @click="handLook(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="交接状态" align="center">
+            <el-table-column label="完成状态" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.handoverState }}</span>
+                <span>{{ scope.row.completeState }}</span>
               </template>
             </el-table-column>
             <el-table-column label="车架号" align="center">
@@ -134,13 +142,25 @@ export default {
       tableKey: 0,
       list: [],
       sids: [],
+      state_list: [
+        {
+          dictKey: '0',
+          dictValue: '未完成'
+        },
+        {
+          dictKey: '1',
+          dictValue: '完成'
+        }
+      ],
       FormLoading: false,
       listLoading: false,
       listQuery: {
         params: {
           useOrgSid: '',
           userSid: '',
-          handoverState: '1',
+          model: '',
+          completeState: '',
+          transferState: '1',
           contractNo: '',
           customerName: '',
           vinNo: ''
@@ -197,7 +217,7 @@ export default {
       row.forEach((element) => {
        aa.push({
          sid: element.sid,
-         handoverState: element.handoverState
+         completeState: element.completeState
        })
       })
       this.sids = aa
@@ -231,7 +251,9 @@ export default {
         params: {
           useOrgSid: '',
           userSid: '',
-          handoverState: '1',
+          model: '',
+          completeState: '',
+          transferState: '1',
           contractNo: '',
           customerName: '',
           vinNo: ''
@@ -251,7 +273,7 @@ export default {
     },
     secondaryHandover() {
       if (this.sids.length === 1) {
-        if (this.sids[0].handoverState === '未完成') {
+        if (this.sids[0].completeState === '未完成') {
           this.viewState = 3
           this.$refs['divAdd'].showEdit(this.sids[0].sid)
         } else {
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/suicheziliaojiaojie/cardatahandedoverAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/suicheziliaojiaojie/cardatahandedoverAdd.vue
index e14dd588e7..e8d128c144 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/suicheziliaojiaojie/cardatahandedoverAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/suicheziliaojiaojie/cardatahandedoverAdd.vue
@@ -115,7 +115,7 @@
           <el-col :span="24">
             <div class="span-sty">备注</div>
             <el-form-item>
-              <el-input v-model="formobj.busVehicleInformation.remarks" clearable class="addinputInfo" style="width: 80%" placeholder=""/>
+              <el-input v-model="formobj.busVehicleInformation.transferRemarks" clearable class="addinputInfo" style="width: 80%" placeholder=""/>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/suicheziliaojiaojie/cardatahandedoverTwoAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/suicheziliaojiaojie/cardatahandedoverTwoAdd.vue
index deb2931536..8e26534c6f 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/suicheziliaojiaojie/cardatahandedoverTwoAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/suicheziliaojiaojie/cardatahandedoverTwoAdd.vue
@@ -40,7 +40,7 @@
           <el-col :span="24">
             <div class="span-sty">备注</div>
             <el-form-item>
-              <el-input v-model="formobj.busVehicleInformation.remarks" clearable class="addinputInfo" style="width: 80%" placeholder=""/>
+              <el-input v-model="formobj.busVehicleInformation.transferRemarks" clearable class="addinputInfo" style="width: 80%" placeholder=""/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -76,7 +76,7 @@ export default {
           environmentalList: '',
           dirverCard: '',
           gasCertificate: '',
-          remarks: '',
+          transferRemarks: '',
           recName: '',
           recTime: ''
         }
@@ -93,7 +93,7 @@ export default {
       fetchDetailsBySid(sid, '2').then((resp) => {
         if (resp.success) {
           this.formobj = resp.data
-          this.formobj.busVehicleInformation.remarks = ''
+          this.formobj.busVehicleInformation.transferRemarks = ''
         }
       })
     },
@@ -124,7 +124,6 @@ export default {
         vehicleSid: '',
         model: '',
         createBySid: '',
-        remarks: '',
         recName: '',
         recTime: '',
         busVehicleInformation: {
@@ -134,7 +133,8 @@ export default {
           manual: '',
           environmentalList: '',
           dirverCard: '',
-          gasCertificate: ''
+          gasCertificate: '',
+          transferRemarks: ''
         }
       }
       this.submitdisabled = false
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/suicheziliaojiaojie/cardatatobehandedover.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/suicheziliaojiaojie/cardatatobehandedover.vue
index eacd61d0e3..143ef35a60 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/suicheziliaojiaojie/cardatatobehandedover.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/suicheziliaojiaojie/cardatatobehandedover.vue
@@ -40,9 +40,9 @@
                 <el-button type="primary" size="mini" @click="handBanLi(scope.row)">办理</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="状态" align="center">
+            <el-table-column label="交接状态" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.handoverState }}</span>
+                <span>{{ scope.row.transferState }}</span>
               </template>
             </el-table-column>
             <el-table-column label="创建日期" align="center">
@@ -136,7 +136,7 @@ export default {
         params: {
           useOrgSid: '',
           userSid: '',
-          handoverState: '0',
+          transferState: '0',
           contractNo: '',
           customerName: '',
           vinNo: ''
@@ -218,7 +218,7 @@ export default {
         params: {
           useOrgSid: '',
           userSid: '',
-          handoverState: '0',
+          transferState: '0',
           contractNo: '',
           customerName: '',
           vinNo: ''