From 430d55c2e986df1f104cd3af598a95b75213a7ea Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 18 Aug 2022 13:53:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=AE=80=E6=98=93=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95--=E8=AE=A2=E9=87=91=E6=94=B6=E5=8F=96=E3=80=81?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E9=A2=84=E5=AE=9A=E4=B8=9A=E5=8A=A1=E5=92=8C?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/flow/jianyidingdan.js             |   59 +-
 .../src/api/jichuxinxi/busdeposit.js          |   22 +-
 .../src/components/uploadFile/upload.vue      |    1 +
 .../xunidingdanFlow/cheliangyuding.vue        |  660 ++++----
 .../xunidingdanFlow/cheliangyudingEdit.vue    |  611 ++++---
 .../xunidingdanFlow/cheliangyudingInfo.vue    |  356 ++--
 .../xunidingdanFlow/dingjinshouqu.vue         |  195 ++-
 .../xunidingdanFlow/dingjinshouquEdit.vue     |  872 +++++-----
 .../xunidingdanFlow/dingjinshouquInfo.vue     |  352 ++--
 .../relation/xuanzecheliang.vue               |  299 ++++
 .../xunidingdanFlow/relation/xuanzekehu.vue   |  269 +++
 .../relation/xuanzekehuAdd.vue                |  948 +++++++++++
 .../xunidingdan/com/xuanzecheliang.vue        |  390 +++--
 .../xunidingdan/com/xuanzekehu.vue            |  439 +++--
 .../xunidingdan/com/xuanzekehuAdd.vue         | 1480 ++++++-----------
 .../xunidingdan/xunidingdanAdd.vue            |  285 ++--
 .../xunidingdan/xunidingdanguanli.vue         |  121 +-
 .../xunidingdan/xunidingdaninfo.vue           |  216 +--
 .../xunidingdan/xunidingjinAdd.vue            |  309 ++--
 .../xunidingdan/xunidingjininfo.vue           |  159 +-
 20 files changed, 4359 insertions(+), 3684 deletions(-)
 create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzecheliang.vue
 create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzekehu.vue
 create mode 100644 anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzekehuAdd.vue

diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/flow/jianyidingdan.js b/anrui-buscenter/anrui-buscenter-ui/src/api/flow/jianyidingdan.js
index 1a6f760e07..af8371c324 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/api/flow/jianyidingdan.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/flow/jianyidingdan.js
@@ -2,59 +2,80 @@ import request from '@/utils/request'
 
 export default {
   // 车辆预定流程审批（同意） 已改
-  agreeCheliangTask: function(params) {
+  agreeCheliangTask: function(data) {
     return request({
       url: 'buscenter/v1/busmaindeposit/completeVehicle',
-      method: 'post',
-      data: params
+      method: 'put',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
   // 订金收取流程审批（同意） 已改
-  agreeDingjinTask: function(params) {
+  agreeDingjinTask: function(data) {
     return request({
       url: 'buscenter/v1/busmaindeposit/completeDeposit',
-      method: 'post',
-      data: params
+      method: 'put',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
   // 流程审批（驳回） 已改
-  rejectTask: function(params) {
+  rejectTask: function(data) {
     return request({
       url: 'buscenter/v1/busmaindeposit/reject',
-      method: 'post',
-      data: params
+      method: 'put',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
   // 流程审批（终止） 已改
-  breakTask: function(params) {
+  breakTask: function(data) {
     return request({
       url: 'buscenter/v1/busmaindeposit/breakProcess',
-      method: 'post',
-      data: params
+      method: 'put',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
   // 流程审批（撤回） 已改
-  revokeTask: function(params) {
+  revokeTask: function(data) {
     return request({
       url: 'buscenter/v1/busmaindeposit/revokeProcess',
-      method: 'post',
-      data: params
+      method: 'put',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
   // 审批流程（同意）获取下一环节 已改
   getNextNodesForSubmit: function(data) {
     return request({
       url: 'buscenter/v1/busmaindeposit/getNextNodesForSubmit',
-      method: 'get',
-      params: data
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
   // 审批流程（驳回、终止）获取上一环节 已改
   getPreviousNodesForReject: function(data) {
     return request({
       url: 'buscenter/v1/busmaindeposit/getPreviousNodesForReject',
-      method: 'get',
-      params: data
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
   // 读取xml文件
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/busdeposit.js b/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/busdeposit.js
index 141958d81a..49124f0d7b 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/busdeposit.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/busdeposit.js
@@ -1,8 +1,7 @@
 import request from '@/utils/request'
-import qs from 'qs'
 
 // 简易订单页面接口
-//条件分页查询数据的列表 (8.12测试)
+// 条件分页查询数据的列表 (8.12测试)
 export function listPage(data) {
   return request({
     url: '/buscenter/v1/busmaindeposit/listPage',
@@ -14,7 +13,7 @@ export function listPage(data) {
   })
 }
 
-//根据sid批量删除 (8.12测试)
+// 根据sid批量删除 (8.12测试)
 export function deleteBySids(data) {
   return request({
     url: '/buscenter/v1/busmaindeposit/deleteBySids',
@@ -26,8 +25,7 @@ export function deleteBySids(data) {
   })
 }
 
-
-//==========订金收取
+// ==========订金收取
 // 保存虚拟订单（订金）(8.12已改)
 export function saveDing(data) {
   return request({
@@ -56,7 +54,7 @@ export function submitApprove(data) {
 export function depositDetail(data) {
   return request({
     url: 'buscenter/v1/busdeposit/init/depositDetail/' + data.virtualOrderSid + '/' + data.userSid,
-    method: 'get',
+    method: 'get'
   })
 }
 
@@ -64,12 +62,11 @@ export function depositDetail(data) {
 export function fetchSid(data) {
   return request({
     url: 'buscenter/v1/busdeposit/getDepositInfoDetails/' + data,
-    method: 'get',
+    method: 'get'
   })
 }
 
-
-//==========预定车辆
+// ==========预定车辆
 // 保存虚拟订单（预定车辆） (8.12已改)
 export function saveChe(data) {
   return request({
@@ -85,7 +82,7 @@ export function saveChe(data) {
 // 提交虚拟订单(车辆)审批流程 (8.12已改)
 export function submitVehicleApprove(data) {
   return request({
-    url: 'buscenter/v1/busmaindeposit',
+    url: 'buscenter/v1/busmaindeposit/submitVirtualOrderVehicle',
     method: 'post',
     data: data,
     headers: {
@@ -110,11 +107,10 @@ export function selectSid(data) {
 export function getReserveCarDetails(data) {
   return request({
     url: 'buscenter/v1/busdepositvehicle/getReserveCarDetails/' + data,
-    method: 'get',
+    method: 'get'
   })
 }
 
-
 // 获取下拉框
 export function typeValues(data) {
   return request({
@@ -133,7 +129,7 @@ export function kehu(data) {
   })
 }
 
-//订单批量删除主车优惠情况
+// 订单批量删除主车优惠情况
 export function getDelDis(data) {
   return request({
     url: '/buscenter/v1/busorder/delDis/' + data,
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/upload.vue b/anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/upload.vue
index 3bded014c6..97b711ed69 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/upload.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/upload.vue
@@ -238,6 +238,7 @@
         }
       },
       handlePictureCardPreview(file) {
+        this.dialogVisible = true
         this.dialogImageUrl = file.url
       },
       // 上传失败
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyuding.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyuding.vue
index 9eb9f682c4..e1a071c142 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyuding.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyuding.vue
@@ -1,74 +1,79 @@
 <template>
   <div class="app-container">
-    <div v-show="visible">
+    <div>
       <div class="tab-header webtop">
         <div>销售简易订单详情</div>
         <!-- <div v-else></div> -->
         <div>
-          <el-button type="primary" @click="openAgree('同意')">同 意</el-button>
-          <el-button type="danger" @click="openReject('驳回')">驳 回</el-button>
-          <el-button type="danger" @click="openStop('终止')">终 止</el-button>
+          <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
+          <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
+          <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
         </div>
       </div>
-      <div class="listconadd">
-        <el-form
-          ref="dataForm"
-          :model="temp"
-          label-position="right"
-          class="formadd"
-        >
-          <div class="tit">
-            销售虚拟订车单
-            <div class="times">
-              <div><span>分公司：</span><span>{{ temp.departmentName }}</span></div>
-              <div><span>申请人：</span><span>{{ temp.staffName }}</span></div>
-              <div><span>申请日期：</span><span>{{ temp.createDate }}</span></div>
-              <div><span>金额单位：</span><span>元</span></div>
-            </div>
-          </div>
-          <el-row class="bordertopline">
-            <el-col :span="2" class="tleftb">
-              <el-form-item>订单类型</el-form-item>
+      <div class="">
+        <div class="titwu">销售简易订单</div>
+        <el-form ref="dataForm" :model="temp" label-position="right" class="formadd">
+          <el-row class="rowStyle">
+            <el-col :span="24" class="tleftb colStyle">
+              <span>金额单位: 元</span>
             </el-col>
-            <el-col :span="6" class="trightb">
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span>分公司</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.departmentName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>申请人</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.staffName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>申请日期</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.createDate }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span>订单类型</span>
+            </el-col>
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.depositBillType }}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="2" class="tleftb">
-              <el-form-item>客户名称</el-form-item>
+            <el-col :span="3" class="tleftb">
+              <span>客户名称</span>
             </el-col>
-            <el-col :span="6" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 {{ temp.customerName }}
               </el-form-item>
             </el-col>
-            <el-col :span="2" class="tleftb">
-              <el-form-item>联系电话</el-form-item>
+            <el-col :span="3" class="tleftb">
+              <span>联系电话</span>
             </el-col>
-            <el-col :span="6" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 {{ temp.mobile }}
               </el-form-item>
             </el-col>
           </el-row>
           <!--Start 预订车辆信息-->
-          <!--          <div class="title">-->
           <div class="title">预订车辆信息</div>
-          <!--          </div>-->
-          <el-table
-            v-loading="listLoading"
-            :data="list"
-            border
-            style="width: 100%"
-            :index="index"
-          >
-            <el-table-column
-              align="center"
-              label="序号"
-              type="index"
-              width="50"
-            />
+          <el-table v-loading="listLoading" :data="list" border style="width: 100%" :index="index">
+            <el-table-column align="center" label="序号" type="index" width="60"/>
             <el-table-column label="品牌" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.brand }}</span>
@@ -80,16 +85,16 @@
               </template>
             </el-table-column>
             <el-table-column label="车架号" align="center">
-              <template slot-scope="scope" @click="">
+              <template slot-scope="scope">
                 <span>{{ scope.row.vin }}</span>
               </template>
             </el-table-column>
             <el-table-column label="颜色" align="center">
-              <template slot-scope="scope" @click="">
+              <template slot-scope="scope">
                 <span>{{ scope.row.colour }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="存放地点" align="center">
+            <el-table-column label="存放地点">
               <template slot-scope="scope">
                 <span>{{ scope.row.location }}</span>
               </template>
@@ -115,18 +120,19 @@
     </div>
     <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
       <el-form label-position="right" class="formadd">
-        <el-row v-show="currentLink">
+        <el-row v-show="currentLink" style="border-top: 1px solid #E0E3EB">
           <el-col :span="4" class="tleftb">当前环节</el-col>
-          <el-col :span="20" class="trightb">
+          <el-col :span="20">
             <el-form-item prop="purchasingUnitName"><span>{{ current.taskName }}->{{ nextNode.name }}</span>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row style="border-bottom: 1px solid #e0e3eb;">
+        <el-row :class="{ rowClass:!currentLink }">
           <el-col :span="4" class="tleftb">意见</el-col>
-          <el-col :span="20" class="trightb">
-            <el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw"
-                      clearable></el-input>
+          <el-col :span="20">
+            <el-form-item>
+              <el-input v-model="dialogList.comment" placeholder="审批意见" class="addinputw" clearable></el-input>
+            </el-form-item>
           </el-col>
         </el-row>
         <div style="text-align:center;margin-top: 20px;">
@@ -139,336 +145,272 @@
 </template>
 
 <script>
-import {mapGetters} from "vuex";
-import {getReserveCarDetails} from "@/api/jichuxinxi/busdeposit";
+import { getReserveCarDetails } from '@/api/jichuxinxi/busdeposit'
 import req from '@/api/flow/jianyidingdan.js'
 
-  export default {
-    name: "cheliangyuding",
-    data() {
-      return {
-        disabled: true,
-        index: 0,
-        edit: true,
-        // --按钮菜单-------
-        YongHuid: [],
-        visible: true,
-        stateId: "0",
-        FormLoading: false,
-        listLoading: false,
-        list: [],
-        temp: {}, // 添加和修改
-        textMap: {
-          update: "修改",
-          create: "创建",
-        },
-        submitDto: {
-          businessSid: '',
-          userSid: window.sessionStorage.getItem("userSid"),
-        },
-        nodeState: '',
-        billNo: '',
-        createDate: '',
-        mobile: '',
-        orgName: '',
-        staffName: '',
-        _userSid: '',
-        customerName: [],
-        xuniSid: '',
-        tificateT: [],
-        dnumbDate: [],
-        dialogStatus: '', // 对话框状态
-        // ------流程所需------------------------------
-        currentLink:true, // 控制当前环节一行的显示隐藏
-        dialogList: {
-          comment: ''
-        },
-        xmlData: '', // 模型xml数据
-        taskList: [],
-        startTask: true,
-        current: {
-          taskDefKey: '',
-          taskName: '' // 当前环节名称
-        },
-        nextNode: {}, // 下一环节
-        nodeDialogVisible: false,
-        // 同意办理列表
-        agreeList: {
-          businessSid: '',
-          comment: '',
-          instanceId: '',
-          taskId: '',
-          orgSidPath: '',
-          taskDefKey: '',
-          userSid:''
-        },
-        // 驳回列表
-        regectList: {
-          businessSid: '',
-          comment: '',
-          instanceId: '',
-          taskId: '',
-          userSid: ''
-        },
-        // 终止列表
-        stopList: {
-          businessSid: '',
-          comment: '',
-          instanceId: '',
-          taskId: '',
-          userSid: ''
+export default {
+  name: 'cheliangyuding',
+  data() {
+    return {
+      disabled: true,
+      index: 0,
+      // --按钮菜单-------
+      FormLoading: false,
+      listLoading: false,
+      list: [],
+      temp: {}, // 添加和修改
+      // ------流程所需------------------------------
+      currentLink: true, // 控制当前环节一行的显示隐藏
+      dialogList: {
+        comment: ''
+      },
+      xmlData: '', // 模型xml数据
+      taskList: [],
+      startTask: true,
+      current: {
+        taskDefKey: '',
+        taskName: '' // 当前环节名称
+      },
+      nextNode: {}, // 下一环节
+      nodeDialogVisible: false,
+      // 同意办理列表
+      agreeList: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      },
+      // 驳回列表
+      regectList: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        userSid: ''
+      },
+      // 终止列表
+      stopList: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        userSid: ''
+      }
+    }
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 350 + 'px'
+      }
+    }, '*')
+  },
+  created() {
+    // ===获取参数
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('获取到的obj', obj)
+    // 同意列表
+    this.agreeList.businessSid = obj.businessSid
+    this.agreeList.instanceId = obj.instanceId
+    this.agreeList.taskId = obj.taskId
+    this.agreeList.taskDefKey = obj.taskDefKey
+    this.agreeList.userSid = window.sessionStorage.getItem('userSid')
+    this.agreeList.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.current.taskDefKey = obj.taskDefKey
+    this.current.taskName = obj.taskName
+    // 驳回列表
+    this.regectList.businessSid = obj.businessSid
+    this.regectList.instanceId = obj.instanceId
+    this.regectList.taskId = obj.taskId
+    this.regectList.userSid = window.sessionStorage.getItem('userSid')
+    // 终止列表
+    this.stopList.businessSid = obj.businessSid
+    this.stopList.instanceId = obj.instanceId
+    this.stopList.taskId = obj.taskId
+    this.stopList.userSid = window.sessionStorage.getItem('userSid')
+    // 加载流程图相关的数据
+    this.showInfo(obj.businessSid)
+  },
+  methods: {
+    // ----------功能打开开始--------
+    showInfo(sid) {
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      getReserveCarDetails(sid).then((response) => {
+        if (response.code) {
+          this.temp = response.data
+          this.list = response.data.vehicleList
         }
-      };
+      })
     },
-    computed: {
-      ...mapGetters([
-        "id",
-        "roles",
-        "rolesIds",
-        "departmentId",
-        "departmentCode",
-      ]),
+    // ---------- 流程开始 -----------------------------
+    // 点击同意
+    openAgree(val) {
+      this.operation = val
+      this.dialogList.comment = '同意'
+      this.currentLink = true // 控制当前环节一行的显示隐藏
+      // const formVariables = {
+      //   businessSid: this.agreeList.businessSid
+      // }
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
     },
-    mounted() {
-      window.parent.postMessage({
-        cmd: 'returnHeight',
-        params: {
-          // 告诉父级页面，子页面的弹框高度。
-          code: 2,
-          data: document.body.scrollHeight + 220  + 'px'
+    // 点击驳回
+    openReject(val) {
+      this.operation = val
+      this.dialogList.comment = ''
+      this.currentLink = true // 控制当前环节一行的显示隐藏
+      // const formVariables = {
+      //   businessSid: this.regectList.businessSid
+      // }
+      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
         }
-      }, '*')
+        this.submitdisabled = false
+      })
     },
-    created() {
-      // ===获取参数
-      var one = window.location.href.indexOf('&data') + 6
-      const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
-      const obj = JSON.parse(decodeURIComponent(data))
-      console.log('获取到的obj',obj)
-      // 同意列表
-      this.agreeList.businessSid = obj.businessSid
-      this.agreeList.instanceId = obj.instanceId
-      this.agreeList.taskId = obj.taskId
-      this.agreeList.taskDefKey = obj.taskDefKey
-      this.agreeList.userSid =  window.sessionStorage.getItem('userSid')
-      this.agreeList.orgSidPath = window.sessionStorage.getItem('orgSidPath')
-      this.current.taskDefKey = obj.taskDefKey
-      this.current.taskName = obj.taskName
-      // 驳回列表
-      this.regectList.businessSid = obj.businessSid
-      this.regectList.instanceId = obj.instanceId
-      this.regectList.taskId = obj.taskId
-      this.regectList.userSid = window.sessionStorage.getItem('userSid')
-      // 终止列表
-      this.stopList.businessSid = obj.businessSid
-      this.stopList.instanceId = obj.instanceId
-      this.stopList.taskId = obj.taskId
-      this.stopList.userSid = window.sessionStorage.getItem('userSid')
-      // 办理状态
-      this.transactState = obj.transactState
-      // 加载流程图相关的数据
-      this.showInfo(obj.businessSid)
-      this.getModelDetail(obj.deployId)
-      this.getFlowViewer(obj.instanceId)
+    // 点击终止
+    openStop(val) {
+      this.operation = val
+      this.dialogList.comment = ''
+      this.currentLink = false // 控制当前环节一行的显示隐藏
+      this.nodeDialogVisible = true
     },
-    methods: {
-      // ----------功能打开开始--------
-      showInfo(sid) {
-        console.log("修改打开", sid);
-        this.submitDto.businessSid = sid;
-        this.$nextTick(() => {
-          this.$refs["dataForm"].clearValidate();
-        });
-        getReserveCarDetails(sid).then((response) => {
-          if (response.code) {
-            this.temp = response.data
-            this.list = response.data.vehicleList
-          } else {
-            this.$notify({
-              title: "提示",
-              message: "查看失败",
-              type: "error",
-              duration: 2000,
-            });
-          }
-        });
-      },
-      // ---------- 流程开始 ------------------------------
-      /** xml 文件 */
-      getModelDetail(deployId) {
-        // 发送请求，获取xml
-        req.readXml(deployId).then((res) => {
-          this.xmlData = res.data
-        })
-      },
-      // 已办环节的节点
-      getFlowViewer(procInsId) {
-        req.getFlowViewer(procInsId).then((res) => {
-          this.taskList = res.data
-        })
-      },
-      // 点击同意
-      openAgree(val) {
-        this.operation = val
-        this.dialogList.comment = '同意'
-        this.currentLink = true // 控制当前环节一行的显示隐藏
-        // const formVariables = {
-        //   businessSid: this.agreeList.businessSid
-        // }
-        req.getNextNodesForSubmit({taskDefKey:this.current.taskDefKey}).then((resp) => {
-          if (resp.success) {
-            var arr = resp.data
-            this.nextNode = arr[0]
-            this.nodeDialogVisible = true
-          }
-          this.submitdisabled = false
-        })
-      },
-      // 点击驳回
-      openReject(val) {
-        this.operation = val
-        this.dialogList.comment = ''
-        this.currentLink = true // 控制当前环节一行的显示隐藏
-        // const formVariables = {
-        //   businessSid: this.regectList.businessSid
-        // }
-        req.getPreviousNodesForReject({taskDefKey: this.current.taskDefKey}).then((resp) => {
-          if (resp.success) {
-            var arr = resp.data
-            this.nextNode = arr[0]
-            this.nodeDialogVisible = true
-          }
-          this.submitdisabled = false
+    /** 选择代办人确认 */
+    confirm() {
+      if (this.operation === '同意') {
+        this.handleAgree()
+      } else if (this.operation === '驳回') {
+        this.handleReject()
+      } else if (this.operation === '终止') {
+        this.handleStop()
+      }
+    },
+    /** 同意任务 */
+    handleAgree() {
+      this.agreeList.comment = this.dialogList.comment
+      if (this.agreeList.comment === '') {
+        this.$message({
+          showClose: true,
+          message: '请填写同意意见！',
+          type: 'error'
         })
-      },
-      // 点击终止
-      openStop(val) {
-        this.operation = val
-        this.dialogList.comment = ''
-        this.currentLink = false // 控制当前环节一行的显示隐藏
-        this.nodeDialogVisible = true
-      },
-      /** 选择代办人确认 */
-      confirm() {
-        if (this.operation === '同意') {
-          this.handleAgree()
-        } else if (this.operation === '驳回') {
-          this.handleReject()
-        } else if (this.operation === '终止') {
-          this.handleStop()
-        }
-      },
-      /** 同意任务 */
-      handleAgree() {
-        this.agreeList.comment = this.dialogList.comment
-        if (this.agreeList.comment == '') {
+        return
+      }
+      req.agreeCheliangTask(this.agreeList).then((response) => {
+        if (response.success) {
           this.$message({
             showClose: true,
-            message: '请填写同意意见！',
-            type: 'error'
+            message: '执行成功',
+            type: 'success'
           })
-          return
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
         }
-        req.agreeCheliangTask(this.agreeList).then((response) => {
-          if (response.success) {
-            this.$message({
-              showClose: true,
-              message: '执行成功',
-              type: 'success'
-            })
-            this.nodeDialogVisible = false
-            // 子页面向父级页面传递值
-            window.parent.postMessage({
-              cmd: 'returnHeight',
-              params: {
-                // 操作成功，告诉父级页面关闭弹框
-                code: 1
-              }
-            }, '*')
-          }
+      })
+    },
+    /** 驳回任务 */
+    handleReject() {
+      this.regectList.comment = this.dialogList.comment
+      if (this.regectList.comment === '') {
+        this.$message({
+          showClose: true,
+          message: '请填写驳回意见！',
+          type: 'error'
         })
-      },
-      /** 驳回任务 */
-      handleReject() {
-        this.regectList.comment = this.dialogList.comment
-        if (this.regectList.comment == '') {
+        return
+      }
+      req.rejectTask(this.regectList).then((response) => {
+        if (response.success) {
           this.$message({
             showClose: true,
-            message: '请填写驳回意见！',
-            type: 'error'
+            message: '执行成功',
+            type: 'success'
           })
-          return
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
         }
-        req.rejectTask(this.regectList).then((response) => {
-          if (response.success) {
-            this.$message({
-              showClose: true,
-              message: '执行成功',
-              type: 'success'
-            })
-            this.nodeDialogVisible = false
-            // 子页面向父级页面传递值
-            window.parent.postMessage({
-              cmd: 'returnHeight',
-              params: {
-                // 操作成功，告诉父级页面关闭弹框
-                code: 1
-              }
-            }, '*')
-          }
+      })
+    },
+    /** 终止任务 */
+    handleStop() {
+      this.stopList.comment = this.dialogList.comment
+      if (this.stopList.comment === '') {
+        this.$message({
+          showClose: true,
+          message: '请填写终止意见！',
+          type: 'error'
         })
-      },
-      /** 终止任务 */
-      handleStop() {
-        this.stopList.comment = this.dialogList.comment
-        if (this.stopList.comment == '') {
+        return
+      }
+      req.breakTask(this.stopList).then((response) => {
+        if (response.success) {
           this.$message({
             showClose: true,
-            message: '请填写终止意见！',
-            type: 'error'
+            message: '执行成功',
+            type: 'success'
           })
-          return
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
         }
-        req.breakTask(this.stopList).then((response) => {
-          if (response.success) {
-            this.$message({
-              showClose: true,
-              message: '执行成功',
-              type: 'success'
-            })
-            this.nodeDialogVisible = false
-            // 子页面向父级页面传递值
-            window.parent.postMessage({
-              cmd: 'returnHeight',
-              params: {
-                // 操作成功，告诉父级页面关闭弹框
-                code: 1
-              }
-            }, '*')
-          }
-        })
-      },
-    },
+      })
+    }
   }
+}
 </script>
 
 <style scoped>
-  .tit {
-    margin: 0 0 20px 0;
-    padding: 10px 0 0 0;
-  }
-
-  .times {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-around;
-    padding: 30px 0 10px 0;
-    margin: 0 auto 0px auto;
-    width: 70%;
-    font-size: 14px;
-  }
-
-  /deep/ . el-form-item__content {
-    margin-left: 0 !important;
-  }
+.titwu {
+  font-size: 28px;
+  text-align: center;
+  padding: 30px 0 20px 0;
+}
+.rowStyle {
+  border-left: 0px !important;
+}
+.colStyle {
+  border-right: 0px !important;
+}
+.rowClass {
+  border-top: 1px solid #E0E3EB;
+}
 </style>
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 43c5974efe..7869d0136f 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
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div v-show="visible">
+    <div v-show="viewState == 1">
       <div class="tab-header webtop">
         <div>{{ viewTitle }}</div>
         <div>
@@ -9,57 +9,79 @@
         </div>
       </div>
       <div class="">
-        <el-form ref="dataForm" :model="temp" label-position="right" label-width="100%" class="formadd" :rules="rules">
-          <div class="tit">
-            销售虚拟订车单
-            <div class="times">
-              <div><span>分公司：</span><span>{{ temp.departmentName }}</span></div>
-              <div><span>申请人：</span><span>{{ temp.staffName }}</span></div>
-              <div><span>申请日期：</span><span>{{ temp.createDate }}</span></div>
-              <div><span>金额单位：</span><span>元</span></div>
-            </div>
-          </div>
-          <el-row class="bordertopline">
-            <el-col :span="2" class="tleftb">
-              <el-form-item>订单类型</el-form-item>
+        <div class="titwu">销售简易订单</div>
+        <el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
+          <el-row class="rowStyle">
+            <el-col :span="24" class="tleftb colStyle">
+              <span>金额单位: 元</span>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span>分公司</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.departmentName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>申请人</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.staffName }}</span>
+              </el-form-item>
             </el-col>
-            <el-col :span="6" class="trightb">
+            <el-col :span="3" class="tleftb">
+              <span>申请日期</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.createDate }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span>订单类型</span>
+            </el-col>
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.depositBillType }}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="2" class="tleftb">
-              <el-form-item>客户名称</el-form-item>
+            <el-col :span="3" class="tleftb">
+              <span>客户名称</span>
             </el-col>
-            <el-col :span="6" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 {{ temp.customerName }}
-                <span class="bluezi changeIt" @click="handleCustomer()">选择客户/新增客户</span>
+                <span class="bluezi changeIt" @click="handleCustomer()">选择客户</span>
               </el-form-item>
             </el-col>
-            <el-col :span="2" class="tleftb">
-              <el-form-item>联系电话</el-form-item>
+            <el-col :span="3" class="tleftb">
+              <span>联系电话</span>
             </el-col>
-            <el-col :span="6" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 {{ temp.mobile }}
               </el-form-item>
             </el-col>
           </el-row>
           <!--Start 预订车辆信息-->
-          <div class="titcon">
-            <div class="title">预订车辆信息</div>
-            <div class="baocun">
-              <el-button size="medium" type="primary" @click="handleyudingcheliang" class="btntopbluebut">选择车辆
+          <div class="title">
+            <div>预订车辆信息</div>
+            <div>
+              <el-button size="mini" type="primary" @click="handleyudingcheliang" class="btntopbluebut">选择车辆
               </el-button>
             </div>
           </div>
           <el-table v-loading="listLoading" :data="list" border style="width: 100%" :index="index">
-            <el-table-column align="center" label="序号" type="index" width="50"/>
+            <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,list[scope.$index])">删除
                 </el-button>
               </template>
             </el-table-column>
@@ -74,12 +96,12 @@
               </template>
             </el-table-column>
             <el-table-column label="车架号" width="140px" align="center">
-              <template slot-scope="scope" @click="">
+              <template slot-scope="scope">
                 <span>{{ scope.row.vin }}</span>
               </template>
             </el-table-column>
             <el-table-column label="颜色" width="100px" align="center">
-              <template slot-scope="scope" @click="">
+              <template slot-scope="scope">
                 <span>{{ scope.row.colour }}</span>
               </template>
             </el-table-column>
@@ -95,10 +117,7 @@
             </el-table-column>
             <el-table-column label="预计订金日期" width="220px" align="center">
               <template slot-scope="scope">
-                <el-date-picker v-model="scope.row.depositDate" type="date" style="width:90%"
-                                value-format="yyyy-MM-dd"
-                                placeholder="选择日期"
-                                :picker-options="pickerOptions">
+                <el-date-picker v-model="scope.row.depositDate" type="date" style="width:90%" value-format="yyyy-MM-dd" placeholder="选择日期" :picker-options="pickerOptions">
                 </el-date-picker>
               </template>
             </el-table-column>
@@ -111,313 +130,279 @@
         </el-form>
       </div>
     </div>
-
-    <!--选择车辆（确定）-->
-    <xuanzecheliang v-show="xuanzecheliangShow" @yudingcheliangfanhui="yudingcheliangfanhui" ref="xuanzecheliang"
-                    @handleVehicle="selectVehicle"/>
+    <xuanzecheliang v-show="viewState == 3" @yudingcheliangfanhui="resetState" ref="divCheLiang" @handleVehicle="selectVehicle"/>
     <!--选择客户（确定）-->
-    <xuanzekehu v-show="xuanzekehuShow" @yudingcheliangfanhui="yudingcheliangfanhui" ref="xuanzekehu"
-                @handleCustomer="selectCustomer"/>
+    <xuanzekehu v-show="viewState == 2" ref="divSelect" @doback="resetState" @handleCustomer="selectCustomer"/>
   </div>
 </template>
 
 <script>
-import {fetchBySid, getPathSidByUserSid} from '@/api/dictcommons/dictcommons'
-import {saveChe, selectSid, submitVehicleApprove, typeValues} from '@/api/jichuxinxi/busdeposit'
-import req from '@/api/flow/jianyidingdan.js'
-import yudingcheliang from "@/views/xiaoshouguanli/xunidingdan/com/yudingcheliang"
-import hetongdanganguanliAdd from '@/views/hetongguanli/hetongdanganguanli/hetongdanganguanliAdd.vue'
-import hetongdanganguanliInfo from '@/views/hetongguanli/hetongdanganguanli/hetongdanganguanliInfo.vue'
-import kehudanganAdd from '@/views/kehuguanli/kehudangan/kehudanganAdd.vue'
-import xuanzecheliang from "@/views/xiaoshouguanli/xunidingdan/com/xuanzecheliang"
-import xuanzekehu from "@/views/xiaoshouguanli/xunidingdan/com/xuanzekehu"
-  export default {
-    name: "cheliangyudingEdit",
-    components: {
-      yudingcheliang,
-      hetongdanganguanliAdd,
-      hetongdanganguanliInfo,
-      kehudanganAdd,
-      xuanzecheliang,
-      xuanzekehu
-    },
-    data() {
-      return {
-        // 限制日期不可选择当天之前的
-        pickerOptions: {
-          disabledDate(time) {
-            let threeDay = 60 * 60 * 24 * 1000 * 3;
-            return time.getTime() < Date.now() || time.getTime() > Date.now() + threeDay;
-          },
-        },
-        viewTitle: '',
-        index: 0,
-        disabled: false, // 提交按钮状态
-        // dialogStatus: 'add',
-        // --按钮菜单-------
-        YongHuid: [],
-        edit: true,
-        visible: true,
-        stateId: '0',
-        FormLoading: false,
-        listLoading: false,
-        list: [],
-        temp: {
-          staffName: '',
-          customerSid: '',  // 客户sid
-          virtualOrderSid: '',  // 虚拟订单s
-          customerName: '',  // 客户名称
-          virtualOrderId: '',  // 虚拟订单s
-          sellerName: '',  // 销售专员
-          departmentName: '',  // 部门名称
-          mobile: '',  // 手机号
-          createDate: '',  // 创建时间
-          carList: [],
-          taskId: '', // 任务Id
-          procInsId: '', // 流程实例ID
-          userSid: window.sessionStorage.getItem('userSid')
-        }, // 添加和修改
-        xuniSid: '',
-        mobile: '',
-        orgName: '',
+import { fetchBySid, getPathSidByUserSid } from '@/api/dictcommons/dictcommons'
+import { saveChe, selectSid, submitVehicleApprove, typeValues } from '@/api/jichuxinxi/busdeposit'
+import xuanzecheliang from './relation/xuanzecheliang'
+import xuanzekehu from './relation/xuanzekehu'
+
+export default {
+  name: 'cheliangyudingEdit',
+  components: {
+    xuanzecheliang,
+    xuanzekehu
+  },
+  data() {
+    return {
+      // 限制日期不可选择当天之前的
+      pickerOptions: {
+        disabledDate(time) {
+          let threeDay = 60 * 60 * 24 * 1000 * 3
+          return time.getTime() < Date.now() || time.getTime() > Date.now() + threeDay
+        }
+      },
+      viewTitle: '',
+      index: 0,
+      disabled: false, // 提交按钮状态
+      // --按钮菜单-------
+      viewState: 1,
+      FormLoading: false,
+      listLoading: false,
+      list: [],
+      temp: {
         staffName: '',
-        _userSid: '',
-        deposit_list: [],
-        customerName: [],
-        tificateT: [],
-        dnumbDate: [],
-        dialogStatus: '', // 对话框状态
-        yudingcheliangShow: false,
-        xuanzecheliangShow: false, // 选择车辆
-        xuanzekehuShow: false, // 选择客户
-        rules: {},
-        // ------------------------------------
+        customerSid: '', // 客户sid
+        virtualOrderSid: '', // 虚拟订单s
+        customerName: '', // 客户名称
+        virtualOrderId: '', // 虚拟订单s
+        sellerName: '', // 销售专员
+        departmentName: '', // 部门名称
+        mobile: '', // 手机号
+        createDate: '', // 创建时间
+        carList: [],
+        taskId: '', // 任务Id
+        procInsId: '', // 流程实例ID
+        userSid: window.sessionStorage.getItem('userSid')
+      },
+      deposit_list: [],
+      rules: {}
+      // ------------------------------------
+    }
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 350 + 'px'
       }
+    }, '*')
+  },
+  created() {
+    // ===获取参数
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    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)
+        }
+      })
     },
-    mounted() {
-      window.parent.postMessage({
-        cmd: 'returnHeight',
-        params: {
-          // 告诉父级页面，子页面的弹框高度。
-          code: 2,
-          data: document.body.scrollHeight + 220 + 'px'
+    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
         }
-      }, '*')
+      }
     },
-    created() {
-      // ===获取参数
-      var one = window.location.href.indexOf('&data') + 6
-      const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
-      const obj = JSON.parse(decodeURIComponent(data))
-      this.showEdit(obj.businessSid,obj.instanceId,obj.taskId)
+    getPathSid() {
+      const userSid = window.sessionStorage.getItem('userSid')
+      getPathSidByUserSid({ userSid: userSid }).then((res) => {
+        if (res.success) {
+          this.getCreateOrgName(res.data)
+        }
+      })
     },
-    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
-          }
+    getCreateOrgName(sid) {
+      fetchBySid(sid).then((res) => {
+        if (res.success) {
+          this.temp.departmentName = res.data.name
         }
-      },
-      getPathSid() {
-        const userSid = window.sessionStorage.getItem('userSid')
-        getPathSidByUserSid({userSid: userSid}).then((res) => {
-          if (res.success) {
-            this.getCreateOrgName(res.data)
-          }
-        })
-      },
-      getCreateOrgName(sid) {
-        fetchBySid(sid).then((res) => {
-          if (res.success) {
-            this.temp.departmentName = res.data.name
-          }
-        })
-      },
-      showEdit(businessSid,instanceId,taskId) {
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        });
-        this.stateId = '1'
-        this.dialogStatus = 'edit';
-        this.viewTitle = '【编辑】销售简易订单';
-        const data = {
-          customerSid: '',
-          virtualOrderSid: businessSid,
-          userSid: window.sessionStorage.getItem('userSid')
+      })
+    },
+    showEdit(businessSid, instanceId, taskId) {
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.viewTitle = '【编辑】销售简易订单'
+      const data = {
+        customerSid: '',
+        virtualOrderSid: businessSid,
+        userSid: window.sessionStorage.getItem('userSid')
+      }
+      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
         }
-        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
-          }
-        });
-        this.getDeposit_date()
-      },
-
-      // ------------ 功能实现 ------------
-      // 添加数据
-      handleCreate() {
+      })
+      this.getDeposit_date()
+    },
+    // ------------ 功能实现 ------------
+    // 添加数据
+    handleCreate() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.temp.carList = this.list
+          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.$message({ showClose: true, type: 'success', message: '提交成功' })
+              // 子页面向父级页面传递值
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            } else {
+              this.$notify({
+                title: '提示',
+                message: '添加失败',
+                type: 'error',
+                duration: 2000
+              })
+            }
+          })
+        }
+      })
+    },
+    // 提交
+    handleSubmit() {
+      this.$confirm('是否确定提交该业务', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
-            this.dialogStatus = 'create';
-            this.temp.carList = this.list;
+            this.FormLoading = true
+            this.temp.carList = this.list
             this.temp.staffSid = window.sessionStorage.getItem('staffSid')
             this.temp.orgSid = window.sessionStorage.getItem('orgSid')
-            saveChe(this.temp).then((response) => {
-              this.FormLoading = true;
+            console.log('提交时sid', this.temp.sid)
+            // 提交流程
+            submitVehicleApprove(this.temp).then((response) => {
               if (response.code === '200') {
-                this.xuniSid = response.data;
-                this.FormLoading = false;
-                // this.$emit('doback')
-              } else {
                 this.$notify({
                   title: '提示',
-                  message: '添加失败',
-                  type: 'error',
-                  duration: 2000,
+                  message: '提交成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                // 子页面向父级页面传递值
+                window.parent.postMessage({
+                  cmd: 'returnHeight',
+                  params: {
+                    // 操作成功，告诉父级页面关闭弹框
+                    code: 1
+                  }
+                }, '*')
+              } else {
+                this.$notify({
+                  title: '提交失败',
+                  message: response.msg,
+                  type: 'error'
                 })
               }
             })
           }
         })
-      },
-
-      // 提交
-      handleSubmit() {
-        this.$confirm('是否确定提交该业务', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$refs['dataForm'].validate((valid) => {
-            if (valid) {
-              this.FormLoading = true;
-              this.dialogStatus = 'create';
-              this.temp.carList = this.list;
-              this.temp.staffSid = window.sessionStorage.getItem('staffSid')
-              this.temp.orgSid = window.sessionStorage.getItem('orgSid')
-              console.log('提交时sid', this.temp.sid)
-              // 提交流程
-              submitVehicleApprove(this.temp).then((response) => {
-                if (response.code === '200') {
-                  this.$notify({
-                    title: '提示',
-                    message: '提交成功',
-                    type: 'success',
-                    duration: 2000,
-                  })
-                } else {
-                  this.$notify({
-                    title: '提交失败',
-                    message: response.msg,
-                    type: 'error',
-                  })
-                }
-              })
-            }
-          })
+      })
+    },
+    // 返回客户数据
+    selectCustomer(row) {
+      this.viewState = 1
+      this.temp.customerName = row.name
+      this.temp.customerSid = row.sid
+      this.temp.mobile = row.mobile
+    },
+    // 返回车辆表数据
+    selectVehicle(depositVehicleList) {
+      this.viewState = 1
+      for (var i = 0; i < depositVehicleList.length; i++) {
+        this.list.push({
+          brand: depositVehicleList[i].brandName,
+          model: depositVehicleList[i].vehicleAlias,
+          vin: depositVehicleList[i].vinNo,
+          colour: depositVehicleList[i].carColor,
+          location: depositVehicleList[i].location,
+          price: depositVehicleList[i].guidedPrice,
+          modelSid: depositVehicleList[i].modelSid,
+          configSid: depositVehicleList[i].configSid,
+          carSid: depositVehicleList[i].sid
         })
-      },
-      // 返回客户数据
-      selectCustomer(row) {
-        this.temp.customerName = row.name
-        this.temp.customerSid = row.sid
-        this.temp.mobile = row.mobile
-      },
-      // 返回车辆表数据
-      selectVehicle(depositVehicleList) {
-        for (var i = 0; i < depositVehicleList.length; i++) {
-          this.list.push({
-            brand: depositVehicleList[i].brandName,
-            model: depositVehicleList[i].vehicleAlias,
-            vin: depositVehicleList[i].vinNo,
-            colour: depositVehicleList[i].carColor,
-            location: depositVehicleList[i].location,
-            price: depositVehicleList[i].guidedPrice,
-            modelSid: depositVehicleList[i].modelSid,
-            configSid: depositVehicleList[i].configSid,
-            carSid: depositVehicleList[i].sid
-          })
-        }
-      },
-      // 删除一行
-      handleDelete(row, index) {
-        this.list.splice(index, 1)
-        // if (row.sid !== '') {
-        //   const sid_list = []
-        //   sid_list.push(row.sid, row.vehicleSid)
-        //   console.log('删除车辆信息', sid_list)
-        // } else {
-        //   this.list.splice(index, 1)
-        // }
-      },
-      // ------------ 页面跳转以及数据获取 ------------
-      // 打开车辆
-      handleyudingcheliang() {
-        this.visible = false;
-        this.xuanzekehuShow = false;
-        this.xuanzecheliangShow = true;
-        this.yudingcheliangShow = false;
-      },
-      // 打开选择客户页面
-      handleCustomer() {
-        this.xuanzekehuShow = true
-        this.xuanzecheliangShow = false;
-        this.visible = false;
-        this.yudingcheliangShow = false;
-      },
-      // 车辆、客户返回
-      yudingcheliangfanhui() {
-        this.visible = true;
-        this.xuanzecheliangShow = false
-        this.xuanzekehuShow = false
-        this.yudingcheliangShow = false;
-      },
-
-
+      }
     },
+    // 删除一行
+    handleDelete(row, index) {
+      this.list.splice(index, 1)
+    },
+    // ------------ 页面跳转以及数据获取 ------------
+    // 打开车辆
+    handleyudingcheliang() {
+      this.viewState = 3
+      this.$refs['divCheLiang'].init()
+    },
+    // 打开选择客户页面
+    handleCustomer() {
+      this.viewState = 2
+      this.$refs['divSelect'].init()
+    },
+    // 车辆、客户返回
+    resetState() {
+      this.viewState = 1
+    }
   }
+}
 </script>
 
 <style scoped>
-  .tit {
-    margin: 0 0 20px 0;
-    padding: 10px 0 0 0;
-  }
-
-  .times {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-around;
-    padding: 30px 0 10px 0;
-    margin: 0 auto 0px auto;
-    width: 70%;
-    font-size: 14px;
-  }
-
-  /deep/ .el-form-item__content {
-    margin-left: 0 !important;
-  }
-
-  .changeIt {
-    line-height: 40px;
-    font-size: 17px;
-    float: right;
-  }
+.titwu {
+  font-size: 28px;
+  text-align: center;
+  padding: 30px 0 20px 0;
+}
+.title {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+.rowStyle {
+  border-left: 0px !important;
+}
+.colStyle {
+  border-right: 0px !important;
+}
+.changeIt {
+  line-height: 40px;
+  font-size: 17px;
+  float: right;
+}
 </style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyudingInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyudingInfo.vue
index eac24c617b..d4c16daa54 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyudingInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyudingInfo.vue
@@ -1,72 +1,76 @@
 <template>
   <div class="app-container">
-    <div v-show="visible">
+    <div>
       <div class="tab-header webtop">
         <div>销售简易订单详情</div>
-        <!-- <div v-else></div> -->
         <div>
-          <el-button type="danger" @click="openRevoke">撤 回</el-button>
+          <el-button type="danger" size="small" @click="openRevoke">撤 回</el-button>
         </div>
       </div>
-      <div class="listconadd">
-        <el-form
-          ref="dataForm"
-          :model="temp"
-          label-position="right"
-          class="formadd"
-        >
-          <div class="tit">
-            销售虚拟订车单
-            <div class="times">
-              <div><span>分公司：</span><span>{{ temp.departmentName }}</span></div>
-              <div><span>申请人：</span><span>{{ temp.staffName }}</span></div>
-              <div><span>申请日期：</span><span>{{ temp.createDate }}</span></div>
-              <div><span>金额单位：</span><span>元</span></div>
-            </div>
-          </div>
-          <el-row class="bordertopline">
-            <el-col :span="2" class="tleftb">
-              <el-form-item>订单类型</el-form-item>
+      <div class="">
+        <div class="titwu">销售简易订单</div>
+        <el-form ref="dataForm" :model="temp" label-position="right" class="formadd">
+          <el-row class="rowStyle">
+            <el-col :span="24" class="tleftb colStyle">
+              <span>金额单位: 元</span>
             </el-col>
-            <el-col :span="6" class="trightb">
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span>分公司</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.departmentName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>申请人</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.staffName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>申请日期</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.createDate }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span>订单类型</span>
+            </el-col>
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.depositBillType }}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="2" class="tleftb">
-              <el-form-item>客户名称</el-form-item>
+            <el-col :span="3" class="tleftb">
+              <span>客户名称</span>
             </el-col>
-            <el-col :span="6" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 {{ temp.customerName }}
               </el-form-item>
             </el-col>
-            <el-col :span="2" class="tleftb">
-              <el-form-item>联系电话</el-form-item>
+            <el-col :span="3" class="tleftb">
+              <span>联系电话</span>
             </el-col>
-            <el-col :span="6" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 {{ temp.mobile }}
               </el-form-item>
             </el-col>
           </el-row>
           <!--Start 预订车辆信息-->
-          <!--          <div class="title">-->
           <div class="title">预订车辆信息</div>
-          <!--          </div>-->
-          <el-table
-            v-loading="listLoading"
-            :data="list"
-            border
-            style="width: 100%"
-            :index="index"
-          >
-            <el-table-column
-              align="center"
-              label="序号"
-              type="index"
-              width="50"
-            />
+          <el-table v-loading="listLoading" :data="list" border style="width: 100%" :index="index">
+            <el-table-column align="center" label="序号" type="index" width="60"/>
             <el-table-column label="品牌" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.brand }}</span>
@@ -78,16 +82,16 @@
               </template>
             </el-table-column>
             <el-table-column label="车架号" align="center">
-              <template slot-scope="scope" @click="">
+              <template slot-scope="scope">
                 <span>{{ scope.row.vin }}</span>
               </template>
             </el-table-column>
             <el-table-column label="颜色" align="center">
-              <template slot-scope="scope" @click="">
+              <template slot-scope="scope">
                 <span>{{ scope.row.colour }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="存放地点" align="center">
+            <el-table-column label="存放地点">
               <template slot-scope="scope">
                 <span>{{ scope.row.location }}</span>
               </template>
@@ -115,172 +119,116 @@
 </template>
 
 <script>
-import {mapGetters} from "vuex";
-import {getReserveCarDetails} from "@/api/jichuxinxi/busdeposit";
+import { getReserveCarDetails } from '@/api/jichuxinxi/busdeposit'
 import req from '@/api/flow/jianyidingdan.js'
 
-  export default {
-    name: "cheliangyudingInfo",
-    data() {
-      return {
-        disabled: true,
-        index: 0,
-        edit: true,
-        // --按钮菜单-------
-        YongHuid: [],
-        visible: true,
-        stateId: "0",
-        FormLoading: false,
-        listLoading: false,
-        list: [],
-        temp: {}, // 添加和修改
-        textMap: {
-          update: "修改",
-          create: "创建",
-        },
-        submitDto: {
-          businessSid: '',
-          userSid: window.sessionStorage.getItem("userSid"),
-        },
-        nodeState: '',
-        billNo: '',
-        createDate: '',
-        mobile: '',
-        orgName: '',
-        staffName: '',
-        _userSid: '',
-        customerName: [],
-        xuniSid: '',
-        tificateT: [],
-        dnumbDate: [],
-        dialogStatus: '', // 对话框状态
-        // ------流程所需------------------------------
-        // 撤回
-        revokeList: {
-          businessSid: '',
-          instanceId: '',
-          taskId: '',
-          userSid: ''
-        },
-      };
-    },
-    computed: {
-      ...mapGetters([
-        "id",
-        "roles",
-        "rolesIds",
-        "departmentId",
-        "departmentCode",
-      ]),
-    },
-    mounted() {
-      window.parent.postMessage({
-        cmd: 'returnHeight',
-        params: {
-          // 告诉父级页面，子页面的弹框高度。
-          code: 2,
-          data: document.body.scrollHeight + 220 + 'px'
+export default {
+  name: 'cheliangyudingInfo',
+  data() {
+    return {
+      disabled: true,
+      index: 0,
+      // --按钮菜单-------
+      FormLoading: false,
+      listLoading: false,
+      list: [],
+      temp: {}, // 添加和修改
+      // ------流程所需------------------------------
+      // 撤回
+      revokeList: {
+        businessSid: '',
+        instanceId: '',
+        taskId: '',
+        userSid: ''
+      }
+    }
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 380 + 'px'
+      }
+    }, '*')
+  },
+  created() {
+    // ===获取参数
+    var one = window.location.href.indexOf('&data') + 6
+    // url解码unescape()已从web中移除,尽量不使用
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('obj', obj)
+    this.showInfo(obj.businessSid)
+    // 撤回列表
+    this.revokeList.businessSid = obj.businessSid
+    this.revokeList.instanceId = obj.instanceId
+    this.revokeList.taskId = obj.taskId
+    this.revokeList.taskDefKey = obj.taskDefKey
+    this.revokeList.userSid = window.sessionStorage.getItem('userSid')
+  },
+  methods: {
+    // ----------功能打开开始--------
+    showInfo(sid) {
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      getReserveCarDetails(sid).then((response) => {
+        if (response.code) {
+          this.temp = response.data
+          this.list = response.data.vehicleList
         }
-      }, '*')
+      })
     },
-    created() {
-      // ===获取参数
-      var one = window.location.href.indexOf('&data') + 6
-      // url解码unescape()已从web中移除,尽量不使用
-      const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
-      const obj = JSON.parse(decodeURIComponent(data))
-      console.log('obj',obj)
-      this.showInfo(obj.businessSid)
-      // 撤回列表
-      this.revokeList.businessSid = obj.businessSid
-      this.revokeList.instanceId = obj.instanceId
-      this.revokeList.taskId = obj.taskId
-      this.revokeList.taskDefKey = obj.taskDefKey
-      this.revokeList.userSid = window.sessionStorage.getItem('userSid')
-      // 办理状态
-      this.transactState = obj.transactState
-      // 加载流程图相关的数据
-      // this.getModelDetail(obj.deployId)
-      // this.getFlowViewer(obj.instanceId)
+    openRevoke() {
+      this.$confirm('是否确认执行撤回操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleRevoke()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消撤回'
+        })
+      })
     },
-    methods: {
-      // ----------功能打开开始--------
-      showInfo(sid) {
-        console.log("修改打开", sid);
-        this.submitDto.businessSid = sid;
-        this.$nextTick(() => {
-          this.$refs["dataForm"].clearValidate();
-        });
-        getReserveCarDetails(sid).then((response) => {
-          if (response.code) {
-            this.temp = response.data
-            this.list = response.data.vehicleList
-          } else {
-            this.$notify({
-              title: "提示",
-              message: "查看失败",
-              type: "error",
-              duration: 2000,
-            });
-          }
-        });
-      },
-      openRevoke() {
-        this.$confirm('是否确认执行撤回操作', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.handleRevoke()
-        }).catch(() => {
+    /** 撤回任务 */
+    handleRevoke() {
+      req.revokeTask(this.revokeList).then((response) => {
+        if (response.success) {
           this.$message({
-            type: 'info',
-            message: '已取消撤回'
+            showClose: true,
+            message: '执行成功',
+            type: 'success'
           })
-        })
-      },
-      /** 撤回任务 */
-      handleRevoke() {
-        // this.revokeList.comment = this.dialogList.comment
-        req.revokeTask(this.revokeList).then((response) => {
-          if (response.success) {
-            this.$message({
-              showClose: true,
-              message: '执行成功',
-              type: 'success'
-            });
-            // 子页面向父级页面传递值
-            window.parent.postMessage({
-              cmd: 'returnHeight',
-              params: {
-                // 操作成功，告诉父级页面关闭弹框
-                code: 1
-              }
-            }, '*')
-          }
-        })
-      }
-    },
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
   }
+}
 </script>
 
 <style scoped>
-  .tit {
-    margin: 0 0 20px 0;
-    padding: 10px 0 0 0;
-  }
-
-  .times {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-around;
-    padding: 30px 0 10px 0;
-    margin: 0 auto 0px auto;
-    width: 70%;
-    font-size: 14px;
-  }
-
-  /deep/ . el-form-item__content {
-    margin-left: 0 !important;
-  }
+.titwu {
+  font-size: 28px;
+  text-align: center;
+  padding: 30px 0 20px 0;
+}
+.rowStyle {
+  border-left: 0px !important;
+}
+.colStyle {
+  border-right: 0px !important;
+}
 </style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue
index 7afd44ed93..13a6c2ba36 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue
@@ -2,63 +2,86 @@
   <div class="app-container">
     <div>
       <div class="tab-header webtop">
-        <div>销售虚拟订单管理详细信息</div>
+        <div>销售简易订单详情</div>
         <div>
-          <el-button type="primary" @click="openAgree('同意')">同 意</el-button>
-          <el-button type="danger" @click="openReject('驳回')">驳 回</el-button>
-          <el-button type="danger" @click="openStop('终止')">终 止</el-button>
+          <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
+          <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
+          <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
         </div>
       </div>
-      <div class="listconadd">
-        <el-form ref="dataForm" :model="temp" label-position="right" label-width="100%" class="formadd">
-          <div class="tit">
-            销售简易订单
-            <div class="times">
-              <div><span>分公司：</span><span>{{ temp.departmentName }}</span></div>
-              <div><span>申请人：</span><span>{{ temp.staffName }}</span></div>
-              <div><span>申请日期：</span><span>{{ temp.createDate }}</span></div>
-              <div><span>金额单位：</span><span>元</span></div>
-            </div>
-          </div>
-          <el-row class="bordertopline">
+      <div class="">
+        <div class="titwu">销售简易订单</div>
+        <el-form ref="dataForm" :model="temp" class="formadd">
+          <el-row class="rowStyle">
+            <el-col :span="24" class="tleftb colStyle">
+              <span>金额单位: 元</span>
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>订单类型</span></el-form-item>
+              <span>分公司</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.departmentName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>申请人</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.staffName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>申请日期</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.createDate }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span>订单类型</span>
+            </el-col>
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.depositBillType }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>付款人</span></el-form-item>
+              <span>付款人</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.payName }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>联系电话</span></el-form-item>
+              <span>联系电话</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.mobile }}</span>
+                <span>{{ temp.phone }}</span>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>车辆台数</span></el-form-item>
+              <span>车辆台数</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.carNumber }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>订金金额</span></el-form-item>
+              <span>订金金额</span>
             </el-col>
-            <el-col :span="13" class="trightb">
+            <el-col :span="13">
               <el-form-item>
                 <span>{{ temp.deposit }}</span>
               </el-form-item>
@@ -66,43 +89,43 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>付款日期</span></el-form-item>
+              <span>付款日期</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.payDate }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>付款方式</span></el-form-item>
+              <span>付款方式</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.payType }}</span>
+                <span>{{ temp.payTypeValue }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>付款银行账号</span></el-form-item>
+              <span>付款银行账号</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
-                <el-input v-model="temp.payNumber" class="addinputw" placeholder="" clearable/>
+                <span>{{ temp.payNumber }}</span>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>收款银行账号</span></el-form-item>
+              <span>收款银行账号</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.collectionNumber }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>收款银行</span></el-form-item>
+              <span>收款银行</span>
             </el-col>
-            <el-col :span="13" class="trightb">
+            <el-col :span="13">
               <el-form-item>
                 <span>{{ temp.collectionBank }}</span>
               </el-form-item>
@@ -110,27 +133,27 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>备注</span></el-form-item>
+              <span>备注</span>
             </el-col>
-            <el-col :span="21" class="trightb">
+            <el-col :span="21">
               <el-form-item>
                 <span>{{ temp.remarks }}</span>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="4" class="tleftb">
-              <el-form-item><span slot="label">付款凭证</span></el-form-item>
+            <el-col :span="3" class="tleftb">
+              <span>付款凭证</span>
             </el-col>
-            <el-col :span="20" class="trightb">
+            <el-col :span="21">
               <el-form-item>
-                <img :src="imgUrl">
+                <img style="width: 178px;height: 178px" :src="imgUrl" @click="handleLook(imgUrl)">
               </el-form-item>
             </el-col>
           </el-row>
           <!--Start 客户信息-->
-          <div class="titcon">
-            <div class="title">客户信息</div>
+          <div class="title">
+            <div>客户信息</div>
           </div>
           <el-table v-loading="listLoading" :data="list" border style="width: 100%" :index="index">
             <el-table-column align="center" label="序号" type="index" width="60"/>
@@ -149,25 +172,29 @@
         </el-form>
       </div>
     </div>
+    <el-dialog :visible.sync="dialogVisible">
+      <img width="100%" :src="dialogImageUrl" alt="">
+    </el-dialog>
     <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
       <el-form label-position="right" class="formadd">
-        <el-row v-show="currentLink">
+        <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
           <el-col :span="4" class="tleftb">当前环节</el-col>
-          <el-col :span="20" class="trightb">
-            <el-form-item prop="purchasingUnitName"><span>{{ current.taskName }}->{{ nextNode.name }}</span>
+          <el-col :span="20">
+            <el-form-item><span>{{ current.taskName }}->{{ nextNode.name }}</span>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row style="border-bottom: 1px solid #e0e3eb;">
+        <el-row :class="{rowClass:!currentLink}">
           <el-col :span="4" class="tleftb">意见</el-col>
-          <el-col :span="20" class="trightb">
-            <el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw"
-                      clearable></el-input>
+          <el-col :span="20">
+            <el-form-item>
+              <el-input v-model="dialogList.comment" placeholder="审批意见" class="addinputw" clearable></el-input>
+            </el-form-item>
           </el-col>
         </el-row>
         <div style="text-align:center;margin-top: 20px;">
-          <el-button type="primary" size="mini" @click="confirm">确 定</el-button>
-          <el-button type="info " size="mini" @click="nodeDialogVisible = false">取 消</el-button>
+          <el-button type="primary" size="small" @click="confirm">确 定</el-button>
+          <el-button type="info " size="small" @click="nodeDialogVisible = false">取 消</el-button>
         </div>
       </el-form>
     </el-dialog>
@@ -175,20 +202,20 @@
 </template>
 
 <script>
-import {fetchSid} from '@/api/jichuxinxi/busdeposit'
+import { fetchSid } from '@/api/jichuxinxi/busdeposit'
 import req from '@/api/flow/jianyidingdan.js'
 
 export default {
-  name: "dingjinshouqu",
+  name: 'dingjinshouqu',
   data() {
     return {
       disabled: '',
       viewTitle: '',
+      dialogVisible: false,
+      dialogImageUrl: '',
       index: 0,
       imgUrl: '',
-      // --按钮菜单-------
-      YongHuid: [],
-      edit: true,
+      // --按钮菜单------
       visible: true,
       stateId: '0',
       FormLoading: false,
@@ -243,7 +270,7 @@ export default {
       params: {
         // 告诉父级页面，子页面的弹框高度。
         code: 2,
-        data: document.body.scrollHeight + 220 + 'px'
+        data: 500 + 'px'
       }
     }, '*')
   },
@@ -282,7 +309,7 @@ export default {
   methods: {
     showInfo(sid) {
       fetchSid(sid).then((response) => {
-        if (response.code === '200') {
+        if (response.success) {
           this.temp = response.data
           this.imgUrl = this.temp.payImages[this.temp.payImages.length - 1]
           this.list = response.data.customerList
@@ -291,7 +318,7 @@ export default {
             title: '提示',
             message: '查看失败',
             type: 'error',
-            duration: 2000,
+            duration: 2000
           })
         }
       })
@@ -318,7 +345,7 @@ export default {
       // const formVariables = {
       //   businessSid: this.agreeList.businessSid
       // }
-      req.getNextNodesForSubmit({taskDefKey: this.current.taskDefKey}).then((resp) => {
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey }).then((resp) => {
         if (resp.success) {
           var arr = resp.data
           this.nextNode = arr[0]
@@ -335,7 +362,7 @@ export default {
       // const formVariables = {
       //   businessSid: this.regectList.businessSid
       // }
-      req.getPreviousNodesForReject({taskDefKey: this.current.taskDefKey}).then((resp) => {
+      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey }).then((resp) => {
         if (resp.success) {
           var arr = resp.data
           this.nextNode = arr[0]
@@ -364,7 +391,7 @@ export default {
     /** 同意任务 */
     handleAgree() {
       this.agreeList.comment = this.dialogList.comment
-      if (this.agreeList.comment == '') {
+      if (this.agreeList.comment === '') {
         this.$message({
           showClose: true,
           message: '请填写同意意见！',
@@ -394,7 +421,7 @@ export default {
     /** 驳回任务 */
     handleReject() {
       this.regectList.comment = this.dialogList.comment
-      if (this.regectList.comment == '') {
+      if (this.regectList.comment === '') {
         this.$message({
           showClose: true,
           message: '请填写驳回意见！',
@@ -424,7 +451,7 @@ export default {
     /** 终止任务 */
     handleStop() {
       this.stopList.comment = this.dialogList.comment
-      if (this.stopList.comment == '') {
+      if (this.stopList.comment === '') {
         this.$message({
           showClose: true,
           message: '请填写终止意见！',
@@ -451,27 +478,27 @@ export default {
         }
       })
     },
+    handleLook(value) {
+      this.dialogVisible = true
+      this.dialogImageUrl = value
+    }
   }
 }
 </script>
 
 <style scoped>
-.tit {
-  margin: 0 0 20px 0;
-  padding: 10px 0 0 0;
+.titwu {
+  font-size: 28px;
+  text-align: center;
+  padding: 30px 0 20px 0;
 }
-
-.times {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-around;
-  padding: 30px 0 10px 0;
-  margin: 0 auto 0px auto;
-  width: 70%;
-  font-size: 14px;
+.rowStyle {
+  border-left: 0px !important;
 }
-
-/deep/ .el-form-item__content {
-  margin-left: 0 !important;
+.colStyle {
+  border-right: 0px !important;
+}
+.rowClass{
+  border-top: 1px solid #E0E3EB;
 }
 </style>
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 8f0f47b8db..425e9532ba 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
@@ -1,47 +1,68 @@
 <template>
   <div class="app-container">
-    <div v-show="visible">
+    <div v-show="viewState == 1">
       <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="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
-      <div class="listconadd">
-        <el-form ref="dataForm" :model="temp" label-position="right" label-width="100%" class="formadd" :rules="rules">
-          <div class="tit">
-            销售虚拟订单
-            <div class="times">
-              <div><span>分公司：</span><span>{{ temp.departmentName }}</span></div>
-              <div><span>申请人：</span><span>{{ temp.staffName }}</span></div>
-              <div><span>申请日期：</span><span>{{ temp.createDate }}</span></div>
-              <div><span>金额单位：</span><span>元</span></div>
-            </div>
-          </div>
-          <el-row class="bordertopline">
+      <div class="">
+        <div class="titwu">销售简易订单</div>
+        <el-form ref="dataForm" :model="temp" class="formadd" :rules="rules">
+          <el-row class="rowStyle">
+            <el-col :span="24" class="tleftb colStyle">
+              <span>金额单位: 元</span>
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>订单类型</span></el-form-item>
+              <span>分公司</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.departmentName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>申请人</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.staffName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>申请日期</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.createDate }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span>订单类型</span>
+            </el-col>
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.depositBillType }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span><span class="icon">*</span>付款人</span></el-form-item>
+              <span><span class="icon">*</span>付款人</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
-                <el-input v-model="temp.payName" class="addinputw" placeholder=""
-                          clearable/>
+                <el-input v-model="temp.payName" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span><span class="icon">*</span>联系电话</span></el-form-item>
+              <span><span class="icon">*</span>联系电话</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="mobile">
                 <el-input v-model="temp.mobile" class="addinputw" placeholder="" clearable/>
               </el-form-item>
@@ -49,18 +70,17 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>车辆台数</span></el-form-item>
+              <span>车辆台数</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
-                <el-input v-model="temp.carNumber" class="addinputw" placeholder=""
-                          clearable/>
+                <el-input v-model="temp.carNumber" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span><span class="icon">*</span>订金金额</span></el-form-item>
+              <span><span class="icon">*</span>订金金额</span>
             </el-col>
-            <el-col :span="13" class="trightb">
+            <el-col :span="13">
               <el-form-item>
                 <el-input v-model="temp.deposit" class="addinputw" placeholder="" clearable/>
               </el-form-item>
@@ -68,34 +88,27 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span><span class="icon">*</span>付款日期</span></el-form-item>
+              <span><span class="icon">*</span>付款日期</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <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-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">
-              <el-form-item><span><span class="icon">*</span>付款方式</span></el-form-item>
+              <span><span class="icon">*</span>付款方式</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
-                <el-select v-model="temp.payTypeKey" class="addinputw" placeholder="" @change="changePaymentType">
-                  <el-option v-for="(item, index) in paymentType_list" :key="index.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"/>
+                <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>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span><span class="icon">*</span>付款银行账号</span></el-form-item>
+              <span><span class="icon">*</span>付款银行账号</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <el-input v-model="temp.payNumber" class="addinputw" placeholder="" clearable/>
               </el-form-item>
@@ -103,32 +116,29 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span><span class="icon">*</span>收款银行账号</span></el-form-item>
+              <span><span class="icon">*</span>收款银行</span>
             </el-col>
-            <el-col :span="5" class="trightb">
-              <el-form-item>
-                <el-select v-model="temp.collectionNumberKey" class="addinputw" placeholder=""
-                           @change="changeProBankAccValue">
-                  <el-option v-for="(item, index) in ProBankAcc_list" :key="index.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
+            <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-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span><span class="icon">*</span>收款银行</span></el-form-item>
+              <span><span class="icon">*</span>收款银行账号</span>
             </el-col>
-            <el-col :span="13" class="trightb">
-              <el-select v-model="temp.collectionBankKey" class="addinputw" placeholder="" @change="changeproBank">
-                <el-option v-for="(item, index) in proBank_list" :key="index.dictKey" :label="item.dictValue"
-                           :value="item.dictKey"/>
-              </el-select>
+            <el-col :span="5">
+              <el-form-item>
+                <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>
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>备注</span></el-form-item>
+              <span>备注</span>
             </el-col>
-            <el-col :span="21" class="trightb">
+            <el-col :span="21">
               <el-form-item>
                 <el-input v-model="temp.remarks" class="addinputw" placeholder="" clearable/>
               </el-form-item>
@@ -136,21 +146,20 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span><span class="icon">*</span>付款凭证</span></el-form-item>
+              <span><span class="icon">*</span>付款凭证</span>
               <div class="tips"><span>（只可上传一张付款凭证）</span></div>
             </el-col>
-            <el-col :span="21" class="trightb">
+            <el-col :span="21">
               <el-form-item>
                 <Upload ref="uploadImg" v-model="list1" :limit="1" bucket="map" :upload-data="{type:'0001'}"/>
               </el-form-item>
             </el-col>
           </el-row>
           <!--Start 客户信息-->
-          <div class="titcon">
-            <div class="title">客户信息</div>
-            <div class="baocun">
-              <el-button type="primary" size="small" icon="el-icon-plus" class="btntopblueline"
-                         @click="handleyudingcheliang()">添加
+          <div class="title">
+            <div>客户信息</div>
+            <div>
+              <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="handleyudingcheliang()">选择
               </el-button>
             </div>
           </div>
@@ -180,432 +189,353 @@
       </div>
     </div>
     <!-- 客户信息 -->
-    <xuanzekehu v-show="kehudanganAddShow" ref="addAndUpdate" @dingjinfanhui="noClickclose"
-                @handleCustomer="selectCustomer"></xuanzekehu>
-
+    <xuanzekehu v-show="viewState == 2" ref="divSelect" @doback="resetState" @handleCustomer="backData"/>
   </div>
 </template>
 
 <script>
-import {mapGetters} from 'vuex'
-import {depositDetail, saveDing, submitApprove, typeValues} from '@/api/jichuxinxi/busdeposit'
-import {fetchBySid, getPathSidByUserSid} from '@/api/dictcommons/dictcommons'
-import req from '@/api/flow/jianyidingdan.js'
+import { depositDetail, saveDing, submitApprove, typeValues } from '@/api/jichuxinxi/busdeposit'
+import { fetchBySid, getPathSidByUserSid } from '@/api/dictcommons/dictcommons'
 import Upload from '@/components/uploadFile/upload.vue' // 上传文件
-import xuanzekehu from "@/views/xiaoshouguanli/xunidingdan/com/xuanzekehu"
+import xuanzekehu from './relation/xuanzekehu'
 
-  export default {
-    name: "dingjinshouquEdit",
-    components: {Upload, xuanzekehu},
-    data() {
-      var checkSubmit = (rule, value, callback) => {
-        const Submit =
-          /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
-        if (Submit.test(value)) {
-          return callback()
-        }
-        callback(new Error('请输入手机号'))
+export default {
+  name: 'dingjinshouquEdit',
+  components: { Upload, xuanzekehu },
+  data() {
+    var checkSubmit = (rule, value, callback) => {
+      const Submit =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
+      if (Submit.test(value)) {
+        return callback()
       }
-      return {
-        // ---见证材料
-        list1: [],
-        viewTitle: '',
-        dialogStatus: '',
-        index: 0,
-        disabled: false, // 提交按钮状态
-        // dialogStatus: 'add',
-        // --按钮菜单-------
-        edit: true,
-        visible: true,
-        stateId: '0',
-        FormLoading: false,
-        listLoading: false,
-        list: [],
-        paymentType_list: [],
-        customer_list: [],
-        proBank_list: [],
-        ProBankAcc_list: [],
-        temp: {
-          departmentName:'',
-          staffName:'',
-          createDate:'',
-          payName: '',
-          payImages: [],  // 付款凭证
-          collectionNumber: '', // 收款银行账号
-          collectionNumberKey: '', // 收款银行账号
-          payTypeKey: '', // 付款方式
-          payType: '', // 付款方式
-          payDate: '', // 付款日期
-          collectionBankKey: '', // 收款银行
-          collectionBank: '', // 收款银行
-          collectionBankSid: '', // 收款银行Sid
-          payNumber: '', // 付款账号
-          deposit: '', // 订金金额
-          carNumber: '', // 车辆台数
-          mobile: '', // 联系电话
-          remarks: '', // 备注
-          customerList: [],
-          userSid: window.sessionStorage.getItem('userSid'), // 用户Sid
-          virtualOrderSid: '', // 订单Sid
-          taskId: '', // 任务Id
-          procInsId: '', // 流程实例ID
-        }, // 添加和修改
-        nodeState: '', // 节点状态
-        sid_list: {},
-        xuniSid: '',
-        orgName: '',
+      callback(new Error('请输入手机号'))
+    }
+    return {
+      // ---见证材料
+      list1: [],
+      viewTitle: '',
+      index: 0,
+      disabled: false, // 提交按钮状态
+      // --按钮菜单-------
+      viewState: 1,
+      FormLoading: false,
+      listLoading: false,
+      list: [],
+      paymentType_list: [],
+      proBank_list: [],
+      ProBankAcc_list: [],
+      temp: {
+        departmentName: '',
         staffName: '',
-        _userSid: '',
-        customerName: [],
-        tificateT: [],
-        dnumbDate: [],
-        yudingcheliangShow: false,
-        hetongdanganguanliAddShow: false,
-        hetongdanganguanliInfoShow: false,
-        kehudanganAddShow: false,
-        rules: {
-          mobile: [
-            {
-              required: true,
-              validator: checkSubmit,
-              trigger: 'blur',
-            },
-          ],
-        },
-        // ------------------------------------
+        createDate: '',
+        payName: '',
+        payImages: [], // 付款凭证
+        collectionNumber: '', // 收款银行账号
+        collectionNumberKey: '', // 收款银行账号
+        payTypeKey: '', // 付款方式
+        payType: '', // 付款方式
+        payDate: '', // 付款日期
+        collectionBankKey: '', // 收款银行
+        collectionBank: '', // 收款银行
+        collectionBankSid: '', // 收款银行Sid
+        payNumber: '', // 付款账号
+        deposit: '', // 订金金额
+        carNumber: '', // 车辆台数
+        mobile: '', // 联系电话
+        remarks: '', // 备注
+        customerList: [],
+        userSid: window.sessionStorage.getItem('userSid'), // 用户Sid
+        virtualOrderSid: '', // 订单Sid
+        taskId: '', // 任务Id
+        procInsId: '' // 流程实例ID
+      },
+      customerName: [],
+      rules: {
+        mobile: [
+          {
+            required: true,
+            validator: checkSubmit,
+            trigger: 'blur'
+          }
+        ]
       }
+      // ------------------------------------
+    }
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  created() {
+    // ===获取参数
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    this.showEdit(obj.businessSid, obj.instanceId, obj.taskId)
+  },
+  methods: {
+    getType() {
+      // 付款方式
+      typeValues({
+        type: 'paymentType'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.paymentType_list = res.data
+          console.log('下拉框请求111', res.data)
+        }
+      })
+      // 收款银行
+      typeValues({
+        type: 'receiptBank'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.proBank_list = res.data
+          console.log('下拉框请求111', res.data)
+        }
+      })
     },
-    computed: {
-      ...mapGetters([
-        'id',
-        'roles',
-        'rolesIds',
-        'departmentId',
-        'departmentCode',
-      ]),
+    changePaymentType(value) {
+      console.log('触发下拉框按钮')
+      let bb = null
+      this.paymentType_list.forEach((e) => {
+        // eslint-disable-next-line eqeqeq
+        if (e.dictValue === value) {
+          bb = {
+            type: e.dictType,
+            name: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
+          }
+        }
+      })
+      this.temp.payType = bb.name
+      this.temp.payTypeKey = bb.key
+      console.log('name', this.temp.payType, 'key', this.temp.payTypeKey)
     },
-    mounted() {
-      window.parent.postMessage({
-        cmd: 'returnHeight',
-        params: {
-          // 告诉父级页面，子页面的弹框高度。
-          code: 2,
-          data: document.body.scrollHeight + 220 + 'px'
+    changeproBank(value) {
+      console.log('触发下拉框按钮')
+      let bb = null
+      this.proBank_list.forEach((e) => {
+        if (e.dictValue === value) {
+          bb = {
+            type: e.dictType,
+            name: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
+          }
         }
-      }, '*')
+      })
+      this.temp.collectionBank = bb.name
+      this.temp.collectionBankKey = bb.key
+      this.getProBankAcc(bb.sid)
     },
-    created() {
-      // ===获取参数
-      var one = window.location.href.indexOf('&data') + 6
-      const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
-      const obj = JSON.parse(decodeURIComponent(data))
-      this.showEdit(obj.businessSid,obj.instanceId,obj.taskId)
+    getProBankAcc(sid) {
+      typeValues({ psid: sid, type: 'receiptAccount' }).then((res) => {
+        if (res.code === '200') {
+          this.ProBankAcc_list = res.data
+          console.log('下拉框请求111', res.data)
+        }
+      })
     },
-    methods: {
-      getType() {
-        // 付款方式
-        typeValues({
-          type: 'paymentType'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.paymentType_list = res.data
-            console.log('下拉框请求111', res.data)
-          }
-        })
-        // 收款银行
-        typeValues({
-          type: 'receiptBank'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.proBank_list = res.data
-            console.log('下拉框请求111', res.data)
-          }
-        })
-      },
-      changePaymentType(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.paymentType_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.dictKey == value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
-          }
-        })
-        this.temp.payType = bb.name
-        this.temp.payTypeKey = bb.key
-        console.log('name', this.temp.payType, 'key', this.temp.payTypeKey)
-      },
-      changeproBank(value) {
-        console.log('触发下拉框按钮')
-        let bb = null
-        this.proBank_list.forEach((e) => {
-          if (e.dictKey == value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
+    changeProBankAccValue(value) {
+      console.log('触发下拉框按钮')
+      let bb = null
+      this.ProBankAcc_list.forEach((e) => {
+        if (e.dictValue === value) {
+          bb = {
+            type: e.dictType,
+            name: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
           }
-        })
-        this.temp.collectionBank = bb.name
-        this.temp.collectionBankKey = bb.key
-        this.getProBankAcc(bb.sid)
-      },
-      getProBankAcc(sid) {
-        typeValues({psid: sid, type: 'receiptAccount'}).then((res) => {
-          if (res.code === '200') {
-            this.ProBankAcc_list = res.data
-            console.log('下拉框请求111', res.data)
-          }
-        })
-      },
-      changeProBankAccValue(value) {
-        console.log('触发下拉框按钮')
-        let bb = null
-        this.ProBankAcc_list.forEach((e) => {
-          if (e.dictKey == value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
-          }
-        })
-        this.temp.collectionNumber = bb.name
-        this.temp.collectionNumberKey = bb.key
-        console.log('name', this.temp.collectionNumber, 'key', this.temp.collectionNumberKey)
-      },
-      getPathSid() {
-        const userSid = window.sessionStorage.getItem('userSid')
-        getPathSidByUserSid({userSid: userSid}).then((res) => {
-          if (res.success) {
-            this.getCreateOrgName(res.data)
-          }
-        })
-      },
-      getCreateOrgName(sid) {
-        fetchBySid(sid).then((res) => {
-          if (res.success) {
-            this.temp.departmentName = res.data.name
-          }
-        })
-      },
-      // 编辑初始化
-      showEdit(businessSid,instanceId,taskId) {
-        this.stateId = '1'
-        console.log('上传图片组件', this.$refs['uploadImg'].stateName)
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-        this.temp.sid = businessSid
-        this.dialogStatus = 'edit'
-        this.viewTitle = '【编辑】销售简易订单'
-        const data = {
-          virtualOrderSid:businessSid,
-          userSid:window.sessionStorage.getItem('userSid')
         }
-        depositDetail(data).then((response) => {
-          if (response.code) {
-            this.temp = response.data
-            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({
-                name: imgName[imgName.length - 1],
-                url: response.data.payImages[response.data.payImages.length - 1],
-              });
-              this.$refs['uploadImg'].showImg(this.list1)
-            }
-            this.temp.instanceId = instanceId
-            this.temp.taskId = taskId
-            this.temp.payImages = []
-            this.getType()
-            // this.getPathSid()
-          }
-        })
-      },
-      getUrl() {
-        console.log('已有图片', this.list1)
-        if (this.list1.length !== 0) {
-          if (this.list1.length > 1) {
-            this.list1.splice(0, 1);
-            const img_list = []
-            img_list.push(this.list1[this.list1.length - 1].url)
-            this.temp.payImages = img_list
-          } else {
-            const img_list = []
-            img_list.push(this.list1[this.list1.length - 1].url)
-            this.temp.payImages = img_list
-          }
+      })
+      this.temp.collectionNumber = bb.name
+      this.temp.collectionNumberKey = bb.key
+      console.log('name', this.temp.collectionNumber, 'key', this.temp.collectionNumberKey)
+    },
+    getPathSid() {
+      const userSid = window.sessionStorage.getItem('userSid')
+      getPathSidByUserSid({ userSid: userSid }).then((res) => {
+        if (res.success) {
+          this.getCreateOrgName(res.data)
         }
-      },
-      selectCustomer(row) {
-        this.list.push({
-          customerName: row.name,
-          mobile: row.mobile,
-          customerSid: row.sid,
-          // headImage
-        })
-      },
-      handleDelete(row, index) {
-        console.log('客户表中的row', row);
-        this.list.splice(index, 1)
-        // if (row.sid !== '') {
-        //   this.sid_list.customerSid = row.customerSid
-        //   this.sid_list.sid = this.temp.sid
-        //   console.log('删除客户信息', this.sid_list)
-        // } else {
-        //   this.list.splice(index, 1)
-        // }
-      },
-      // 添加数据
-      handleCreate() {
-        this.$refs['dataForm'].validate((valid) => {
-          this.getUrl()
-          this.temp.customerList = this.list
-          if (valid) {
-            this.FormLoading = true
-            this.dialogStatus = 'create'
-            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.xuniSid = response.data
-                this.handleReturn('true')
-              } else {
-                this.$notify({
-                  title: '提示',
-                  message: '添加失败',
-                  type: 'error',
-                  duration: 2000,
-                })
-              }
-            })
-          }
-        })
-      },
-      // 提交
-      handleSubmit() {
-        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.temp.staffSid = window.sessionStorage.getItem('staffSid')
-                this.temp.orgSid = window.sessionStorage.getItem('orgSid')
-                this.temp.userSid = window.sessionStorage.getItem('userSid')
-                // 提交流程
-                submitApprove(this.temp).then((response) => {
-                  if (response.code === '200') {
-                    this.handleReturn('true')
-                  } else {
-                    this.$notify({
-                      title: '提交失败',
-                      message: response.msg,
-                      type: 'error',
-                    })
-                  }
-                })
-              }
+      })
+    },
+    getCreateOrgName(sid) {
+      fetchBySid(sid).then((res) => {
+        if (res.success) {
+          this.temp.departmentName = res.data.name
+        }
+      })
+    },
+    // 编辑初始化
+    showEdit(businessSid, instanceId, taskId) {
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.viewTitle = '【编辑】销售简易订单'
+      const data = {
+        virtualOrderSid: businessSid,
+        userSid: window.sessionStorage.getItem('userSid')
+      }
+      depositDetail(data).then((response) => {
+        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({
+              name: imgName[imgName.length - 1],
+              url: response.data.payImages[response.data.payImages.length - 1]
             })
+            this.$refs['uploadImg'].showImg(this.list1)
           }
-        )
-      },
-      // 返回
-      handleReturn(isreload) {
-        if (isreload === 'true') this.$emit('reloadlist')
-        this.temp.sid = '' // SID
-        this.temp = {
-          departmentName:'',
-          staffName:'',
-          createDate:'',
-          payName: '',
-          payImages: [],  // 付款凭证
-          collectionNumber: '', // 收款银行账号
-          collectionNumberKey: '', // 收款银行账号
-          payTypeKey: '', // 付款方式
-          payType: '', // 付款方式
-          payDate: '', // 付款日期
-          collectionBankKey: '', // 收款银行
-          collectionBank: '', // 收款银行
-          collectionBankSid: '', // 收款银行Sid
-          payNumber: '', // 付款账号
-          deposit: '', // 订金金额
-          carNumber: '', // 车辆台数
-          mobile: '', // 联系电话
-          remarks: '', // 备注
-          customerList: [],
-          userSid: '', // 用户Sid
-          virtualOrderSid: '', // 订单Sid
-          taskId: '', // 任务Id
-          procInsId: '' // 流程实例ID
-        } // 添加和修改
-        this.disabled = false
-        this.$refs['uploadImg'].stateName = '' // 必写项
-        this.list1 = []
-        this.list = []
-        this.$refs['dataForm'].resetFields()
-        this.$emit('doback')
-      },
-      // --------------多页面跳转--------------
-      // 新增客户信息
-      handleyudingcheliang() {
-        this.visible = false
-        this.kehudanganAddShow = true
-      },
-      // 选择客户返回
-      noClickclose() {
-        this.visible = true
-        this.yudingcheliangShow = false
-        this.hetongdanganguanliAddShow = false
-        this.hetongdanganguanliInfoShow = false
-        this.kehudanganAddShow = false
+          this.temp.instanceId = instanceId
+          this.temp.taskId = taskId
+          this.temp.payImages = []
+          this.getType()
+        }
+      })
+    },
+    getUrl() {
+      console.log('已有图片', this.list1)
+      if (this.list1.length !== 0) {
+        if (this.list1.length > 1) {
+          this.list1.splice(0, 1)
+          const img_list = []
+          img_list.push(this.list1[this.list1.length - 1].url)
+          this.temp.payImages = img_list
+        } else {
+          const img_list = []
+          img_list.push(this.list1[this.list1.length - 1].url)
+          this.temp.payImages = img_list
+        }
       }
+    },
+    backData(row) {
+      this.viewState = 1
+      this.list.push({
+        customerName: row.name,
+        mobile: row.mobile,
+        customerSid: row.sid
+      })
+    },
+    handleDelete(row, index) {
+      console.log('客户表中的row', row)
+      this.list.splice(index, 1)
+    },
+    // 添加数据
+    handleCreate() {
+      this.$refs['dataForm'].validate((valid) => {
+        this.getUrl()
+        this.temp.customerList = this.list
+        if (valid) {
+          this.FormLoading = 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: '修改成功' })
+              // 子页面向父级页面传递值
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            }
+          })
+        }
+      })
+    },
+    // 提交
+    handleSubmit() {
+      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.temp.staffSid = window.sessionStorage.getItem('staffSid')
+              this.temp.orgSid = window.sessionStorage.getItem('orgSid')
+              this.temp.userSid = window.sessionStorage.getItem('userSid')
+              // 提交流程
+              submitApprove(this.temp).then((response) => {
+                if (response.success) {
+                  this.$message({ showClose: true, type: 'success', message: '提交成功' })
+                  // 子页面向父级页面传递值
+                  window.parent.postMessage({
+                    cmd: 'returnHeight',
+                    params: {
+                      // 操作成功，告诉父级页面关闭弹框
+                      code: 1
+                    }
+                  }, '*')
+                } else {
+                  this.$notify({
+                    title: '提交失败',
+                    message: response.msg,
+                    type: 'error'
+                  })
+                }
+              })
+            }
+          })
+        }
+      )
+    },
+    // --------------多页面跳转--------------
+    // 新增客户信息
+    handleyudingcheliang() {
+      this.viewState = 2
+      this.$refs['divSelect'].init()
+    },
+    // 选择客户返回
+    resetState() {
+      this.viewState = 1
     }
   }
+}
 </script>
 
 <style scoped>
-  .tit {
-    margin: 0 0 20px 0;
-    padding: 10px 0 0 0;
-  }
-
-  .times {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-around;
-    padding: 30px 0 10px 0;
-    margin: 0 auto 0px auto;
-    width: 70%;
-    font-size: 14px;
-  }
-
-  /deep/ .el-form-item__content {
-    margin-left: 0 !important;
-  }
-
-  .tips {
-    font-size: 12px;
-    color: #606266;
-    text-align: right;
-  }
-
-  .formadd .el-row .el-col /deep/ .el-form-item .addinputw {
-    width: 100%;
-  }
+.titwu {
+  font-size: 28px;
+  text-align: center;
+  padding: 30px 0 20px 0;
+}
+.title {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+.rowStyle {
+  border-left: 0px !important;
+}
+.colStyle {
+  border-right: 0px !important;
+}
+.tips {
+  font-size: 12px;
+  color: #606266;
+  text-align: right;
+}
 </style>
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 3e5a338e6c..bef173c8be 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
@@ -2,61 +2,84 @@
   <div class="app-container">
     <div>
       <div class="tab-header webtop">
-        <div>销售虚拟订单管理详细信息</div>
+        <div>销售简易订单详情</div>
         <div>
-          <el-button type="danger" @click="openRevoke">撤 回</el-button>
+          <el-button type="danger" size="small" @click="openRevoke">撤 回</el-button>
         </div>
       </div>
-      <div class="listconadd">
-        <el-form ref="dataForm" :model="temp" label-position="right" label-width="100%" class="formadd">
-          <div class="tit">
-            销售简易订单
-            <div class="times">
-              <div><span>分公司：</span><span>{{ temp.departmentName }}</span></div>
-              <div><span>申请人：</span><span>{{ temp.staffName }}</span></div>
-              <div><span>申请日期：</span><span>{{ temp.createDate }}</span></div>
-              <div><span>金额单位：</span><span>{{ temp.price }}元</span></div>
-            </div>
-          </div>
-          <el-row class="bordertopline">
+      <div class="">
+        <div class="titwu">销售简易订单</div>
+        <el-form ref="dataForm" :model="temp" class="formadd">
+          <el-row class="rowStyle">
+            <el-col :span="24" class="tleftb colStyle">
+              <span>金额单位: 元</span>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span>分公司</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.departmentName }}</span>
+              </el-form-item>
+            </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>订单类型</span></el-form-item>
+              <span>申请人</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.staffName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>申请日期</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.createDate }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span>订单类型</span>
+            </el-col>
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.depositBillType }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>付款人</span></el-form-item>
+              <span>付款人</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.payName }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>联系电话</span></el-form-item>
+              <span>联系电话</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.mobile }}</span>
+                <span>{{ temp.phone }}</span>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>车辆台数</span></el-form-item>
+              <span>车辆台数</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.carNumber }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>订金金额</span></el-form-item>
+              <span>订金金额</span>
             </el-col>
-            <el-col :span="13" class="trightb">
+            <el-col :span="13">
               <el-form-item>
                 <span>{{ temp.deposit }}</span>
               </el-form-item>
@@ -64,43 +87,43 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>付款日期</span></el-form-item>
+              <span>付款日期</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.payDate }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>付款方式</span></el-form-item>
+              <span>付款方式</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.payType }}</span>
+                <span>{{ temp.payTypeValue }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>付款银行账号</span></el-form-item>
+              <span>付款银行账号</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
-                <el-input v-model="temp.payNumber" class="addinputw" placeholder="" clearable/>
+                <span>{{ temp.payNumber }}</span>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>收款银行账号</span></el-form-item>
+              <span>收款银行账号</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.collectionNumber }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>收款银行</span></el-form-item>
+              <span>收款银行</span>
             </el-col>
-            <el-col :span="13" class="trightb">
+            <el-col :span="13">
               <el-form-item>
                 <span>{{ temp.collectionBank }}</span>
               </el-form-item>
@@ -108,27 +131,27 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>备注</span></el-form-item>
+              <span>备注</span>
             </el-col>
-            <el-col :span="21" class="trightb">
+            <el-col :span="21">
               <el-form-item>
                 <span>{{ temp.remarks }}</span>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="4" class="tleftb">
-              <el-form-item><span slot="label">付款凭证</span></el-form-item>
+            <el-col :span="3" class="tleftb">
+              <span>付款凭证</span>
             </el-col>
-            <el-col :span="20" class="trightb">
+            <el-col :span="21">
               <el-form-item>
-                <img :src="imgUrl">
+                <img style="width: 178px;height: 178px" :src="imgUrl" @click="handleLook(imgUrl)">
               </el-form-item>
             </el-col>
           </el-row>
           <!--Start 客户信息-->
-          <div class="titcon">
-            <div class="title">客户信息</div>
+          <div class="title">
+            <div>客户信息</div>
           </div>
           <el-table v-loading="listLoading" :data="list" border style="width: 100%" :index="index">
             <el-table-column align="center" label="序号" type="index" width="60"/>
@@ -147,143 +170,138 @@
         </el-form>
       </div>
     </div>
+    <el-dialog :visible.sync="dialogVisible">
+      <img width="100%" :src="dialogImageUrl" alt="">
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import {fetchSid} from '@/api/jichuxinxi/busdeposit'
+import { fetchSid } from '@/api/jichuxinxi/busdeposit'
 import req from '@/api/flow/jianyidingdan.js'
 
-  export default {
-    name: "dingjinshouquInfo",
-    data() {
-      return {
-        disabled: '',
-        viewTitle: '',
-        index: 0,
-        imgUrl: '',
-        // --按钮菜单-------
-        YongHuid: [],
-        edit: true,
-        visible: true,
-        stateId: '0',
-        FormLoading: false,
-        listLoading: false,
-        list: [],
-        temp: {},
-        // ------流程所需------------------------------
-        // 撤回
-        revokeList: {
-          businessSid: '',
-          instanceId: '',
-          taskId: '',
-          userSid: ''
-        },
+export default {
+  name: 'dingjinshouquInfo',
+  data() {
+    return {
+      dialogVisible: false,
+      dialogImageUrl: '',
+      disabled: '',
+      viewTitle: '',
+      index: 0,
+      imgUrl: '',
+      // --按钮菜单-------
+      visible: true,
+      stateId: '0',
+      FormLoading: false,
+      listLoading: false,
+      list: [],
+      temp: {},
+      // ------流程所需------------------------------
+      // 撤回
+      revokeList: {
+        businessSid: '',
+        instanceId: '',
+        taskId: '',
+        userSid: ''
       }
-    },
-    mounted() {
-      window.parent.postMessage({
-        cmd: 'returnHeight',
-        params: {
-          // 告诉父级页面，子页面的弹框高度。
-          code: 2,
-          data: document.body.scrollHeight + 220 + 'px'
+    }
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  created() {
+    // ===获取参数
+    var one = window.location.href.indexOf('&data') + 6
+    // url解码unescape()已从web中移除,尽量不使用
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('obj', obj)
+    this.showInfo(obj.businessSid)
+    // 撤回列表
+    this.revokeList.businessSid = obj.businessSid
+    this.revokeList.instanceId = obj.instanceId
+    this.revokeList.taskId = obj.taskId
+    this.revokeList.taskDefKey = obj.taskDefKey
+    this.revokeList.userSid = window.sessionStorage.getItem('userSid')
+  },
+  methods: {
+    showInfo(sid) {
+      fetchSid(sid).then((response) => {
+        if (response.success) {
+          this.temp = response.data
+          this.imgUrl = this.temp.payImages[this.temp.payImages.length - 1]
+          this.list = response.data.customerList
+        } else {
+          this.$notify({
+            title: '提示',
+            message: '查看失败',
+            type: 'error',
+            duration: 2000
+          })
         }
-      }, '*')
+      })
     },
-    created() {
-      // ===获取参数
-      var one = window.location.href.indexOf('&data') + 6
-      // url解码unescape()已从web中移除,尽量不使用
-      const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
-      const obj = JSON.parse(decodeURIComponent(data))
-      console.log('obj',obj)
-      this.showInfo(obj.businessSid)
-      // 撤回列表
-      this.revokeList.businessSid = obj.businessSid
-      this.revokeList.instanceId = obj.instanceId
-      this.revokeList.taskId = obj.taskId
-      this.revokeList.taskDefKey = obj.taskDefKey
-      this.revokeList.userSid = window.sessionStorage.getItem('userSid')
-      // 办理状态
-      this.transactState = obj.transactState
-      // 加载流程图相关的数据
-      // this.getModelDetail(obj.deployId)
-      // this.getFlowViewer(obj.instanceId)
-    },
-    methods: {
-      showInfo(sid) {
-        fetchSid(sid).then((response) => {
-          if (response.code === '200') {
-            this.temp = response.data
-            this.imgUrl = this.temp.payImages[this.temp.payImages.length - 1]
-            this.list = response.data.customerList
-          } else {
-            this.$notify({
-              title: '提示',
-              message: '查看失败',
-              type: 'error',
-              duration: 2000,
-            })
-          }
+    openRevoke() {
+      this.$confirm('是否确认执行撤回操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleRevoke()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消撤回'
         })
-      },
-      openRevoke() {
-        this.$confirm('是否确认执行撤回操作', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.handleRevoke()
-        }).catch(() => {
+      })
+    },
+    /** 撤回任务 */
+    handleRevoke() {
+      // this.revokeList.comment = this.dialogList.comment
+      req.revokeTask(this.revokeList).then((response) => {
+        if (response.success) {
           this.$message({
-            type: 'info',
-            message: '已取消撤回'
+            showClose: true,
+            message: '执行成功',
+            type: 'success'
           })
-        })
-      },
-      /** 撤回任务 */
-      handleRevoke() {
-        // this.revokeList.comment = this.dialogList.comment
-        req.revokeTask(this.revokeList).then((response) => {
-          if (response.success) {
-            this.$message({
-              showClose: true,
-              message: '执行成功',
-              type: 'success'
-            });
-            // 子页面向父级页面传递值
-            window.parent.postMessage({
-              cmd: 'returnHeight',
-              params: {
-                // 操作成功，告诉父级页面关闭弹框
-                code: 1
-              }
-            }, '*')
-          }
-        })
-      },
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    handleLook(value) {
+      this.dialogVisible = true
+      this.dialogImageUrl = value
     }
   }
+}
 </script>
 
 <style scoped>
-  .tit {
-    margin: 0 0 20px 0;
-    padding: 10px 0 0 0;
-  }
-
-  .times {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-around;
-    padding: 30px 0 10px 0;
-    margin: 0 auto 0px auto;
-    width: 70%;
-    font-size: 14px;
-  }
-
-  /deep/ .el-form-item__content {
-    margin-left: 0 !important;
-  }
+.titwu {
+  font-size: 28px;
+  text-align: center;
+  padding: 30px 0 20px 0;
+}
+.rowStyle {
+  border-left: 0px !important;
+}
+.colStyle {
+  border-right: 0px !important;
+}
 </style>
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
new file mode 100644
index 0000000000..5d8f889ccb
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzecheliang.vue
@@ -0,0 +1,299 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>现车库存</div>
+        <div>
+          <el-button type="primary" size="small" @click="handleConfirm()">确定</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="">
+        <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="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>
+              </el-form-item>
+              <el-form-item label="功能">
+                <el-input v-model="listQuery.params.vehicleType" 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>
+              <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>
+              <el-form-item label="版本">
+                <el-input v-model="listQuery.params.vehicleVersion" placeholder="请输入" clearable class="filter-item"/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <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>
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
+            <el-table-column width="50px" type="selection" align="center"/>
+            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="品牌" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.brandName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="车型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleAlias }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="颜色" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.carColor }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="存放地点" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.location }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="销售指导价(万元)" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.guidedPrice }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <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"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import { getList } from '@/api/jichuxinxi/busdepositvehicle'
+
+export default {
+  name: "xuanzecheliang",
+  components: {
+    Pagination,
+    pageye
+  },
+  data() {
+    return {
+      createPage: '',
+      dialogVisible: false, // 弹窗
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      btndisabled: false,
+      viewState: 1, // 1、列表 2、添加-车辆预定 3、编辑  4、查看 5、订金-定金收取
+      // 查询 -----------
+      carbrand_list: [], // 品牌
+      tableKey: 0,
+      list: [],
+      sids: [],
+      total: 1,
+      FormLoading: false,
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 5,
+        params: {
+          carbrand: '',
+          driveForm: '',
+          emissionStandard: '',
+          fuelType: '',
+          gearboxType: '',
+          lockedState: '',
+          power: '',
+          productLine: '',
+          vehicleState: '',
+          vehicleType: '',
+          vehicleVersion: ''
+        }
+      },
+      selectDate: undefined,
+      temp: {}, // 添加和编辑
+      depositVehicleList: [],
+      visible: true,
+      hetongdanganguanliInfoShow: false
+      // ------------------------------------
+    }
+  },
+  methods: {
+    // 初始化
+    init() {
+      this.handleFilter()
+      this.getcarbrand()
+    },
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    // 重置
+    handleReset() {
+      this.listQuery = {
+        current: 1,
+        size: 5,
+        params: {
+          carbrand: '',
+          driveForm: '',
+          emissionStandard: '',
+          fuelType: '',
+          gearboxType: '',
+          lockedState: '',
+          power: '',
+          productLine: '',
+          vehicleState: '',
+          vehicleType: '',
+          vehicleVersion: ''
+        }
+      }
+    },
+    // 勾选
+    handleSelectionChange(row) {
+      console.log('row', row)
+      this.depositVehicleList = row
+      const aa = []
+      row.forEach((element) => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+      console.log('选择sid', this.sids)
+    },
+    // 品牌下拉
+    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
+          }
+        }
+      })
+      this.listQuery.params.carbrand = bb.name
+      console.log('name', this.listQuery.params.carbrand)
+    },
+    // 确认
+    handleConfirm() {
+      if (this.sids.length > 0) {
+        this.$emit('handleVehicle', this.depositVehicleList)
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '没有选择车辆!',
+          type: 'error',
+          duration: 2000
+        })
+        return
+      }
+    },
+    // 返回
+    handleReturn() {
+      this.$emit('yudingcheliangfanhui') // 到父页面
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    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.listLoading = false
+        if (
+          response.code === '200' &&
+          response.data &&
+          response.data.total > 0
+        ) {
+          this.list = response.data.records
+          this.total = response.data.total
+        } else {
+          this.list = []
+          this.total = 0
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+.el-input__icon {
+  width: 40px;
+}
+
+.el-form-item .el-form-item__label {
+  width: 100% !important;
+}
+
+.block {
+  display: inline-block;
+}
+
+.el-form-item__content label {
+  padding: 0 5px;
+}
+</style>
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
new file mode 100644
index 0000000000..cf0e0fa8ed
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzekehu.vue
@@ -0,0 +1,269 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>选择客户</div>
+        <div>
+          <el-button type="primary" size="small" @click="handleCreate()">新增客户</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="">
+        <div class="searchcon">
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="客户姓名">
+                <el-input v-model="listQuery.params.name" placeholder="请输入" clearable class="filter-item"/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+            </div>
+          </div>
+        </div>
+<!--        <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column fixed label="操作" align="center">
+              <template slot-scope="scope">
+                <div class="searchbtns">
+                  <el-button size="small" type="primary" @click="handleConfirm(scope.row)">选择</el-button>
+                  <el-button size="small" type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="登记日期" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.createTime }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="客户名称" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="手机号码" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.mobile }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="微信号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.weixin }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="客户类型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.customerType }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="客户级别" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.level }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+    <xuanzekehu-add v-show="viewState == 2 || viewState == 3" ref="addAndUpdate" @reloadlist="resetState" @doback="resetState"/>
+    <el-dialog title="客户登记-类型" :visible.sync="dialogVisible" width="28%" top="13%">
+      <el-form :model="customerTypeList">
+        <el-form-item label="联络方式" :label-width="formLabelWidth" class="diaForm">
+          <el-select v-model="customerTypeList.visitWay" placeholder="请选择" @change="getVisitWay">
+            <el-option v-for="(item) in visitWay_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="客户类型" :label-width="formLabelWidth" class="diaForm">
+          <el-select v-model="customerTypeList.customerType" placeholder="请选择" @change="getCustomerType">
+            <el-option v-for="(item) in customertype_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button class="el-button-sure" type="primary" @click="handleOpen()">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import { pagerList, typeValues } from '@/api/jichuxinxi/busdepositvehicle'
+import xuanzekehuAdd from './xuanzekehuAdd.vue'
+
+export default {
+  name: 'xuanzekehu',
+  components: {
+    Pagination,
+    pageye,
+    xuanzekehuAdd
+  },
+  data() {
+    return {
+      dialogVisible: false, // 弹窗
+      formLabelWidth: '110px',
+      isSearchShow: true,
+      viewState: 1, // 1、列表 2、添加-车辆预定 3、编辑  4、查看 5、订金-定金收取
+      // 查询 -----------
+      tableKey: 0,
+      list: [],
+      sids: [],
+      customerTypeList: {
+        visitWay: '', // 联络方式
+        visitWayKey: '', // 联络方式--Key
+        customerType: '', // 客户类型
+        customerTypeKey: '', // 客户类型--Key
+        psid: ''
+      },
+      visitWay_list: [],
+      customertype_list: [],
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          name: '',
+          userSid: ''
+        }
+      }
+    }
+  },
+  methods: {
+    init() {
+      this.getList()
+      this.getShuJUZiDian()
+    },
+    getShuJUZiDian() {
+      typeValues({ type: 'visitWay' }).then((res) => {
+        if (res.code === '200') {
+          this.visitWay_list = res.data
+        }
+      })
+      typeValues({ type: 'customertype' }).then((res) => {
+        if (res.code === '200') {
+          this.customertype_list = res.data
+        }
+      })
+    },
+    handleOpen() {
+      this.viewState = 2
+      if (this.customerTypeList.visitWay !== '' && this.customerTypeList.customerType !== '') {
+        this.dialogVisible = false
+        const customerTypeList = this.customerTypeList
+        this.$refs['addAndUpdate'].openCreate(customerTypeList)
+        this.customerTypeList = {
+          visitWay: '', // 联络方式
+          visitWayKey: '', // 联络方式--Key
+          customerType: '', // 客户类型
+          customerTypeKey: '', // 客户类型--Key
+          psid: ''
+        }
+      } else {
+        this.$message({
+          message: '请填写联络方式和客户类型',
+          type: 'warning'
+        })
+      }
+    },
+    getVisitWay(value) {
+      let bb = null
+      this.visitWay_list.forEach((e) => {
+        if (e.dictValue === value) {
+          bb = {
+            value: e.dictValue,
+            key: e.dictKey
+          }
+        }
+      })
+      this.customerTypeList.visitWay = bb.value
+      this.customerTypeList.visitWayKey = bb.key
+    },
+    getCustomerType(value) {
+      let bb = null
+      this.customertype_list.forEach((e) => {
+        if (e.dictValue === value) {
+          bb= {
+            value: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
+          }
+        }
+      })
+      this.customerTypeList.customerType = bb.value
+      this.customerTypeList.customerTypeKey = bb.key
+      this.customerTypeList.psid = bb.sid
+    },
+    // ----------功能打开开始--------
+    handleCreate() {
+      this.dialogVisible = true
+    },
+    resetState() {
+      this.viewState = 1
+      this.getList()
+    },
+    // 返回
+    handleReturn() {
+      this.$emit('doback')
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      pagerList(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.code === '200' && response.data && response.data.total > 0) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 勾选
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach((element) => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+      console.log('选择sid', this.sids)
+    },
+    // 确认选择客户
+    handleConfirm(row) {
+      this.$emit('handleCustomer', row)
+    },
+    handleUpdate(row) {
+      this.viewState = 3
+      this.$refs['addAndUpdate'].openUpdate(row.sid)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.searchcon {
+  margin-top: 8px;
+}
+</style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzekehuAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzekehuAdd.vue
new file mode 100644
index 0000000000..0d107ff629
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzekehuAdd.vue
@@ -0,0 +1,948 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>【新增】客户信息</div>
+        <div>
+          <el-button type="primary" size="small" icon="" @click="handleJUBuCun()">保存</el-button>
+          <el-button type="info" size="small" icon="el-icon-close" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="">
+        <div class="titwu">客户信息</div>
+        <el-form ref="dataForm" :model="temp" label-position="top" class="formadd" :rules="rules">
+          <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
+            <div>基础信息</div>
+          </div>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item>
+                <span slot="label">客户名称</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="name">
+                <el-input v-model="temp.name" maxlength="20" placeholder="请输入客户名称" style="width:50%" class="addinputw" clearable/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item>
+                <span slot="label">客户类型</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="weChatID">
+                <span>{{ temp.customerType }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item>
+                <span slot="label">联系电话</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="mobile">
+                <el-input v-model="temp.mobile" maxlength="20" placeholder="请输入联系电话" style="width:50%" class="addinputw" clearable/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item>
+                <span slot="label">微信号</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="weixin">
+                <el-input v-model="temp.weixin" maxlength="20" placeholder="请输入微信号" style="width:50%" class="addinputw" clearable/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-show="temp.customerType==='个人'">
+            <el-col :span="4" class="trightb">
+              <el-form-item>
+                <span slot="label">公司名称</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item prop="company">
+                <el-input v-model="temp.companyName" maxlength="20" placeholder="请输入公司名称" style="width:81%" class="addinputw" clearable/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item>
+                <span slot="label">客户地址</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item>
+                <el-select v-model="temp.province" filterable placeholder="请选择省" class="addinputw" style="width:160px" @change="getShen">
+                  <el-option v-for="item in inputProvinceList" :key="item.sid" :label="item.name" :value="item.sid"/>
+                </el-select>
+                <el-select v-model="temp.city" filterable placeholder="请选择市" class="addinputw" style="width:160px" @change="getShi">
+                  <el-option v-for="item in inputCityList" :key="item.sid" :label="item.name" :value="item.sid"/>
+                </el-select>
+                <el-select v-model="temp.county" filterable placeholder="请选择县" class="addinputw" style="width:160px" @change="getQu">
+                  <el-option v-for="item in inputCountyList" :key="item.sid" :label="item.name" :value="item.sid"/>
+                </el-select>
+                <el-input v-model="temp.address" style="width:46%" clearable/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item>
+                <span slot="label">客户级别</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="level">
+                <el-select v-model="temp.level" class="addinputw" placeholder="请选择客户级别" style="width:50%" @change="getJiBie">
+                  <el-option v-for="(item, index) in induslevel" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" v-show="stateId=='0'" class="trightb">
+              <el-form-item>
+                <span slot="label">是否开启提醒</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" v-show="stateId=='0'">
+              <el-form-item>
+                <el-radio v-model="temp.isOnRemind" label="是">是</el-radio>
+                <el-radio v-model="temp.isOnRemind" label="否">否</el-radio>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-show="temp.isOnRemind=='是'">
+            <el-col :span="4" class="trightb">
+              <el-form-item>
+                <span slot="label">提醒日期</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <el-date-picker v-model="temp.remind_day" type="date" style="width:50%" value-format="yyyy-MM-dd" placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item>
+                <span slot="label">提醒备注</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <el-input v-model="temp.remind_remark" maxlength="20" style="width:50%" placeholder="请输入提醒备注" class="addinputw" clearable/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <!--更多信息-->
+          <el-collapse v-model="activeNames">
+            <el-collapse-item title="更多信息" name="2">
+              <el-row v-show="temp.customerType==='个人'">
+                <el-col :span="4" class="trightb">
+                  <el-form-item>
+                    <span slot="label">客户生日</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item>
+                    <el-date-picker v-model="temp.birthday" style="width:50%" type="date" format="yyyy-MM-dd" class="addinputw" value-format="yyyy-MM-dd" placeholder="请选择"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4" class="trightb">
+                  <el-form-item>
+                    <span slot="label">性别</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item>
+                    <el-radio v-model="temp.sex" label="男">男</el-radio>
+                    <el-radio v-model="temp.sex" label="女">女</el-radio>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="4" class="trightb">
+                  <el-form-item>
+                    <span slot="label">证件类型</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item>
+                    <el-input v-model="temp.certificateType" style="width:50%" maxlength="20" :readonly="true" class="addinputw" clearable/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4" class="trightb">
+                  <el-form-item>
+                    <span slot="label">证件号码</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item>
+                    <el-input v-model="temp.idnumber" style="width:50%" maxlength="20" placeholder="请输入证件号码" class="addinputw" clearable/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="4" class="trightb">
+                  <el-form-item>
+                    <span slot="label">证件有效期</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item>
+                    <el-date-picker v-model="temp.endDate" style="width:50%" type="date" format="yyyy-MM-dd" class="addinputw" value-format="yyyy-MM-dd" placeholder="请选择"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4" class="trightb">
+                  <el-form-item>
+                    <span slot="label">电子邮件</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item>
+                    <el-input v-model="temp.e_mail" maxlength="20" style="width:50%" placeholder="请输入电子邮箱" class="addinputw" clearable/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="4" class="trightb">
+                  <el-form-item>
+                    <span slot="label">紧急联系人</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item>
+                    <el-input v-model="temp.contacts" maxlength="20" style="width:50%" placeholder="请输入紧急联系人" class="addinputw" clearable/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4" class="trightb">
+                  <el-form-item>
+                    <span slot="label">紧急联系电话</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item>
+                    <el-input v-model="temp.emergencyMobile" maxlength="20" style="width:50%" placeholder="请输入紧急联系电话" class="addinputw" clearable/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="4" class="trightb">
+                  <el-form-item>
+                    <span slot="label">客户来源</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item>
+                    <el-select v-model="temp.source" class="addinputw" style="width:50%" placeholder="请选择客户来源" @change="getKeHuLaiYUan">
+                      <el-option v-for="(item, index) in sourceLisst" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4" class="trightb">
+                  <el-form-item>
+                    <span slot="label">客户分类</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item>
+                    <el-select v-model="temp.customerClass" style="width:50%" class="addinputw" placeholder="请选择客户分类" @change="getFenLei">
+                      <el-option v-for="(item, index) in merClass" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="4" class="trightb">
+                  <el-form-item>
+                    <span slot="label">备注</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="20">
+                  <el-form-item>
+                    <el-input v-model="temp.remarks" style="width:81%" maxlength="20" placeholder="请输入备注" class="addinputw" clearable/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <!--              </el-form>-->
+            </el-collapse-item>
+          </el-collapse>
+          <!--运营情况-->
+          <el-collapse v-model="activeNames">
+            <el-collapse-item title="运营情况" name="3">
+              <el-form ref="datufrom" :model="templooke" label-position="top" label-width="190px" class="formadd03">
+                <el-row>
+                  <el-col :span="4" class="trightb">
+                    <el-form-item>
+                      <span slot="label">承运货物类型</span>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item>
+                      <el-select v-model="templooke.consignmentType" style="width:50%" class="addinputw" placeholder="请选择承运货物类型" @change="getHuoWuLeiXing">
+                        <el-option v-for="(item, index) in signmentT" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="4" class="trightb">
+                    <el-form-item>
+                      <span slot="label">承运货物</span>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item>
+                      <el-select v-model="templooke.consignment" style="width:50%" class="addinputw" placeholder="请选择承运货物" @change="getHuoWu">
+                        <el-option v-for="(item, index) in consign" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="4" class="trightb">
+                    <el-form-item>
+                      <span slot="label">运输路线</span>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item>
+                      <el-input v-model="templooke.hallway_state" style="width:50%" maxlength="20" placeholder="请输入运输路线" class="addinputw" clearable/>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="4" class="trightb">
+                    <el-form-item>
+                      <span slot="label">购车状态</span>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item>
+                      <div class="yihang">
+                        <el-checkbox-group v-if="aseType.length > 0" v-model="aseTypeBox" @change="changexuanze">
+                          <el-checkbox v-for="item in aseType" :key="item.divtkey" :label="item.divtkey">
+                            {{ item.dictValue }}
+                          </el-checkbox>
+                        </el-checkbox-group>
+                        <div class="mw">第<el-input v-model="templooke.purchase_num" :disabled="templooke.purchase_num == '0'" maxlength="10" class="addinputwduan" clearable/>辆</div>
+                      </div>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="4" class="trightb">
+                    <el-form-item>
+                      <span slot="label">现有车辆</span>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item>
+                      <el-input style="width:50%" v-model="templooke.existing_vehicles" maxlength="20" placeholder="请输入现有车辆" class="addinputw" clearable/>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="4" class="trightb">
+                    <el-form-item>
+                      <span slot="label">现有车辆品牌</span>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item>
+                      <el-input style="width:50%" v-model="templooke.existing_vehiclesBrand" maxlength="20" placeholder="请输入现有车辆品牌" class="addinputw" clearable/>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="4" class="trightb">
+                    <el-form-item>
+                      <span slot="label">备注</span>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="20">
+                    <el-form-item>
+                      <el-input style="width:81%" v-model="templooke.remarks" maxlength="20" placeholder="请输入备注" class="addinputw" clearable/>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+            </el-collapse-item>
+          </el-collapse>
+          <!--见证材料-->
+          <el-collapse v-model="activeNames" v-show="stateId=='0'">
+            <el-collapse-item title="见证材料" name="4">
+              <el-form ref="datufrom" :model="templooke" label-position="right" label-width="190px" class="formadd03">
+                <el-row>
+                  <el-col :span="24">
+                    <span slot="label">文件</span>
+                    <Upload ref="uploadImg" v-model="list1" :limit="1" bucket="map" :upload-data="{type:'0001'}"/>
+                  </el-col>
+                </el-row>
+              </el-form>
+            </el-collapse-item>
+          </el-collapse>
+        </el-form>
+      </div>
+    </div>
+    <!-- 弹框提示 -->
+    <el-dialog :visible.sync="dialogFormVisible" width="300px" :close-on-click-modal="false">
+      <div class="result-cont">
+        是否更新用户
+      </div>
+      <div slot="footer" v-loading="FormLoading" class="dialog-footer">
+        <el-button @click="dialogFormVisibl()">否</el-button>
+        <el-button type="primary" @click="dialogStatus()">是</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { savePcCustomerInfo, getPcCustomerInfoBySid, updatePcCustomerInfo } from '@/api/jichuxinxi/crmcustomer'
+import { getProvince, getCity, getCounty } from '@/api/portal/areaPicker' // 省市区
+import { typeValues } from '@/api/dictcommons/shujuzidian'
+import { getPcBusinessInfoBySid } from '@/api/jichuxinxi/crmbusiness'
+import Upload from '@/components/uploadFile/upload.vue' //   上传文件
+
+export default {
+  name: 'xuanzekehuAdd',
+  components: { Upload },
+  data() {
+    var checkSubmit = (rule, value, callback) => {
+      const Submit =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
+      if (Submit.test(value)) {
+        return callback()
+      }
+      callback(new Error('请输入手机号'))
+    }
+    var identitycard = (rules, value, callback) => {
+      const card =
+        /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+      if (card.test(value)) {
+        return callback()
+      }
+      callback(new Error('请输入身份证号码'))
+    }
+    return {
+      // ---见证材料
+      list1: [],
+      province: [],
+      city: [],
+      county: [],
+      inputProvinceList: [],
+      inputCityList: [],
+      inputCountyList: [],
+      list: [],
+      activeNames: ['1'],
+      // --按钮菜单-------
+      customerClass: 'customerClass',
+      merClass: [],
+      customerSource: 'customerSource',
+      sourceLisst: [],
+      customerLevel: 'customerLevel',
+      induslevel: [],
+      visitWay: 'visitWay',
+      industway: [],
+      documenttype: 'documenttype',
+      cateType: [],
+      consignmentType: 'consignmentType',
+      signmentT: [],
+      consignment: 'consignment',
+      consign: [],
+      industrytype: 'industrytype',
+      industry_type: [],
+      customerType_list: [],
+      sex_list: [],
+      aseTypeBox: [],
+      aseType: [
+        {
+          dictValue: '首次购车',
+          divtkey: 0
+        },
+        {
+          dictValue: '续购',
+          divtkey: 1
+        }
+      ],
+      stateId: 0,
+      FormLoading: false,
+      listLoading: false,
+      crmVisitAppendixDtoList: [],
+      temp: {
+        crmBusinessDto: {},
+        crmVisitAppendixDtoList: [],
+        customerType: '', // 客户类型
+        visitWay: '', // 见面方式
+        visitWayKey: '',
+        userSid: ''
+      }, // 添加和修改
+      templooke: {},
+      dialogFormVisible: false,
+      rules: {
+        name: [{ required: true, message: '请填写客户名称', trigger: 'blur' }],
+        address: [{ required: true, message: '请填写客户地址', trigger: 'blur' }]
+      }
+    }
+  },
+  methods: {
+    // 初始
+    init() {
+      this.getShuJUZiDian()
+      this.huoquSheng()
+    },
+    // 修改回显
+    openUpdate(sid) {
+      this.stateId = sid
+      this.isOnRemind = '否'
+      this.init()
+      if (this.stateId !== '0') {
+        getPcCustomerInfoBySid(this.stateId).then((response) => {
+          console.log(response.data)
+          if (response.code === '200') {
+            this.$refs['dataForm'].clearValidate()
+            this.temp = response.data
+            this.temp.birthday = this.getDates(this.temp.birthday)
+            if (this.temp.customerType !== '') {
+              typeValues({ type: 'customerType' }).then((res) => {
+                if (res.code === '200') {
+                  if (this.temp.customerType === '个人') {
+                    this.temp.certificateType = '身份证'
+                    this.temp.certificateTypeKey = '01'
+                  } else {
+                    this.temp.certificateType = '营业执照'
+                    this.temp.certificateTypeKey = '02'
+                  }
+                  this.customerType_list = res.data
+                  this.customerType_list.forEach((e) => {
+                    if (e.dictValue === this.temp.customerType) {
+                      typeValues({ psid: e.sid, type: this.customerClass }).then((res) => {
+                        if (res.code === '200') {
+                          this.merClass = res.data
+                        }
+                      })
+                    }
+                  })
+                }
+              })
+            }
+          }
+        })
+        getPcBusinessInfoBySid(this.stateId).then((response) => {
+          if (response.code === '200') {
+            this.templooke = response.data
+            // 选择框回显
+            const Arry = []
+            Arry.push(parseInt(response.data.purchase_time))
+            this.aseTypeBox = Arry
+          }
+        })
+      }
+    },
+    // 新增
+    openCreate(customerTypeList) {
+      this.temp.customerType = customerTypeList.customerType
+      this.temp.customerTypeKey = customerTypeList.customerTypeKey
+      this.temp.visitWay = customerTypeList.visitWay
+      this.temp.visitWayKey = customerTypeList.visitWayKey
+      this.$refs['dataForm'].clearValidate()
+      this.stateId = '0'
+      this.init()
+      if (this.temp.customerType !== '') {
+        if (this.temp.customerType === '个人') {
+          this.temp.certificateType = '身份证'
+          this.temp.certificateTypeKey = '01'
+        } else {
+          this.temp.certificateType = '营业执照'
+          this.temp.certificateTypeKey = '02'
+        }
+        typeValues({ psid: customerTypeList.psid, type: this.customerClass }).then((res) => {
+          if (res.code === '200') {
+            this.merClass = res.data
+          }
+        })
+      }
+    },
+    // ---------------------------------------------------------------------------------
+    // ---------------------------客户基础信息方法------------------------------------------------------
+    // ---------------------------------------------------------------------------------
+    // 下拉卡框 数据字典
+    getShuJUZiDian() {
+      typeValues({ type: this.documenttype }).then((res) => {
+        if (res.code === '200') {
+          this.cateType = res.data
+        }
+      })
+      //
+      typeValues({ type: this.customerSource }).then((res) => {
+        if (res.code === '200') {
+          this.sourceLisst = res.data
+        }
+      })
+      //
+      typeValues({ type: this.customerLevel }).then((res) => {
+        if (res.code === '200') {
+          this.induslevel = res.data
+        }
+      })
+      //
+      typeValues({ type: this.visitWay }).then((res) => {
+        if (res.code === '200') {
+          this.industway = res.data
+        }
+      })
+      //
+      typeValues({ type: this.industrytype }).then((res) => {
+        if (res.code === '200') {
+          this.industry_type = res.data
+        }
+      })
+      //
+      typeValues({ type: this.consignmentType }).then((res) => {
+        if (res.code === '200') {
+          this.signmentT = res.data
+        }
+      })
+      //
+      typeValues({ type: this.consignment }).then((res) => {
+        if (res.code === '200') {
+          this.consign = res.data
+        }
+      })
+      //
+      typeValues({ type: 'sex' }).then((res) => {
+        if (res.code === '200') {
+          this.sex_list = res.data
+        }
+      })
+    },
+    // -------------------------获取省市县方法-------------------------
+    huoquSheng() {
+      getProvince().then((res) => {
+        if (res.code === '200') {
+          this.inputProvinceList = res.data
+        }
+      })
+    },
+    getShen(value) {
+      let bb = ''
+      this.inputProvinceList.forEach((e) => {
+        if (e.sid === value) {
+          bb = {
+            name: e.name,
+            districtCode: e.districtCode,
+            sid: e.sid
+          }
+        }
+      })
+      // 这里是把code的值赋给province省字段
+      this.temp.province = bb.name
+      this.huoquShi(bb.sid)
+    },
+    huoquShi(sid1) {
+      var sid = {
+        sid: sid1
+      }
+      getCity(sid).then((res) => {
+        console.log('2222市', res)
+        if (res.code === '200') {
+          this.inputCityList = res.data
+        }
+      })
+    },
+    getShi(value) {
+      let bb = ''
+      this.inputCityList.forEach((e) => {
+        if (e.sid === value) {
+          bb = {
+            name: e.name,
+            districtCode: e.districtCode,
+            sid: e.sid
+          }
+        }
+      })
+      this.temp.city = bb.name
+      this.huoquXian(bb.sid)
+    },
+    huoquXian(sid1) {
+      var sid = {
+        sid: sid1
+      }
+      getCounty(sid).then((res) => {
+        console.log('333县', res)
+        if (res.code === '200') {
+          this.inputCountyList = res.data
+        }
+      })
+    },
+    getQu(value) {
+      let bb = ''
+      this.inputCountyList.forEach((e) => {
+        if (e.sid === value) {
+          bb = {
+            name: e.name,
+            districtCode: e.districtCode,
+            sid: e.sid
+          }
+        }
+      })
+      this.temp.county = bb.name
+    },
+    // ----------------------------------方法--------------------
+    // 组件返回
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.activeNames = ['1']
+      this.templooke = {}
+      this.temp = {}
+      this.aseTypeBox = []
+      this.$emit('doback')
+    },
+    // 转换时间格式
+    getDates(v) {
+      var now = new Date(v)
+      var year = now.getFullYear() // 年
+      var month = now.getMonth() + 1 // 月
+      var day = now.getDate() // 日
+      var hh = now.getHours() // 时
+      var mm = now.getMinutes() // 分
+      var ss = now.getSeconds() // 分
+      var clock = year + '-'
+      if (month < 10) clock += '0'
+      clock += month + '-'
+      if (day < 10) clock += '0'
+      clock += day + ' '
+      if (hh < 10) clock += '0'
+      clock += hh + ':'
+      if (mm < 10) clock += '0'
+      clock += mm + ':'
+      if (ss < 10) clock += '0'
+      clock += ss
+      return clock
+    },
+    // 首次 续购 处理
+    findselect(list, value) {
+      var item = null
+      for (var i = 0; i < list.length; i++) {
+        if (list[i].divtkey === value) {
+          item = list[i]
+          break
+        }
+      }
+      return item
+    },
+    // 首次 续购
+    changexuanze() {
+      this.aseTypeBox = [this.aseTypeBox[this.aseTypeBox.length - 1]]
+      const item = this.findselect(this.aseType, this.aseTypeBox[0])
+      this.templooke.purchase_time = item.divtkey
+    },
+    // 保存客户运营数据
+    handleJUBuCun() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.FormLoading = true
+          if (this.temp.sex !== '') {
+            this.sex_list.forEach((e) => {
+              if (e.dictValue === this.temp.sex) {
+                this.temp.sexKey = e.dictKey
+              }
+            })
+          }
+          if (this.temp.isOnRemind !== '' && this.temp.isOnRemind === '是') {
+            this.temp.isOnRemindkey = 1
+          } else {
+            this.temp.isOnRemindkey = 0
+          }
+          if (!this.temp.birthday) {
+            this.temp.birthday = ''
+          }
+          if (this.stateId === '0') {
+            this.temp.userSid = window.sessionStorage.getItem('userSid')
+            this.temp.crmBusinessDto = this.templooke
+            this.getUrl()
+            this.temp.crmVisitAppendixDtoList = this.crmVisitAppendixDtoList
+            savePcCustomerInfo(this.temp).then((response) => {
+              this.FormLoading = false
+              if (response.code === '200') {
+                this.$notify({
+                  title: '提示',
+                  message: '添加成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.list1 = []
+                this.handleReturn('true')
+              } else if ('511' === response.code || '513' === response.code) {
+                this.FormLoading = false
+                this.dialogFormVisible = true
+                this.stateId = response.data
+              } else {
+                alert(200)
+              }
+            }).catch(() => {})
+          } else {
+            this.temp.userSid = window.sessionStorage.getItem('userSid')
+            this.temp.crmBusinessDto = this.templooke
+            updatePcCustomerInfo(this.temp).then((res) => {
+              this.FormLoading = false
+              if (res.code === '200') {
+                this.$notify({
+                  title: '提示',
+                  message: '修改成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.handleReturn('true')
+              } else {
+                this.$notify({
+                  title: '提示',
+                  message: '修改失败',
+                  type: 'error',
+                  duration: 2000
+                })
+              }
+            })
+          }
+        }
+      })
+    },
+    dialogStatus() {
+      this.dialogFormVisible = false
+      this.openUpdate(this.stateId)
+    },
+    dialogFormVisibl() {
+      this.$notify({
+        title: '提示',
+        message: '用户名手机号重复',
+        type: 'error',
+        duration: 2000
+      })
+      this.dialogFormVisible = false
+      return
+    },
+    // 客户分类
+    getFenLei(value) {
+      let bb = null
+      this.merClass.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: 'customerClass',
+            name: e.dictValue,
+            vaule: e.dictKey
+          }
+        }
+      })
+      this.temp.customerClass = bb.name
+      this.temp.customerClassKey = bb.vaule
+    },
+    // 客户来源
+    getKeHuLaiYUan(value) {
+      let bb = null
+      this.sourceLisst.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: 'customerSource',
+            name: e.dictValue,
+            vaule: e.dictKey
+          }
+        }
+      })
+      this.temp.source = bb.name
+      this.temp.sourceKey = bb.vaule
+    },
+    // 客户级别
+    getJiBie(value) {
+      let bb = null
+      this.induslevel.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: 'customerLevel',
+            name: e.dictValue,
+            vaule: e.dictKey
+          }
+        }
+      })
+      this.temp.level = bb.name
+      this.temp.levelKey = bb.vaule
+    },
+    // 货物类别
+    getHuoWuLeiXing(value) {
+      let bb = null
+      this.signmentT.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: 'consignmentType',
+            name: e.dictValue,
+            vaule: e.dictKey
+          }
+        }
+      })
+      this.templooke.consignmentType = bb.name
+      this.templooke.consignmentTypeKey = bb.vaule
+    },
+    // 货物
+    getHuoWu(value) {
+      let bb = null
+      this.consign.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: 'consignment',
+            name: e.dictValue,
+            vaule: e.dictKey
+          }
+        }
+      })
+      this.templooke.consignment = bb.name
+      this.templooke.consignmentKey = bb.vaule
+    },
+    // ------------------------------见证材料--------------------------------
+    getUrl() {
+      for (var i = 0; i < this.list1.length; i++) {
+        var namese = this.list1[i].name
+        var nameArr = namese.split('.')
+        this.crmVisitAppendixDtoList.push({
+          // attachType: '0001',
+          fileName: this.list1[i].name,
+          filePath: this.list1[i].url,
+          fileSize: this.list1[i].size,
+          // linkSid: this.temp.customerSid,
+          createBySid: window.sessionStorage.getItem('userSid'),
+          fileType: nameArr[nameArr.length - 1]
+        })
+        console.log('11223344', this.crmVisitAppendixDtoList)
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+
+.trightb {
+  text-align: right;
+}
+
+.addinputwduan {
+  width: 80px;
+  margin: 0 5px;
+}
+
+/deep/ .el-collapse-item__header {
+  height: 40px;
+  padding: 10px;
+  font-weight: bold;
+  font-size: 20px;
+  text-align: left;
+  color: #ffffff;
+  background-color: #0294d7;
+}
+
+/deep/ .el-collapse-item__content {
+  padding-bottom: 0;
+}
+.titwu {
+  font-size: 28px;
+  text-align: center;
+  padding: 30px 0 20px 0;
+}
+</style>
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 e2ea79aa7a..0e71d143f4 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
@@ -8,16 +8,14 @@
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
-      <div class="webcon">
+      <div class="main-content">
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="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="请选择" @change="changeCarbrand">
+                  <el-option v-for="(item, index) in carbrand_list" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="功能">
@@ -53,12 +51,10 @@
         </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"/>
+          <pageye v-show="total>0" :total="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">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
             <el-table-column width="50px" type="selection" align="center"/>
             <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column label="品牌" align="center">
@@ -96,8 +92,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="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
       </div>
     </div>
@@ -105,215 +100,200 @@
 </template>
 
 <script>
-  import {mapGetters} from 'vuex'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  import {getList, selectBrand} from '@/api/jichuxinxi/busdepositvehicle'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import { getList } from '@/api/jichuxinxi/busdepositvehicle'
 
-  export default {
-    name: "xuanzecheliang",
-    components: {
-      Pagination,
-      pageye
+export default {
+  name: "xuanzecheliang",
+  components: {
+    Pagination,
+    pageye
+  },
+  data() {
+    return {
+      createPage: '',
+      dialogVisible: false, // 弹窗
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      btndisabled: false,
+      viewState: 1, // 1、列表 2、添加-车辆预定 3、编辑  4、查看 5、订金-定金收取
+      // 查询 -----------
+      carbrand_list: [], // 品牌
+      tableKey: 0,
+      list: [],
+      sids: [],
+      total: 1,
+      FormLoading: false,
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 5,
+        params: {
+          carbrand: '',
+          driveForm: '',
+          emissionStandard: '',
+          fuelType: '',
+          gearboxType: '',
+          lockedState: '',
+          power: '',
+          productLine: '',
+          vehicleState: '',
+          vehicleType: '',
+          vehicleVersion: ''
+        }
+      },
+      selectDate: undefined,
+      temp: {}, // 添加和编辑
+      depositVehicleList: [],
+      visible: true,
+      hetongdanganguanliInfoShow: false
+      // ------------------------------------
+    }
+  },
+  methods: {
+    // 初始化
+    init() {
+      this.handleFilter()
+      this.getcarbrand()
     },
-    data() {
-      return {
-        createPage: '',
-        dialogVisible: false, // 弹窗
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        btndisabled: false,
-        viewState: 1, // 1、列表 2、添加-车辆预定 3、编辑  4、查看 5、订金-定金收取
-        // 查询 -----------
-        carbrand_list: [], // 品牌
-        tableKey: 0,
-        list: [],
-        sids: [],
-        total: 1,
-        FormLoading: false,
-        listLoading: false,
-        listQuery: {
-          current: 1,
-          size: 20,
-          params: {
-            carbrand: '',
-            driveForm: '',
-            emissionStandard: '',
-            fuelType: '',
-            gearboxType: '',
-            lockedState: '',
-            power: '',
-            productLine: '',
-            vehicleState: '',
-            vehicleType: '',
-            vehicleVersion: ''
-          },
-        },
-        selectDate: undefined,
-        temp: {}, // 添加和编辑
-        depositVehicleList: [],
-        visible: true,
-        hetongdanganguanliInfoShow: false,
-        // ------------------------------------
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
       }
     },
-    computed: {
-      ...mapGetters([
-        'id',
-        'roles',
-        'rolesIds',
-        'departmentId',
-        'departmentCode',
-      ]),
+    // 重置
+    handleReset() {
+      this.listQuery = {
+        current: 1,
+        size: 5,
+        params: {
+          carbrand: '',
+          driveForm: '',
+          emissionStandard: '',
+          fuelType: '',
+          gearboxType: '',
+          lockedState: '',
+          power: '',
+          productLine: '',
+          vehicleState: '',
+          vehicleType: '',
+          vehicleVersion: ''
+        }
+      }
     },
-    created() {
-      // 初始化变量
-      this.init()
+    // 勾选
+    handleSelectionChange(row) {
+      console.log('row', row)
+      this.depositVehicleList = row
+      const aa = []
+      row.forEach((element) => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+      console.log('选择sid', this.sids)
     },
-    methods: {
-      // 初始化
-      init() {
-        this.handleFilter();
-        this.getcarbrand()
-      },
-      // 搜索条件效果
-      clicksearchShow() {
-        this.isSearchShow = !this.isSearchShow
-        if (this.isSearchShow) {
-          this.searchxianshitit = '隐藏查询条件'
-        } else {
-          this.searchxianshitit = '显示查询条件'
-        }
-      },
-      // 重置
-      handleReset() {
-        this.listQuery = {
-          current: 1,
-          size: 20,
-          params: {
-            carbrand: '',
-            driveForm: '',
-            emissionStandard: '',
-            fuelType: '',
-            gearboxType: '',
-            lockedState: '',
-            power: '',
-            productLine: '',
-            vehicleState: '',
-            vehicleType: '',
-            vehicleVersion: ''
-          },
-        }
-      },
-      // 勾选
-      handleSelectionChange(row) {
-        console.log('row', row)
-        this.depositVehicleList = row
-        const aa = []
-        row.forEach((element) => {
-          aa.push(element.sid)
-        })
-        this.sids = aa
-        console.log('选择sid', this.sids)
-      },
-      // 品牌下拉
-      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
-            }
+    // 品牌下拉
+    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
           }
+        }
+      })
+      this.listQuery.params.carbrand = bb.name
+      console.log('name', this.listQuery.params.carbrand)
+    },
+    // 确认
+    handleConfirm() {
+      if (this.sids.length > 0) {
+        this.$emit('handleVehicle', this.depositVehicleList)
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '没有选择车辆!',
+          type: 'error',
+          duration: 2000
         })
-        this.listQuery.params.carbrand = bb.name
-        console.log('name', this.listQuery.params.carbrand)
-      },
-      // 确认
-      handleConfirm() {
-        if (this.sids.length > 0) {
-          this.$emit('handleVehicle', this.depositVehicleList)
-          this.handleReturn()
+        return
+      }
+    },
+    // 返回
+    handleReturn() {
+      this.$emit('yudingcheliangfanhui') // 到父页面
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    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.listLoading = false
+        if (
+          response.code === '200' &&
+          response.data &&
+          response.data.total > 0
+        ) {
+          this.list = response.data.records
+          this.total = response.data.total
         } else {
-          this.$notify({
-            title: '提示',
-            message: '没有选择车辆!',
-            type: 'error',
-            duration: 2000
-          });
-          return
+          this.list = []
+          this.total = 0
         }
-      },
-      // 返回
-      handleReturn() {
-        this.$emit('yudingcheliangfanhui') // 到父页面
-      },
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.listQuery.current - 1) * this.listQuery.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      // 查询列表信息
-      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.listLoading = false
-          if (
-            response.code === '200' &&
-            response.data &&
-            response.data.total > 0
-          ) {
-            this.list = response.data.records
-            this.total = response.data.total
-          } else {
-            this.list = []
-            this.total = 0
-          }
-        })
-      },
-      // 查询按钮
-      handleFilter() {
-        this.listQuery.current = 1
-        this.getList()
-      },
+      })
     },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    }
   }
+}
 </script>
 <style scoped lang="scss">
-  .el-input__icon {
-    width: 40px;
-  }
+.el-input__icon {
+  width: 40px;
+}
 
-  .el-form-item .el-form-item__label {
-    width: 100% !important;
-  }
+.el-form-item .el-form-item__label {
+  width: 100% !important;
+}
 
-  .block {
-    display: inline-block;
-  }
+.block {
+  display: inline-block;
+}
 
-  .el-form-item__content label {
-    padding: 0 5px;
-  }
+.el-form-item__content label {
+  padding: 0 5px;
+}
 </style>
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 cbe081a8a9..925cc21355 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
@@ -1,19 +1,18 @@
 <template>
   <div class="app-container">
-    <div v-show="kehu_xuanze">
+    <div v-show="viewState == 1">
       <div class="tab-header webtop">
         <div>选择客户</div>
         <div>
-          <el-button type="primary" size="medium" @click="handleCreate()">新增客户</el-button>
+          <el-button type="primary" size="small" @click="handleCreate()">新增客户</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
-      <div class="webcon">
+      <div class="">
         <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="130px" class="tab-header">
-              <el-form-item label="客户姓名"> <!--客户姓名/公司名称/手机号/微信号/证件号码-->
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="客户姓名">
                 <el-input v-model="listQuery.params.name" placeholder="请输入" clearable class="filter-item"/>
               </el-form-item>
             </el-form>
@@ -22,14 +21,11 @@
             </div>
           </div>
         </div>
-        <pageye v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
-                class="pagination" @pagination="getList"/>
+        <!--        <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
         <div class="">
-          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%"
-                    @selection-change="handleSelectionChange">
-<!--            <el-table-column width="50px" type="selection" align="center"/>-->
-            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
-            <el-table-column label="操作" align="center">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column fixed label="操作" align="center">
               <template slot-scope="scope">
                 <div class="searchbtns">
                   <el-button size="small" type="primary" @click="handleConfirm(scope.row)">选择</el-button>
@@ -37,14 +33,14 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="客户姓名" align="center">
+            <el-table-column label="登记日期" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.name }}</span>
+                <span>{{ scope.row.createTime }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="公司名称" align="center">
+            <el-table-column label="客户名称" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.companyName }}</span>
+                <span>{{ scope.row.name }}</span>
               </template>
             </el-table-column>
             <el-table-column label="手机号码" align="center">
@@ -57,9 +53,14 @@
                 <span>{{ scope.row.weixin }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="状态" align="center">
+            <el-table-column label="客户类型" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.follow_state }}</span>
+                <span>{{ scope.row.customerType }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="客户级别" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.level }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -67,246 +68,202 @@
         <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>
-    <el-dialog
-          title="客户登记-类型"
-          :visible.sync="dialogVisible"
-          width="28%"
-          top="13%">
-          <el-form :model="customerTypeList">
-            <el-form-item label="联络方式" :label-width="formLabelWidth" class="diaForm">
-              <el-select v-model="customerTypeList.visitWay" placeholder="请选择联络方式" @change="getVisitWay">
-                <el-option v-for="(item) in visitWay_list" :key="item.dictKey" :label="item.dictValue"
-                           :value="item.dictKey"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="客户类型" :label-width="formLabelWidth" class="diaForm">
-              <el-radio v-model="customerTypeList.customerType" label="个人">个人</el-radio>
-              <el-radio v-model="customerTypeList.customerType" label="企业">企业</el-radio>
-            </el-form-item>
-          </el-form>
-          <span slot="footer" class="dialog-footer">
-            <el-button class="el-button-sure" type="primary" @click="handleOpen()">确 定</el-button>
-            <el-button @click="dialogVisible = false">取 消</el-button>
-          </span>
-        </el-dialog>
-    <kehudangan-add  ref="addAndUpdate" @handleReturn="resetState"/>
+    <xuanzekehu-add v-show="viewState == 2 || viewState == 3" ref="addAndUpdate" @reloadlist="resetState" @doback="resetState"/>
+    <el-dialog title="客户登记-类型" :visible.sync="dialogVisible" width="28%" top="13%">
+      <el-form :model="customerTypeList">
+        <el-form-item label="联络方式" :label-width="formLabelWidth" class="diaForm">
+          <el-select v-model="customerTypeList.visitWay" placeholder="请选择" @change="getVisitWay">
+            <el-option v-for="(item) in visitWay_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="客户类型" :label-width="formLabelWidth" class="diaForm">
+          <el-select v-model="customerTypeList.customerType" placeholder="请选择" @change="getCustomerType">
+            <el-option v-for="(item) in customertype_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button class="el-button-sure" type="primary" @click="handleOpen()">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-  import {mapGetters} from 'vuex'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  import {pagerList,typeValues} from '@/api/jichuxinxi/busdepositvehicle'
-  import xuanzekehuAdd from "./xuanzekehuAdd";
-  import KehudanganAdd from "@/views/kehuguanli/kehudangan/kehudanganAdd";
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import { pagerList, typeValues } from '@/api/jichuxinxi/busdepositvehicle'
+import xuanzekehuAdd from './xuanzekehuAdd.vue'
 
-  export default {
-    name: "xuanzekehu",
-    components: {
-      KehudanganAdd,
-      Pagination,
-      pageye,
-      xuanzekehuAdd,
-      typeValues
+export default {
+  name: 'xuanzekehu',
+  components: {
+    Pagination,
+    pageye,
+    xuanzekehuAdd
+  },
+  data() {
+    return {
+      dialogVisible: false, // 弹窗
+      formLabelWidth: '110px',
+      isSearchShow: true,
+      viewState: 1, // 1、列表 2、添加-车辆预定 3、编辑  4、查看 5、订金-定金收取
+      // 查询 -----------
+      tableKey: 0,
+      list: [],
+      sids: [],
+      customerTypeList: {
+        visitWay: '', // 联络方式
+        visitWayKey: '', // 联络方式--Key
+        customerType: '', // 客户类型
+        customerTypeKey: '', // 客户类型--Key
+        psid: ''
+      },
+      visitWay_list: [],
+      customertype_list: [],
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          name: '',
+          userSid: ''
+        }
+      }
+    }
+  },
+  methods: {
+    init() {
+      this.getList()
+      this.getShuJUZiDian()
+    },
+    getShuJUZiDian() {
+      typeValues({ type: 'visitWay' }).then((res) => {
+        if (res.code === '200') {
+          this.visitWay_list = res.data
+        }
+      })
+      typeValues({ type: 'customertype' }).then((res) => {
+        if (res.code === '200') {
+          this.customertype_list = res.data
+        }
+      })
     },
-    data() {
-      return {
-        createPage: '',
-        kehu_xuanze: true, // 列表页面展示
-        kehu_add: false, //添加页面
-        dialogVisible: false, // 弹窗
-        formLabelWidth: '110px',
-        isSearchShow: true,
-        // searchxianshitit: '显示查询条件',
-        btndisabled: false,
-        viewState: 1, // 1、列表 2、添加-车辆预定 3、编辑  4、查看 5、订金-定金收取
-        // 查询 -----------
-        depositType: [], // 虚拟订单类型
-        tableKey: 0,
-        list: [],
-        sids: [],
-        total: 1,
-        customerTypeList: {
+    handleOpen() {
+      this.viewState = 2
+      if (this.customerTypeList.visitWay !== '' && this.customerTypeList.customerType !== '') {
+        this.dialogVisible = false
+        const customerTypeList = this.customerTypeList
+        this.$refs['addAndUpdate'].openCreate(customerTypeList)
+        this.customerTypeList = {
           visitWay: '', // 联络方式
-          visitWayKey: '',
-          customerType: ''// 客户类型
-        },
-        visitWay_list: [],
-        FormLoading: false,
-        listLoading: false,
-        listQuery: {
-          current: 1,
-          size: 20,
-          params: {
-            orgName: '',
-            staffName: '',
-            customerName: '',
-            virtualDepositType: '',
-            createDateStart: '',
-            createDateEnd: '',
-          },
-        },
-        selectDate: undefined,
-        temp: {}, // 添加和编辑
-        visible: true,
-        // ------------------------------------
+          visitWayKey: '', // 联络方式--Key
+          customerType: '', // 客户类型
+          customerTypeKey: '', // 客户类型--Key
+          psid: ''
+        }
+      } else {
+        this.$message({
+          message: '请填写联络方式和客户类型',
+          type: 'warning'
+        })
       }
     },
-    computed: {
-      ...mapGetters([
-        'id',
-        'roles',
-        'rolesIds',
-        'departmentId',
-        'departmentCode',
-      ]),
-    },
-    created() {
-      // 初始化变量
-      this.init()
-      this.getShuJUZiDian()
+    getVisitWay(value) {
+      let bb = null
+      this.visitWay_list.forEach((e) => {
+        if (e.dictValue === value) {
+          bb = {
+            value: e.dictValue,
+            key: e.dictKey
+          }
+        }
+      })
+      this.customerTypeList.visitWay = bb.value
+      this.customerTypeList.visitWayKey = bb.key
     },
-    methods: {
-      init() {
-        this.getList()
-        // this.getType()
-      },
-      getShuJUZiDian() {
-        typeValues({
-          type: 'visitWay',
-        }).then((res) => {
-          if (res.code === '200') {
-            this.visitWay_list = res.data
+    getCustomerType(value) {
+      let bb = null
+      this.customertype_list.forEach((e) => {
+        if (e.dictValue === value) {
+          bb= {
+            value: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
           }
-        })
-      },
-      handleOpen() {
-        if (this.customerTypeList.visitWay !== '' && this.customerTypeList.customerType !== '') {
-          this.dialogVisible = false
-          const customerTypeList = this.customerTypeList
-          this.$refs.addAndUpdate.openCreate(customerTypeList, () => {
-            // this.visible = false
-            this.customerTypeList = {
-              visitWay: '',
-              visitWayKey: '',
-              customerType: ''
-            }
-          })
+        }
+      })
+      this.customerTypeList.customerType = bb.value
+      this.customerTypeList.customerTypeKey = bb.key
+      this.customerTypeList.psid = bb.sid
+    },
+    // ----------功能打开开始--------
+    handleCreate() {
+      this.dialogVisible = true
+    },
+    resetState() {
+      this.viewState = 1
+      this.getList()
+    },
+    // 返回
+    handleReturn() {
+      this.$emit('doback')
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      pagerList(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.code === '200' && response.data && response.data.total > 0) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
         } else {
-          this.$message({
-            message: '请填写联络方式和客户类型',
-            type: 'warning'
-          });
+          this.list = []
+          this.listQuery.total = 0
         }
-      },
-      getVisitWay(value) {
-        let bb = null
-        this.visitWay_list.forEach((e) => {
-          if (e.dictKey == value) {
-            bb = {
-              type: 'visitWay',
-              name: e.dictValue,
-              vaule: e.dictKey,
-              sid: e.sid,
-            }
-          }
-        })
-        this.customerTypeList.visitWay = bb.name
-        this.customerTypeList.visitWayKey = bb.vaule
-      },
-      // 搜索条件效果
-      // clicksearchShow() {
-      //   this.isSearchShow = !this.isSearchShow
-      //   if (this.isSearchShow) {
-      //     this.searchxianshitit = '隐藏查询条件'
-      //   } else {
-      //     this.searchxianshitit = '显示查询条件'
-      //   }
-      // },
-      // ----------功能打开开始--------
-      handleCreate() {
-        this.kehu_xuanze = false
-        this.dialogVisible=true
-        // this.kehu_add = true
-      },
-      resetState() {
-        this.kehu_xuanze = true
-        this.kehu_add = false
-        this.getList()
-      },
-      // 返回
-      handleReturn() {
-        this.$emit('dingjinfanhui') // 到订金收取父页面
-        this.$emit('yudingcheliangfanhui') // 到车辆预定父页面
-      },
-
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.listQuery.current - 1) * this.listQuery.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      // 查询列表信息
-      getList() {
-        this.listLoading = true
-        pagerList({
-          current: this.listQuery.current,
-          size: this.listQuery.size,
-          params: {
-            userSid: window.sessionStorage.getItem('userSid')
-          },
-        }).then((response) => {
-          this.listLoading = false
-          if (
-            response.code === '200' &&
-            response.data &&
-            response.data.total > 0
-          ) {
-            this.list = response.data.records
-            this.total = response.data.total
-          } else {
-            this.list = []
-            this.total = 0
-          }
-        })
-      },
-      // 查询按钮
-      handleFilter() {
-        this.listQuery.current = 1
-        this.getList()
-      },
-      // 勾选
-      handleSelectionChange(row) {
-        const aa = []
-        row.forEach((element) => {
-          aa.push(element.sid)
-        })
-        this.sids = aa
-        console.log('选择sid', this.sids)
-      },
-      // 确认选择客户
-      handleConfirm(row) {
-        console.log('选择客户row', row)
-        this.$emit('handleCustomer', row)
-        this.handleReturn()
-      },
-      handleUpdate(row) {
-
-      },
-
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 勾选
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach((element) => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+      console.log('选择sid', this.sids)
     },
+    // 确认选择客户
+    handleConfirm(row) {
+      this.$emit('handleCustomer', row)
+    },
+    handleUpdate(row) {
+      this.viewState = 3
+      this.$refs['addAndUpdate'].openUpdate(row.sid)
+    }
   }
+}
 </script>
 
-<style scoped lang="scss">
-  .searchcon {
-    margin-top: 8px;
-  }
-
+<style scoped>
+.searchcon {
+  margin-top: 8px;
+}
 </style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/com/xuanzekehuAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/com/xuanzekehuAdd.vue
index df42cdf3e5..bae7a5f9fa 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/com/xuanzekehuAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/com/xuanzekehuAdd.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div v-show="visible">
+    <div>
       <div class="tab-header webtop">
         <div>【新增】客户信息</div>
         <div>
@@ -9,9 +9,8 @@
         </div>
       </div>
       <div class="listconadd">
-        <el-form ref="dataForm" :model="temp" label-position="top" label-width="190px" class="formadd "
-                 :rules="rules">
-          <div class="titwu">客户信息</div>
+        <div class="titwu">客户信息</div>
+        <el-form ref="dataForm" :model="temp" label-position="top" class="formadd" :rules="rules">
           <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
             <div>基础信息</div>
           </div>
@@ -45,7 +44,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item prop="mobile">
-                <el-input v-model="temp.mobile"  maxlength="20" placeholder="请输入联系电话" style="width:50%" class="addinputw" clearable/>
+                <el-input v-model="temp.mobile" maxlength="20" placeholder="请输入联系电话" style="width:50%" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="4" class="trightb">
@@ -88,7 +87,7 @@
                 <el-select v-model="temp.county" filterable placeholder="请选择县" class="addinputw" style="width:160px" @change="getQu">
                   <el-option v-for="item in inputCountyList" :key="item.sid" :label="item.name" :value="item.sid"/>
                 </el-select>
-                <el-input v-model="temp.address"  style="width:46%" clearable/>
+                <el-input v-model="temp.address" style="width:46%" clearable/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -174,9 +173,6 @@
                 </el-col>
                 <el-col :span="8">
                   <el-form-item>
-                    <!-- <el-select v-model="temp.certificateType" class="addinputw" placeholder="请选择证件类型" @change="getZhengJian">
-                      <el-option v-for="(item, index) in cateType" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                    </el-select> -->
                     <el-input v-model="temp.certificateType" style="width:50%" maxlength="20" :readonly="true" class="addinputw" clearable/>
                   </el-form-item>
                 </el-col>
@@ -280,7 +276,6 @@
           <el-collapse v-model="activeNames">
             <el-collapse-item title="运营情况" name="3">
               <el-form ref="datufrom" :model="templooke" label-position="top" label-width="190px" class="formadd03">
-                <!--  <div class="titleleft">运营情况</div>-->
                 <el-row>
                   <el-col :span="4" class="trightb">
                     <el-form-item>
@@ -301,10 +296,8 @@
                   </el-col>
                   <el-col :span="8">
                     <el-form-item>
-                      <el-select v-model="templooke.consignment" style="width:50%" class="addinputw" placeholder="请选择承运货物"
-                                 @change="getHuoWu">
-                        <el-option v-for="(item, index) in consign" :key="index.dictKey" :label="item.dictValue"
-                                   :value="item.dictKey"/>
+                      <el-select v-model="templooke.consignment" style="width:50%" class="addinputw" placeholder="请选择承运货物" @change="getHuoWu">
+                        <el-option v-for="(item, index) in consign" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                       </el-select>
                     </el-form-item>
                   </el-col>
@@ -328,15 +321,12 @@
                   <el-col :span="8">
                     <el-form-item>
                       <div class="yihang">
-                        <el-checkbox-group v-if="aseType.length>0" v-model="aseTypeBox" @change="changexuanze">
+                        <el-checkbox-group v-if="aseType.length > 0" v-model="aseTypeBox" @change="changexuanze">
                           <el-checkbox v-for="item in aseType" :key="item.divtkey" :label="item.divtkey">
-                            {{item.dictValue }}
+                            {{ item.dictValue }}
                           </el-checkbox>
                         </el-checkbox-group>
-                        <div class="mw">第
-                          <el-input v-model="templooke.purchase_num" maxlength="10" class="addinputwduan" clearable/>
-                          辆
-                        </div>
+                        <div class="mw">第<el-input v-model="templooke.purchase_num" :disabled="templooke.purchase_num == '0'" maxlength="10" class="addinputwduan" clearable/>辆</div>
                       </div>
                     </el-form-item>
                   </el-col>
@@ -349,9 +339,7 @@
                   </el-col>
                   <el-col :span="8">
                     <el-form-item>
-                      <el-input style="width:50%" v-model="templooke.existing_vehicles" maxlength="20" placeholder="请输入现有车辆"
-                                class="addinputw"
-                                clearable/>
+                      <el-input style="width:50%" v-model="templooke.existing_vehicles" maxlength="20" placeholder="请输入现有车辆" class="addinputw" clearable/>
                     </el-form-item>
                   </el-col>
                   <el-col :span="4" class="trightb">
@@ -361,8 +349,7 @@
                   </el-col>
                   <el-col :span="8">
                     <el-form-item>
-                      <el-input style="width:50%" v-model="templooke.existing_vehiclesBrand" maxlength="20" placeholder="请输入现有车辆品牌"
-                                class="addinputw" clearable/>
+                      <el-input style="width:50%" v-model="templooke.existing_vehiclesBrand" maxlength="20" placeholder="请输入现有车辆品牌" class="addinputw" clearable/>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -374,8 +361,7 @@
                   </el-col>
                   <el-col :span="20">
                     <el-form-item>
-                      <el-input style="width:81%" v-model="templooke.remarks" maxlength="20" placeholder="请输入备注" class="addinputw"
-                                clearable/>
+                      <el-input style="width:81%" v-model="templooke.remarks" maxlength="20" placeholder="请输入备注" class="addinputw" clearable/>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -396,12 +382,8 @@
             </el-collapse-item>
           </el-collapse>
         </el-form>
-
       </div>
     </div>
-    <cheliangxuqiu-add ref="addAndUpdate" @handleReturn="visible=true" @created="dataCreated" @updated="dataUpdated"
-                       @doback="dataDengJi" @modify="dataModify"/>
-    <cheliangxuqiuinfo ref="Info" @handleReturn="visible=true"/>
     <!-- 弹框提示 -->
     <el-dialog :visible.sync="dialogFormVisible" width="300px" :close-on-click-modal="false">
       <div class="result-cont">
@@ -416,984 +398,546 @@
 </template>
 
 <script>
-import {mapGetters} from 'vuex'
-  import {
-    savePcCustomerInfo,
-    namesDown,
-    getPcCustomerInfoBySid,
-    getPcDistributorList,
-    updatePcCustomerInfo,
-    getPcCustomerMobileAndName,
-  } from '@/api/jichuxinxi/crmcustomer'
-  import {
-    getProvince,
-    getCity,
-    getCounty
-  } from '@/api/portal/areaPicker' // 省市区
-  import {typeValues} from '@/api/dictcommons/shujuzidian'
-  import {loginDetails} from '@/api/dictcommons/basemanufacturer'
-  import {getStorage} from '@/utils/auth'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  import cheliangxuqiuAdd from '@/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue'
-  import cheliangxuqiuinfo from '@/views/kehuguanli/cheliangxuqiu/cheliangxuqiuinfo.vue'
-  import {pagerList, delBySids} from '@/api/jichuxinxi/crmvehicle'
-  import {getPcBusinessInfoBySid} from '@/api/jichuxinxi/crmbusiness'
-  import Upload from '@/components/uploadFile/upload.vue' //   上传文件
-  import rules from '@/utils/roles'
+import { savePcCustomerInfo, getPcCustomerInfoBySid, updatePcCustomerInfo } from '@/api/jichuxinxi/crmcustomer'
+import { getProvince, getCity, getCounty } from '@/api/portal/areaPicker' // 省市区
+import { typeValues } from '@/api/dictcommons/shujuzidian'
+import { getPcBusinessInfoBySid } from '@/api/jichuxinxi/crmbusiness'
+import Upload from '@/components/uploadFile/upload.vue' //   上传文件
 
-  export default {
-    name: "xuanzekehuAdd",
-    components: {Pagination, pageye, cheliangxuqiuAdd, cheliangxuqiuinfo, Upload},
-    data() {
-      var checkSubmit = (rule, value, callback) => {
-        const Submit =
-          /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
-        if (Submit.test(value)) {
-          return callback()
-        }
-        callback(new Error('请输入手机号'))
+export default {
+  name: 'xuanzekehuAdd',
+  components: { Upload },
+  data() {
+    var checkSubmit = (rule, value, callback) => {
+      const Submit =
+        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
+      if (Submit.test(value)) {
+        return callback()
       }
-      var identitycard = (rules, value, callback) => {
-        const card =
-          /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
-        if (card.test(value)) {
-          return callback()
-        }
-        callback(new Error('请输入身份证号码'))
+      callback(new Error('请输入手机号'))
+    }
+    var identitycard = (rules, value, callback) => {
+      const card =
+        /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+      if (card.test(value)) {
+        return callback()
       }
-      return {
-        // ---见证材料
-        list1: [],
-        list2: [],
-        list3: [],
-        province: [],
-        city: [],
-        county: [],
-        inputProvinceList: [],
-        inputCityList: [],
-        inputCountyList: [],
-        list: [],
-        activeNames: ['1'],
-        // --按钮菜单-------
-        customerClass: 'customerClass',
-        merClass: [],
-        customerSource: 'customerSource',
-        sourceLisst: [],
-        customerLevel: 'customerLevel',
-        induslevel: [],
-        visitWay: 'visitWay',
-        industway: [],
-        documenttype: 'documenttype',
-        cateType: [],
-        customerType: 'customerType',
-        merType: [],
-        ncySid: [],
-        edOrgSid: [],
-        consignmentType: 'consignmentType',
-        signmentT: [],
-        consignment: 'consignment',
-        consign: [],
-        industrytype: 'industrytype',
-        industry_type: [],
-        customerType_list:[],
-        sex_list:[],
-        aseTypeBox: [],
-        aseType: [
-          {
-            dictValue: '首次购车',
-            divtkey: 0,
-          },
-          {
-            dictValue: '续购',
-            divtkey: 1,
-          },
-        ],
-        Customeryou: '',
-        checkin: '', //登记状态
-        kehusid: '',
-        YongHuid: [],
-        visible: false,
-        stateId: 0,
-        FormLoading: false,
-        listLoading: false,
-        tempdaat: {},
-        crmVisitAppendixDtoList:[],
-        temp: {
-          crmBusinessDto: {},
-          crmVisitAppendixDtoList: [],
-          customerType: '', //客户类型
-          visitWay: '', // 见面方式
-          visitWayKey: '',
-          userSid: '',
-          orgSid:''
-        }, // 添加和修改
-        templooke: {},
-        tempmore: {},
-        textMap: {
-          update: '修改',
-          create: '创建',
-        },
-        dialogFormVisible: false,
-        client: '',
-        clientphone: '',
-        sids: [],
-        listQuery: {
-          current: 1,
-          size: 20,
-          params: {
-            distributorName: '',
-          },
-        },
-        clientSid: '',
-        rules: {
-          name: [
-            {
-              required: true,
-              message: '请填写客户名称',
-              trigger: 'blur',
-            },
-          ],
-          address: [
-            {
-              required: true,
-              message: '请填写客户地址',
-              trigger: 'blur',
-            },
-          ],
-          // mobile: [
-          //   {
-          //     required: true,
-          //     validator: checkSubmit,
-          //     trigger: 'blur',
-          //   },
-          // ],
-          // idnumber: [
-          //   {
-          //     required: true,
-          //     validator: identitycard,
-          //     trigger: 'blur',
-          //   },
-          // ],
+      callback(new Error('请输入身份证号码'))
+    }
+    return {
+      // ---见证材料
+      list1: [],
+      province: [],
+      city: [],
+      county: [],
+      inputProvinceList: [],
+      inputCityList: [],
+      inputCountyList: [],
+      list: [],
+      activeNames: ['1'],
+      // --按钮菜单-------
+      customerClass: 'customerClass',
+      merClass: [],
+      customerSource: 'customerSource',
+      sourceLisst: [],
+      customerLevel: 'customerLevel',
+      induslevel: [],
+      visitWay: 'visitWay',
+      industway: [],
+      documenttype: 'documenttype',
+      cateType: [],
+      consignmentType: 'consignmentType',
+      signmentT: [],
+      consignment: 'consignment',
+      consign: [],
+      industrytype: 'industrytype',
+      industry_type: [],
+      customerType_list: [],
+      sex_list: [],
+      aseTypeBox: [],
+      aseType: [
+        {
+          dictValue: '首次购车',
+          divtkey: 0
         },
+        {
+          dictValue: '续购',
+          divtkey: 1
+        }
+      ],
+      stateId: 0,
+      FormLoading: false,
+      listLoading: false,
+      crmVisitAppendixDtoList: [],
+      temp: {
+        crmBusinessDto: {},
+        crmVisitAppendixDtoList: [],
+        customerType: '', // 客户类型
+        visitWay: '', // 见面方式
+        visitWayKey: '',
+        userSid: ''
+      }, // 添加和修改
+      templooke: {},
+      dialogFormVisible: false,
+      rules: {
+        name: [{ required: true, message: '请填写客户名称', trigger: 'blur' }],
+        address: [{ required: true, message: '请填写客户地址', trigger: 'blur' }]
       }
+    }
+  },
+  methods: {
+    // 初始
+    init() {
+      this.getShuJUZiDian()
+      this.huoquSheng()
     },
-    computed: {
-      ...mapGetters([
-        'id',
-        'roles',
-        'rolesIds',
-        'departmentId',
-        'departmentCode',
-      ]),
-    },
-    created() {
-      // 初始化变量
+    // 修改回显
+    openUpdate(sid) {
+      this.stateId = sid
+      this.isOnRemind = '否'
       this.init()
-      this.huoquSheng() //获取省
-    },
-    methods: {
-      //初始
-      init() {
-        this.getShuJUZiDian()
-        this.getGuaKao()
-        this.postHuoquyonghu()
-        this.getZhongJie()
-      },
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.listQuery.current - 1) * this.listQuery.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      //修改回显
-      openUpdate(sid, showed) {
-        this.clientSid = sid
-        this.stateId = sid
-        console.log('888888888888', this.stateId)
-        this.isOnRemind='否'
-        //   this.client = customer.name
-        //   this.clientphone = customer.mobile
-        if (this.stateId !== '0') {
-          getPcCustomerInfoBySid(this.stateId).then((response) => {
-            console.log(response.data)
-            if (response.code === '200') {
-              this.$refs['dataForm'].clearValidate()
-              this.temp = response.data
-              this.temp.birthday = this.getDates(this.temp.birthday)
-              // this.temp.address=this.temp.province+this.temp.city+this.temp.county
-              this.visible = true
-              if(this.temp.customerType!==''){
-                typeValues({type: 'customerType'}).then((res) => {
-                  if (res.code === '200') {
-                    if(this.temp.customerType=='个人'){
-                      this.temp.certificateType='身份证'
-                      this.temp.certificateTypeKey='01'
-                    }
-                    else{
-                      this.temp.certificateType='营业执照'
-                      this.temp.certificateTypeKey='02'
-                    }
-                    this.customerType_list = res.data
-                    this.customerType_list.forEach((e) => {
-                      if (e.dictValue == this.temp.customerType) {
-                        typeValues({psid: e.sid, type: this.customerClass}).then((res)=>{
-                          if (res.code === '200') {
-                            this.merClass = res.data
-                          }
-                        })
-                      }
-                    })
+      if (this.stateId !== '0') {
+        getPcCustomerInfoBySid(this.stateId).then((response) => {
+          console.log(response.data)
+          if (response.code === '200') {
+            this.$refs['dataForm'].clearValidate()
+            this.temp = response.data
+            this.temp.birthday = this.getDates(this.temp.birthday)
+            if (this.temp.customerType !== '') {
+              typeValues({ type: 'customerType' }).then((res) => {
+                if (res.code === '200') {
+                  if (this.temp.customerType === '个人') {
+                    this.temp.certificateType = '身份证'
+                    this.temp.certificateTypeKey = '01'
+                  } else {
+                    this.temp.certificateType = '营业执照'
+                    this.temp.certificateTypeKey = '02'
                   }
-                })
-              }
-              if (showed && typeof showed === 'function') {
-                showed()
-              }
-            }
-          })
-          getPcBusinessInfoBySid(this.stateId).then((response) => {
-            if (response.code === '200') {
-              this.templooke = response.data
-              //选择框回显
-              const Arry = []
-              Arry.push(parseInt(response.data.purchase_time))
-              this.aseTypeBox = Arry
-            }
-          })
-        }
-        // this.getChelianglsit()
-      },
-      //新增
-      openCreate(customerTypeList, showed) {
-        this.resetTemp()
-        this.temp.customerType = customerTypeList.customerType
-        this.temp.visitWay = customerTypeList.visitWay
-        this.temp.visitWayKey = customerTypeList.visitWayKey
-        this.$refs['dataForm'].clearValidate()
-        this.stateId = '0'
-        this.visible = true
-        if(this.temp.customerType!==''){
-          if(this.temp.customerType=='个人'){
-            this.temp.certificateType='身份证'
-            this.temp.certificateTypeKey='01'
-          }
-          else{
-            this.temp.certificateType='营业执照'
-            this.temp.certificateTypeKey='02'
-          }
-          typeValues({type: 'customerType'}).then((res) => {
-            if (res.code === '200') {
-              this.customerType_list = res.data
-              this.customerType_list.forEach((e) => {
-                if (e.dictValue == this.temp.customerType) {
-                  typeValues({psid: e.sid, type: this.customerClass}).then((res)=>{
-                    if (res.code === '200') {
-                      this.merClass = res.data
+                  this.customerType_list = res.data
+                  this.customerType_list.forEach((e) => {
+                    if (e.dictValue === this.temp.customerType) {
+                      typeValues({ psid: e.sid, type: this.customerClass }).then((res) => {
+                        if (res.code === '200') {
+                          this.merClass = res.data
+                        }
+                      })
                     }
                   })
                 }
               })
             }
-          })
-        }
-        if (showed && typeof showed === 'function') {
-          showed()
-        }
-      },
-      // ---------------------------------------------------------------------------------
-      // ---------------------------客户基础信息方法------------------------------------------------------
-      // ---------------------------------------------------------------------------------
-      // 下拉卡框 数据字典
-      getShuJUZiDian() {
-        typeValues({type: this.documenttype}).then((res) => {
-          if (res.code === '200') {
-            this.cateType = res.data
-          }
-        })
-        typeValues({type: this.customerType}).then((res) => {
-          if (res.code === '200') {
-            this.merType = res.data
-          }
-        })
-        //
-        typeValues({type: this.customerSource}).then((res) => {
-          if (res.code === '200') {
-            this.sourceLisst = res.data
-          }
-        })
-        //
-        typeValues({type: this.customerLevel}).then((res) => {
-          if (res.code === '200') {
-            this.induslevel = res.data
-          }
-        })
-        //
-        typeValues({type: this.visitWay}).then((res) => {
-          if (res.code === '200') {
-            this.industway = res.data
-          }
-        })
-        //
-        typeValues({type: this.industrytype}).then((res) => {
-          if (res.code === '200') {
-            this.industry_type = res.data
-          }
-        })
-        //
-        typeValues({type: this.consignmentType}).then((res) => {
-          if (res.code === '200') {
-            this.signmentT = res.data
-          }
-        })
-        //
-        typeValues({type: this.consignment}).then((res) => {
-          if (res.code === '200') {
-            this.consign = res.data
-          }
-        })
-        //
-        typeValues({type: 'sex'}).then((res) => {
-          if (res.code === '200') {
-            this.sex_list = res.data
           }
         })
-      },
-      // // 客户分类
-      // getKeHufenlei(kehusid) {
-      //   typeValues({psid: kehusid, type: this.customerClass}).then((res) => {
-      //     console.log('9988888', res)
-      //     if (res.code === '200') {
-      //       this.merClass = res.data
-      //     }
-      //   })
-      // },
-      // 挂靠单位
-      getGuaKao() {
-        // namesDown({name: this.temp.affiliatedOrgSid}).then((response) => {
-        //   if (response.code === '200') {
-        //     this.edOrgSid = response.data
-        //   }
-        // })
-      },
-      // -------------------------获取省市县方法-------------------------
-      huoquSheng() {
-        getProvince().then((res) => {
-          // console.log('11111省：', res)
-          if (res.code === '200') {
-            this.inputProvinceList = res.data
-          }
-
-        })
-      },
-      getShen(value) {
-        let bb = ''
-        this.inputProvinceList.forEach((e) => {
-          if (e.sid == value) {
-            bb = {
-              name: e.name,
-              districtCode: e.districtCode,
-              sid: e.sid
-            }
+        getPcBusinessInfoBySid(this.stateId).then((response) => {
+          if (response.code === '200') {
+            this.templooke = response.data
+            // 选择框回显
+            const Arry = []
+            Arry.push(parseInt(response.data.purchase_time))
+            this.aseTypeBox = Arry
           }
         })
-        // 这里是把code的值赋给province省字段
-        this.temp.province = bb.name
-        this.huoquShi(bb.sid)
-      },
-      huoquShi(sid1) {
-        var sid = {
-          sid: sid1
+      }
+    },
+    // 新增
+    openCreate(customerTypeList) {
+      this.temp.customerType = customerTypeList.customerType
+      this.temp.customerTypeKey = customerTypeList.customerTypeKey
+      this.temp.visitWay = customerTypeList.visitWay
+      this.temp.visitWayKey = customerTypeList.visitWayKey
+      this.$refs['dataForm'].clearValidate()
+      this.stateId = '0'
+      this.init()
+      if (this.temp.customerType !== '') {
+        if (this.temp.customerType === '个人') {
+          this.temp.certificateType = '身份证'
+          this.temp.certificateTypeKey = '01'
+        } else {
+          this.temp.certificateType = '营业执照'
+          this.temp.certificateTypeKey = '02'
         }
-        getCity(sid).then((res) => {
-          console.log('2222市', res)
+        typeValues({ psid: customerTypeList.psid, type: this.customerClass }).then((res) => {
           if (res.code === '200') {
-            this.inputCityList = res.data
-          }
-        })
-      },
-      getShi(value) {
-        let bb = ''
-        this.inputCityList.forEach((e) => {
-          if (e.sid == value) {
-            bb = {
-              name: e.name,
-              districtCode: e.districtCode,
-              sid: e.sid
-            }
+            this.merClass = res.data
           }
         })
-        this.temp.city = bb.name
-        this.huoquXian(bb.sid)
-      },
-      huoquXian(sid1) {
-        var sid = {
-          sid: sid1
+      }
+    },
+    // ---------------------------------------------------------------------------------
+    // ---------------------------客户基础信息方法------------------------------------------------------
+    // ---------------------------------------------------------------------------------
+    // 下拉卡框 数据字典
+    getShuJUZiDian() {
+      typeValues({ type: this.documenttype }).then((res) => {
+        if (res.code === '200') {
+          this.cateType = res.data
         }
-        getCounty(sid).then((res) => {
-          console.log('333县', res)
-          if (res.code === '200') {
-            this.inputCountyList = res.data
-          }
-        })
-      },
-      getQu(value) {
-        let bb = ''
-        this.inputCountyList.forEach((e) => {
-          if (e.sid == value) {
-            bb = {
-              name: e.name,
-              districtCode: e.districtCode,
-              sid: e.sid
-            }
-          }
-        })
-        this.temp.county = bb.name
-        // this.temp.address=this.temp.province+this.temp.city+this.temp.county
-        // this.deCode.push(bb.districtCode)
-        console.log('6666677777777', this.deCode)
-      },
-      // ----------------------------------方法--------------------
-      // 组件返回
-      handleReturn() {
-        this.visible=false
-        this.activeNames=['1']
-        this.$emit('handleReturn')
-      },
-      // 添加前数据初始化
-      resetTemp() {
-        this.temp = {}
-        this.templooke = {}
-        this.aseTypeBox = []
-        this.list1=[]
-      },
-      // 获取用户信息
-      postHuoquyonghu() {
-        var token = getStorage()
-        loginDetails(token).then((response) => {
-          if (response.code === '200') {
-            this.YongHuid = response.data
-          }
-        })
-      },
-
-      // 转换时间格式
-      getDates(v) {
-        var now = new Date(v)
-        var year = now.getFullYear() // 年
-        var month = now.getMonth() + 1 // 月
-        var day = now.getDate() // 日
-        var hh = now.getHours() // 时
-        var mm = now.getMinutes() // 分
-        var ss = now.getSeconds() // 分
-        var clock = year + '-'
-        if (month < 10) clock += '0'
-        clock += month + '-'
-        if (day < 10) clock += '0'
-        clock += day + ' '
-        if (hh < 10) clock += '0'
-        clock += hh + ':'
-        if (mm < 10) clock += '0'
-        clock += mm + ':'
-        if (ss < 10) clock += '0'
-        clock += ss
-        return clock
-      },
-      // 首次 续购 处理
-      findselect(list, value) {
-        var item = null
-        for (var i = 0; i < list.length; i++) {
-          if (list[i].divtkey == value) {
-            item = list[i]
-            break
-          }
+      })
+      //
+      typeValues({ type: this.customerSource }).then((res) => {
+        if (res.code === '200') {
+          this.sourceLisst = res.data
         }
-        return item
-      },
-      // 首次 续购
-      changexuanze() {
-        this.aseTypeBox = [this.aseTypeBox[this.aseTypeBox.length - 1]]
-        var item = this.findselect(this.aseType, this.aseTypeBox[0])
-        this.templooke.purchase_time = item.divtkey
-      },
-      // 保存客户运营数据
-      handleJUBuCun() {
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            this.FormLoading = true
-            if(this.temp.sex!==''){
-              this.sex_list.forEach((e)=>{
-                if(e.dictValue==this.temp.sex){
-                 this.temp.sexKey=e.dictKey
-                }
-              })
-            }
-            if(this.temp.isOnRemind!=='' && this.temp.isOnRemind=='是'){
-              this.temp.isOnRemindkey=1
-            }
-            else{
-              this.temp.isOnRemindkey=0
-            }
-            if(this.temp.customerType!==''){
-              let bb=''
-              this.merType.forEach((e) => {
-                if (e.dictValue == this.temp.customerType) {
-                  bb = {
-                    type: 'customerType',
-                    name: e.dictValue,
-                    value: e.dictKey,
-                    sid: e.sid,
-                  }
-                }
-              })
-              this.temp.customerTypeKey=bb.value
-            }
-
-              this.temp.dto1 = this.templooke // this.templooke这个是运营的数据源
-              this.temp.userSid = this.YongHuid.sid
-              this.temp.staffSid = this.YongHuid.staffSid
-              this.temp.orgSid = this.YongHuid.organizationSid
-              this.temp.crmBusinessDto = this.templooke
-              this.getUrl()
-              this.temp.crmVisitAppendixDtoList=this.crmVisitAppendixDtoList
-              savePcCustomerInfo(this.temp).then((response)=>{
-                this.FormLoading = false
-                if(response.code=== '200'){
-                  // this.clientSid = response.data
-                  this.$notify({
-                    title: '提示',
-                    message: '添加成功',
-                    type: 'success',
-                    duration: 2000,
-                  })
-                  this.templooke = {}
-                  this.visible = false
-                  this.activeNames=['1']
-                  this.list1=[]
-                  this.$emit('handleReturn')
-
-                }else if('511'===response.code || '513'===response.code){
-                  this.FormLoading = false
-                  this.dialogFormVisible = true
-                  this.stateId=response.data
-                }else{
-                  alert(200);
-                }
-              }).catch(function(reson,data){
-
-              })
-          }
-        })
-      },
-      dialogStatus() {
-        this.dialogFormVisible = false
-        this.openUpdate(this.stateId)
-        // this.$refs['dataForm'].validate((valid) => {
-        //   if (valid) {
-        //     this.FormLoading = true
-        //     console.log('77777777777777777777777777777777')
-        //     this.temp.dto1 = this.templooke // this.templooke这个是运营的数据源
-        //     this.temp.userSid = this.YongHuid.sid
-        //     this.temp.staffSid = this.YongHuid.staffSid
-        //     this.temp.orgSid = this.YongHuid.organizationSid
-        //     this.temp.userSid = this.YongHuid.sid
-        //     this.temp.crmBusinessDto = this.templooke
-        //     if(this.temp.sex!==''){
-        //       this.sex_list.forEach((e)=>{
-        //         if(e.dictValue==this.temp.sex){
-        //           this.temp.sexKey=e.dictKey
-        //         }
-        //       })
-        //     }
-        //     if(this.temp.isOnRemind!=='' && this.temp.isOnRemind=='是'){
-        //       this.temp.isOnRemindkey=1
-        //     }
-        //     else{
-        //       this.temp.isOnRemindkey=0
-        //     }
-        //     this.getUrl()
-        //     savePcCustomerInfo(this.temp).then((response) => {
-        //       this.FormLoading = false
-        //         if (response.code === '200') {
-        //           this.clientSid = response.data
-        //           this.$notify({
-        //             title: '提示',
-        //             message: '添加成功',
-        //             type: 'success',
-        //             duration: 2000,
-        //           })
-        //           this.templooke = []
-        //           this.dialogFormVisible = false
-        //           this.visible = false
-        //           this.$emit('handleReturn')
-        //       } else {
-        //               this.$notify({
-        //                 title: '提示',
-        //                 message: '添加失败',
-        //                 type: 'error',
-        //                 duration: 2000,
-        //               })
-        //             }
-        //       })
-        //   }
-        // })
-      },
-      dialogFormVisibl() {
-        this.$notify({
-          title: '提示',
-          message: '用户名手机号重复',
-          type: 'error',
-          duration: 2000,
-        })
-        this.dialogFormVisible = false
-        return
-      },
-      // ----------------------------------------------------------------------------------
-      // ---------------------------模糊搜索------------------------------------------------------
-      // ---------------------------------------------------------------------------------
-      // 中介单位
-      getZhongJie() {
-        // getPcDistributorList().then((response) => {
-        //   if (response.code === '200') {
-        //     this.ncySid = response.data
-        //   }
-        // })
-      },
-      // 中介单位处理
-      getZongjieDanwei(value) {
-        let bb = null
-        this.ncySid.forEach((e) => {
-          if (e.sid == value) {
-            bb = {
-              name: e.distributorName,
-            }
-          }
-        })
-        this.temp.agencyName = bb.name
-      },
-      // ---------------------------------------------------------------------------------
-      // ---------------------------数据字典的处理------------------------------------------------------
-      // ---------------------------------------------------------------------------------
-      // 证件类型
-      getZhengJian(value) {
-        let bb = null
-        this.cateType.forEach((e) => {
-          if (e.dictKey == value) {
-            bb = {
-              type: 'documenttype',
-              name: e.dictValue,
-              vaule: e.dictKey,
-            }
-          }
-        })
-        this.temp.certificateType = bb.name
-        this.temp.certificateTypeKey = bb.vaule
-      },
-      // 客户类型
-      // getKeHu(value) {
-      //   let bb = null
-      //   this.merType.forEach((e) => {
-      //     if (e.dictKey == value) {
-      //       bb = {
-      //         type: 'customerType',
-      //         name: e.dictValue,
-      //         vaule: e.dictKey,
-      //         sid: e.sid,
-      //       }
-      //     }
-      //   })
-      //   this.temp.customerType = bb.name
-      //   console.log('value值', this.temp.customerType)
-      //   this.temp.customerTypeKey = bb.vaule
-      //   console.log('key值', this.temp.customerTypeKey)
-      //   this.kehusid = bb.sid
-      //   console.log('sid值', this.kehusid)
-      //   this.getKeHufenlei(this.kehusid)
-      // },
-      // 客户分类
-      getFenLei(value) {
-        let bb = null
-        this.merClass.forEach((e) => {
-          if (e.dictKey == value) {
-            bb = {
-              type: 'customerClass',
-              name: e.dictValue,
-              vaule: e.dictKey,
-            }
-          }
-        })
-        this.temp.customerClass = bb.name
-        this.temp.customerClassKey = bb.vaule
-      },
-      // 客户来源
-      getKeHuLaiYUan(value) {
-        let bb = null
-        this.sourceLisst.forEach((e) => {
-          if (e.dictKey == value) {
-            bb = {
-              type: 'customerSource',
-              name: e.dictValue,
-              vaule: e.dictKey,
-            }
-          }
-        })
-        this.temp.source = bb.name
-        this.temp.sourceKey = bb.vaule
-      },
-      // 客户级别
-      getJiBie(value) {
-        let bb = null
-        this.induslevel.forEach((e) => {
-          if (e.dictKey == value) {
-            bb = {
-              type: 'customerLevel',
-              name: e.dictValue,
-              vaule: e.dictKey,
-            }
+      })
+      //
+      typeValues({ type: this.customerLevel }).then((res) => {
+        if (res.code === '200') {
+          this.induslevel = res.data
+        }
+      })
+      //
+      typeValues({ type: this.visitWay }).then((res) => {
+        if (res.code === '200') {
+          this.industway = res.data
+        }
+      })
+      //
+      typeValues({ type: this.industrytype }).then((res) => {
+        if (res.code === '200') {
+          this.industry_type = res.data
+        }
+      })
+      //
+      typeValues({ type: this.consignmentType }).then((res) => {
+        if (res.code === '200') {
+          this.signmentT = res.data
+        }
+      })
+      //
+      typeValues({ type: this.consignment }).then((res) => {
+        if (res.code === '200') {
+          this.consign = res.data
+        }
+      })
+      //
+      typeValues({ type: 'sex' }).then((res) => {
+        if (res.code === '200') {
+          this.sex_list = res.data
+        }
+      })
+    },
+    // -------------------------获取省市县方法-------------------------
+    huoquSheng() {
+      getProvince().then((res) => {
+        if (res.code === '200') {
+          this.inputProvinceList = res.data
+        }
+      })
+    },
+    getShen(value) {
+      let bb = ''
+      this.inputProvinceList.forEach((e) => {
+        if (e.sid === value) {
+          bb = {
+            name: e.name,
+            districtCode: e.districtCode,
+            sid: e.sid
           }
-        })
-        this.temp.level = bb.name
-        this.temp.levelKey = bb.vaule
-      },
-      // 来访
-      getLaiFang(value) {
-        let bb = null
-        this.industway.forEach((e) => {
-          if (e.dictKey == value) {
-            bb = {
-              type: 'visitWay',
-              name: e.dictValue,
-              vaule: e.dictKey,
-            }
+        }
+      })
+      // 这里是把code的值赋给province省字段
+      this.temp.province = bb.name
+      this.huoquShi(bb.sid)
+    },
+    huoquShi(sid1) {
+      var sid = {
+        sid: sid1
+      }
+      getCity(sid).then((res) => {
+        console.log('2222市', res)
+        if (res.code === '200') {
+          this.inputCityList = res.data
+        }
+      })
+    },
+    getShi(value) {
+      let bb = ''
+      this.inputCityList.forEach((e) => {
+        if (e.sid === value) {
+          bb = {
+            name: e.name,
+            districtCode: e.districtCode,
+            sid: e.sid
           }
-        })
-        this.temp.visit_way = bb.name
-        this.temp.visit_way_key = bb.vaule
-      },
-      // 客户行业
-      getHangYe(value) {
-        let bb = null
-        this.industry_type.forEach((e) => {
-          if (e.dictKey == value) {
-            bb = {
-              type: 'industrytype',
-              name: e.dictValue,
-              vaule: e.dictKey,
-            }
+        }
+      })
+      this.temp.city = bb.name
+      this.huoquXian(bb.sid)
+    },
+    huoquXian(sid1) {
+      var sid = {
+        sid: sid1
+      }
+      getCounty(sid).then((res) => {
+        console.log('333县', res)
+        if (res.code === '200') {
+          this.inputCountyList = res.data
+        }
+      })
+    },
+    getQu(value) {
+      let bb = ''
+      this.inputCountyList.forEach((e) => {
+        if (e.sid === value) {
+          bb = {
+            name: e.name,
+            districtCode: e.districtCode,
+            sid: e.sid
           }
-        })
-        this.templooke.customer_industry_type = bb.name
-        this.templooke.customer_industry_type_key = bb.vaule
-      },
-      // 货物类别
-      getHuoWuLeiXing(value) {
-        let bb = null
-        this.signmentT.forEach((e) => {
-          if (e.dictKey == value) {
-            bb = {
-              type: 'consignmentType',
-              name: e.dictValue,
-              vaule: e.dictKey,
-            }
+        }
+      })
+      this.temp.county = bb.name
+    },
+    // ----------------------------------方法--------------------
+    // 组件返回
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.activeNames = ['1']
+      this.templooke = {}
+      this.temp = {}
+      this.aseTypeBox = []
+      this.$emit('doback')
+    },
+    // 转换时间格式
+    getDates(v) {
+      var now = new Date(v)
+      var year = now.getFullYear() // 年
+      var month = now.getMonth() + 1 // 月
+      var day = now.getDate() // 日
+      var hh = now.getHours() // 时
+      var mm = now.getMinutes() // 分
+      var ss = now.getSeconds() // 分
+      var clock = year + '-'
+      if (month < 10) clock += '0'
+      clock += month + '-'
+      if (day < 10) clock += '0'
+      clock += day + ' '
+      if (hh < 10) clock += '0'
+      clock += hh + ':'
+      if (mm < 10) clock += '0'
+      clock += mm + ':'
+      if (ss < 10) clock += '0'
+      clock += ss
+      return clock
+    },
+    // 首次 续购 处理
+    findselect(list, value) {
+      var item = null
+      for (var i = 0; i < list.length; i++) {
+        if (list[i].divtkey === value) {
+          item = list[i]
+          break
+        }
+      }
+      return item
+    },
+    // 首次 续购
+    changexuanze() {
+      this.aseTypeBox = [this.aseTypeBox[this.aseTypeBox.length - 1]]
+      const item = this.findselect(this.aseType, this.aseTypeBox[0])
+      this.templooke.purchase_time = item.divtkey
+    },
+    // 保存客户运营数据
+    handleJUBuCun() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.FormLoading = true
+          if (this.temp.sex !== '') {
+            this.sex_list.forEach((e) => {
+              if (e.dictValue === this.temp.sex) {
+                this.temp.sexKey = e.dictKey
+              }
+            })
           }
-        })
-        this.templooke.consignmentType = bb.name
-        this.templooke.consignmentTypeKey = bb.vaule
-      },
-      // 货物
-      getHuoWu(value) {
-        let bb = null
-        this.consign.forEach((e) => {
-          if (e.dictKey == value) {
-            bb = {
-              type: 'consignment',
-              name: e.dictValue,
-              vaule: e.dictKey,
-            }
+          if (this.temp.isOnRemind !== '' && this.temp.isOnRemind === '是') {
+            this.temp.isOnRemindkey = 1
+          } else {
+            this.temp.isOnRemindkey = 0
+          }
+          if (!this.temp.birthday) {
+            this.temp.birthday = ''
+          }
+          if (this.stateId === '0') {
+            this.temp.userSid = window.sessionStorage.getItem('userSid')
+            this.temp.crmBusinessDto = this.templooke
+            this.getUrl()
+            this.temp.crmVisitAppendixDtoList = this.crmVisitAppendixDtoList
+            savePcCustomerInfo(this.temp).then((response) => {
+              this.FormLoading = false
+              if (response.code === '200') {
+                this.$notify({
+                  title: '提示',
+                  message: '添加成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.list1 = []
+                this.handleReturn('true')
+              } else if ('511' === response.code || '513' === response.code) {
+                this.FormLoading = false
+                this.dialogFormVisible = true
+                this.stateId = response.data
+              } else {
+                alert(200)
+              }
+            }).catch(() => {})
+          } else {
+            this.temp.userSid = window.sessionStorage.getItem('userSid')
+            this.temp.crmBusinessDto = this.templooke
+            updatePcCustomerInfo(this.temp).then((res) => {
+              this.FormLoading = false
+              if (res.code === '200') {
+                this.$notify({
+                  title: '提示',
+                  message: '修改成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.handleReturn('true')
+              } else {
+                this.$notify({
+                  title: '提示',
+                  message: '修改失败',
+                  type: 'error',
+                  duration: 2000
+                })
+              }
+            })
           }
-        })
-        this.templooke.consignment = bb.name
-        this.templooke.consignmentKey = bb.vaule
-      },
-      // ---------------------------------------------------------------------------------
-      // ---------------------------车辆需求方法------------------------------------------------------
-      // ---------------------------------------------------------------------------------
-      //车辆列表查询
-      getChelianglsit() {
-        var query = {
-          customerSid: this.stateId,
-          staffSid: this.YongHuid.staffSid,
         }
-        pagerList(query).then((response) => {
-          if (response.code === '200') {
-            this.list = response.data
+      })
+    },
+    dialogStatus() {
+      this.dialogFormVisible = false
+      this.openUpdate(this.stateId)
+    },
+    dialogFormVisibl() {
+      this.$notify({
+        title: '提示',
+        message: '用户名手机号重复',
+        type: 'error',
+        duration: 2000
+      })
+      this.dialogFormVisible = false
+      return
+    },
+    // 客户分类
+    getFenLei(value) {
+      let bb = null
+      this.merClass.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: 'customerClass',
+            name: e.dictValue,
+            vaule: e.dictKey
           }
-        })
-      },
-      // 添加保存完成
-      dataCreated() {
-        this.visible = true
-        this.$refs['dataForm'].resetFields() //
-        this.temp = []
-        this.$refs['datufrom'].resetFields() //
-        this.templooke = []
-        this.$emit('created')
-      },
-      // 修改保存完成
-      dataUpdated() {
-        this.visible = true
-        this.getList()
-      },
-      //查看
-      handlelooke(row) {
-        this.$refs.Info.openinfo(row.sid, this.stateId, () => {
-          debugger
-          this.visible = false
-        })
-      },
-      // 打开修改
-      handleUpdate(row) {
-        this.$refs.addAndUpdate.openUpdate(
-          row.sid,
-          this.stateId,
-          this.checkin,
-          () => {
-            this.visible = false
+        }
+      })
+      this.temp.customerClass = bb.name
+      this.temp.customerClassKey = bb.vaule
+    },
+    // 客户来源
+    getKeHuLaiYUan(value) {
+      let bb = null
+      this.sourceLisst.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: 'customerSource',
+            name: e.dictValue,
+            vaule: e.dictKey
           }
-        )
-      },
-      // 根据本行ID删除数据
-      handleDelete(row) {
-        delBySids(row.sid).then((response) => {
-          if (response.code === '200') {
-            this.$notify({
-              title: '提示',
-              message: '删除成功',
-              type: 'success',
-              duration: 2000,
-            })
-            this.getChelianglsit()
-          } else {
-            this.$notify({
-              title: '删除失败',
-              message: response.msg,
-              type: 'error',
-            })
+        }
+      })
+      this.temp.source = bb.name
+      this.temp.sourceKey = bb.vaule
+    },
+    // 客户级别
+    getJiBie(value) {
+      let bb = null
+      this.induslevel.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: 'customerLevel',
+            name: e.dictValue,
+            vaule: e.dictKey
           }
-        })
-      },
-      //------------------------------见证材料--------------------------------
-      getUrl() {
-        for (var i = 0; i < this.list1.length; i++) {
-          var namese = this.list1[i].name
-          var nameArr = namese.split('.')
-          this.crmVisitAppendixDtoList.push({
-            // attachType: '0001',
-            fileName: this.list1[i].name,
-            filePath: this.list1[i].url,
-            fileSize: this.list1[i].size,
-            // linkSid: this.temp.customerSid,
-            createBySid: this.YongHuid.sid,
-            fileType: nameArr[nameArr.length - 1],
-          })
-          console.log('11223344', this.crmVisitAppendixDtoList)
         }
-      },
-      //------------------------------客户登记--------------------------------
-      //新增
-      showAdd(register, showed) {
-        this.checkin = register
-        console.log('852', this.checkin)
-        this.$refs['dataForm'].clearValidate()
-        this.stateId = '0'
-        // this.resetTemp()
-        this.visible = true
-        if (showed && typeof showed === 'function') {
-          showed()
+      })
+      this.temp.level = bb.name
+      this.temp.levelKey = bb.vaule
+    },
+    // 货物类别
+    getHuoWuLeiXing(value) {
+      let bb = null
+      this.signmentT.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: 'consignmentType',
+            name: e.dictValue,
+            vaule: e.dictKey
+          }
         }
-      },
-      showEdit(sid, register, showed) {
-        this.clientSid = sid
-        this.stateId = sid
-        this.checkin = register
-        if (this.stateId !== '0') {
-          getPcCustomerInfoBySid(this.stateId).then((response) => {
-            if (response.code === '200') {
-              this.$refs['dataForm'].clearValidate()
-              this.temp = response.data
-              this.temp.birthday = this.getDates(this.temp.birthday)
-              this.visible = true
-              if (showed && typeof showed === 'function') {
-                showed()
-              }
-            }
-          })
-          getPcBusinessInfoBySid(this.stateId).then((response) => {
-            if (response.code === '200') {
-              this.templooke = response.data
-              //选择框回显
-              const Arry = []
-              Arry.push(parseInt(response.data.purchase_time))
-              this.aseTypeBox = Arry
-            }
-          })
+      })
+      this.templooke.consignmentType = bb.name
+      this.templooke.consignmentTypeKey = bb.vaule
+    },
+    // 货物
+    getHuoWu(value) {
+      let bb = null
+      this.consign.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: 'consignment',
+            name: e.dictValue,
+            vaule: e.dictKey
+          }
         }
-        this.getChelianglsit()
-      },
-      // 添加保存完成
-      dataDengJi() {
-        this.visible = true
-        this.$emit('doback')
-      },
-      dataModify() {
-        this.visible = true
-        // this.$emit('doback')
-      },
+      })
+      this.templooke.consignment = bb.name
+      this.templooke.consignmentKey = bb.vaule
     },
+    // ------------------------------见证材料--------------------------------
+    getUrl() {
+      for (var i = 0; i < this.list1.length; i++) {
+        var namese = this.list1[i].name
+        var nameArr = namese.split('.')
+        this.crmVisitAppendixDtoList.push({
+          // attachType: '0001',
+          fileName: this.list1[i].name,
+          filePath: this.list1[i].url,
+          fileSize: this.list1[i].size,
+          // linkSid: this.temp.customerSid,
+          createBySid: window.sessionStorage.getItem('userSid'),
+          fileType: nameArr[nameArr.length - 1]
+        })
+        console.log('11223344', this.crmVisitAppendixDtoList)
+      }
+    }
   }
+}
 </script>
 <style scoped>
-  .yulan {
-    text-align: right;
-    margin-top: 15px;
-  }
-  .tleftb{
-    text-align: left;
-  }
-  .trightb{
-    text-align: right;
-  }
-  .hang {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
-    padding: 20px 10px;
-  }
 
-  .addinputwduan {
-    width: 80px;
-    margin: 0 5px;
-  }
+.trightb {
+  text-align: right;
+}
 
-  /*.formadd02 {*/
-  /*  padding-top: 20px;*/
-  /*}*/
+.addinputwduan {
+  width: 80px;
+  margin: 0 5px;
+}
 
-  /*.formadd03 {*/
-  /*  padding-top: 20px;*/
-  /*}*/
+/deep/ .el-collapse-item__header {
+  height: 40px;
+  padding: 10px;
+  font-weight: bold;
+  font-size: 20px;
+  text-align: left;
+  color: #ffffff;
+  background-color: #0294d7;
+}
 
-  /deep/ .el-collapse-item__header {
-    height:40px;
-    padding: 10px;
-    font-weight: bold;
-    font-size: 20px;
-    text-align: left;
-    color: #ffffff;
-    background-color: #0294d7;
-  }
-  /deep/ .el-collapse-item__content{
-    padding-bottom: 0;
-  }
+/deep/ .el-collapse-item__content {
+  padding-bottom: 0;
+}
 </style>
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 8da38759e0..5d174d2dfd 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
@@ -1,66 +1,88 @@
 <template>
   <div class="app-container">
-    <div v-show="visible">
+    <div v-show="viewState == 1">
       <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="info" size="small" @click="handleReturn()">返回</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
       <div class="listconadd">
-        <el-form ref="dataForm" :model="temp" label-position="right" label-width="100%" class="formadd" :rules="rules">
-          <div class="tit">
-            销售虚拟订车单
-            <div class="times">
-              <div><span>分公司：</span><span>{{ temp.departmentName }}</span></div>
-              <div><span>申请人：</span><span>{{ temp.staffName }}</span></div>
-              <div><span>申请日期：</span><span>{{ temp.createDate }}</span></div>
-              <div><span>金额单位：</span><span>元</span></div>
-            </div>
-          </div>
-          <el-row class="bordertopline">
-            <el-col :span="2" class="tleftb">
-              <el-form-item>订单类型</el-form-item>
+        <div class="titwu">销售简易订单</div>
+        <el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
+          <el-row class="rowStyle">
+            <el-col :span="24" class="tleftb colStyle">
+              <span>金额单位: 元</span>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span>分公司</span>
             </el-col>
-            <el-col :span="6" class="trightb">
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.departmentName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>申请人</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.staffName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>申请日期</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.createDate }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span>订单类型</span>
+            </el-col>
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.depositBillType }}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="2" class="tleftb">
-              <el-form-item>客户名称</el-form-item>
+            <el-col :span="3" class="tleftb">
+              <span>客户名称</span>
             </el-col>
-            <el-col :span="6" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 {{ temp.customerName }}
-                <span class="bluezi changeIt" @click="handleCustomer()">选择客户/新增客户</span>
+                <span class="bluezi changeIt" @click="handleCustomer()">选择客户</span>
               </el-form-item>
             </el-col>
-            <el-col :span="2" class="tleftb">
-              <el-form-item>联系电话</el-form-item>
+            <el-col :span="3" class="tleftb">
+              <span>联系电话</span>
             </el-col>
-            <el-col :span="6" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 {{ temp.mobile }}
               </el-form-item>
             </el-col>
           </el-row>
           <!--Start 预订车辆信息-->
-          <div class="titcon">
-            <div class="title">预订车辆信息</div>
-            <div class="baocun">
-              <el-button size="medium" type="primary" @click="handleyudingcheliang" class="btntopbluebut">选择车辆
+          <div class="title">
+            <div>预订车辆信息</div>
+            <div>
+              <el-button size="mini" type="primary" @click="handleyudingcheliang" class="btntopbluebut">选择车辆
               </el-button>
             </div>
           </div>
           <el-table v-loading="listLoading" :data="list" border style="width: 100%" :index="index">
-            <el-table-column align="center" label="序号" type="index" width="50"/>
+            <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,list[scope.$index])">删除
                 </el-button>
               </template>
             </el-table-column>
@@ -75,12 +97,12 @@
               </template>
             </el-table-column>
             <el-table-column label="车架号" width="140px" align="center">
-              <template slot-scope="scope" @click="">
+              <template slot-scope="scope">
                 <span>{{ scope.row.vin }}</span>
               </template>
             </el-table-column>
             <el-table-column label="颜色" width="100px" align="center">
-              <template slot-scope="scope" @click="">
+              <template slot-scope="scope">
                 <span>{{ scope.row.colour }}</span>
               </template>
             </el-table-column>
@@ -96,10 +118,7 @@
             </el-table-column>
             <el-table-column label="预计订金日期" width="220px" align="center">
               <template slot-scope="scope">
-                <el-date-picker v-model="scope.row.depositDate" type="date" style="width:90%"
-                                value-format="yyyy-MM-dd"
-                                placeholder="选择日期"
-                                :picker-options="pickerOptions">
+                <el-date-picker v-model="scope.row.depositDate" type="date" style="width:90%" value-format="yyyy-MM-dd" placeholder="选择日期" :picker-options="pickerOptions">
                 </el-date-picker>
               </template>
             </el-table-column>
@@ -112,33 +131,22 @@
         </el-form>
       </div>
     </div>
-
     <!--选择车辆（确定）-->
-    <xuanzecheliang v-show="xuanzecheliangShow" @yudingcheliangfanhui="yudingcheliangfanhui" ref="xuanzecheliang"
-                    @handleVehicle="selectVehicle"/>
+    <xuanzecheliang v-show="viewState == 3" @yudingcheliangfanhui="resetState" ref="divCheLiang" @handleVehicle="selectVehicle"/>
     <!--选择客户（确定）-->
-    <xuanzekehu v-show="xuanzekehuShow" @yudingcheliangfanhui="yudingcheliangfanhui" ref="xuanzekehu"
-                @handleCustomer="selectCustomer"/>
+    <xuanzekehu v-show="viewState == 2" ref="divSelect" @doback="resetState" @handleCustomer="selectCustomer"/>
   </div>
 </template>
 
 <script>
-import {fetchBySid, getPathSidByUserSid} from '@/api/dictcommons/dictcommons'
-import {saveChe, selectSid, submitVehicleApprove, typeValues} from '@/api/jichuxinxi/busdeposit'
-import yudingcheliang from "@/views/xiaoshouguanli/xunidingdan/com/yudingcheliang"
-import hetongdanganguanliAdd from '@/views/hetongguanli/hetongdanganguanli/hetongdanganguanliAdd.vue'
-import hetongdanganguanliInfo from '@/views/hetongguanli/hetongdanganguanli/hetongdanganguanliInfo.vue'
-import kehudanganAdd from '@/views/kehuguanli/kehudangan/kehudanganAdd.vue'
-import xuanzecheliang from "@/views/xiaoshouguanli/xunidingdan/com/xuanzecheliang"
-import xuanzekehu from "@/views/xiaoshouguanli/xunidingdan/com/xuanzekehu"
+import { fetchBySid, getPathSidByUserSid } from '@/api/dictcommons/dictcommons'
+import { saveChe, selectSid, submitVehicleApprove, typeValues } from '@/api/jichuxinxi/busdeposit'
+import xuanzecheliang from '@/views/xiaoshouguanli/xunidingdan/com/xuanzecheliang'
+import xuanzekehu from '@/views/xiaoshouguanli/xunidingdan/com/xuanzekehu'
 
 export default {
-  name: 'Add',
+  name: 'xunidingdanAdd',
   components: {
-    yudingcheliang,
-    hetongdanganguanliAdd,
-    hetongdanganguanliInfo,
-    kehudanganAdd,
     xuanzecheliang,
     xuanzekehu
   },
@@ -147,56 +155,42 @@ export default {
       // 限制日期不可选择当天之前的
       pickerOptions: {
         disabledDate(time) {
-          let threeDay = 60 * 60 * 24 * 1000 * 3;
-          return time.getTime() < Date.now() || time.getTime() > Date.now() + threeDay;
-        },
+          let threeDay = 60 * 60 * 24 * 1000 * 3
+          return time.getTime() < Date.now() || time.getTime() > Date.now() + threeDay
+        }
       },
       viewTitle: '',
       index: 0,
       disabled: false, // 提交按钮状态
-      // dialogStatus: 'add',
       // --按钮菜单-------
-      YongHuid: [],
-      edit: true,
-      visible: true,
-      stateId: '0',
+      viewState: 1,
       FormLoading: false,
       listLoading: false,
       list: [],
       temp: {
         staffName: '',
-        customerSid: '',  // 客户sid
-        virtualOrderSid: '',  // 虚拟订单s
-        customerName: '',  // 客户名称
-        virtualOrderId: '',  // 虚拟订单s
-        sellerName: '',  // 销售专员
-        departmentName: '',  // 部门名称
-        mobile: '',  // 手机号
-        createDate: '',  // 创建时间
+        customerSid: '', // 客户sid
+        virtualOrderSid: '', // 虚拟订单s
+        customerName: '', // 客户名称
+        virtualOrderId: '', // 虚拟订单s
+        sellerName: '', // 销售专员
+        departmentName: '', // 部门名称
+        mobile: '', // 手机号
+        createDate: '', // 创建时间
         carList: [],
         taskId: '', // 任务Id
         procInsId: '', // 流程实例ID
         userSid: window.sessionStorage.getItem('userSid')
-      }, // 添加和修改
-      xuniSid: '',
-      mobile: '',
-      orgName: '',
+      },
       staffName: '',
-      _userSid: '',
       deposit_list: [],
       customerName: [],
-      tificateT: [],
-      dnumbDate: [],
-      dialogStatus: '', // 对话框状态
-      yudingcheliangShow: false,
-      xuanzecheliangShow: false, // 选择车辆
-      xuanzekehuShow: false, // 选择客户
-      rules: {},
+      rules: {}
       // ------------------------------------
     }
   },
   methods: {
-    //下拉框-预计订金日期
+    // 下拉框-预计订金日期
     getDeposit_date() {
       typeValues({
         type: 'reserveDepositDate'
@@ -217,7 +211,7 @@ export default {
     },
     getPathSid() {
       const userSid = window.sessionStorage.getItem('userSid')
-      getPathSidByUserSid({userSid: userSid}).then((res) => {
+      getPathSidByUserSid({ userSid: userSid }).then((res) => {
         if (res.success) {
           this.getCreateOrgName(res.data)
         }
@@ -231,34 +225,30 @@ export default {
       })
     },
     showAdd(depositBillType, depositBillTypeKey) {
-      this.stateId = '0';
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
-      });
-      var nowDate = new Date();
+      })
+      var nowDate = new Date()
       var date = {
         year: nowDate.getFullYear(),
         month: nowDate.getMonth() + 1,
-        day: nowDate.getDate(),
+        day: nowDate.getDate()
       }
       var dayDate = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
       this.temp.createDate = dayDate // 申请日期
       this.temp.staffName = window.sessionStorage.getItem('name') // 申请人
       this.temp.depositBillType = depositBillType
       this.temp.depositBillTypeKey = depositBillTypeKey
-      this.dialogStatus = 'add';
-      this.viewTitle = '【新增】销售简易订单';
+      this.viewTitle = '【新增】销售简易订单'
       this.getDeposit_date()
       this.getPathSid() // 分公司
     },
     showEdit(sid, depositBillType) {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
-      });
-      this.stateId = '1'
+      })
       this.temp.sid = sid
-      this.dialogStatus = 'edit';
-      this.viewTitle = '【编辑】销售简易订单';
+      this.viewTitle = '【编辑】销售简易订单'
       const data = {
         customerSid: '',
         virtualOrderSid: sid,
@@ -270,24 +260,21 @@ export default {
           this.list = response.data.carList
           this.temp.depositBillType = depositBillType
         }
-      });
+      })
       this.getDeposit_date()
     },
-
     // ------------ 功能实现 ------------
     // 添加数据
     handleCreate() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.dialogStatus = 'create';
-          this.temp.carList = this.list;
+          this.temp.carList = this.list
           this.temp.staffSid = window.sessionStorage.getItem('staffSid')
           this.temp.orgSid = window.sessionStorage.getItem('orgSid')
           saveChe(this.temp).then((response) => {
-            this.FormLoading = true;
+            this.FormLoading = true
             if (response.code === '200') {
-              this.xuniSid = response.data;
-              this.FormLoading = false;
+              this.FormLoading = false
               this.handleReturn('true')
               // this.$emit('doback')
             } else {
@@ -295,14 +282,13 @@ export default {
                 title: '提示',
                 message: '添加失败',
                 type: 'error',
-                duration: 2000,
+                duration: 2000
               })
             }
           })
         }
       })
     },
-
     // 提交
     handleSubmit() {
       this.$confirm('是否确定提交该业务', '提示', {
@@ -312,9 +298,8 @@ export default {
       }).then(() => {
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
-            this.FormLoading = true;
-            this.dialogStatus = 'create';
-            this.temp.carList = this.list;
+            this.FormLoading = true
+            this.temp.carList = this.list
             this.temp.staffSid = window.sessionStorage.getItem('staffSid')
             this.temp.orgSid = window.sessionStorage.getItem('orgSid')
             console.log('提交时sid', this.temp.sid)
@@ -325,14 +310,14 @@ export default {
                   title: '提示',
                   message: '提交成功',
                   type: 'success',
-                  duration: 2000,
+                  duration: 2000
                 })
                 this.handleReturn('true')
               } else {
                 this.$notify({
                   title: '提交失败',
                   message: response.msg,
-                  type: 'error',
+                  type: 'error'
                 })
               }
             })
@@ -342,18 +327,18 @@ export default {
     },
     // 返回
     handleReturn(isreload) {
-      if (isreload === 'true') this.$emit('reloadlist');
-      this.temp.sid = ''; // SID
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.temp.sid = '' // SID
       this.temp = {
         staffName: '',
-        customerSid: '',  // 客户sid
-        virtualOrderSid: '',  // 虚拟订单s
-        customerName: '',  // 客户名称
-        virtualOrderId: '',  // 虚拟订单s
-        sellerName: '',  // 销售专员
-        departmentName: '',  // 部门名称
-        mobile: '',  // 手机号
-        createDate: '',  // 创建时间
+        customerSid: '', // 客户sid
+        virtualOrderSid: '', // 虚拟订单s
+        customerName: '', // 客户名称
+        virtualOrderId: '', // 虚拟订单s
+        sellerName: '', // 销售专员
+        departmentName: '', // 部门名称
+        mobile: '', // 手机号
+        createDate: '', // 创建时间
         carList: [],
         taskId: '', // 任务Id
         procInsId: '', // 流程实例ID
@@ -361,17 +346,19 @@ export default {
       }
       this.disabled = false
       this.list = []
-      this.$refs['dataForm'].resetFields();
+      this.$refs['dataForm'].resetFields()
       this.$emit('doback')
     },
     // 返回客户数据
     selectCustomer(row) {
+      this.viewState = 1
       this.temp.customerName = row.name
       this.temp.customerSid = row.sid
       this.temp.mobile = row.mobile
     },
     // 返回车辆表数据
     selectVehicle(depositVehicleList) {
+      this.viewState = 1
       for (var i = 0; i < depositVehicleList.length; i++) {
         this.list.push({
           brand: depositVehicleList[i].brandName,
@@ -389,64 +376,42 @@ export default {
     // 删除一行
     handleDelete(row, index) {
       this.list.splice(index, 1)
-      // if (row.sid !== '') {
-      //   const sid_list = []
-      //   sid_list.push(row.sid, row.vehicleSid)
-      //   console.log('删除车辆信息', sid_list)
-      // } else {
-      //   this.list.splice(index, 1)
-      // }
     },
     // ------------ 页面跳转以及数据获取 ------------
     // 打开车辆
     handleyudingcheliang() {
-      this.visible = false;
-      this.xuanzekehuShow = false;
-      this.xuanzecheliangShow = true;
-      this.yudingcheliangShow = false;
+      this.viewState = 3
+      this.$refs['divCheLiang'].init()
     },
     // 打开选择客户页面
     handleCustomer() {
-      this.xuanzekehuShow = true
-      this.xuanzecheliangShow = false;
-      this.visible = false;
-      this.yudingcheliangShow = false;
+      this.viewState = 2
+      this.$refs['divSelect'].init()
     },
     // 车辆、客户返回
-    yudingcheliangfanhui() {
-      this.visible = true;
-      this.xuanzecheliangShow = false
-      this.xuanzekehuShow = false
-      this.yudingcheliangShow = false;
-    },
-
-
-  },
+    resetState() {
+      this.viewState = 1
+    }
+  }
 }
 </script>
 <style scoped>
-.tit {
-  margin: 0 0 20px 0;
-  padding: 10px 0 0 0;
-}
-
-.times {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-around;
-  padding: 30px 0 10px 0;
-  margin: 0 auto 0px auto;
-  width: 70%;
-  font-size: 14px;
+.rowStyle {
+  border-left: 0px !important;
 }
-
-/deep/ .el-form-item__content {
-  margin-left: 0 !important;
+.colStyle {
+  border-right: 0px !important;
 }
-
 .changeIt {
   line-height: 40px;
   font-size: 17px;
   float: right;
 }
+.title {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
 </style>
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 082a88a8b3..a2ac51d93a 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
@@ -2,46 +2,23 @@
   <div class="app-container">
     <div v-show="viewState == 1">
       <button-bar view-title="销售简易订单管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
-      <div class="tab-header webtop">
-      </div>
-      <div class="webcon">
+      <div class="main-content">
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
-            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="130px" class="tab-header">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
               <el-form-item label="订单类型">
                 <el-select v-model="listQuery.params.depositBillTypeKey" placeholder="请选择">
-                  <el-option
-                    v-for="item in depositType"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey">
-                  </el-option>
+                  <el-option v-for="item in depositType" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="客户(付款人)">
-                <el-input v-model="listQuery.params.customerName" placeholder="请输入" clearable class="filter-item"/>
+                <el-input v-model="listQuery.params.name" placeholder="请输入" clearable class="filter-item"/>
               </el-form-item>
               <el-form-item label="申请日期">
-                <div class="block">
-                  <el-date-picker
-                    v-model="listQuery.params.startTime"
-                    type="date"
-                    placeholder="选择日期"
-                    value-format="yyyy-MM-dd"
-                    format="yyyy-MM-dd">
-                  </el-date-picker>
-                </div>
-                <label>至</label>
-                <div class="block">
-                  <el-date-picker
-                    v-model="listQuery.params.endTime"
-                    type="date"
-                    placeholder="选择日期"
-                    value-format="yyyy-MM-dd"
-                    format="yyyy-MM-dd">
-                  </el-date-picker>
-                </div>
+                <el-date-picker v-model="listQuery.params.startTime" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.endTime" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -52,20 +29,16 @@
         </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"/>
+          <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">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
             <el-table-column width="50px" type="selection" align="center"/>
             <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column width="130px" label="操作" align="center">
               <template slot-scope="scope">
                 <div class="searchbtns">
-                  <el-button size="mini" type="primary"
-                             :disabled="scope.row.nodeState == '待提交' ? false:scope.row.nodeState == '发起订单'?false : true"
-                             @click="handleEdit(scope.row)">办理
+                  <el-button size="mini" type="primary" :disabled="scope.row.nodeState == '待提交' ? false : scope.row.nodeState == '销售专员' ? false : true" @click="handleEdit(scope.row)">办理
                   </el-button>
                   <el-button size="mini" type="primary" @click="handleCheck(scope.row)">查看</el-button>
                 </div>
@@ -126,23 +99,19 @@
         <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>
-    <el-dialog
-      title="请选择订单类型"
-      :visible.sync="dialogVisible"
-      width="22%">
+    <el-dialog title="请选择简易订单类型" :visible.sync="dialogVisible" width="22%">
       <div class="diaCenter">
         <el-radio v-model="billTypeKey" label="01">订金收取</el-radio>
         <el-radio v-model="billTypeKey" label="02">车辆预订</el-radio>
       </div>
       <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="handleConfirm()">确 定</el-button>
-            <el-button @click="dialogVisible = false">退 出</el-button>
-          </span>
+        <el-button type="primary" size="small" @click="handleConfirm()">确 定</el-button>
+        <el-button size="small" @click="dialogVisible = false">退 出</el-button>
+      </span>
     </el-dialog>
     <!-- 车辆预订 新增编辑页面 -->
     <div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="getList"/>
@@ -158,8 +127,7 @@
 </template>
 
 <script>
-import {mapGetters} from 'vuex'
-import {deleteBySids, listPage, typeValues} from '@/api/jichuxinxi/busdeposit'
+import { deleteBySids, listPage, typeValues } from '@/api/jichuxinxi/busdeposit'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import divAdd from './xunidingdanAdd.vue'
@@ -220,17 +188,17 @@ export default {
       nodeState_list: [], // 流程状态
       sids: [],
       billType: [],
-      total: 1,
       FormLoading: false,
       listLoading: false,
       listQuery: {
         current: 1,
-        size: 20,
+        size: 5,
+        total: 0,
         params: {
           userSid: window.sessionStorage.getItem('userSid'),
           orgName: '',
           staffName: '',
-          customerName: '',
+          name: '',
           billType: '',
           startTime: '',
           endTime: ''
@@ -243,15 +211,6 @@ export default {
       // ------------------------------------
     }
   },
-  computed: {
-    ...mapGetters([
-      'id',
-      'roles',
-      'rolesIds',
-      'departmentId',
-      'departmentCode'
-    ])
-  },
   created() {
     // 初始化变量
     this.init()
@@ -280,9 +239,7 @@ export default {
     },
     // 下拉框-虚拟订车单类型
     getType() {
-      typeValues({
-        type: 'depositBillType'
-      }).then((res) => {
+      typeValues({type: 'depositBillType' }).then((res) => {
         if (res.code === '200') {
           this.depositType = res.data
           console.log('下拉框请求订单类型', res.data)
@@ -320,20 +277,16 @@ export default {
       this.listLoading = true
       listPage(this.listQuery).then((response) => {
         this.listLoading = false
-        if (
-          response.code === '200' &&
-          response.data &&
-          response.data.total > 0
-        ) {
+        if (response.code === '200' && response.data && response.data.total > 0) {
           this.list = response.data.records
           for (var i = 0; i < response.data.records.length; i++) {
-            var timeArr = response.data.records[i].createDate.split(' ');
-            this.list[i].createDate = timeArr[0];
+            var timeArr = response.data.records[i].createDate.split(' ')
+            this.list[i].createDate = timeArr[0]
           }
-          this.total = response.data.total
+          this.listQuery.total = response.data.total
         } else {
           this.list = []
-          this.total = 0
+          this.listQuery.total = 0
         }
       })
     },
@@ -347,7 +300,7 @@ export default {
         aa.push(element.sid)
         bb.push(element.depositBillTypeKey)
         cc.push(element.nodeState)
-      });
+      })
       this.sids = aa
       this.billType = bb
       this.nodeState_list = cc
@@ -406,11 +359,11 @@ export default {
           }
         })
         const billType = bb.name
-        if (this.billTypeKey == '01') {
-          this.dialogVisible = false;
+        if (this.billTypeKey === '01') {
+          this.dialogVisible = false
           this.viewState = 5
           this.$refs['divDing'].showAdd(billType, this.billTypeKey)
-        } else if (this.billTypeKey == '02') {
+        } else if (this.billTypeKey === '02') {
           this.dialogVisible = false
           this.viewState = 2
           this.$refs['divadd'].showAdd(billType, this.billTypeKey)
@@ -422,23 +375,23 @@ export default {
         })
       }
     },
-    //办理
+    // 办理
     handleEdit(row) {
-      if (row.depositBillTypeKey == '01') {
+      if (row.depositBillTypeKey === '01') {
         this.viewState = 5
         this.dialogStatus = 'edit'
-        this.$refs['divDing'].showEdit(row.sid,row.depositBillType)
-      } else if (row.depositBillTypeKey == '02') {
+        this.$refs['divDing'].showEdit(row.sid, row.depositBillType)
+      } else if (row.depositBillTypeKey === '02') {
         this.viewState = 3
         this.dialogStatus = 'edit'
-        this.$refs['divadd'].showEdit(row.sid,row.depositBillType)
+        this.$refs['divadd'].showEdit(row.sid, row.depositBillType)
       }
     },
     // 打开查看详情
     handleCheck(row) {
-      if (row.depositBillTypeKey == '01') {
+      if (row.depositBillTypeKey === '01') {
         this.viewState = 6
-        this.$refs['divDingInfo'].showInfo(row.sid,row.depositBillType)
+        this.$refs['divDingInfo'].showInfo(row.sid, row.depositBillType)
       } else {
         this.viewState = 4
         this.$refs['divinfo'].showInfo(row.sid, row.depositBillType)
@@ -462,7 +415,7 @@ export default {
           userSid: window.sessionStorage.getItem('userSid'),
           orgName: '',
           staffName: '',
-          customerName: '',
+          name: '',
           billType: '',
           startTime: '',
           endTime: ''
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdaninfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdaninfo.vue
index 221903fbc0..1bcb74bb0d 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdaninfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdaninfo.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div v-show="visible">
+    <div>
       <div class="tab-header webtop">
         <div>销售简易订单详情</div>
         <!-- <div v-else></div> -->
@@ -9,64 +9,69 @@
         </div>
       </div>
       <div class="listconadd">
-        <el-form
-          ref="dataForm"
-          :model="temp"
-          label-position="right"
-          class="formadd"
-        >
-          <div class="tit">
-            销售虚拟订车单
-            <div class="times">
-              <div><span>分公司：</span><span>{{ temp.departmentName }}</span></div>
-              <div><span>申请人：</span><span>{{ temp.staffName }}</span></div>
-              <div><span>申请日期：</span><span>{{ temp.createDate }}</span></div>
-              <div><span>金额单位：</span><span>元</span></div>
-            </div>
-          </div>
-          <el-row class="bordertopline">
-            <el-col :span="2" class="tleftb">
-              <el-form-item>订单类型</el-form-item>
+        <div class="titwu">销售简易订单</div>
+        <el-form ref="dataForm" :model="temp" label-position="right" class="formadd">
+          <el-row class="rowStyle">
+            <el-col :span="24" class="tleftb colStyle">
+              <span>金额单位: 元</span>
             </el-col>
-            <el-col :span="6" class="trightb">
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span>分公司</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.departmentName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>申请人</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.staffName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>申请日期</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.createDate }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span>订单类型</span>
+            </el-col>
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.depositBillType }}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="2" class="tleftb">
-              <el-form-item>客户名称</el-form-item>
+            <el-col :span="3" class="tleftb">
+              <span>客户名称</span>
             </el-col>
-            <el-col :span="6" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 {{ temp.customerName }}
               </el-form-item>
             </el-col>
-            <el-col :span="2" class="tleftb">
-              <el-form-item>联系电话</el-form-item>
+            <el-col :span="3" class="tleftb">
+              <span>联系电话</span>
             </el-col>
-            <el-col :span="6" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 {{ temp.mobile }}
               </el-form-item>
             </el-col>
           </el-row>
           <!--Start 预订车辆信息-->
-          <!--          <div class="title">-->
           <div class="title">预订车辆信息</div>
-          <!--          </div>-->
-          <el-table
-            v-loading="listLoading"
-            :data="list"
-            border
-            style="width: 100%"
-            :index="index"
-          >
-            <el-table-column
-              align="center"
-              label="序号"
-              type="index"
-              width="50"
-            />
+          <el-table v-loading="listLoading" :data="list" border style="width: 100%" :index="index">
+            <el-table-column align="center" label="序号" type="index" width="60"/>
             <el-table-column label="品牌" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.brand }}</span>
@@ -78,16 +83,16 @@
               </template>
             </el-table-column>
             <el-table-column label="车架号" align="center">
-              <template slot-scope="scope" @click="">
+              <template slot-scope="scope">
                 <span>{{ scope.row.vin }}</span>
               </template>
             </el-table-column>
             <el-table-column label="颜色" align="center">
-              <template slot-scope="scope" @click="">
+              <template slot-scope="scope">
                 <span>{{ scope.row.colour }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="存放地点" align="center">
+            <el-table-column label="存放地点">
               <template slot-scope="scope">
                 <span>{{ scope.row.location }}</span>
               </template>
@@ -115,133 +120,48 @@
 </template>
 
 <script>
-import {mapGetters} from "vuex";
-import {getReserveCarDetails} from "@/api/jichuxinxi/busdeposit";
+import { getReserveCarDetails } from '@/api/jichuxinxi/busdeposit'
 
 export default {
-  name: "Add",
+  name: 'xunidingdanInfo',
   data() {
     return {
       disabled: true,
       index: 0,
-      edit: true,
       // --按钮菜单-------
-      YongHuid: [],
-      visible: true,
-      stateId: "0",
       FormLoading: false,
       listLoading: false,
       list: [],
-      temp: {}, // 添加和修改
-      textMap: {
-        update: "修改",
-        create: "创建",
-      },
-      submitDto: {
-        businessSid: '',
-        userSid: window.sessionStorage.getItem("userSid"),
-      },
-      nodeState: '',
-      billNo: '',
-      createDate: '',
-      mobile: '',
-      orgName: '',
-      staffName: '',
-      _userSid: '',
-      customerName: [],
-      xuniSid: '',
-      tificateT: [],
-      dnumbDate: [],
-      dialogStatus: '', // 对话框状态
-    };
-  },
-  computed: {
-    ...mapGetters([
-      "id",
-      "roles",
-      "rolesIds",
-      "departmentId",
-      "departmentCode",
-    ]),
+      temp: {} // 添加和修改
+    }
   },
   methods: {
     // ----------功能打开开始--------
-    handleReturn(isreload) {
-      if (isreload === "true") this.$emit("reloadlist");
-      this.temp.sid = ''; // SID
-      this.$refs["dataForm"].resetFields();
-      this.$emit("doback");
+    handleReturn() {
+      this.temp = {} // SID
+      this.$refs['dataForm'].resetFields()
+      this.$emit('doback')
     },
-
     showInfo(sid, depositBillType) {
-      console.log("修改打开", sid);
-      this.submitDto.businessSid = sid;
       this.$nextTick(() => {
-        this.$refs["dataForm"].clearValidate();
-      });
+        this.$refs['dataForm'].clearValidate()
+      })
       getReserveCarDetails(sid).then((response) => {
-        if (response.code) {
+        if (response.success) {
           this.temp = response.data
           this.temp.depositBillType = depositBillType
           this.list = response.data.vehicleList
-        } else {
-          this.$notify({
-            title: "提示",
-            message: "查看失败",
-            type: "error",
-            duration: 2000,
-          });
         }
-      });
-    },
-    // 提交
-    handleSubmit() {
-      this.$confirm("是否确定提交该业务", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        this.temp.userSid = window.sessionStorage.getItem('userSid')
-        // 提交流程
-        submitVehicleApprove(this.temp).then((response) => {
-          if (response.code === "200") {
-            this.$notify({
-              title: "提示",
-              message: "添加成功",
-              type: "success",
-              duration: 2000,
-            });
-          } else {
-            this.$notify({
-              title: "添加失败",
-              message: response.msg,
-              type: "error",
-            });
-          }
-        });
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
 <style scoped>
-.tit {
-  margin: 0 0 20px 0;
-  padding: 10px 0 0 0;
-}
-
-.times {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-around;
-  padding: 30px 0 10px 0;
-  margin: 0 auto 0px auto;
-  width: 70%;
-  font-size: 14px;
+.rowStyle {
+  border-left: 0px !important;
 }
-
-/deep/ .el-form-item__content {
-  margin-left: 0 !important;
+.colStyle {
+  border-right: 0px !important;
 }
-
 </style>
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 9f4e4d2c3d..8bdf327e46 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
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div v-show="visible">
+    <div v-show="viewState == 1">
       <div class="tab-header webtop">
         <div>{{ viewTitle }}</div>
         <div>
@@ -10,38 +10,60 @@
         </div>
       </div>
       <div class="listconadd">
-        <el-form ref="dataForm" :model="temp" label-position="right" label-width="100%" class="formadd" :rules="rules">
-          <div class="tit">
-            销售虚拟订单
-            <div class="times">
-              <div><span>分公司：</span><span>{{ temp.departmentName }}</span></div>
-              <div><span>申请人：</span><span>{{ temp.staffName }}</span></div>
-              <div><span>申请日期：</span><span>{{ temp.createDate }}</span></div>
-              <div><span>金额单位：</span><span>元</span></div>
-            </div>
-          </div>
-          <el-row class="bordertopline">
+        <div class="titwu">销售简易订单</div>
+        <el-form ref="dataForm" :model="temp" class="formadd" :rules="rules">
+          <el-row class="rowStyle">
+            <el-col :span="24" class="tleftb colStyle">
+              <span>金额单位: 元</span>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span>分公司</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.departmentName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>申请人</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.staffName }}</span>
+              </el-form-item>
+            </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>订单类型</span></el-form-item>
+              <span>申请日期</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.createDate }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span>订单类型</span>
+            </el-col>
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.depositBillType }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span><span class="icon">*</span>付款人</span></el-form-item>
+              <span><span class="icon">*</span>付款人</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
-                <el-input v-model="temp.payName" class="addinputw" placeholder=""
-                          clearable/>
+                <el-input v-model="temp.payName" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span><span class="icon">*</span>联系电话</span></el-form-item>
+              <span><span class="icon">*</span>联系电话</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="mobile">
                 <el-input v-model="temp.mobile" class="addinputw" placeholder="" clearable/>
               </el-form-item>
@@ -49,18 +71,17 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>车辆台数</span></el-form-item>
+              <span>车辆台数</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
-                <el-input v-model="temp.carNumber" class="addinputw" placeholder=""
-                          clearable/>
+                <el-input v-model="temp.carNumber" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span><span class="icon">*</span>订金金额</span></el-form-item>
+              <span><span class="icon">*</span>订金金额</span>
             </el-col>
-            <el-col :span="13" class="trightb">
+            <el-col :span="13">
               <el-form-item>
                 <el-input v-model="temp.deposit" class="addinputw" placeholder="" clearable/>
               </el-form-item>
@@ -68,9 +89,9 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span><span class="icon">*</span>付款日期</span></el-form-item>
+              <span><span class="icon">*</span>付款日期</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <el-date-picker
                   v-model="temp.payDate"
@@ -82,20 +103,19 @@
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span><span class="icon">*</span>付款方式</span></el-form-item>
+              <span><span class="icon">*</span>付款方式</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
-                <el-select v-model="temp.payTypeKey" class="addinputw" placeholder="" @change="changePaymentType">
-                  <el-option v-for="(item, index) in paymentType_list" :key="index.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"/>
+                <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>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span><span class="icon">*</span>付款银行账号</span></el-form-item>
+              <span><span class="icon">*</span>付款银行账号</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <el-input v-model="temp.payNumber" class="addinputw" placeholder="" clearable/>
               </el-form-item>
@@ -103,32 +123,29 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span><span class="icon">*</span>收款银行账号</span></el-form-item>
+              <span><span class="icon">*</span>收款银行</span>
             </el-col>
-            <el-col :span="5" class="trightb">
-              <el-form-item>
-                <el-select v-model="temp.collectionNumberKey" class="addinputw" placeholder=""
-                           @change="changeProBankAccValue">
-                  <el-option v-for="(item, index) in ProBankAcc_list" :key="index.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
+            <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-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span><span class="icon">*</span>收款银行</span></el-form-item>
+              <span><span class="icon">*</span>收款银行账号</span>
             </el-col>
-            <el-col :span="13" class="trightb">
-              <el-select v-model="temp.collectionBankKey" class="addinputw" placeholder="" @change="changeproBank">
-                <el-option v-for="(item, index) in proBank_list" :key="index.dictKey" :label="item.dictValue"
-                           :value="item.dictKey"/>
-              </el-select>
+            <el-col :span="5">
+              <el-form-item>
+                <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>
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>备注</span></el-form-item>
+              <span>备注</span>
             </el-col>
-            <el-col :span="21" class="trightb">
+            <el-col :span="21">
               <el-form-item>
                 <el-input v-model="temp.remarks" class="addinputw" placeholder="" clearable/>
               </el-form-item>
@@ -136,21 +153,20 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span><span class="icon">*</span>付款凭证</span></el-form-item>
+              <span><span class="icon">*</span>付款凭证</span>
               <div class="tips"><span>（只可上传一张付款凭证）</span></div>
             </el-col>
-            <el-col :span="21" class="trightb">
+            <el-col :span="21">
               <el-form-item>
                 <Upload ref="uploadImg" v-model="list1" :limit="1" bucket="map" :upload-data="{type:'0001'}"/>
               </el-form-item>
             </el-col>
           </el-row>
           <!--Start 客户信息-->
-          <div class="titcon">
-            <div class="title">客户信息</div>
-            <div class="baocun">
-              <el-button type="primary" size="small" icon="el-icon-plus" class="btntopblueline"
-                         @click="handleyudingcheliang()">添加
+          <div class="title">
+            <div>客户信息</div>
+            <div>
+              <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="handleyudingcheliang()">选择
               </el-button>
             </div>
           </div>
@@ -180,22 +196,19 @@
       </div>
     </div>
     <!-- 客户信息 -->
-    <xuanzekehu v-show="kehudanganAddShow" ref="addAndUpdate" @dingjinfanhui="noClickclose"
-                @handleCustomer="selectCustomer"></xuanzekehu>
-
+    <xuanzekehu v-show="viewState == 2" ref="divSelect" @doback="resetState" @handleCustomer="selectCustomer"/>
   </div>
 </template>
 
 <script>
-import {mapGetters} from 'vuex'
-import {depositDetail, saveDing, submitApprove, typeValues} from '@/api/jichuxinxi/busdeposit'
-import {fetchBySid, getPathSidByUserSid} from '@/api/dictcommons/dictcommons'
+import { depositDetail, saveDing, submitApprove, typeValues } from '@/api/jichuxinxi/busdeposit'
+import { fetchBySid, getPathSidByUserSid } from '@/api/dictcommons/dictcommons'
 import Upload from '@/components/uploadFile/upload.vue' // 上传文件
-import xuanzekehu from "@/views/xiaoshouguanli/xunidingdan/com/xuanzekehu"
+import xuanzekehu from '@/views/xiaoshouguanli/xunidingdan/com/xuanzekehu'
 
 export default {
-  name: "xunidingjinAdd",
-  components: {Upload, xuanzekehu},
+  name: 'xunidingjinAdd',
+  components: { Upload, xuanzekehu },
   data() {
     var checkSubmit = (rule, value, callback) => {
       const Submit =
@@ -209,27 +222,22 @@ export default {
       // ---见证材料
       list1: [],
       viewTitle: '',
-      dialogStatus: '',
       index: 0,
       disabled: false, // 提交按钮状态
-      // dialogStatus: 'add',
       // --按钮菜单-------
-      edit: true,
-      visible: true,
-      stateId: '0',
+      viewState: 1,
       FormLoading: false,
       listLoading: false,
       list: [],
       paymentType_list: [],
-      customer_list: [],
       proBank_list: [],
       ProBankAcc_list: [],
       temp: {
-        departmentName:'',
-        staffName:'',
-        createDate:'',
+        departmentName: '',
+        staffName: '',
+        createDate: '',
         payName: '',
-        payImages: [],  // 付款凭证
+        payImages: [], // 付款凭证
         collectionNumber: '', // 收款银行账号
         collectionNumberKey: '', // 收款银行账号
         payTypeKey: '', // 付款方式
@@ -247,42 +255,21 @@ export default {
         userSid: window.sessionStorage.getItem('userSid'), // 用户Sid
         virtualOrderSid: '', // 订单Sid
         taskId: '', // 任务Id
-        procInsId: '', // 流程实例ID
-      }, // 添加和修改
-      nodeState: '', // 节点状态
-      sid_list: {},
-      xuniSid: '',
-      orgName: '',
-      staffName: '',
-      _userSid: '',
+        procInsId: '' // 流程实例ID
+      },
       customerName: [],
-      tificateT: [],
-      dnumbDate: [],
-      yudingcheliangShow: false,
-      hetongdanganguanliAddShow: false,
-      hetongdanganguanliInfoShow: false,
-      kehudanganAddShow: false,
       rules: {
         mobile: [
           {
             required: true,
             validator: checkSubmit,
-            trigger: 'blur',
-          },
-        ],
-      },
+            trigger: 'blur'
+          }
+        ]
+      }
       // ------------------------------------
     }
   },
-  computed: {
-    ...mapGetters([
-      'id',
-      'roles',
-      'rolesIds',
-      'departmentId',
-      'departmentCode',
-    ]),
-  },
   methods: {
     getType() {
       // 付款方式
@@ -305,11 +292,9 @@ export default {
       })
     },
     changePaymentType(value) {
-      console.log('触发下拉框按钮')
-      let bb = {}
+      let bb = null
       this.paymentType_list.forEach((e) => {
-        // eslint-disable-next-line eqeqeq
-        if (e.dictKey == value) {
+        if (e.dictValue === value) {
           bb = {
             type: e.dictType,
             name: e.dictValue,
@@ -323,10 +308,9 @@ export default {
       console.log('name', this.temp.payType, 'key', this.temp.payTypeKey)
     },
     changeproBank(value) {
-      console.log('触发下拉框按钮')
       let bb = null
       this.proBank_list.forEach((e) => {
-        if (e.dictKey == value) {
+        if (e.dictValue === value) {
           bb = {
             type: e.dictType,
             name: e.dictValue,
@@ -340,7 +324,7 @@ export default {
       this.getProBankAcc(bb.sid)
     },
     getProBankAcc(sid) {
-      typeValues({psid: sid, type: 'receiptAccount'}).then((res) => {
+      typeValues({ psid: sid, type: 'receiptAccount' }).then((res) => {
         if (res.code === '200') {
           this.ProBankAcc_list = res.data
           console.log('下拉框请求111', res.data)
@@ -348,10 +332,9 @@ export default {
       })
     },
     changeProBankAccValue(value) {
-      console.log('触发下拉框按钮')
       let bb = null
       this.ProBankAcc_list.forEach((e) => {
-        if (e.dictKey == value) {
+        if (e.dictValue === value) {
           bb = {
             type: e.dictType,
             name: e.dictValue,
@@ -366,7 +349,7 @@ export default {
     },
     getPathSid() {
       const userSid = window.sessionStorage.getItem('userSid')
-      getPathSidByUserSid({userSid: userSid}).then((res) => {
+      getPathSidByUserSid({ userSid: userSid }).then((res) => {
         if (res.success) {
           this.getCreateOrgName(res.data)
         }
@@ -381,52 +364,48 @@ export default {
     },
     // 新增初始化
     showAdd(depositBillType, depositBillTypeKey) {
-      this.stateId = '0'
       this.$refs['uploadImg'].stateName = 'xunidingjinAdd'
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
-      var nowDate = new Date();
+      var nowDate = new Date()
       var date = {
         year: nowDate.getFullYear(),
         month: nowDate.getMonth() + 1,
-        day: nowDate.getDate(),
+        day: nowDate.getDate()
       }
       var dayDate = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
       this.temp.createDate = dayDate // 申请日期
       this.temp.staffName = window.sessionStorage.getItem('name') // 申请人
       this.temp.depositBillType = depositBillType
       this.temp.depositBillTypeKey = depositBillTypeKey
-      this.dialogStatus = 'add'
       this.viewTitle = '【新增】销售简易订单'
       this.getType()
       this.getPathSid() // 分公司
     },
     // 编辑初始化
-    showEdit(sid,depositBillType) {
-      this.stateId = '1'
+    showEdit(sid, depositBillType) {
       console.log('上传图片组件', this.$refs['uploadImg'].stateName)
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
-      this.temp.sid = sid
-      this.dialogStatus = 'edit'
       this.viewTitle = '【编辑】销售简易订单'
       const data = {
-        virtualOrderSid:sid,
-        userSid:window.sessionStorage.getItem('userSid')
+        virtualOrderSid: sid,
+        userSid: window.sessionStorage.getItem('userSid')
       }
       depositDetail(data).then((response) => {
         if (response.code) {
           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("/");
+            const imgName = response.data.payImages[response.data.payImages.length - 1].split('/')
             this.list1.push({
               name: imgName[imgName.length - 1],
-              url: response.data.payImages[response.data.payImages.length - 1],
-            });
+              url: response.data.payImages[response.data.payImages.length - 1]
+            })
             this.$refs['uploadImg'].showImg(this.list1)
           }
           this.temp.payImages = []
@@ -439,7 +418,7 @@ export default {
       console.log('已有图片', this.list1)
       if (this.list1.length !== 0) {
         if (this.list1.length > 1) {
-          this.list1.splice(0, 1);
+          this.list1.splice(0, 1)
           const img_list = []
           img_list.push(this.list1[this.list1.length - 1].url)
           this.temp.payImages = img_list
@@ -451,23 +430,17 @@ export default {
       }
     },
     selectCustomer(row) {
+      this.viewState = 1
       this.list.push({
         customerName: row.name,
         mobile: row.mobile,
-        customerSid: row.sid,
+        customerSid: row.sid
         // headImage
       })
     },
     handleDelete(row, index) {
-      console.log('客户表中的row', row);
+      console.log('客户表中的row', row)
       this.list.splice(index, 1)
-      // if (row.sid !== '') {
-      //   this.sid_list.customerSid = row.customerSid
-      //   this.sid_list.sid = this.temp.sid
-      //   console.log('删除客户信息', this.sid_list)
-      // } else {
-      //   this.list.splice(index, 1)
-      // }
     },
     // 添加数据
     handleCreate() {
@@ -476,21 +449,19 @@ export default {
         this.temp.customerList = this.list
         if (valid) {
           this.FormLoading = true
-          this.dialogStatus = 'create'
           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.xuniSid = response.data
               this.handleReturn('true')
             } else {
               this.$notify({
                 title: '提示',
                 message: '添加失败',
                 type: 'error',
-                duration: 2000,
+                duration: 2000
               })
             }
           })
@@ -520,7 +491,7 @@ export default {
                   this.$notify({
                     title: '提交失败',
                     message: response.msg,
-                    type: 'error',
+                    type: 'error'
                   })
                 }
               })
@@ -534,11 +505,11 @@ export default {
       if (isreload === 'true') this.$emit('reloadlist')
       this.temp.sid = '' // SID
       this.temp = {
-        departmentName:'',
-        staffName:'',
-        createDate:'',
+        departmentName: '',
+        staffName: '',
+        createDate: '',
         payName: '',
-        payImages: [],  // 付款凭证
+        payImages: [], // 付款凭证
         collectionNumber: '', // 收款银行账号
         collectionNumberKey: '', // 收款银行账号
         payTypeKey: '', // 付款方式
@@ -568,48 +539,34 @@ export default {
     // --------------多页面跳转--------------
     // 新增客户信息
     handleyudingcheliang() {
-      this.visible = false
-      this.kehudanganAddShow = true
+      this.viewState = 2
+      this.$refs['divSelect'].init()
     },
     // 选择客户返回
-    noClickclose() {
-      this.visible = true
-      this.yudingcheliangShow = false
-      this.hetongdanganguanliAddShow = false
-      this.hetongdanganguanliInfoShow = false
-      this.kehudanganAddShow = false
+    resetState() {
+      this.viewState = 1
     }
   }
 }
 </script>
 
 <style scoped>
-.tit {
-  margin: 0 0 20px 0;
-  padding: 10px 0 0 0;
-}
-
-.times {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-around;
-  padding: 30px 0 10px 0;
-  margin: 0 auto 0px auto;
-  width: 70%;
-  font-size: 14px;
-}
-
-/deep/ .el-form-item__content {
-  margin-left: 0 !important;
-}
-
 .tips {
   font-size: 12px;
   color: #606266;
   text-align: right;
 }
-
-.formadd .el-row .el-col /deep/ .el-form-item .addinputw {
-  width: 100%;
+.title {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+.rowStyle {
+  border-left: 0px !important;
+}
+.colStyle {
+  border-right: 0px !important;
 }
 </style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjininfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjininfo.vue
index 9f1a4c9e9a..da5aa09903 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjininfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjininfo.vue
@@ -2,61 +2,84 @@
   <div class="app-container">
     <div>
       <div class="tab-header webtop">
-        <div>销售虚拟订单管理详细信息</div>
+        <div>销售简易订单详情</div>
         <div>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
       <div class="listconadd">
-        <el-form ref="dataForm" :model="temp" label-position="right" label-width="100%" class="formadd">
-          <div class="tit">
-            销售简易订单
-            <div class="times">
-              <div><span>分公司：</span><span>{{ temp.departmentName }}</span></div>
-              <div><span>申请人：</span><span>{{ temp.staffName }}</span></div>
-              <div><span>申请日期：</span><span>{{ temp.createDate }}</span></div>
-              <div><span>金额单位：</span><span>元</span></div>
-            </div>
-          </div>
-          <el-row class="bordertopline">
+        <div class="titwu">销售简易订单</div>
+        <el-form ref="dataForm" :model="temp" class="formadd">
+          <el-row class="rowStyle">
+            <el-col :span="24" class="tleftb colStyle">
+              <span>金额单位: 元</span>
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>订单类型</span></el-form-item>
+              <span>分公司</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.departmentName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>申请人</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.staffName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span>申请日期</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.createDate }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span>订单类型</span>
+            </el-col>
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.depositBillType }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>付款人</span></el-form-item>
+              <span>付款人</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.payName }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>联系电话</span></el-form-item>
+              <span>联系电话</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.mobile }}</span>
+                <span>{{ temp.phone }}</span>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>车辆台数</span></el-form-item>
+              <span>车辆台数</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.carNumber }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>订金金额</span></el-form-item>
+              <span>订金金额</span>
             </el-col>
-            <el-col :span="13" class="trightb">
+            <el-col :span="13">
               <el-form-item>
                 <span>{{ temp.deposit }}</span>
               </el-form-item>
@@ -64,43 +87,43 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>付款日期</span></el-form-item>
+              <span>付款日期</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.payDate }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>付款方式</span></el-form-item>
+              <span>付款方式</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.payType }}</span>
+                <span>{{ temp.payTypeValue }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>付款银行账号</span></el-form-item>
+              <span>付款银行账号</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
-                <el-input v-model="temp.payNumber" class="addinputw" placeholder="" clearable/>
+                <span>{{ temp.payNumber }}</span>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>收款银行账号</span></el-form-item>
+              <span>收款银行账号</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <span>{{ temp.collectionNumber }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>收款银行</span></el-form-item>
+              <span>收款银行</span>
             </el-col>
-            <el-col :span="13" class="trightb">
+            <el-col :span="13">
               <el-form-item>
                 <span>{{ temp.collectionBank }}</span>
               </el-form-item>
@@ -108,27 +131,27 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <el-form-item><span>备注</span></el-form-item>
+              <span>备注</span>
             </el-col>
-            <el-col :span="21" class="trightb">
+            <el-col :span="21">
               <el-form-item>
                 <span>{{ temp.remarks }}</span>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="4" class="tleftb">
-              <el-form-item><span slot="label">付款凭证</span></el-form-item>
+            <el-col :span="3" class="tleftb">
+              <span>付款凭证</span>
             </el-col>
-            <el-col :span="20" class="trightb">
+            <el-col :span="21">
               <el-form-item>
-                <img :src="imgUrl">
+                <img style="width: 178px;height: 178px" :src="imgUrl" @click="handleLook(imgUrl)">
               </el-form-item>
             </el-col>
           </el-row>
           <!--Start 客户信息-->
-          <div class="titcon">
-            <div class="title">客户信息</div>
+          <div class="title">
+            <div>客户信息</div>
           </div>
           <el-table v-loading="listLoading" :data="list" border style="width: 100%" :index="index">
             <el-table-column align="center" label="序号" type="index" width="60"/>
@@ -147,14 +170,17 @@
         </el-form>
       </div>
     </div>
+    <el-dialog :visible.sync="dialogVisible">
+      <img width="100%" :src="dialogImageUrl" alt="">
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import {fetchSid} from '@/api/jichuxinxi/busdeposit'
+import { fetchSid } from '@/api/jichuxinxi/busdeposit'
 
 export default {
-  name: "xunidingjininfo",
+  name: 'xunidingjininfo',
   data() {
     return {
       disabled: '',
@@ -162,20 +188,19 @@ export default {
       index: 0,
       imgUrl: '',
       // --按钮菜单-------
-      YongHuid: [],
-      edit: true,
       visible: true,
-      stateId: '0',
       FormLoading: false,
       listLoading: false,
       list: [],
       temp: {},
+      dialogVisible: false,
+      dialogImageUrl: ''
     }
   },
   methods: {
-    showInfo(sid,depositBillType) {
+    showInfo(sid, depositBillType) {
       fetchSid(sid).then((response) => {
-        if (response.code === '200') {
+        if (response.success) {
           this.temp = response.data
           this.imgUrl = this.temp.payImages[this.temp.payImages.length - 1]
           this.list = response.data.customerList
@@ -185,39 +210,29 @@ export default {
             title: '提示',
             message: '查看失败',
             type: 'error',
-            duration: 2000,
+            duration: 2000
           })
         }
       })
     },
-    handleReturn(isreload) {
-      if (isreload === 'true') this.$emit('reloadlist')
-      this.temp.sid = '' // SID
+    handleLook(value) {
+      this.dialogVisible = true
+      this.dialogImageUrl = value
+    },
+    handleReturn() {
+      this.temp = {} // SID
       this.$refs['dataForm'].resetFields()
       this.$emit('doback')
-    },
-
+    }
   }
 }
 </script>
 
 <style scoped>
-.tit {
-  margin: 0 0 20px 0;
-  padding: 10px 0 0 0;
+.rowStyle {
+  border-left: 0px !important;
 }
-
-.times {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-around;
-  padding: 30px 0 10px 0;
-  margin: 0 auto 0px auto;
-  width: 70%;
-  font-size: 14px;
-}
-
-/deep/ .el-form-item__content {
-  margin-left: 0 !important;
+.colStyle {
+  border-right: 0px !important;
 }
 </style>