manage-client 4.0.67 → 4.0.69

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.
@@ -331,9 +331,9 @@
331
331
  await self.$MagLoadParams.loadParam()
332
332
  await self.$MagGetSaleParam.initinputtor()
333
333
  self.initQueryParam()
334
- self.getinstructtype()
335
- self.getinstructtitle()
336
- self.getinstructstate()
334
+ // self.getinstructtype()
335
+ // self.getinstructtitle()
336
+ // self.getinstructstate()
337
337
  await self.$getConfig(self, 'NewQueryInstruct')
338
338
  console.log('指令查看config', self.config)
339
339
  self.getfield = self.config.excelHeaders
@@ -356,8 +356,8 @@
356
356
  other: [],
357
357
  sumsmodel: {},
358
358
  userType:[],
359
- instructtype:[],
360
- instructstate:[],
359
+ // instructtype:[],
360
+ // instructstate:[],
361
361
  org:{
362
362
  org:[this.$login.f.orgid],
363
363
  dep:[],
@@ -379,7 +379,7 @@
379
379
  'f_orgname': '组织机构'
380
380
  }
381
381
  },
382
- instructtitle: [],
382
+ // instructtitle: [],
383
383
  detailShow: false,
384
384
  f_instruct_content: '',
385
385
  modelval: [
@@ -455,57 +455,57 @@
455
455
  }
456
456
  })
457
457
  },
458
- getinstructtype(){
459
- this.instructtype=[]
460
- let load = new HttpResetClass()
461
- load.load('POST', 'api/af-revenue/sql/singleTableParam', {
462
- data: {
463
- items:'f_instruct_type',
464
- tablename:'t_instruct',
465
- condition:'f_instruct_type is not null group by f_instruct_type'
466
- }
467
- },{warnMsg:null,resolveMsg:null}).then((res) => {
468
- this.instructtype.push({label: '全部', value: ''})
469
- res.data.forEach((item) => {
470
- this.instructtype.push({label: item.f_instruct_type, value: item.f_instruct_type})
471
- })
472
- })
473
-
474
- },
475
- getinstructtitle(){
476
- this.instructtype=[]
477
- let load = new HttpResetClass()
478
- load.load('POST', 'api/af-revenue/sql/singleTableParam', {
479
- data: {
480
- items:'f_instruct_title',
481
- tablename:'t_instruct',
482
- condition:'f_instruct_title is not null group by f_instruct_title'
483
- }
484
- },{warnMsg:null,resolveMsg:null}).then((res) => {
485
- this.instructtitle.push({label: '全部', value: ''})
486
- res.data.forEach((item) => {
487
- this.instructtitle.push({label: item.f_instruct_title, value: item.f_instruct_title})
488
- })
489
- })
490
-
491
- },
492
- getinstructstate(){
493
- this.instructstate=[]
494
- let load = new HttpResetClass()
495
- load.load('POST', 'api/af-revenue/sql/singleTableParam', {
496
- data: {
497
- items:'f_instruct_state',
498
- tablename:'t_instruct',
499
- condition:'f_instruct_state is not null group by f_instruct_state'
500
- }
501
- },{warnMsg:null,resolveMsg:null}).then((res) => {
502
- this.instructstate.push({label: '全部', value: ''})
503
- res.data.forEach((item) => {
504
- this.instructstate.push({label: item.f_instruct_state, value: item.f_instruct_state})
505
- })
506
- })
507
-
508
- },
458
+ // getinstructtype(){
459
+ // this.instructtype=[]
460
+ // let load = new HttpResetClass()
461
+ // load.load('POST', 'api/af-revenue/sql/singleTableParam', {
462
+ // data: {
463
+ // items:'f_instruct_type',
464
+ // tablename:'t_instruct',
465
+ // condition:`f_instruct_type is not null and f_instruct_date>='${this.$refs.paged.$refs.criteria.model.f_start_date}' and f_instruct_date<='${this.$refs.paged.$refs.criteria.model.f_end_date}' group by f_instruct_type`
466
+ // }
467
+ // },{warnMsg:null,resolveMsg:null}).then((res) => {
468
+ // this.instructtype.push({label: '全部', value: ''})
469
+ // res.data.forEach((item) => {
470
+ // this.instructtype.push({label: item.f_instruct_type, value: item.f_instruct_type})
471
+ // })
472
+ // })
473
+ //
474
+ // },
475
+ // getinstructtitle(){
476
+ // this.instructtype=[]
477
+ // let load = new HttpResetClass()
478
+ // load.load('POST', 'api/af-revenue/sql/singleTableParam', {
479
+ // data: {
480
+ // items:'f_instruct_title',
481
+ // tablename:'t_instruct',
482
+ // condition:`f_instruct_title is not null and f_instruct_date>='${this.$refs.paged.$refs.criteria.model.f_start_date}' and f_instruct_date<='${this.$refs.paged.$refs.criteria.model.f_end_date}' group by f_instruct_title`
483
+ // }
484
+ // },{warnMsg:null,resolveMsg:null}).then((res) => {
485
+ // this.instructtitle.push({label: '全部', value: ''})
486
+ // res.data.forEach((item) => {
487
+ // this.instructtitle.push({label: item.f_instruct_title, value: item.f_instruct_title})
488
+ // })
489
+ // })
490
+ //
491
+ // },
492
+ // getinstructstate(){
493
+ // this.instructstate=[]
494
+ // let load = new HttpResetClass()
495
+ // load.load('POST', 'api/af-revenue/sql/singleTableParam', {
496
+ // data: {
497
+ // items:'f_instruct_state',
498
+ // tablename:'t_instruct',
499
+ // condition:`f_instruct_state is not null and f_instruct_date>='${this.$refs.paged.$refs.criteria.model.f_start_date}' and f_instruct_date<='${this.$refs.paged.$refs.criteria.model.f_end_date}' group by f_instruct_state`
500
+ // }
501
+ // },{warnMsg:null,resolveMsg:null}).then((res) => {
502
+ // this.instructstate.push({label: '全部', value: ''})
503
+ // res.data.forEach((item) => {
504
+ // this.instructstate.push({label: item.f_instruct_state, value: item.f_instruct_state})
505
+ // })
506
+ // })
507
+ //
508
+ // },
509
509
  clearmsg () {
510
510
  this.$refs.paged.$refs.criteria.model = {}
511
511
  },
@@ -577,6 +577,15 @@
577
577
  },
578
578
  },
579
579
  computed: {
580
+ instructtype () {
581
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('指令类型')]
582
+ },
583
+ instructstate () {
584
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('执行状态')]
585
+ },
586
+ instructtitle () {
587
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('指令标题')]
588
+ },
580
589
  userType () {
581
590
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
582
591
  },