apply-clients 3.5.4-71 → 3.5.4-73

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.5.4-71",
3
+ "version": "3.5.4-73",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -220,7 +220,7 @@ export default {
220
220
  }
221
221
  this.button_state = true
222
222
  try {
223
- if (this.payType.indexOf('现金') != -1) {
223
+ if (this.payType.indexOf('现金') != -1 || this.payType.indexOf('扫码支付') != -1) {
224
224
  await this.saveUserFile('save')
225
225
  } else {
226
226
  await this.openQrCode()
@@ -608,6 +608,8 @@ export default {
608
608
  },
609
609
  async saveUserFile(type) {
610
610
  for (let i = 0; i < this.material.length; i++) {
611
+ this.material[i].f_material_name=this.material[i].f_material_name.name
612
+ this.material[i].f_typenumber=this.material[i].f_typenumber.name
611
613
  this.material[i].f_process_id = this.selectdata.f_process_id
612
614
  this.material[i].f_department = Vue.user.f_department_name
613
615
  this.material[i].f_fee = this.material[i].f_material_price * this.material[i].f_material_number