apply-clients 3.0.5-6 → 3.0.5-8

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.0.5-6",
3
+ "version": "3.0.5-8",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -33,7 +33,8 @@
33
33
  "lib-flexible": "^0.3.2",
34
34
  "px2rem-loader": "^0.1.9",
35
35
  "vue": "^1.0.17",
36
- "vue-bubble": "^1.0.3"
36
+ "vue-bubble": "^1.0.3",
37
+ "jsencrypt": "3.0.0-rc.1"
37
38
  },
38
39
  "devDependencies": {
39
40
  "babel-core": "^6.0.0",
@@ -89,10 +90,10 @@
89
90
  "sinon-chai": "^2.8.0",
90
91
  "style": "0.0.3",
91
92
  "style-loader": "^0.20.3",
92
- "system-clients": "^1.6.16",
93
+ "system-clients": "1.6.38-siyang",
93
94
  "system-phone": "1.1.18",
94
95
  "url-loader": "^0.5.7",
95
- "vue-client": "1.21.48",
96
+ "vue-client": "1.21.50-siyang",
96
97
  "vue-hot-reload-api": "^1.2.0",
97
98
  "vue-html-loader": "^1.0.0",
98
99
  "vue-loader": "^8.2.1",
@@ -1709,7 +1709,7 @@
1709
1709
  //所有选择框/输入框遍历
1710
1710
  for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
1711
1711
  //任何是否的选择框只要是否都不能提交
1712
- if (this.selectdata.defname != '客户申请') {
1712
+ /*if (this.selectdata.defname != '客户申请') {
1713
1713
  if (this.$refs.service_show.data.fields[i].value === '否') {
1714
1714
  this.$refs.service_show.disable_button = false
1715
1715
  console.log(this.$refs.service_show.data)
@@ -1719,7 +1719,7 @@
1719
1719
  }else {
1720
1720
  this.$refs.service_show.data.buttons[1].button_name = '提交'
1721
1721
  }
1722
- }
1722
+ }*/
1723
1723
  //时间到期提醒
1724
1724
  if (this.$refs.service_show.data.fields[i].label.includes("时间") || this.$refs.service_show.data.fields[i].label.includes("工期")) {
1725
1725
  let setTime = this.$refs.service_show.data.fields[i].value
@@ -2401,7 +2401,7 @@
2401
2401
  if(model.button.button_name === '提交' && this.$refs.service_show.data.defname === '客户申请' && this.$refs.service_show.model.f_cell_type === '新小区' ){
2402
2402
  model.button.button_name ='跳过'
2403
2403
  }
2404
- if(model.button.button_name === '提交' && this.$refs.service_show.data.defname === '下发开工通知(财务部)' && this.$refs.service_show.model.f_pay_flag === '已缴费' ){
2404
+ if(model.button.button_name === '提交' && (this.$refs.service_show.data.defname === '费用缴纳' || this.$refs.service_show.data.defname === '费用确认' ) && this.$refs.service_show.model.f_pay_flag === '否' ){
2405
2405
  model.button.button_name ='跳过'
2406
2406
  }
2407
2407
  console.log('本次点击button执行的操作是=>' + operate)