From a933f7bc93bf0acb975e2bafc224b94be7fc2d0e Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Sat, 9 Apr 2022 09:31:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E7=94=B3=E8=AF=B7=E7=9A=84?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=E3=80=81=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E3=80=81=E8=AF=A6=E6=83=85=E3=80=81=E6=B5=81=E7=A8=8B=E5=8F=8A?=
 =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=B8=B8=E7=94=A8=E9=85=8D=E7=BD=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/supplychain/busvehicleapply.js    |  42 +-
 .../cheliangpaichan/cheliangpaichan.vue       | 505 ++++++++---------
 .../cheliangpaichan/cheliangpaichanAdd.vue    | 521 ++++++++---------
 .../cheliangpaichan/cheliangpaichanInfo.vue   | 456 +++++++++------
 .../chexingbyconfiguration.vue                | 191 +++++++
 .../paichanguanli/cheliangpaichanEdit.vue     | 455 +++++++++++++++
 .../paichanguanli/cheliangpaichanInfo.vue     | 529 ++++++++++++++++++
 .../paichanguanli/chexingbyconfiguration.vue  | 191 +++++++
 8 files changed, 2145 insertions(+), 745 deletions(-)
 create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
 create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanInfo.vue
 create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue

diff --git a/anrui-scm/anrui-scm-ui/src/api/supplychain/busvehicleapply.js b/anrui-scm/anrui-scm-ui/src/api/supplychain/busvehicleapply.js
index b285cfce28..13a5af1a68 100644
--- a/anrui-scm/anrui-scm-ui/src/api/supplychain/busvehicleapply.js
+++ b/anrui-scm/anrui-scm-ui/src/api/supplychain/busvehicleapply.js
@@ -1,6 +1,5 @@
 import request from '@/utils/request'
 // import qs from 'qs'
-// 其他入库单
 
 export default {
   // 查询分页列表
@@ -12,6 +11,15 @@ export default {
       headers: { 'Content-Type': 'application/json' }
     })
   },
+  // 查询车型和常用配置列表
+  configurationlistPage: function(parmas) {
+    return request({
+      url: '/base/basevehmodelconfig/listPage',
+      method: 'post',
+      data: parmas,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
   // 保存新增记录
   saveAdd: function(params) {
     return request({
@@ -22,9 +30,18 @@ export default {
     })
   },
   // 保存修改记录
-  saveEdit: function(params, sid) {
+  saveEdit: function(params) {
+    return request({
+      url: '/base/v1/busvehicleapply/update',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 提交流程
+  submitVehicleApply: function(params) {
     return request({
-      url: '/base/v1/busvehicleapply/update/' + sid,
+      url: '/base/v1/busvehicleapply/submitVehicleApply',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
@@ -46,15 +63,6 @@ export default {
       method: 'get'
     })
   },
-
-  // // 根据单据编号查看详情
-  // fetchByBillNo: function(sid) {
-  //   return request({
-  //     url: '/base/busvehicleapply/fetchBySid/' + sid,
-  //     method: 'get'
-  //   })
-  // },
-
   // 获取下拉列表（数据字典）
   pullDown: function(data) {
     return request({
@@ -72,16 +80,6 @@ export default {
       params: data
     })
   },
-
-  // 获取下拉列表（简述配置）
-  getList: function(data) {
-    return request({
-      url: '/base/v1/basemodelconfig/getListByVeSid',
-      method: 'get',
-      params: data
-    })
-  },
-
   // 提交
   doSubmit: function(params) {
     return request({
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/vehicle/cheliangpaichan/cheliangpaichan.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/vehicle/cheliangpaichan/cheliangpaichan.vue
index e266541c59..987a0684df 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/vehicle/cheliangpaichan/cheliangpaichan.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/vehicle/cheliangpaichan/cheliangpaichan.vue
@@ -1,19 +1,16 @@
 <template>
   <div class="app-container">
-    <div v-show="viewState === 1">
+    <div v-show="viewState == 1">
       <button-bar view-title="车辆排产管理" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <div class="searchcon">
-        <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' :
-          '显示查询条件' }}
+        <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
         </el-button>
         <div v-show="isSearchShow" class="search">
           <el-form :inline="true" class="tab-header">
             <el-form-item class="formItem" label="申请日期">
-              <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.params.applicationDateStart" clearable
-                              style="width: 160px;" type="date" placeholder="开始日期"/>
+              <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.params.applicationDateStart" clearable style="width: 160px;" type="date" placeholder="开始日期"/>
               <div class="line">至</div>
-              <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.params.applicationDateEnd" clearable
-                              style="width: 160px;" type="date" placeholder="结束日期"/>
+              <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.params.applicationDateEnd" clearable style="width: 160px;" type="date" placeholder="结束日期"/>
             </el-form-item>
             <el-form-item label="状态">
               <!--   <el-select v-model="queryParams.params.billType" @change="changeBillType" style="width:200px"-->
@@ -21,7 +18,7 @@
               <!--     <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue"-->
               <!--                :value="item.dictKey"></el-option>-->
               <!--   </el-select>-->
-                 <el-input v-model="queryParams.params.vehicleName" placeholder="请输入状态" clearable/>
+              <el-input v-model="queryParams.params.vehicleName" placeholder="请输入状态" clearable/>
             </el-form-item>
             <el-divider/>
             <div class="btn" style="text-align: center;">
@@ -34,306 +31,278 @@
       <!--Start 项目列表头部-->
       <div class="listtop">
         <div class="tit">排产车型列表</div>
-        <pageye
-          v-show="dataList.length > 0"
-          :total="queryParams.total"
-          :page.sync="queryParams.current"
-          :limit.sync="queryParams.size"
-          class="pagination"
-          @pagination="loadList"/>
+        <pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
       </div>
       <!--End 项目列表头部-->
 
       <!--Start 项目列表-->
       <div class="listcon">
-        <el-table
-          v-loading="tableLoading"
-          :data="dataList"
-          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 prop="billNo" label="操作" align="center">
+        <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
+          <el-table-column width="50" type="selection" align="center"/>
+          <el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center"/>
+          <el-table-column width="150" label="操作" align="center">
             <template slot-scope="scope">
-              <span class="bluezi" @click="toInfo(scope.row)">办理</span>
-              <span class="bluezi" @click="toInfo(scope.row)">查看</span>
+              <el-button type="primary" size="small" :disabled="scope.row.nodeState=='' ? false : scope.row.nodeState=='排产申请'?false:true" @click="toEdit(scope.row)">办理</el-button>
+              <el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
             </template>
           </el-table-column>
-          <el-table-column prop="state" label="状态" align="center"/>
-          <el-table-column prop="applicationCode" label="排产类型" align="center"/>
-          <el-table-column prop="applicationCode" label="申请编号" align="center"/>
-          <el-table-column prop="applicationDate" label="申请日期" align="center"/>
-          <el-table-column prop="createByName" label="申请人" align="center"/>
-          <el-table-column prop="remarks" label="备注" align="center"/>
+          <el-table-column width="150" prop="nodeState" label="状态" align="center"/>
+          <el-table-column width="150" prop="schedulingType" label="排产类型" align="center"/>
+          <el-table-column width="200" prop="applicationCode" label="申请编号" align="center"/>
+          <el-table-column width="150" prop="applicationDate" label="申请日期" align="center"/>
+          <el-table-column width="150" prop="createByName" label="申请人" align="center"/>
+          <el-table-column prop="remarks" fit label="备注" align="left" header-align="center"/>
         </el-table>
       </div>
       <!--End 项目列表-->
       <div class="pages">
-        <div class="tit"/>
         <!-- 翻页 -->
-        <pagination
-          v-show="dataList.length > 0"
-          :total="queryParams.total"
-          :page.sync="queryParams.current"
-          :limit.sync="queryParams.size"
-          class="pagination"
-          @pagination="loadList"
-        />
+        <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
       </div>
     </div>
     <!--End 查询和其列表部分-->
 
     <!--新增修改部分组件-->
     <div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/>
-
     <!--详情部分组件-->
     <div-info v-show="viewState == 4" ref="divinfo" @doback="resetState"/>
   </div>
 </template>
 
 <script>
-  import req from '@/api/supplychain/busvehicleapply'
-  import ButtonBar from '@/components/ButtonBar'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  import divAdd from './cheliangpaichanAdd'
-  import divInfo from './cheliangpaichanInfo'
-  import { setuser, getuser } from '@/utils/baocun'
+import req from '@/api/supplychain/busvehicleapply'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import divAdd from './cheliangpaichanAdd'
+import divInfo from './cheliangpaichanInfo'
 
-  export default {
-    name: 'cheliangpaichan',
-    components: {
-      ButtonBar,
-      Pagination,
-      pageye,
-      divAdd,
-      divInfo
+export default {
+  name: 'cheliangpaichan',
+  components: {
+    ButtonBar,
+    Pagination,
+    pageye,
+    divAdd,
+    divInfo
+  },
+  data() {
+    return {
+      btndisabled: false,
+      viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+      isSearchShow: false, // 显示隐藏
+      tableLoading: false,
+      // 列表数据
+      dataList: [],
+      // sid数组
+      sids: [], // 用于导出的时候保存已选择SID
+      sides: '', // 一条数据的sid
+      queryParams: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          applicationDateStart: '',
+          applicationDateEnd: '',
+          vehicleName: '' // 车型
+        }
+      },
+      row: {}
+    }
+  },
+  created() {
+    this.loadList()
+  },
+  methods: {
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX' + btnKey)
+      switch (btnKey) {
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'toEdit':
+          this.toEdit()
+          break
+        case 'doSubmit':
+          this.doSubmit()
+          break
+        case 'doDel':
+          this.doDel()
+          break
+        case 'doImport':
+          this.doImport()
+          break
+        case 'doExport':
+          this.doExport()
+          break
+        default:
+          break
+      }
+    },
+    // 获取数据sid
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+      this.row = row
+      this.sides = this.sids.join() // 将sid数组的元素转化成字符串
+      console.log('获取sids数组', this.sids)
+    },
+    toAdd(row) {
+      this.viewState = 2
+      this.$refs['divadd'].showAdd()
+    },
+    toEdit() {
+      if (this.sids.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
+        return
+      }
+      if (this.sids.length > 1) {
+        this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' })
+        return
+      }
+      this.viewState = 3
+      const sid = this.sids[0]
+      const row = this.row
+      this.$refs['divadd'].showEdit(sid, row)
+    },
+    toInfo(row) {
+      this.viewState = 4
+      console.log('这是打开详情接口', row)
+      const sid = row.sid
+      this.$refs['divinfo'].showInfo(sid, row)
+    },
+    // 查询
+    dosearch() {
+      this.queryParams.current = 1
+      this.loadList()
     },
-    data() {
-      return {
-        btndisabled: false,
-        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-        isSearchShow: false, // 显示隐藏
-        tableLoading: false,
-        // 列表数据
-        dataList: [],
-        // sid数组
-        sids: [], // 用于导出的时候保存已选择SID
-        sides: '', // 一条数据的sid
-        queryParams: {
-          current: 1,
+    // 重置
+    resetQuery() {
+      this.queryParams = {
+        current: 1,
           size: 10,
           total: 0,
           params: {
-            applicationDateStart: '',
+          applicationDateStart: '',
             applicationDateEnd: '',
-            vehicleName:'', // 车型
-          }
-        },
-        row: {}
+            vehicleName: '' // 车型
+        }
       }
+      this.dosearch()
     },
-    created() {
-      this.loadList()
+    // 加载分页列表
+    loadList() {
+      const _this = this
+      this.tableLoading = true
+      req.listPage(this.queryParams).then(resp => {
+        console.log('查询列表', resp)
+        _this.tableLoading = false
+        const data = resp.data
+        _this.queryParams.total = data.total
+        _this.dataList = data.records
+      }).catch(() => {
+        _this.tableLoading = false
+      })
     },
-    methods: {
-      resetState() {
-        this.viewState = 1
-      },
-      btnHandle(btnKey) {
-        console.log('XXXXXXXXXXXXXXX' + btnKey)
-        switch (btnKey) {
-          case 'toAdd':
-            this.toAdd()
-            break
-          case 'toEdit':
-            this.toEdit()
-            break
-          case 'doSubmit':
-            this.doSubmit()
-            break
-          case 'doDel':
-            this.doDel()
-            break
-          case 'doImport':
-            this.doImport()
-            break
-          case 'doExport':
-            this.doExport()
-            break
-          default:
-            break
-        }
-      },
-
-      // 获取数据sid
-      handleSelectionChange(row) {
-        console.log('aaa', row)
-        const aa = []
-        row.forEach(element => {
-          aa.push(element.sid)
-          setuser(this.sids)
-        })
-        this.sids = aa
-        this.row = row
-        this.sides = this.sids.join() //将sid数组的元素转化成字符串
-        console.log('获取sids数组', this.sids)
-      },
-
-      toAdd(row) {
-        this.viewState = 2
-        this.$refs['divadd'].showAdd()
-      },
-      toEdit() {
-        if (this.sids.length === 0) {
-          this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
-          return
-        }
-        if (this.sids.length > 1) {
-          this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' })
-          return
-        }
-        this.viewState = 3
-        const sid = this.sids[0]
-        const row = this.row
-        this.$refs['divadd'].showEdit(sid, row)
-      },
-      doSubmit(row) {
-        // 提交的代码
-        this.btndisabled = true
-        req
-          .doSubmit(this.queryParams.params, this.sids)
-          .then(resp => {
-            console.log(resp)
-            this.btndisabled = false
-          })
-          .catch(() => {
-            this.btndisabled = false
-          })
-      },
-      doDel(row) {
-        if (this.sids.length === 0) {
-          this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
-          return
-        }
-        const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
-        this.$confirm(tip, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 删除
+    doDel(row) {
+      if (this.sids.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
+        return
+      }
+      const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
         })
-          .then(() => {
-            const loading = this.$loading({
-              lock: true,
-              text: 'Loading',
-              spinner: 'el-icon-loading',
-              background: 'rgba(0, 0, 0, 0.7)'
-            })
-            const _this = this
-            req.delBySids(this.sids).then(resp => {
-              loading.close()
-              _this.$message({ type: 'success', message: resp.msg, showClose: true })
-              _this.loadList()
-            })
-              .catch(e => {
-                loading.close()
-              })
-          })
-          .catch(() => {
-          })
-      },
-      doImport(row) {
-        // 导入的代码
-        req
-          .importExcel(this.queryParams.params, this.sids)
-          .then(resp => {
-            console.log(resp)
-          })
-          .catch(() => {
-          })
-      },
-      doExport(sids) {
-        // 导出的代码
-        req
-          .exportExcel(this.queryParams.params, this.sids)
-          .then(resp => {
-            var map = resp.data
-            const fileName = map.filename // 导出文件名
-            // // 对于<a>标签，只有 Firefox 和 Chrome（内核） 支持 download 属性
-            // // IE10以上支持blob但是依然不支持download
-            const link = document.createElement('a') // 创建a标签
-            link.download = fileName // a标签添加属性
-            link.style.display = 'none'
-            link.href = map.downurl
-            document.body.appendChild(link)
-            link.click() // 执行下载
-            URL.revokeObjectURL(link.href) // 释放url
-            document.body.removeChild(link) // 释放标签
-          })
-          .catch(() => {
-          })
-      },
-      dosearch() {
-        this.queryParams.current = 1
-        this.loadList()
-      },
-
-      resetQuery() {
-        this.queryParams.params = {}
-        this.queryParams.params.sid = '' // sid
-        this.queryParams.params.name = '' // 登录名
-        this.dosearch()
-      },
-      // 查询
-      loadList() {
         const _this = this
-        this.tableLoading = true
-        req
-          .listPage(this.queryParams)
-          .then(resp => {
-            console.log('查询列表', resp)
-            _this.tableLoading = false
-            const data = resp.data
-            _this.queryParams.total = data.total
-            _this.dataList = data.records
-            // for (var i = 0; i < data.records.length; i++) {
-            //   var timeArr = data.records[i].createTime.split(' ');
-            //   this.dataList[i].createTime = timeArr[0];
-            // }
-          })
-          .catch(() => {
-            _this.tableLoading = false
-          })
-      },
-
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      toInfo(row) {
-        this.viewState = 4
-        console.log('这是打开详情接口', row)
-        const sid = row.sid
-        this.$refs['divinfo'].showInfo(sid, row)
-      }
+        req.delBySids(this.sids).then(resp => {
+          loading.close()
+          _this.$message({ type: 'success', message: resp.msg, showClose: true })
+          _this.loadList()
+        }).catch(e => {
+          loading.close()
+        })
+      }).catch(() => {})
+    },
+    // 子组件关闭（返回）
+    resetState() {
+      this.viewState = 1
+      this.loadList()
+    },
+    doSubmit(row) {
+      // 提交的代码
+      this.btndisabled = true
+      req.doSubmit(this.queryParams.params, this.sids).then(resp => {
+        console.log(resp)
+        this.btndisabled = false
+      }).catch(() => {
+        this.btndisabled = false
+      })
+    },
+    doImport(row) {
+      // 导入的代码
+      req.importExcel(this.queryParams.params, this.sids).then(resp => {
+        console.log(resp)
+      }).catch(() => {})
+    },
+    doExport(sids) {
+      // 导出的代码
+      req.exportExcel(this.queryParams.params, this.sids).then(resp => {
+        var map = resp.data
+        const fileName = map.filename // 导出文件名
+        // // 对于<a>标签，只有 Firefox 和 Chrome（内核） 支持 download 属性
+        // // IE10以上支持blob但是依然不支持download
+        const link = document.createElement('a') // 创建a标签
+        link.download = fileName // a标签添加属性
+        link.style.display = 'none'
+        link.href = map.downurl
+        document.body.appendChild(link)
+        link.click() // 执行下载
+        URL.revokeObjectURL(link.href) // 释放url
+        document.body.removeChild(link) // 释放标签
+      }).catch(() => {})
     }
   }
+}
 </script>
 
 <style scoped>
-  .bluezi {
-    padding-left: 5px;
-  }
+.line {
+  display: inline-block;
+  margin: 0px 15px;
+}
+.listtop {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 40px;
+}
+.tit {
+  margin-bottom: -10px;
+}
 
-  .line {
-    display: inline-block;
-    margin: 0px 15px;
-  }
-
-  .formItem {
-    margin-right: 28px;
-  }
+.pagination {
+  margin-bottom: -10px;
+}
+.formItem {
+  margin-right: 28px;
+}
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/vehicle/cheliangpaichan/cheliangpaichanAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/vehicle/cheliangpaichan/cheliangpaichanAdd.vue
index d8518b36b0..8d65425e21 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/vehicle/cheliangpaichan/cheliangpaichanAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/vehicle/cheliangpaichan/cheliangpaichanAdd.vue
@@ -1,173 +1,182 @@
 <template>
   <div class="app-container">
-    <!--标题按钮部分开始-->
-    <div class="tab-header webtop">
-      <!--标题-->
-      <div>{{ viewTitle }}</div>
-      <!--start 添加修改按钮-->
-      <div>
-        <el-button type="primary" size="small" :disabled="submitdisabled" @click="dialogStatus === 'add' ? saveAdd() : saveEdit()">保存</el-button>
-        <el-button type="primary" size="small" @click="dialogStatus === 'create' ? saveAdd() : saveEdit()">提交</el-button>
-        <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
-      </div>
-    </div>
-    <!--标题按钮部分结束-->
-    <!--Start 新增修改部分-->
-    <div class="listconadd">
-      <div class="wlInfo"><span>销售出库单</span></div>
-      <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
-        <el-row class="lineone">
-          <el-col :span="3" class="el-form-item-right">
-            <el-form-item label="单据编号:"></el-form-item>
-          </el-col>
-          <el-col :span="5">
-            <el-form-item>
-              <el-input v-model="formobj.applicationCode" readonly/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3" class="el-form-item-right">
-            <el-form-item label="制单人:"></el-form-item>
-          </el-col>
-          <el-col :span="5">
-            <el-form-item>
-              <el-input v-model="formobj.createByName" readonly/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3" class="el-form-item-right">
-            <el-form-item label="制单日期:"></el-form-item>
-          </el-col>
-          <el-col :span="5">
-            <el-form-item>
-              <el-input v-model="formobj.applicationDate" readonly/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row class="linetwo">
-          <el-col :span="3" class="el-form-item-right">
-            <el-form-item label="排产类型:"></el-form-item>
-          </el-col>
-          <el-col :span="21">
-            <el-form-item>
-              <el-select v-model="formobj.schedulingType" placeholder="请选择" @change="changeSchedulingType" clearable>
-                <el-option v-for="item in schedulingType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row class="linethree">
-          <el-col :span="3" class="el-form-item-right">
-            <el-form-item label="备注:"></el-form-item>
-          </el-col>
-          <el-col :span="21">
-            <el-form-item>
-              <el-input v-model="formobj.remarks" clearable/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div class="tableStyle">
-        <div style="margin-left: 5px;font-weight: bold">排产车型列表</div>
-        <div style="margin-left: 15px">
-          <el-button type="primary" size="small" icon="el-icon-plus" @click="addCommodity()">新增</el-button>
+    <div v-show="viewState== 1">
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="dialogStatus === 'add' ? saveAdd() : saveEdit()">保存
+          </el-button>
+          <el-button type="primary" size="small" @click="submitVehicleApply()">提交
+          </el-button>
+          <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
         </div>
       </div>
-      <el-table :key="tableKey" :data="formobj.busVehicleApplyDetailDtoList" :index="index" show-summary :summary-method="getSummaries" border style="width: 100%">
-        <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-        <el-table-column fixed prop="name" label="操作" width="80px" align="center" header-align="center">
-          <template slot-scope="scope">
-            <el-button size="mini" type="danger" @click="dataDelete(scope.$index, formobj.busVehicleApplyDetailDtoList[scope.$index])">删除</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="车型" width="300" header-align="center">
-          <template slot-scope="scope" prop="vehicleName">
-            <el-select v-model="scope.row.vehicleName" placeholder="请选择" style="width: 270px" @change="changeVehicle(scope.row)" clearable>
-              <el-option v-for="item in vehicle_list" :key="item.sid" :label="item.modelName" :value="item.modelName"></el-option>
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column label="常用配置" width="300" header-align="center">
-          <template slot-scope="scope" prop="configName">
-            <span>{{ scope.row.configName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="排产数量" header-align="center">
-          <template slot-scope="scope" prop="quantity">
-            <el-input v-model="scope.row.quantity" placeholder="" class="addinputw" clearable/>
-          </template>
-        </el-table-column>
-        <el-table-column prop="useDeposit" label="使用订金" header-align="center">
-          <template slot-scope="scope" prop="useDeposit">
-            <el-input v-model="scope.row.useDeposit" placeholder="" class="addinputw" clearable/>
-          </template>
-        </el-table-column>
-        <el-table-column prop="applyForDeposit" label="申请订金" header-align="center">
-          <template slot-scope="scope" prop="applyForDeposit">
-            <el-input v-model="scope.row.applyForDeposit" placeholder="" class="addinputw" clearable/>
-          </template>
-        </el-table-column>
-        <el-table-column label="销售指导价" header-align="center">
-          <template slot-scope="scope" prop="saleGuPrice">
-            <el-input v-model="scope.row.saleGuPrice" placeholder="" class="addinputw" clearable/>
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" header-align="center">
-          <template slot-scope="scope" prop="remarks">
-            <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div>
-        <div class="tableStyle">
-          <div style="margin-left: 5px;font-weight: bold">订金使用情况</div>
-        </div>
-        <el-form ref="formobj" :model="formobj" label-width="130px" label-position="top" class="formadd">
-          <el-row>
-            <el-col :span="4" class="el-form-item-right">
-              <el-form-item label="当前订金金额"></el-form-item>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="listconadd">
+        <div class="wlInfo"><span>排产申请</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
+          <el-row class="lineone">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请编号:"></el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="5">
               <el-form-item>
-                <el-input v-model="formobj.quantity" placeholder="" clearable/>
+                <el-input v-model="formobj.applicationCode" readonly/>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="el-form-item-right">
-              <el-form-item label="本次需使用金额"></el-form-item>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请人:"></el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="5">
               <el-form-item>
-                {{ useMoney }}
+                <el-input v-model="formobj.createByName" readonly/>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="el-form-item-right">
-              <el-form-item label="本次申请金额"></el-form-item>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请日期:"></el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="5">
               <el-form-item>
-                {{ applyMoney }}
+                <el-input v-model="formobj.applicationDate" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="排产类型:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-select v-model="formobj.schedulingType" placeholder="请选择" clearable>
+                  <el-option v-for="item in schedulingType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linethree">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="备注:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.remarks" clearable/>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
+        <div class="tableStyle">
+          <div style="margin-left: 5px;font-weight: bold">排产车型列表</div>
+          <div style="margin-left: 15px">
+            <el-button type="primary" size="small" icon="el-icon-plus" @click="addCommodity()">添加</el-button>
+          </div>
+        </div>
+        <el-table :key="tableKey" :data="formobj.busVehicleApplyDetailDtoList" :index="index" show-summary :summary-method="getSummaries" border style="width: 100%">
+          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+          <el-table-column fixed prop="name" label="操作" width="80px" align="center" header-align="center">
+            <template slot-scope="scope">
+              <el-button size="mini" type="danger" @click="dataDelete(scope.$index, formobj.busVehicleApplyDetailDtoList[scope.$index])">删除
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="车型" align="left" header-align="center" width="250">
+            <template slot-scope="scope" prop="vehicleName">
+              <span>{{ scope.row.vehicleName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="常用配置" align="left" header-align="center">
+            <template slot-scope="scope" prop="configName">
+              <span>{{ scope.row.configName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="排产数量" header-align="center" width="130">
+            <template slot-scope="scope" prop="quantity">
+              <el-input v-model="scope.row.quantity" placeholder="" class="addinputw" clearable/>
+            </template>
+          </el-table-column>
+          <el-table-column prop="useDeposit" label="使用订金" header-align="center" width="150">
+            <template slot-scope="scope" prop="useDeposit">
+              <el-input v-model="scope.row.useDeposit" placeholder="" class="addinputw" clearable/>
+            </template>
+          </el-table-column>
+          <el-table-column prop="applyForDeposit" label="申请订金" header-align="center" width="150">
+            <template slot-scope="scope" prop="applyForDeposit">
+              <el-input v-model="scope.row.applyForDeposit" placeholder="" class="addinputw" clearable/>
+            </template>
+          </el-table-column>
+          <el-table-column label="销售指导价" header-align="center" width="150">
+            <template slot-scope="scope" prop="saleGuPrice">
+              <el-input v-model="scope.row.saleGuPrice" placeholder="" class="addinputw" clearable/>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" header-align="center" width="200">
+            <template slot-scope="scope" prop="remarks">
+              <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div>
+          <div class="tableStyle">
+            <div style="margin-left: 5px;font-weight: bold">订金使用情况</div>
+          </div>
+          <el-form ref="formobj" :model="formobj" label-width="130px" label-position="top" class="formadd">
+            <el-row>
+              <el-col :span="4" class="el-form-item-right">
+                <el-form-item label="当前订金金额"></el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item>
+                  <el-input v-model="formobj.currentAmount" placeholder="" clearable/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" class="el-form-item-right">
+                <el-form-item label="本次需使用金额"></el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item>
+                  {{ useMoney }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" class="el-form-item-right">
+                <el-form-item label="本次申请金额"></el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item>
+                  {{ applyMoney }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
       </div>
     </div>
     <!--End 添加修改部分-->
+    <!--选择车型和常用配置-->
+    <configuration v-show="viewState == 2" ref="divconfiguration" @backData="backData" @doback="closePage"/>
   </div>
 </template>
 
 <script>
 import req from '@/api/supplychain/busvehicleapply'
-
+import configuration from './chexingbyconfiguration'
 export default {
   name: 'cheliangpaichanAdd',
+  components: {
+    configuration
+  },
   data() {
     return {
       viewTitle: '',
       dialogStatus: '',
+      viewState: 1,
       index: 0,
       tableKey: 0,
       // 下拉框
       schedulingType_list: [], // 排产订金使用
-      vehicle_list: [], // 车型
+      list1: [],
       useMoney: '', // 本次需使用金额
       applyMoney: '', // 本次申请金额
       // 表单数据
@@ -179,20 +188,8 @@ export default {
         applicationDate: '', // 申请日期
         schedulingType: '', // 排产类型
         remarks: '', // 备注
-        busVehicleApplyDetailDtoList: [
-          {
-            quantity: '',
-            applySid: '',
-            configSid: '',
-            configName: '',
-            useDeposit: '',
-            applyForDeposit: '',
-            remarks: '',
-            saleGuPrice: '',
-            vehicleName: '',
-            vehicleSid: ''
-          }
-        ]
+        currentAmount: '', // 当前订金金额
+        busVehicleApplyDetailDtoList: []
       },
       rules: {},
       submitdisabled: false
@@ -200,7 +197,6 @@ export default {
   },
   created() {
     this.getSchedulingType()
-    this.getCheXing()
   },
   // computed: {
   //   sumUseDeposit() {
@@ -209,93 +205,25 @@ export default {
   //   }
   // },
   methods: {
-    // 下拉框-排产类型 changeSchedulingType
+    // 下拉框-排产类型
     getSchedulingType() {
       req.pullDown({ type: 'schedulingType' }).then((res) => {
-        if (res.code == "200") {
+        if (res.code == '200') {
           this.schedulingType_list = res.data
           console.log('下拉框请求111', res.data)
         }
       })
     },
-    changeSchedulingType(value) {
-      console.log('触发下拉框按钮')
-      let bb = {}
-      this.schedulingType_list.forEach((e) => {
-        if (e.dictKey == value) {
-          bb = {
-            type: e.dictType,
-            name: e.dictValue,
-            key: e.dictKey,
-            sid: e.sid
-          }
-        }
-      })
-      this.formobj.schedulingType = bb.name
-      // this.formobj.scmOtherInboundDto.billType = bb.sid
-      console.log('name', this.formobj.schedulingType)
-    },
-
-    // 下拉框—车型
-    getCheXing() {
-      req.selectDown().then((res) => {
-        if (res.code == "200") {
-          this.vehicle_list = res.data
-        }
-      })
-    },
-    changeVehicle(row) {
-      let bb = {}
-      this.vehicle_list.forEach((e) => {
-        if (e.modelName == row.vehicleName) {
-          bb = {
-            name: e.modelName,
-            sid: e.sid
-          }
-        }
-      })
-      console.log('车型sid', bb.sid)
-      req.getList({ vehicleSid: bb.sid }).then((res) => {
-          console.log('车型', res)
-          if (res.code == "200") {
-            this.configName_list = res.data
-          }
-        })
-    },
-
     // 明细表添加一行数据
     addCommodity() {
-      this.formobj.busVehicleApplyDetailDtoList.push({
-        quantity: '',
-        applySid: '',
-        configSid: '',
-        configName: '',
-        useDeposit: '',
-        applyForDeposit: '',
-        remarks: '',
-        saleGuPrice: '',
-        vehicleName: '',
-        vehicleSid: ''
-      })
+      this.viewState = 2
+      this.$refs['divconfiguration'].showData(this.list1)
     },
-
     // 明细表删除一行数据
     dataDelete(index, row) {
       this.formobj.busVehicleApplyDetailDtoList.splice(index, 1)
+      this.list1.splice(index, 1)
     },
-
-    // 返回（===既判断又赋值）
-    handleReturn(isreload) {
-      if (isreload === 'true') this.$emit('reloadlist')
-      this.formobj.schedulingType = '' // 排产类型
-      this.formobj.depositPayment = '' // 排产订金使用
-      this.formobj.remarks = '' // 备注
-      this.formobj.busVehicleApplyDetailDtoList = [{}]
-      this.refreshItem++
-      this.$refs['form_obj'].resetFields()
-      this.$emit('doback')
-    },
-
     showAdd() {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
@@ -303,7 +231,6 @@ export default {
       this.dialogStatus = 'add'
       this.viewTitle = '【新增】排产申请'
     },
-
     showEdit(sid, row) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
@@ -312,69 +239,85 @@ export default {
       this.viewTitle = '【编辑】排产申请'
       console.log('编辑回显', sid)
       req.fetchBySid(sid).then((resp) => {
-          const data = resp.data
-          this.formobj.applicationCode = data.applicationCode
-          this.formobj.applicationDate = data.applicationDate
-          this.formobj.schedulingType = data.schedulingType
-          this.formobj.depositPayment = data.depositPayment
-          this.formobj.remarks = data.remarks
-          this.formobj.sid = sid
-          this.formobj.busVehicleApplyDetailDtoList = data.busVehicleApplyDetailVoList
-        }).catch((e) => {
-          this.formobj = row
+        const data = resp.data
+        this.formobj.applicationCode = data.applicationCode
+        this.formobj.applicationDate = data.applicationDate
+        this.formobj.schedulingType = data.schedulingType
+        this.formobj.remarks = data.remarks
+        this.formobj.currentAmount = data.currentAmount
+        this.formobj.sid = sid
+        this.formobj.busVehicleApplyDetailDtoList = data.busVehicleApplyDetailVoList
+        this.list1 = data.busVehicleApplyDetailVoList
+      }).catch((e) => {
+        this.formobj = row
+      })
+    },
+    // 车型常用配置列表--新增确定返回的数据
+    backData(value) {
+      this.viewState = 1
+      // this.formobj.busVehicleApplyDetailDtoList = []
+      if (this.formobj.busVehicleApplyDetailDtoList.length > 0) {
+        for (var i = 0; i < value.length; i++) {
+          for (var u = 0; u < this.formobj.busVehicleApplyDetailDtoList.length; u++) {
+            if (value[i].modelName == this.formobj.busVehicleApplyDetailDtoList[u].vehicleName && value[i].configName == this.formobj.busVehicleApplyDetailDtoList[u].configName) {
+              value.splice(value[i], 1)
+            }
+          }
+        }
+      }
+      if (value.length > 0) {
+        value.forEach((e) => {
+          this.formobj.busVehicleApplyDetailDtoList.push({
+            quantity: '',
+            applySid: '',
+            configSid: e.configurationItemsSid,
+            configName: e.configName,
+            useDeposit: '',
+            applyForDeposit: '',
+            remarks: '',
+            saleGuPrice: '',
+            vehicleName: e.modelName,
+            vehicleSid: e.modelSid
+          })
         })
+        this.list1 = this.formobj.busVehicleApplyDetailDtoList
+      }
     },
-
     saveAdd() {
-      const _this = this
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
-          req
-            .saveAdd(this.formobj)
-            .then((resp) => {
-              this.submitdisabled = false
-              if (resp.code === '200') {
-                this.$notify({
-                  title: '提示',
-                  message: '添加成功',
-                  type: 'success',
-                  duration: 2000
-                })
-                _this.$message({
-                  showClose: true,
-                  type: 'success',
-                  message: resp.msg
-                })
-                _this.handleReturn('true')
-              }
-            })
-            .catch(() => {
-              this.submitdisabled = false
-            })
+          req.saveAdd(this.formobj).then((resp) => {
+            this.submitdisabled = false
+            if (resp.code == '200') {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: resp.msg
+              })
+              this.handleReturn('true')
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
         } else {
           return false
         }
       })
     },
-
     saveEdit() {
-      const _this = this
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
-          req
-            .saveEdit(this.formobj, this.formobj.sid)
-            .then((resp) => {
+          req.saveEdit(this.formobj).then((resp) => {
               this.submitdisabled = false
-              _this.$message({
+              this.$message({
                 showClose: true,
                 type: 'success',
                 message: resp.msg
               })
-              _this.handleReturn('true')
-            })
-            .catch(() => {
+              this.handleReturn('true')
+            }).catch(() => {
               this.submitdisabled = false
             })
         } else {
@@ -382,9 +325,40 @@ export default {
         }
       })
     },
+    submitVehicleApply() {
+      req.submitVehicleApply(this.formobj).then((res) => {
+        if (res.code == '200') {
+          this.$message({
+            showClose: true,
+            type: 'success',
+            message: '提交成功'
+          })
+          this.handleReturn('true')
+        } else {
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '提交失败'
+          })
+        }
+      })
+    },
+    // 返回（===既判断又赋值）
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj.schedulingType = '' // 排产类型
+      this.formobj.remarks = '' // 备注
+      this.formobj.currentAmount = ''
+      this.formobj.applicationCode = ''
+      this.formobj.applicationDate = ''
+      this.formobj.busVehicleApplyDetailDtoList = []
+      this.list1 = []
+      this.$refs['form_obj'].resetFields()
+      this.$refs['divconfiguration'].getList()
+      this.$emit('doback')
+    },
     // 合计
     getSummaries(param) {
-      console.log(123123)
       const { columns, data } = param
       const sums = []
       columns.forEach((column, index) => {
@@ -404,7 +378,7 @@ export default {
           }, 0)
           sums[index] += ''
           this.useMoney = sums[index] += ''
-        } else if (column.property === 'applyForDeposit'){
+        } else if (column.property === 'applyForDeposit') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
             if (!isNaN(value)) {
@@ -433,6 +407,9 @@ export default {
         }
       })
       return sums
+    },
+    closePage() {
+      this.viewState = 1
     }
   }
 }
@@ -444,31 +421,24 @@ export default {
   font-size: 28px;
   line-height: 90px;
 }
-
 .lineone {
   border-bottom: 2px solid #e0e3eb;
 }
-
 .lineone .el-form-item {
   margin-bottom: -10px;
 }
-
 .lineone >>> .el-input__inner {
   border: 0;
 }
-
 .linetwo {
   margin-top: 10px;
 }
-
 .linetwo .el-form-item {
   margin-bottom: 0px !important;
 }
-
 .linethree .el-form-item {
   margin-bottom: 0px !important;
 }
-
 .tableStyle {
   background-color: #FFFFFF;
   display: flex;
@@ -477,7 +447,6 @@ export default {
   border: 1px solid #dfe4ed;
   height: 40px;
 }
-
 .el-form-item-right {
   /* padding: 0 10px 0 0; */
   text-align: right;
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/vehicle/cheliangpaichan/cheliangpaichanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/vehicle/cheliangpaichan/cheliangpaichanInfo.vue
index f2bdb0ab05..ef3d274a56 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/vehicle/cheliangpaichan/cheliangpaichanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/vehicle/cheliangpaichan/cheliangpaichanInfo.vue
@@ -1,207 +1,305 @@
 <template>
   <div class="app-container">
-    <!--标题按钮部分开始-->
-    <div class="tab-header webtop">
-      <!--标题-->
-      <div>【详情】排产申请</div>
-      <!--start 详情按钮-->
-      <div>
-        <el-button itype="info" size="small" @click="handleReturn()">返回</el-button>
+    <div>
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+        </div>
       </div>
-      <!--end 详情按钮-->
-    </div>
-    <!--标题按钮部分结束-->
-    <div class="listconadd"><!-- -->
-      <div class="title">排产申请</div>
-      <el-form ref="form_obj" :model="formobj" :inline="true" label-width="120px">
-        <div style="border-bottom:  2px solid #e0e3eb; height: 40px;">
-          <!--第一行-->
-          <el-row>
-            <el-col :span="10" style="margin-left: 80px; height: 20px;">
-              <el-form-item label="单据编号:">{{ formobj.applicationCode }}</el-form-item>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="listconadd">
+        <div class="wlInfo"><span>排产申请</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
+          <el-row class="lineone">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请编号:"></el-form-item>
             </el-col>
-            <el-col :span="6" style=" height: 20px;">
-              <el-form-item label="制单人:">{{ formobj.makeListName }}</el-form-item>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.applicationCode" readonly/>
+              </el-form-item>
             </el-col>
-            <el-col :span="5" style=" height: 20px;">
-              <el-form-item label="制单日期:">{{ formobj.applicationDate }}</el-form-item>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请人:"></el-form-item>
             </el-col>
-          </el-row>
-        </div>
-        <div class="invoiceadd" style="margin-top: 5px;">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item prop="schedulingType" label="排产类型">
-                <el-input v-model="formobj.schedulingType" placeholder="" class="addinputw"
-                          readonly/>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.createByName" readonly/>
               </el-form-item>
             </el-col>
-
-            <el-col :span="24">
-              <el-form-item prop="depositPayment" label="排产订金使用">
-                <el-input v-model="formobj.depositPayment" placeholder="" class="addinputw"
-                          readonly/>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请日期:"></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.applicationDate" readonly/>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item prop="remarks" label="备注">
-                <el-input v-model="formobj.remarks" placeholder="" class="addinputw"
-                          readonly/>
+          </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="排产类型:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.schedulingType" readonly/>
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row class="linethree">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="备注:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.remarks" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div class="tableStyle">
+          <div style="margin-left: 5px;font-weight: bold">排产车型列表</div>
         </div>
-        <div class="addtable">
-          <div class="tabletitle">
-            <div class="titlename">
-              货物明细
-            </div>
+        <el-table :key="tableKey" :data="formobj.busVehicleApplyDetailDtoList" :index="index" show-summary :summary-method="getSummaries" border style="width: 100%">
+          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+          <el-table-column label="车型" align="left" header-align="center" width="250">
+            <template slot-scope="scope" prop="vehicleName">
+              <span>{{ scope.row.vehicleName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="常用配置" align="left" header-align="center">
+            <template slot-scope="scope" prop="configName">
+              <span>{{ scope.row.configName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="排产数量" header-align="center" width="130">
+            <template slot-scope="scope" prop="quantity">
+              <span>{{ scope.row.quantity }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="useDeposit" label="使用订金" header-align="center" width="150">
+            <template slot-scope="scope" prop="useDeposit">
+              <span>{{ scope.row.useDeposit }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="applyForDeposit" label="申请订金" header-align="center" width="150">
+            <template slot-scope="scope" prop="applyForDeposit">
+              <span>{{ scope.row.applyForDeposit }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="销售指导价" header-align="center" width="150">
+            <template slot-scope="scope" prop="saleGuPrice">
+              <span>{{ scope.row.saleGuPrice }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" header-align="center" width="200">
+            <template slot-scope="scope" prop="remarks">
+              <span>{{ scope.row.remarks }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div>
+          <div class="tableStyle">
+            <div style="margin-left: 5px;font-weight: bold">订金使用情况</div>
           </div>
-          <template class="tablelist">
-            <!--          :rules="rules"  <el-table :data="tableData" :index="index" border tyle="width: 100%">-->
-            <el-table
-              :data="formobj.busVehicleApplyDetailVoList"
-              :index="index"
-              border
-              style="width: 100%"> <!-- show-summary :summary-method="getSummaries" -->
-              <el-table-column
-                align="center"
-                label="序号"
-                type="index"
-                width="50"/>
-              <el-table-column prop="vehicleName" width="210" label="车型" align="center">
-                <template slot-scope="props">
-                  <span>{{props.row.vehicleName}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column prop="configName" width="210" label="简述配置" align="center">
-                <template slot-scope="props">
-                  <!--                  <el-input v-model="props.row.mName" style="width:120px;" class="tableinput"/>-->
-                  <span>{{props.row.configName}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column prop="spOrDiConDes" width="300" label="特殊或差异配置说明" align="center">
-                <template slot-scope="props">
-                  <el-input v-model="props.row.spOrDiConDes" style="width:203px;" class="tableinput"/>
-                  <!--                  <span>{{props.row.model}}</span>-->
-                </template>
-              </el-table-column>
-              <el-table-column prop="actualQuantity" width="180" label="排产数量" align="center">
-                <template slot-scope="props">
-                  <el-input v-model="props.row.actualQuantity" style="width:150px;" class="tableinput"/>
-                  <!--<span>{{props.row.count}}</span>-->
-                </template>
-              </el-table-column>
-              <el-table-column prop="proSchDep" width="180" label="排产订金" align="center">
-                <template slot-scope="props">
-                  <el-input v-model="props.row.proSchDep" style="width:150px;" class="tableinput"/>
-                  <!-- <span>{{props.row.leviedSubtotal}}</span>-->
-                </template>
-              </el-table-column>
-              <el-table-column prop="saleGuPrice	" width="180" label="销售指导价" align="center">
-                <template slot-scope="props">
-                  <el-input v-model="props.row.saleGuPrice	" style="width:150px;" class="tableinput"/>
-                  <!--                  <span>{{props.row.company}}</span>-->
-                </template>
-              </el-table-column>
-              <el-table-column prop="remarks" width="280" label="备注" align="center">
-                <template slot-scope="props">
-                  <el-input v-model="props.row.remarks" style="width:180px;" class="tableinput"/>
-                  <!--                  <span>{{props.row.remarks}}</span>-->
-                </template>
-              </el-table-column>
-            </el-table>
-          </template>
+          <el-form ref="formobj" :model="formobj" label-width="130px" label-position="top" class="formadd">
+            <el-row>
+              <el-col :span="4" class="el-form-item-right">
+                <el-form-item label="当前订金金额"></el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item>
+                  {{ formobj.currentAmount }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" class="el-form-item-right">
+                <el-form-item label="本次需使用金额"></el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item>
+                  {{ useMoney }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" class="el-form-item-right">
+                <el-form-item label="本次申请金额"></el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item>
+                  {{ applyMoney }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
         </div>
-      </el-form>
+      </div>
     </div>
+    <!--End 添加修改部分-->
   </div>
 </template>
 
 <script>
-  import req from '@/api/supplychain/busvehicleapply'
-
-  export default {
-    name: 'cheliangpaichanInfo',
-    data() {
-      return {
-        viewTitle: '',
-        index: 0,
-
-        viewState: 4,
-        formobj: {
-          sid: '', // 一条数据的sid
-          createBySid: window.sessionStorage.getItem('userSid'), // 用户人sid
-          orgSid: window.sessionStorage.getItem('orgSid'), // 部门sid
-          orgName: window.sessionStorage.getItem('departmentName'), // 部门名称
-          makeListName: window.sessionStorage.getItem('name'),//制单人
-          applicationCode:'',
-          applicationDate:'',
-          schedulingType: '',// 排产类型
-          depositPayment: '', // 排产订金使用
-          remarks: '', // 备注
-          busVehicleApplyDetailDtoList: [{
-            vehicleName: '', // 车型
-            configName: '', // 简述配置
-            spOrDiConDes: '', // 特殊或差异
-            actualQuantity: '', // 排产数量
-            proSchDep: '', // 排产订金
-            saleGuPrice: '', // 销售指导价
-            remarks:'' // 备注
-          }]
-        },
-      }
-    },
-    methods: {
-      handleReturn() {
-        this.formobj.scmOtherInboundDto = {}
-        this.formobj.scmOtherInboundDetailDto = [{}]
-        this.$emit('doback')
-      },
-      showInfo(sid, row) {
-        this.viewTitle = '其他入库单详情'
-        const _this = this
-        console.log('详情页面', sid)
-        req.fetchBySid(sid).then(resp => {
-          const data = resp.data
-          // this.formobj = data
-          this.formobj.applicationCode = data.applicationCode
-          this.formobj.applicationDate = data.applicationDate
-          this.formobj.schedulingType = data.schedulingType
-          this.formobj.depositPayment = data.depositPayment
-          this.formobj.remarks = data.remarks
-          this.formobj.sid = sid
-          // //明细表
-          this.formobj.busVehicleApplyDetailVoList = data.busVehicleApplyDetailVoList
-        }).catch(e => {
-          this.formobj = row
-        })
+import req from '@/api/supplychain/busvehicleapply'
+export default {
+  name: 'cheliangpaichanInfo',
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      tableKey: 0,
+      useMoney: '', // 本次需使用金额
+      applyMoney: '', // 本次申请金额
+      // 表单数据
+      formobj: {
+        sid: '', // 一条数据的sid
+        createBySid: window.sessionStorage.getItem('userSid'), // 用户人sid
+        createByName: window.sessionStorage.getItem('name'), // 制单人
+        applicationCode: '', // 申请编号
+        applicationDate: '', // 申请日期
+        schedulingType: '', // 排产类型
+        remarks: '', // 备注
+        currentAmount: '', // 当前订金金额
+        busVehicleApplyDetailDtoList: []
       },
+      rules: {}
+    }
+  },
+  methods: {
+    showInfo(sid, row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.viewTitle = '排产申请详情'
+      req.fetchBySid(sid).then((resp) => {
+        const data = resp.data
+        this.formobj.applicationCode = data.applicationCode
+        this.formobj.applicationDate = data.applicationDate
+        this.formobj.schedulingType = data.schedulingType
+        this.formobj.remarks = data.remarks
+        this.formobj.currentAmount = data.currentAmount
+        this.formobj.sid = sid
+        this.formobj.busVehicleApplyDetailDtoList = data.busVehicleApplyDetailVoList
+      }).catch((e) => {
+        this.formobj = row
+      })
+    },
+    // 返回（===既判断又赋值）
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj.schedulingType = '' // 排产类型
+      this.formobj.remarks = '' // 备注
+      this.formobj.currentAmount = ''
+      this.formobj.createByName = ''
+      this.formobj.createBySid = ''
+      this.formobj.applicationCode = ''
+      this.formobj.applicationDate = ''
+      this.formobj.busVehicleApplyDetailDtoList = []
+      this.list1 = []
+      this.$refs['form_obj'].resetFields()
+      this.$emit('doback')
+    },
+    // 合计
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        if (column.property === 'useDeposit') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+          this.useMoney = sums[index] += ''
+        } else if (column.property === 'applyForDeposit') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+          this.applyMoney = sums[index] += ''
+        } else {
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ''
+            this.amount = sums[index] += ''
+          } else {
+            sums[index] = ''
+          }
+        }
+      })
+      return sums
     }
   }
+}
 </script>
 
 <style scoped>
-  /* 利用穿透，设置input边框隐藏 */
-  .invoiceadd >>> .el-input__inner {
-    border: 0;
-    border-bottom: 1px solid #e0e3eb !important;
-  }
-
-  /* 如果你的 el-input type 设置成textarea ，就要用这个了 */
-  /*.invoiceadd>>>.el-textarea__inner {
-    border: 0;
-    resize: none;!* 这个是去掉 textarea 下面拉伸的那个标志，如下图 *!
-  }*/
-  .invoiceadd >>> .el-form-item__content {
-    margin-left: 0 !important;
-  }
-
-  .el-input {
-    width: 230px;
-  }
-
-  .el-col .el-form-item {
-    margin-bottom: 10px;
-  }
+.wlInfo {
+  text-align: center;
+  font-size: 28px;
+  line-height: 90px;
+}
+.lineone {
+  border-bottom: 2px solid #e0e3eb;
+}
+.lineone .el-form-item {
+  margin-bottom: -10px;
+}
+.lineone >>> .el-input__inner {
+  border: 0;
+}
+.linetwo {
+  margin-top: 10px;
+}
+.linetwo .el-form-item {
+  margin-bottom: 0px !important;
+}
+.linetwo >>> .el-input__inner {
+  border: 0;
+}
+.linethree .el-form-item {
+  margin-bottom: 0px !important;
+}
+.tableStyle {
+  background-color: #FFFFFF;
+  display: flex;
+  justify-content: start;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 40px;
+}
+.el-form-item-right {
+  text-align: right;
+}
+.formadd{
+  padding: 0px !important;
+}
+.icon {
+  color: #e84026;
+  margin-right: 4px;
+}
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/vehicle/cheliangpaichan/chexingbyconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/vehicle/cheliangpaichan/chexingbyconfiguration.vue
index e69de29bb2..7a94bf557b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/vehicle/cheliangpaichan/chexingbyconfiguration.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/vehicle/cheliangpaichan/chexingbyconfiguration.vue
@@ -0,0 +1,191 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>车型常用列表</div>
+        <div>
+          <el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="webcon">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="客户名称:">
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
+              <el-form-item label="合同编号:">
+                <el-input v-model="listQuery.params.contractNo" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
+              <div class="searchbtns">
+                <el-button type="primary" @click="handleFilter">查询</el-button>
+                <el-button type="primary" @click="handresetting">重置</el-button>
+              </div>
+            </el-form>
+          </div>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" ref="multipleTable" 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.modelName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="常用配置" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.configName }}</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>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import req from '@/api/supplychain/busvehicleapply'
+
+export default {
+  name: "chexingbyconfiguration",
+  components: {
+    Pagination
+  },
+  data() {
+    return {
+      isSearchShow: false,
+      searchxianshitit: '隐藏查询条件',
+      tableKey: 0,
+      showbackState: 30,
+      sids: [],
+      list: [],
+      datalist: [],
+      number: '',
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 10,
+        params: {
+          contractNo: '',
+          customerName: ''
+        },
+        total: 1
+      }
+    }
+  },
+  created() {
+    // 初始化变量
+    this.init()
+    // 加载列表
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    init() {
+      this.getList()
+    },
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 返回
+    handleReturn() {
+      this.$emit('doback')
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      req.configurationlistPage(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.code == '200') {
+          this.listQuery.total = response.data.total
+          this.list = response.data.records
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.getList()
+    },
+    // 重置按钮
+    handresetting() {
+      this.listQuery = {
+        current: 1,
+        size: 10,
+        params: {
+          contractNo: '',
+          customerName: ''
+        },
+        total: 0
+      }
+      this.getList()
+    },
+    handleSelectionChange(row) {
+      this.sids = []
+      const aa = []
+      row.forEach((element) => {
+        aa.push({
+          modelName: element.modelName,
+          modelSid: element.modelSid,
+          configName: element.configName,
+          configurationItemsSid: element.configurationItemsSid
+        })
+      })
+      this.sids = aa
+    },
+    showData(value) {
+      if (value.length > 0){
+        for (var i = 0; i < value.length; i++) {
+          this.datalist.push(value[i])
+        }
+      } else {
+       this.datalist = []
+      }
+      if (this.datalist.length > 0) {
+        for (var j = 0; j < this.datalist.length; j++) {
+          for (var k = 0; k < this.list.length; k++) {
+            if (this.datalist[j].vehicleName == this.list[k].modelName && this.datalist[j].configName == this.list[k].configName) {
+              this.$refs.multipleTable.toggleRowSelection(this.list[k], true)
+            }
+          }
+        }
+      } else {
+        this.$refs.multipleTable.clearSelection()
+      }
+    },
+    // 添加修改返回
+    AddUpdateReturn() {
+      if (this.sids.length > 0) {
+        this.$emit('backData', this.sids)
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '请选择至少一条记录进行删除操作!',
+          type: 'error',
+          duration: 2000
+        })
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+</style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
new file mode 100644
index 0000000000..3cf8f53257
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
@@ -0,0 +1,455 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState== 1">
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="dialogStatus === 'add' ? saveAdd() : saveEdit()">保存
+          </el-button>
+          <el-button type="primary" size="small" @click="submitVehicleApply()">提交
+          </el-button>
+          <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+        </div>
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="listconadd">
+        <div class="wlInfo"><span>排产申请</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
+          <el-row class="lineone">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请编号:"></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.applicationCode" readonly/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请人:"></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.createByName" readonly/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请日期:"></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.applicationDate" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="排产类型:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-select v-model="formobj.schedulingType" placeholder="请选择" clearable>
+                  <el-option v-for="item in schedulingType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linethree">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="备注:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.remarks" clearable/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div class="tableStyle">
+          <div style="margin-left: 5px;font-weight: bold">排产车型列表</div>
+          <div style="margin-left: 15px">
+            <el-button type="primary" size="small" icon="el-icon-plus" @click="addCommodity()">添加</el-button>
+          </div>
+        </div>
+        <el-table :key="tableKey" :data="formobj.busVehicleApplyDetailDtoList" :index="index" show-summary :summary-method="getSummaries" border style="width: 100%">
+          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+          <el-table-column fixed prop="name" label="操作" width="80px" align="center" header-align="center">
+            <template slot-scope="scope">
+              <el-button size="mini" type="danger" @click="dataDelete(scope.$index, formobj.busVehicleApplyDetailDtoList[scope.$index])">删除
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="车型" align="left" header-align="center" width="250">
+            <template slot-scope="scope" prop="vehicleName">
+              <span>{{ scope.row.vehicleName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="常用配置" align="left" header-align="center">
+            <template slot-scope="scope" prop="configName">
+              <span>{{ scope.row.configName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="排产数量" header-align="center" width="130">
+            <template slot-scope="scope" prop="quantity">
+              <el-input v-model="scope.row.quantity" placeholder="" class="addinputw" clearable/>
+            </template>
+          </el-table-column>
+          <el-table-column prop="useDeposit" label="使用订金" header-align="center" width="150">
+            <template slot-scope="scope" prop="useDeposit">
+              <el-input v-model="scope.row.useDeposit" placeholder="" class="addinputw" clearable/>
+            </template>
+          </el-table-column>
+          <el-table-column prop="applyForDeposit" label="申请订金" header-align="center" width="150">
+            <template slot-scope="scope" prop="applyForDeposit">
+              <el-input v-model="scope.row.applyForDeposit" placeholder="" class="addinputw" clearable/>
+            </template>
+          </el-table-column>
+          <el-table-column label="销售指导价" header-align="center" width="150">
+            <template slot-scope="scope" prop="saleGuPrice">
+              <el-input v-model="scope.row.saleGuPrice" placeholder="" class="addinputw" clearable/>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" header-align="center" width="150">
+            <template slot-scope="scope" prop="remarks">
+              <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div>
+          <div class="tableStyle">
+            <div style="margin-left: 5px;font-weight: bold">订金使用情况</div>
+          </div>
+          <el-form ref="formobj" :model="formobj" label-width="130px" label-position="top" class="formadd">
+            <el-row>
+              <el-col :span="4" class="el-form-item-right">
+                <el-form-item label="当前订金金额"></el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item>
+                  <el-input v-model="formobj.currentAmount" placeholder="" clearable/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" class="el-form-item-right">
+                <el-form-item label="本次需使用金额"></el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item>
+                  {{ useMoney }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" class="el-form-item-right">
+                <el-form-item label="本次申请金额"></el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item>
+                  {{ applyMoney }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+    </div>
+    <!--End 添加修改部分-->
+    <!--选择车型和常用配置-->
+    <configuration v-show="viewState == 2" ref="divconfiguration" @backData="backData" @doback="closePage"/>
+  </div>
+</template>
+
+<script>
+import req from '@/api/supplychain/busvehicleapply'
+import configuration from './chexingbyconfiguration'
+export default {
+  name: 'cheliangpaichanEdit',
+  components: {
+    configuration
+  },
+  data() {
+    return {
+      viewTitle: '',
+      dialogStatus: '',
+      viewState: 1,
+      index: 0,
+      tableKey: 0,
+      // 下拉框
+      schedulingType_list: [], // 排产订金使用
+      list1: [],
+      useMoney: '', // 本次需使用金额
+      applyMoney: '', // 本次申请金额
+      // 表单数据
+      formobj: {
+        sid: '', // 一条数据的sid
+        createBySid: window.sessionStorage.getItem('userSid'), // 用户人sid
+        createByName: window.sessionStorage.getItem('name'), // 制单人
+        applicationCode: '', // 申请编号
+        applicationDate: '', // 申请日期
+        schedulingType: '', // 排产类型
+        remarks: '', // 备注
+        currentAmount: '', // 当前订金金额
+        busVehicleApplyDetailDtoList: []
+      },
+      rules: {},
+      submitdisabled: false
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var a = window.location.href.indexOf('?') + 1 // 第一个?后面的一个字符的位置
+    var b = window.location.href.indexOf('#data') // 第一个#data出现的位置
+    const info = window.location.href.slice(a, b)
+    var sid = info.substr(info.indexOf('=') + 1)
+    this.showInfo(sid)
+    this.getSchedulingType()
+  },
+  methods: {
+    // 下拉框-排产类型
+    getSchedulingType() {
+      req.pullDown({ type: 'schedulingType' }).then((res) => {
+        if (res.code == '200') {
+          this.schedulingType_list = res.data
+          console.log('下拉框请求111', res.data)
+        }
+      })
+    },
+    // 明细表添加一行数据
+    addCommodity() {
+      this.viewState = 2
+      this.$refs['divconfiguration'].showData(this.list1)
+    },
+    // 明细表删除一行数据
+    dataDelete(index, row) {
+      this.formobj.busVehicleApplyDetailDtoList.splice(index, 1)
+      this.list1.splice(index, 1)
+    },
+    showInfo(sid, row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.dialogStatus = 'edit'
+      this.viewTitle = '【编辑】排产申请'
+      console.log('编辑回显', sid)
+      req.fetchBySid(sid).then((resp) => {
+        const data = resp.data
+        this.formobj.applicationCode = data.applicationCode
+        this.formobj.applicationDate = data.applicationDate
+        this.formobj.schedulingType = data.schedulingType
+        this.formobj.remarks = data.remarks
+        this.formobj.currentAmount = data.currentAmount
+        this.formobj.sid = sid
+        this.formobj.busVehicleApplyDetailDtoList = data.busVehicleApplyDetailVoList
+        this.list1 = data.busVehicleApplyDetailVoList
+      }).catch((e) => {
+        this.formobj = row
+      })
+    },
+    // 车型常用配置列表--新增确定返回的数据
+    backData(value) {
+      this.viewState = 1
+      // this.formobj.busVehicleApplyDetailDtoList = []
+      if (this.formobj.busVehicleApplyDetailDtoList.length > 0) {
+        for (var i = 0; i < value.length; i++) {
+          for (var u = 0; u < this.formobj.busVehicleApplyDetailDtoList.length; u++) {
+            if (value[i].modelName == this.formobj.busVehicleApplyDetailDtoList[u].vehicleName && value[i].configName == this.formobj.busVehicleApplyDetailDtoList[u].configName) {
+              value.splice(value[i], 1)
+            }
+          }
+        }
+      }
+      if (value.length > 0) {
+        value.forEach((e) => {
+          this.formobj.busVehicleApplyDetailDtoList.push({
+            quantity: '',
+            applySid: '',
+            configSid: e.configurationItemsSid,
+            configName: e.configName,
+            useDeposit: '',
+            applyForDeposit: '',
+            remarks: '',
+            saleGuPrice: '',
+            vehicleName: e.modelName,
+            vehicleSid: e.modelSid
+          })
+        })
+        this.list1 = this.formobj.busVehicleApplyDetailDtoList
+      }
+    },
+    saveAdd() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveAdd(this.formobj).then((resp) => {
+            this.submitdisabled = false
+            if (resp.code == '200') {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: resp.msg
+              })
+              this.handleReturn('true')
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    saveEdit() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveEdit(this.formobj).then((resp) => {
+            this.submitdisabled = false
+            this.$message({
+              showClose: true,
+              type: 'success',
+              message: resp.msg
+            })
+            this.handleReturn('true')
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    submitVehicleApply() {
+      console.log(this.formobj,858585)
+      req.submitVehicleApply(this.formobj).then((res) => {
+        if (res.code == '200') {
+          this.$message({
+            showClose: true,
+            type: 'success',
+            message: '提交成功'
+          })
+        } else {
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '提交失败'
+          })
+        }
+      })
+    },
+    // 返回（===既判断又赋值）
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj.schedulingType = '' // 排产类型
+      this.formobj.remarks = '' // 备注
+      this.formobj.currentAmount = ''
+      this.formobj.applicationCode = ''
+      this.formobj.applicationDate = ''
+      this.formobj.busVehicleApplyDetailDtoList = []
+      this.list1 = []
+      this.$refs['form_obj'].resetFields()
+      this.$refs['divconfiguration'].getList()
+      this.$emit('doback')
+    },
+    // 合计
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        if (column.property === 'useDeposit') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+          this.useMoney = sums[index] += ''
+        } else if (column.property === 'applyForDeposit') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+          this.applyMoney = sums[index] += ''
+        } else {
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ''
+            this.amount = sums[index] += ''
+          } else {
+            sums[index] = ''
+          }
+        }
+      })
+      return sums
+    },
+    closePage() {
+      this.viewState = 1
+    }
+  }
+}
+</script>
+
+<style scoped>
+.wlInfo {
+  text-align: center;
+  font-size: 28px;
+  line-height: 90px;
+}
+.lineone {
+  border-bottom: 2px solid #e0e3eb;
+}
+.lineone .el-form-item {
+  margin-bottom: -10px;
+}
+.lineone >>> .el-input__inner {
+  border: 0;
+}
+.linetwo {
+  margin-top: 10px;
+}
+.linetwo .el-form-item {
+  margin-bottom: 0px !important;
+}
+.linethree .el-form-item {
+  margin-bottom: 0px !important;
+}
+.tableStyle {
+  background-color: #FFFFFF;
+  display: flex;
+  justify-content: start;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 40px;
+}
+.el-form-item-right {
+  /* padding: 0 10px 0 0; */
+  text-align: right;
+}
+.formadd{
+  padding: 0px !important;
+}
+.icon {
+  color: #e84026;
+  margin-right: 4px;
+}
+</style>
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanInfo.vue
new file mode 100644
index 0000000000..656cf0b6d5
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanInfo.vue
@@ -0,0 +1,529 @@
+<template>
+  <div class="app-container">
+    <div>
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button v-show="transactState=='00'" type="primary" @click="openAgree">同 意</el-button>
+          <el-button v-show="transactState=='00'" type="danger" @click="openReject">驳 回</el-button>
+          <el-button v-show="transactState=='00'" type="danger" @click="openStop">终 止</el-button>
+          <el-button v-show="transactState=='01'" type="danger" @click="openRevoke">撤 回 </el-button>
+          <el-button type="info" @click="centerDialogVisible = false">关 闭</el-button>
+        </div>
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="listconadd">
+        <div class="wlInfo"><span>排产申请</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
+          <el-row class="lineone">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请编号:"></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.applicationCode" readonly/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请人:"></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.createByName" readonly/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请日期:"></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.applicationDate" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="排产类型:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.schedulingType" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linethree">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="备注:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.remarks" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div v-show="transactState=='00'">
+<!--          <div class="diaTitle"><i class="el-icon-chat-line-square"></i><span>审批意见</span></div>-->
+          <el-form :model="dialogList" :inline="true" label-width="80px">
+              <el-row>
+                <el-col>
+                  <el-form-item label="审批意见">
+                    <el-input v-model="dialogList.comment" type="textarea" maxlength="20" placeholder="请输入审批意见" class="inputType" clearable/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+          </el-form>
+        </div>
+        <div class="tableStyle">
+          <div style="margin-left: 5px;font-weight: bold">排产车型列表</div>
+        </div>
+        <el-table :key="tableKey" :data="formobj.busVehicleApplyDetailDtoList" :index="index" show-summary :summary-method="getSummaries" border style="width: 100%">
+          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+          <el-table-column label="车型" align="left" header-align="center" width="250">
+            <template slot-scope="scope" prop="vehicleName">
+              <span>{{ scope.row.vehicleName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="常用配置" align="left" header-align="center">
+            <template slot-scope="scope" prop="configName">
+              <span>{{ scope.row.configName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="排产数量" header-align="center" width="130">
+            <template slot-scope="scope" prop="quantity">
+              <span>{{ scope.row.quantity }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="useDeposit" label="使用订金" header-align="center" width="150">
+            <template slot-scope="scope" prop="useDeposit">
+              <span>{{ scope.row.useDeposit }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="applyForDeposit" label="申请订金" header-align="center" width="150">
+            <template slot-scope="scope" prop="applyForDeposit">
+              <span>{{ scope.row.applyForDeposit }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="销售指导价" header-align="center" width="150">
+            <template slot-scope="scope" prop="saleGuPrice">
+              <span>{{ scope.row.saleGuPrice }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" header-align="center" width="200">
+            <template slot-scope="scope" prop="remarks">
+              <span>{{ scope.row.remarks }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div>
+          <div class="tableStyle">
+            <div style="margin-left: 5px;font-weight: bold">订金使用情况</div>
+          </div>
+          <el-form ref="formobj" :model="formobj" label-width="130px" label-position="top" class="formadd">
+            <el-row>
+              <el-col :span="4" class="el-form-item-right">
+                <el-form-item label="当前订金金额"></el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item>
+                  {{ formobj.currentAmount }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" class="el-form-item-right">
+                <el-form-item label="本次需使用金额"></el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item>
+                  {{ useMoney }}
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" class="el-form-item-right">
+                <el-form-item label="本次申请金额"></el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item>
+                  {{ applyMoney }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+    </div>
+    <!--End 添加修改部分-->
+  </div>
+</template>
+
+<script>
+import req from '@/api/supplychain/busvehicleapply'
+import { businessAgree, rejectTask, breakTask, revokeTask } from '@/api/flow/todo'
+export default {
+  name: 'cheliangpaichanInfo',
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      tableKey: 0,
+      useMoney: '', // 本次需使用金额
+      applyMoney: '', // 本次申请金额
+      dialogList: {
+        comment: ''
+      },
+      // 表单数据
+      formobj: {
+        sid: '', // 一条数据的sid
+        createBySid: window.sessionStorage.getItem('userSid'), // 用户人sid
+        createByName: window.sessionStorage.getItem('name'), // 制单人
+        applicationCode: '', // 申请编号
+        applicationDate: '', // 申请日期
+        schedulingType: '', // 排产类型
+        remarks: '', // 备注
+        currentAmount: '', // 当前订金金额
+        busVehicleApplyDetailDtoList: []
+      },
+      transactState: '', // 办理状态
+      // 同意办理列表
+      agreeList: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        userSid: window.sessionStorage.getItem('userSid')
+      },
+      // 驳回列表
+      regectList: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        userSid: window.sessionStorage.getItem('userSid')
+      },
+      // 终止列表
+      stopList: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        userSid: window.sessionStorage.getItem('userSid')
+      },
+      // 撤回
+      revokeList: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        userSid: window.sessionStorage.getItem('userSid')
+      },
+      rules: {}
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var a = window.location.href.indexOf('?') + 1 // 第一个?后面的一个字符的位置
+    var b = window.location.href.indexOf('#data') // 第一个#data出现的位置
+    const info = window.location.href.slice(a, b)
+    var sid = info.substr(info.indexOf('=') + 1)
+    this.showInfo(sid)
+    // ===获取参数
+    var one = window.location.href.lastIndexOf('#') + 1
+    var two = window.location.href.lastIndexOf('}') + 1
+    const data = decodeURI(window.location.href.slice(one, two)) // url解码unescape()已从web中移除,尽量不使用
+    var tar = data.substr(data.indexOf('=') + 1)
+    const obj = JSON.parse(tar)
+    console.log('iframe页面获取的obj:', obj)
+    // 同意列表
+    this.agreeList.businessSid = sid
+    this.agreeList.instanceId = obj.instanceId
+    this.agreeList.taskId = obj.taskId
+    // 驳回列表
+    this.regectList.businessSid = sid
+    this.regectList.instanceId = obj.instanceId
+    this.regectList.taskId = obj.taskId
+    // 终止列表
+    this.stopList.businessSid = sid
+    this.stopList.instanceId = obj.instanceId
+    this.stopList.taskId = obj.taskId
+    // 撤回列表
+    this.revokeList.businessSid = sid
+    this.revokeList.instanceId = obj.instanceId
+    this.revokeList.taskId = obj.taskId
+    // 办理状态
+    this.transactState = obj.transactState
+  },
+  methods: {
+    showInfo(sid) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.viewTitle = '排产申请详情'
+      req.fetchBySid(sid).then((resp) => {
+        const data = resp.data
+        this.formobj.applicationCode = data.applicationCode
+        this.formobj.applicationDate = data.applicationDate
+        this.formobj.schedulingType = data.schedulingType
+        this.formobj.remarks = data.remarks
+        this.formobj.currentAmount = data.currentAmount
+        this.formobj.sid = sid
+        this.formobj.busVehicleApplyDetailDtoList = data.busVehicleApplyDetailVoList
+      }).catch((e) => {
+        this.formobj = {}
+      })
+    },
+    // 同意
+    openAgree() {
+      this.$confirm('是否确认执行同意操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleAgree()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消同意'
+        })
+      })
+    },
+    // 驳回
+    openReject() {
+      this.$confirm('是否确认执行驳回操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleReject()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消驳回'
+        })
+      })
+    },
+    // 终止
+    openStop() {
+      this.$confirm('是否确认执行终止操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleStop()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消终止'
+        })
+      })
+    },
+    /** 确认撤回任务 */
+    openRevoke() {
+      this.$confirm('是否确认执行撤回操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleRevoke()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消撤回'
+        })
+      })
+    },
+    /** 同意任务 */
+    handleAgree() {
+      this.agreeList.comment = this.dialogList.comment
+      businessAgree(this.agreeList).then((response) => {
+        if (response.code === '200') {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.refreshIt()
+        } else {
+          this.$notify({
+            title: '提示',
+            message: '执行失败',
+            type: 'error',
+            duration: 2000
+          })
+        }
+      })
+    },
+    /** 终止任务 */
+    handleStop() {
+      this.stopList.comment = this.dialogList.comment
+      breakTask(this.stopList).then((response) => {
+        if (response.code === '200') {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+        } else {
+          this.$notify({
+            title: '提示',
+            message: '执行失败',
+            type: 'error',
+            duration: 2000
+          })
+        }
+      })
+    },
+    /** 驳回任务 */
+    handleReject() {
+      this.regectList.comment = this.dialogList.comment
+      rejectTask(this.regectList).then((response) => {
+        if (response.code === '200') {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+        } else {
+          this.$notify({
+            title: '提示',
+            message: '执行失败',
+            type: 'error',
+            duration: 2000
+          })
+        }
+      })
+    },
+    /** 撤回任务 */
+    handleRevoke() {
+      this.revokeList.comment = this.dialogList.comment
+      revokeTask(this.revokeList).then((response) => {
+        if (response.code === '200') {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+        } else {
+          this.$notify({
+            title: '提示',
+            message: '执行失败',
+            type: 'error',
+            duration: 2000
+          })
+        }
+      })
+    },
+    // 合计
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        if (column.property === 'useDeposit') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+          this.useMoney = sums[index] += ''
+        } else if (column.property === 'applyForDeposit') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+          this.applyMoney = sums[index] += ''
+        } else {
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ''
+            this.amount = sums[index] += ''
+          } else {
+            sums[index] = ''
+          }
+        }
+      })
+      return sums
+    }
+  }
+}
+</script>
+
+<style scoped>
+.diaTitle {
+  padding: 30px 0 15px 0;
+  font-size: 20px;
+  font-weight: 500;
+}
+.inputType {
+  width: 600px;
+}
+.wlInfo {
+  text-align: center;
+  font-size: 28px;
+  line-height: 90px;
+}
+.lineone {
+  border-bottom: 2px solid #e0e3eb;
+}
+.lineone .el-form-item {
+  margin-bottom: -10px;
+}
+.lineone >>> .el-input__inner {
+  border: 0;
+}
+.linetwo {
+  margin-top: 10px;
+}
+.linetwo .el-form-item {
+  margin-bottom: 0px !important;
+}
+.linetwo >>> .el-input__inner {
+  border: 0;
+}
+.linethree .el-form-item {
+  margin-bottom: 0px !important;
+}
+.tableStyle {
+  background-color: #FFFFFF;
+  display: flex;
+  justify-content: start;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 40px;
+}
+.el-form-item-right {
+  text-align: right;
+}
+.formadd{
+  padding: 0px !important;
+}
+.icon {
+  color: #e84026;
+  margin-right: 4px;
+}
+</style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue
new file mode 100644
index 0000000000..2f2d56aadc
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue
@@ -0,0 +1,191 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>车型常用列表</div>
+        <div>
+          <el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="webcon">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="客户名称:">
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
+              <el-form-item label="合同编号:">
+                <el-input v-model="listQuery.params.contractNo" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
+              <div class="searchbtns">
+                <el-button type="primary" @click="handleFilter">查询</el-button>
+                <el-button type="primary" @click="handresetting">重置</el-button>
+              </div>
+            </el-form>
+          </div>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" ref="multipleTable" 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.modelName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="常用配置" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.configName }}</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>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import req from '@/api/supplychain/busvehicleapply'
+
+export default {
+  name: "chexingbyconfiguration",
+  components: {
+    Pagination
+  },
+  data() {
+    return {
+      isSearchShow: false,
+      searchxianshitit: '隐藏查询条件',
+      tableKey: 0,
+      showbackState: 30,
+      sids: [],
+      list: [],
+      datalist: [],
+      number: '',
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 10,
+        params: {
+          contractNo: '',
+          customerName: ''
+        },
+        total: 1
+      }
+    }
+  },
+  created() {
+    // 初始化变量
+    this.init()
+    // 加载列表
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    init() {
+      this.getList()
+    },
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 返回
+    handleReturn() {
+      this.$emit('doback')
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      req.configurationlistPage(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.code == '200') {
+          this.listQuery.total = response.data.total
+          this.list = response.data.records
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.getList()
+    },
+    // 重置按钮
+    handresetting() {
+      this.listQuery = {
+        current: 1,
+        size: 10,
+        params: {
+          contractNo: '',
+          customerName: ''
+        },
+        total: 0
+      }
+      this.getList()
+    },
+    handleSelectionChange(row) {
+      this.sids = []
+      const aa = []
+      row.forEach((element) => {
+        aa.push({
+          modelName: element.modelName,
+          modelSid: element.modelSid,
+          configName: element.configName,
+          configurationItemsSid: element.configurationItemsSid
+        })
+      })
+      this.sids = aa
+    },
+    showData(value) {
+      if (value.length > 0){
+        for (var i = 0; i < value.length; i++) {
+          this.datalist.push(value[i])
+        }
+      } else {
+        this.datalist = []
+      }
+      if (this.datalist.length > 0) {
+        for (var j = 0; j < this.datalist.length; j++) {
+          for (var k = 0; k < this.list.length; k++) {
+            if (this.datalist[j].vehicleName == this.list[k].modelName && this.datalist[j].configName == this.list[k].configName) {
+              this.$refs.multipleTable.toggleRowSelection(this.list[k], true)
+            }
+          }
+        }
+      } else {
+        this.$refs.multipleTable.clearSelection()
+      }
+    },
+    // 添加修改返回
+    AddUpdateReturn() {
+      if (this.sids.length > 0) {
+        this.$emit('backData', this.sids)
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '请选择至少一条记录进行删除操作!',
+          type: 'error',
+          duration: 2000
+        })
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+</style>