sale-client 3.7.55 → 3.7.57
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 +3 -3
- package/src/filiale/qianneng/ChangeMeter.vue +2 -1
- package/src/filiale/qingtongxia/MeterDisable/DisableManage.vue +105 -0
- package/src/filiale/qingtongxia/MeterEnable/EnableManage.vue +190 -0
- package/src/filiale/qingtongxia/UserBaseInfoNew.vue +1 -1
- package/src/filiale/qingtongxia/sale.js +4 -0
- package/src/filiale/tongchuan/FileUserFiles.vue +28 -2
- package/src/filiale/tongchuan/MeterinfoTest.vue +2 -1
- package/src/filiale/tongchuan/UserGeneralInfoTest.vue +1 -1
- package/src/filiale/tongchuan/UserMeterInfoTest.vue +3 -2
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sale-client",
|
|
3
|
-
"version": "3.7.
|
|
3
|
+
"version": "3.7.57",
|
|
4
4
|
"description": "收费模块前台组件",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"qrcodejs2": "^0.0.2",
|
|
25
25
|
"vue": "^1.0.17",
|
|
26
26
|
"webpack-dev-server": "^2.11.5",
|
|
27
|
-
"vue-client": "1.
|
|
27
|
+
"vue-client": "1.26.8",
|
|
28
28
|
"yarn": "^1.22.10"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
@@ -76,7 +76,7 @@
|
|
|
76
76
|
"karma-spec-reporter": "0.0.31",
|
|
77
77
|
"karma-webpack": "^2.0.2",
|
|
78
78
|
"ldap-clients": "3.0.96",
|
|
79
|
-
"system-clients": "
|
|
79
|
+
"system-clients": "3.2.90-tongchuan",
|
|
80
80
|
"less": "^2.7.3",
|
|
81
81
|
"manage-client": "3.1.8-88",
|
|
82
82
|
"mkdirp": "^0.5.1",
|
|
@@ -716,7 +716,8 @@ export default {
|
|
|
716
716
|
f_meterbase: this.model.f_using_base_old,
|
|
717
717
|
f_meter_brand: this.row.f_meter_brand,
|
|
718
718
|
f_meter_classify: this.row.f_meter_type,
|
|
719
|
-
f_price_id: this.row.f_price_id
|
|
719
|
+
f_price_id: this.row.f_price_id,
|
|
720
|
+
version: this.row.version
|
|
720
721
|
}
|
|
721
722
|
this.$resetpost(url, {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
|
|
722
723
|
console.log('成功')
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="auto">
|
|
3
|
+
<validator name='v'>
|
|
4
|
+
<form class="form-horizontal">
|
|
5
|
+
<div class="row">
|
|
6
|
+
<div class="col-sm-4 form-group">
|
|
7
|
+
<label for="f_reason" class="font_normal_body">停用原因</label>
|
|
8
|
+
<v-select v-model="model.f_reason"
|
|
9
|
+
placeholder='停用原因'
|
|
10
|
+
:value.sync="model.f_reason"
|
|
11
|
+
:options='reason'
|
|
12
|
+
v-ref:reason
|
|
13
|
+
close-on-select ></v-select>
|
|
14
|
+
</div>
|
|
15
|
+
</div>
|
|
16
|
+
<div class="row" style="margin-top:1px;">
|
|
17
|
+
<div class="col-sm-8 form-group">
|
|
18
|
+
<label for="f_reason" class="font_normal_body">备  注</label>
|
|
19
|
+
<input class="input_search" style="width:80%" v-model="model.f_othereason" placeholder="备注"/>
|
|
20
|
+
</div>
|
|
21
|
+
</div>
|
|
22
|
+
</form>
|
|
23
|
+
<div style="text-align:right;">
|
|
24
|
+
<button class="button_search button_spacing" @click="confirm()" :disabled='!$v.valid'>确认</button>
|
|
25
|
+
<button class="button_clear" @click="clean()" >取消</button>
|
|
26
|
+
</div>
|
|
27
|
+
</validator>
|
|
28
|
+
</div>
|
|
29
|
+
<upload :blodid="blodid" :businessid="randomBusinessId" isremark="true" :deleteimg="true" fusetype="停用"></upload>
|
|
30
|
+
</template>
|
|
31
|
+
<script>
|
|
32
|
+
/**
|
|
33
|
+
*综合业务
|
|
34
|
+
表具停用组件
|
|
35
|
+
*/
|
|
36
|
+
export default {
|
|
37
|
+
title: '表具停用',
|
|
38
|
+
props: ['row'],
|
|
39
|
+
data () {
|
|
40
|
+
return {
|
|
41
|
+
blodid: '',
|
|
42
|
+
showupload: true,
|
|
43
|
+
model: {},
|
|
44
|
+
randomBusinessId: '',
|
|
45
|
+
reason: this.$appdata.getParam('停用原因')
|
|
46
|
+
}
|
|
47
|
+
},
|
|
48
|
+
ready () {
|
|
49
|
+
this.blodid = this.row.f_userinfo_id
|
|
50
|
+
this.getRandomId()
|
|
51
|
+
},
|
|
52
|
+
methods: {
|
|
53
|
+
getRandomId () {
|
|
54
|
+
this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
|
|
55
|
+
let res = Math.random() * 16 | 0
|
|
56
|
+
let v = c == 'x' ? res : (res & 0x3 | 0x8)
|
|
57
|
+
return v.toString(16)
|
|
58
|
+
})
|
|
59
|
+
},
|
|
60
|
+
async confirm () {
|
|
61
|
+
await this.$LogicService.meterDisable(this.model, this.row)
|
|
62
|
+
let array = [{
|
|
63
|
+
f_user_id: this.row.f_user_id,
|
|
64
|
+
f_userfiles_id: this.row.f_userfiles_id,
|
|
65
|
+
f_alias: this.row.f_alias,
|
|
66
|
+
f_userinfo_id: this.row.f_userinfo_id,
|
|
67
|
+
f_orgname: this.$login.f.orgs,
|
|
68
|
+
f_orgid: this.$login.f.orgid,
|
|
69
|
+
f_meternumber: this.row.f_meternumber
|
|
70
|
+
}]
|
|
71
|
+
// if (this.row.f_meter_type === '物联网表') {
|
|
72
|
+
// await this.$resetpost('rs/logic/iot_instructUpdateAndDelect',
|
|
73
|
+
// {
|
|
74
|
+
// data: {
|
|
75
|
+
// data1: {
|
|
76
|
+
// f_apply_type: '阀门控制',
|
|
77
|
+
// userid: array,
|
|
78
|
+
// nowDate: new Date(),
|
|
79
|
+
// f_apply_value: '关阀',
|
|
80
|
+
// f_apply_beizhu: '表具停用自动关阀',
|
|
81
|
+
// f_apply_operator: this.$login.f.name
|
|
82
|
+
// },
|
|
83
|
+
// data2: {
|
|
84
|
+
// userid: array,
|
|
85
|
+
// instructtype: '阀门控制',
|
|
86
|
+
// isOpen: '关阀',
|
|
87
|
+
// instructTitle: '手动关阀',
|
|
88
|
+
// reasonInfo: '表具停用自动关阀',
|
|
89
|
+
// f_instruct_state: '待发送',
|
|
90
|
+
// inputtor: this.$login.f.name
|
|
91
|
+
// }
|
|
92
|
+
// }
|
|
93
|
+
// })
|
|
94
|
+
// }
|
|
95
|
+
this.$dispatch('success')
|
|
96
|
+
},
|
|
97
|
+
clean () {
|
|
98
|
+
this.$dispatch('refresh')
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
</script>
|
|
103
|
+
|
|
104
|
+
<style>
|
|
105
|
+
</style>
|
|
@@ -0,0 +1,190 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="auto">
|
|
3
|
+
<validator name='v'>
|
|
4
|
+
<form novalidate class="form-horizontal">
|
|
5
|
+
<div class="row">
|
|
6
|
+
<div class="col-sm-6 form-group">
|
|
7
|
+
<label class="font_normal_body">停用时间</label>
|
|
8
|
+
<input type="text" class="input_search" v-model="disable.f_operate_date" style="width:60%" disabled placeholder="上次停用时间"/>
|
|
9
|
+
</div>
|
|
10
|
+
<div class="col-sm-6 form-group">
|
|
11
|
+
<label class="font_normal_body">操作人</label>
|
|
12
|
+
<input type="text" class="input_search" v-model="disable.f_operator" style="width:60%" disabled placeholder="操作人"/>
|
|
13
|
+
</div>
|
|
14
|
+
<div class="col-sm-12 form-group">
|
|
15
|
+
<label class="font_normal_body">停用原因</label>
|
|
16
|
+
<input type="text" class="input_search" v-model="disable.f_comments" style="width:60%" disabled placeholder="停用原因"/>
|
|
17
|
+
</div>
|
|
18
|
+
<div class="col-sm-12 form-group">
|
|
19
|
+
<label class="font_normal_body">其他原因</label>
|
|
20
|
+
<input type="text" class="input_search" v-model="disable.f_othereason" style="width:60%" disabled placeholder="停用原因"/>
|
|
21
|
+
</div>
|
|
22
|
+
</div>
|
|
23
|
+
<div class="row">
|
|
24
|
+
<div class="col-sm-4 form-group">
|
|
25
|
+
<label for="f_reason" class="font_normal_body">启用原因</label>
|
|
26
|
+
<v-select v-model="model.f_comments" style="width:60%"
|
|
27
|
+
placeholder='启用原因'
|
|
28
|
+
:value.sync="model.f_comments"
|
|
29
|
+
:options='reason'
|
|
30
|
+
v-ref:reason
|
|
31
|
+
close-on-select ></v-select>
|
|
32
|
+
</div>
|
|
33
|
+
<div class="checkbox col-sm-4" style="margin-left:5%" v-if="!kaifa&&row.f_meter_type ==='物联网表'">
|
|
34
|
+
<label>
|
|
35
|
+
<input style="zoom: 200%;top: 1px;left: 14px;" @click="changeisuse(true)" type="checkbox" name="optionsRadios" :id="'optionsRadios'+index" value="option1" :checked="kaifa?'checked':''">
|
|
36
|
+
开阀
|
|
37
|
+
</label>
|
|
38
|
+
</div>
|
|
39
|
+
<div class="checkbox col-sm-4" style="margin-left:5%" v-if="kaifa&&row.f_meter_type ==='物联网表'">
|
|
40
|
+
<label>
|
|
41
|
+
<input style="zoom: 200%;top: 1px;left: 14px;" @click="changeisuse(false)" type="checkbox" name="optionsRadios" :id="'optionsRadios'+index" value="option1" :checked="kaifa?'checked':''">
|
|
42
|
+
开阀
|
|
43
|
+
</label>
|
|
44
|
+
</div>
|
|
45
|
+
</div>
|
|
46
|
+
<div class="row" style="margin-top:1px;">
|
|
47
|
+
<div class="col-sm-8 form-group">
|
|
48
|
+
<label for="f_reason" class="font_normal_body">备  注</label>
|
|
49
|
+
<input class="input_search" style="width:80%" v-model="model.f_othereason" placeholder="备注"/>
|
|
50
|
+
</div>
|
|
51
|
+
</div>
|
|
52
|
+
</form>
|
|
53
|
+
<div style="text-align:right;">
|
|
54
|
+
<button class="button_search button_spacing" @click="confirm()" :disabled='!$v.valid'>确认</button>
|
|
55
|
+
<button class="button_clear" @click="clean()" >取消</button>
|
|
56
|
+
</div>
|
|
57
|
+
</validator>
|
|
58
|
+
</div>
|
|
59
|
+
</template>
|
|
60
|
+
<script>
|
|
61
|
+
/**
|
|
62
|
+
*综合业务
|
|
63
|
+
*表具启用组件
|
|
64
|
+
*/
|
|
65
|
+
|
|
66
|
+
let meterEnable = async function (self, model, row) {
|
|
67
|
+
let data = {
|
|
68
|
+
f_userfiles_id: {
|
|
69
|
+
f_userfiles_id: row.f_userfiles_id,
|
|
70
|
+
f_table_state: '正常',
|
|
71
|
+
version: row.version
|
|
72
|
+
},
|
|
73
|
+
f_user_id: row.f_user_id,
|
|
74
|
+
record_userinfo: row.f_userinfo_id,
|
|
75
|
+
f_userinfo_id: row.f_userinfo_id,
|
|
76
|
+
f_user_name: row.f_user_name,
|
|
77
|
+
f_user_phone: row.f_user_phone,
|
|
78
|
+
f_state: '有效',
|
|
79
|
+
f_comments: model.f_comments[0],
|
|
80
|
+
f_othereason: model.f_othereason,
|
|
81
|
+
f_operat_type: '启用',
|
|
82
|
+
f_describe: `${self.$login.f.name}对客户${row.f_user_name}进行表具启用操作`,
|
|
83
|
+
f_operator: self.$login.f.name,
|
|
84
|
+
f_operatorid: self.$login.f.id,
|
|
85
|
+
f_orgid: self.$login.f.orgid,
|
|
86
|
+
f_orgname: self.$login.f.orgs,
|
|
87
|
+
f_depid: self.$login.f.depids,
|
|
88
|
+
f_depname: self.$login.f.deps,
|
|
89
|
+
f_zoneid: self.$login.f.zoneid,
|
|
90
|
+
f_zones: self.$login.f.zones
|
|
91
|
+
}
|
|
92
|
+
await self.$resetpost('rs/entity/t_enable', data, {resolveMsg: '表具启用成功', rejectMsg: '表具启用失败'})
|
|
93
|
+
if (self.kaifa) {
|
|
94
|
+
let array = [{
|
|
95
|
+
f_user_id: self.row.f_userfiles_id,
|
|
96
|
+
f_alias: self.row.f_alias,
|
|
97
|
+
f_userinfo_id: self.row.f_userinfo_id,
|
|
98
|
+
f_orgname: self.$login.f.orgs,
|
|
99
|
+
f_orgid: self.$login.f.orgid,
|
|
100
|
+
f_meternumber: self.row.f_meternumber
|
|
101
|
+
}]
|
|
102
|
+
// await self.$resetpost('rs/logic/iot_instructUpdateAndDelect',
|
|
103
|
+
// {
|
|
104
|
+
// data: {
|
|
105
|
+
// data1: {
|
|
106
|
+
// f_apply_type: '阀门控制',
|
|
107
|
+
// userid: array,
|
|
108
|
+
// nowDate: new Date(),
|
|
109
|
+
// f_apply_value: '开阀',
|
|
110
|
+
// f_apply_beizhu: '表具停用自动开阀',
|
|
111
|
+
// f_apply_operator: self.$login.f.name
|
|
112
|
+
// },
|
|
113
|
+
// data2: {
|
|
114
|
+
// userid: array,
|
|
115
|
+
// instructtype: '阀门控制',
|
|
116
|
+
// isOpen: '开阀',
|
|
117
|
+
// instructTitle: '手动开阀',
|
|
118
|
+
// f_instruct_state: '待发送',
|
|
119
|
+
// inputtor: self.$login.f.name
|
|
120
|
+
// }
|
|
121
|
+
// }
|
|
122
|
+
// }).then(res => {
|
|
123
|
+
// console.log(res)
|
|
124
|
+
// let sql = `update t_userfiles set f_network_valve = 0 where f_userfiles_id = '${self.row.f_userfiles_id}'`
|
|
125
|
+
// self.$resetpost('rs/logic/runSQL', {sql: sql}, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
|
|
126
|
+
// })
|
|
127
|
+
}
|
|
128
|
+
self.$dispatch('success')
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
export default {
|
|
132
|
+
title: '启用管理',
|
|
133
|
+
props: ['row'],
|
|
134
|
+
data () {
|
|
135
|
+
return {
|
|
136
|
+
model: {
|
|
137
|
+
},
|
|
138
|
+
select: {
|
|
139
|
+
f_date: '',
|
|
140
|
+
f_reason: ''
|
|
141
|
+
},
|
|
142
|
+
reason: this.$appdata.getParam('启用原因'),
|
|
143
|
+
disable: {},
|
|
144
|
+
kaifa: false
|
|
145
|
+
}
|
|
146
|
+
},
|
|
147
|
+
ready () {
|
|
148
|
+
this.deactivatedReason()
|
|
149
|
+
},
|
|
150
|
+
methods: {
|
|
151
|
+
changeisuse (val) {
|
|
152
|
+
if (val) {
|
|
153
|
+
this.kaifa = true
|
|
154
|
+
} else {
|
|
155
|
+
this.kaifa = false
|
|
156
|
+
}
|
|
157
|
+
},
|
|
158
|
+
// 查询停用原因
|
|
159
|
+
async deactivatedReason () {
|
|
160
|
+
let data = {
|
|
161
|
+
tablename: 't_disable',
|
|
162
|
+
condition: `id = (select max(id) from t_disable where f_userfiles_id = '${this.row.f_userfiles_id}')`
|
|
163
|
+
}
|
|
164
|
+
let res = await this.$resetpost('rs/sql/saleSingleTable', {data: data}, {resolveMsg: null, rejectMsg: '获取上次停用原因失败'})
|
|
165
|
+
this.disable = res.data[0]
|
|
166
|
+
},
|
|
167
|
+
confirm () {
|
|
168
|
+
meterEnable(this, this.model, this.row)
|
|
169
|
+
// this.$LogicService.meterEnable(this.model, this.row)
|
|
170
|
+
// .then(
|
|
171
|
+
// (res) => this.$dispatch('success', '表具启用', this.row, res)
|
|
172
|
+
// ).catch(
|
|
173
|
+
// (error) => {
|
|
174
|
+
// if (error.state === 603) {
|
|
175
|
+
// this.$error('重复提交')
|
|
176
|
+
// return
|
|
177
|
+
// }
|
|
178
|
+
// this.$dispatch('error', '表具启用', this.row, error)
|
|
179
|
+
// }
|
|
180
|
+
// )
|
|
181
|
+
},
|
|
182
|
+
clean () {
|
|
183
|
+
this.$dispatch('refresh')
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
</script>
|
|
188
|
+
|
|
189
|
+
<style>
|
|
190
|
+
</style>
|
|
@@ -173,7 +173,7 @@
|
|
|
173
173
|
<button v-if="row.f_meter_type.includes('物联网表')"
|
|
174
174
|
class="button_search" type="button" @click="openUser">开户
|
|
175
175
|
</button>
|
|
176
|
-
<button v-if="row.f_meter_type.includes('物联网表') && valveLimit
|
|
176
|
+
<button v-if="row.f_meter_type.includes('物联网表') && valveLimit"
|
|
177
177
|
class="button_search" type="button" @click="valvecontrol">开关阀
|
|
178
178
|
</button>
|
|
179
179
|
<button v-if="row.f_meter_type.includes('物联网表') && autoValveLimit"
|
|
@@ -24,4 +24,8 @@ export default function () {
|
|
|
24
24
|
Vue.component('meter-message', (resolve) => { require(['./MeterMessage.vue'], resolve) })
|
|
25
25
|
// 换表
|
|
26
26
|
Vue.component('change-meter', (resolve) => { require(['./newchangemeter/ChangeMeter.vue'], resolve) })
|
|
27
|
+
// 表具停用
|
|
28
|
+
Vue.component('disable-manage', (resolve) => { require(['./MeterDisable/DisableManage'], resolve) })
|
|
29
|
+
// 表具启用
|
|
30
|
+
Vue.component('enable-manage', (resolve) => { require(['./MeterEnable/EnableManage'], resolve) })
|
|
27
31
|
}
|
|
@@ -135,7 +135,7 @@
|
|
|
135
135
|
</div>
|
|
136
136
|
<div :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
|
|
137
137
|
class="form-group">
|
|
138
|
-
<label class="font_normal_body"
|
|
138
|
+
<label class="font_normal_body">户档案开户时间</label>
|
|
139
139
|
<datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
|
|
140
140
|
class="datepicker"
|
|
141
141
|
condition="f_open_date >= '{} 00:00:00' "
|
|
@@ -155,6 +155,28 @@
|
|
|
155
155
|
v-model="model.f_end_date"
|
|
156
156
|
></datepicker>
|
|
157
157
|
</div>
|
|
158
|
+
<div :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
|
|
159
|
+
class="form-group">
|
|
160
|
+
<label class="font_normal_body">表档案开户时间</label>
|
|
161
|
+
<datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date_uf"
|
|
162
|
+
class="datepicker"
|
|
163
|
+
condition="f_open_date_uf >= '{} 00:00:00' "
|
|
164
|
+
placeholder="起始时间"
|
|
165
|
+
style="width:60%"
|
|
166
|
+
v-model="model.f_start_date_uf"
|
|
167
|
+
></datepicker>
|
|
168
|
+
</div>
|
|
169
|
+
<div :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
|
|
170
|
+
class="form-group" >
|
|
171
|
+
<label class="font_normal_body" >  至  </label>
|
|
172
|
+
<datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date_uf"
|
|
173
|
+
class="datepicker"
|
|
174
|
+
condition="f_open_date_uf <= '{} 23:59:59' "
|
|
175
|
+
placeholder="结束时间"
|
|
176
|
+
style="width:60%"
|
|
177
|
+
v-model="model.f_end_date_uf"
|
|
178
|
+
></datepicker>
|
|
179
|
+
</div>
|
|
158
180
|
<div
|
|
159
181
|
:class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
|
|
160
182
|
class="form-group">
|
|
@@ -418,7 +440,10 @@
|
|
|
418
440
|
<nobr>发卡状态</nobr>
|
|
419
441
|
</th>
|
|
420
442
|
<th v-if="!$parent.$parent.$parent.createFile">
|
|
421
|
-
<nobr
|
|
443
|
+
<nobr>户档案开户时间</nobr>
|
|
444
|
+
</th>
|
|
445
|
+
<th v-if="!$parent.$parent.$parent.createFile">
|
|
446
|
+
<nobr>表档案开户时间</nobr>
|
|
422
447
|
</th>
|
|
423
448
|
<th v-if="!$parent.$parent.$parent.createFile">
|
|
424
449
|
<nobr>建档人</nobr>
|
|
@@ -480,6 +505,7 @@
|
|
|
480
505
|
<td style="text-align: center;">{{row.f_price_name}}</td>
|
|
481
506
|
<td style="text-align: center;">{{row.f_whether_hairpin}}</td>
|
|
482
507
|
<td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_open_date}}</td>
|
|
508
|
+
<td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_open_date_uf}}</td>
|
|
483
509
|
<td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_createfile_person}}</td>
|
|
484
510
|
<td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_userfiles_address}}</td>
|
|
485
511
|
<td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_feed_method}}</td>
|
|
@@ -179,6 +179,7 @@
|
|
|
179
179
|
<datepicker style="width:60%" placeholder="通气日期"
|
|
180
180
|
v-model="row.f_gas_date"
|
|
181
181
|
v-ref:f_gas_date
|
|
182
|
+
:disabled ="isedit"
|
|
182
183
|
:value.sync="row.f_gas_date"
|
|
183
184
|
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
184
185
|
:show-reset-button="reset"
|
|
@@ -471,7 +472,7 @@ let meterBookGen = function * (self) {
|
|
|
471
472
|
finalDate: ''
|
|
472
473
|
}
|
|
473
474
|
},
|
|
474
|
-
props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id'],
|
|
475
|
+
props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'isedit'],
|
|
475
476
|
ready () {
|
|
476
477
|
console.log('看看meter里面的数据', this.meter, this.row)
|
|
477
478
|
console.log('--------------====================', this.meter.f_aroundmeter, this.row.f_aroundmeter)
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
|
|
18
18
|
<div style="height: auto;width: 100%">
|
|
19
19
|
<file-user-meter-info :meterinfo="data.meterinfo" :f_filialeid="f_filialeid" :metervalid.sync="meterInfo"
|
|
20
|
-
:f_userinfo_id="data.baseinfo.base.f_userinfo_id" v-ref:meter></file-user-meter-info>
|
|
20
|
+
:f_userinfo_id="data.baseinfo.base.f_userinfo_id" :isedit="isedit" v-ref:meter></file-user-meter-info>
|
|
21
21
|
</div>
|
|
22
22
|
|
|
23
23
|
<div style="height: auto;width: 100%">
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
<button class="button_search" style="width: max-content" @click="showDevices($index, row)">用气设备信息</button>
|
|
10
10
|
</div>
|
|
11
11
|
<file-meter-info :meter="row" :f_filialeid="f_filialeid" :usertype="usertype" :gasproperties="gasproperties" @self-valid='valida'
|
|
12
|
-
@delete-meter="deleteMeter($index)" :f_userinfo_id="f_userinfo_id"></file-meter-info>
|
|
12
|
+
@delete-meter="deleteMeter($index)" :f_userinfo_id="f_userinfo_id" :isedit="isedit"></file-meter-info>
|
|
13
13
|
|
|
14
14
|
</div>
|
|
15
15
|
<div class="panel panel-default auto text-center" @click="addMeter()" style="cursor: pointer;">
|
|
@@ -46,7 +46,8 @@ export default {
|
|
|
46
46
|
twoWay: true
|
|
47
47
|
},
|
|
48
48
|
f_filialeid: {},
|
|
49
|
-
f_userinfo_id: {}
|
|
49
|
+
f_userinfo_id: {},
|
|
50
|
+
isedit: ''
|
|
50
51
|
},
|
|
51
52
|
ready () {
|
|
52
53
|
console.log('表具信息，，，，', this.meterinfo)
|