manage-client 3.2.55-aode → 3.2.56-aode

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 (4) hide show
  1. package/build/dev-server.js +2 -4
  2. package/build/webpack.base.conf.js +79 -78
  3. package/package.json +1 -1
  4. package/src/components/sale/businessquery/InspectListGas.vue +14 -11
package/build/dev-server.js CHANGED
@@ -12,7 +12,7 @@ var compiler = webpack(config)
12
12
  // https://github.com/chimurai/http-proxy-middleware
13
13
  // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
14
14
  // var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
15
- var str = 'http://192.168.10.14:8300', fuwu = 'http://192.168.10.233:8300', bendi = 'http://192.168.10.14:8300'
15
+ var str = 'http://192.168.10.14:8300', fuwu = 'http://192.168.10.233:8300', bendi = 'http://localhost:9025/'
16
16
  // var str = 'http://121.36.106.17:8400' , fuwu = 'http://121.36.106.17:8400' , bendi = 'http://192.168.10.14:8300'
17
17
  var proxyTable = {
18
18
 
@@ -48,9 +48,7 @@ var proxyTable = {
48
48
  '/rs/sql/webmeter_getUserGasList': {
49
49
  target: bendi
50
50
  },
51
- '/rs/sql/getNewUserGasAll': {
52
- target: bendi
53
- },
51
+
54
52
  '/rs/logic/chargevaluesave': {
55
53
  target: 'http://localhost:8025'
56
54
  },
package/build/webpack.base.conf.js CHANGED
@@ -1,78 +1,79 @@
1
- var path = require('path')
2
- var cssLoaders = require('./css-loaders')
3
- var projectRoot = path.resolve(__dirname, '../')
4
- module.exports = {
5
- entry: {
6
- app: './src/main.js'
7
- },
8
- output: {
9
- path: path.resolve(__dirname, '../dist/static'),
10
- publicPath: 'static/',
11
- filename: '[name].js'
12
- },
13
- resolve: {
14
- extensions: ['', '.js', '.vue'],
15
- fallback: [path.join(__dirname, '../node_modules')],
16
- alias: {
17
- 'src': path.resolve(__dirname, '../src'),
18
- 'test': path.resolve(__dirname, '../test')
19
- }
20
- },
21
- resolveLoader: {
22
- fallback: [path.join(__dirname, '../node_modules')]
23
- },
24
- module: {
25
- loaders: [
26
- {
27
- test: /\.vue$/,
28
- loader: 'vue'
29
- },
30
- {
31
- test: /\.js$/,
32
- loader: 'babel',
33
- include: [
34
- `${projectRoot}\\src`,
35
- `${projectRoot}\\build`,
36
- `${projectRoot}\\examples`,
37
- `${projectRoot}\\test`,
38
- `${projectRoot}\\node_modules\\vue-client\\src`,
39
- `${projectRoot}\\node_modules\\vue-strap\\src`,
40
- `${projectRoot}\\node_modules\\system-clients\\src`,
41
- `${projectRoot}\\node_modules\\jsencrypt`,
42
- `${projectRoot}\\node_modules\\axios`,
43
- `${projectRoot}\\node_modules\\sale-client\\src`,
44
- ]
45
- },
46
- {
47
- test: /\.json$/,
48
- loader: 'json'
49
- },
50
- {
51
- test: /\.html$/,
52
- loader: 'vue-html'
53
- },
54
- {
55
- test: /\.less$/,
56
- loader: 'style!css!less'
57
- },
58
- {
59
- test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
60
- loader: 'url',
61
- query: {
62
- limit: 10000,
63
- name: '[name].[ext]?[hash:7]'
64
- }
65
- }
66
- ]
67
- },
68
- vue: {
69
- loaders: cssLoaders({
70
- sourceMap: false,
71
- extract: false
72
- })
73
- },
74
- plugins: [],
75
- eslint: {
76
- formatter: require('eslint-friendly-formatter')
77
- }
78
- }
1
+ var path = require('path')
2
+ var cssLoaders = require('./css-loaders')
3
+ var projectRoot = path.resolve(__dirname, '../')
4
+ module.exports = {
5
+ entry: {
6
+ app: './src/main.js'
7
+ },
8
+ output: {
9
+ path: path.resolve(__dirname, '../dist/static'),
10
+ publicPath: 'static/',
11
+ filename: '[name].js'
12
+ },
13
+ resolve: {
14
+ extensions: ['', '.js', '.vue'],
15
+ fallback: [path.join(__dirname, '../node_modules')],
16
+ alias: {
17
+ 'src': path.resolve(__dirname, '../src'),
18
+ 'test': path.resolve(__dirname, '../test')
19
+ }
20
+ },
21
+ resolveLoader: {
22
+ fallback: [path.join(__dirname, '../node_modules')]
23
+ },
24
+ module: {
25
+ loaders: [
26
+ {
27
+ test: /\.vue$/,
28
+ loader: 'vue'
29
+ },
30
+ {
31
+ test: /\.js$/,
32
+ loader: 'babel',
33
+ include: [
34
+ `${projectRoot}\\src`,
35
+ `${projectRoot}\\build`,
36
+ `${projectRoot}\\examples`,
37
+ `${projectRoot}\\test`,
38
+ `${projectRoot}\\node_modules\\vue-client\\src`,
39
+ `${projectRoot}\\node_modules\\vue-client\\src\\plugins`,
40
+ `${projectRoot}\\node_modules\\vue-strap\\src`,
41
+ `${projectRoot}\\node_modules\\system-clients\\src`,
42
+ `${projectRoot}\\node_modules\\jsencrypt`,
43
+ `${projectRoot}\\node_modules\\axios`,
44
+ `${projectRoot}\\node_modules\\sale-client\\src`,
45
+ ]
46
+ },
47
+ {
48
+ test: /\.json$/,
49
+ loader: 'json'
50
+ },
51
+ {
52
+ test: /\.html$/,
53
+ loader: 'vue-html'
54
+ },
55
+ {
56
+ test: /\.less$/,
57
+ loader: 'style!css!less'
58
+ },
59
+ {
60
+ test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
61
+ loader: 'url',
62
+ query: {
63
+ limit: 10000,
64
+ name: '[name].[ext]?[hash:7]'
65
+ }
66
+ }
67
+ ]
68
+ },
69
+ vue: {
70
+ loaders: cssLoaders({
71
+ sourceMap: false,
72
+ extract: false
73
+ })
74
+ },
75
+ plugins: [],
76
+ eslint: {
77
+ formatter: require('eslint-friendly-formatter')
78
+ }
79
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.2.55-aode",
3
+ "version": "3.2.56-aode",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/sale/businessquery/InspectListGas.vue CHANGED
@@ -76,7 +76,7 @@
76
76
 
77
77
 
78
78
  </div>
79
- <div v-if="$parent.$parent.meter_classify == '机表'" class="col-sm-2 flex-row" style="white-space: nowrap">
79
+ <div v-if="$parent.$parent.meter_classify != '卡表'" class="col-sm-2 flex-row" style="white-space: nowrap">
80
80
  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;期间次数&nbsp;</label>
81
81
 
82
82
  <div class="row">
@@ -100,7 +100,7 @@
100
100
  </div>
101
101
 
102
102
  </div>
103
- <div v-if="$parent.$parent.meter_classify == '机表'" class="col-sm-2 flex-row" style="white-space: nowrap">
103
+ <div v-if="$parent.$parent.meter_classify != '卡表'" class="col-sm-2 flex-row" style="white-space: nowrap">
104
104
  <label class="font_normal_body">期间用气量&nbsp;</label>
105
105
  <div class="row">
106
106
  <input type="text" style="width:30%" class="input_search" v-model="model.handsellpregasmin"
@@ -167,17 +167,18 @@
167
167
  <th><nobr>表具状态</nobr></th>
168
168
  <th><nobr>气表品牌</nobr></th>
169
169
  <th><nobr>气价名称</nobr></th>
170
- <th><nobr>最后购气日期</nobr></th>
170
+ <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>最后购气日期</nobr></th>
171
+ <th v-show="$parent.$parent.$parent.meter_classify != '卡表'"><nobr>最后抄表日期</nobr></th>
171
172
  <!-- <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>总购气次数</nobr></th>-->
172
- <!-- <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>总抄表次数</nobr></th>-->
173
+ <!-- <th v-show="$parent.$parent.$parent.meter_classify != '卡表'"><nobr>总抄表次数</nobr></th>-->
173
174
  <!-- <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>总购气量</nobr></th>-->
174
- <!-- <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>总抄表气量</nobr></th>-->
175
+ <!-- <th v-show="$parent.$parent.$parent.meter_classify != '卡表'"><nobr>总抄表气量</nobr></th>-->
175
176
  <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>期间购气次数</nobr></th>
176
- <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>期间抄表次数</nobr></th>
177
+ <th v-show="$parent.$parent.$parent.meter_classify != '卡表'"><nobr>期间抄表次数</nobr></th>
177
178
  <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>期间购气量</nobr></th>
178
- <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>期间抄表气量</nobr></th>
179
+ <th v-show="$parent.$parent.$parent.meter_classify != '卡表'"><nobr>期间抄表气量</nobr></th>
179
180
  <!-- <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>累计未购气天数</nobr></th>-->
180
- <!-- <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>累计未抄表天数</nobr></th>-->
181
+ <!-- <th v-show="$parent.$parent.$parent.meter_classify != '卡表'"><nobr>累计未抄表天数</nobr></th>-->
181
182
  <th><nobr>组织机构</nobr></th>
182
183
  </tr>
183
184
  </template>
@@ -210,8 +211,8 @@
210
211
  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td>
211
212
  <!-- <td v-if="meter_classify == '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">总购气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>-->
212
213
  <td v-if="meter_classify == '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">期间购气量合计:&emsp;&emsp;{{sumsmodel.sellpregas}}</td>
213
- <!-- <td v-if="meter_classify == '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">总抄表气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>-->
214
- <td v-if="meter_classify == '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">期间抄表气量合计:&emsp;{{sumsmodel.sellpregas}}</td>
214
+ <!-- <td v-if="meter_classify != '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">总抄表气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>-->
215
+ <td v-if="meter_classify != '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">期间抄表气量合计:&emsp;{{sumsmodel.sellpregas}}</td>
215
216
  </tr>
216
217
  </table>
217
218
  </div>
@@ -376,6 +377,7 @@
376
377
  }
377
378
  }
378
379
  args.condition = args.condition+ ` ${this.filialeCodeStr}`
380
+ args.condition = args.condition+ `and f_meter_type = '${this.meter_classify }'`
379
381
  console.log("拼接的condition", args.condition, this.model)
380
382
  this.model.search(args.condition, args.model)
381
383
  },
@@ -400,7 +402,7 @@
400
402
  computed: {
401
403
 
402
404
  f_meter_classify(){
403
- return [{label: '卡表', value: '卡表'},{label: '机表', value: '机表'} ]
405
+ return [{label: '卡表', value: '卡表'},{label: '机表', value: '机表'},{label: '物联网表', value: '物联网表'} ]
404
406
  // return [{label: '卡表', value: '卡表'}]
405
407
  },
406
408
  contain_newfiles(){
@@ -436,6 +438,7 @@
436
438
  if (temp2.model.contain_newfile==='否'){
437
439
  result.condition = result.condition+" and f_open_date not between " + result.startDate + " and " + result.endDate
438
440
  }
441
+ result.condition = result.condition+ `and f_meter_type = '${this.meter_classify }'`
439
442
 
440
443
  return result
441
444
  }