From 21c7670188418591eeeb6756a20ea983f70328c9 Mon Sep 17 00:00:00 2001
From: beyond <931414026@qq.com>
Date: Tue, 17 Dec 2019 17:49:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=B2=E5=BE=8B=E5=AE=BE=2017=E6=97=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Collection.js                         | 413 +++++++++---------
 src/api/InstallmentList.js                    | 113 ++---
 src/api/OverdueList.js                        | 119 ++---
 src/api/SaleContract.js                       | 209 ++++-----
 src/api/SaleOut.js                            |   9 +
 src/lang/zh.js                                |   3 +-
 src/views/Advancemanage/AddAdvanceOrder.vue   |   4 +-
 src/views/Coupon/AddCoupon.vue                |   2 +-
 src/views/Coupon/components/MyDialog.vue      |   2 +-
 src/views/InstallmentList/index.vue           |   7 +-
 .../InventoryCount/AddInventoryCount.vue      |  63 ++-
 .../InventoryCount/components/MyDialog.vue    |  84 +++-
 src/views/OverdueList/index.vue               |   1 +
 src/views/Product/NewProduct.vue              |  49 ++-
 .../ReturnExchange/AddReturnExchange.vue      |  22 +-
 .../ReturnExchange/components/MyDetail.vue    |   2 +-
 .../ReturnExchange/components/MyDialog.vue    |  19 +-
 .../ReturnExchange/components/MySaleout.vue   |   2 +-
 src/views/SaleContract/AddSaleContract.vue    |   2 +-
 src/views/SaleContract/SaleContractList.vue   |   6 +
 .../SaleContract/components/MyDialog.vue      |   2 +-
 src/views/SaleOrder/AddSaleOrder.vue          |   4 +-
 src/views/SaleOrder/components/MyDialog.vue   |   4 +-
 src/views/SaleOut/AddSaleOut.vue              |   8 +-
 src/views/SaleOut/AddSaleOut2.vue             |   6 +-
 src/views/SaleOut/SaleOutList.vue             |   3 +
 src/views/SaleOut/components/MyDialog.vue     |   8 +-
 static/file/物品资料表.xlsx                   | Bin 10306 -> 10278 bytes
 28 files changed, 667 insertions(+), 499 deletions(-)

diff --git a/src/api/Collection.js b/src/api/Collection.js
index 62905715..33ba1b36 100644
--- a/src/api/Collection.js
+++ b/src/api/Collection.js
@@ -1,205 +1,208 @@
-import request from '@/utils/request'
-
-// 逾期列表
-export function installmentlist(query) {
-  var params = new URLSearchParams()
-  if (query.installmentId !== '' && query.installmentId !== null && query.installmentId !== undefined) {
-    params.append('installmentId', query.installmentId) // 你要传给后台的参数值 key/value
-  }
-  if (query.stat !== '' && query.stat !== null && query.stat !== undefined) {
-    params.append('stat', query.stat) // 你要传给后台的参数值 key/value
-  }
-  if (query.orderNumber !== '' && query.orderNumber !== null && query.orderNumber !== undefined) {
-    params.append('orderNumber', query.orderNumber) // 你要传给后台的参数值 key/value
-  }
-  if (query.applyNumber !== '' && query.applyNumber !== null && query.applyNumber !== undefined) {
-    params.append('applyNumber', query.applyNumber) // 你要传给后台的参数值 key/value
-  }
-  if (query.customerId !== '' && query.customerId !== null && query.customerId !== undefined) {
-    params.append('customerId', query.customerId) // 你要传给后台的参数值 key/value
-  }
-  if (query.customerName !== '' && query.customerName !== null && query.customerName !== undefined) {
-    params.append('customerName', query.customerName) // 你要传给后台的参数值 key/value
-  }
-  if (query.customerPhone !== '' && query.customerPhone !== null && query.customerPhone !== undefined) {
-    params.append('customerPhone', query.customerPhone) // 你要传给后台的参数值 key/value
-  }
-  if (query.saleRepositoryId !== '' && query.saleRepositoryId !== null && query.saleRepositoryId !== undefined) {
-    params.append('saleRepositoryId', query.saleRepositoryId) // 你要传给后台的参数值 key/value
-  }
-  if (query.judgeStat !== '' && query.judgeStat !== null && query.judgeStat !== undefined) {
-    params.append('judgeStat', query.judgeStat) // 你要传给后台的参数值 key/value
-  }
-  if (query.receiptStat !== '' && query.receiptStat !== null && query.receiptStat !== undefined) {
-    params.append('receiptStat', query.receiptStat) // 你要传给后台的参数值 key/value
-  }
-  if (query.beginTime !== '' && query.beginTime !== null && query.beginTime !== undefined) {
-    params.append('beginTime', query.beginTime) // 你要传给后台的参数值 key/value
-  }
-  if (query.endTime !== '' && query.endTime !== null && query.endTime !== undefined) {
-    params.append('endTime', query.endTime) // 你要传给后台的参数值 key/value
-  }
-  if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) {
-    params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value
-  }
-  if (query.createPersonId !== '' && query.createPersonId !== null && query.createPersonId !== undefined) {
-    params.append('createPersonId', query.createPersonId) // 你要传给后台的参数值 key/value
-  }
-  if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
-    params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
-  }
-  params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value
-  params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value
-  return request({
-    url: '/installmentorder/installmentlist',
-    method: 'post',
-    data: params
-  })
-}
-
-export function updateEach(query) {
-  var params = new URLSearchParams()
-  params.append('installmentOrderDetailJson', query) // 你要传给后台的参数值 key/value
-  return request({
-    url: '/installmentorder/updateEach',
-    method: 'post',
-    data: params
-  })
-}
-
-export function reToEmp(installmentId, collectPersonId) {
-  var params = new URLSearchParams()
-  params.append('installmentId', installmentId) // 你要传给后台的参数值 key/value
-  params.append('collectPersonId', collectPersonId) // 你要传给后台的参数值 key/value
-  return request({
-    url: '/installmentorder/reToEmp',
-    method: 'post',
-    data: params
-  })
-}
-
-export function postphone(eachids) {
-  var params = new URLSearchParams()
-  params.append('eachids', eachids) // 你要传给后台的参数值 key/value
-  return request({
-    url: '/installmentorder/postphone',
-    method: 'post',
-    data: params
-  })
-}
-
-export function pushPay(query) {
-  var params = new URLSearchParams()
-  console.log(query)
-  console.log(query.installmentId)
-  params.append('installmentId', query.installmentId) // 你要传给后台的参数值 key/value
-  return request({
-    url: '/installmentorder/pushPay',
-    method: 'post',
-    data: params
-  })
-}
-
-// 添加收车单
-export function createrecoverVehicle(query, query2, query3, query4) {
-  var params = new URLSearchParams()
-  params.append('Json', query) // 你要传给后台的参数值 key/value
-  params.append('detailJson', query2) // 你要传给后台的参数值 key/value
-  params.append('lostDetailJson', query3) // 你要传给后台的参数值 key/value
-  if (query4.repositoryId !== '' && query4.repositoryId !== null && query4.repositoryId !== undefined) {
-    params.append('repositoryId', query4.repositoryId) // 你要传给后台的参数值 key/value
-  }
-  if (query4.regionId !== '' && query4.regionId !== null && query4.regionId !== undefined) {
-    params.append('regionId', query4.regionId) // 你要传给后台的参数值 key/value
-  }
-  return request({
-    url: '/recoverVehicle/create',
-    method: 'post',
-    data: params
-  })
-}
-
-// 查询收车单
-export function searchrecoverVehicle(query) {
-  var params = new URLSearchParams()
-  if (query.title !== '' && query.title !== null && query.title !== undefined) {
-    params.append('title', query.title) // 你要传给后台的参数值 key/value
-  }
-  if (query.number !== '' && query.number !== null && query.number !== undefined) {
-    params.append('number', query.number) // 你要传给后台的参数值 key/value
-  }
-  if (query.receivePersonId !== '' && query.receivePersonId !== null && query.receivePersonId !== undefined) {
-    params.append('receivePersonId', query.receivePersonId) // 你要传给后台的参数值 key/value
-  }
-  if (query.customerName !== '' && query.customerName !== null && query.customerName !== undefined) {
-    params.append('customerName', query.customerName) // 你要传给后台的参数值 key/value
-  }
-  if (query.receiptStat !== '' && query.receiptStat !== null && query.receiptStat !== undefined) {
-    params.append('receiptStat', query.receiptStat) // 你要传给后台的参数值 key/value
-  }
-  if (query.judgeStat !== '' && query.judgeStat !== null && query.judgeStat !== undefined) {
-    params.append('judgeStat', query.judgeStat) // 你要传给后台的参数值 key/value
-  }
-  if (query.beginTime !== '' && query.beginTime !== null && query.beginTime !== undefined) {
-    params.append('beginTime', query.beginTime) // 你要传给后台的参数值 key/value
-  }
-  if (query.endTime !== '' && query.endTime !== null && query.endTime !== undefined) {
-    params.append('endTime', query.endTime) // 你要传给后台的参数值 key/value
-  }
-  if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) {
-    params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value
-  }
-  if (query.createPersonId !== '' && query.createPersonId !== null && query.createPersonId !== undefined) {
-    params.append('createPersonId', query.createPersonId) // 你要传给后台的参数值 key/value
-  }
-  if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
-    params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
-  }
-  params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value
-  params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value
-  return request({
-    url: '/recoverVehicle/search',
-    method: 'post',
-    data: params
-  })
-}
-
-// 修改收车单
-export function updaterecoverVehicle(query, query2, query3) {
-  var params = new URLSearchParams()
-  params.append('Json', query) // 你要传给后台的参数值 key/value
-  params.append('detailJson', query2) // 你要传给后台的参数值 key/value
-  params.append('lostDetailJson', query3) // 你要传给后台的参数值 key/value
-  return request({
-    url: '/recoverVehicle/update',
-    method: 'post',
-    data: params
-  })
-}
-
-// 删除收车单
-export function deleterecoverVehicle(query, query2) {
-  var params = new URLSearchParams()
-  if (query !== '' && query !== null && query !== undefined) {
-    params.append('modelids', query) // 你要传给后台的参数值 key/value
-  }
-  if (query2 !== '' && query2 !== null && query2 !== undefined) {
-    params.append('operatorId', query2) // 你要传给后台的参数值 key/value
-  }
-  return request({
-    url: '/recoverVehicle/delete',
-    method: 'post',
-    data: params
-  })
-}
-
-// 审核收车单
-export function updaterecoverVehicle2(query) {
-  var params = new URLSearchParams()
-  params.append('Json', query) // 你要传给后台的参数值 key/value
-  return request({
-    url: '/recoverVehicle/update',
-    method: 'post',
-    data: params
-  })
-}
+import request from '@/utils/request'
+
+// 逾期列表
+export function installmentlist(query) {
+  var params = new URLSearchParams()
+  if (query.installmentId !== '' && query.installmentId !== null && query.installmentId !== undefined) {
+    params.append('installmentId', query.installmentId) // 你要传给后台的参数值 key/value
+  }
+  if (query.stat !== '' && query.stat !== null && query.stat !== undefined) {
+    params.append('stat', query.stat) // 你要传给后台的参数值 key/value
+  }
+  if (query.orderNumber !== '' && query.orderNumber !== null && query.orderNumber !== undefined) {
+    params.append('orderNumber', query.orderNumber) // 你要传给后台的参数值 key/value
+  }
+  if (query.applyNumber !== '' && query.applyNumber !== null && query.applyNumber !== undefined) {
+    params.append('applyNumber', query.applyNumber) // 你要传给后台的参数值 key/value
+  }
+  if (query.customerId !== '' && query.customerId !== null && query.customerId !== undefined) {
+    params.append('customerId', query.customerId) // 你要传给后台的参数值 key/value
+  }
+  if (query.customerName !== '' && query.customerName !== null && query.customerName !== undefined) {
+    params.append('customerName', query.customerName) // 你要传给后台的参数值 key/value
+  }
+  if (query.customerPhone !== '' && query.customerPhone !== null && query.customerPhone !== undefined) {
+    params.append('customerPhone', query.customerPhone) // 你要传给后台的参数值 key/value
+  }
+  if (query.saleRepositoryId !== '' && query.saleRepositoryId !== null && query.saleRepositoryId !== undefined) {
+    params.append('saleRepositoryId', query.saleRepositoryId) // 你要传给后台的参数值 key/value
+  }
+  if (query.judgeStat !== '' && query.judgeStat !== null && query.judgeStat !== undefined) {
+    params.append('judgeStat', query.judgeStat) // 你要传给后台的参数值 key/value
+  }
+  if (query.receiptStat !== '' && query.receiptStat !== null && query.receiptStat !== undefined) {
+    params.append('receiptStat', query.receiptStat) // 你要传给后台的参数值 key/value
+  }
+  if (query.beginTime !== '' && query.beginTime !== null && query.beginTime !== undefined) {
+    params.append('beginTime', query.beginTime) // 你要传给后台的参数值 key/value
+  }
+  if (query.endTime !== '' && query.endTime !== null && query.endTime !== undefined) {
+    params.append('endTime', query.endTime) // 你要传给后台的参数值 key/value
+  }
+  if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) {
+    params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value
+  }
+  if (query.createPersonId !== '' && query.createPersonId !== null && query.createPersonId !== undefined) {
+    params.append('createPersonId', query.createPersonId) // 你要传给后台的参数值 key/value
+  }
+  if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
+    params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
+  }
+  if (query.address !== '' && query.address !== null && query.address !== undefined) {
+    params.append('address', query.address) // 你要传给后台的参数值 key/value
+  }
+  params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value
+  params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value
+  return request({
+    url: '/installmentorder/installmentlist',
+    method: 'post',
+    data: params
+  })
+}
+
+export function updateEach(query) {
+  var params = new URLSearchParams()
+  params.append('installmentOrderDetailJson', query) // 你要传给后台的参数值 key/value
+  return request({
+    url: '/installmentorder/updateEach',
+    method: 'post',
+    data: params
+  })
+}
+
+export function reToEmp(installmentId, collectPersonId) {
+  var params = new URLSearchParams()
+  params.append('installmentId', installmentId) // 你要传给后台的参数值 key/value
+  params.append('collectPersonId', collectPersonId) // 你要传给后台的参数值 key/value
+  return request({
+    url: '/installmentorder/reToEmp',
+    method: 'post',
+    data: params
+  })
+}
+
+export function postphone(eachids) {
+  var params = new URLSearchParams()
+  params.append('eachids', eachids) // 你要传给后台的参数值 key/value
+  return request({
+    url: '/installmentorder/postphone',
+    method: 'post',
+    data: params
+  })
+}
+
+export function pushPay(query) {
+  var params = new URLSearchParams()
+  console.log(query)
+  console.log(query.installmentId)
+  params.append('installmentId', query.installmentId) // 你要传给后台的参数值 key/value
+  return request({
+    url: '/installmentorder/pushPay',
+    method: 'post',
+    data: params
+  })
+}
+
+// 添加收车单
+export function createrecoverVehicle(query, query2, query3, query4) {
+  var params = new URLSearchParams()
+  params.append('Json', query) // 你要传给后台的参数值 key/value
+  params.append('detailJson', query2) // 你要传给后台的参数值 key/value
+  params.append('lostDetailJson', query3) // 你要传给后台的参数值 key/value
+  if (query4.repositoryId !== '' && query4.repositoryId !== null && query4.repositoryId !== undefined) {
+    params.append('repositoryId', query4.repositoryId) // 你要传给后台的参数值 key/value
+  }
+  if (query4.regionId !== '' && query4.regionId !== null && query4.regionId !== undefined) {
+    params.append('regionId', query4.regionId) // 你要传给后台的参数值 key/value
+  }
+  return request({
+    url: '/recoverVehicle/create',
+    method: 'post',
+    data: params
+  })
+}
+
+// 查询收车单
+export function searchrecoverVehicle(query) {
+  var params = new URLSearchParams()
+  if (query.title !== '' && query.title !== null && query.title !== undefined) {
+    params.append('title', query.title) // 你要传给后台的参数值 key/value
+  }
+  if (query.number !== '' && query.number !== null && query.number !== undefined) {
+    params.append('number', query.number) // 你要传给后台的参数值 key/value
+  }
+  if (query.receivePersonId !== '' && query.receivePersonId !== null && query.receivePersonId !== undefined) {
+    params.append('receivePersonId', query.receivePersonId) // 你要传给后台的参数值 key/value
+  }
+  if (query.customerName !== '' && query.customerName !== null && query.customerName !== undefined) {
+    params.append('customerName', query.customerName) // 你要传给后台的参数值 key/value
+  }
+  if (query.receiptStat !== '' && query.receiptStat !== null && query.receiptStat !== undefined) {
+    params.append('receiptStat', query.receiptStat) // 你要传给后台的参数值 key/value
+  }
+  if (query.judgeStat !== '' && query.judgeStat !== null && query.judgeStat !== undefined) {
+    params.append('judgeStat', query.judgeStat) // 你要传给后台的参数值 key/value
+  }
+  if (query.beginTime !== '' && query.beginTime !== null && query.beginTime !== undefined) {
+    params.append('beginTime', query.beginTime) // 你要传给后台的参数值 key/value
+  }
+  if (query.endTime !== '' && query.endTime !== null && query.endTime !== undefined) {
+    params.append('endTime', query.endTime) // 你要传给后台的参数值 key/value
+  }
+  if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) {
+    params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value
+  }
+  if (query.createPersonId !== '' && query.createPersonId !== null && query.createPersonId !== undefined) {
+    params.append('createPersonId', query.createPersonId) // 你要传给后台的参数值 key/value
+  }
+  if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
+    params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
+  }
+  params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value
+  params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value
+  return request({
+    url: '/recoverVehicle/search',
+    method: 'post',
+    data: params
+  })
+}
+
+// 修改收车单
+export function updaterecoverVehicle(query, query2, query3) {
+  var params = new URLSearchParams()
+  params.append('Json', query) // 你要传给后台的参数值 key/value
+  params.append('detailJson', query2) // 你要传给后台的参数值 key/value
+  params.append('lostDetailJson', query3) // 你要传给后台的参数值 key/value
+  return request({
+    url: '/recoverVehicle/update',
+    method: 'post',
+    data: params
+  })
+}
+
+// 删除收车单
+export function deleterecoverVehicle(query, query2) {
+  var params = new URLSearchParams()
+  if (query !== '' && query !== null && query !== undefined) {
+    params.append('modelids', query) // 你要传给后台的参数值 key/value
+  }
+  if (query2 !== '' && query2 !== null && query2 !== undefined) {
+    params.append('operatorId', query2) // 你要传给后台的参数值 key/value
+  }
+  return request({
+    url: '/recoverVehicle/delete',
+    method: 'post',
+    data: params
+  })
+}
+
+// 审核收车单
+export function updaterecoverVehicle2(query) {
+  var params = new URLSearchParams()
+  params.append('Json', query) // 你要传给后台的参数值 key/value
+  return request({
+    url: '/recoverVehicle/update',
+    method: 'post',
+    data: params
+  })
+}
diff --git a/src/api/InstallmentList.js b/src/api/InstallmentList.js
index 5205096e..5a818810 100644
--- a/src/api/InstallmentList.js
+++ b/src/api/InstallmentList.js
@@ -1,55 +1,58 @@
-import request from '@/utils/request'
-
-// 分期列表
-export function installmentlist(query) {
-  var params = new URLSearchParams()
-  if (query.installmentId !== '' && query.installmentId !== null && query.installmentId !== undefined) {
-    params.append('installmentId', query.installmentId) // 你要传给后台的参数值 key/value
-  }
-  if (query.orderNumber !== '' && query.orderNumber !== null && query.orderNumber !== undefined) {
-    params.append('orderNumber', query.orderNumber) // 你要传给后台的参数值 key/value
-  }
-  if (query.applyNumber !== '' && query.applyNumber !== null && query.applyNumber !== undefined) {
-    params.append('applyNumber', query.applyNumber) // 你要传给后台的参数值 key/value
-  }
-  if (query.customerId !== '' && query.customerId !== null && query.customerId !== undefined) {
-    params.append('customerId', query.customerId) // 你要传给后台的参数值 key/value
-  }
-  if (query.customerName !== '' && query.customerName !== null && query.customerName !== undefined) {
-    params.append('customerName', query.customerName) // 你要传给后台的参数值 key/value
-  }
-  if (query.customerPhone !== '' && query.customerPhone !== null && query.customerPhone !== undefined) {
-    params.append('customerPhone', query.customerPhone) // 你要传给后台的参数值 key/value
-  }
-  if (query.saleRepositoryId !== '' && query.saleRepositoryId !== null && query.saleRepositoryId !== undefined) {
-    params.append('saleRepositoryId', query.saleRepositoryId) // 你要传给后台的参数值 key/value
-  }
-  if (query.judgeStat !== '' && query.judgeStat !== null && query.judgeStat !== undefined) {
-    params.append('judgeStat', query.judgeStat) // 你要传给后台的参数值 key/value
-  }
-  if (query.receiptStat !== '' && query.receiptStat !== null && query.receiptStat !== undefined) {
-    params.append('receiptStat', query.receiptStat) // 你要传给后台的参数值 key/value
-  }
-  if (query.beginTime !== '' && query.beginTime !== null && query.beginTime !== undefined) {
-    params.append('beginTime', query.beginTime) // 你要传给后台的参数值 key/value
-  }
-  if (query.endTime !== '' && query.endTime !== null && query.endTime !== undefined) {
-    params.append('endTime', query.endTime) // 你要传给后台的参数值 key/value
-  }
-  if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) {
-    params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value
-  }
-  if (query.createPersonId !== '' && query.createPersonId !== null && query.createPersonId !== undefined) {
-    params.append('createPersonId', query.createPersonId) // 你要传给后台的参数值 key/value
-  }
-  if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
-    params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
-  }
-  params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value
-  params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value
-  return request({
-    url: '/installmentorder/installmentlist',
-    method: 'post',
-    data: params
-  })
-}
+import request from '@/utils/request'
+
+// 分期列表
+export function installmentlist(query) {
+  var params = new URLSearchParams()
+  if (query.installmentId !== '' && query.installmentId !== null && query.installmentId !== undefined) {
+    params.append('installmentId', query.installmentId) // 你要传给后台的参数值 key/value
+  }
+  if (query.orderNumber !== '' && query.orderNumber !== null && query.orderNumber !== undefined) {
+    params.append('orderNumber', query.orderNumber) // 你要传给后台的参数值 key/value
+  }
+  if (query.applyNumber !== '' && query.applyNumber !== null && query.applyNumber !== undefined) {
+    params.append('applyNumber', query.applyNumber) // 你要传给后台的参数值 key/value
+  }
+  if (query.customerId !== '' && query.customerId !== null && query.customerId !== undefined) {
+    params.append('customerId', query.customerId) // 你要传给后台的参数值 key/value
+  }
+  if (query.customerName !== '' && query.customerName !== null && query.customerName !== undefined) {
+    params.append('customerName', query.customerName) // 你要传给后台的参数值 key/value
+  }
+  if (query.customerPhone !== '' && query.customerPhone !== null && query.customerPhone !== undefined) {
+    params.append('customerPhone', query.customerPhone) // 你要传给后台的参数值 key/value
+  }
+  if (query.saleRepositoryId !== '' && query.saleRepositoryId !== null && query.saleRepositoryId !== undefined) {
+    params.append('saleRepositoryId', query.saleRepositoryId) // 你要传给后台的参数值 key/value
+  }
+  if (query.judgeStat !== '' && query.judgeStat !== null && query.judgeStat !== undefined) {
+    params.append('judgeStat', query.judgeStat) // 你要传给后台的参数值 key/value
+  }
+  if (query.receiptStat !== '' && query.receiptStat !== null && query.receiptStat !== undefined) {
+    params.append('receiptStat', query.receiptStat) // 你要传给后台的参数值 key/value
+  }
+  if (query.beginTime !== '' && query.beginTime !== null && query.beginTime !== undefined) {
+    params.append('beginTime', query.beginTime) // 你要传给后台的参数值 key/value
+  }
+  if (query.endTime !== '' && query.endTime !== null && query.endTime !== undefined) {
+    params.append('endTime', query.endTime) // 你要传给后台的参数值 key/value
+  }
+  if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) {
+    params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value
+  }
+  if (query.createPersonId !== '' && query.createPersonId !== null && query.createPersonId !== undefined) {
+    params.append('createPersonId', query.createPersonId) // 你要传给后台的参数值 key/value
+  }
+  if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
+    params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
+  }
+  if (query.address !== '' && query.address !== null && query.address !== undefined) {
+    params.append('address', query.address) // 你要传给后台的参数值 key/value
+  }
+  params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value
+  params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value
+  return request({
+    url: '/installmentorder/installmentlist',
+    method: 'post',
+    data: params
+  })
+}
diff --git a/src/api/OverdueList.js b/src/api/OverdueList.js
index c410bff3..e1df8333 100644
--- a/src/api/OverdueList.js
+++ b/src/api/OverdueList.js
@@ -1,58 +1,61 @@
-import request from '@/utils/request'
-
-// 分期列表
-export function installmentlist(query) {
-  var params = new URLSearchParams()
-  if (query.installmentId !== '' && query.installmentId !== null && query.installmentId !== undefined) {
-    params.append('installmentId', query.installmentId) // 你要传给后台的参数值 key/value
-  }
-  if (query.stat !== '' && query.stat !== null && query.stat !== undefined) {
-    params.append('stat', query.stat) // 你要传给后台的参数值 key/value
-  }
-  if (query.orderNumber !== '' && query.orderNumber !== null && query.orderNumber !== undefined) {
-    params.append('orderNumber', query.orderNumber) // 你要传给后台的参数值 key/value
-  }
-  if (query.applyNumber !== '' && query.applyNumber !== null && query.applyNumber !== undefined) {
-    params.append('applyNumber', query.applyNumber) // 你要传给后台的参数值 key/value
-  }
-  if (query.customerId !== '' && query.customerId !== null && query.customerId !== undefined) {
-    params.append('customerId', query.customerId) // 你要传给后台的参数值 key/value
-  }
-  if (query.customerName !== '' && query.customerName !== null && query.customerName !== undefined) {
-    params.append('customerName', query.customerName) // 你要传给后台的参数值 key/value
-  }
-  if (query.customerPhone !== '' && query.customerPhone !== null && query.customerPhone !== undefined) {
-    params.append('customerPhone', query.customerPhone) // 你要传给后台的参数值 key/value
-  }
-  if (query.saleRepositoryId !== '' && query.saleRepositoryId !== null && query.saleRepositoryId !== undefined) {
-    params.append('saleRepositoryId', query.saleRepositoryId) // 你要传给后台的参数值 key/value
-  }
-  if (query.judgeStat !== '' && query.judgeStat !== null && query.judgeStat !== undefined) {
-    params.append('judgeStat', query.judgeStat) // 你要传给后台的参数值 key/value
-  }
-  if (query.receiptStat !== '' && query.receiptStat !== null && query.receiptStat !== undefined) {
-    params.append('receiptStat', query.receiptStat) // 你要传给后台的参数值 key/value
-  }
-  if (query.beginTime !== '' && query.beginTime !== null && query.beginTime !== undefined) {
-    params.append('beginTime', query.beginTime) // 你要传给后台的参数值 key/value
-  }
-  if (query.endTime !== '' && query.endTime !== null && query.endTime !== undefined) {
-    params.append('endTime', query.endTime) // 你要传给后台的参数值 key/value
-  }
-  if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) {
-    params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value
-  }
-  if (query.createPersonId !== '' && query.createPersonId !== null && query.createPersonId !== undefined) {
-    params.append('createPersonId', query.createPersonId) // 你要传给后台的参数值 key/value
-  }
-  if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
-    params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
-  }
-  params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value
-  params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value
-  return request({
-    url: '/installmentorder/installmentlist',
-    method: 'post',
-    data: params
-  })
-}
+import request from '@/utils/request'
+
+// 分期列表
+export function installmentlist(query) {
+  var params = new URLSearchParams()
+  if (query.installmentId !== '' && query.installmentId !== null && query.installmentId !== undefined) {
+    params.append('installmentId', query.installmentId) // 你要传给后台的参数值 key/value
+  }
+  if (query.stat !== '' && query.stat !== null && query.stat !== undefined) {
+    params.append('stat', query.stat) // 你要传给后台的参数值 key/value
+  }
+  if (query.orderNumber !== '' && query.orderNumber !== null && query.orderNumber !== undefined) {
+    params.append('orderNumber', query.orderNumber) // 你要传给后台的参数值 key/value
+  }
+  if (query.applyNumber !== '' && query.applyNumber !== null && query.applyNumber !== undefined) {
+    params.append('applyNumber', query.applyNumber) // 你要传给后台的参数值 key/value
+  }
+  if (query.customerId !== '' && query.customerId !== null && query.customerId !== undefined) {
+    params.append('customerId', query.customerId) // 你要传给后台的参数值 key/value
+  }
+  if (query.customerName !== '' && query.customerName !== null && query.customerName !== undefined) {
+    params.append('customerName', query.customerName) // 你要传给后台的参数值 key/value
+  }
+  if (query.customerPhone !== '' && query.customerPhone !== null && query.customerPhone !== undefined) {
+    params.append('customerPhone', query.customerPhone) // 你要传给后台的参数值 key/value
+  }
+  if (query.saleRepositoryId !== '' && query.saleRepositoryId !== null && query.saleRepositoryId !== undefined) {
+    params.append('saleRepositoryId', query.saleRepositoryId) // 你要传给后台的参数值 key/value
+  }
+  if (query.judgeStat !== '' && query.judgeStat !== null && query.judgeStat !== undefined) {
+    params.append('judgeStat', query.judgeStat) // 你要传给后台的参数值 key/value
+  }
+  if (query.receiptStat !== '' && query.receiptStat !== null && query.receiptStat !== undefined) {
+    params.append('receiptStat', query.receiptStat) // 你要传给后台的参数值 key/value
+  }
+  if (query.beginTime !== '' && query.beginTime !== null && query.beginTime !== undefined) {
+    params.append('beginTime', query.beginTime) // 你要传给后台的参数值 key/value
+  }
+  if (query.endTime !== '' && query.endTime !== null && query.endTime !== undefined) {
+    params.append('endTime', query.endTime) // 你要传给后台的参数值 key/value
+  }
+  if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) {
+    params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value
+  }
+  if (query.createPersonId !== '' && query.createPersonId !== null && query.createPersonId !== undefined) {
+    params.append('createPersonId', query.createPersonId) // 你要传给后台的参数值 key/value
+  }
+  if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
+    params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
+  }
+  if (query.address !== '' && query.address !== null && query.address !== undefined) {
+    params.append('address', query.address) // 你要传给后台的参数值 key/value
+  }
+  params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value
+  params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value
+  return request({
+    url: '/installmentorder/installmentlist',
+    method: 'post',
+    data: params
+  })
+}
diff --git a/src/api/SaleContract.js b/src/api/SaleContract.js
index 75ba4507..9e75c5f7 100644
--- a/src/api/SaleContract.js
+++ b/src/api/SaleContract.js
@@ -1,103 +1,106 @@
-import request from '@/utils/request'
-
-// 添加销售合同
-export function createsaleContract(query, query2, query4) {
-  var params = new URLSearchParams()
-  params.append('Json', query) // 你要传给后台的参数值 key/value
-  params.append('detailJson', query2) // 你要传给后台的参数值 key/value
-  if (query4.repositoryId !== '' && query4.repositoryId !== null && query4.repositoryId !== undefined) {
-    params.append('repositoryId', query4.repositoryId) // 你要传给后台的参数值 key/value
-  }
-  if (query4.regionId !== '' && query4.regionId !== null && query4.regionId !== undefined) {
-    params.append('regionId', query4.regionId) // 你要传给后台的参数值 key/value
-  }
-  return request({
-    url: '/saleContract/create',
-    method: 'post',
-    data: params
-  })
-}
-
-// 查询销售合同
-export function searchsaleContract(query) {
-  var params = new URLSearchParams()
-  if (query.title !== '' && query.title !== null && query.title !== undefined) {
-    params.append('title', query.title) // 你要传给后台的参数值 key/value
-  }
-  if (query.number !== '' && query.number !== null && query.number !== undefined) {
-    params.append('number', query.number) // 你要传给后台的参数值 key/value
-  }
-  if (query.customerName !== '' && query.customerName !== null && query.customerName !== undefined) {
-    params.append('customerName', query.customerName) // 你要传给后台的参数值 key/value
-  }
-  if (query.saleType !== '' && query.saleType !== null && query.saleType !== undefined) {
-    params.append('saleType', query.saleType) // 你要传给后台的参数值 key/value
-  }
-  if (query.judgeStat !== '' && query.judgeStat !== null && query.judgeStat !== undefined) {
-    params.append('judgeStat', query.judgeStat) // 你要传给后台的参数值 key/value
-  }
-  if (query.receiptStat !== '' && query.receiptStat !== null && query.receiptStat !== undefined) {
-    params.append('receiptStat', query.receiptStat) // 你要传给后台的参数值 key/value
-  }
-  if (query.beginTime !== '' && query.beginTime !== null && query.beginTime !== undefined) {
-    params.append('beginTime', query.beginTime) // 你要传给后台的参数值 key/value
-  }
-  if (query.endTime !== '' && query.endTime !== null && query.endTime !== undefined) {
-    params.append('endTime', query.endTime) // 你要传给后台的参数值 key/value
-  }
-  if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) {
-    params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value
-  }
-  if (query.createPersonId !== '' && query.createPersonId !== null && query.createPersonId !== undefined) {
-    params.append('createPersonId', query.createPersonId) // 你要传给后台的参数值 key/value
-  }
-  if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
-    params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
-  }
-  params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value
-  params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value
-  return request({
-    url: '/saleContract/search',
-    method: 'post',
-    data: params
-  })
-}
-
-//  修改销售合同
-export function updatesaleContract(query, query2) {
-  var params = new URLSearchParams()
-  params.append('Json', query) // 你要传给后台的参数值 key/value
-  params.append('detailJson', query2) // 你要传给后台的参数值 key/value
-  return request({
-    url: '/saleContract/update',
-    method: 'post',
-    data: params
-  })
-}
-
-// 删除销售合同
-export function deletesaleContract(query, query2) {
-  var params = new URLSearchParams()
-  if (query !== '' && query !== null && query !== undefined) {
-    params.append('modelids', query) // 你要传给后台的参数值 key/value
-  }
-  if (query2 !== '' && query2 !== null && query2 !== undefined) {
-    params.append('operatorId', query2) // 你要传给后台的参数值 key/value
-  }
-  return request({
-    url: '/saleContract/delete',
-    method: 'post',
-    data: params
-  })
-}
-
-// 审核销售合同
-export function updatesaleContract2(query) {
-  var params = new URLSearchParams()
-  params.append('Json', query) // 你要传给后台的参数值 key/value
-  return request({
-    url: '/saleContract/update',
-    method: 'post',
-    data: params
-  })
-}
+import request from '@/utils/request'
+
+// 添加销售合同
+export function createsaleContract(query, query2, query4) {
+  var params = new URLSearchParams()
+  params.append('Json', query) // 你要传给后台的参数值 key/value
+  params.append('detailJson', query2) // 你要传给后台的参数值 key/value
+  if (query4.repositoryId !== '' && query4.repositoryId !== null && query4.repositoryId !== undefined) {
+    params.append('repositoryId', query4.repositoryId) // 你要传给后台的参数值 key/value
+  }
+  if (query4.regionId !== '' && query4.regionId !== null && query4.regionId !== undefined) {
+    params.append('regionId', query4.regionId) // 你要传给后台的参数值 key/value
+  }
+  return request({
+    url: '/saleContract/create',
+    method: 'post',
+    data: params
+  })
+}
+
+// 查询销售合同
+export function searchsaleContract(query) {
+  var params = new URLSearchParams()
+  if (query.title !== '' && query.title !== null && query.title !== undefined) {
+    params.append('title', query.title) // 你要传给后台的参数值 key/value
+  }
+  if (query.number !== '' && query.number !== null && query.number !== undefined) {
+    params.append('number', query.number) // 你要传给后台的参数值 key/value
+  }
+  if (query.customerType !== '' && query.customerType !== null && query.customerType !== undefined) {
+    params.append('customerType', query.customerType) // 你要传给后台的参数值 key/value
+  }
+  if (query.customerName !== '' && query.customerName !== null && query.customerName !== undefined) {
+    params.append('customerName', query.customerName) // 你要传给后台的参数值 key/value
+  }
+  if (query.saleType !== '' && query.saleType !== null && query.saleType !== undefined) {
+    params.append('saleType', query.saleType) // 你要传给后台的参数值 key/value
+  }
+  if (query.judgeStat !== '' && query.judgeStat !== null && query.judgeStat !== undefined) {
+    params.append('judgeStat', query.judgeStat) // 你要传给后台的参数值 key/value
+  }
+  if (query.receiptStat !== '' && query.receiptStat !== null && query.receiptStat !== undefined) {
+    params.append('receiptStat', query.receiptStat) // 你要传给后台的参数值 key/value
+  }
+  if (query.beginTime !== '' && query.beginTime !== null && query.beginTime !== undefined) {
+    params.append('beginTime', query.beginTime) // 你要传给后台的参数值 key/value
+  }
+  if (query.endTime !== '' && query.endTime !== null && query.endTime !== undefined) {
+    params.append('endTime', query.endTime) // 你要传给后台的参数值 key/value
+  }
+  if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) {
+    params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value
+  }
+  if (query.createPersonId !== '' && query.createPersonId !== null && query.createPersonId !== undefined) {
+    params.append('createPersonId', query.createPersonId) // 你要传给后台的参数值 key/value
+  }
+  if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
+    params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
+  }
+  params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value
+  params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value
+  return request({
+    url: '/saleContract/search',
+    method: 'post',
+    data: params
+  })
+}
+
+//  修改销售合同
+export function updatesaleContract(query, query2) {
+  var params = new URLSearchParams()
+  params.append('Json', query) // 你要传给后台的参数值 key/value
+  params.append('detailJson', query2) // 你要传给后台的参数值 key/value
+  return request({
+    url: '/saleContract/update',
+    method: 'post',
+    data: params
+  })
+}
+
+// 删除销售合同
+export function deletesaleContract(query, query2) {
+  var params = new URLSearchParams()
+  if (query !== '' && query !== null && query !== undefined) {
+    params.append('modelids', query) // 你要传给后台的参数值 key/value
+  }
+  if (query2 !== '' && query2 !== null && query2 !== undefined) {
+    params.append('operatorId', query2) // 你要传给后台的参数值 key/value
+  }
+  return request({
+    url: '/saleContract/delete',
+    method: 'post',
+    data: params
+  })
+}
+
+// 审核销售合同
+export function updatesaleContract2(query) {
+  var params = new URLSearchParams()
+  params.append('Json', query) // 你要传给后台的参数值 key/value
+  return request({
+    url: '/saleContract/update',
+    method: 'post',
+    data: params
+  })
+}
diff --git a/src/api/SaleOut.js b/src/api/SaleOut.js
index 73ffbe69..2d25d5a0 100644
--- a/src/api/SaleOut.js
+++ b/src/api/SaleOut.js
@@ -64,6 +64,15 @@ export function searchsaleOut(query) {
   if (query.customerName !== '' && query.customerName !== null && query.customerName !== undefined) {
     params.append('customerName', query.customerName) // 你要传给后台的参数值 key/value
   }
+  if (query.carCode !== '' && query.carCode !== null && query.carCode !== undefined) {
+    params.append('carCode', query.carCode) // 你要传给后台的参数值 key/value
+  }
+  if (query.motorCode !== '' && query.motorCode !== null && query.motorCode !== undefined) {
+    params.append('motorCode', query.motorCode) // 你要传给后台的参数值 key/value
+  }
+  if (query.batteryCode !== '' && query.batteryCode !== null && query.batteryCode !== undefined) {
+    params.append('batteryCode', query.batteryCode) // 你要传给后台的参数值 key/value
+  }
   if (query.customerId !== '' && query.customerId !== null && query.customerId !== undefined) {
     params.append('customerId', query.customerId) // 你要传给后台的参数值 key/value
   }
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 010f0812..719fe21e 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -3766,7 +3766,8 @@ export default {
   },
   updates2: {
     dbdxq: '调拨单详情',
-    customerName: '零售客户姓名'
+    customerName: '零售客户姓名',
+    xsj: '销售价'
   },
   otherlanguage: {
     newvoucher: '凭证',
diff --git a/src/views/Advancemanage/AddAdvanceOrder.vue b/src/views/Advancemanage/AddAdvanceOrder.vue
index fe231dfa..f7ccb2f8 100644
--- a/src/views/Advancemanage/AddAdvanceOrder.vue
+++ b/src/views/Advancemanage/AddAdvanceOrder.vue
@@ -364,7 +364,7 @@ export default {
         row.taxprice = (row.salePrice * (1 + row.taxRate / 100)).toFixed(2)
       }
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
@@ -377,7 +377,7 @@ export default {
     // 通过折扣计算折扣额
     getdiscountRate(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
diff --git a/src/views/Coupon/AddCoupon.vue b/src/views/Coupon/AddCoupon.vue
index 16d6bd99..629c17a3 100644
--- a/src/views/Coupon/AddCoupon.vue
+++ b/src/views/Coupon/AddCoupon.vue
@@ -666,7 +666,7 @@ export default {
     // 通过折扣计算折扣额
     getdiscountRate(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (1 - row.discountRate / 100)).toFixed(2)
       }
diff --git a/src/views/Coupon/components/MyDialog.vue b/src/views/Coupon/components/MyDialog.vue
index cee992f0..8856542d 100644
--- a/src/views/Coupon/components/MyDialog.vue
+++ b/src/views/Coupon/components/MyDialog.vue
@@ -505,7 +505,7 @@ export default {
     // 通过折扣计算折扣额
     getdiscountRate(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (1 - row.discountRate / 100)).toFixed(2)
       }
diff --git a/src/views/InstallmentList/index.vue b/src/views/InstallmentList/index.vue
index 262766ae..e64d4da3 100644
--- a/src/views/InstallmentList/index.vue
+++ b/src/views/InstallmentList/index.vue
@@ -18,6 +18,11 @@
               <el-input v-model="getemplist.applyNumber" :placeholder="$t('InstallmentList.applyNumber')" clearable @keyup.enter.native="handleFilter"/>
             </el-form-item>
           </el-col>
+          <el-col :span="5">
+            <el-form-item :label="$t('StockInvoice.address')" label-width="100px">
+              <el-input v-model="getemplist.address" clearable @keyup.enter.native="handleFilter"/>
+            </el-form-item>
+          </el-col>
           <!--更多搜索条件-->
           <!-- <el-col :span="3">
             <el-popover
@@ -190,7 +195,7 @@
               <el-button v-permission2="['200-203-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
               <el-button v-show="isReview(scope.row)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
               <el-button v-permission2="['200-203-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
-              <el-button v-permission="['200-203-59']" v-show="scope.row.stat !== 2" type="primary" @click="handleMyReceipt1(scope.row)"><span>改期</span></el-button>
+              <el-button v-permission="['200-203-59']" v-show="scope.row.stat !== 2&&scope.row.stat !== 3" type="primary" @click="handleMyReceipt1(scope.row)"><span>改期</span></el-button>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/InventoryCount/AddInventoryCount.vue b/src/views/InventoryCount/AddInventoryCount.vue
index 8e60b6a2..8fa9796b 100644
--- a/src/views/InventoryCount/AddInventoryCount.vue
+++ b/src/views/InventoryCount/AddInventoryCount.vue
@@ -73,25 +73,29 @@
           <el-editable-column type="index" width="55" align="center"/>
           <el-editable-column :edit-render="{type: 'default'}" :label="$t('Hmodule.hw')" prop="locationCode" align="center" width="200px">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.locationCode" :value="scope.row.locationCode" :placeholder="$t('Hmodule.xzhw')" filterable clearable style="width: 100%;" @visible-change="updatebatch($event,scope)">
-                <el-option
-                  v-for="(item, index) in locationlist"
-                  :key="index"
-                  :value="item.locationCode"
-                  :label="item.locationCode"/>
-              </el-select>
+              <p>{{ getLocationData(scope.row) }}</p>
             </template>
           </el-editable-column>
           <!--<el-editable-column :edit-render="{name: 'ElSelect', options: batchlist, type: 'visible'}" prop="batch" align="center" :label="$t('Hmodule.pc')" width="150px"/>-->
-          <el-editable-column :edit-render="{type: 'default'}" :label="$t('Hmodule.pc')" prop="batch" align="center" width="200px">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.batch" :value="scope.row.batch" :placeholder="$t('Hmodule.xcpc')" filterable clearable style="width: 100%;" @visible-change="updatebatch2($event,scope)">
+          <!--          <el-editable-column :edit-render="{type: 'default'}" :label="$t('Hmodule.pc')" prop="batch" align="center" width="200px">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <el-select v-model="scope.row.batch" :value="scope.row.batch" :placeholder="$t('Hmodule.xcpc')" filterable clearable style="width: 100%;" @visible-change="updatebatch2($event,scope)">-->
+          <!--                <el-option-->
+          <!--                  v-for="(item, index) in batchlist"-->
+          <!--                  :key="index"-->
+          <!--                  :value="item"-->
+          <!--                  :label="item"/>-->
+          <!--              </el-select>-->
+          <el-editable-column :edit-render="{name: 'ElInput', type: 'visible'}" :label="$t('Hmodule.pc')" prop="batch" align="center" min-width="150" >
+            <template slot="edit" slot-scope="scope">
+              <el-select v-if="scope.row.batch !== '不使用'" v-model="scope.row.batch" :value="scope.row.batch" :placeholder="$t('Hmodule.xcpc')" filterable clearable style="width: 100%;" @visible-change="updatebatch2($event,scope)">
                 <el-option
                   v-for="(item, index) in batchlist"
                   :key="index"
                   :value="item"
                   :label="item"/>
               </el-select>
+              <span v-else>{{ scope.row.batch }}</span>
             </template>
           </el-editable-column>
           <el-editable-column :label="$t('Hmodule.wpbh')" prop="productCode" align="center" width="150px"/>
@@ -350,6 +354,42 @@ export default {
     _that = this
   },
   methods: {
+    getLocationData(row) {
+      // 默认批次
+      if (row.batch === null || row.batch === '' || row.batch === undefined) {
+        const parms3 = row.productCode
+        batchlist(this.personalForm.countRepositoryId, parms3).then(res => {
+          console.log(res)
+          if (res.data.data.content.length > 0) {
+            row.batch = res.data.data.content[0]
+          }
+        })
+      } else {
+        const parms3 = row.productCode
+        batchlist(this.personalForm.countRepositoryId, parms3).then(res => {
+          if (res.data.data.content.length === 0) {
+            if (row.batch !== '不使用') {
+              row.batch = null
+            }
+          }
+        })
+      }
+      // 默认货位
+      getlocation(this.personalForm.countRepositoryId, row).then(res => {
+        if (res.data.ret === 200) {
+          console.log('res', res)
+          if (res.data.data.content.length !== 0) {
+            row.locationCode = res.data.data.content[0].locationCode
+            row.locationId = res.data.data.content[0].id
+            console.log('row.locationCode', row.locationCode)
+          } else {
+            row.locationCode = null
+            row.locationId = null
+          }
+        }
+      })
+      return row.locationCode
+    },
     checkStock(row) {
       console.log('this.moreaction.length', this.moreaction.length)
       if (this.moreaction.length > 1 || this.moreaction.length === 0) {
@@ -621,6 +661,7 @@ export default {
       this.countRepositoryId = val.repositoryName
       this.personalForm.countRepositoryId = val.id
       this.locationlistparms.repositoryId = val.id
+      this.$refs.editable.clear()
       // locationlist(this.locationlistparms).then(res => {
       //   if (res.data.ret === 200) {
       //     this.locationlist = res.data.data.content.list.map(function(item) {
@@ -663,6 +704,8 @@ export default {
         // }
         this.$refs.editable.insert(val[i])
       }
+      // 货位批次默认
+      // 2撒打算
       // console.log(val)
       // const row = this.$refs.editable.insert(val)
     }
diff --git a/src/views/InventoryCount/components/MyDialog.vue b/src/views/InventoryCount/components/MyDialog.vue
index 33d93c59..e6f75bba 100644
--- a/src/views/InventoryCount/components/MyDialog.vue
+++ b/src/views/InventoryCount/components/MyDialog.vue
@@ -75,27 +75,32 @@
           @selection-change="handleSelectionChange">
           <el-editable-column type="selection" width="55" align="center"/>
           <el-editable-column type="index" width="55" align="center"/>
-          <el-editable-column :edit-render="{type: 'default'}" :label="$t('Hmodule.hw')" prop="locationId" align="center" width="200px">
+          <el-editable-column :edit-render="{type: 'default'}" :label="$t('Hmodule.hw')" prop="locationCode" align="center" width="200px">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.locationId" :value="scope.row.locationId" :placeholder="$t('Hmodule.xzhw')" filterable clearable style="width: 100%;" @visible-change="updatebatch($event,scope)">
-                <el-option
-                  v-for="(item, index) in locationlist"
-                  :key="index"
-                  :value="item.id"
-                  :label="item.locationCode"/>
-              </el-select>
+              <p>{{ getLocationData(scope.row) }}</p>
             </template>
           </el-editable-column>
           <!--<el-editable-column :edit-render="{name: 'ElSelect', options: batchlist, type: 'visible'}" prop="batch" align="center" :label="$t('Hmodule.pc')" width="150px"/>-->
-          <el-editable-column :edit-render="{type: 'default'}" :label="$t('Hmodule.pc')" prop="batch" align="center" width="200px">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.batch" :value="scope.row.batch" :placeholder="$t('Hmodule.xcpc')" filterable clearable style="width: 100%;" @visible-change="updatebatch2($event,scope)" @change="changequantity(scope)">
+          <!--<el-editable-column :edit-render="{name: 'ElSelect', options: batchlist, type: 'visible'}" prop="batch" align="center" :label="$t('Hmodule.pc')" width="150px"/>-->
+          <!--          <el-editable-column :edit-render="{type: 'default'}" :label="$t('Hmodule.pc')" prop="batch" align="center" width="200px">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <el-select v-model="scope.row.batch" :value="scope.row.batch" :placeholder="$t('Hmodule.xcpc')" filterable clearable style="width: 100%;" @visible-change="updatebatch2($event,scope)">-->
+          <!--                <el-option-->
+          <!--                  v-for="(item, index) in batchlist"-->
+          <!--                  :key="index"-->
+          <!--                  :value="item"-->
+          <!--                  :label="item"/>-->
+          <!--              </el-select>-->
+          <el-editable-column :edit-render="{name: 'ElInput', type: 'visible'}" :label="$t('Hmodule.pc')" prop="batch" align="center" min-width="150" >
+            <template slot="edit" slot-scope="scope">
+              <el-select v-if="scope.row.batch !== '不使用'" v-model="scope.row.batch" :value="scope.row.batch" :placeholder="$t('Hmodule.xcpc')" filterable clearable style="width: 100%;" @visible-change="updatebatch2($event,scope)">
                 <el-option
                   v-for="(item, index) in batchlist"
                   :key="index"
                   :value="item"
                   :label="item"/>
               </el-select>
+              <span v-else>{{ scope.row.batch }}</span>
             </template>
           </el-editable-column>
           <el-editable-column :label="$t('Hmodule.wpbh')" prop="productCode" align="center" width="150px"/>
@@ -300,6 +305,42 @@ export default {
     _that = this
   },
   methods: {
+    getLocationData(row) {
+      // 默认批次
+      if (row.batch === null || row.batch === '' || row.batch === undefined) {
+        const parms3 = row.productCode
+        batchlist(this.personalForm.countRepositoryId, parms3).then(res => {
+          console.log(res)
+          if (res.data.data.content.length > 0) {
+            row.batch = res.data.data.content[0]
+          }
+        })
+      } else {
+        const parms3 = row.productCode
+        batchlist(this.personalForm.countRepositoryId, parms3).then(res => {
+          if (res.data.data.content.length === 0) {
+            if (row.batch !== '不使用') {
+              row.batch = null
+            }
+          }
+        })
+      }
+      // 默认货位
+      getlocation(this.personalForm.countRepositoryId, row).then(res => {
+        if (res.data.ret === 200) {
+          console.log('res', res)
+          if (res.data.data.content.length !== 0) {
+            row.locationCode = res.data.data.content[0].locationCode
+            row.locationId = res.data.data.content[0].id
+            console.log('row.locationCode', row.locationCode)
+          } else {
+            row.locationCode = null
+            row.locationId = null
+          }
+        }
+      })
+      return row.locationCode
+    },
     handleSelectionChange(val) {
       console.log(val)
       this.moreaction = val
@@ -459,16 +500,17 @@ export default {
       this.countRepositoryId = val.repositoryName
       this.personalForm.countRepositoryId = val.id
       this.locationlistparms.repositoryId = val.id
-      locationlist(this.locationlistparms).then(res => {
-        if (res.data.ret === 200) {
-          this.locationlist = res.data.data.content.list.map(function(item) {
-            return {
-              'value': item.id,
-              'label': item.locationName
-            }
-          })
-        }
-      })
+      this.$refs.editable.clear()
+      // locationlist(this.locationlistparms).then(res => {
+      //   if (res.data.ret === 200) {
+      //     this.locationlist = res.data.data.content.list.map(function(item) {
+      //       return {
+      //         'value': item.id,
+      //         'label': item.locationName
+      //       }
+      //     })
+      //   }
+      // })
     },
     // 盘点单事件
     // 新增盘点单明细
diff --git a/src/views/OverdueList/index.vue b/src/views/OverdueList/index.vue
index b235f7b7..dd163357 100644
--- a/src/views/OverdueList/index.vue
+++ b/src/views/OverdueList/index.vue
@@ -36,6 +36,7 @@
                 <el-option :label="$t('updates.shtg')" value="2"/>
                 <el-option :label="$t('updates.shptg')" value="3"/>
               </el-select>
+              <el-input v-model="getemplist.address" placeholder="地址" style="width: 40%;float: left;margin-left: 20px;margin-top: 20px" clearable @keyup.enter.native="handleFilter"/>
               <!--<el-date-picker-->
               <!--v-model="date"-->
               <!--type="daterange"-->
diff --git a/src/views/Product/NewProduct.vue b/src/views/Product/NewProduct.vue
index bbc1bb79..b695cc3c 100644
--- a/src/views/Product/NewProduct.vue
+++ b/src/views/Product/NewProduct.vue
@@ -24,8 +24,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item :label="$t('Product.typeid')" :rules="Iscategoryid === 3 || Iscategoryid === '' ? personalrules.typeid:[{ required: true, message: '请选择车辆型号', trigger: 'change' }]" prop="typeid" style="width: 100%;">
-                  <el-select ref="clear" v-model="typeid" :disabled="Iscategoryid === 3 || Iscategoryid === ''" value-key="id" style="margin-left: 18px;width: 200px" placeholder="请选择车辆型号" clearable @change="type($event)" @focus="updatecate">
+                <el-form-item :label="$t('Product.typeid')" :rules="Iscategoryid === '03' || Iscategoryid === '' ? personalrules.typeid:[{ required: true, message: '请选择车辆型号', trigger: 'change' }]" prop="typeid" style="width: 100%;">
+                  <el-select ref="clear" v-model="typeid" :disabled="Iscategoryid === '03' || Iscategoryid === ''" value-key="id" style="margin-left: 18px;width: 200px" placeholder="请选择车辆型号" clearable @change="type($event)" @focus="updatecate">
                     <el-option v-show="false" label="" value=""/>
                     <el-option
                       v-for="(item, index) in types"
@@ -40,8 +40,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item :label="$t('Product.disposeId')" :rules="Iscategoryid === 3 || Iscategoryid === '' || Iscategoryid === 2 ? personalrules.disposeId:[{ required: true, message: '请选择配置', trigger: 'change' }]" prop="disposeId" style="width: 100%;">
-                  <el-select ref="clear2" v-model="disposeId" :disabled="Iscategoryid === 3 || Iscategoryid === '' || Iscategoryid === 2" value-key="id" placeholder="请选择配置" style="margin-left: 18px;width: 200px" @change="dispose($event)" @focus="updatecate">
+                <el-form-item :label="$t('Product.disposeId')" :rules="Iscategoryid === '03' || Iscategoryid === '' || Iscategoryid === '02' || Iscategoryid === '05' ? personalrules.disposeId:[{ required: true, message: '请选择配置', trigger: 'change' }]" prop="disposeId" style="width: 100%;">
+                  <el-select ref="clear2" v-model="disposeId" :disabled="Iscategoryid === '03' || Iscategoryid === '' || Iscategoryid === '02' || Iscategoryid === '05'" value-key="id" placeholder="请选择配置" style="margin-left: 18px;width: 200px" @change="dispose($event)" @focus="updatecate">
                     <el-option v-show="false" label="" value=""/>
                     <el-option
                       v-for="(item, index) in disposes"
@@ -56,8 +56,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item :label="$t('Product.versionId')" :rules="Iscategoryid === 3 || Iscategoryid === '' ? personalrules.versionId:[{ required: true, message: '请选择版本', trigger: 'change' }]" prop="versionId" style="width: 100%;">
-                  <el-select ref="clear3" v-model="versionId" :disabled="Iscategoryid === 3 || Iscategoryid === ''" value-key="id" placeholder="请选择版本" style="margin-left: 18px;width: 200px" @change="version($event)" @focus="updatecate">
+                <el-form-item :label="$t('Product.versionId')" :rules="Iscategoryid === '03' || Iscategoryid === '' ? personalrules.versionId:[{ required: true, message: '请选择版本', trigger: 'change' }]" prop="versionId" style="width: 100%;">
+                  <el-select ref="clear3" v-model="versionId" :disabled="Iscategoryid === '03' || Iscategoryid === ''" value-key="id" placeholder="请选择版本" style="margin-left: 18px;width: 200px" @change="version($event)" @focus="updatecate">
                     <el-option v-show="false" label="" value=""/>
                     <el-option
                       v-for="(item, index) in versions"
@@ -72,8 +72,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item :label="$t('Product.color')" :rules="Iscategoryid === 3 || Iscategoryid === '' ? personalrules.colorId:[{ required: true, message: '请选择颜色', trigger: 'change' }]" prop="colorId" style="width: 100%;">
-                  <el-select ref="clear4" v-model="colorId" :disabled="Iscategoryid === 3 || Iscategoryid === ''" value-key="id" placeholder="请选择颜色" style="margin-left: 18px;width: 200px" @change="color($event)" @focus="updatecate">
+                <el-form-item :label="$t('Product.color')" :rules="Iscategoryid === '03' || Iscategoryid === '' ? personalrules.colorId:[{ required: true, message: '请选择颜色', trigger: 'change' }]" prop="colorId" style="width: 100%;">
+                  <el-select ref="clear4" v-model="colorId" :disabled="Iscategoryid === '03' || Iscategoryid === ''" value-key="id" placeholder="请选择颜色" style="margin-left: 18px;width: 200px" @change="color($event)" @focus="updatecate">
                     <el-option v-show="false" label="" value=""/>
                     <el-option
                       v-for="(item, index) in colors"
@@ -88,8 +88,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item :label="$t('Product.diameterId')" :rules="Iscategoryid === 1 || Iscategoryid === 2 || Iscategoryid === '' ? personalrules.diameterId:[{ required: true, message: '请选择直径规格', trigger: 'change' }]" prop="diameterId" style="width: 100%;">
-                  <el-select ref="clear5" v-model="diameterId" :disabled="Iscategoryid === 1 || Iscategoryid === 2 || Iscategoryid === ''" value-key="id" placeholder="请选择直径规格" style="margin-left: 18px;width: 200px" @change="diameter($event)" @focus="updatecate">
+                <el-form-item :label="$t('Product.diameterId')" :rules="Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '' || Iscategoryid === '05' ? personalrules.diameterId:[{ required: true, message: '请选择直径规格', trigger: 'change' }]" prop="diameterId" style="width: 100%;">
+                  <el-select ref="clear5" v-model="diameterId" :disabled="Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '' || Iscategoryid === '05'" value-key="id" placeholder="请选择直径规格" style="margin-left: 18px;width: 200px" @change="diameter($event)" @focus="updatecate">
                     <el-option v-show="false" label="" value=""/>
                     <el-option
                       v-for="(item, index) in diameters"
@@ -136,8 +136,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item :label="$t('Product.lengthLevelId')" :rules="Iscategoryid === 1 || Iscategoryid === 2 || Iscategoryid === '' ? personalrules.lengthLevelId:[{ required: true, message: '请选择长度等级', trigger: 'change' }]" prop="lengthLevelId" style="width: 100%;">
-                  <el-select ref="clear8" v-model="lengthLevelId" :disabled="Iscategoryid === 1 || Iscategoryid === 2 || personalForm.categoryid === ''" value-key="id" placeholder="请选择长度等级" style="margin-left: 18px;width: 200px" @change="length($event)" @focus="updatecate">
+                <el-form-item :label="$t('Product.lengthLevelId')" :rules="Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '' || Iscategoryid === '05' ? personalrules.lengthLevelId:[{ required: true, message: '请选择长度等级', trigger: 'change' }]" prop="lengthLevelId" style="width: 100%;">
+                  <el-select ref="clear8" v-model="lengthLevelId" :disabled="Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '05' || personalForm.categoryid === ''" value-key="id" placeholder="请选择长度等级" style="margin-left: 18px;width: 200px" @change="length($event)" @focus="updatecate">
                     <el-option v-show="false" label="" value=""/>
                     <el-option
                       v-for="(item, index) in lengthLevels"
@@ -152,8 +152,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item :label="$t('Product.faceId')" :rules="Iscategoryid === 1 || Iscategoryid === 2 || Iscategoryid === '' ? personalrules.faceId:[{ required: true, message: '请选择表面处理', trigger: 'change' }]" prop="faceId" style="width: 100%;">
-                  <el-select ref="clear9" v-model="faceId" :disabled="Iscategoryid === 1 || Iscategoryid === 2 || Iscategoryid === ''" value-key="id" placeholder="请选择表面处理" style="margin-left: 18px;width: 200px" @change="face($event)" @focus="updatecate">
+                <el-form-item :label="$t('Product.faceId')" :rules="Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '05' || Iscategoryid === '' ? personalrules.faceId:[{ required: true, message: '请选择表面处理', trigger: 'change' }]" prop="faceId" style="width: 100%;">
+                  <el-select ref="clear9" v-model="faceId" :disabled="Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '05' || Iscategoryid === ''" value-key="id" placeholder="请选择表面处理" style="margin-left: 18px;width: 200px" @change="face($event)" @focus="updatecate">
                     <el-option v-show="false" label="" value=""/>
                     <el-option
                       v-for="(item, index) in faces"
@@ -168,8 +168,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item :label="$t('Product.performanceLevelId')" :rules="Iscategoryid === 1 || Iscategoryid === 2 || Iscategoryid === '' ? personalrules.performanceLevelId:[{ required: true, message: '请选择性能等级', trigger: 'change' }]" prop="performanceLevelId" style="width: 100%;">
-                  <el-select ref="clear10" v-model="performanceLevelId" :disabled="Iscategoryid === 1 || Iscategoryid === 2 || Iscategoryid === ''" value-key="id" placeholder="请选择性能等级" style="margin-left: 18px;width: 200px" @change="performanceLevel($event)" @focus="updatecate">
+                <el-form-item :label="$t('Product.performanceLevelId')" :rules="Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '05' || Iscategoryid === '' ? personalrules.performanceLevelId:[{ required: true, message: '请选择性能等级', trigger: 'change' }]" prop="performanceLevelId" style="width: 100%;">
+                  <el-select ref="clear10" v-model="performanceLevelId" :disabled="Iscategoryid === '01' || Iscategoryid === '02' || Iscategoryid === '05' || Iscategoryid === ''" value-key="id" placeholder="请选择性能等级" style="margin-left: 18px;width: 200px" @change="performanceLevel($event)" @focus="updatecate">
                     <el-option v-show="false" label="" value=""/>
                     <el-option
                       v-for="(item, index) in performanceLevels"
@@ -1155,6 +1155,8 @@ export default {
     },
     finder(val) {
       const Id = this.recursion(val)
+      console.log('IdIdIdIdId', Id)
+      console.log('valvalvalval', val)
       if (Id.code === '01') {
         console.log(val)
         this.personalForm.categoryCode = '01' + val.data.code
@@ -1176,9 +1178,22 @@ export default {
           this.personalForm.categoryCode = '03' + val.parent.data.code + val.data.code
           this.personalForm.categoryid = val.data.id
         }
+      } else if (Id.code === '05') {
+        if (val.level === 2) {
+          this.personalForm.categoryCode = '05' + val.data.code + '00' + '00'
+          this.personalForm.categoryid = val.data.id
+        } else if (val.level === 3) {
+          console.log(val)
+          this.personalForm.categoryCode = '05' + val.parent.data.code + val.data.code + '00'
+          this.personalForm.categoryid = val.data.id
+        } else if (val.level === 4) {
+          this.personalForm.categoryCode = '05' + val.parent.parent.data.code + val.parent.data.code + val.data.code
+          this.personalForm.categoryid = val.data.id
+        }
       }
       console.log(this.personalForm.categoryCode)
-      this.Iscategoryid = Id.id
+      this.Iscategoryid = Id.code
+      console.log('thisIscategoryid2222222222222222', this.Iscategoryid)
     },
     // 递归函数
     recursion(val) {
diff --git a/src/views/ReturnExchange/AddReturnExchange.vue b/src/views/ReturnExchange/AddReturnExchange.vue
index 5ea57ae1..291f157c 100644
--- a/src/views/ReturnExchange/AddReturnExchange.vue
+++ b/src/views/ReturnExchange/AddReturnExchange.vue
@@ -8,7 +8,7 @@
           <el-form ref="personalForm" :model="personalForm" :rules="personalrules" :inline="true" status-icon class="demo-ruleForm" label-width="130px">
             <el-row>
               <el-col :span="6">
-                <el-form-item :label="$t('ReturnExchange.title')" prop="title" style="width: 100%;">
+                <el-form-item :label="$t('ReturnExchange.title')" style="width: 100%;">
                   <el-input v-model="personalForm.title" style="margin-left: 18px;width: 200px" clearable/>
                 </el-form-item>
               </el-col>
@@ -42,7 +42,7 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item :label="$t('ReturnExchange.customerPhone')" prop="customerPhone" style="width: 100%;">
-                  <el-input v-model="personalForm.customerPhone" style="margin-left: 18px;width: 200px" clearable/>
+                  <el-input v-model="personalForm.customerPhone" disabled style="margin-left: 18px;width: 200px" clearable/>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -318,7 +318,7 @@ export default {
           { required: true, message: '请输差异金额', trigger: 'blur' }
         ],
         repositoryId: [
-          { required: true, validator: validatePass4, trigger: 'blur' }
+          { required: true, validator: validatePass4, trigger: 'change' }
         ]
       },
       // 订单明细数据
@@ -371,6 +371,7 @@ export default {
       this.control = true
     },
     productdetail(val) {
+      console.log('12312312', val)
       const nowlistdata = this.$refs.editable2.getRecords()
       for (let i = 0; i < val.length; i++) {
         for (let j = 0; j < nowlistdata.length; j++) {
@@ -385,6 +386,21 @@ export default {
         }
         this.$refs.editable2.insert(val[i])
       }
+      const nowlistdata1 = this.$refs.editable.getRecords()
+      const nowlistdata2 = this.$refs.editable2.getRecords()
+      let money1 = 0
+      let money2 = 0
+      console.log('nowlistdata1', nowlistdata1)
+      for (let i = 0; i < nowlistdata1.length; i++) {
+        money1 = money1 + (nowlistdata1[i].includeTaxCostMoney - nowlistdata1[i].discountMoney)
+        console.log('includeTaxCostMoney', nowlistdata1[i].includeTaxCostMoney)
+      }
+      for (let i = 0; i < nowlistdata2.length; i++) {
+        money2 = money2 + ((nowlistdata2[i].taxPrice * nowlistdata2[i].quantity) - nowlistdata2[i].discountMoney)
+      }
+      console.log('money1', money1)
+      console.log('money2', money2)
+      this.personalForm.diffMoney = (money1 - money2).toFixed(2)
     },
     chooserep() {
       this.repositorycontrol = true
diff --git a/src/views/ReturnExchange/components/MyDetail.vue b/src/views/ReturnExchange/components/MyDetail.vue
index c731d675..07a95f14 100644
--- a/src/views/ReturnExchange/components/MyDetail.vue
+++ b/src/views/ReturnExchange/components/MyDetail.vue
@@ -296,7 +296,7 @@ export default {
           taxRate: '0.00',
           taxMoney: '0.00',
           money: '0.00',
-          discount: '100.00',
+          discount: '0.00',
           discountMoney: '0.00'
         }
       })
diff --git a/src/views/ReturnExchange/components/MyDialog.vue b/src/views/ReturnExchange/components/MyDialog.vue
index f069c480..a0964ba1 100644
--- a/src/views/ReturnExchange/components/MyDialog.vue
+++ b/src/views/ReturnExchange/components/MyDialog.vue
@@ -7,7 +7,7 @@
         <el-form ref="personalForm" :model="personalForm" :rules="personalrules" :inline="true" status-icon class="demo-ruleForm" label-width="130px">
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('ReturnExchange.title')" prop="title" style="width: 100%;">
+              <el-form-item :label="$t('ReturnExchange.title')" style="width: 100%;">
                 <el-input v-model="personalForm.title" style="margin-left: 18px;width: 200px" clearable/>
               </el-form-item>
             </el-col>
@@ -41,7 +41,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('ReturnExchange.customerPhone')" prop="customerPhone" style="width: 100%;">
-                <el-input v-model="personalForm.customerPhone" style="margin-left: 18px;width: 200px" clearable/>
+                <el-input v-model="personalForm.customerPhone" disabled style="margin-left: 18px;width: 200px" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -391,6 +391,21 @@ export default {
         }
         this.$refs.editable2.insert(val[i])
       }
+      const nowlistdata1 = this.$refs.editable.getRecords()
+      const nowlistdata2 = this.$refs.editable2.getRecords()
+      let money1 = 0
+      let money2 = 0
+      console.log('nowlistdata1', nowlistdata1)
+      for (let i = 0; i < nowlistdata1.length; i++) {
+        money1 = money1 + (nowlistdata1[i].includeTaxCostMoney - nowlistdata1[i].discountMoney)
+        console.log('includeTaxCostMoney', nowlistdata1[i].includeTaxCostMoney)
+      }
+      for (let i = 0; i < nowlistdata2.length; i++) {
+        money2 = money2 + ((nowlistdata2[i].taxPrice * nowlistdata2[i].quantity) - nowlistdata2[i].discountMoney)
+      }
+      console.log('money1', money1)
+      console.log('money2', money2)
+      this.personalForm.diffMoney = (money1 - money2).toFixed(2)
     },
     chooserep() {
       this.repositorycontrol = true
diff --git a/src/views/ReturnExchange/components/MySaleout.vue b/src/views/ReturnExchange/components/MySaleout.vue
index 2eacc31f..104381d4 100644
--- a/src/views/ReturnExchange/components/MySaleout.vue
+++ b/src/views/ReturnExchange/components/MySaleout.vue
@@ -10,7 +10,7 @@
           </el-col>
           <el-col :span="3" style="margin-left: 5px">
             <el-form-item>
-              <el-input v-model="getemplist.applyNumber" placeholder="出库单编号" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
+              <el-input v-model="getemplist.number" placeholder="出库单编号" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
             </el-form-item>
           </el-col>
           <el-col :span="3" style="margin-left: 20px">
diff --git a/src/views/SaleContract/AddSaleContract.vue b/src/views/SaleContract/AddSaleContract.vue
index a778df60..08f4b115 100644
--- a/src/views/SaleContract/AddSaleContract.vue
+++ b/src/views/SaleContract/AddSaleContract.vue
@@ -709,7 +709,7 @@ export default {
     // 数量变化其他参数
     queryStock(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
diff --git a/src/views/SaleContract/SaleContractList.vue b/src/views/SaleContract/SaleContractList.vue
index 80e84fb8..0d4b76cc 100644
--- a/src/views/SaleContract/SaleContractList.vue
+++ b/src/views/SaleContract/SaleContractList.vue
@@ -46,6 +46,7 @@
                 <el-option :label="$t('updates.shtg')" value="2"/>
                 <el-option :label="$t('updates.shptg')" value="3"/>
               </el-select>
+              <el-input v-model="getemplist.customerName" :placeholder="$t('updates2.customerName')" style="width: 40%;float: left;margin-left: 20px;margin-top: 20px" clearable @keyup.enter.native="handleFilter"/>
               <!--<el-date-picker-->
               <!--v-model="date"-->
               <!--type="daterange"-->
@@ -389,6 +390,11 @@ export default {
     // 搜索
     handleFilter() {
       this.getemplist.pageNum = 1
+      if (this.getemplist.customerName !== null && this.getemplist.customerName !== undefined && this.getemplist.customerName !== '') {
+        this.getemplist.customerType = 2
+      } else {
+        this.getemplist.customerType = null
+      }
       searchsaleContract(this.getemplist).then(res => {
         if (res.data.ret === 200) {
           this.list = res.data.data.content.list
diff --git a/src/views/SaleContract/components/MyDialog.vue b/src/views/SaleContract/components/MyDialog.vue
index 498b8e14..c4e443d5 100644
--- a/src/views/SaleContract/components/MyDialog.vue
+++ b/src/views/SaleContract/components/MyDialog.vue
@@ -610,7 +610,7 @@ export default {
     // 数量变化其他参数
     queryStock(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
diff --git a/src/views/SaleOrder/AddSaleOrder.vue b/src/views/SaleOrder/AddSaleOrder.vue
index 2808a0fe..97acf886 100644
--- a/src/views/SaleOrder/AddSaleOrder.vue
+++ b/src/views/SaleOrder/AddSaleOrder.vue
@@ -625,7 +625,7 @@ export default {
     // 数量变化其他参数
     queryStock(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
@@ -825,7 +825,7 @@ export default {
     // 通过折扣计算折扣额
     getdiscountRate(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
diff --git a/src/views/SaleOrder/components/MyDialog.vue b/src/views/SaleOrder/components/MyDialog.vue
index 8c33e863..b07b1aa6 100644
--- a/src/views/SaleOrder/components/MyDialog.vue
+++ b/src/views/SaleOrder/components/MyDialog.vue
@@ -556,7 +556,7 @@ export default {
     // 数量变化其他参数
     queryStock(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
@@ -699,7 +699,7 @@ export default {
     // 通过折扣计算折扣额
     getdiscountRate(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
diff --git a/src/views/SaleOut/AddSaleOut.vue b/src/views/SaleOut/AddSaleOut.vue
index bf9d6ade..5214cf63 100644
--- a/src/views/SaleOut/AddSaleOut.vue
+++ b/src/views/SaleOut/AddSaleOut.vue
@@ -1075,7 +1075,7 @@ export default {
       }
 
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
@@ -1487,7 +1487,7 @@ export default {
     // 计算含税金额
     getincludeTaxMoney(row) {
       row.includeTaxMoney = (row.taxprice * row.quantity).toFixed(2)
-      row.discountMoney = (row.taxprice * row.quantity * (1 - row.discountRate / 100)).toFixed(2)
+      row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       return row.includeTaxMoney
     },
     // 通过税率计算含税价
@@ -1497,7 +1497,7 @@ export default {
         row.discountMoney = row.includeTaxCostMoney * row.discountRate
       }
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
@@ -1510,7 +1510,7 @@ export default {
     // 通过折扣计算折扣额
     getdiscountRate(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
diff --git a/src/views/SaleOut/AddSaleOut2.vue b/src/views/SaleOut/AddSaleOut2.vue
index b86338dc..317e9c4f 100644
--- a/src/views/SaleOut/AddSaleOut2.vue
+++ b/src/views/SaleOut/AddSaleOut2.vue
@@ -769,7 +769,7 @@ export default {
         }
       })
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
@@ -1105,7 +1105,7 @@ export default {
         row.taxprice = (row.salePrice * (1 + row.taxRate / 100)).toFixed(2)
       }
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
@@ -1118,7 +1118,7 @@ export default {
     // 通过折扣计算折扣额
     getdiscountRate(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
diff --git a/src/views/SaleOut/SaleOutList.vue b/src/views/SaleOut/SaleOutList.vue
index d7d795f3..83fea17f 100644
--- a/src/views/SaleOut/SaleOutList.vue
+++ b/src/views/SaleOut/SaleOutList.vue
@@ -40,6 +40,9 @@
                 <el-option :label="$t('updates.shptg')" value="3"/>
               </el-select>
               <el-input v-model="getemplist.customerName" :placeholder="$t('updates2.customerName')" style="width: 40%;float: right;margin-right: 20px;margin-top: 20px" clearable @keyup.enter.native="handleFilter"/>
+              <el-input v-model="getemplist.carCode" :placeholder="$t('updates.cjbm')" style="width: 40%;float: left;margin-left: 20px;margin-top: 20px" clearable @keyup.enter.native="handleFilter"/>
+              <el-input v-model="getemplist.motorCode" :placeholder="$t('updates.djbm')" style="width: 40%;float: right;margin-right: 20px;margin-top: 20px" clearable @keyup.enter.native="handleFilter"/>
+              <el-input v-model="getemplist.batteryCode" :placeholder="$t('updates.dcbm')" style="width: 40%;float: left;margin-left: 20px;margin-top: 20px" clearable @keyup.enter.native="handleFilter"/>
               <!--<el-date-picker-->
               <!--v-model="date"-->
               <!--type="daterange"-->
diff --git a/src/views/SaleOut/components/MyDialog.vue b/src/views/SaleOut/components/MyDialog.vue
index 7b002283..55c9ba4a 100644
--- a/src/views/SaleOut/components/MyDialog.vue
+++ b/src/views/SaleOut/components/MyDialog.vue
@@ -949,7 +949,7 @@ export default {
       }
 
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
@@ -1205,7 +1205,7 @@ export default {
     // 计算含税金额
     getincludeTaxMoney(row) {
       row.includeTaxMoney = (row.taxprice * row.quantity).toFixed(2)
-      row.discountMoney = (row.taxprice * row.quantity * (1 - row.discountRate / 100)).toFixed(2)
+      row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       return row.includeTaxMoney
     },
     // 通过税率计算含税价
@@ -1214,7 +1214,7 @@ export default {
         row.taxprice = (row.salePrice * (1 + row.taxRate / 100)).toFixed(2)
       }
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
@@ -1227,7 +1227,7 @@ export default {
     // 通过折扣计算折扣额
     getdiscountRate(row) {
       if (row.discountRate === 0) {
-        row.discountMoney = row.taxprice * row.quantity
+        row.discountMoney = 0
       } else {
         row.discountMoney = (row.taxprice * row.quantity * (row.discountRate / 100)).toFixed(2)
       }
diff --git a/static/file/物品资料表.xlsx b/static/file/物品资料表.xlsx
index 8dfd97047a94d47047802106c3fda6d2a0a8f91a..cfc261fa5bf359c7303603070d0cdf8c09c7d697 100644
GIT binary patch
delta 5677
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

delta 5724
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
WPeofaL@*jPf{>l?2`kHA<i7x4_m`>w