manage-client 3.2.183 → 3.2.185

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.
@@ -13,9 +13,11 @@ var compiler = webpack(config)
13
13
  // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
14
14
  var shaoguan = 'http://119.146.1.106:8300/'
15
15
  var qtx= 'http://36.103.222.144:6300/'
16
- var bendi = 'http://220.194.141.253:8600/'
16
+ // var bendi = 'http://220.194.141.253:8600/'
17
17
  // var bendi = 'http://203.57.101.233:9001'
18
- var fuwu = 'http://172.168.1.11:9001/'
18
+ // var bendi = 'http://172.168.1.11:9001/'
19
+ // var bendi = 'http://192.168.50.4:8400/'
20
+ var bendi = 'http://121.36.106.17:8400/'
19
21
  // var fuwu = 'http://203.57.101.233:9001'
20
22
  var system = 'http://192.168.50.4:8400'
21
23
  // 192.168.
package/build.gradle CHANGED
@@ -5,7 +5,7 @@ buildscript {
5
5
  }
6
6
  }
7
7
 
8
- version = '3.1.0-17'
8
+ version = '3.1.0-18'
9
9
  apply plugin: 'java'
10
10
  task release(type:Exec) {
11
11
  workingDir '.'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.2.183",
3
+ "version": "3.2.185",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -0,0 +1,113 @@
1
+ <template>
2
+ <div class="basic-main" style="height: 100%">
3
+ <div class="form-group" >
4
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
5
+ <div class="row">
6
+ <div class="col-sm-3 form-group" >
7
+ <label class="font_normal_body" for="startDate">开始日期:</label>
8
+ <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
9
+ v-model="model.startDate"
10
+ :value.sync="model.startDate"
11
+ :disabled-days-of-Week="[]"
12
+ :format="'yyyy-MM-dd HH:mm:ss'"
13
+ :show-reset-button="reset">
14
+ </datepicker>
15
+ </div>
16
+ <div class="col-sm-3 form-group" >
17
+ <label class="font_normal_body" for="endDate">结束日期:</label>
18
+ <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
19
+ v-model="model.endDate"
20
+ :value.sync="model.endDate"
21
+ :disabled-days-of-Week="[]"
22
+ :format="'yyyy-MM-dd HH:mm:ss'"
23
+ :show-reset-button="reset">
24
+ </datepicker>
25
+ </div>
26
+ <div class="col-sm-3 form-group">
27
+ <label class="font_normal_body">用户状态:</label>
28
+ <v-select :value.sync="queryData.f_user_state" multiple
29
+ v-model="queryData.f_user_state"
30
+ :options='f_state' placeholder='请选择'>
31
+ </v-select>
32
+ </div>
33
+ <div class="col-sm-3 form-group" style = "float:right;">
34
+ <button class="button_search" @click="searchData()">查询</button>
35
+ </div>
36
+ </div>
37
+ </div>
38
+ <div style="width:100%;height: 100%;margin-top: 2%" class="div-iframe">
39
+ <iframe class="ifarme_style" style="width:100%;height:100%" :src="url" v-if="isShow"></iframe>
40
+ </div>
41
+ </div>
42
+ </div>
43
+ </template>
44
+
45
+ <script>
46
+ export default {
47
+ title: '案例报表',
48
+ data () {
49
+ return {
50
+ f_state: [ {label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '销户', value: '销户'}, {label: '预备', value: '预备'} ],
51
+ orgCondtionStr: '1=1',
52
+ model: {
53
+ startDate: '',
54
+ endDate: ''
55
+ },
56
+ isShow: false,
57
+ url: '',
58
+ urlPrefix: 'http://192.168.50.77:31039/report/jmreport/shareView/761723305776898048',
59
+ queryData: {
60
+ f_user_state: []
61
+ }
62
+ }
63
+ },
64
+ ready () {
65
+ this.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
66
+ this.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
67
+ },
68
+ methods: {
69
+ searchData () {
70
+ let queryData = this.orgCondtionStr
71
+ for (let key in this.queryData) {
72
+ if (this.queryData[key] !== null && this.queryData[key] !== '' && this.queryData[key] !== undefined && this.queryData[key].length > 0) {
73
+ if (Array.isArray(this.queryData[key])) {
74
+ var stringValue = ''
75
+ for (var i = 0; i < this.queryData[key].length; i++) {
76
+ if (i === this.queryData[key].length - 1) {
77
+ stringValue = stringValue + "'" + this.queryData[key][i] + "'"
78
+ } else {
79
+ stringValue = stringValue + "'" + this.queryData[key][i] + "',"
80
+ }
81
+ }
82
+ queryData = queryData + ' and ' + key + ' in (' + stringValue + ')'
83
+ } else {
84
+ queryData = queryData + ' and ' + key + ' = ' + this.queryData[key]
85
+ }
86
+ }
87
+ }
88
+ // 重置url
89
+ this.url = ''
90
+ // encodeURIComponent是将该参数中的特殊符号进行编码,后端会进行解码
91
+ this.url = this.urlPrefix + '?condition=' + encodeURIComponent(queryData) +
92
+ '&startDate=' + encodeURIComponent(this.model.startDate) +
93
+ '&endDate=' + encodeURIComponent(this.model.endDate) +
94
+ '&logicName=testReport'
95
+ this.isShow = true
96
+ },
97
+ load () {
98
+ this.isShow = true
99
+ }
100
+ }
101
+ }
102
+ </script>
103
+ <style scoped>
104
+ .noborder{
105
+ border: none;
106
+ }
107
+ .span{
108
+ height: 0;
109
+ }
110
+ .ifarme_style{
111
+ border: medium none;
112
+ }
113
+ </style>
@@ -145,7 +145,6 @@
145
145
  }
146
146
  },
147
147
  ready() {
148
- this.getaddress()
149
148
  readySomething(this).then(() => {
150
149
  this.$emit('ready')
151
150
  }).catch((error) => {
@@ -152,9 +152,10 @@
152
152
  <label class="font_normal_body">气价名称</label>
153
153
  <v-select :value.sync="model.f_price_name"
154
154
  v-model="model.f_price_name"
155
+ multiple
155
156
  :options="$parent.$parent.getPricenames"
156
- condition="f_price_name = '{}'"
157
- close-on-select></v-select>
157
+ condition="f_price_name in {}"
158
+ ></v-select>
158
159
  </div>
159
160
  <div class="col-sm-2 form-group">
160
161
  <label class="font_normal_body">下账状态</label>
@@ -522,6 +522,10 @@ export default function (filiale) {
522
522
  Vue.component('price-report-wh', (resolve) => {
523
523
  require(['./components/SellReport/PriceReportWH'], resolve)
524
524
  })
525
+ // 案例报表
526
+ Vue.component('anli-report', (resolve) => {
527
+ require(['./components/SellReport/AnLiReport'], resolve)
528
+ })
525
529
  // 乌海工业报表
526
530
  Vue.component('gy-report-wh', (resolve) => {
527
531
  require(['./components/SellReport/GYReportWH'], resolve)