sale-client 3.6.3 → 3.6.5

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 +85 -82
  2. package/package.json +1 -1
  3. package/src/filiale/qianneng/FilesManage/FileUserFiles.vue +45 -48
  4. package/src/filiale/qianneng/FilesManageNew/FileUserFiles.vue +17 -17
  5. package/src/main.js +27 -27
package/build/dev-server.js CHANGED
@@ -1,82 +1,85 @@
1
- var path = require('path')
2
- const [localUrl, serverRul] = ['http://121.36.60.63:8800/', 'http://121.36.60.63:8800/']
3
- var merge = require('webpack-merge')
4
- var baseConfig = require('./webpack.dev.conf')
5
- var devConfig = {
6
- devServer: {
7
- contentBase: path.join(__dirname, 'src'),
8
- hot: true,
9
- publicPath: baseConfig.output.publicPath,
10
- historyApiFallback: true,
11
- host: '127.0.0.1',
12
- port: 8089,
13
- open: true,
14
- stats: {
15
- colors: false, // 配置控制台输出彩色日志
16
- chunks: false, // 不输出构建 chunk 信息
17
- children: false // 不输出子模块构建信息
18
- },
19
- proxy: {
20
- '/rs/file': {
21
- target: serverRul
22
- },
23
- // 查找资源服务数据
24
- '/rs/search': {
25
- target: serverRul
26
- },
27
- // 查找资源服务数据
28
- '/rs/logic/getLogin': {
29
- target: serverRul
30
- },
31
- // 查找资源服务数据
32
- '/rs/logic/getInitData': {
33
- target: serverRul
34
- },
35
- '/rs/logic/getSaleInitData': {
36
- target: serverRul
37
- },
38
- // 用户登录服务地址
39
- '/rs/user': {
40
- target: serverRul
41
- },
42
- '/rs/path': {
43
- target: serverRul
44
- },
45
- '/rs/data': {
46
- target: serverRul
47
- },
48
- '/rs/license': {
49
- target: serverRul
50
- },
51
- '/rs/db': {
52
- target: serverRul
53
- },
54
- '/excel': {
55
- target: serverRul
56
- },
57
- '/rs/config': {
58
- target: serverRul
59
- },
60
- '/rs/report': {
61
- target: serverRul
62
- },
63
- '/rs/vue': {
64
- target: serverRul
65
- },
66
- '/rs/logic': {
67
- target: localUrl
68
- },
69
- '/rs/sql': {
70
- target: localUrl
71
- },
72
- '/webmeter': {
73
- target: serverRul
74
- },
75
- '/rs': {
76
- target: serverRul
77
- // changeOrigin: true
78
- }
79
- }
80
- }
81
- }
82
- module.exports = merge(baseConfig, devConfig)
1
+ var path = require('path')
2
+ const [localUrl, serverRul] = ['http://121.36.60.63:8800/', 'http://121.36.60.63:8800/']
3
+ var merge = require('webpack-merge')
4
+ var baseConfig = require('./webpack.dev.conf')
5
+ var devConfig = {
6
+ devServer: {
7
+ contentBase: path.join(__dirname, 'src'),
8
+ hot: true,
9
+ publicPath: baseConfig.output.publicPath,
10
+ historyApiFallback: true,
11
+ host: '127.0.0.1',
12
+ port: 8089,
13
+ open: true,
14
+ stats: {
15
+ colors: false, // 配置控制台输出彩色日志
16
+ chunks: false, // 不输出构建 chunk 信息
17
+ children: false // 不输出子模块构建信息
18
+ },
19
+ proxy: {
20
+ '/rs/sql/filemanage_getUserfies': {
21
+ target: 'http://127.0.0.1:8080/'
22
+ },
23
+ '/rs/file': {
24
+ target: serverRul
25
+ },
26
+ // 查找资源服务数据
27
+ '/rs/search': {
28
+ target: serverRul
29
+ },
30
+ // 查找资源服务数据
31
+ '/rs/logic/getLogin': {
32
+ target: serverRul
33
+ },
34
+ // 查找资源服务数据
35
+ '/rs/logic/getInitData': {
36
+ target: serverRul
37
+ },
38
+ '/rs/logic/getSaleInitData': {
39
+ target: serverRul
40
+ },
41
+ // 用户登录服务地址
42
+ '/rs/user': {
43
+ target: serverRul
44
+ },
45
+ '/rs/path': {
46
+ target: serverRul
47
+ },
48
+ '/rs/data': {
49
+ target: serverRul
50
+ },
51
+ '/rs/license': {
52
+ target: serverRul
53
+ },
54
+ '/rs/db': {
55
+ target: serverRul
56
+ },
57
+ '/excel': {
58
+ target: serverRul
59
+ },
60
+ '/rs/config': {
61
+ target: serverRul
62
+ },
63
+ '/rs/report': {
64
+ target: serverRul
65
+ },
66
+ '/rs/vue': {
67
+ target: serverRul
68
+ },
69
+ '/rs/logic': {
70
+ target: localUrl
71
+ },
72
+ '/rs/sql': {
73
+ target: localUrl
74
+ },
75
+ '/webmeter': {
76
+ target: serverRul
77
+ },
78
+ '/rs': {
79
+ target: serverRul
80
+ // changeOrigin: true
81
+ }
82
+ }
83
+ }
84
+ }
85
+ module.exports = merge(baseConfig, devConfig)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.3",
3
+ "version": "3.6.5",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/filiale/qianneng/FilesManage/FileUserFiles.vue CHANGED
@@ -13,7 +13,7 @@
13
13
  class="form-group"
14
14
  v-if="$parent.$parent.clientWidth>1600">
15
15
  <label class="font_normal_body">客户编号</label>
16
- <input class="input_search" condition="f_userinfo_code = '{}'"
16
+ <input class="input_search" condition="u.f_userinfo_code = '{}'"
17
17
  placeholder='客户编号'
18
18
  style="width:60%" type="text" v-model="model.f_userinfo_code">
19
19
  </div>
@@ -24,7 +24,7 @@
24
24
  class="form-group"
25
25
  v-if="$parent.$parent.clientWidth<1600&&!$parent.$parent.createFile">
26
26
  <label class="font_normal_body">客户编号</label>
27
- <input class="input_search" condition="f_userinfo_code = '{}'"
27
+ <input class="input_search" condition="u.f_userinfo_code = '{}'"
28
28
  placeholder='客户编号'
29
29
  style="width:60%" type="text" v-model="model.f_userinfo_code">
30
30
  </div>
@@ -33,7 +33,7 @@
33
33
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
34
34
  class="form-group" v-if="!$parent.$parent.createFile">
35
35
  <label class="font_normal_body">客户名称</label>
36
- <input class="input_search" condition="f_user_name = '{}'"
36
+ <input class="input_search" condition="u.f_user_name like '%{}%'"
37
37
  placeholder='客户姓名'
38
38
  style="width:60%" type="text" v-model="model.f_user_name">
39
39
  </div>
@@ -92,7 +92,7 @@
92
92
  class="form-group"
93
93
  v-if="$parent.$parent.clientWidth<1600&&$parent.$parent.createFile">
94
94
  <label class="font_normal_body">客户编号</label>
95
- <input class="input_search" condition="f_userinfo_code = '{}'"
95
+ <input class="input_search" condition="u.f_userinfo_code = '{}'"
96
96
  placeholder='客户编号'
97
97
  style="width:60%" type="text" v-model="model.f_userinfo_code">
98
98
  </div>
@@ -103,7 +103,7 @@
103
103
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
104
104
  class="form-group" v-if="$parent.$parent.createFile">
105
105
  <label class="font_normal_body">客户名称</label>
106
- <input class="input_search" condition="f_user_name = '{}'"
106
+ <input class="input_search" condition="u.f_user_name = '{}'"
107
107
  placeholder='客户姓名'
108
108
  style="width:60%" type="text" v-model="model.f_user_name">
109
109
  </div>
@@ -111,7 +111,7 @@
111
111
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
112
112
  class="form-group">
113
113
  <label class="font_normal_body">旧客户号</label>
114
- <input class="input_search" condition="f_olduserinfo_code = '{}'" placeholder='客户编号'
114
+ <input class="input_search" condition="u.f_olduserinfo_code = '{}'" placeholder='客户编号'
115
115
  style="width:60%"
116
116
  type="text"
117
117
  v-model="model.f_olduserinfo_code">
@@ -121,7 +121,7 @@
121
121
  class="form-group">
122
122
  <label class="font_normal_body">用户类型</label>
123
123
  <v-select :options='$parent.$parent.user_type' :value.sync="model.f_user_type"
124
- close-on-select condition="f_user_type='{}'"
124
+ close-on-select condition="tuf.f_user_type='{}'"
125
125
  placeholder='用户类型' v-model="model.f_user_type"></v-select>
126
126
  </div>
127
127
  <div
@@ -129,7 +129,7 @@
129
129
  class="form-group">
130
130
  <label class="font_normal_body">用气性质</label>
131
131
  <v-select :options='$parent.$parent.gasproperties' :value.sync="model.f_gasproperties"
132
- close-on-select condition="f_gasproperties='{}'"
132
+ close-on-select condition="tuf.f_gasproperties='{}'"
133
133
  placeholder='用气性质' v-model="model.f_gasproperties"></v-select>
134
134
  </div>
135
135
  <div
@@ -137,7 +137,7 @@
137
137
  class="form-group">
138
138
  <label class="font_normal_body">气表类型</label>
139
139
  <v-select :options='$parent.$parent.meter_classify' :value.sync="model.f_meter_classify"
140
- close-on-select condition="f_meter_classify='{}'"
140
+ close-on-select condition="tuf.f_meter_classify='{}'"
141
141
  placeholder='气表类型' v-model="model.f_meter_classify"></v-select>
142
142
  </div>
143
143
  <div class="form-group" :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}">
@@ -145,7 +145,7 @@
145
145
  <v-select :value.sync="model.f_meter_brand" multiple
146
146
  v-model="model.f_meter_brand"
147
147
  :options='$parent.$parent.meterbrands' placeholder='请选择'
148
- condition="f_meter_brand in {}"
148
+ condition="gb.f_meter_brand in {}"
149
149
  close-on-select></v-select>
150
150
  </div>
151
151
  <!-- <div-->
@@ -160,7 +160,7 @@
160
160
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
161
161
  class="form-group">
162
162
  <label class="font_normal_body">客户电话</label>
163
- <input class="input_search" condition="f_user_phone = '{}'" placeholder='客户电话' style="width:60%"
163
+ <input class="input_search" condition="u.f_user_phone = '{}'" placeholder='客户电话' style="width:60%"
164
164
  type="text"
165
165
  v-model="model.f_user_phone">
166
166
  </div>
@@ -168,14 +168,14 @@
168
168
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
169
169
  class="form-group">
170
170
  <label class="font_normal_body">小&emsp;&emsp;区</label>
171
- <input class="input_search" condition="f_residential_area like '%{}%'" placeholder='小区' style="width:60%"
171
+ <input class="input_search" condition="a.f_residential_area like '%{}%'" placeholder='小区' style="width:60%"
172
172
  type="text" v-model="model.f_residential_area">
173
173
  </div>
174
174
  <div
175
175
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
176
176
  class="form-group">
177
177
  <label class="font_normal_body">客户地址</label>
178
- <input class="input_search" condition="f_address like '%{}%'" placeholder='客户地址' style="width:60%"
178
+ <input class="input_search" condition="a.f_address like '%{}%'" placeholder='客户地址' style="width:60%"
179
179
  type="text" v-model="model.f_address">
180
180
  </div>
181
181
  <div
@@ -183,7 +183,7 @@
183
183
  class="form-group">
184
184
  <label class="font_normal_body">客户状态</label>
185
185
  <v-select :options='$parent.$parent.userstates' :value.sync="model.f_user_state"
186
- close-on-select condition="f_user_state='{}'"
186
+ close-on-select condition="u.f_user_state='{}'"
187
187
  placeholder='客户状态' v-model="model.f_user_state"></v-select>
188
188
  </div>
189
189
  <div
@@ -191,21 +191,21 @@
191
191
  class="form-group">
192
192
  <label class="font_normal_body">发卡状态</label>
193
193
  <v-select :options='$parent.$parent.f_whether_hairpin' :value.sync="model.f_whether_hairpin"
194
- close-on-select condition="f_whether_hairpin = '{}'"
194
+ close-on-select condition="tuf.f_whether_hairpin = '{}'"
195
195
  placeholder='发卡状态' v-model="model.f_whether_hairpin"></v-select>
196
196
  </div>
197
197
  <div
198
198
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
199
199
  class="form-group">
200
200
  <label class="font_normal_body">卡&emsp;&emsp;号</label>
201
- <input class="input_search" condition="f_card_id = '{}'" placeholder='卡号' style="width:60%"
201
+ <input class="input_search" condition="tuf.f_card_id = '{}'" placeholder='卡号' style="width:60%"
202
202
  type="text" v-model="model.f_card_id">
203
203
  </div>
204
204
  <div
205
205
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
206
206
  class="form-group">
207
207
  <label class="font_normal_body">用&nbsp;&nbsp;气&nbsp;点</label>
208
- <input class="input_search" condition="f_userfiles_address like '%{}%'" placeholder='用气点名称' style="width:60%"
208
+ <input class="input_search" condition="tuf.f_userfiles_address like '%{}%'" placeholder='用气点名称' style="width:60%"
209
209
  type="text" v-model="model.f_userfiles_address">
210
210
  </div>
211
211
  <div
@@ -213,7 +213,7 @@
213
213
  class="form-group">
214
214
  <label class="font_normal_body" style="width: auto">天然气证</label>
215
215
  <v-select :options='$parent.$parent.usegas' :value.sync="model.f_send_usegas_card"
216
- close-on-select condition="f_send_usegas_card='{}'"
216
+ close-on-select condition="u.f_send_usegas_card='{}'"
217
217
  placeholder='天然气使用证' v-model="model.f_send_usegas_card"></v-select>
218
218
  </div>
219
219
  <div
@@ -223,7 +223,7 @@
223
223
  <v-select :options='$parent.$parent.adjustables' :search='true'
224
224
  :value.sync="model.f_adjustable_id"
225
225
  close-on-select
226
- condition="f_adjustable_id = '{}'" placeholder='调压箱'
226
+ condition="tuf.f_adjustable_id = '{}'" placeholder='调压箱'
227
227
  v-model='model.f_adjustable_id'></v-select>
228
228
  </div>
229
229
  <div
@@ -233,7 +233,7 @@
233
233
  <v-select :options='$parent.$parent.useoptions' :search='true'
234
234
  :value.sync="model.f_usetype"
235
235
  close-on-select
236
- condition="f_usetype = '{}'" placeholder='使用类型'
236
+ condition="tuf.f_usetype = '{}'" placeholder='使用类型'
237
237
  v-model='model.f_usetype'></v-select>
238
238
  </div>
239
239
  <div class="col-sm-2 form-group">
@@ -242,14 +242,14 @@
242
242
  :options='$parent.$parent.meterbooks' placeholder='抄表册'
243
243
  style="width:60%"
244
244
  close-on-select
245
- condition="f_meter_book_num = '{}'"></v-select>
245
+ condition="tuf.f_meter_book_num = '{}'"></v-select>
246
246
  </div>
247
247
  <div
248
248
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
249
249
  class="form-group">
250
250
  <label class="font_normal_body">工业备注</label>
251
251
  <v-select :options='$parent.$parent.industrycomments' :value.sync="model.f_gongye_type"
252
- close-on-select condition="f_gongye_type='{}'"
252
+ close-on-select condition="tuf.f_gongye_type='{}'"
253
253
  placeholder='工业备注' v-model="model.f_gongye_type"></v-select>
254
254
  </div>
255
255
  <div :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
@@ -257,7 +257,7 @@
257
257
  <label class="font_normal_body" title="建档开始时间">开始时间</label>
258
258
  <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
259
259
  class="datepicker"
260
- condition="f_createfile_date >= '{} 00:00:00' "
260
+ condition="u.f_createfile_date >= '{} 00:00:00' "
261
261
  placeholder="建档开始时间"
262
262
  style="width:60%"
263
263
  v-model="model.f_start_date"
@@ -268,7 +268,7 @@
268
268
  <label class="font_normal_body" title="建档结束时间">结束时间</label>
269
269
  <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
270
270
  class="datepicker"
271
- condition="f_createfile_date <= '{} 23:59:59' "
271
+ condition="u.f_createfile_date <= '{} 23:59:59' "
272
272
  placeholder="建档结束时间"
273
273
  style="width:60%"
274
274
  v-model="model.f_end_date"
@@ -278,14 +278,14 @@
278
278
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
279
279
  class="form-group">
280
280
  <label class="font_normal_body">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
281
- <input class="input_search" condition="f_meternumber ='{}'" placeholder='表号' style="width:60%"
281
+ <input class="input_search" condition="tuf.f_meternumber ='{}'" placeholder='表号' style="width:60%"
282
282
  type="text" v-model="model.f_meternumber">
283
283
  </div>
284
284
  <div :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
285
285
  class="form-group">
286
286
  <label class="font_normal_body">入户证号</label>
287
287
  <input type="text" class="input_search" style="width:60%" v-model="model.f_enter_number"
288
- condition="f_enter_number = '{}'" placeholder='入户证号'
288
+ condition="a.f_enter_number = '{}'" placeholder='入户证号'
289
289
  >
290
290
  </div>
291
291
  </div>
@@ -508,7 +508,7 @@ let loadParamGem = async function (self) {
508
508
  return {
509
509
  iswork: false,
510
510
  isShowDetailInfo: false,
511
- meterbooks:[{label: '全部',value: ''}], //抄表册
511
+ meterbooks: [{label: '全部', value: ''}], // 抄表册
512
512
  config: {
513
513
  createType: ['address', 'area'], // 建档方式： address-地址建档 area-小区建档
514
514
  hasLimit: true
@@ -532,7 +532,7 @@ let loadParamGem = async function (self) {
532
532
  dep: [],
533
533
  user: []
534
534
  },
535
- orgcondition: ' and f_orgid = ' + this.$login.f.orgid,
535
+ orgcondition: ' and u.f_orgid = ' + this.$login.f.orgid,
536
536
  createFile: false,
537
537
 
538
538
  curorgid: [this.$login.f.orgid],
@@ -611,27 +611,24 @@ let loadParamGem = async function (self) {
611
611
  this.meterbooks = [...this.meterbooks, ...this.$GetSaleParam.getMeterBooks()]
612
612
  },
613
613
  getRes (obj) {
614
- console.log("-----------------")
615
- this.orgcondition = obj
616
- if(this.$refs.paged.$refs.criteria.$refs.sel.depresid.length>0){
617
- this.f_filialeid=this.$refs.paged.$refs.criteria.$refs.sel.depresid[0]
618
- }else{
619
- this.f_filialeid=this.$login.f.orgid
614
+ console.log('-----------------')
615
+ this.orgcondition = obj.replace('f_orgid', 'u.f_orgid').replace('f_depid', 'u.f_depid').replace('f_operatorid', 'u.f_operatorid')
616
+ if (this.$refs.paged.$refs.criteria.$refs.sel.depresid.length > 0) {
617
+ this.f_filialeid = this.$refs.paged.$refs.criteria.$refs.sel.depresid[0]
618
+ } else {
619
+ this.f_filialeid = this.$login.f.orgid
620
620
  }
621
-
622
621
  },
623
- downloadFiles(){
624
- let downurl='rs/downloadfile/file?filename=批量建档导出Excel模板';
625
- this.$resetget(downurl,{}).then(res=>{
626
- var link = document.createElement('a');
627
- link.target="_blank"
628
- link.href =downurl ;
629
- link.setAttribute("download", "批量建档导出Excel模板.xlsx"); //指定下载后的文件名，防跳转
630
- document.body.appendChild(link);
631
- link.click();
622
+ downloadFiles () {
623
+ let downurl = 'rs/downloadfile/file?filename=批量建档导出Excel模板'
624
+ this.$resetget(downurl, {}).then(res => {
625
+ var link = document.createElement('a')
626
+ link.target = '_blank'
627
+ link.href = downurl
628
+ link.setAttribute('download', '批量建档导出Excel模板.xlsx') // 指定下载后的文件名，防跳转
629
+ document.body.appendChild(link)
630
+ link.click()
632
631
  })
633
-
634
-
635
632
  },
636
633
  /**
637
634
  * 退出用户详细信息页面
@@ -762,8 +759,8 @@ let loadParamGem = async function (self) {
762
759
  count++
763
760
  })
764
761
  await this.$resetpost('rs/logic/saveCancellation', {infoIds: infoIds}, {resolveMsg: null, rejectMsg: '批量销户失败'}).then((res) => {
765
- if(res && res.data){
766
- this.$showMessage(`本次批量销户总计: ${res.data.allnum}户 ,成功: ${res.data.successnum}户 ,失败(已经销户): ${res.data.errornum2} 户,失败(待审核): ${res.data.errornum1}户 `);
762
+ if (res && res.data) {
763
+ this.$showMessage(`本次批量销户总计: ${res.data.allnum}户 ,成功: ${res.data.successnum}户 ,失败(已经销户): ${res.data.errornum2} 户,失败(待审核): ${res.data.errornum1}户 `)
767
764
  }
768
765
  this.xiaohushow = false
769
766
  this.close()
package/src/filiale/qianneng/FilesManageNew/FileUserFiles.vue CHANGED
@@ -24,7 +24,7 @@
24
24
  class="form-group"
25
25
  v-if="$parent.$parent.clientWidth>1600">
26
26
  <label class="font_normal_body">客户编号</label>
27
- <input class="input_search" condition="f_userinfo_code = '{}'"
27
+ <input class="input_search" condition="u.f_userinfo_code = '{}'"
28
28
  placeholder='客户编号'
29
29
  style="width:60%" type="text" v-model="model.f_userinfo_code">
30
30
  </div>
@@ -32,7 +32,7 @@
32
32
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
33
33
  class="form-group" v-if="!$parent.$parent.createFile">
34
34
  <label class="font_normal_body">客户名称</label>
35
- <input class="input_search" condition="f_user_name = '{}'"
35
+ <input class="input_search" condition="u.f_user_name like '%{}%'"
36
36
  placeholder='客户姓名'
37
37
  style="width:60%" type="text" v-model="model.f_user_name">
38
38
  </div>
@@ -93,7 +93,7 @@
93
93
  class="form-group"
94
94
  v-if="$parent.$parent.clientWidth<1600&&$parent.$parent.createFile">
95
95
  <label class="font_normal_body">客户编号</label>
96
- <input class="input_search" condition="f_userinfo_code = '{}'"
96
+ <input class="input_search" condition="u.f_userinfo_code = '{}'"
97
97
  placeholder='客户编号'
98
98
  style="width:60%" type="text" v-model="model.f_userinfo_code">
99
99
  </div>
@@ -101,7 +101,7 @@
101
101
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
102
102
  class="form-group" v-if="$parent.$parent.createFile">
103
103
  <label class="font_normal_body">客户名称</label>
104
- <input class="input_search" condition="f_user_name = '{}'"
104
+ <input class="input_search" condition="u.f_user_name = '{}'"
105
105
  placeholder='客户姓名'
106
106
  style="width:60%" type="text" v-model="model.f_user_name">
107
107
  </div>
@@ -109,7 +109,7 @@
109
109
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
110
110
  class="form-group">
111
111
  <label class="font_normal_body">旧客户号</label>
112
- <input class="input_search" condition="f_olduserinfo_code = '{}'" placeholder='客户编号'
112
+ <input class="input_search" condition="u.f_olduserinfo_code = '{}'" placeholder='客户编号'
113
113
  style="width:60%"
114
114
  type="text"
115
115
  v-model="model.f_olduserinfo_code">
@@ -119,14 +119,14 @@
119
119
  class="form-group">
120
120
  <label class="font_normal_body">用气性质</label>
121
121
  <v-select :options='$parent.$parent.gasproperties' :value.sync="model.f_gasproperties"
122
- close-on-select condition="f_gasproperties='{}'"
122
+ close-on-select condition="tuf.f_gasproperties='{}'"
123
123
  placeholder='用气性质' v-model="model.f_gasproperties"></v-select>
124
124
  </div>
125
125
  <div
126
126
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
127
127
  class="form-group">
128
128
  <label class="font_normal_body">客户电话</label>
129
- <input class="input_search" condition="f_user_phone = '{}'" placeholder='客户电话' style="width:60%"
129
+ <input class="input_search" condition="u.f_user_phone = '{}'" placeholder='客户电话' style="width:60%"
130
130
  type="text"
131
131
  v-model="model.f_user_phone">
132
132
  </div>
@@ -134,7 +134,7 @@
134
134
  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
135
135
  class="form-group">
136
136
  <label class="font_normal_body">客户地址</label>
137
- <input class="input_search" condition="f_address like '%{}%'" placeholder='客户地址' style="width:60%"
137
+ <input class="input_search" condition="a.f_address like '%{}%'" placeholder='客户地址' style="width:60%"
138
138
  type="text" v-model="model.f_address">
139
139
  </div>
140
140
  <div
@@ -142,7 +142,7 @@
142
142
  class="form-group">
143
143
  <label class="font_normal_body">客户状态</label>
144
144
  <v-select :options='$parent.$parent.userstates' :value.sync="model.f_user_state"
145
- close-on-select condition="f_user_state='{}'"
145
+ close-on-select condition="u.f_user_state='{}'"
146
146
  :value-single="true"
147
147
  placeholder='客户状态' v-model="model.f_user_state"></v-select>
148
148
  </div>
@@ -153,7 +153,7 @@
153
153
  <v-select :options='$parent.$parent.adjustables' :search='true'
154
154
  :value.sync="model.f_adjustable_id"
155
155
  close-on-select
156
- condition="f_adjustable_id = '{}'" placeholder='调压箱'
156
+ condition="tuf.f_adjustable_id = '{}'" placeholder='调压箱'
157
157
  v-model='model.f_adjustable_id'></v-select>
158
158
  </div>
159
159
  <div
@@ -161,7 +161,7 @@
161
161
  class="form-group">
162
162
  <label class="font_normal_body">建档时间</label>
163
163
  <datepicker placeholder="开始日期" v-model="model.startDate" :value.sync="model.startDate" style="width:60%"
164
- :format="'yyyy-MM-dd'" condition="f_createfile_date >= '{}'">
164
+ :format="'yyyy-MM-dd'" condition="u.f_createfile_date >= '{}'">
165
165
  </datepicker>
166
166
  </div>
167
167
  <div
@@ -169,7 +169,7 @@
169
169
  class="form-group">
170
170
  <label class="font_normal_body">&emsp;&ensp;至&ensp;&emsp;</label>
171
171
  <datepicker placeholder="结束日期" v-model="model.endDate" :value.sync="model.endDate" style="width:60%"
172
- :format="'yyyy-MM-dd'" condition="f_createfile_date <= '{}'">
172
+ :format="'yyyy-MM-dd'" condition="u.f_createfile_date <= '{}'">
173
173
  </datepicker>
174
174
  </div>
175
175
  <div
@@ -177,7 +177,7 @@
177
177
  class="form-group">
178
178
  <label class="font_normal_body">打印时间</label>
179
179
  <datepicker placeholder="开始日期" v-model="model.startPrintDate" :value.sync="model.startPrintDate" style="width:60%"
180
- :format="'yyyy-MM-dd'" condition="f_printdate >= '{}'">
180
+ :format="'yyyy-MM-dd'" condition="p.f_print_time >= '{}'">
181
181
  </datepicker>
182
182
  </div>
183
183
  <div
@@ -185,7 +185,7 @@
185
185
  class="form-group">
186
186
  <label class="font_normal_body">打印时间</label>
187
187
  <datepicker placeholder="结束日期" v-model="model.endPrintDate" :value.sync="model.endPrintDate" style="width:60%"
188
- :format="'yyyy-MM-dd'" condition="f_printdate <= '{}'">
188
+ :format="'yyyy-MM-dd'" condition="p.f_print_time <= '{}'">
189
189
  </datepicker>
190
190
  </div>
191
191
  <div
@@ -193,14 +193,14 @@
193
193
  class="form-group">
194
194
  <label class="font_normal_body">工业备注</label>
195
195
  <v-select :options='$parent.$parent.industrycomments' :value.sync="model.f_industry_comments"
196
- close-on-select condition="f_industry_comments='{}'"
196
+ close-on-select condition="tuf.f_gongye_type='{}'"
197
197
  placeholder='气表类型' v-model="model.f_industry_comments"></v-select>
198
198
  </div>
199
199
  <div :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
200
200
  class="form-group">
201
201
  <label class="font_normal_body">入户证号</label>
202
202
  <input type="text" class="input_search" style="width:60%" v-model="model.f_enter_number"
203
- condition="f_enter_number = '{}'" placeholder='入户证号'
203
+ condition="a.f_enter_number = '{}'" placeholder='入户证号'
204
204
  >
205
205
  </div>
206
206
  <!--:class="{'col-sm-3':$parent.$parent.clientWidth>1600||!$parent.$parent.createFile,'col-sm-4':$parent.$parent.clientWidth<1600&&$parent.$parent.createFile}"-->
@@ -555,7 +555,7 @@ let loadParamGem = async function (self) {
555
555
  if (!this.f_filialeid) {
556
556
  this.f_filialeid = this.$login.f.orgid
557
557
  }
558
- args.condition = `${args.condition} and f_filialeid = '${this.f_filialeid}'`
558
+ args.condition = `${args.condition} and tuf.f_filialeid = '${this.f_filialeid}'`
559
559
  this.criteriaShow = false
560
560
  this.$refs.paged.$refs.grid.$el.scrollTop = 0
561
561
  this.model.search(args.condition, args.model)
package/src/main.js CHANGED
@@ -1,27 +1,27 @@
1
- import Vue from 'vue'
2
- import all from 'vue-client/src/all'
3
- import App from './App'
4
- import system from 'system-clients/src/system'
5
- import sale from './sale'
6
- import wenxi from './filiale/lixianV3/sale'
7
- // import FilialeSale from './filiale/yuansheng/sale'
8
- import address from 'address-client/src/address'
9
- import ldap from 'ldap-clients/src/ldap'
10
- import VueClipboard from 'vue-clipboard2'
11
-
12
- Vue.use(VueClipboard)
13
- Vue.config.silent = true
14
-
15
- all()
16
- system(false)
17
- sale()
18
- wenxi()
19
- // FilialeSale()
20
- address()
21
- ldap()
22
- require('system-clients/src/styles/less/bootstrap.less')
23
-
24
- new Vue({
25
- el: 'body',
26
- components: { App }
27
- })
1
+ import Vue from 'vue'
2
+ import all from 'vue-client/src/all'
3
+ import App from './App'
4
+ import system from 'system-clients/src/system'
5
+ import sale from './sale'
6
+ import wenxi from './filiale/qianneng/sale'
7
+ // import FilialeSale from './filiale/yuansheng/sale'
8
+ import address from 'address-client/src/address'
9
+ import ldap from 'ldap-clients/src/ldap'
10
+ import VueClipboard from 'vue-clipboard2'
11
+
12
+ Vue.use(VueClipboard)
13
+ Vue.config.silent = true
14
+
15
+ all()
16
+ system(false)
17
+ sale()
18
+ wenxi()
19
+ // FilialeSale()
20
+ address()
21
+ ldap()
22
+ require('system-clients/src/styles/less/bootstrap.less')
23
+
24
+ new Vue({
25
+ el: 'body',
26
+ components: { App }
27
+ })