safecheck-client 4.0.1-37 → 4.0.1-39
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,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "safecheck-client",
|
|
3
3
|
"//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
|
|
4
|
-
"version": "4.0.1-
|
|
4
|
+
"version": "4.0.1-39",
|
|
5
5
|
"description": "安检模块 前端组件",
|
|
6
6
|
"author": "丁新 <417755458@qq.com>",
|
|
7
7
|
"license": "ISC",
|
|
@@ -111,7 +111,7 @@ export default {
|
|
|
111
111
|
'check' (val) {
|
|
112
112
|
let condition
|
|
113
113
|
//tag
|
|
114
|
-
condition = `
|
|
114
|
+
condition = `c.f_checker_name='${this.check.f_checker}' and i.f_state!='作废' and c.f_issued='是'`
|
|
115
115
|
if(this.checkstatus){
|
|
116
116
|
condition += ` and cp.f_entry_status = '${this.checkstatus}'`
|
|
117
117
|
}
|
|
@@ -17,12 +17,16 @@
|
|
|
17
17
|
onkeyup="value=value.replace(/[^\d\.]/g,'')" readonly type="text">
|
|
18
18
|
</div>
|
|
19
19
|
|
|
20
|
+
<!-- <div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">-->
|
|
21
|
+
<!-- <label class="lb-left text-justify">上期结余</label>-->
|
|
22
|
+
<!-- <input v-model="meterData.f_curbalance" class="form-control"-->
|
|
23
|
+
<!-- onkeyup="value=value.replace(/[^\d\.]/g,'')" readonly type="text">-->
|
|
24
|
+
<!-- </div>-->
|
|
20
25
|
<div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">
|
|
21
|
-
<label class="lb-left text-justify"
|
|
22
|
-
<input v-model="meterData.
|
|
26
|
+
<label class="lb-left text-justify">用户余额</label>
|
|
27
|
+
<input v-model="meterData.user_f_balance" class="form-control"
|
|
23
28
|
onkeyup="value=value.replace(/[^\d\.]/g,'')" readonly type="text">
|
|
24
29
|
</div>
|
|
25
|
-
|
|
26
30
|
<!-- 上次抄表结果状态 -->
|
|
27
31
|
<div class="col-xs-12 col-sm-12 col-md-12 form-input-group mg8">
|
|
28
32
|
<label class="lb-left text-justify">上次抄表结果状态</label>
|
|
@@ -65,8 +69,8 @@ export default {
|
|
|
65
69
|
let http = new HttpResetClass()
|
|
66
70
|
http.load('POST', `${this.$androidUtil.getProxyUrl()}/af-telephone/rs/sql/tel_singleTable_OrderBy`, {
|
|
67
71
|
data: {
|
|
68
|
-
items: 'a
|
|
69
|
-
tablename:
|
|
72
|
+
items: 'a.*,ui.f_balance as user_f_balance',
|
|
73
|
+
tablename: `t_handplan a left join (select f_userinfo_id,max(id) as id from t_handplan group by f_userinfo_id) b on a.id = b.id left join t_userinfo ui on b.f_userinfo_id=ui.f_userinfo_id and ui.f_user_state ='正常'`,
|
|
70
74
|
condition: `b.f_userinfo_id = '${this.service.f_userinfoid}'`,
|
|
71
75
|
orderitem: 'a.id'
|
|
72
76
|
}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
</div>
|
|
16
16
|
<div class="row auto" style="margin: 5px 0">
|
|
17
17
|
<label class="righttxt">用户名称:</label><input type="text" class="form-control rightipt"
|
|
18
|
-
v-model="userinfo.baseinfo.base.f_user_name"
|
|
18
|
+
v-model="userinfo.baseinfo.base.f_user_name" />
|
|
19
19
|
</div>
|
|
20
20
|
<div class="row auto" style="margin: 5px 0">
|
|
21
21
|
<label class="righttxt">身份证号:</label><input type="text" class="form-control rightipt"
|
|
@@ -666,7 +666,8 @@ export default {
|
|
|
666
666
|
this.excessive = true
|
|
667
667
|
let userinfoms = Object.assign({}, this.userinfo_old.baseinfo.base)
|
|
668
668
|
// userinfoms.f_user_name=row.f_user_name
|
|
669
|
-
userinfoms.
|
|
669
|
+
userinfoms.f_user_name= this.userinfo.baseinfo.base.f_user_name,
|
|
670
|
+
userinfoms.f_user_phone = this.userinfo.baseinfo.base.f_user_phone
|
|
670
671
|
userinfoms.f_rent_phone=this.userinfo.baseinfo.base.f_rent_phone
|
|
671
672
|
userinfoms.f_idnumber = this.userinfo.baseinfo.base.f_idnumber
|
|
672
673
|
userinfoms.f_rent_name = this.userinfo.baseinfo.base.f_rent_name
|
|
@@ -1407,7 +1407,8 @@ export default {
|
|
|
1407
1407
|
let param = {}
|
|
1408
1408
|
param = res.data[0]
|
|
1409
1409
|
param.f_new_tablebase = _this.data.f_new_tablebase
|
|
1410
|
-
param.tabname="在线抄表"
|
|
1410
|
+
param.tabname="在线抄表",
|
|
1411
|
+
param.f_result_state="安检回量"
|
|
1411
1412
|
var pardate = {
|
|
1412
1413
|
_this:this,
|
|
1413
1414
|
tittle:'抄表单信息',
|