From 2e424eecb39e0fb4b786cdd164b4d22c69b59320 Mon Sep 17 00:00:00 2001 From: wangpeng Date: Sat, 27 Jan 2024 18:09:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=A3=80=E6=9F=A5=E9=A1=B9?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=20=E7=B1=BB=E7=9B=AE?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=92=8C=E6=A3=80=E6=9F=A5=E9=A1=B9=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E6=98=AF=E5=90=A6=E5=B7=B2=E8=A2=AB=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/components/info.vue | 4 ++-- .../common/components/itemEdit.vue | 21 +++++++++++++++---- .../common/components/itemInfo.vue | 21 ++++++++++++------- .../common/components/itemList.vue | 11 +++++++--- .../common/components/list.vue | 2 +- .../dictionary/components/list.vue | 9 ++++---- 6 files changed, 46 insertions(+), 22 deletions(-) diff --git a/src/views/hiddenDangerCheckStandardLibrary/common/components/info.vue b/src/views/hiddenDangerCheckStandardLibrary/common/components/info.vue index 45465d5..cc47df7 100644 --- a/src/views/hiddenDangerCheckStandardLibrary/common/components/info.vue +++ b/src/views/hiddenDangerCheckStandardLibrary/common/components/info.vue @@ -9,10 +9,10 @@ 标准名称 {{ form.CHECK_STANDARD_NAME }} - + 标准明细 diff --git a/src/views/hiddenDangerCheckStandardLibrary/common/components/itemEdit.vue b/src/views/hiddenDangerCheckStandardLibrary/common/components/itemEdit.vue index 75ac908..a0e23b0 100644 --- a/src/views/hiddenDangerCheckStandardLibrary/common/components/itemEdit.vue +++ b/src/views/hiddenDangerCheckStandardLibrary/common/components/itemEdit.vue @@ -43,6 +43,11 @@ + + + + +
取 消 @@ -74,6 +79,10 @@ export default { { id: 1, name: '选择' }, { id: 2, name: '填写' } ], + commonItemStatusList: [ + { id: 1, name: '有效' }, + { id: 2, name: '停用' } + ], tempData: { CHECK_CATEGORY: '', CHECK_ITEM: '' @@ -90,7 +99,8 @@ export default { CHECK_QUALIFIED: '', CHECK_UNQUALIFIED: '', OPERATION_TYPE: '', - COMMON_ITEM_SORT: '' + COMMON_ITEM_SORT: '', + COMMON_ITEM_STATUS: '' }, rules: { CHECK_CATEGORY: [{ required: true, message: '标准类别不能为空', trigger: 'blur' }], @@ -101,7 +111,8 @@ export default { CHECK_QUALIFIED: [{ required: true, message: '检查合格项不能为空', trigger: 'blur' }], CHECK_UNQUALIFIED: [{ required: true, message: '检查不合格项不能为空', trigger: 'blur' }], OPERATION_TYPE: [{ required: true, message: '操作类型不能为空', trigger: 'blur' }], - COMMON_ITEM_SORT: [{ required: true, message: '排序不能为空', trigger: 'blur' }] + COMMON_ITEM_SORT: [{ required: true, message: '排序不能为空', trigger: 'blur' }], + COMMON_ITEM_STATUS: [{ required: true, message: '状态不能为空', trigger: 'blur' }] }, listQuery: { page: 1, @@ -118,6 +129,7 @@ export default { this.visible = true this.checkCategoryList = e.checkCategoryList this.checkItemAllList = e.checkItemAllList + this.form.COMMON_ID = e.form.COMMON_ID this.form.COMMON_ITEM_SORT = e.form.COMMON_ITEM_SORT if (e.form.COMMON_ITEM_ID) { this.checkItemList = this.checkItemAllList.filter(item => item.PARENT_IDS.includes(e.form.CHECK_CATEGORY)) @@ -127,8 +139,8 @@ export default { this.tempData.CHECK_CATEGORY = e.form.CHECK_CATEGORY this.tempData.CHECK_ITEM = e.form.CHECK_ITEM this.$set(this.form, 'CHECK_CATEGORY_WAY', 'select') - console.log(this.form) } + console.log(this.form) }, changeEditWay() { this.form.CHECK_CATEGORY_WAY = this.form.CHECK_CATEGORY_WAY === 'select' ? 'value' : 'select' @@ -183,7 +195,8 @@ export default { CHECK_QUALIFIED: '', CHECK_UNQUALIFIED: '', OPERATION_TYPE: '', - COMMON_ITEM_SORT: '' + COMMON_ITEM_SORT: '', + COMMON_ITEM_STATUS: '' } }, close() { diff --git a/src/views/hiddenDangerCheckStandardLibrary/common/components/itemInfo.vue b/src/views/hiddenDangerCheckStandardLibrary/common/components/itemInfo.vue index 7c033a3..c9a4c07 100644 --- a/src/views/hiddenDangerCheckStandardLibrary/common/components/itemInfo.vue +++ b/src/views/hiddenDangerCheckStandardLibrary/common/components/itemInfo.vue @@ -3,33 +3,35 @@ - + - + - + - + - + - + - + + + @@ -59,14 +61,17 @@ export default { COMMON_ITEM_ID: '', COMMON_ID: '', CHECK_CATEGORY: '', + CHECK_CATEGORY_NAME: '', CHECK_ITEM: '', + CHECK_ITEM_NAME: '', CHECK_CONTENT: '', CHECK_STANDARD: '', REFERENCE_BASIS: '', CHECK_QUALIFIED: '', CHECK_UNQUALIFIED: '', OPERATION_TYPE: '', - COMMON_ITEM_SORT: '' + COMMON_ITEM_SORT: '', + COMMON_ITEM_STATUS: '' } } }, diff --git a/src/views/hiddenDangerCheckStandardLibrary/common/components/itemList.vue b/src/views/hiddenDangerCheckStandardLibrary/common/components/itemList.vue index 3102b7b..f301ce1 100644 --- a/src/views/hiddenDangerCheckStandardLibrary/common/components/itemList.vue +++ b/src/views/hiddenDangerCheckStandardLibrary/common/components/itemList.vue @@ -64,12 +64,17 @@ {{ row.OPERATION_TYPE ? (row.OPERATION_TYPE === 1 ? '选择' : '填写') : '' }} + + + @@ -191,7 +196,7 @@ export default { }, handleAdd() { const data = {} - data.form = JSON.parse(JSON.stringify({ COMMON_ITEM_SORT: this.total + 1 })) + data.form = JSON.parse(JSON.stringify({ COMMON_ID: this.$parent.COMMON_ID, COMMON_ITEM_SORT: this.total + 1 })) data.checkCategoryList = this.checkCategoryList data.checkItemAllList = this.checkItemAllList this.$refs.edit.init(data) diff --git a/src/views/hiddenDangerCheckStandardLibrary/common/components/list.vue b/src/views/hiddenDangerCheckStandardLibrary/common/components/list.vue index 6442f0e..5586ecf 100644 --- a/src/views/hiddenDangerCheckStandardLibrary/common/components/list.vue +++ b/src/views/hiddenDangerCheckStandardLibrary/common/components/list.vue @@ -88,7 +88,7 @@ 追加导入清单详细编辑 - 删除 + 删除 diff --git a/src/views/hiddenDangerCheckStandardLibrary/dictionary/components/list.vue b/src/views/hiddenDangerCheckStandardLibrary/dictionary/components/list.vue index 53a750b..33e61ff 100644 --- a/src/views/hiddenDangerCheckStandardLibrary/dictionary/components/list.vue +++ b/src/views/hiddenDangerCheckStandardLibrary/dictionary/components/list.vue @@ -55,18 +55,19 @@
+ 刷新 - 删除 +
- +
行业类型{{ form.CHECK_CATEGORY_NAME }}{{ form.CHECK_CATEGORY_NAME }} 标准项目{{ form.CHECK_ITEM_NAME }}{{ form.CHECK_ITEM_NAME }}
检查内容{{ form.CHECK_CONTENT }}{{ form.CHECK_CONTENT }}
检查标准{{ form.CHECK_STANDARD }}{{ form.CHECK_STANDARD }}
参考依据{{ form.REFERENCE_BASIS }}{{ form.REFERENCE_BASIS }}
检查合格项{{ form.CHECK_QUALIFIED }}{{ form.CHECK_QUALIFIED }}
检查不合格项{{ form.CHECK_UNQUALIFIED }}{{ form.CHECK_UNQUALIFIED }}
操作类型 {{ form.OPERATION_TYPE ? (form.OPERATION_TYPE === 1 ? '选择' : '填写') : '' }}状态{{ form.COMMON_ITEM_STATUS ? (form.COMMON_ITEM_STATUS === 1 ? '有效' : '停用') : '' }} 排序 {{ form.COMMON_ITEM_SORT }}