diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js b/anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js
index a097e22bb6..4128471010 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js
@@ -55,3 +55,12 @@ export function roleList(data){
     headers: { 'Content-Type': 'application/json' }
   })
 }
+
+// 根据当前登录用户分公司sid获取本分公司下存放地点
+export function fetchByUseOrgSid(data) {
+  return request({
+    url: 'scm/v1/scmwarehouse/fetchByUseOrgSid',
+    method: 'get',
+    params: data
+  })
+}
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyudingEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyudingEdit.vue
index 7869d0136f..365af9e6bd 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyudingEdit.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyudingEdit.vue
@@ -77,11 +77,11 @@
               </el-button>
             </div>
           </div>
-          <el-table v-loading="listLoading" :data="list" border style="width: 100%" :index="index">
+          <el-table v-loading="listLoading" :data="temp.carList" border style="width: 100%" :index="index">
             <el-table-column align="center" label="序号" type="index" width="60"/>
             <el-table-column label="操作" align="center" width="80px" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button size="mini" type="danger" @click="handleDelete(scope.row,scope.$index,list[scope.$index])">删除
+                <el-button size="mini" type="danger" @click="handleDelete(scope.row,scope.$index)">删除
                 </el-button>
               </template>
             </el-table-column>
@@ -138,7 +138,7 @@
 
 <script>
 import { fetchBySid, getPathSidByUserSid } from '@/api/dictcommons/dictcommons'
-import { saveChe, selectSid, submitVehicleApprove, typeValues } from '@/api/jichuxinxi/busdeposit'
+import { saveChe, selectSid, submitVehicleApprove } from '@/api/jichuxinxi/busdeposit'
 import xuanzecheliang from './relation/xuanzecheliang'
 import xuanzekehu from './relation/xuanzekehu'
 
@@ -159,12 +159,10 @@ export default {
       },
       viewTitle: '',
       index: 0,
-      disabled: false, // 提交按钮状态
+      submitdisabled: false, // 提交按钮状态
       // --按钮菜单-------
       viewState: 1,
-      FormLoading: false,
       listLoading: false,
-      list: [],
       temp: {
         staffName: '',
         customerSid: '', // 客户sid
@@ -180,7 +178,7 @@ export default {
         procInsId: '', // 流程实例ID
         userSid: window.sessionStorage.getItem('userSid')
       },
-      deposit_list: [],
+      customerName: [],
       rules: {}
       // ------------------------------------
     }
@@ -203,25 +201,6 @@ export default {
     this.showEdit(obj.businessSid, obj.instanceId, obj.taskId)
   },
   methods: {
-    // 下拉框-预计订金日期
-    getDeposit_date() {
-      typeValues({
-        type: 'reserveDepositDate'
-      }).then((res) => {
-        if (res.code === '200') {
-          this.deposit_list = res.data
-          console.log('下拉框请求预计订金日期', res.data)
-        }
-      })
-    },
-    changeDeposit_date(row) {
-      for (var i = 0; i < this.deposit_list.length; i++) {
-        if (this.deposit_list[i].dictValue === row.depositDate) {
-          row.depositDate = this.deposit_list[i].dictValue
-          this.list[i].reserve_deposit_date_key = this.deposit_list[i].dictKey
-        }
-      }
-    },
     getPathSid() {
       const userSid = window.sessionStorage.getItem('userSid')
       getPathSidByUserSid({ userSid: userSid }).then((res) => {
@@ -250,7 +229,6 @@ export default {
       selectSid(data).then((response) => {
         if (response.code) {
           this.temp = response.data
-          this.list = response.data.carList
           this.temp.sid = businessSid
           this.temp.instanceId = instanceId
           this.temp.taskId = taskId
@@ -261,9 +239,21 @@ export default {
     // ------------ 功能实现 ------------
     // 添加数据
     handleCreate() {
+      if (this.temp.customerName === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择客户' })
+        return
+      }
+      if (this.temp.carList.length > 0) {
+        for (var i = 0; i < this.temp.carList.length; i++) {
+          if (this.temp.carList[i].depositDate === '') {
+            this.$message({ showClose: true, type: 'error', message: '预顶车辆信息表中预约订金日期不能为空' })
+            return
+          }
+        }
+      }
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.temp.carList = this.list
+          this.submitdisabled = true
           this.temp.staffSid = window.sessionStorage.getItem('staffSid')
           this.temp.orgSid = window.sessionStorage.getItem('orgSid')
           saveChe(this.temp).then((response) => {
@@ -279,13 +269,6 @@ export default {
                   code: 1
                 }
               }, '*')
-            } else {
-              this.$notify({
-                title: '提示',
-                message: '添加失败',
-                type: 'error',
-                duration: 2000
-              })
             }
           })
         }
@@ -293,6 +276,18 @@ export default {
     },
     // 提交
     handleSubmit() {
+      if (this.temp.customerName === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择客户' })
+        return
+      }
+      if (this.temp.carList.length > 0) {
+        for (var i = 0; i < this.temp.carList.length; i++) {
+          if (this.temp.carList[i].depositDate === '') {
+            this.$message({ showClose: true, type: 'error', message: '预顶车辆信息表中预约订金日期不能为空' })
+            return
+          }
+        }
+      }
       this.$confirm('是否确定提交该业务', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -300,8 +295,7 @@ export default {
       }).then(() => {
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
-            this.FormLoading = true
-            this.temp.carList = this.list
+            this.submitdisabled = true
             this.temp.staffSid = window.sessionStorage.getItem('staffSid')
             this.temp.orgSid = window.sessionStorage.getItem('orgSid')
             console.log('提交时sid', this.temp.sid)
@@ -322,12 +316,6 @@ export default {
                     code: 1
                   }
                 }, '*')
-              } else {
-                this.$notify({
-                  title: '提交失败',
-                  message: response.msg,
-                  type: 'error'
-                })
               }
             })
           }
@@ -345,7 +333,7 @@ export default {
     selectVehicle(depositVehicleList) {
       this.viewState = 1
       for (var i = 0; i < depositVehicleList.length; i++) {
-        this.list.push({
+        this.temp.carList.push({
           brand: depositVehicleList[i].brandName,
           model: depositVehicleList[i].vehicleAlias,
           vin: depositVehicleList[i].vinNo,
@@ -354,24 +342,30 @@ export default {
           price: depositVehicleList[i].guidedPrice,
           modelSid: depositVehicleList[i].modelSid,
           configSid: depositVehicleList[i].configSid,
-          carSid: depositVehicleList[i].sid
+          carSid: depositVehicleList[i].sid,
+          depositDate: '',
+          remarks: ''
         })
       }
     },
     // 删除一行
     handleDelete(row, index) {
-      this.list.splice(index, 1)
+      this.temp.carList.splice(index, 1)
     },
     // ------------ 页面跳转以及数据获取 ------------
     // 打开车辆
     handleyudingcheliang() {
       this.viewState = 3
-      this.$refs['divCheLiang'].init()
+      this.$refs['divCheLiang'].init(this.temp.carList)
     },
     // 打开选择客户页面
     handleCustomer() {
       this.viewState = 2
-      this.$refs['divSelect'].init()
+      const aa = []
+      aa.push({
+        customerSid: this.temp.customerSid
+      })
+      this.$refs['divSelect'].init(aa)
     },
     // 车辆、客户返回
     resetState() {
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue
index 425e9532ba..a25bf0d6bc 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue
@@ -4,8 +4,8 @@
       <div class="tab-header webtop">
         <div>{{ viewTitle }}</div>
         <div>
-          <el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
-          <el-button type="primary" size="small" :disabled="disabled" @click="handleSubmit()">提交</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleCreate()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSubmit()">提交</el-button>
         </div>
       </div>
       <div class="">
@@ -55,7 +55,7 @@
               <span><span class="icon">*</span>付款人</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
+              <el-form-item prop="payName">
                 <el-input v-model="temp.payName" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
@@ -81,7 +81,7 @@
               <span><span class="icon">*</span>订金金额</span>
             </el-col>
             <el-col :span="13">
-              <el-form-item>
+              <el-form-item prop="deposit">
                 <el-input v-model="temp.deposit" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
@@ -91,7 +91,7 @@
               <span><span class="icon">*</span>付款日期</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
+              <el-form-item prop="payDate">
                 <el-date-picker v-model="temp.payDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" class="addinputw"></el-date-picker>
               </el-form-item>
             </el-col>
@@ -99,7 +99,7 @@
               <span><span class="icon">*</span>付款方式</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
+              <el-form-item prop="payType">
                 <el-select v-model="temp.payType" class="addinputw" placeholder="" @change="changePaymentType">
                   <el-option v-for="item in paymentType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                 </el-select>
@@ -109,7 +109,7 @@
               <span><span class="icon">*</span>付款银行账号</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
+              <el-form-item prop="payNumber">
                 <el-input v-model="temp.payNumber" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
@@ -119,15 +119,17 @@
               <span><span class="icon">*</span>收款银行</span>
             </el-col>
             <el-col :span="13">
-              <el-select v-model="temp.collectionBank" class="addinputw" placeholder="" @change="changeproBank">
-                <el-option v-for="item in proBank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
-              </el-select>
+              <el-form-item prop="collectionBank">
+                <el-select v-model="temp.collectionBank" class="addinputw" placeholder="" @change="changeproBank">
+                  <el-option v-for="item in proBank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                </el-select>
+              </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>收款银行账号</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
+              <el-form-item prop="collectionNumber">
                 <el-select v-model="temp.collectionNumber" class="addinputw" placeholder="" @change="changeProBankAccValue">
                   <el-option v-for="item in ProBankAcc_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                 </el-select>
@@ -163,12 +165,11 @@
               </el-button>
             </div>
           </div>
-          <el-table v-loading="listLoading" :data="list" border style="width: 100%" :index="index">
+          <el-table v-loading="listLoading" :data="temp.customerList" border style="width: 100%" :index="index">
             <el-table-column align="center" label="序号" type="index" width="60"/>
             <el-table-column label="操作" align="center" width="80px" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <!--                <el-button size="mini" type="primary" @click="handleUpdate(row)">编辑</el-button>-->
-                <el-button size="mini" type="danger" @click="handleDelete(scope.row,scope.$index,list[scope.$index])">
+                <el-button size="mini" type="danger" @click="handleDelete(scope.row,scope.$index)">
                   删除
                 </el-button>
               </template>
@@ -216,12 +217,10 @@ export default {
       list1: [],
       viewTitle: '',
       index: 0,
-      disabled: false, // 提交按钮状态
+      submitdisabled: false, // 提交按钮状态
       // --按钮菜单-------
       viewState: 1,
-      FormLoading: false,
       listLoading: false,
-      list: [],
       paymentType_list: [],
       proBank_list: [],
       ProBankAcc_list: [],
@@ -252,13 +251,14 @@ export default {
       },
       customerName: [],
       rules: {
-        mobile: [
-          {
-            required: true,
-            validator: checkSubmit,
-            trigger: 'blur'
-          }
-        ]
+        payName: [{ required: true, message: '付款人不能为空', trigger: 'blur' }],
+        mobile: [{ required: true, validator: checkSubmit, trigger: 'blur' }],
+        deposit: [{ required: true, message: '订金金额不能为空', trigger: 'blur' }],
+        payDate: [{ required: true, message: '付款日期不能为空', trigger: 'change' }],
+        payType: [{ required: true, message: '付款方式不能为空', trigger: 'change' }],
+        payNumber: [{ required: true, message: '付款银行账号不能为空', trigger: 'blur' }],
+        collectionBank: [{ required: true, message: '收款银行不能为空', trigger: 'change' }],
+        collectionNumber: [{ required: true, message: '收款银行账号不能为空', trigger: 'change' }]
       }
       // ------------------------------------
     }
@@ -390,7 +390,6 @@ export default {
         if (response.code) {
           this.temp = response.data
           this.temp.sid = response.data.virtualOrderSid
-          this.list = response.data.customerList
           if (response.data.payImages.length > 0) {
             const imgName = response.data.payImages[response.data.payImages.length - 1].split('/')
             this.list1.push({
@@ -423,7 +422,7 @@ export default {
     },
     backData(row) {
       this.viewState = 1
-      this.list.push({
+      this.temp.customerList.push({
         customerName: row.name,
         mobile: row.mobile,
         customerSid: row.sid
@@ -431,20 +430,22 @@ export default {
     },
     handleDelete(row, index) {
       console.log('客户表中的row', row)
-      this.list.splice(index, 1)
+      this.temp.customerList.splice(index, 1)
     },
     // 添加数据
     handleCreate() {
+      this.getUrl()
+      if (this.temp.payImages.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请上传付款凭证' })
+        return
+      }
       this.$refs['dataForm'].validate((valid) => {
-        this.getUrl()
-        this.temp.customerList = this.list
         if (valid) {
-          this.FormLoading = true
+          this.submitdisabled = true
           this.temp.staffSid = window.sessionStorage.getItem('staffSid')
           this.temp.orgSid = window.sessionStorage.getItem('orgSid')
           this.temp.userSid = window.sessionStorage.getItem('userSid')
           saveDing(this.temp).then((response) => {
-            this.FormLoading = false
             if (response.success) {
               this.$message({ showClose: true, type: 'success', message: '修改成功' })
               // 子页面向父级页面传递值
@@ -462,16 +463,23 @@ export default {
     },
     // 提交
     handleSubmit() {
+      this.getUrl()
+      if (this.temp.payImages.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请上传付款凭证' })
+        return
+      }
+      if (this.temp.customerList.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '客户信息列表不能为空' })
+        return
+      }
       this.$confirm('是否确定提交该业务', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
           this.$refs['dataForm'].validate((valid) => {
-            this.getUrl()
-            this.temp.customerList = this.list
             if (valid) {
-              this.FormLoading = true
+              this.submitdisabled = true
               this.temp.staffSid = window.sessionStorage.getItem('staffSid')
               this.temp.orgSid = window.sessionStorage.getItem('orgSid')
               this.temp.userSid = window.sessionStorage.getItem('userSid')
@@ -504,7 +512,7 @@ export default {
     // 新增客户信息
     handleyudingcheliang() {
       this.viewState = 2
-      this.$refs['divSelect'].init()
+      this.$refs['divSelect'].init(this.temp.customerList)
     },
     // 选择客户返回
     resetState() {
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquInfo.vue
index bef173c8be..80e4b7296e 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquInfo.vue
@@ -4,7 +4,7 @@
       <div class="tab-header webtop">
         <div>销售简易订单详情</div>
         <div>
-          <el-button type="danger" size="small" @click="openRevoke">撤 回</el-button>
+          <el-button type="danger" size="small" @click="openRevoke">撤回</el-button>
         </div>
       </div>
       <div class="">
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzecheliang.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzecheliang.vue
index 5d8f889ccb..e8d1db54dd 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzecheliang.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzecheliang.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <div>
       <div class="tab-header webtop">
-        <div>现车库存</div>
+        <div>车辆查询</div>
         <div>
           <el-button type="primary" size="small" @click="handleConfirm()">确定</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
@@ -14,33 +14,25 @@
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="130px" class="tab-header">
               <el-form-item label="品牌">
-                <el-select v-model="listQuery.params.carbrand" class="addinputw" placeholder="请选择" @change="changeCarbrand">
-                  <el-option v-for="(item, index) in carbrand_list" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                <el-select v-model="listQuery.params.carbrand" class="addinputw" placeholder="请选择">
+                  <el-option v-for="(item, index) in carbrand_list" :key="index.sid" :label="item.brandName" :value="item.sid"/>
                 </el-select>
               </el-form-item>
-              <el-form-item label="功能">
-                <el-input v-model="listQuery.params.vehicleType" placeholder="请输入" clearable class="filter-item"/>
+              <el-form-item label="车型">
+                <el-input v-model="listQuery.params.modelName" placeholder="请输入" clearable class="filter-item"/>
               </el-form-item>
-              <el-form-item label="系列">
-                <el-input v-model="listQuery.params.productLine" placeholder="请输入" clearable class="filter-item"/>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.vinNo" placeholder="请输入" clearable class="filter-item"/>
               </el-form-item>
-              <el-form-item label="变速箱">
-                <el-input v-model="listQuery.params.gearboxType" placeholder="请输入" clearable class="filter-item"/>
-              </el-form-item>
-              <el-form-item label="驱动">
-                <el-input v-model="listQuery.params.driveForm" placeholder="请输入" clearable class="filter-item"/>
-              </el-form-item>
-              <el-form-item label="排放标准">
-                <el-input v-model="listQuery.params.emissionStandard" placeholder="请输入" clearable class="filter-item"/>
-              </el-form-item>
-              <el-form-item label="马力">
-                <el-input v-model="listQuery.params.power" placeholder="请输入" clearable class="filter-item"/>
-              </el-form-item>
-              <el-form-item label="燃料">
-                <el-input v-model="listQuery.params.fuelType" placeholder="请输入" clearable class="filter-item"/>
+              <el-form-item label="颜色">
+                <el-select v-model="listQuery.params.carColorKey" placeholder="请选择" clearable class="addinputw" filterable>
+                  <el-option v-for="item in carColor_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
               </el-form-item>
-              <el-form-item label="版本">
-                <el-input v-model="listQuery.params.vehicleVersion" placeholder="请输入" clearable class="filter-item"/>
+              <el-form-item label="存放地点">
+                <el-select v-model="listQuery.params.location" class="addinputw" clearable placeholder="请选择" filterable>
+                  <el-option v-for="item in location_list" :key="item.sid" :label="item.warehouseName" :value="item.sid"/>
+                </el-select>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -50,8 +42,8 @@
           </div>
         </div>
         <div class="listtop">
-          <div class="tit">现车库存列表</div>
-          <pageye v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+          <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>
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
@@ -92,7 +84,7 @@
         <div class="pages">
           <div class="tit"/>
           <!-- 翻页 -->
-          <pagination v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
       </div>
     </div>
@@ -103,9 +95,10 @@
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import { getList } from '@/api/jichuxinxi/busdepositvehicle'
+import { brandDown, typeValues, getPathSidByUserSid, fetchByUseOrgSid} from '@/api/dictcommons/dictcommons'
 
 export default {
-  name: "xuanzecheliang",
+  name: 'xuanzecheliang',
   components: {
     Pagination,
     pageye
@@ -120,27 +113,25 @@ export default {
       viewState: 1, // 1、列表 2、添加-车辆预定 3、编辑  4、查看 5、订金-定金收取
       // 查询 -----------
       carbrand_list: [], // 品牌
+      carColor_list: [],
+      location_list: [],
       tableKey: 0,
       list: [],
       sids: [],
-      total: 1,
       FormLoading: false,
       listLoading: false,
       listQuery: {
         current: 1,
         size: 5,
+        total: 0,
         params: {
           carbrand: '',
-          driveForm: '',
-          emissionStandard: '',
-          fuelType: '',
-          gearboxType: '',
-          lockedState: '',
-          power: '',
-          productLine: '',
-          vehicleState: '',
-          vehicleType: '',
-          vehicleVersion: ''
+          modelName: '',
+          carColorKey: '',
+          vinNo: '',
+          location: '',
+          userSid: '',
+          vinNoList: []
         }
       },
       selectDate: undefined,
@@ -153,8 +144,19 @@ export default {
   },
   methods: {
     // 初始化
-    init() {
-      this.handleFilter()
+    init(value) {
+      const aa = []
+      if (value.length > 0) {
+        for (var i = 0; i < value.length; i++) {
+          aa.push(value[i].vin)
+        }
+        this.listQuery.params.vinNoList = aa
+      } else {
+        this.listQuery.params.vinNoList = []
+      }
+      this.listQuery.current = 1
+      this.listQuery.total = 0
+      this.listQuery.size = 5
       this.getcarbrand()
     },
     // 搜索条件效果
@@ -168,23 +170,16 @@ export default {
     },
     // 重置
     handleReset() {
-      this.listQuery = {
-        current: 1,
-        size: 5,
-        params: {
-          carbrand: '',
-          driveForm: '',
-          emissionStandard: '',
-          fuelType: '',
-          gearboxType: '',
-          lockedState: '',
-          power: '',
-          productLine: '',
-          vehicleState: '',
-          vehicleType: '',
-          vehicleVersion: ''
-        }
-      }
+      this.listQuery.current = 1
+      this.listQuery.size = 5
+      this.listQuery.total = 0
+      this.listQuery.params.carbrand = ''
+      this.listQuery.params.modelName = ''
+      this.listQuery.params.vinNo = ''
+      this.listQuery.params.location = ''
+      this.listQuery.params.carColorKey = ''
+      this.listQuery.params.userSid = ''
+      this.getList()
     },
     // 勾选
     handleSelectionChange(row) {
@@ -199,27 +194,26 @@ export default {
     },
     // 品牌下拉
     getcarbrand() {
-      // selectBrand().then((res) => {
-      //   if (res.code === '200') {
-      //     this.carbrand_list = res.data
-      //     console.log('下拉框请求品牌', res.data)
-      //   }
-      // })
-    },
-    changeCarbrand(value) {
-      let bb = {}
-      this.carbrand_list.forEach((e) => {
-        // eslint-disable-next-line eqeqeq
-        if (e.dictKey == value) {
-          bb = {
-            name: e.dictValue,
-            key: e.dictKey,
-            sid: e.sid
-          }
+      typeValues({ type: 'bodyColor' }).then((resp) => {
+        if (resp.success) {
+          this.carColor_list = resp.data
+        }
+      })
+      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          brandDown({ useOrg: res.data }).then((resp) => {
+            if (resp.success) {
+              this.carbrand_list = resp.data
+            }
+          })
+          fetchByUseOrgSid({ sid: res.data }).then((respsone) => {
+            if (respsone.success) {
+              this.location_list = respsone.data
+            }
+          })
         }
       })
-      this.listQuery.params.carbrand = bb.name
-      console.log('name', this.listQuery.params.carbrand)
+      this.getList()
     },
     // 确认
     handleConfirm() {
@@ -248,27 +242,15 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
-      getList({
-        current: this.listQuery.current,
-        size: this.listQuery.size,
-        params: {
-          modelName: this.listQuery.modelName,
-          carModel: this.listQuery.carModel,
-          brandName: this.listQuery.brandName
-        }
-      }).then((response) => {
-        console.log('列表查询结果：', response)
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      getList(this.listQuery).then((response) => {
         this.listLoading = false
-        if (
-          response.code === '200' &&
-          response.data &&
-          response.data.total > 0
-        ) {
+        if (response.success) {
           this.list = response.data.records
-          this.total = response.data.total
+          this.listQuery.total = response.data.total
         } else {
           this.list = []
-          this.total = 0
+          this.listQuery.total = 0
         }
       })
     },
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzekehu.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzekehu.vue
index cf0e0fa8ed..14c75bb540 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzekehu.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzekehu.vue
@@ -133,13 +133,21 @@ export default {
         total: 0,
         params: {
           name: '',
-          userSid: ''
+          userSid: '',
+          customerSidList: []
         }
       }
     }
   },
   methods: {
-    init() {
+    init(value) {
+      const aa = []
+      if (value.length > 0) {
+        value.forEach((e) => {
+          aa.push(e.customerSid)
+        })
+        this.listQuery.params.customerSidList = aa
+      }
       this.getList()
       this.getShuJUZiDian()
     },
@@ -192,7 +200,7 @@ export default {
       let bb = null
       this.customertype_list.forEach((e) => {
         if (e.dictValue === value) {
-          bb= {
+          bb = {
             value: e.dictValue,
             key: e.dictKey,
             sid: e.sid
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/com/xuanzecheliang.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/com/xuanzecheliang.vue
index 0e71d143f4..640d56d143 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/com/xuanzecheliang.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/com/xuanzecheliang.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <div>
       <div class="tab-header webtop">
-        <div>现车库存</div>
+        <div>车辆查询</div>
         <div>
           <el-button type="primary" size="small" @click="handleConfirm()">确定</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
@@ -14,33 +14,25 @@
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="130px" class="tab-header">
               <el-form-item label="品牌">
-                <el-select v-model="listQuery.params.carbrand" class="addinputw" placeholder="请选择" @change="changeCarbrand">
-                  <el-option v-for="(item, index) in carbrand_list" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                <el-select v-model="listQuery.params.carbrand" class="addinputw" placeholder="请选择">
+                  <el-option v-for="(item, index) in carbrand_list" :key="index.sid" :label="item.brandName" :value="item.sid"/>
                 </el-select>
               </el-form-item>
-              <el-form-item label="功能">
-                <el-input v-model="listQuery.params.vehicleType" placeholder="请输入" clearable class="filter-item"/>
+              <el-form-item label="车型">
+                <el-input v-model="listQuery.params.modelName" placeholder="请输入" clearable class="filter-item"/>
               </el-form-item>
-              <el-form-item label="系列">
-                <el-input v-model="listQuery.params.productLine" placeholder="请输入" clearable class="filter-item"/>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.vinNo" placeholder="请输入" clearable class="filter-item"/>
               </el-form-item>
-              <el-form-item label="变速箱">
-                <el-input v-model="listQuery.params.gearboxType" placeholder="请输入" clearable class="filter-item"/>
-              </el-form-item>
-              <el-form-item label="驱动">
-                <el-input v-model="listQuery.params.driveForm" placeholder="请输入" clearable class="filter-item"/>
-              </el-form-item>
-              <el-form-item label="排放标准">
-                <el-input v-model="listQuery.params.emissionStandard" placeholder="请输入" clearable class="filter-item"/>
-              </el-form-item>
-              <el-form-item label="马力">
-                <el-input v-model="listQuery.params.power" placeholder="请输入" clearable class="filter-item"/>
-              </el-form-item>
-              <el-form-item label="燃料">
-                <el-input v-model="listQuery.params.fuelType" placeholder="请输入" clearable class="filter-item"/>
+              <el-form-item label="颜色">
+                <el-select v-model="listQuery.params.carColorKey" placeholder="请选择" clearable class="addinputw" filterable>
+                  <el-option v-for="item in carColor_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
               </el-form-item>
-              <el-form-item label="版本">
-                <el-input v-model="listQuery.params.vehicleVersion" placeholder="请输入" clearable class="filter-item"/>
+              <el-form-item label="存放地点">
+                <el-select v-model="listQuery.params.location" class="addinputw" clearable placeholder="请选择" filterable>
+                  <el-option v-for="item in location_list" :key="item.sid" :label="item.warehouseName" :value="item.sid"/>
+                </el-select>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -50,8 +42,8 @@
           </div>
         </div>
         <div class="listtop">
-          <div class="tit">现车库存列表</div>
-          <pageye v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+          <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>
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
@@ -92,7 +84,7 @@
         <div class="pages">
           <div class="tit"/>
           <!-- 翻页 -->
-          <pagination v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
       </div>
     </div>
@@ -103,9 +95,10 @@
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import { getList } from '@/api/jichuxinxi/busdepositvehicle'
+import { brandDown, typeValues, getPathSidByUserSid, fetchByUseOrgSid} from '@/api/dictcommons/dictcommons'
 
 export default {
-  name: "xuanzecheliang",
+  name: 'xuanzecheliang',
   components: {
     Pagination,
     pageye
@@ -120,27 +113,25 @@ export default {
       viewState: 1, // 1、列表 2、添加-车辆预定 3、编辑  4、查看 5、订金-定金收取
       // 查询 -----------
       carbrand_list: [], // 品牌
+      carColor_list: [],
+      location_list: [],
       tableKey: 0,
       list: [],
       sids: [],
-      total: 1,
       FormLoading: false,
       listLoading: false,
       listQuery: {
         current: 1,
         size: 5,
+        total: 0,
         params: {
           carbrand: '',
-          driveForm: '',
-          emissionStandard: '',
-          fuelType: '',
-          gearboxType: '',
-          lockedState: '',
-          power: '',
-          productLine: '',
-          vehicleState: '',
-          vehicleType: '',
-          vehicleVersion: ''
+          modelName: '',
+          carColorKey: '',
+          vinNo: '',
+          location: '',
+          userSid: '',
+          vinNoList: []
         }
       },
       selectDate: undefined,
@@ -153,8 +144,19 @@ export default {
   },
   methods: {
     // 初始化
-    init() {
-      this.handleFilter()
+    init(value) {
+      const aa = []
+      if (value.length > 0) {
+        for (var i = 0; i < value.length; i++) {
+          aa.push(value[i].vin)
+        }
+        this.listQuery.params.vinNoList = aa
+      } else {
+        this.listQuery.params.vinNoList = []
+      }
+      this.listQuery.current = 1
+      this.listQuery.total = 0
+      this.listQuery.size = 5
       this.getcarbrand()
     },
     // 搜索条件效果
@@ -168,23 +170,16 @@ export default {
     },
     // 重置
     handleReset() {
-      this.listQuery = {
-        current: 1,
-        size: 5,
-        params: {
-          carbrand: '',
-          driveForm: '',
-          emissionStandard: '',
-          fuelType: '',
-          gearboxType: '',
-          lockedState: '',
-          power: '',
-          productLine: '',
-          vehicleState: '',
-          vehicleType: '',
-          vehicleVersion: ''
-        }
-      }
+      this.listQuery.current = 1
+      this.listQuery.size = 5
+      this.listQuery.total = 0
+      this.listQuery.params.carbrand = ''
+      this.listQuery.params.modelName = ''
+      this.listQuery.params.vinNo = ''
+      this.listQuery.params.location = ''
+      this.listQuery.params.carColorKey = ''
+      this.listQuery.params.userSid = ''
+      this.getList()
     },
     // 勾选
     handleSelectionChange(row) {
@@ -199,27 +194,26 @@ export default {
     },
     // 品牌下拉
     getcarbrand() {
-      // selectBrand().then((res) => {
-      //   if (res.code === '200') {
-      //     this.carbrand_list = res.data
-      //     console.log('下拉框请求品牌', res.data)
-      //   }
-      // })
-    },
-    changeCarbrand(value) {
-      let bb = {}
-      this.carbrand_list.forEach((e) => {
-        // eslint-disable-next-line eqeqeq
-        if (e.dictKey == value) {
-          bb = {
-            name: e.dictValue,
-            key: e.dictKey,
-            sid: e.sid
-          }
+      typeValues({ type: 'bodyColor' }).then((resp) => {
+        if (resp.success) {
+          this.carColor_list = resp.data
+        }
+      })
+      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          brandDown({ useOrg: res.data }).then((resp) => {
+            if (resp.success) {
+              this.carbrand_list = resp.data
+            }
+          })
+          fetchByUseOrgSid({ sid: res.data }).then((respsone) => {
+            if (respsone.success) {
+              this.location_list = respsone.data
+            }
+          })
         }
       })
-      this.listQuery.params.carbrand = bb.name
-      console.log('name', this.listQuery.params.carbrand)
+      this.getList()
     },
     // 确认
     handleConfirm() {
@@ -248,27 +242,15 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
-      getList({
-        current: this.listQuery.current,
-        size: this.listQuery.size,
-        params: {
-          modelName: this.listQuery.modelName,
-          carModel: this.listQuery.carModel,
-          brandName: this.listQuery.brandName
-        }
-      }).then((response) => {
-        console.log('列表查询结果：', response)
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      getList(this.listQuery).then((response) => {
         this.listLoading = false
-        if (
-          response.code === '200' &&
-          response.data &&
-          response.data.total > 0
-        ) {
+        if (response.success) {
           this.list = response.data.records
-          this.total = response.data.total
+          this.listQuery.total = response.data.total
         } else {
           this.list = []
-          this.total = 0
+          this.listQuery.total = 0
         }
       })
     },
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/com/xuanzekehu.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/com/xuanzekehu.vue
index 925cc21355..b5854c263c 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/com/xuanzekehu.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/com/xuanzekehu.vue
@@ -8,7 +8,7 @@
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
-      <div class="">
+      <div class="main-content">
         <div class="searchcon">
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
@@ -133,13 +133,21 @@ export default {
         total: 0,
         params: {
           name: '',
-          userSid: ''
+          userSid: '',
+          customerSidList: []
         }
       }
     }
   },
   methods: {
-    init() {
+    init(value) {
+      const aa = []
+      if (value.length > 0) {
+        value.forEach((e) => {
+          aa.push(e.customerSid)
+        })
+        this.listQuery.params.customerSidList = aa
+      }
       this.getList()
       this.getShuJUZiDian()
     },
@@ -192,7 +200,7 @@ export default {
       let bb = null
       this.customertype_list.forEach((e) => {
         if (e.dictValue === value) {
-          bb= {
+          bb = {
             value: e.dictValue,
             key: e.dictKey,
             sid: e.sid
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanAdd.vue
index 5d174d2dfd..773b7bf095 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanAdd.vue
@@ -4,8 +4,8 @@
       <div class="tab-header webtop">
         <div>{{ viewTitle }}</div>
         <div>
-          <el-button type="primary" size="small" :disabled="FormLoading" @click="handleCreate()">保存</el-button>
-          <el-button type="primary" size="small" :disabled="disabled" @click="handleSubmit()">提交</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleCreate()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSubmit()">提交</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
@@ -78,11 +78,11 @@
               </el-button>
             </div>
           </div>
-          <el-table v-loading="listLoading" :data="list" border style="width: 100%" :index="index">
+          <el-table v-loading="listLoading" :data="temp.carList" border style="width: 100%" :index="index">
             <el-table-column align="center" label="序号" type="index" width="60"/>
             <el-table-column label="操作" align="center" width="80px" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button size="mini" type="danger" @click="handleDelete(scope.row,scope.$index,list[scope.$index])">删除
+                <el-button size="mini" type="danger" @click="handleDelete(scope.row,scope.$index)">删除
                 </el-button>
               </template>
             </el-table-column>
@@ -161,12 +161,10 @@ export default {
       },
       viewTitle: '',
       index: 0,
-      disabled: false, // 提交按钮状态
+      submitdisabled: false, // 提交按钮状态
       // --按钮菜单-------
       viewState: 1,
-      FormLoading: false,
       listLoading: false,
-      list: [],
       temp: {
         staffName: '',
         customerSid: '', // 客户sid
@@ -183,32 +181,12 @@ export default {
         userSid: window.sessionStorage.getItem('userSid')
       },
       staffName: '',
-      deposit_list: [],
       customerName: [],
       rules: {}
       // ------------------------------------
     }
   },
   methods: {
-    // 下拉框-预计订金日期
-    getDeposit_date() {
-      typeValues({
-        type: 'reserveDepositDate'
-      }).then((res) => {
-        if (res.code === '200') {
-          this.deposit_list = res.data
-          console.log('下拉框请求预计订金日期', res.data)
-        }
-      })
-    },
-    changeDeposit_date(row) {
-      for (var i = 0; i < this.deposit_list.length; i++) {
-        if (this.deposit_list[i].dictValue === row.depositDate) {
-          row.depositDate = this.deposit_list[i].dictValue
-          this.list[i].reserve_deposit_date_key = this.deposit_list[i].dictKey
-        }
-      }
-    },
     getPathSid() {
       const userSid = window.sessionStorage.getItem('userSid')
       getPathSidByUserSid({ userSid: userSid }).then((res) => {
@@ -240,7 +218,6 @@ export default {
       this.temp.depositBillType = depositBillType
       this.temp.depositBillTypeKey = depositBillTypeKey
       this.viewTitle = '【新增】销售简易订单'
-      this.getDeposit_date()
       this.getPathSid() // 分公司
     },
     showEdit(sid, depositBillType) {
@@ -257,26 +234,33 @@ export default {
       selectSid(data).then((response) => {
         if (response.code) {
           this.temp = response.data
-          this.list = response.data.carList
           this.temp.depositBillType = depositBillType
         }
       })
-      this.getDeposit_date()
     },
     // ------------ 功能实现 ------------
     // 添加数据
     handleCreate() {
+      if (this.temp.customerName === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择客户' })
+        return
+      }
+      if (this.temp.carList.length > 0) {
+        for (var i = 0; i < this.temp.carList.length; i++) {
+          if (this.temp.carList[i].depositDate === '') {
+            this.$message({ showClose: true, type: 'error', message: '预顶车辆信息表中预约订金日期不能为空' })
+            return
+          }
+        }
+      }
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.temp.carList = this.list
+          this.submitdisabled = true
           this.temp.staffSid = window.sessionStorage.getItem('staffSid')
           this.temp.orgSid = window.sessionStorage.getItem('orgSid')
           saveChe(this.temp).then((response) => {
-            this.FormLoading = true
             if (response.code === '200') {
-              this.FormLoading = false
               this.handleReturn('true')
-              // this.$emit('doback')
             } else {
               this.$notify({
                 title: '提示',
@@ -291,6 +275,18 @@ export default {
     },
     // 提交
     handleSubmit() {
+      if (this.temp.customerName === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择客户' })
+        return
+      }
+      if (this.temp.carList.length > 0) {
+        for (var i = 0; i < this.temp.carList.length; i++) {
+          if (this.temp.carList[i].depositDate === '') {
+            this.$message({ showClose: true, type: 'error', message: '预顶车辆信息表中预约订金日期不能为空' })
+            return
+          }
+        }
+      }
       this.$confirm('是否确定提交该业务', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -298,8 +294,7 @@ export default {
       }).then(() => {
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
-            this.FormLoading = true
-            this.temp.carList = this.list
+            this.submitdisabled = true
             this.temp.staffSid = window.sessionStorage.getItem('staffSid')
             this.temp.orgSid = window.sessionStorage.getItem('orgSid')
             console.log('提交时sid', this.temp.sid)
@@ -344,8 +339,7 @@ export default {
         procInsId: '', // 流程实例ID
         userSid: window.sessionStorage.getItem('userSid')
       }
-      this.disabled = false
-      this.list = []
+      this.submitdisabled = false
       this.$refs['dataForm'].resetFields()
       this.$emit('doback')
     },
@@ -360,7 +354,7 @@ export default {
     selectVehicle(depositVehicleList) {
       this.viewState = 1
       for (var i = 0; i < depositVehicleList.length; i++) {
-        this.list.push({
+        this.temp.carList.push({
           brand: depositVehicleList[i].brandName,
           model: depositVehicleList[i].vehicleAlias,
           vin: depositVehicleList[i].vinNo,
@@ -369,24 +363,30 @@ export default {
           price: depositVehicleList[i].guidedPrice,
           modelSid: depositVehicleList[i].modelSid,
           configSid: depositVehicleList[i].configSid,
-          carSid: depositVehicleList[i].sid
+          carSid: depositVehicleList[i].sid,
+          depositDate: '',
+          remarks: ''
         })
       }
     },
     // 删除一行
-    handleDelete(row, index) {
-      this.list.splice(index, 1)
+    handleDelete(index) {
+      this.temp.carList.splice(index, 1)
     },
     // ------------ 页面跳转以及数据获取 ------------
     // 打开车辆
     handleyudingcheliang() {
       this.viewState = 3
-      this.$refs['divCheLiang'].init()
+      this.$refs['divCheLiang'].init(this.temp.carList)
     },
     // 打开选择客户页面
     handleCustomer() {
       this.viewState = 2
-      this.$refs['divSelect'].init()
+      const aa = []
+      aa.push({
+        customerSid: this.temp.customerSid
+      })
+      this.$refs['divSelect'].init(aa)
     },
     // 车辆、客户返回
     resetState() {
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanguanli.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanguanli.vue
index a2ac51d93a..b78478b2ef 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanguanli.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanguanli.vue
@@ -13,7 +13,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="客户(付款人)">
-                <el-input v-model="listQuery.params.name" placeholder="请输入" clearable class="filter-item"/>
+                <el-input v-model="listQuery.params.name" placeholder="请输入" clearable/>
               </el-form-item>
               <el-form-item label="申请日期">
                 <el-date-picker v-model="listQuery.params.startTime" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
@@ -46,7 +46,8 @@
             </el-table-column>
             <el-table-column label="状态" align="left" header-align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.nodeState }}</span>
+                <span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
+                <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
             <el-table-column label="单据类型" align="center">
@@ -54,7 +55,7 @@
                 <span>{{ scope.row.depositBillType }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="分公司" width="150px" align="center"><!--原单据编号-->
+            <el-table-column label="分公司" width="150px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.orgName }}</span>
               </template>
@@ -64,7 +65,7 @@
                 <span>{{ scope.row.staffName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请日期" align="center"><!-- 原创建日期 -->
+            <el-table-column label="申请日期" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.createDate }}</span>
               </template>
@@ -123,6 +124,9 @@
     <xunidingjininfo v-show="viewState == 6" ref="divDingInfo" @doback="resetState" @reloadlist="getList"/>
     <!--合同详情预览-->
     <hetongdanganguanli-info v-show="hetongdanganguanliInfoShow" @handleReturn="noClickclose"/>
+    <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
+      <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
+    </el-dialog>
   </div>
 </template>
 
@@ -136,6 +140,7 @@ import xunidingjinAdd from './xunidingjinAdd'
 import xunidingjininfo from './xunidingjininfo'
 import hetongdanganguanliInfo from '@/views/hetongguanli/hetongdanganguanli/hetongdanganguanliInfo.vue'
 import ButtonBar from '@/components/ButtonBar'
+import { getStorage } from '@/utils/auth'
 
 export default {
   name: 'Xunidingdanguanli',
@@ -151,6 +156,9 @@ export default {
   },
   data() {
     return {
+      url: '',
+      dialogHeight: '80%',
+      centerDialogVisible: false,
       viewState: 1, // 1、列表 2、添加-车辆预订 3、编辑  4、查看 5、订金-订金收取
       disabled: false, // 办理按钮
       billTypeKey: '',
@@ -185,7 +193,6 @@ export default {
       depositType: [], // 虚拟订单类型
       tableKey: 0,
       list: [],
-      nodeState_list: [], // 流程状态
       sids: [],
       billType: [],
       FormLoading: false,
@@ -195,7 +202,7 @@ export default {
         size: 5,
         total: 0,
         params: {
-          userSid: window.sessionStorage.getItem('userSid'),
+          userSid: '',
           orgName: '',
           staffName: '',
           name: '',
@@ -204,9 +211,6 @@ export default {
           endTime: ''
         }
       },
-      nodeState: '',
-      selectDate: undefined,
-      visible: true,
       hetongdanganguanliInfoShow: false
       // ------------------------------------
     }
@@ -218,11 +222,47 @@ export default {
     this.getList()
   },
   mounted() {
+    // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage
+    window.addEventListener('message', this.handleMessage)
     this.$refs['btnbar'].setButtonList(this.btnList)
   },
   methods: {
+    async handleMessage(event) {
+      var code = ''
+      if (event.data.params !== null && event.data.params !== undefined) {
+        code = event.data.params.code
+      }
+      if (code === 1) {
+        this.init()
+        this.centerDialogVisible = false
+      } else if (code === 2) {
+        this.dialogHeight = event.data.params.data
+        this.setIframeHeight(document.getElementById('iframe'))
+      }
+    },
+    closeIt() {
+      this.url = ''
+      this.centerDialogVisible = false
+    },
+    setIframeHeight(iframe) {
+      iframe.height = this.dialogHeight
+    },
+    flowRecord(row) {
+      this.centerDialogVisible = true
+      var params = {
+        deployId: row.procDefId,
+        procInsId: row.procInsId,
+        token: getStorage()
+      }
+      this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
+    },
     init() {
-      this.getType()
+      typeValues({type: 'depositBillType' }).then((res) => {
+        if (res.code === '200') {
+          this.depositType = res.data
+          console.log('下拉框请求订单类型', res.data)
+        }
+      })
     },
     // 搜索条件效果
     clicksearchShow() {
@@ -234,18 +274,6 @@ export default {
       }
     },
     // ----------功能打开开始--------
-    resetState() {
-      this.viewState = 1
-    },
-    // 下拉框-虚拟订车单类型
-    getType() {
-      typeValues({type: 'depositBillType' }).then((res) => {
-        if (res.code === '200') {
-          this.depositType = res.data
-          console.log('下拉框请求订单类型', res.data)
-        }
-      })
-    },
     btnHandle(btnKey) {
       console.log('XXXXXXXXXXXXXXX    ' + btnKey)
       switch (btnKey) {
@@ -275,9 +303,10 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
       listPage(this.listQuery).then((response) => {
         this.listLoading = false
-        if (response.code === '200' && response.data && response.data.total > 0) {
+        if (response.success) {
           this.list = response.data.records
           for (var i = 0; i < response.data.records.length; i++) {
             var timeArr = response.data.records[i].createDate.split(' ')
@@ -295,53 +324,60 @@ export default {
       console.log('row', row)
       const aa = []
       const bb = []
-      const cc = []
       row.forEach((element) => {
         aa.push(element.sid)
         bb.push(element.depositBillTypeKey)
-        cc.push(element.nodeState)
       })
       this.sids = aa
       this.billType = bb
-      this.nodeState_list = cc
       console.log('选择sid', this.sids)
       console.log('选择订单类型', this.billType)
-      console.log('流程状态', this.nodeState_list)
     },
-
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 重置
+    handleReset() {
+      this.listQuery = {
+        current: 1,
+        size: 5,
+        params: {
+          userSid: '',
+          orgName: '',
+          staffName: '',
+          name: '',
+          billType: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+      this.getList()
+    },
     // 根据本行ID删除数据
     doDel() {
-      if (this.sids.length > 0) {
-        const sids = this.sids
-        deleteBySids(sids).then((response) => {
-          if (response.code === '200') {
-            this.$notify({
-              title: '提示',
-              message: '删除成功',
-              type: 'success',
-              duration: 2000
-            })
+      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(() => {
+        deleteBySids(this.sids).then((response) => {
+          if (response.success) {
+            this.$message({ showClose: true, type: 'success', message: '删除成功' })
             this.getList()
-          } else {
-            this.$notify({
-              title: '删除失败',
-              message: response.msg,
-              type: 'error'
-            })
           }
         })
-      } else {
-        this.$notify({
-          title: '提示',
-          message: '没有选择资方信息!!',
-          type: 'error',
-          duration: 2000
-        })
-        return
-      }
+      })
     },
     // 打开添加
     toAdd() {
+      this.billTypeKey = ''
       this.dialogVisible = true
     },
     // 确认
@@ -397,33 +433,13 @@ export default {
         this.$refs['divinfo'].showInfo(row.sid, row.depositBillType)
       }
     },
+    resetState() {
+      this.viewState = 1
+    },
     doClose() {
       this.$store.dispatch('tagsView/delView', this.$route)
       this.$router.go(-1)
     },
-    // 查询按钮
-    handleFilter() {
-      this.listQuery.current = 1
-      this.getList()
-    },
-    // 重置
-    handleReset() {
-      this.listQuery = {
-        current: 1,
-        size: 20,
-        params: {
-          userSid: window.sessionStorage.getItem('userSid'),
-          orgName: '',
-          staffName: '',
-          name: '',
-          billType: '',
-          startTime: '',
-          endTime: ''
-        }
-      }
-      this.getList()
-    },
-
     // ----------功能打开结束--------
     noClickclose() {
       this.viewState = 1
@@ -433,22 +449,6 @@ export default {
     handleCheckhetong() {
       this.viewState = false
       this.hetongdanganguanliInfoShow = true
-    },
-    // 导出
-    handleDaoChu() {
-      //   basefinbankExportExcel(this.sids).then((res) => {
-      //     const blob = new Blob([res], {
-      //       type: 'application/vnd.ms-excel',
-      //     })
-      //     const objectUrl = URL.createObjectURL(blob)
-      //     window.location.href = objectUrl
-      //     this.$notify({
-      //       title: '提示',
-      //       message: '导出成功',
-      //       type: 'success',
-      //       duration: 2000,
-      //     })
-      //   })
     }
   }
 }
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue
index 8bdf327e46..435a655f5f 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue
@@ -4,8 +4,8 @@
       <div class="tab-header webtop">
         <div>{{ viewTitle }}</div>
         <div>
-          <el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
-          <el-button type="primary" size="small" :disabled="disabled" @click="handleSubmit()">提交</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleCreate()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSubmit()">提交</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
@@ -56,7 +56,7 @@
               <span><span class="icon">*</span>付款人</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
+              <el-form-item prop="payName">
                 <el-input v-model="temp.payName" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
@@ -82,7 +82,7 @@
               <span><span class="icon">*</span>订金金额</span>
             </el-col>
             <el-col :span="13">
-              <el-form-item>
+              <el-form-item prop="deposit">
                 <el-input v-model="temp.deposit" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
@@ -92,21 +92,15 @@
               <span><span class="icon">*</span>付款日期</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
-                <el-date-picker
-                  v-model="temp.payDate"
-                  type="date"
-                  placeholder="选择日期"
-                  value-format="yyyy-MM-dd"
-                  class="addinputw">
-                </el-date-picker>
+              <el-form-item prop="payDate">
+                <el-date-picker v-model="temp.payDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" class="addinputw"></el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>付款方式</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
+              <el-form-item prop="payType">
                 <el-select v-model="temp.payType" class="addinputw" placeholder="" @change="changePaymentType">
                   <el-option v-for="item in paymentType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                 </el-select>
@@ -116,7 +110,7 @@
               <span><span class="icon">*</span>付款银行账号</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
+              <el-form-item prop="payNumber">
                 <el-input v-model="temp.payNumber" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
@@ -126,15 +120,17 @@
               <span><span class="icon">*</span>收款银行</span>
             </el-col>
             <el-col :span="13">
-              <el-select v-model="temp.collectionBank" class="addinputw" placeholder="" @change="changeproBank">
-                <el-option v-for="item in proBank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
-              </el-select>
+              <el-form-item prop="collectionBank">
+                <el-select v-model="temp.collectionBank" placeholder="" @change="changeproBank">
+                  <el-option v-for="item in proBank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                </el-select>
+              </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>收款银行账号</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
+              <el-form-item prop="collectionNumber">
                 <el-select v-model="temp.collectionNumber" class="addinputw" placeholder="" @change="changeProBankAccValue">
                   <el-option v-for="item in ProBankAcc_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                 </el-select>
@@ -170,12 +166,12 @@
               </el-button>
             </div>
           </div>
-          <el-table v-loading="listLoading" :data="list" border style="width: 100%" :index="index">
+          <el-table v-loading="listLoading" :data="temp.customerList" border style="width: 100%" :index="index">
             <el-table-column align="center" label="序号" type="index" width="60"/>
             <el-table-column label="操作" align="center" width="80px" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <!--                <el-button size="mini" type="primary" @click="handleUpdate(row)">编辑</el-button>-->
-                <el-button size="mini" type="danger" @click="handleDelete(scope.row,scope.$index,list[scope.$index])">
+                <el-button size="mini" type="danger" @click="handleDelete(scope.row,scope.$index)">
                   删除
                 </el-button>
               </template>
@@ -223,12 +219,10 @@ export default {
       list1: [],
       viewTitle: '',
       index: 0,
-      disabled: false, // 提交按钮状态
+      submitdisabled: false, // 提交按钮状态
       // --按钮菜单-------
       viewState: 1,
-      FormLoading: false,
       listLoading: false,
-      list: [],
       paymentType_list: [],
       proBank_list: [],
       ProBankAcc_list: [],
@@ -259,15 +253,15 @@ export default {
       },
       customerName: [],
       rules: {
-        mobile: [
-          {
-            required: true,
-            validator: checkSubmit,
-            trigger: 'blur'
-          }
-        ]
+        payName: [{ required: true, message: '付款人不能为空', trigger: 'blur' }],
+        mobile: [{ required: true, validator: checkSubmit, trigger: 'blur' }],
+        deposit: [{ required: true, message: '订金金额不能为空', trigger: 'blur' }],
+        payDate: [{ required: true, message: '付款日期不能为空', trigger: 'change' }],
+        payType: [{ required: true, message: '付款方式不能为空', trigger: 'change' }],
+        payNumber: [{ required: true, message: '付款银行账号不能为空', trigger: 'blur' }],
+        collectionBank: [{ required: true, message: '收款银行不能为空', trigger: 'change' }],
+        collectionNumber: [{ required: true, message: '收款银行账号不能为空', trigger: 'change' }]
       }
-      // ------------------------------------
     }
   },
   methods: {
@@ -399,7 +393,6 @@ export default {
           this.temp = response.data
           this.temp.sid = response.data.virtualOrderSid
           this.temp.depositBillType = depositBillType
-          this.list = response.data.customerList
           if (response.data.payImages.length > 0) {
             const imgName = response.data.payImages[response.data.payImages.length - 1].split('/')
             this.list1.push({
@@ -431,7 +424,7 @@ export default {
     },
     selectCustomer(row) {
       this.viewState = 1
-      this.list.push({
+      this.temp.customerList.push({
         customerName: row.name,
         mobile: row.mobile,
         customerSid: row.sid
@@ -439,21 +432,22 @@ export default {
       })
     },
     handleDelete(row, index) {
-      console.log('客户表中的row', row)
-      this.list.splice(index, 1)
+      this.temp.customerList.splice(index, 1)
     },
     // 添加数据
     handleCreate() {
+      this.getUrl()
+      if (this.temp.payImages.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请上传付款凭证' })
+        return
+      }
       this.$refs['dataForm'].validate((valid) => {
-        this.getUrl()
-        this.temp.customerList = this.list
         if (valid) {
-          this.FormLoading = true
+          this.submitdisabled = true
           this.temp.staffSid = window.sessionStorage.getItem('staffSid')
           this.temp.orgSid = window.sessionStorage.getItem('orgSid')
           this.temp.userSid = window.sessionStorage.getItem('userSid')
           saveDing(this.temp).then((response) => {
-            this.FormLoading = false
             if (response.code === '200') {
               this.handleReturn('true')
             } else {
@@ -470,16 +464,23 @@ export default {
     },
     // 提交
     handleSubmit() {
+      this.getUrl()
+      if (this.temp.payImages.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请上传付款凭证' })
+        return
+      }
+      if (this.temp.customerList.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '客户信息列表不能为空' })
+        return
+      }
       this.$confirm('是否确定提交该业务', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
           this.$refs['dataForm'].validate((valid) => {
-            this.getUrl()
-            this.temp.customerList = this.list
             if (valid) {
-              this.FormLoading = true
+              this.submitdisabled = true
               this.temp.staffSid = window.sessionStorage.getItem('staffSid')
               this.temp.orgSid = window.sessionStorage.getItem('orgSid')
               this.temp.userSid = window.sessionStorage.getItem('userSid')
@@ -529,10 +530,9 @@ export default {
         taskId: '', // 任务Id
         procInsId: '' // 流程实例ID
       } // 添加和修改
-      this.disabled = false
+      this.submitdisabled = false
       this.$refs['uploadImg'].stateName = '' // 必写项
       this.list1 = []
-      this.list = []
       this.$refs['dataForm'].resetFields()
       this.$emit('doback')
     },
@@ -540,7 +540,7 @@ export default {
     // 新增客户信息
     handleyudingcheliang() {
       this.viewState = 2
-      this.$refs['divSelect'].init()
+      this.$refs['divSelect'].init(this.temp.customerList)
     },
     // 选择客户返回
     resetState() {