apply-clients 3.5.6-48 → 3.5.6-49

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.
Files changed (5) hide show
  1. package/build/dev-server.js +2 -2
  2. package/package.json +1 -1
  3. package/src/filiale/jinhuang/android/AppAddMaterialScience.vue +31 -28
  4. package/src/filiale/jinhuang/pc/addMaterialScience.vue +33 -29
  5. package/src/main.js +1 -1
package/build/dev-server.js CHANGED
@@ -8,8 +8,8 @@ var compiler = webpack(config)
8
8
  // var proxy = httpProxy.createProxyServer()
9
9
  // var ldap = 'http://121.36.79.201:8400'
10
10
  // var applyinstall = 'http://121.36.79.201:8400'
11
- var ldap = 'http://61.163.123.47:30785'
12
- var applyinstall = 'http://61.163.123.47:30785'
11
+ var ldap = 'http://113.219.4.57:31467'
12
+ var applyinstall = 'http://113.219.4.57:31467'
13
13
 
14
14
  var proxyTable = {
15
15
  '/api': {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.5.6-48",
3
+ "version": "3.5.6-49",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/filiale/jinhuang/android/AppAddMaterialScience.vue CHANGED
@@ -215,11 +215,12 @@ export default {
215
215
  bjqChecklag:[],
216
216
  fmaterialname:{},
217
217
  isShow:[false],
218
+ orgcode: this.$appdata.getSingleValue(`${Vue.user.orgs}-用友`),
218
219
  requestBody: {
219
220
  so_saleorder: {
220
221
  "pk_group": "H", // 集团【集团】
221
- "pk_org": "30", // 销售组织【组织_业务单元_销售组织】
222
- "pk_org_v": "30", // 销售组织版本【组织_业务单元_销售组织版本信息】
222
+ "pk_org":this.$appdata.getSingleValue(`${Vue.user.orgs}-用友`), // 销售组织【组织_业务单元_销售组织】
223
+ "pk_org_v":this.$appdata.getSingleValue(`${Vue.user.orgs}-用友`), // 销售组织版本【组织_业务单元_销售组织版本信息】
223
224
  "vtrantypecode": "30-0xx-002", // 订单类型编码【】
224
225
  "ctrantypeid": "1001E11000000001KYUT", // 订单类型【单据类型】
225
226
  "cdeptid": "07", // 部门最新版本【部门】
@@ -318,21 +319,22 @@ export default {
318
319
  let res2 = await http.load(
319
320
  'POST',
320
321
  `${this.$androidUtil.getProxyUrl()}/rs/logic/yongyouMaterialNew`,
322
+ {
323
+ data: {
324
+ f_orgid:this.orgcode
325
+ }
326
+ },
321
327
  {resolveMsg: null, rejectMsg: '材料查询失败！！！'}
322
328
  )
323
329
  for (let i = 0; i < res2.data.data.length; i++) {
324
- if( res2.data.data[i].tongqi === '开通维修'){
325
- let lable = `${res2.data.data[i].classname}-${res2.data.data[i].spec}-${res2.data.data[i].smallnumname}`
326
- this.meterialOptions.push(
327
- {
328
- 'label': lable.trim(),
329
- 'value':res2.data.data[i].code,
330
- 'materials': res2.data.data[i]
331
- }
332
- )
333
-
334
- }
335
-
330
+ let lable = `${res2.data.data[i].classname}-${res2.data.data[i].spec}-${res2.data.data[i].smallnumname}`
331
+ this.meterialOptions.push(
332
+ {
333
+ 'label': lable.trim(),
334
+ 'value':res2.data.data[i].code,
335
+ 'materials': res2.data.data[i]
336
+ }
337
+ )
336
338
  }
337
339
  },
338
340
  // 获取模态框材料
@@ -365,7 +367,7 @@ export default {
365
367
  material = this.meterialOptions[i].materials
366
368
  }
367
369
  }
368
- this.materials[index].f_material_price=0
370
+ this.materials[index].f_material_price=material.jiage
369
371
  this.materials[index].f_material_name = material.name
370
372
  this.materials[index].f_material_style = material.spec
371
373
  this.materials[index].f_material_unit = material.smallnumname
@@ -391,8 +393,8 @@ export default {
391
393
  for (let i = 0; i < this.materials.length; i++) {
392
394
  let obj={
393
395
  "pk_group": "H", // 集团【集团】
394
- "pk_org": "30", // 销售组织【组织_业务单元_销售组织】
395
- "pk_org_v": "30", // 销售组织【组织_业务单元_销售组织】
396
+ "pk_org": this.orgcode, // 销售组织【组织_业务单元_销售组织】
397
+ "pk_org_v": this.orgcode, // 销售组织【组织_业务单元_销售组织】
396
398
  "carorgid": "30", // 应收组织最新版本【财务组织】
397
399
  "carorgvid": "30", // 应收组织【财务组织版本】
398
400
  "csendstockorgid": "30", // 发货库存组织最新版本【库存组织】
@@ -485,7 +487,7 @@ export default {
485
487
  {resolveMsg: null, rejectMsg: '材料推送失败！！！'}
486
488
  )
487
489
  if (res2.data.status == 200) {
488
- let pk=res2.data.pk
490
+ let pk=res2.data.data
489
491
  for (let i = 0; i < this.materials.length; i++) {
490
492
  this.materials[i].f_logotype=pk
491
493
  }
@@ -527,18 +529,19 @@ export default {
527
529
  resolveMsg: null,
528
530
  rejectMsg: '作废失败！！！'
529
531
  })
532
+ let logotypeArray = JSON.parse(row.f_logotype)
530
533
  let http2 = new HttpResetClass()
531
- let res2 = await http2.load(
532
- 'POST',
533
- `${this.$androidUtil.getProxyUrl()}/rs/logic/yongyouDelMaterial`,
534
- {data: {
535
- body:{
536
- pk:row.f_logotype
534
+ for (let i = 0; i < logotypeArray.length; i++) {
535
+ let res2 = await http2.load(
536
+ 'POST',
537
+ `rs/logic/yongyouDelMaterial`,
538
+ {data: {
539
+ pk:logotypeArray[i].pk
537
540
  }
538
- }
539
- },
540
- {resolveMsg: null, rejectMsg: '材料推送失败！！！'}
541
- )
541
+ },
542
+ {resolveMsg: null, rejectMsg: '材料推送失败！！！'}
543
+ )
544
+ }
542
545
  this.closeMaterials()
543
546
  }
544
547
  }
package/src/filiale/jinhuang/pc/addMaterialScience.vue CHANGED
@@ -219,11 +219,12 @@
219
219
  meterialOptions: [],
220
220
  row: {},
221
221
  bjqChecklag: [],
222
+ orgcode: this.$appdata.getSingleValue(`${this.$login.f.orgs}-用友`),
222
223
  requestBody: {
223
224
  so_saleorder: {
224
225
  "pk_group": "H", // 集团【集团】
225
- "pk_org": "30", // 销售组织【组织_业务单元_销售组织】
226
- "pk_org_v": "30", // 销售组织版本【组织_业务单元_销售组织版本信息】
226
+ "pk_org": this.$appdata.getSingleValue(`${this.$login.f.orgs}-用友`), // 销售组织【组织_业务单元_销售组织】
227
+ "pk_org_v":this.$appdata.getSingleValue(`${this.$login.f.orgs}-用友`), // 销售组织版本【组织_业务单元_销售组织版本信息】
227
228
  "vtrantypecode": "30-0xx-002", // 订单类型编码【】
228
229
  "ctrantypeid": "1001E11000000001KYUT", // 订单类型【单据类型】
229
230
  "cdeptid": "07", // 部门最新版本【部门】
@@ -325,21 +326,22 @@
325
326
  let res2 = await http.load(
326
327
  'POST',
327
328
  `${this.$androidUtil.getProxyUrl()}/rs/logic/yongyouMaterialNew`,
329
+ {
330
+ data: {
331
+ f_orgid:this.orgcode
332
+ }
333
+ },
328
334
  {resolveMsg: null, rejectMsg: '材料查询失败！！！'}
329
335
  )
330
336
  for (let i = 0; i < res2.data.data.length; i++) {
331
- if( res2.data.data[i].tongqi === '开通维修'){
332
- let lable = `${res2.data.data[i].classname}-${res2.data.data[i].spec}-${res2.data.data[i].smallnumname}`
333
- this.meterialOptions.push(
334
- {
335
- 'label': lable.trim(),
336
- 'value':res2.data.data[i].code,
337
- 'materials': res2.data.data[i]
338
- }
339
- )
340
-
341
- }
342
-
337
+ let lable = `${res2.data.data[i].classname}-${res2.data.data[i].spec}-${res2.data.data[i].smallnumname}`
338
+ this.meterialOptions.push(
339
+ {
340
+ 'label': lable.trim(),
341
+ 'value':res2.data.data[i].code,
342
+ 'materials': res2.data.data[i]
343
+ }
344
+ )
343
345
  }
344
346
  },
345
347
  modifyOtherValue (index){
@@ -352,7 +354,7 @@
352
354
  material = this.meterialOptions[i].materials
353
355
  }
354
356
  }
355
- this.materials[index].f_material_price=0
357
+ this.materials[index].f_material_price=material.jiage
356
358
  this.materials[index].f_material_name = material.name
357
359
  this.materials[index].f_material_style = material.spec
358
360
  this.materials[index].f_material_unit = material.smallnumname
@@ -378,8 +380,8 @@
378
380
  for (let i = 0; i < this.materials.length; i++) {
379
381
  let obj={
380
382
  "pk_group": "H", // 集团【集团】
381
- "pk_org": "30", // 销售组织【组织_业务单元_销售组织】
382
- "pk_org_v": "30", // 销售组织【组织_业务单元_销售组织】
383
+ "pk_org": this.orgcode, // 销售组织【组织_业务单元_销售组织】
384
+ "pk_org_v": this.orgcode, // 销售组织【组织_业务单元_销售组织】
383
385
  "carorgid": "30", // 应收组织最新版本【财务组织】
384
386
  "carorgvid": "30", // 应收组织【财务组织版本】
385
387
  "csendstockorgid": "30", // 发货库存组织最新版本【库存组织】
@@ -472,7 +474,7 @@
472
474
  {resolveMsg: null, rejectMsg: '材料推送失败！！！'}
473
475
  )
474
476
  if (res2.data.status == 200) {
475
- let pk=res2.data.pk
477
+ let pk=res2.data.data
476
478
  for (let i = 0; i < this.materials.length; i++) {
477
479
  this.materials[i].f_logotype=pk
478
480
  }
@@ -511,21 +513,23 @@
511
513
  resolveMsg: null,
512
514
  rejectMsg: '作废失败！！！'
513
515
  })
516
+ // row.f_logotype "[{"billcode":"SO302025042400001230","pk":"1001ZZ1000000003IAC3"},{"billcode":"SO302025042400001229","pk":"1001ZZ1000000003IAC4"}]"
517
+ //转为将字符串数组，转为数组
518
+ let logotypeArray = JSON.parse(row.f_logotype)
514
519
  let http2 = new HttpResetClass()
515
- let res2 = await http2.load(
516
- 'POST',
517
- `rs/logic/yongyouDelMaterial`,
518
- {data: {
519
- body:{
520
- pk:row.f_logotype
520
+ for (let i = 0; i < logotypeArray.length; i++) {
521
+ let res2 = await http2.load(
522
+ 'POST',
523
+ `rs/logic/yongyouDelMaterial`,
524
+ {data: {
525
+ pk:logotypeArray[i].pk
521
526
  }
522
- }
523
- },
524
- {resolveMsg: null, rejectMsg: '材料推送失败！！！'}
525
- )
527
+ },
528
+ {resolveMsg: null, rejectMsg: '材料推送失败！！！'}
529
+ )
530
+ }
526
531
  this.closeMaterials()
527
532
  }
528
-
529
533
  },
530
534
  async updateMaterial (index,row) {
531
535
  this.title = '修改'
package/src/main.js CHANGED
@@ -9,7 +9,7 @@ import {material} from 'material-client'
9
9
  import apply from './apply'
10
10
 
11
11
  all()
12
- apply('fugou')
12
+ apply('jinhuang')
13
13
  ldap()
14
14
  sale()
15
15
  material()