sale-client 3.6.498 → 3.6.499

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": "sale-client",
3
- "version": "3.6.498",
3
+ "version": "3.6.499",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -25,6 +25,7 @@
25
25
  return {
26
26
  url: '',
27
27
  imgstr: '',
28
+ imgurl: '',
28
29
  scheduleData: '',
29
30
  showclase: false,
30
31
  showbuy: false
@@ -43,17 +44,25 @@
43
44
  this.show = false
44
45
  },
45
46
  getUserInfo () {
46
- jsign.jsign_set_string('singurl', encodeURI(this.url))
47
+ jsign.jsign_set_string('singurl', encodeURI(this.imgurl))
47
48
  },
48
49
  getContractData (userinfoid) {
49
50
  console.log(userinfoid)
50
51
  this.showbuy = true
51
52
  this.f_userinfo_id = userinfoid
52
53
  this.$resetpost('wx/rs/logic/wordToosRept', {f_userinfo_id: this.f_userinfo_id}, {resolveMsg: null, rejectMsg: '获取合同失败!!'}).then(item => {
53
- this.showbuy = false
54
54
  if (item.data.length > 0) {
55
55
  this.scheduleData = item.data[0]
56
56
  this.url = item.data[0].f_visitpc_url
57
+ // 1. 替换反斜杠为斜杠
58
+ // 2. 对 URL 进行编码
59
+ let fullUrl = encodeURI(this.url.replace(/\\/g, '/'))
60
+ this.$resetpost(`rs/convert/convertImg`, {url: fullUrl}, {resolveMsg: null, rejectMsg: null}).then((ret) => {
61
+ let img = window.location.href + 'files' + ret.data
62
+ this.imgurl = encodeURI(img.replace(/\\/g, '/'))
63
+ console.log(this.imgurl)
64
+ this.showbuy = false
65
+ })
57
66
  }
58
67
  }).catch(err => {
59
68
  console.log(err)
@@ -282,6 +282,14 @@
282
282
  close-on-select>
283
283
  </v-select>
284
284
  </div>
285
+ <div style="" class="col-sm-4 form-group" v-if="getConfigShowItem('f_is_signature')"
286
+ v-show="(formconfig && formconfig.f_is_signature && formconfig.f_is_signature.required) || !onlyshowmust"
287
+ :class="[$v.f_is_signature.required ? 'has-error' : '']">
288
+ <label for="f_is_signature" class="font_normal_body">{{getConfigLabelName('f_is_signature','是否签署合同')}}</label>
289
+ <v-select id="f_is_signature" :value.sync="baseinfo.base.f_is_signature" v-model="baseinfo.base.f_is_signature"
290
+ :placeholder="getConfigPlaceholder('f_is_signature','是否签署合同')"
291
+ :options='signature' style="width: 65%" :value-single="true" close-on-select></v-select>
292
+ </div>
285
293
  </div>
286
294
  <div class="row">
287
295
  <div style="" class="col-sm-12 form-group" v-if="getConfigShowItem('f_comments')"
@@ -398,6 +406,7 @@
398
406
  banknames: this.$appdata.getParam('银行名称'),
399
407
  userstates: this.$appdata.getParam('用户状态'),
400
408
  mgq: this.$appdata.getParam('是否煤改气'),
409
+ signature: this.$appdata.getParam('是否签署合同'),
401
410
  peopleMax: this.$appdata.getSingleValue('最大人口数'),
402
411
  pointsMax: this.$appdata.getSingleValue('最大用气点数量'),
403
412
  costtype: this.$appdata.getParam('付款类型'),
@@ -132,7 +132,6 @@ import WebChargeQueryUser from '../../components/common/userinfo_detail/ic_detai
132
132
  import WebHandQueryUser from '../../components/common/userinfo_detail/ic_detail/WebHandQueryUser'
133
133
  import UserDeviceQuery from '../../components/common/userinfo_detail/ic_detail/UserDeviceQuery'
134
134
  import contractSigningList from '../../components/common/userinfo_detail/ic_detail/contractSigningList'
135
- import SecurityCheckInfo from './SecuritycheckInfo'
136
135
  import hiddenDanger from './hiddenDanger'
137
136
 
138
137
  // 导入物联网相关查询
@@ -151,7 +150,6 @@ export default {
151
150
  props: ['f_userfiles_id', 'f_userinfo_id', 'f_userinfo_code', 'parentname', 'buttonshow'],
152
151
  components: {
153
152
  hiddenDanger,
154
- SecurityCheckInfo,
155
153
  PriceAdjustmentQueryUser,
156
154
  PriceChangeQueryUser,
157
155
  AutomaticPurse,
package/src/sign.html CHANGED
@@ -8,159 +8,111 @@
8
8
  padding: 0;
9
9
  margin: 0;
10
10
  }
11
- .s_conLeft {
12
- width: 700px;
13
- height: 750px;
14
- padding: 20px;
11
+ .s_content {
12
+ width: 100%;
13
+ height: 100%;
15
14
  position: relative;
16
- background: #e8f8f8;
17
15
  }
18
- //.s_conLeft {
19
- // width: 700px;
20
- // height: 750px;
21
- // padding: 20px;
22
- // position: relative;
23
- // background: #e8f8f8;
24
- //}
16
+ .s_conLeft {
17
+ width: 75%;
18
+ height: 100%;
19
+ float: left;
20
+ background: #ffffff;
21
+ }
25
22
  .s_conLeftsing {
26
- width: 700px;
27
- height: 730px;
23
+ width: 100%;
24
+ height: 1000px;
25
+ border: none;
28
26
  }
29
27
  .s_conRight {
28
+ width: 25%;
29
+ height: 100%;
30
+ float: right;
31
+ background: #ffffff;
32
+ }
33
+ .sign_window {
34
+ width: 300px;
30
35
  position: absolute;
31
- top: 0;
32
- right: 0;
33
- left: 700px;
34
- bottom: 0;
35
- overflow: auto;
36
- margin-top: 0px;
37
- background: #e8f8f8;
38
- margin-left: 50px;
36
+ right: 20px;
37
+ top: 100px;
39
38
  }
40
- //.s_conRight {
41
- // position: absolute;
42
- // top: 0;
43
- // right: 0;
44
- // left: 700px;
45
- // bottom: 0;
46
- // //overflow: auto;
47
- // margin-top: -35px;
48
- // background: #e8f8f8;
49
- // margin-left: 50px;
50
- //}
51
-
52
- .sign_window
53
- {
54
- float:left;
55
- width:500px;
56
- height:300px;
57
- position:absolute;
58
- right:0px;
59
- top:380px;
39
+ #open_close_sign {
40
+ float: right;
41
+ width: 60px;
42
+ height: 30px;
43
+ background: #5E5EA2;
44
+ color: #ffffff;
45
+ margin-bottom: 10px;
46
+ cursor: pointer;
47
+ border: 1px solid #4a4a8a;
60
48
  }
61
-
62
- #open_close_sign
63
- {
64
- float:right;
65
- width:60px;
66
- height:60px;
67
- background:#5E5EA2;
68
- color:#ffffff;
69
- margin-bottom:20px
49
+ #enter_sign {
50
+ float: left;
51
+ width: 100%;
52
+ background: #ffffff;
53
+ border: 1px solid #cccccc;
70
54
  }
71
-
72
- #enter_sign
73
- {
74
- float:left;
75
- width:100%;
76
- height:100%;
77
- background:#CCCC99;
55
+ .enter_sign_inner {
56
+ float: left;
57
+ background: #5E5EA2;
58
+ width: 100%;
59
+ height: 30px;
60
+ line-height: 30px;
78
61
  }
79
-
80
- .enter_sign_inner
81
- {
82
- float:left;
83
- background:red;
84
- width:100%;
85
- height:30px;
86
- line-height:30px;
87
- opacity:0.4;
62
+ .enter_sign_inner p {
63
+ margin-left: 10px;
64
+ color: #ffffff;
88
65
  }
89
-
90
- .enter_sign_inner p
91
- {
92
- margin-left:10px;
93
- color:#ffffff;
66
+ .obj_id {
67
+ float: left;
68
+ width: 290px;
69
+ height: 220px;
70
+ margin: 5px;
71
+ background: #ffffff;
72
+ border: 1px solid #e0e0e0;
94
73
  }
95
-
96
- .obj_id
97
- {
98
- float:left;
99
- width:490px;
100
- height:220px;
101
- margin-top:5px;
102
- margin-left:5px;
103
- margin-right:5px;
104
- background:#ffffff;
105
- float:left;
106
- overflow:hidden;
74
+ .sign_place {
75
+ float: left;
76
+ position: absolute;
77
+ left: 10px;
78
+ top: 310px;
107
79
  }
108
-
109
- .sign_place
110
- {
111
- float:left;
112
- position:absolute;
113
- left:10px;
114
- top:310px;
80
+ .sign_dashed {
81
+ float: left;
82
+ border-bottom: 1px dashed black;
83
+ width: 435px;
84
+ height: 30px;
85
+ position: absolute;
86
+ left: 60px;
87
+ top: 300px;
115
88
  }
116
-
117
- .sign_dashed
118
- {
119
- float:left;
120
- border-bottom:1px dashed black;
121
- width:435px;
122
- height:30px;
123
- position:absolute;
124
- left:60px;
125
- top:300px;
89
+ .sign_button {
90
+ float: left;
91
+ width: 100%;
92
+ height: 45px;
93
+ background: #f5f5f5;
126
94
  }
127
-
128
- .sign_button
129
- {
130
- float:left;
131
- background:#CCCC99;
132
- width:100%;
133
- height:45px;
95
+ .sign_button_inner {
96
+ text-align: center;
97
+ padding-top: 8px;
134
98
  }
135
-
136
- .sign_button_inner
137
- {
138
- float:left;
139
- margin-left:45px;
99
+ .sign_button_ok {
100
+ width: 80px;
101
+ height: 28px;
102
+ background: #5E5EA2;
103
+ color: #ffffff;
104
+ border: 1px solid #4a4a8a;
105
+ margin: 0 10px;
106
+ cursor: pointer;
140
107
  }
141
-
142
- .sign_button_ok
143
- {
144
- float:left;
145
- width:80px;
146
- margin-left:20px;
147
- margin-top:8px;
148
- background:#0000ff;
149
- padding:3px 5px;
150
- color:#ffffff;
151
- border:1px solid #0000ff;
152
- }
153
-
154
- .sign_button_resign
155
- {
156
- float:left;
157
- width:80px;
158
- margin-left:20px;
159
- margin-top:8px;
160
- background:#ff0000;
161
- padding:3px 5px;
162
- color:#ffffff;
163
- border:1px solid #ff0000;
108
+ .sign_button_resign {
109
+ width: 80px;
110
+ height: 28px;
111
+ background: #ff0000;
112
+ color: #ffffff;
113
+ border: 1px solid #cc0000;
114
+ margin: 0 10px;
115
+ cursor: pointer;
164
116
  }
165
117
  </style>
166
118
  </head>
@@ -213,7 +165,7 @@
213
165
  obj.TInputInitialize();
214
166
  obj.TInputMovetoExt();
215
167
  obj.TInputRegisterButtonInfo(TInput_getButtonsInfo());
216
- }, 600);
168
+ }, 600);
217
169
  }
218
170
  window.onunload=function(){
219
171
  obj.TInputFinalize();