diff --git a/src/components/CascaderDict/index.vue b/src/components/CascaderDict/index.vue index 6243369..7bf90df 100644 --- a/src/components/CascaderDict/index.vue +++ b/src/components/CascaderDict/index.vue @@ -1,15 +1,18 @@ + + + diff --git a/src/views/hiddenDangerCheckStandardLibrary/common/components/itemInfo.vue b/src/views/hiddenDangerCheckStandardLibrary/common/components/itemInfo.vue new file mode 100644 index 0000000..7c033a3 --- /dev/null +++ b/src/views/hiddenDangerCheckStandardLibrary/common/components/itemInfo.vue @@ -0,0 +1,94 @@ + + + + diff --git a/src/views/hiddenDangerCheckStandardLibrary/common/components/itemList.vue b/src/views/hiddenDangerCheckStandardLibrary/common/components/itemList.vue new file mode 100644 index 0000000..3102b7b --- /dev/null +++ b/src/views/hiddenDangerCheckStandardLibrary/common/components/itemList.vue @@ -0,0 +1,322 @@ + + diff --git a/src/views/hiddenDangerCheckStandardLibrary/common/components/list.vue b/src/views/hiddenDangerCheckStandardLibrary/common/components/list.vue index ff510e5..6442f0e 100644 --- a/src/views/hiddenDangerCheckStandardLibrary/common/components/list.vue +++ b/src/views/hiddenDangerCheckStandardLibrary/common/components/list.vue @@ -6,15 +6,34 @@ - + + + + + + + + + + + + + @@ -22,11 +41,11 @@ 搜索 - + 重置 - - 批量导入 + + 导入标准表 @@ -55,19 +74,21 @@ - - + + + + + @@ -111,45 +132,17 @@ export default { varList: [], title: '新增', dictId: 'f2598ba72e864eadabf0ca4b664d26b9', // 行业类型 - form: { + commonStatusList: [ + { id: 1, name: '有效' }, + { id: 2, name: '停用' } + ], + searchForm: { INDUSTRY_TYPE_ARR: [], INDUSTRY_TYPE_TREE: '', - CHECK_STANDARD_NAME: '' - }, - industry_type_list_rule: { - value: 'DICTIONARIES_ID', - label: 'NAME', - children: 'children', - lazy: true, - lazyLoad(node, resolve) { - if (!node.value) return - requestFN( - 'dictionaries/getLevels', { DICTIONARIES_ID: node.value } - ).then((data) => { - resolve(data.list) - }).catch((e) => { - console.log(e) - }) - } - }, - hidden_types_list_rule: { - value: 'DICTIONARIES_ID', - label: 'NAME', - children: 'children', - lazy: true, - lazyLoad(node, resolve) { - if (!node.value) return - requestFN( - 'dictionaries/getLevels', { DICTIONARIES_ID: node.value } - ).then((data) => { - resolve(data.list) - }).catch((e) => { - console.log(e) - }) - } - }, - industry_type_list: [], - hidden_types_list: [] + CHECK_STANDARD_NAME: '', + COMMON_STATUS: '', + CREATE_TIME: [] + } } }, created() { @@ -164,19 +157,27 @@ export default { this.getList() }, resetting() { - this.form = { + this.searchForm = { INDUSTRY_TYPE_ARR: [], INDUSTRY_TYPE_TREE: '', - CHECK_STANDARD_NAME: '' + CHECK_STANDARD_NAME: '', + COMMON_STATUS: '', + CREATE_TIME: [] } this.getList() }, getList() { this.listLoading = true - this.form.INDUSTRY_TYPE_TREE = this.form.INDUSTRY_TYPE_ARR.join(',') + this.searchForm.INDUSTRY_TYPE_TREE = this.searchForm.INDUSTRY_TYPE_ARR.join(',') requestFN( '/hiddenDangerCheckStandardCommon/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, - this.form + { + INDUSTRY_TYPE_TREE: this.searchForm.INDUSTRY_TYPE_TREE, + CHECK_STANDARD_NAME: this.searchForm.CHECK_STANDARD_NAME, + COMMON_STATUS: this.searchForm.COMMON_STATUS, + CREATE_TIME_BEGIN: this.searchForm.CREATE_TIME[0] || '', + CREATE_TIME_END: this.searchForm.CREATE_TIME[1] || '' + } ).then((data) => { this.listLoading = false this.varList = data.varList @@ -191,7 +192,7 @@ export default { this.title = '新增' }, handleEdit(row) { - this.$refs.edit.init(row) + this.$refs.edit.init(JSON.parse(JSON.stringify(row))) this.title = '编辑' }, handleDelete(id) { @@ -288,12 +289,21 @@ export default { this.hidden_types_list = data.list }).catch((e) => { console.log(e) }) }, - getInfo(e) { - this.$refs.info.init(e) + getInfo(row) { + this.$refs.info.init(row.COMMON_ID) this.title = '详情' }, - importExcel() { - this.$refs.updateFile.init() + getCommonItem(row) { + this.$parent.activeName = 'ItemList' + this.$parent.COMMON_ID = row.COMMON_ID + }, + importExcel(importType, row) { + const data = {} + if (importType !== 'import') { + data.form = JSON.parse(JSON.stringify(row)) + } + data.importType = importType + this.$refs.updateFile.init(data) }, getResult(e) { this.getList() diff --git a/src/views/hiddenDangerCheckStandardLibrary/common/components/updateFile.vue b/src/views/hiddenDangerCheckStandardLibrary/common/components/updateFile.vue index cf344b1..1515bfa 100644 --- a/src/views/hiddenDangerCheckStandardLibrary/common/components/updateFile.vue +++ b/src/views/hiddenDangerCheckStandardLibrary/common/components/updateFile.vue @@ -1,16 +1,24 @@ diff --git a/src/views/hiddenDangerCheckStandardLibrary/dictionary/components/info.vue b/src/views/hiddenDangerCheckStandardLibrary/dictionary/components/info.vue new file mode 100644 index 0000000..e8f098c --- /dev/null +++ b/src/views/hiddenDangerCheckStandardLibrary/dictionary/components/info.vue @@ -0,0 +1,82 @@ + + + + diff --git a/src/views/hiddenDangerCheckStandardLibrary/dictionary/components/list.vue b/src/views/hiddenDangerCheckStandardLibrary/dictionary/components/list.vue new file mode 100644 index 0000000..53a750b --- /dev/null +++ b/src/views/hiddenDangerCheckStandardLibrary/dictionary/components/list.vue @@ -0,0 +1,241 @@ + + diff --git a/src/views/hiddenDangerCheckStandardLibrary/dictionary/index.vue b/src/views/hiddenDangerCheckStandardLibrary/dictionary/index.vue new file mode 100644 index 0000000..224a889 --- /dev/null +++ b/src/views/hiddenDangerCheckStandardLibrary/dictionary/index.vue @@ -0,0 +1,18 @@ + +