apply-clients 3.3.99 → 3.3.102
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 +1 -1
- package/src/components/android/AppOnetomany.vue +32 -45
- package/src/components/android/AppServiceView.vue +1 -11
- package/src/components/android/AppSign.vue +6 -2
- package/src/components/android/AreaSelect/AppResAreaSelectGroup.vue +9 -3
- package/src/components/android/Supervisory/AppSupervisoryCart.vue +1 -1
- package/src/components/product/Onetomany.vue +31 -44
package/package.json
CHANGED
|
@@ -164,56 +164,43 @@ export default {
|
|
|
164
164
|
},
|
|
165
165
|
methods: {
|
|
166
166
|
async confirmModal () {
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
167
|
+
//报警器设备型号校验
|
|
168
|
+
if (this.selectdata.f_apply_type === '报警器报建') {
|
|
169
|
+
let data = {
|
|
170
|
+
f_material_name: "",
|
|
171
|
+
f_bjq_sid: "",
|
|
172
|
+
}
|
|
173
|
+
this.onetomany.fields.forEach(item => {
|
|
174
|
+
if (item.label === '材料编号') {
|
|
175
|
+
data.f_bjq_sid = item.value
|
|
173
176
|
}
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
data.f_bjq_sid = item.value
|
|
177
|
-
}
|
|
178
|
-
if (item.label === '材料名称'){
|
|
179
|
-
data.f_material_name = item.value
|
|
180
|
-
}
|
|
181
|
-
})
|
|
182
|
-
if (data.f_material_name.substr(0,3) === '报警器'){
|
|
183
|
-
let res = await this.$resetpost(
|
|
184
|
-
`${this.$androidUtil.getProxyUrl()}/ncc/rs/logic/bjqcheck`,
|
|
185
|
-
// `ncc/rs/logic/bjqcheck`,
|
|
186
|
-
// `/rs/logic/bjqcheck`,
|
|
187
|
-
data
|
|
188
|
-
)
|
|
189
|
-
if (res.data.code == 200){
|
|
190
|
-
if (this.onetomany.add.event) {
|
|
191
|
-
this.$dispatch(this.onetomany.add.event, this.index)
|
|
192
|
-
} else {
|
|
193
|
-
this.$dispatch('onetomanyadd', this.index)
|
|
194
|
-
}
|
|
195
|
-
this.closeModal()
|
|
196
|
-
}else {
|
|
197
|
-
this.disableButton = true
|
|
198
|
-
this.$showMessage(res.data.msg)
|
|
199
|
-
}
|
|
200
|
-
}else {
|
|
201
|
-
if (this.onetomany.add.event) {
|
|
202
|
-
this.$dispatch(this.onetomany.add.event, this.index)
|
|
203
|
-
} else {
|
|
204
|
-
this.$dispatch('onetomanyadd', this.index)
|
|
205
|
-
}
|
|
206
|
-
this.closeModal()
|
|
177
|
+
if (item.label === '材料名称') {
|
|
178
|
+
data.f_material_name = item.value
|
|
207
179
|
}
|
|
208
|
-
}
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
180
|
+
})
|
|
181
|
+
if (data.f_material_name.substr(0, 3) === '报警器') {
|
|
182
|
+
let res = await this.$resetpost(
|
|
183
|
+
`${this.$androidUtil.getProxyUrl()}/ncc/rs/logic/bjqcheck`,
|
|
184
|
+
// `ncc/rs/logic/bjqcheck`,
|
|
185
|
+
// `/rs/logic/bjqcheck`,
|
|
186
|
+
data
|
|
187
|
+
)
|
|
188
|
+
if (res.data.code != 200) {
|
|
189
|
+
this.disableButton = true
|
|
190
|
+
this.$showMessage(res.data.msg)
|
|
191
|
+
return
|
|
213
192
|
}
|
|
214
|
-
this.closeModal()
|
|
215
193
|
}
|
|
216
194
|
}
|
|
195
|
+
|
|
196
|
+
if (this.modelTitle === '新增') {
|
|
197
|
+
if (this.onetomany.add.event) {
|
|
198
|
+
this.$dispatch(this.onetomany.add.event, this.index)
|
|
199
|
+
} else {
|
|
200
|
+
this.$dispatch('onetomanyadd', this.index)
|
|
201
|
+
}
|
|
202
|
+
this.closeModal()
|
|
203
|
+
}
|
|
217
204
|
if (this.modelTitle === '修改') {
|
|
218
205
|
if (this.onetomany.update.event) {
|
|
219
206
|
this.$dispatch(this.onetomany.update.event, this.index, this.rowIndex)
|
|
@@ -179,17 +179,6 @@
|
|
|
179
179
|
</div>
|
|
180
180
|
</div>
|
|
181
181
|
</div>
|
|
182
|
-
<!--区域地址联动-->
|
|
183
|
-
<div>
|
|
184
|
-
<app-res-area-select-group
|
|
185
|
-
v-if="data.f_apply_type === '报警器报建' && data.defname === '工程施工' && data.title === '工程施工' && data.f_sub_state !='完工'"
|
|
186
|
-
labelstyle = "control-label"
|
|
187
|
-
@shiji-select = "getSelectShijiValue"
|
|
188
|
-
@xian-select = "getSelectXianValue"
|
|
189
|
-
@shequ-select = "getSelectShequValue"
|
|
190
|
-
>
|
|
191
|
-
</app-res-area-select-group>
|
|
192
|
-
</div>
|
|
193
182
|
<div class="col-sm-12 col-xs-12" id="test11">
|
|
194
183
|
<accordion one-at-a-time="true">
|
|
195
184
|
<panel v-for="(i,item) in data.onetomany" :header="item.title" :is-open="false" type="primary">
|
|
@@ -203,6 +192,7 @@
|
|
|
203
192
|
|
|
204
193
|
<!--自定义组件-->
|
|
205
194
|
<slot>
|
|
195
|
+
|
|
206
196
|
</slot>
|
|
207
197
|
|
|
208
198
|
<!-- 按钮组 -->
|
|
@@ -66,6 +66,8 @@ export default {
|
|
|
66
66
|
console.log('===================签字文件上传==============')
|
|
67
67
|
console.log('===================打印id==============',HostApp.__this__.blobid)
|
|
68
68
|
let data = {
|
|
69
|
+
defname:HostApp.__this__.defname,
|
|
70
|
+
type:HostApp.__this__.type,
|
|
69
71
|
blodid: HostApp.__this__.blobid,
|
|
70
72
|
username: Vue.user.name,
|
|
71
73
|
fremarks: '报装手机签字文件',
|
|
@@ -84,11 +86,13 @@ export default {
|
|
|
84
86
|
HostApp.__this__.getFiles(res.id)
|
|
85
87
|
},
|
|
86
88
|
async getFiles (fileid) {
|
|
89
|
+
debugger
|
|
90
|
+
console.log('=========进来===============')
|
|
87
91
|
let http = new HttpResetClass()
|
|
88
|
-
|
|
92
|
+
console.log('=========进来===============')
|
|
89
93
|
let data = {
|
|
90
94
|
tablename: 't_files',
|
|
91
|
-
condition: `
|
|
95
|
+
condition: `f_blobid = '${this.blobid}' `
|
|
92
96
|
}
|
|
93
97
|
let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data}, {
|
|
94
98
|
// let res = await http.load('POST', `rs/sql/singleTable`, {data: data}, {
|
|
@@ -100,7 +100,9 @@ export default {
|
|
|
100
100
|
this.xianfontColors = this.pub2Colors
|
|
101
101
|
this.shequfontColors = this.pub2Colors
|
|
102
102
|
}
|
|
103
|
-
this.$
|
|
103
|
+
this.$parent.$parent.$parent.areaData.sjvalue = value
|
|
104
|
+
this.$parent.$parent.$parent.disableButton()
|
|
105
|
+
// this.$dispatch('shiji-select', value, lable)
|
|
104
106
|
},
|
|
105
107
|
async getjdao(value,lable,obj) {
|
|
106
108
|
this.jdao_options = []
|
|
@@ -118,7 +120,9 @@ export default {
|
|
|
118
120
|
this.xianfontColors = this.pub2Colors
|
|
119
121
|
this.shequfontColors = this.pub2Colors
|
|
120
122
|
}
|
|
121
|
-
this.$
|
|
123
|
+
this.$parent.$parent.$parent.areaData.xianvalue = value
|
|
124
|
+
this.$parent.$parent.$parent.disableButton()
|
|
125
|
+
// this.$dispatch('xian-select',value, lable)
|
|
122
126
|
},
|
|
123
127
|
async getshequ(value,lable,obj) {
|
|
124
128
|
if (value !=null && value.length!=0){
|
|
@@ -126,7 +130,9 @@ export default {
|
|
|
126
130
|
}else {
|
|
127
131
|
this.shequfontColors = this.pub2Colors
|
|
128
132
|
}
|
|
129
|
-
this.$
|
|
133
|
+
this.$parent.$parent.$parent.areaData.sqvalue = value
|
|
134
|
+
this.$parent.$parent.$parent.disableButton()
|
|
135
|
+
// this.$dispatch('shequ-select',value, lable)
|
|
130
136
|
}
|
|
131
137
|
},
|
|
132
138
|
watch: {
|
|
@@ -81,7 +81,7 @@ export default {
|
|
|
81
81
|
tablename: 't_charge_record',
|
|
82
82
|
condition: `f_process_id = '${this.selectdata.f_process_id}'`
|
|
83
83
|
}
|
|
84
|
-
let res = await http.load('POST',
|
|
84
|
+
let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data:data}, {
|
|
85
85
|
resolveMsg: null,
|
|
86
86
|
rejectMsg: '收费信息查询失败！！！'
|
|
87
87
|
})
|
|
@@ -210,55 +210,42 @@ export default {
|
|
|
210
210
|
},
|
|
211
211
|
methods: {
|
|
212
212
|
async confirmModal () {
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
213
|
+
//报警器设备型号校验
|
|
214
|
+
if (this.selectdata.f_apply_type === '报警器报建'){
|
|
215
|
+
let data = {
|
|
216
|
+
f_material_name : "",
|
|
217
|
+
f_bjq_sid: "",
|
|
218
|
+
}
|
|
219
|
+
this.onetomany.fields.forEach(item=>{
|
|
220
|
+
if (item.label === '材料编号'){
|
|
221
|
+
data.f_bjq_sid = item.value
|
|
219
222
|
}
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
data.f_bjq_sid = item.value
|
|
223
|
-
}
|
|
224
|
-
if (item.label === '材料名称'){
|
|
225
|
-
data.f_material_name = item.value
|
|
226
|
-
}
|
|
227
|
-
})
|
|
228
|
-
if (data.f_material_name.substr(0,3) === '报警器'){
|
|
229
|
-
let res = await this.$resetpost(
|
|
230
|
-
`ncc/rs/logic/bjqcheck`,
|
|
231
|
-
// `/rs/logic/bjqcheck`,
|
|
232
|
-
data
|
|
233
|
-
)
|
|
234
|
-
if (res.data.code == 200){
|
|
235
|
-
if (this.onetomany.add.event) {
|
|
236
|
-
this.$dispatch(this.onetomany.add.event, this.index)
|
|
237
|
-
} else {
|
|
238
|
-
this.$dispatch('onetomanyadd', this.index)
|
|
239
|
-
}
|
|
240
|
-
this.closeModal()
|
|
241
|
-
}else {
|
|
242
|
-
this.disableButton = true
|
|
243
|
-
this.$showMessage(res.data.msg)
|
|
244
|
-
}
|
|
245
|
-
}else {
|
|
246
|
-
if (this.onetomany.add.event) {
|
|
247
|
-
this.$dispatch(this.onetomany.add.event, this.index)
|
|
248
|
-
} else {
|
|
249
|
-
this.$dispatch('onetomanyadd', this.index)
|
|
250
|
-
}
|
|
251
|
-
this.closeModal()
|
|
223
|
+
if (item.label === '材料名称'){
|
|
224
|
+
data.f_material_name = item.value
|
|
252
225
|
}
|
|
253
|
-
}
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
226
|
+
})
|
|
227
|
+
if (data.f_material_name.substr(0,3) === '报警器'){
|
|
228
|
+
let res = await this.$resetpost(
|
|
229
|
+
`ncc/rs/logic/bjqcheck`,
|
|
230
|
+
// `/rs/logic/bjqcheck`,
|
|
231
|
+
data
|
|
232
|
+
)
|
|
233
|
+
if (res.data.code != 200){
|
|
234
|
+
this.disableButton = true
|
|
235
|
+
this.$showMessage(res.data.msg)
|
|
236
|
+
return
|
|
258
237
|
}
|
|
259
|
-
this.closeModal()
|
|
260
238
|
}
|
|
261
239
|
}
|
|
240
|
+
|
|
241
|
+
if (this.modelTitle === '新增') {
|
|
242
|
+
if (this.onetomany.add.event) {
|
|
243
|
+
this.$dispatch(this.onetomany.add.event, this.index)
|
|
244
|
+
} else {
|
|
245
|
+
this.$dispatch('onetomanyadd', this.index)
|
|
246
|
+
}
|
|
247
|
+
this.closeModal()
|
|
248
|
+
}
|
|
262
249
|
if (this.modelTitle === '修改') {
|
|
263
250
|
if (this.onetomany.update.event) {
|
|
264
251
|
this.$dispatch(this.onetomany.update.event, this.index, this.rowIndex)
|