|
|
@@ -44,6 +44,7 @@
|
|
|
>
|
|
|
<el-form :model="form">
|
|
|
<el-form-item label="未付金额（元）" :label-width="formLabelWidth">
|
|
|
+ <el-input v-model="allmoney" autocomplete="off" class="deal"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="本次付款金额（元）" :label-width="formLabelWidth">
|
|
|
<el-input
|
|
|
@@ -71,12 +72,15 @@
|
|
|
<el-upload
|
|
|
action="https://www.zthymaoyi.com/upload/admin"
|
|
|
list-type="picture-card"
|
|
|
- :on-preview="handlePictureCardPreview"
|
|
|
+ :on-success="handlePictureCardPreview"
|
|
|
:on-remove="handleRemove"
|
|
|
class="photo2"
|
|
|
>
|
|
|
<i class="el-icon-plus"></i>
|
|
|
</el-upload>
|
|
|
+ <el-dialog :visible.sync="dialogVisible">
|
|
|
+ <img width="100%" :src="paymentScreenshot" alt="">
|
|
|
+ </el-dialog>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
@@ -93,7 +97,7 @@
|
|
|
>
|
|
|
<el-form :model="form">
|
|
|
<el-form-item label="未收金额（元）" :label-width="formLabelWidth">
|
|
|
- <el-input v-model="form.region" autocomplete="off" class="deal"></el-input>
|
|
|
+ <el-input v-model="allmoney1" autocomplete="off" class="deal"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="本次收款金额（元）" :label-width="formLabelWidth">
|
|
|
<el-input
|
|
|
@@ -121,12 +125,15 @@
|
|
|
<el-upload
|
|
|
action="https://www.zthymaoyi.com/upload/admin"
|
|
|
list-type="picture-card"
|
|
|
- :on-preview="handlePictureCardPreview"
|
|
|
+ :on-success="handlePictureCardPreview1"
|
|
|
:on-remove="handleRemove"
|
|
|
class="photo2"
|
|
|
>
|
|
|
<i class="el-icon-plus"></i>
|
|
|
</el-upload>
|
|
|
+ <el-dialog :visible.sync="dialogVisible">
|
|
|
+ <img width="100%" :src="collectionScreenshot" alt="">
|
|
|
+ </el-dialog>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
@@ -205,18 +212,16 @@ export default {
|
|
|
|
|
|
data() {
|
|
|
return {
|
|
|
- checked: true,
|
|
|
dialogFormVisible1: false,
|
|
|
dialogFormVisible2: false,
|
|
|
dialogVisible: false,
|
|
|
-
|
|
|
+ showViewer: false,
|
|
|
form: {
|
|
|
transactionPrice: '',
|
|
|
transactionsNumber: '',
|
|
|
submissionDate: ''
|
|
|
},
|
|
|
formLabelWidth: '120px',
|
|
|
-
|
|
|
barWidth: 0,
|
|
|
barHeight: 0,
|
|
|
retioX: 1,
|
|
|
@@ -224,6 +229,8 @@ export default {
|
|
|
money:0,
|
|
|
collectmoney:0,
|
|
|
collectionDate:'',
|
|
|
+ paymentScreenshot: '',
|
|
|
+ collectionScreenshot:'',
|
|
|
paymentDate:'',
|
|
|
isTaped: false,
|
|
|
isHover: false,
|
|
|
@@ -241,6 +248,8 @@ export default {
|
|
|
// 年
|
|
|
year: '',
|
|
|
pickerOptions: {},
|
|
|
+ allmoney:0,
|
|
|
+ allmoney1:0,
|
|
|
value2: '',
|
|
|
deptBudgetTotal: 0,
|
|
|
currentPage: 1,
|
|
|
@@ -261,13 +270,11 @@ export default {
|
|
|
contractNoList:[],
|
|
|
modification:[],
|
|
|
contractNo: '',
|
|
|
- inOutTaskNo: '',
|
|
|
compId: sessionStorage.getItem('ws-pf_compId'),
|
|
|
deptCircularPage: {},
|
|
|
warehouseList: [],
|
|
|
deptBudgetList: {},
|
|
|
pcFlag: 1,
|
|
|
- historyList: [],
|
|
|
pickerBeginDateBefore: {
|
|
|
disabledDate: time => {
|
|
|
return time.getTime() > Date.now()
|
|
|
@@ -282,11 +289,6 @@ export default {
|
|
|
this.showType = this.isShow
|
|
|
},
|
|
|
methods: {
|
|
|
- updated() {
|
|
|
- this.$nextTick(() => {
|
|
|
- this.$refs.warehouseList.doLayout()
|
|
|
- })
|
|
|
- },
|
|
|
contractchange(e){
|
|
|
this.contractNo=e
|
|
|
this.getList()
|
|
|
@@ -301,6 +303,9 @@ export default {
|
|
|
}
|
|
|
else{
|
|
|
this.dialogFormVisible1=true
|
|
|
+ for(var i=0;i<this.modification.length;i++){
|
|
|
+ this.allmoney+=this.modification[i].amountNotPayable
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
handlecollect(){
|
|
|
@@ -309,6 +314,9 @@ export default {
|
|
|
}
|
|
|
else{
|
|
|
this.dialogFormVisible2=true
|
|
|
+ for(var i=0;i<this.modification.length;i++){
|
|
|
+ this.allmoney1+=this.modification[i].collectionNotPayable
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
//统计审核
|
|
|
@@ -359,7 +367,7 @@ export default {
|
|
|
columns.forEach((column, index) => {
|
|
|
if (index === 0) {
|
|
|
sums[index] = '合计'
|
|
|
- } else if (index === 5 || index === 7 || index === 8 || index === 9) {
|
|
|
+ } else if (index === 4 || index === 10 || index === 8 || index === 9|| index === 12 || index === 13 || index === 14 ) {
|
|
|
const values = data.map(item => Number(item[column.property]))
|
|
|
if (!values.every(value => isNaN(value))) {
|
|
|
sums[index] = values.reduce((prev, curr) => {
|
|
|
@@ -386,7 +394,7 @@ export default {
|
|
|
confirmButtonText: '确定',
|
|
|
type: 'warning'
|
|
|
}).then(() => {
|
|
|
- closepaymoney({purchaseClosingReportList:this.modification,money:this.money,paymentDate:this.paymentDate}).toPromise()
|
|
|
+ closepaymoney({purchaseClosingReportList:this.modification,money:this.money,paymentDate:this.paymentDate,paymentScreenshot:this.paymentScreenshot}).toPromise()
|
|
|
.then(response => {
|
|
|
this.$message.success('付款成功')
|
|
|
this.dialogFormVisible1=false
|
|
|
@@ -401,7 +409,7 @@ export default {
|
|
|
confirmButtonText: '确定',
|
|
|
type: 'warning'
|
|
|
}).then(() => {
|
|
|
- closecollmoney({purchaseClosingReportList:this.modification,money:this.collectmoney,collectionDate:this.collectionDate}).toPromise()
|
|
|
+ closecollmoney({purchaseClosingReportList:this.modification,money:this.collectmoney,collectionDate:this.collectionDate,collectionScreenshot:this.collectionScreenshot}).toPromise()
|
|
|
.then(response => {
|
|
|
this.$message.success('收款成功')
|
|
|
this.dialogFormVisible2=false
|
|
|
@@ -446,8 +454,10 @@ export default {
|
|
|
console.log(file)
|
|
|
},
|
|
|
handlePictureCardPreview(file) {
|
|
|
- this.dialogImageUrl = file.url
|
|
|
- this.dialogVisible = true
|
|
|
+ this.paymentScreenshot = file.url
|
|
|
+ },
|
|
|
+ handlePictureCardPreview1(file) {
|
|
|
+ this.collectionScreenshot = file.url
|
|
|
},
|
|
|
handleDownload(file) {
|
|
|
console.log(file)
|
|
|
@@ -545,9 +555,6 @@ export default {
|
|
|
}
|
|
|
return fmt
|
|
|
},
|
|
|
- handleClose() {
|
|
|
- this.accessoryTFs = false
|
|
|
- },
|
|
|
handleSizeChange(val) {
|
|
|
console.log(`每页 ${val} 条`)
|
|
|
this.pageSize = val
|
|
|
@@ -589,44 +596,10 @@ export default {
|
|
|
return false
|
|
|
})
|
|
|
},
|
|
|
- selecttaskType(e) {
|
|
|
- for (var i = 0; i < this.taskTypeList.length; i++) {
|
|
|
- if (this.taskTypeList[i].value == e) {
|
|
|
- this.searchType = this.taskTypeList[i].type
|
|
|
- }
|
|
|
- }
|
|
|
- },
|
|
|
- // fujian(row) {
|
|
|
- // if (
|
|
|
- // row.receiveAttachmentPath === null ||
|
|
|
- // row.receiveAttachmentPath === ''
|
|
|
- // ) {
|
|
|
- // EventBus.$emit(
|
|
|
- // 'warning',
|
|
|
- // this.$t('system.noticeCircular.NoInformation')
|
|
|
- // )
|
|
|
- // } else {
|
|
|
- // this.accessoryTFs = true
|
|
|
- // }
|
|
|
- // this.appendixIdss = row.receiveAttachmentPath
|
|
|
- // },
|
|
|
- handleExamine(row) {
|
|
|
- this.$router.push({
|
|
|
- name: 'salesContractExamine',
|
|
|
- query: { id: row.id }
|
|
|
- })
|
|
|
- },
|
|
|
// 关闭 dialog时 处理文件url 初始化upload组件
|
|
|
handleCloe() {
|
|
|
this.dialogViewSpareMoney = false
|
|
|
},
|
|
|
- history(row) {
|
|
|
- billoperatehis({ id: row.id })
|
|
|
- .toPromise()
|
|
|
- .then(response => {
|
|
|
- this.historyList = response
|
|
|
- })
|
|
|
- },
|
|
|
//查找
|
|
|
find() {
|
|
|
this.currentPage = 1
|
mxx