apply-clients 3.3.110-210 → 3.3.110-213
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
|
@@ -11,7 +11,8 @@
|
|
|
11
11
|
<th class="textNoLineBreak">材料编号</th>
|
|
12
12
|
<th class="textNoLineBreak">材料标识</th>
|
|
13
13
|
<th class="textNoLineBreak">
|
|
14
|
-
<button class="button_new button_spacing" type="button" @click="$parent.$parent.openMaterialModal()"
|
|
14
|
+
<button class="button_new button_spacing" type="button" @click="$parent.$parent.openMaterialModal()">添加
|
|
15
|
+
</button>
|
|
15
16
|
</th>
|
|
16
17
|
</tr>
|
|
17
18
|
</template>
|
|
@@ -39,8 +40,11 @@
|
|
|
39
40
|
<nobr>{{row.f_material_code}}</nobr>
|
|
40
41
|
</td>
|
|
41
42
|
<td style="text-align: center;">
|
|
42
|
-
<button type="button" class="button_search button_spacing"
|
|
43
|
-
|
|
43
|
+
<button type="button" class="button_search button_spacing"
|
|
44
|
+
@click="$parent.$parent.updateMaterial($index,row)">修改
|
|
45
|
+
</button>
|
|
46
|
+
<button type="button" class="button_delete button_spacing" @click="$parent.$parent.deleteMaterial(row)">删除
|
|
47
|
+
</button>
|
|
44
48
|
</td>
|
|
45
49
|
</tr>
|
|
46
50
|
</template>
|
|
@@ -55,11 +59,14 @@
|
|
|
55
59
|
<div v-for="(i,item) in materials" class="form-group col-sm-12 panel panel-info">
|
|
56
60
|
<div class="panel-heading head col-sm-12" style="background-color: #e8f4ff;margin-bottom: 10px">
|
|
57
61
|
<div class="col-sm-6 text-left">材料{{$index+1}}信息</div>
|
|
58
|
-
<div class="col-sm-6 text-right"
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
62
|
+
<div class="col-sm-6 text-right">
|
|
63
|
+
<button
|
|
64
|
+
class="button_delete button_spacing"
|
|
65
|
+
@click.prevent="deleteDevicesinfo(i)"
|
|
66
|
+
v-if="title === '新增'"
|
|
67
|
+
>删除
|
|
68
|
+
</button>
|
|
69
|
+
</div>
|
|
63
70
|
</div>
|
|
64
71
|
<div class="form-group col-sm-6">
|
|
65
72
|
<label class="col-sm-4 control-label">选择材料：</label>
|
|
@@ -141,8 +148,12 @@
|
|
|
141
148
|
<footer slot="modal-footer" class="modal-footer">
|
|
142
149
|
<template v-if="mark !== 1">
|
|
143
150
|
<button type="button" class="btn btn-primary" v-if="title==='新增'" @click="pushMaterial()">添加材料</button>
|
|
144
|
-
<button type="button" class="btn btn-primary" v-if="title==='新增'" @click="addMaterial()"
|
|
145
|
-
|
|
151
|
+
<button type="button" class="btn btn-primary" v-if="title==='新增'" @click="addMaterial()"
|
|
152
|
+
:disabled="!$v.valid">确认添加
|
|
153
|
+
</button>
|
|
154
|
+
<button type="button" class="btn btn-primary" v-if="title==='修改'" @click="updateConfirm()"
|
|
155
|
+
:disabled="!$v.valid">确认修改
|
|
156
|
+
</button>
|
|
146
157
|
</template>
|
|
147
158
|
</footer>
|
|
148
159
|
</modal>
|
|
@@ -152,6 +163,7 @@
|
|
|
152
163
|
<script>
|
|
153
164
|
import Vue from 'vue'
|
|
154
165
|
import {HttpResetClass} from 'vue-client'
|
|
166
|
+
|
|
155
167
|
export default {
|
|
156
168
|
name: 'addMaterialScience',
|
|
157
169
|
props: {
|
|
@@ -159,76 +171,78 @@
|
|
|
159
171
|
type: Object
|
|
160
172
|
}
|
|
161
173
|
},
|
|
162
|
-
data
|
|
174
|
+
data() {
|
|
163
175
|
return {
|
|
164
176
|
onetomany: {
|
|
165
177
|
rows: []
|
|
166
178
|
},
|
|
167
|
-
title:'新增',
|
|
168
|
-
showMaterialModal:false,
|
|
169
|
-
materials:[
|
|
179
|
+
title: '新增',
|
|
180
|
+
showMaterialModal: false,
|
|
181
|
+
materials: [
|
|
170
182
|
{
|
|
171
|
-
material:'',
|
|
172
|
-
f_material_name:'',
|
|
173
|
-
f_material_style:'',
|
|
174
|
-
f_material_unit:'',
|
|
175
|
-
f_material_number:'',
|
|
176
|
-
f_bjq_sid:'',
|
|
177
|
-
f_material_code:''
|
|
183
|
+
material: '',
|
|
184
|
+
f_material_name: '',
|
|
185
|
+
f_material_style: '',
|
|
186
|
+
f_material_unit: '',
|
|
187
|
+
f_material_number: '',
|
|
188
|
+
f_bjq_sid: '',
|
|
189
|
+
f_material_code: ''
|
|
178
190
|
}
|
|
179
191
|
],
|
|
180
|
-
meterialOptions:[],
|
|
181
|
-
row:{}
|
|
192
|
+
meterialOptions: [],
|
|
193
|
+
row: {}
|
|
182
194
|
}
|
|
183
195
|
},
|
|
184
|
-
ready(){
|
|
196
|
+
ready() {
|
|
185
197
|
this.getOnetoManyData()
|
|
186
198
|
},
|
|
187
199
|
methods: {
|
|
188
200
|
async getOnetoManyData () {
|
|
201
|
+
let http = new HttpResetClass()
|
|
189
202
|
let data = {
|
|
190
203
|
tablename: `t_material_apply`,
|
|
191
204
|
condition: `f_process_id='${this.selectdata.f_process_id}'`
|
|
192
205
|
}
|
|
193
|
-
let res = await
|
|
194
|
-
|
|
206
|
+
let res = await http.load(
|
|
207
|
+
'POST',
|
|
208
|
+
`${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable?aaa=123`,
|
|
195
209
|
{data: data},
|
|
196
210
|
{resolveMsg: null, rejectMsg: 'onetomany查询失败'}
|
|
197
211
|
)
|
|
198
212
|
this.onetomany.rows = res.data
|
|
199
213
|
},
|
|
200
|
-
async openMaterialModal
|
|
214
|
+
async openMaterialModal() {
|
|
201
215
|
this.getMateralNames()
|
|
202
216
|
this.title = '新增'
|
|
203
217
|
this.materials = [
|
|
204
218
|
{
|
|
205
|
-
material:'',
|
|
206
|
-
f_material_name:'',
|
|
207
|
-
f_material_style:'',
|
|
208
|
-
f_material_unit:'',
|
|
209
|
-
f_material_number:'',
|
|
210
|
-
f_bjq_sid:'',
|
|
211
|
-
f_material_code:''
|
|
219
|
+
material: '',
|
|
220
|
+
f_material_name: '',
|
|
221
|
+
f_material_style: '',
|
|
222
|
+
f_material_unit: '',
|
|
223
|
+
f_material_number: '',
|
|
224
|
+
f_bjq_sid: '',
|
|
225
|
+
f_material_code: ''
|
|
212
226
|
}
|
|
213
227
|
],
|
|
214
228
|
this.showMaterialModal = true
|
|
215
229
|
},
|
|
216
|
-
deleteDevicesinfo
|
|
230
|
+
deleteDevicesinfo(index) {
|
|
217
231
|
this.materials.splice(index, 1)
|
|
218
232
|
},
|
|
219
|
-
pushMaterial
|
|
233
|
+
pushMaterial() {
|
|
220
234
|
this.materials.push({
|
|
221
|
-
material:'',
|
|
222
|
-
f_material_name:'',
|
|
223
|
-
f_material_style:'',
|
|
224
|
-
f_material_unit:'',
|
|
225
|
-
f_material_number:'',
|
|
226
|
-
f_bjq_sid:'',
|
|
227
|
-
f_material_code:''
|
|
235
|
+
material: '',
|
|
236
|
+
f_material_name: '',
|
|
237
|
+
f_material_style: '',
|
|
238
|
+
f_material_unit: '',
|
|
239
|
+
f_material_number: '',
|
|
240
|
+
f_bjq_sid: '',
|
|
241
|
+
f_material_code: ''
|
|
228
242
|
})
|
|
229
243
|
},
|
|
230
244
|
// 获取模态框材料
|
|
231
|
-
async getMateralNames
|
|
245
|
+
async getMateralNames() {
|
|
232
246
|
let data = {
|
|
233
247
|
condition: `1=1`
|
|
234
248
|
}
|
|
@@ -242,14 +256,14 @@
|
|
|
242
256
|
|
|
243
257
|
this.meterialOptions = res.data.map(item => {
|
|
244
258
|
return {
|
|
245
|
-
'label': `${item.f_material_name}--${item.f_material_style}
|
|
259
|
+
'label': `${item.f_material_name}--${item.f_material_style}`,
|
|
246
260
|
'value': item
|
|
247
261
|
}
|
|
248
262
|
})
|
|
249
263
|
},
|
|
250
|
-
modifyOtherValue
|
|
251
|
-
console.log("进来了",index)
|
|
252
|
-
console.log("dddd",this.materials[index].material)
|
|
264
|
+
modifyOtherValue(index) {
|
|
265
|
+
console.log("进来了", index)
|
|
266
|
+
console.log("dddd", this.materials[index].material)
|
|
253
267
|
let material = this.materials[index].material
|
|
254
268
|
this.materials[index].f_material_name = material.f_material_name
|
|
255
269
|
this.materials[index].f_material_style = material.f_material_style
|
|
@@ -257,28 +271,29 @@
|
|
|
257
271
|
this.materials[index].f_material_number = material.f_material_number
|
|
258
272
|
},
|
|
259
273
|
// 新增材料
|
|
260
|
-
async addMaterial
|
|
274
|
+
async addMaterial() {
|
|
261
275
|
this.title = '新增'
|
|
262
276
|
let data = {
|
|
263
|
-
f_process_id
|
|
277
|
+
f_process_id: this.selectdata.f_process_id,
|
|
264
278
|
f_operator_id: Vue.user.id,
|
|
265
279
|
f_operator: Vue.user.name,
|
|
266
280
|
f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
|
|
267
281
|
f_orgid: Vue.user.orgid,
|
|
268
282
|
f_orgname: Vue.user.orgs,
|
|
269
|
-
materials:this.materials
|
|
283
|
+
materials: this.materials
|
|
270
284
|
}
|
|
271
|
-
let
|
|
285
|
+
let http = new HttpResetClass()
|
|
286
|
+
let res = await http.load(
|
|
287
|
+
'POST',
|
|
272
288
|
`${this.$androidUtil.getProxyUrl()}/rs/logic/saveMaterials`,
|
|
273
289
|
data
|
|
274
290
|
)
|
|
275
291
|
this.closeMaterials()
|
|
276
292
|
},
|
|
277
|
-
deleteMaterial
|
|
278
|
-
this.$showMessage('您确定要删除这条记录吗？',['confirm']).then(res =>{
|
|
279
|
-
if (res === 'confirm'){
|
|
293
|
+
deleteMaterial(row) {
|
|
294
|
+
this.$showMessage('您确定要删除这条记录吗？', ['confirm']).then(res => {
|
|
295
|
+
if (res === 'confirm') {
|
|
280
296
|
let http = new HttpResetClass()
|
|
281
|
-
|
|
282
297
|
let res = http.load(
|
|
283
298
|
'DELETE',
|
|
284
299
|
`${this.$androidUtil.getProxyUrl()}/rs/entity/t_material_apply/${row.id}`,
|
|
@@ -289,36 +304,38 @@
|
|
|
289
304
|
}
|
|
290
305
|
})
|
|
291
306
|
},
|
|
292
|
-
async updateMaterial
|
|
307
|
+
async updateMaterial(index, row) {
|
|
293
308
|
this.title = '修改'
|
|
294
309
|
this.row = row
|
|
295
310
|
this.getMateralNames()
|
|
296
311
|
this.materials = [
|
|
297
312
|
{
|
|
298
|
-
material:'',
|
|
299
|
-
f_material_name:row.f_material_name,
|
|
300
|
-
f_material_style:row.f_material_style,
|
|
301
|
-
f_material_unit:row.f_material_unit,
|
|
302
|
-
f_material_number:row.f_material_number,
|
|
303
|
-
f_material_code:row.f_material_code
|
|
313
|
+
material: '',
|
|
314
|
+
f_material_name: row.f_material_name,
|
|
315
|
+
f_material_style: row.f_material_style,
|
|
316
|
+
f_material_unit: row.f_material_unit,
|
|
317
|
+
f_material_number: row.f_material_number,
|
|
318
|
+
f_material_code: row.f_material_code
|
|
304
319
|
}
|
|
305
320
|
]
|
|
306
321
|
this.showMaterialModal = true
|
|
307
322
|
},
|
|
308
|
-
async updateConfirm
|
|
323
|
+
async updateConfirm() {
|
|
309
324
|
let data = this.row
|
|
310
325
|
data.f_material_name = this.materials[0].f_material_name
|
|
311
326
|
data.f_material_style = this.materials[0].f_material_style
|
|
312
327
|
data.f_material_unit = this.materials[0].f_material_unit
|
|
313
328
|
data.f_material_number = this.materials[0].f_material_number
|
|
314
329
|
data.f_material_code = this.materials[0].f_material_code
|
|
315
|
-
let
|
|
330
|
+
let http = new HttpResetClass()
|
|
331
|
+
let res = await http.load(
|
|
332
|
+
'POST',
|
|
316
333
|
`${this.$androidUtil.getProxyUrl()}/rs/entity/t_material_apply`,
|
|
317
334
|
data
|
|
318
335
|
)
|
|
319
336
|
this.closeMaterials()
|
|
320
337
|
},
|
|
321
|
-
closeMaterials
|
|
338
|
+
closeMaterials() {
|
|
322
339
|
this.getOnetoManyData()
|
|
323
340
|
this.showMaterialModal = false
|
|
324
341
|
}
|
|
@@ -158,7 +158,7 @@
|
|
|
158
158
|
<label class="font_normal_body">表  号：</label>
|
|
159
159
|
<input type="text" style="width:60%" class="input_search" placeholder='表号' v-model="model.f_meternumber"
|
|
160
160
|
v-on:keyup.enter="$parent.$parent.search()"
|
|
161
|
-
condition="
|
|
161
|
+
condition="meternumber like '%{}%'">
|
|
162
162
|
</div>
|
|
163
163
|
<div class="form-group col-sm-3">
|
|
164
164
|
<label class="font_normal_body">领用人：</label>
|