|
@@ -1060,45 +1060,52 @@
|
|
// })
|
|
// })
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- let _url1 = process.env.VUE_APP_BASE_API + '/identityAuthenticationInfo/api/getIdentityAuthenticationInfo'
|
|
|
|
- let _url2 = process.env.VUE_APP_BASE_API + '/paymentManagement/getInfo'
|
|
|
|
- this.$axios.all([
|
|
|
|
- this.$axios.get(_url1, {
|
|
|
|
- params: {
|
|
|
|
- id: this.rowData.identityId,
|
|
|
|
- authenticationStatusKey: 7,
|
|
|
|
- }
|
|
|
|
- }).then(res => res.data),
|
|
|
|
- this.$axios.get(_url2, {
|
|
|
|
- params: {
|
|
|
|
- id: this.rowData.id
|
|
|
|
- }
|
|
|
|
- }).then(res => res.data)
|
|
|
|
- ]).then(
|
|
|
|
- this.$axios.spread((val1, val2) => {
|
|
|
|
- // val 是数组中每个接口返回的值 res.data
|
|
|
|
- console.log('两个接口全部加载完成', val1, val2);
|
|
|
|
- this.printData = val2.data
|
|
|
|
- console.log(this.printData)
|
|
|
|
- if (val2.data.compName == '黑龙江秋收有限公司') {
|
|
|
|
- this.printData.compName = '黑龙江中天昊元贸易有限公司'
|
|
|
|
- }
|
|
|
|
- this.isShowPrint = true
|
|
|
|
- // if(this.printData.solidGrainPrice){
|
|
|
|
- // this.printData.solidGrainPrice = (this.printData.tidalGrainPrice * this.printData.netWeight)/this.printData.pureWeight
|
|
|
|
- // }
|
|
|
|
- let date = new Date()
|
|
|
|
- this.printData.currentTime =
|
|
|
|
- date.getFullYear() +
|
|
|
|
- '年' +
|
|
|
|
- Number(date.getMonth() + 1) +
|
|
|
|
- '月' +
|
|
|
|
- date.getDate() +
|
|
|
|
- '日'
|
|
|
|
- })
|
|
|
|
- ).catch(err => {
|
|
|
|
- console.log(err);
|
|
|
|
- })
|
|
|
|
|
|
+ await getpaymentexamine({
|
|
|
|
+ id: this.rowData.id,
|
|
|
|
+ })
|
|
|
|
+ .toPromise()
|
|
|
|
+ .then((response) => {
|
|
|
|
+ this.printData = response
|
|
|
|
+ console.log(this.printData)
|
|
|
|
+ if (response.compName == '黑龙江秋收有限公司') {
|
|
|
|
+ this.printData.compName = '黑龙江中天昊元贸易有限公司'
|
|
|
|
+ }
|
|
|
|
+ this.isShowPrint = true
|
|
|
|
+ // if(this.printData.solidGrainPrice){
|
|
|
|
+ // this.printData.solidGrainPrice = (this.printData.tidalGrainPrice * this.printData.netWeight)/this.printData.pureWeight
|
|
|
|
+ // }
|
|
|
|
+ let date = new Date()
|
|
|
|
+ this.printData.currentTime =
|
|
|
|
+ date.getFullYear() +
|
|
|
|
+ '年' +
|
|
|
|
+ Number(date.getMonth() + 1) +
|
|
|
|
+ '月' +
|
|
|
|
+ date.getDate() +
|
|
|
|
+ '日'
|
|
|
|
+ })
|
|
|
|
+ // let _url1 = process.env.VUE_APP_BASE_API + '/identityAuthenticationInfo/api/getIdentityAuthenticationInfo'
|
|
|
|
+ // let _url2 = process.env.VUE_APP_BASE_API + '/paymentManagement/getInfo'
|
|
|
|
+ // this.$axios.all([
|
|
|
|
+ // this.$axios.get(_url1, {
|
|
|
|
+ // params: {
|
|
|
|
+ // id: this.rowData.identityId,
|
|
|
|
+ // authenticationStatusKey: 7,
|
|
|
|
+ // }
|
|
|
|
+ // }).then(res => res.data),
|
|
|
|
+ // this.$axios.get(_url2, {
|
|
|
|
+ // params: {
|
|
|
|
+ // id: this.rowData.id
|
|
|
|
+ // }
|
|
|
|
+ // }).then(res => res.data)
|
|
|
|
+ // ]).then(
|
|
|
|
+ // this.$axios.spread((val1, val2) => {
|
|
|
|
+ // // val 是数组中每个接口返回的值 res.data
|
|
|
|
+ // console.log('两个接口全部加载完成', val1, val2);
|
|
|
|
+
|
|
|
|
+ // })
|
|
|
|
+ // ).catch(err => {
|
|
|
|
+ // console.log(err);
|
|
|
|
+ // })
|
|
// getCustomerLook({
|
|
// getCustomerLook({
|
|
// id: this.rowData.identityId,
|
|
// id: this.rowData.identityId,
|
|
// authenticationStatusKey: 7,
|
|
// authenticationStatusKey: 7,
|