diff --git a/src/components/Search/index.vue b/src/components/Search/index.vue index 2dba1af2..36ff614a 100644 --- a/src/components/Search/index.vue +++ b/src/components/Search/index.vue @@ -145,6 +145,7 @@ export default { search() { let whereValue let whereSql + console.log(this.wvalue, 'wvalue') if (this.searchVal) { if (this.control === 'date') { if (this.wsql) { @@ -161,7 +162,7 @@ export default { } else { if (this.wsql) { const Value = encodeURI(`\%${this.searchVal}\%`) - const where_sql = `(${this.wsql}=?) and ${Value} >= ?` + const where_sql = `(${this.wsql}) and (${this.where_sql} like ?)` const whereValue = `${this.wvalue};${Value}` const where_type = `${this.wtype};${this.where_type}` whereSql = `where_sql=${where_sql}&where_value=${whereValue}&where_type=${where_type}` @@ -171,9 +172,13 @@ export default { } } } else { - whereSql = `where_sql=&where_value=&where_type=` + if (this.wsql) { + whereSql = `where_sql=${this.wsql}&where_value=${this.wvalue}&where_type=${this.wtype}` + } else { + whereSql = `where_sql=&where_value=&where_type=` + } } - console.log(whereSql) + console.log(whereSql, '1231') this.$emit('search', `${whereSql}`) } } diff --git a/src/views/insp_name/components/insp_item/api/index.js b/src/views/insp_name/components/insp_item/api/index.js index 6cc3a7c1..bb46a968 100644 --- a/src/views/insp_name/components/insp_item/api/index.js +++ b/src/views/insp_name/components/insp_item/api/index.js @@ -1,7 +1,11 @@ import request from '@/utils/request' export default { - getDate(id, pageSize, pageNo, whereSql) { + getDate(id, pageSize, pageNo, whereSql, isWhereSql) { + console.log(isWhereSql, 'isWhereSql') + if (!isWhereSql) { + whereSql = `where_sql=insp_item.insp_name_id = ?&where_value=${id}&where_type=string` + } return request({ url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=subeditgrid&query_funid=insp_item&user_id=administrator`, method: 'post', diff --git a/src/views/insp_name/components/insp_item/index.vue b/src/views/insp_name/components/insp_item/index.vue index ca08ac55..f11da6c8 100644 --- a/src/views/insp_name/components/insp_item/index.vue +++ b/src/views/insp_name/components/insp_item/index.vue @@ -5,7 +5,7 @@
- + { if (data.success) { this.data = data.data.root @@ -183,7 +187,7 @@ export default { }, search(sql) { this.whereSql = sql - this.getList() + this.getList(this.id, true) }, editCreate() { this.title = '新增' diff --git a/src/views/insp_name/index.vue b/src/views/insp_name/index.vue index a6c716f2..b29410de 100644 --- a/src/views/insp_name/index.vue +++ b/src/views/insp_name/index.vue @@ -255,7 +255,7 @@ export default { }, rowClick(row) { this.id = row.insp_name__insp_name_id - this.$refs.inspItem.getList(this.id) + this.$refs.inspItem.getList(this.id, false) }, closeDialog() { this.dialogFormVisible = false diff --git a/src/views/safe_insp/components/insp_det/api/index.js b/src/views/safe_insp/components/insp_det/api/index.js index d988b6fb..47acfd4a 100644 --- a/src/views/safe_insp/components/insp_det/api/index.js +++ b/src/views/safe_insp/components/insp_det/api/index.js @@ -1,11 +1,11 @@ import request from '@/utils/request' export default { - getDate(id, pageSize, pageNo, isWhereSql, whereValue) { + getDate(id, pageSize, pageNo, whereSql) { return request({ url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=subeditgrid&query_funid=insp_det&user_id=administrator`, method: 'post', - data: `start=${pageNo}&limit=${pageSize}&where_sql=insp_det.safe_insp_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0` + data: `start=${pageNo}&limit=${pageSize}&${whereSql}&is_query=1&query_type=0` }).then(response => response.data) }, getDeptTree() { diff --git a/src/views/safe_insp/components/insp_det/index.vue b/src/views/safe_insp/components/insp_det/index.vue index f29577d4..0d526ee1 100644 --- a/src/views/safe_insp/components/insp_det/index.vue +++ b/src/views/safe_insp/components/insp_det/index.vue @@ -196,7 +196,7 @@ export default { treeList: [], whereSql: '', whereValue: '', - where_sql: 'insp_item.insp_name_id = ?', + where_sql: 'insp_det.safe_insp_id = ?', where_value: this.$props.id, where_type: 'string', dialogUploadVisible: false @@ -233,6 +233,7 @@ export default { }) }, search(sql) { + console.log(sql, 'sqlsql ') this.whereSql = sql this.getList() },