diff --git a/src/views/AdvancePay/AddAdvancePay.vue b/src/views/AdvancePay/AddAdvancePay.vue
index d893aa89..534c879f 100644
--- a/src/views/AdvancePay/AddAdvancePay.vue
+++ b/src/views/AdvancePay/AddAdvancePay.vue
@@ -72,18 +72,11 @@
-
+
@@ -159,6 +152,15 @@ export default {
callback()
}
}
+
+ const validatePass5 = (rule, value, callback) => {
+ console.log(this.personalForm.bankName, value)
+ if (this.personalForm.bankName === undefined || this.personalForm.bankName === null || this.personalForm.bankName === '') {
+ callback(new Error('请输入开户行'))
+ } else {
+ callback()
+ }
+ }
// const validatePass4 = (rule, value, callback) => {
// console.log(this.personalForm.settleMode)
// if (this.personalForm.settleMode === undefined || this.personalForm.settleMode === null || this.personalForm.settleMode === '') {
@@ -232,6 +234,9 @@ export default {
},
// 采购申请单规则数据
personalrules: {
+ bankName: [
+ { required: true, validator: validatePass5, trigger: 'blur' }
+ ],
supplierId: [
{ required: true, validator: validatePass, trigger: 'change' }
],
@@ -299,7 +304,7 @@ export default {
// })
// console.log('needratio', needratio)
console.log('this.personalForm.ratioRate', this.personalForm.ratioRate)
- this.personalForm.totalMoney = Number(this.personalForm.ratioRate) / 100 * Number(this.personalForm.orderMoney)
+ this.personalForm.totalMoney = (Number(this.personalForm.ratioRate) / 100 * Number(this.personalForm.orderMoney)).toFixed(2)
},
getinformation() {
if (this.$store.getters.empcontract) {
@@ -490,6 +495,7 @@ export default {
this.stockPersonId = val.buyerName
this.personalForm.stockPersonId = val.buyerId
this.personalForm.settleMode = val.paymentId
+ this.personalForm.bankName = val.bankName
if (val.moneyId !== '' && val.moneyId !== null && val.moneyId !== undefined) {
this.personalForm.currency = String(val.moneyId)
}
diff --git a/src/views/AdvancePay/AdvancePayList.vue b/src/views/AdvancePay/AdvancePayList.vue
index 87b42a5c..dd44c6e4 100644
--- a/src/views/AdvancePay/AdvancePayList.vue
+++ b/src/views/AdvancePay/AdvancePayList.vue
@@ -131,6 +131,8 @@
+
+
@@ -267,6 +269,49 @@ export default {
_that = this
},
methods: {
+ handleReview4(row) {
+ console.log('row ====', row)
+ this.reviewParms = {}
+ this.reviewParms.id = row.id
+ this.reviewParms.judgePersonId = this.$store.getters.userId
+ this.$confirm(this.$t('prompt.qfsp'), this.$t('prompt.fsp'), {
+ distinguishCancelAndClose: true,
+ confirmButtonText: this.$t('prompt.fsp'),
+ type: 'warning'
+ }).then(() => {
+ this.reviewParms.judgeStat = 0
+ const parms = JSON.stringify(this.reviewParms)
+ updateadvancepay2(parms).then(res => {
+ if (res.data.ret === 200) {
+ if (res.data.data.result === false) {
+ this.$message({
+ type: 'error',
+ message: this.$t('prompt.fspsb')
+ })
+ } else {
+ this.$message({
+ type: 'success',
+ message: this.$t('prompt.fspcg')
+ })
+ }
+ this.getlist()
+ } else {
+ this.$notify.error({
+ title: 'wrong',
+ message: res.data.msg,
+ offset: 100
+ })
+ }
+ })
+ })
+ },
+ // 判断反审批按钮
+ isReview4(row) {
+ // console.log(row)
+ if (row.judgeStat === 2 && row.receiptStat !== 3) {
+ return true
+ }
+ },
numFormat(num) {
var res = num.toString().replace(/\d+/, function(n) { // 先提取整数部分
return n.replace(/(\d)(?=(\d{3})+$)/g, function($1) {
diff --git a/src/views/AdvancePay/components/DetailList.vue b/src/views/AdvancePay/components/DetailList.vue
index b1b51808..190513b0 100644
--- a/src/views/AdvancePay/components/DetailList.vue
+++ b/src/views/AdvancePay/components/DetailList.vue
@@ -46,6 +46,12 @@
{{ personalForm.payAccount }}
+
+
+
+ {{ personalForm.bankName }}
+
+
{{ personalForm.ratioRate }}
@@ -102,6 +108,15 @@
{{ scope.row.stat | statfilter }}
+
+
+ {{ scope.row.allName }}
+
+
@@ -240,12 +255,12 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.stockArrivalDetailVos
this.reviewList = []
- const review = this.personalForm.approvalUseVos
- for (const i in review) {
- if (review[i].actualStepHandler !== null) {
- this.reviewList.push(review[i])
- }
- }
+ this.reviewList = this.personalForm.approvalUseVos
+ // for (const i in review) {
+ // if (review[i].actualStepHandler !== null) {
+ // this.reviewList.push(review[i])
+ // }
+ // }
}
},
beforeCreate() {
diff --git a/src/views/AdvancePay/components/MyDialog.vue b/src/views/AdvancePay/components/MyDialog.vue
index 5a039df7..d13a4e6d 100644
--- a/src/views/AdvancePay/components/MyDialog.vue
+++ b/src/views/AdvancePay/components/MyDialog.vue
@@ -70,6 +70,12 @@
+
+
+
+
+
+
{{ scope.row.name }}
@@ -227,6 +224,56 @@ export default {
_that = this
},
methods: {
+ formatJson(filterVal, jsonData) {
+ return jsonData.map(v => filterVal.map(j => {
+ return v[j]
+ }))
+ },
+ // 导出
+ handleExport() {
+ this.downloadLoading = true
+
+ if (this.getemplist.type === '1') {
+ import('@/vendor/Export2Excel').then(excel => {
+ const tHeader = ['供应商名称', '订货数量', '订货金额', '订货税额', '合计', '已到货数量', '未到货数量']
+ const filterVal = ['name', 'orderQuantity', 'totalMoney', 'taxMoney', 'heji', 'arrivedQuantity', 'notArrivedQuantity']
+ const data = this.formatJson(filterVal, this.list)
+ excel.export_json_to_excel({
+ header: tHeader,
+ data,
+ filename: '采购订单汇总表'
+ })
+ this.downloadLoading = false
+ })
+ }
+ if (this.getemplist.type === '2') {
+ import('@/vendor/Export2Excel').then(excel => {
+ const tHeader = ['经办人名称', '订货数量', '订货金额', '订货税额', '合计', '已到货数量', '未到货数量']
+ const filterVal = ['name', 'orderQuantity', 'totalMoney', 'taxMoney', 'heji', 'arrivedQuantity', 'notArrivedQuantity']
+ const data = this.formatJson(filterVal, this.list)
+ excel.export_json_to_excel({
+ header: tHeader,
+ data,
+ filename: '采购订单汇总表'
+ })
+ this.downloadLoading = false
+ })
+ }
+ if (this.getemplist.type === '4') {
+ import('@/vendor/Export2Excel').then(excel => {
+ const tHeader = ['种类名称', '订货数量', '订货金额', '订货税额', '合计', '已到货数量', '未到货数量']
+ const filterVal = ['name', 'orderQuantity', 'totalMoney', 'taxMoney', 'heji', 'arrivedQuantity', 'notArrivedQuantity']
+ const data = this.formatJson(filterVal, this.list)
+ excel.export_json_to_excel({
+ header: tHeader,
+ data,
+ filename: '采购订单汇总表'
+ })
+ this.downloadLoading = false
+ })
+ }
+ },
+
clickRow(val) {
if (val.judgeStat === 0) {
this.$refs.table.toggleRowSelection(val)
@@ -239,9 +286,6 @@ export default {
if (this.getemplist.type === '2') {
this.first = '经办人名称'
}
- if (this.getemplist.type === '3') {
- this.first = '品牌名称'
- }
if (this.getemplist.type === '4') {
this.first = '种类名称'
}
@@ -381,12 +425,13 @@ export default {
},
// 详情操作
handleDetail(row) {
- console.log(row)
- const query_params = {
- id: row.id,
- name: row.name
- }
- this.$router.push({ path: '/StockOrder/StockOrderList', query: { arry: query_params }})
+ console.log('row========>', row)
+ // console.log(row)
+ // const query_params = {
+ // id: row.id,
+ // name: row.name
+ // }
+ // this.$router.push({ path: '/StockOrder/StockOrderList', query: { arry: query_params }})
},
// 判断审核按钮
isReview(row) {
diff --git a/src/views/StockOrder/AddStockOrder.vue b/src/views/StockOrder/AddStockOrder.vue
index 1c19ce77..d4a06dcb 100644
--- a/src/views/StockOrder/AddStockOrder.vue
+++ b/src/views/StockOrder/AddStockOrder.vue
@@ -591,11 +591,11 @@ export default {
num5 += Number(this.list2[i].discountMoney)
}
this.allNumber = num1
- this.allMoney = num2
- this.allTaxMoney = num3
- this.allIncludeTaxMoney = num4
- this.allDiscountMoney = num5
- this.allMoneyMoveDiscount = num4 - num5
+ this.allMoney = (num2).toFixed(2)
+ this.allTaxMoney = (num3).toFixed(2)
+ this.allIncludeTaxMoney = (num4).toFixed(2)
+ this.allDiscountMoney = (num5).toFixed(2)
+ this.allMoneyMoveDiscount = (Number(num4) - Number(num5)).toFixed(2)
},
deep: true
}
@@ -959,10 +959,10 @@ export default {
sums[18] = ''
sums[19] = ''
this.allNumber = sums[7]
- this.allMoney = sums[13]
- this.allTaxMoney = sums[15]
- this.allIncludeTaxMoney = sums[14]
- this.allDiscountMoney = sums[17]
+ this.allMoney = (sums[13]).toFixed(2)
+ this.allTaxMoney = (sums[15]).toFixed(2)
+ this.allIncludeTaxMoney = (sums[14]).toFixed(2)
+ this.allDiscountMoney = (sums[17]).toFixed(2)
this.allMoneyMoveDiscount = (sums[14] - sums[17]).toFixed(6)
return sums
},
@@ -1052,7 +1052,7 @@ export default {
// 计算税额
getTaxMoney2(row) {
if (row.stockQuantity !== 0) {
- row.tax = (row.price * row.taxRate / 100 * row.stockQuantity).toFixed(6)
+ row.tax = (row.price * row.taxRate / 100 * row.stockQuantity).toFixed(2)
} else {
row.tax = 0
}
@@ -1061,7 +1061,7 @@ export default {
// 计算含税金额
getTaxMoney(row) {
row.includeTaxMoney = (row.stockQuantity * row.includeTaxPrice).toFixed(6)
- row.discountMoney = (row.includeTaxPrice * row.stockQuantity * (row.discountRate / 100)).toFixed(6)
+ row.discountMoney = (row.includeTaxPrice * row.stockQuantity * (row.discountRate / 100)).toFixed(2)
return row.includeTaxMoney
},
// 计算金额
diff --git a/src/views/StockOrder/StockOrderList.vue b/src/views/StockOrder/StockOrderList.vue
index 88a0c4ee..44d97222 100644
--- a/src/views/StockOrder/StockOrderList.vue
+++ b/src/views/StockOrder/StockOrderList.vue
@@ -423,71 +423,24 @@ export default {
}
},
activated() {
- console.log('$route.query', this.$route.query)
- try {
- if (this.$route.query) {
- if (this.$route.query.arry.id === 784836221) {
- this.getemplist.orderNumber = this.$route.query.arry.name
- } else {
- this.getemplist.supplierId = this.$route.query.arry.id
- this.supplierId = this.$route.query.arry.name
- }
-
- this.getlist()
- }
- } catch (err) {
- this.getlist()
+ console.log('this.$store.getters.empcontract', this.$store.getters.empcontract)
+ if (this.$store.getters.empcontract.supplierId) {
+ this.getemplist.supplierId = this.$store.getters.empcontract.supplierId
+ this.getemplist.beginTime = this.$store.getters.empcontract.beginTime
+ this.getemplist.endTime = this.$store.getters.empcontract.endTime
}
-
- this.getinformation()
- this.countquery = this.$store.getters.empcontract
- if (this.countquery) {
- console.log('this.countquery====', this.countquery)
- this.getemplist.supplierId = this.countquery.id
- this.supplierId = this.countquery.name
- if (this.countquery.beginTime !== '') {
- this.getemplist.beginTime = this.countquery.beginTime
- }
- if (this.countquery.beginTime !== '') {
- this.getemplist.endTime = this.countquery.endTime
- }
- this.getlist()
- } else {
- this.getlist()
- }
-
+ this.getlist()
setTimeout(() => {
this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 140
}, 100)
},
+ deactivated() {
+ this.getemplist.supplierId = ''
+ this.getemplist.beginTime = ''
+ this.getemplist.endTime = ''
+ this.$store.dispatch('getempcontract', '')
+ },
mounted() {
- console.log('$route.query', this.$route.query)
- if (this.$route.query) {
- if (this.$route.query.arry.id === 784836221) {
- this.getemplist.orderNumber = this.$route.query.arry.name
- } else {
- this.getemplist.supplierId = this.$route.query.arry.id
- this.supplierId = this.$route.query.arry.name
- }
-
- this.getlist()
- }
- this.countquery = this.$store.getters.empcontract
- if (this.countquery) {
- console.log('this.countquery====', this.countquery)
- this.getemplist.supplierId = this.countquery.id
- this.supplierId = this.countquery.name
- if (this.countquery.beginTime !== '') {
- this.getemplist.beginTime = this.countquery.beginTime
- }
- if (this.countquery.beginTime !== '') {
- this.getemplist.endTime = this.countquery.endTime
- }
- this.getlist()
- } else {
- this.getlist()
- }
- // this.getlist()
setTimeout(() => {
this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 140
}, 100)
@@ -759,17 +712,13 @@ export default {
this.listLoading = true
stockorderlist(this.getemplist).then(res => {
if (res.data.ret === 200) {
- console.log('res.data.data.content.list', res.data.data.content.list)
if (res.data.data.content.list !== '' && res.data.data.content.list !== undefined && res.data.data.content.list !== null) {
for (let i = 0; i < res.data.data.content.list.length; i++) {
- console.log('res.data.data.content.list[i].stockOrderDetailVos', res.data.data.content.list[i].stockOrderDetailVos)
const list2 = res.data.data.content.list[i].stockOrderDetailVos
- console.log('list2', list2)
if (list2 !== '' && list2 !== undefined && list2 !== null) {
for (let j = 0; j < list2.length; j++) {
list2[j].taxRate = list2[j].taxRate * 100
list2[j].discountRate = list2[j].discountRate * 100
- console.log('list2[j].taxRate', list2[j].taxRate)
}
}
}
@@ -840,7 +789,6 @@ export default {
}
this.list = process
this.getSpanArr(this.list)
- console.log('this.list==================', this.list)
this.total = res.data.data.content.totalCount
}
setTimeout(() => {
diff --git a/src/views/StockOrder/components/MyDetail.vue b/src/views/StockOrder/components/MyDetail.vue
index 682e46cc..f428fa68 100644
--- a/src/views/StockOrder/components/MyDetail.vue
+++ b/src/views/StockOrder/components/MyDetail.vue
@@ -320,7 +320,8 @@ export default {
returnQuantity: 0,
actualArrivalQuantity: 0,
discountRate: 0,
- taxRate: 0
+ taxRate: 0,
+ flag: false
}
})
console.log(productDetail)
diff --git a/src/views/StockOrder/components/MyDialog.vue b/src/views/StockOrder/components/MyDialog.vue
index e1d934ca..cadb2772 100644
--- a/src/views/StockOrder/components/MyDialog.vue
+++ b/src/views/StockOrder/components/MyDialog.vue
@@ -167,7 +167,9 @@
:data.sync="list2"
:edit-config="{ showIcon: true, showStatus: true}"
:edit-rules="validRules"
+ :summary-method="getSummaries"
class="click-table1"
+ show-summary
stripe
border
size="small"
@@ -280,32 +282,32 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -541,6 +543,9 @@ export default {
this.personalForm.id = this.personalForm.parentId
this.list2 = this.personalForm.stockOrderDetailVos
this.changeRate()
+ },
+ list2() {
+ console.log('this.list2', this.list2)
}
},
created() {
@@ -663,25 +668,25 @@ export default {
sums[index] = ''
}
})
- sums[2] = ''
- sums[3] = ''
- sums[4] = ''
- sums[5] = ''
- sums[7] = ''
- sums[8] = ''
+ // sums[2] = ''
+ // sums[3] = ''
+ // sums[4] = ''
+ // sums[5] = ''
+ // sums[7] = ''
+ // sums[8] = ''
sums[9] = ''
- sums[13] = ''
- sums[14] = ''
- sums[16] = ''
- sums[17] = ''
- sums[18] = ''
- sums[19] = ''
- this.allNumber = sums[6]
- this.allMoney = sums[10]
- this.allTaxMoney = sums[12]
- this.allIncludeTaxMoney = sums[11]
- this.allDiscountMoney = sums[15]
- this.allMoneyMoveDiscount = sums[11] - sums[15]
+ // sums[13] = ''
+ // sums[14] = ''
+ // sums[16] = ''
+ // sums[17] = ''
+ // sums[18] = ''
+ // sums[19] = ''
+ this.allNumber = Number(sums[7])
+ this.allMoney = Number(sums[13]).toFixed(2)
+ this.allTaxMoney = Number(sums[15]).toFixed(2)
+ this.allIncludeTaxMoney = Number(sums[14]).toFixed(2)
+ this.allDiscountMoney = Number(sums[17]).toFixed(2)
+ this.allMoneyMoveDiscount = (Number(sums[14]) - Number(sums[17])).toFixed(2)
return sums
},
getways() {
@@ -1178,7 +1183,7 @@ export default {
return false
}
}
- this.$refs.editable.insert(val[i])
+ this.$refs.editable.insertAt(val[i], -1)
}
},
// 清空记录
diff --git a/src/views/StockQuery/StockCount.vue b/src/views/StockQuery/StockCount.vue
index 579df048..a3c5a5a1 100644
--- a/src/views/StockQuery/StockCount.vue
+++ b/src/views/StockQuery/StockCount.vue
@@ -14,7 +14,6 @@
style="width: 230px;"
start-placeholder="Start"
end-placeholder="End"
- value-format="yyyy-MM-dd"
/>
{{ $t('public.search') }}
diff --git a/src/views/StockRetreat/components/MyArrival.vue b/src/views/StockRetreat/components/MyArrival.vue
index 9f82e7f6..212e24e6 100644
--- a/src/views/StockRetreat/components/MyArrival.vue
+++ b/src/views/StockRetreat/components/MyArrival.vue
@@ -439,7 +439,7 @@ export default {
}
})
for (let i = 0; i < arrivalDetail.length; i++) {
- if (arrivalDetail[i].unqualifyQuantity === 0) {
+ if (arrivalDetail[i].unqualifyQuantity === 0 || arrivalDetail[i].returnQuantity !== 0) {
arrivalDetail.splice(i, 1)
i--
}
diff --git a/src/views/Supplier/NewSupplier.vue b/src/views/Supplier/NewSupplier.vue
index 9083b7e1..6d058f85 100644
--- a/src/views/Supplier/NewSupplier.vue
+++ b/src/views/Supplier/NewSupplier.vue
@@ -240,13 +240,13 @@
border
size="small"
style="width: 100%">
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/views/Supplier/components/DetailList.vue b/src/views/Supplier/components/DetailList.vue
index ac0b36ab..0192007e 100644
--- a/src/views/Supplier/components/DetailList.vue
+++ b/src/views/Supplier/components/DetailList.vue
@@ -724,12 +724,13 @@ export default {
watch: {
detailcontrol() {
this.editVisible = this.detailcontrol
+ this.getemplist.pageSize = 10
},
detaildata() {
this.personalForm = this.detaildata
this.list2 = this.personalForm.supplierDetailVos
this.showlist = this.list2.slice(0, 10)
- this.total4 = this.personalForm.supplierDetailVos.length
+ this.total = this.personalForm.supplierDetailVos.length
this.tableData6 = this.personalForm.supplierPunishments
},
detailid() {
diff --git a/src/views/Supplier/components/MyDialog.vue b/src/views/Supplier/components/MyDialog.vue
index a58d5bd7..ab857ba1 100644
--- a/src/views/Supplier/components/MyDialog.vue
+++ b/src/views/Supplier/components/MyDialog.vue
@@ -220,13 +220,13 @@
size="small"
height="600px"
style="width: 100%">
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/views/SupplierAdjust/AddSupplierAdjust.vue b/src/views/SupplierAdjust/AddSupplierAdjust.vue
index 795a04eb..a08ba853 100644
--- a/src/views/SupplierAdjust/AddSupplierAdjust.vue
+++ b/src/views/SupplierAdjust/AddSupplierAdjust.vue
@@ -374,7 +374,7 @@ export default {
// }
// }
// }
- if (row.newTaxRate && row.newIncludeTaxPrice) {
+ if (row.newTaxRate !== null && row.newTaxRate !== '' && row.newTaxRate !== undefined && row.newIncludeTaxPrice) {
row.newPrice = row.newIncludeTaxPrice / (1 + row.newTaxRate / 100)
}
if (row.proportion && row.newIncludeTaxPrice) {
diff --git a/src/views/SupplierAdjust/components/DetailList.vue b/src/views/SupplierAdjust/components/DetailList.vue
index eba5322d..4363b8ad 100644
--- a/src/views/SupplierAdjust/components/DetailList.vue
+++ b/src/views/SupplierAdjust/components/DetailList.vue
@@ -76,6 +76,7 @@
v-show="total > 0"
:total="total"
:page.sync="getemplist.pageNum"
+ :page-sizes.sync="pageArr"
:limit.sync="getemplist.pageSize"
@pagination="getlist"
/>
@@ -259,7 +260,8 @@ export default {
// 弹窗组件的控制
editVisible: this.detailcontrol,
// 供应商信息数据
- personalForm: this.detaildata
+ personalForm: this.detaildata,
+ pageArr: [10]
}
},
watch: {
@@ -269,7 +271,13 @@ export default {
window.addEventListener('afterprint', () => {
console.log('打印完成==========')
}, true)
+ this.getemplist.pageSize = 10
}
+ const parms = {
+ page: 1,
+ limit: 50
+ }
+ this.getlist(parms)
},
detaildata() {
this.personalForm = this.detaildata
diff --git a/src/views/SupplierAdjust/components/MyDialog.vue b/src/views/SupplierAdjust/components/MyDialog.vue
index e05ec9b0..49a70020 100644
--- a/src/views/SupplierAdjust/components/MyDialog.vue
+++ b/src/views/SupplierAdjust/components/MyDialog.vue
@@ -439,7 +439,7 @@ export default {
// }
// }
this.updateList()
- if (row.newTaxRate && row.newIncludeTaxPrice) {
+ if (row.newTaxRate !== null && row.newTaxRate !== '' && row.newTaxRate !== undefined && row.newIncludeTaxPrice) {
row.newPrice = row.newIncludeTaxPrice / (1 + row.newTaxRate / 100)
}
if (row.proportion && row.newIncludeTaxPrice) {
@@ -457,6 +457,7 @@ export default {
// }
// }
// }
+ console.log('scopegetprice', scope)
if (row.newTaxRate && row.newPrice) {
row.newIncludeTaxPrice = (row.newPrice * (1 + row.newTaxRate / 100))
}