apply-clients 3.1.49 → 3.1.50

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 (2) hide show
  1. package/package.json +1 -1
  2. package/src/components/product/Supervisory/SupervisoryList2.vue +60 -56
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.1.49",
3
+ "version": "3.1.50",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/product/Supervisory/SupervisoryList2.vue CHANGED
@@ -199,9 +199,12 @@
199
199
  data() {
200
200
  return {
201
201
  applytype: [{label:"全部",value:''}, {label:"集中报建",value:'集中报建'}, {label:"非民用报建",value:'非民用报建'},{label:"散户报建",value:'散户报建'}],
202
- model: {
203
- data:null
204
- },
202
+ model: new PagedList('rs/sql/supervisory2', 20, {
203
+ data: {
204
+ id: `${this.$login.f.id}`,
205
+ org: `${this.$login.f.orgs}`
206
+ }
207
+ }),
205
208
  defnames:[], // 所有流程节点
206
209
  condition: '', // 查询条件
207
210
  criteriaShow: false,
@@ -237,58 +240,59 @@
237
240
  },
238
241
  //获取当前登录人已处理过的流程ID
239
242
  async searchCondition() {
240
- let http = new HttpResetClass()
241
- let data = {
242
- org: `${this.$login.f.orgs}`
243
- }
244
- let res = await http.load('POST', 'rs/sql/getActor', {data: data}, {
245
- resolveMsg: null,
246
- rejectMsg: '查询角色失败'
247
- })
248
- let x = []
249
- for (let i = 0; i < res.data.length; i++) {
250
- if (this.$login.f.f_role_name.includes(res.data[i].actor)) {
251
- x.push(res.data[i].processid)
252
- }
253
- }
254
- this.processids = JSON.stringify(x)
255
-
256
- console.log("x的数据", this.processids)
243
+ // let http = new HttpResetClass()
244
+ // let data = {
245
+ // org: `${this.$login.f.orgs}`
246
+ // }
247
+ // let res = await http.load('POST', 'rs/sql/getActor', {data: data}, {
248
+ // resolveMsg: null,
249
+ // rejectMsg: '查询角色失败'
250
+ // })
251
+ // let x = []
252
+ // for (let i = 0; i < res.data.length; i++) {
253
+ // if (this.$login.f.f_role_name.includes(res.data[i].actor)) {
254
+ // x.push(res.data[i].processid)
255
+ // }
256
+ // }
257
+ // this.processids = JSON.stringify(x)
258
+ //
259
+ // console.log("x的数据", this.processids)
257
260
  },
258
261
  async search() {
259
- let http = new HttpResetClass()
260
- let data = {
261
- org: `${this.$login.f.orgs}`
262
- }
263
- let res = await http.load('POST', 'rs/sql/getActor', {data: data}, {
264
- resolveMsg: null,
265
- rejectMsg: '查询角色失败'
266
- })
267
- let x = []
268
- for (let i = 0; i < res.data.length; i++){
269
- if (this.$login.f.f_role_name.includes(res.data[i].actor)){
270
- x.push(res.data[i].processid)
271
- }
272
- }
273
- this.processids = JSON.stringify(x)
274
- console.log("x的数据",this.processids)
275
- data = {
276
- condition: '1=1',
277
- x:this.processids,
278
- org: `${this.$login.f.orgs}`
279
- }
280
- if (this.$refs.cp.$refs.cri.condition){
281
- data.condition = data.condition + 'and' +this.$refs.cp.$refs.cri.condition
282
- }
283
- this.condition = data.condition
284
- res = await http.load('POST', 'rs/sql/supervisory2', {data: data}, {
285
- resolveMsg: null,
286
- rejectMsg: '查询失败'
287
- })
288
- console.log("当前数据",res.data)
289
- this.model.data = res.data
262
+ console.log("测试1",this.$login.f.id)
263
+ // let http = new HttpResetClass()
264
+ // let data = {
265
+ // org: `${this.$login.f.orgs}`
266
+ // }
267
+ // let res = await http.load('POST', 'rs/sql/getActor', {data: data}, {
268
+ // resolveMsg: null,
269
+ // rejectMsg: '查询角色失败'
270
+ // })
271
+ // let x = []
272
+ // for (let i = 0; i <= res.data.length; i++){
273
+ // if (this.$login.f.f_role_name.includes(res.data[i].actor)){
274
+ // x.push(res.data[i].processid)
275
+ // }
276
+ // }
277
+ // this.processids = JSON.stringify(x)
278
+ // console.log("x的数据",this.processids)
279
+ // data = {
280
+ // condition: '1=1',
281
+ // x:this.processids,
282
+ // org: `${this.$login.f.orgs}`
283
+ // }
284
+ // if (this.$refs.cp.$refs.cri.condition){
285
+ // data.condition = data.condition + 'and' +this.$refs.cp.$refs.cri.condition
286
+ // }
287
+ // this.condition = data.condition
288
+ // res = await http.load('POST', 'rs/sql/supervisory2', {data: data}, {
289
+ // resolveMsg: null,
290
+ // rejectMsg: '查询失败'
291
+ // })
292
+ // console.log("当前数据",res.data)
293
+ // this.model.data = res.data
290
294
  // 调用查询
291
- // this.$refs.cp.$refs.cri.search()
295
+ this.$refs.cp.$refs.cri.search()
292
296
  },
293
297
  hidden() {
294
298
  this.$dispatch('hidden', this.criteriaShow)
@@ -331,12 +335,12 @@
331
335
  getCondition () {
332
336
  console.log("condition",this.$refs.cp.$refs.cri.condition)
333
337
  return {
334
- condition: this.condition,
335
- org: `${this.$login.f.orgs}`,
336
- x: this.processids,
338
+ condition: this.$refs.cp.$refs.cri.condition,
339
+ // org: `${this.$login.f.orgs}`,
340
+ // x: this.processids,
337
341
  data: {
338
342
  org: `${this.$login.f.orgs}`,
339
- orgid: this.$login.f.orgid
343
+ id: `${this.$login.f.id}`
340
344
  }
341
345
  }
342
346
  }