-
+
-
+
{{ $t('newupd.qqq') }}
{{ $t('newupd.www') }}
@@ -435,6 +435,10 @@ export default {
getlist() {
// 物料需求计划列表数据
this.listLoading = true
+ if (this.countquery) {
+ console.log('this.countquery====', this.countquery)
+ this.getemplist.supplierId = this.countquery
+ }
searchsaleOrder(this.getemplist).then(res => {
if (res.data.ret === 200) {
this.list = res.data.data.content.list
diff --git a/src/views/SaleOut/NewAccessoriesOut.vue b/src/views/SaleOut/NewAccessoriesOut.vue
index 0eff5778..c930ed21 100644
--- a/src/views/SaleOut/NewAccessoriesOut.vue
+++ b/src/views/SaleOut/NewAccessoriesOut.vue
@@ -7,6 +7,11 @@
+
+
+
+
+
diff --git a/src/views/SaleReturn/SaleReturnList.vue b/src/views/SaleReturn/SaleReturnList.vue
index 4c872400..ff1d5278 100644
--- a/src/views/SaleReturn/SaleReturnList.vue
+++ b/src/views/SaleReturn/SaleReturnList.vue
@@ -155,12 +155,12 @@
-
+
-
+
diff --git a/src/views/StockApply/AddStockApply.vue b/src/views/StockApply/AddStockApply.vue
index 4da7128b..fac8c408 100644
--- a/src/views/StockApply/AddStockApply.vue
+++ b/src/views/StockApply/AddStockApply.vue
@@ -14,7 +14,7 @@
-
+
@@ -303,6 +303,9 @@ export default {
},
// 采购申请单规则数据
personalrules: {
+ title: [
+ { required: true, message: '请填写采购主题', trigger: 'change' }
+ ],
applyRepositoryId: [
{ required: true, validator: validatePass6, trigger: 'change' }
],
diff --git a/src/views/StockApply/StockApplyList.vue b/src/views/StockApply/StockApplyList.vue
index 599b66cb..0ded9617 100644
--- a/src/views/StockApply/StockApplyList.vue
+++ b/src/views/StockApply/StockApplyList.vue
@@ -142,12 +142,12 @@
-
+
-
+
diff --git a/src/views/StockApply/components/MyDialog.vue b/src/views/StockApply/components/MyDialog.vue
index 8ce540fd..0c2eb6cc 100644
--- a/src/views/StockApply/components/MyDialog.vue
+++ b/src/views/StockApply/components/MyDialog.vue
@@ -7,7 +7,7 @@
-
+
@@ -222,6 +222,9 @@ export default {
control: false,
// 采购申请单规则数据
personalrules: {
+ title: [
+ { required: true, message: '请填写采购主题', trigger: 'change' }
+ ],
applyPersonId: [
{ required: true, validator: validatePass, trigger: 'change' }
],
diff --git a/src/views/StockArrival/AddStockArrival.vue b/src/views/StockArrival/AddStockArrival.vue
index d8d86a21..e1d271e8 100644
--- a/src/views/StockArrival/AddStockArrival.vue
+++ b/src/views/StockArrival/AddStockArrival.vue
@@ -155,7 +155,7 @@
-
+
{{ $t('updates.cgdhdmx') }}
diff --git a/src/views/StockArrival/StockArrivalList.vue b/src/views/StockArrival/StockArrivalList.vue
index 2b6f0d5e..85a54353 100644
--- a/src/views/StockArrival/StockArrivalList.vue
+++ b/src/views/StockArrival/StockArrivalList.vue
@@ -172,12 +172,12 @@
-->
-
+
-
+
生成采购入库单
生成质检报告单
生成采购退货单
diff --git a/src/views/StockContract/StockContractList.vue b/src/views/StockContract/StockContractList.vue
index 20c81e68..5f726341 100644
--- a/src/views/StockContract/StockContractList.vue
+++ b/src/views/StockContract/StockContractList.vue
@@ -141,12 +141,12 @@
-
+
-
+
diff --git a/src/views/StockCount/orderImplDetail.vue b/src/views/StockCount/orderImplDetail.vue
index f321af7e..9322c611 100644
--- a/src/views/StockCount/orderImplDetail.vue
+++ b/src/views/StockCount/orderImplDetail.vue
@@ -26,33 +26,47 @@
ref="table"
:height="tableHeight"
:data="list"
+ :span-method="arraySpanMethod"
size="small"
border
style="width: 100%"
@row-click="clickRow">
+
+
-
-
@@ -90,7 +94,7 @@ import waves from '@/directive/waves' // Waves directive
import Pagination from '@/components/Pagination'
import permission from '@/directive/permission/index.js' // 权限判断指令
import permission2 from '@/directive/permission2/index.js' // 权限判断指令
-import checkPermission from '@/utils/permission' // 权限判断函数
+import checkPermission from '@/utils/permission' // 权限判断函数11
import MyEmp from './components/MyEmp'
import DetailList from './components/DetailList'
import MyDialog from './components/MyDialog'
@@ -139,7 +143,6 @@ export default {
data() {
return {
tableHeight: 200,
-
first: '',
step1: '',
step2: '',
@@ -286,16 +289,110 @@ export default {
updatecountry() {
this.getlist()
},
+ getSpanArr(data) {
+ this.spanArr = []
+ for (var i = 0; i < data.length; i++) {
+ if (i === 0) {
+ this.spanArr.push(1)
+ this.pos = 0
+ } else {
+ // 判断当前元素与上一个元素是否相同
+ if (data[i].orderId === data[i - 1].orderId) {
+ this.spanArr[this.pos] += 1
+ this.spanArr.push(0)
+ } else {
+ this.spanArr.push(1)
+ this.pos = i
+ }
+ }
+ }
+ console.log('this.spanArr=================', this.spanArr)
+ },
+ arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+ const _row = this.spanArr[rowIndex]
+ const _col = _row > 0 ? 1 : 0
+ if (columnIndex !== 2 && columnIndex !== 3 && columnIndex !== 4 && columnIndex !== 5 && columnIndex !== 6 && columnIndex !== 7 && columnIndex !== 8) {
+ return {
+ rowspan: _row,
+ colspan: _col
+ }
+ }
+ },
getlist() {
// 物料需求计划列表数据
this.listLoading = true
orderImplDetail(this.getemplist).then(res => {
if (res.data.ret === 200) {
- this.list = res.data.data.content.list
- for (let i = 0; i < this.list.length; i++) {
- this.list[i].heji = this.list[i].totalMoney + this.list[i].taxMoney
+ const list = res.data.data.content.list
+ for (let i = 0; i < list.length; i++) {
+ list[i].heji = list[i].totalMoney + list[i].taxMoney
}
- // this.total = res.data.data.content.totalCount
+ const needlist = list
+ const newarr = list.map(item => {
+ return item.stockOrderDetailVos
+ })
+ const newarr2 = [].concat.apply([], newarr)
+ const processarr = this._.cloneDeep(newarr2)
+ for (const i in needlist) {
+ for (const j in processarr) {
+ if (needlist[i].id === processarr[j].orderId) {
+ processarr[j].id = needlist[i].id
+ processarr[j].allDiscountMoney = needlist[i].allDiscountMoney
+ processarr[j].allIncludeTaxDiscountMoney = needlist[i].allIncludeTaxDiscountMoney
+ processarr[j].allIncludeTaxMoney = needlist[i].allIncludeTaxMoney
+ processarr[j].allMoney = needlist[i].allMoney
+ processarr[j].allQuantity = needlist[i].allQuantity
+ processarr[j].allTaxMoney = needlist[i].allTaxMoney
+ processarr[j].approvalUseVos = needlist[i].approvalUseVos
+ processarr[j].arrivalDate = needlist[i].arrivalDate
+ processarr[j].countryId = needlist[i].countryId
+ processarr[j].countryName = needlist[i].countryName
+ processarr[j].createDate = needlist[i].createDate
+ processarr[j].createPersonId = needlist[i].createPersonId
+ processarr[j].createPersonName = needlist[i].createPersonName
+ processarr[j].currency = needlist[i].currency
+ processarr[j].deliveryMode = needlist[i].deliveryMode
+ processarr[j].deliveryModeName = needlist[i].deliveryModeName
+ processarr[j].deptId = needlist[i].deptId
+ processarr[j].deptName = needlist[i].deptName
+ processarr[j].endDate = needlist[i].endDate
+ processarr[j].endPersonId = needlist[i].endPersonId
+ processarr[j].endPersonName = needlist[i].endPersonName
+ processarr[j].isVat = needlist[i].isVat
+ processarr[j].judgeDate = needlist[i].judgeDate
+ processarr[j].judgePersonId = needlist[i].judgePersonId
+ processarr[j].judgePersonName = needlist[i].judgePersonName
+ processarr[j].judgeStat = needlist[i].judgeStat
+ processarr[j].modifyDate = needlist[i].modifyDate
+ processarr[j].modifyPersonId = needlist[i].modifyPersonId
+ processarr[j].modifyPersonName = needlist[i].modifyPersonName
+ processarr[j].orderDate = needlist[i].orderDate
+ processarr[j].orderNumber = needlist[i].orderNumber
+ processarr[j].otherMoney = needlist[i].otherMoney
+ processarr[j].payMode = needlist[i].payMode
+ processarr[j].payModeName = needlist[i].payModeName
+ processarr[j].receiptStat = needlist[i].receiptStat
+ processarr[j].settleMode = needlist[i].settleMode
+ processarr[j].settleModeName = needlist[i].settleModeName
+ processarr[j].signPersonId = needlist[i].signPersonId
+ processarr[j].signPersonName = needlist[i].signPersonName
+ processarr[j].sourceType = needlist[i].sourceType
+ processarr[j].stockPersonId = needlist[i].stockPersonId
+ processarr[j].stockPersonName = needlist[i].stockPersonName
+ processarr[j].stockRepositoryId = needlist[i].stockRepositoryId
+ processarr[j].stockRepositoryName = needlist[i].stockRepositoryName
+ processarr[j].stockType = needlist[i].stockType
+ processarr[j].stockTypeId = needlist[i].stockTypeId
+ processarr[j].supplierId = needlist[i].supplierId
+ processarr[j].supplierName = needlist[i].supplierName
+ processarr[j].supplierNumber = needlist[i].supplierNumber
+ processarr[j].title = needlist[i].title
+ // processarr[j].stockOrderDetailVos = needlist[i].stockOrderDetailVos
+ }
+ }
+ }
+ this.list = processarr
+ this.getSpanArr(processarr)
}
setTimeout(() => {
this.listLoading = false
@@ -327,18 +424,19 @@ export default {
this.getemplist.beginTime = this.date[0]
this.getemplist.endTime = this.date[1]
}
- orderImplDetail(this.getemplist).then(res => {
- if (res.data.ret === 200) {
- this.list = res.data.data.content.list
- for (let i = 0; i < this.list.length; i++) {
- this.list[i].heji = this.list[i].totalMoney + this.list[i].taxMoney
- }
- // this.total = res.data.data.content.totalCount
- // this.restFilter()
- } else {
- // this.restFilter()
- }
- })
+ this.getlist()
+ // orderImplDetail(this.getemplist).then(res => {
+ // if (res.data.ret === 200) {
+ // this.list = res.data.data.content.list
+ // for (let i = 0; i < this.list.length; i++) {
+ // this.list[i].heji = this.list[i].totalMoney + this.list[i].taxMoney
+ // }
+ // // this.total = res.data.data.content.totalCount
+ // // this.restFilter()
+ // } else {
+ // // this.restFilter()
+ // }
+ // })
},
// 采购人focus事件
handlechooseStock() {
diff --git a/src/views/StockCount/orderReport.vue b/src/views/StockCount/orderReport.vue
index 293e4da2..3b05b83b 100644
--- a/src/views/StockCount/orderReport.vue
+++ b/src/views/StockCount/orderReport.vue
@@ -385,7 +385,7 @@ export default {
this.getlist()
}
},
- // 详情操作
+ // 详情操作111
handleDetail(row) {
console.log('row', row)
const param = {}
diff --git a/src/views/StockCount/purchaseCount.vue b/src/views/StockCount/purchaseCount.vue
index 3db3b0b4..052589ea 100644
--- a/src/views/StockCount/purchaseCount.vue
+++ b/src/views/StockCount/purchaseCount.vue
@@ -6,7 +6,10 @@
-
+
+
+
+
-
+
- -->
+
+
+ {{ scope.row.supplierName }}
+
+
+
+
-
+ align="center"/> -->
+
+
+ {{ scope.row.name }}
+
+
-
+ align="center"/> -->
+
+
+ {{ scope.row.productName }}
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -90,7 +108,7 @@
+
+
diff --git a/src/views/payment/paymentList.vue b/src/views/payment/paymentList.vue
index 0c087ff2..b674e3c6 100644
--- a/src/views/payment/paymentList.vue
+++ b/src/views/payment/paymentList.vue
@@ -136,9 +136,9 @@
-
+
-
+
diff --git a/test.zip b/test.zip
new file mode 100644
index 00000000..bdfaf7a9
Binary files /dev/null and b/test.zip differ