From 00f1846d252558660bfc3383596bb61086b1402c Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 4 Jan 2024 11:33:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?style:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulatoryRepository/standQA/index.vue | 1526 +++++++++-------- 1 file changed, 801 insertions(+), 725 deletions(-) diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue index 82b697624..956ef953f 100644 --- a/src/pages/regulatoryRepository/standQA/index.vue +++ b/src/pages/regulatoryRepository/standQA/index.vue @@ -1,70 +1,95 @@ From 4a0476e2a6b2cbae87e1364241aacb8670704c37 Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 4 Jan 2024 11:54:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix(=E9=97=AE=E7=AD=94=E5=BA=93):=20?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=BC=B9=E7=AA=97=E6=97=B6=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E4=B8=AD=E7=9A=84=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulatoryRepository/standQA/index.vue | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue index 956ef953f..9ac3145aa 100644 --- a/src/pages/regulatoryRepository/standQA/index.vue +++ b/src/pages/regulatoryRepository/standQA/index.vue @@ -611,6 +611,7 @@ :visible.sync="answerListDrawer" size="900px" custom-class="demo-drawer" + :before-close="beforeClose" >
@@ -624,7 +625,7 @@
@@ -765,6 +766,20 @@ export default { this.toAnswer() }, methods: { + close () { + this.$router.push({ + name: 'StandQA', + query: {} + }) + this.answerListDrawer = false + }, + beforeClose (done) { + this.$router.push({ + name: 'StandQA', + query: {} + }) + done() + }, toAnswer () { if (this.$route.query && this.$route.query.id) { this.$http._getData('/lawss/AskQuestions/askQuestionById', { From a068eca37f770b7dab5691ee00780e674ca66d1f Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 5 Jan 2024 17:07:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?style:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 2785 +++++++++-------- 1 file changed, 1505 insertions(+), 1280 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 208873b46..ed7ebfc98 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -5,9 +5,9 @@
- + />
- - - {{ node.label }} - - - 新增 - - - 编辑 - - - 删除 - - - + > + + + {{ node.label }} + + + 新增 + + + 编辑 + + + 删除 + + +
-
+
- - + +
-
+
@@ -303,9 +341,9 @@ border class="drag-table" :row-class-name="dragRowClassName" - @sort-change="sortChange" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', - fontWeight: 'bold', height: '48px'}" + fontWeight: 'bold', height: '48px'}" + @sort-change="sortChange" @selection-change="standSelectChange" > @@ -313,13 +351,14 @@ - + align="center" + /> + type="index" + width="55" + label="序号" + align="center" + > @@ -339,15 +378,15 @@ > - - - + - - - - - + 数据获取中
- + ref="menuTree" + node-key="id" + class="tree-line" + icon-class="icon-tree" + :indent="0" + show-checkbox + :check-strictly="true" + :props="props" + :data="treeList1" + :default-expanded-keys="['1']" + highlight-current + :filter-node-method="filterNode" + @check-change="handleCheckChange" + />
- +
@@ -557,7 +613,7 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +
- +
- +

点击或拖拽上传文件

@@ -966,8 +1072,11 @@ - + @@ -977,7 +1086,7 @@ - + + @click="searchConfiguraStand" + > 查询 @@ -1012,17 +1122,19 @@ :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" @sort-change="sortChangeConfig" @select="handleSelectConfigStand" - @select-all="selectConfigStandAll"> + @select-all="selectConfigStandAll" + > - + align="center" + /> + type="index" + width="55" + label="序号" + align="center" + > @@ -1032,26 +1144,25 @@ prop="standCode" label="企标编号" align="center" - > - + /> - + align="center" + /> - + align="center" + /> - + align="center" + /> @@ -1062,8 +1173,8 @@ prop="standStatusShow" label="标准状态" width="200" - align="center"> - + align="center" + />
+ @pageSizeChange="configuraPageSizeChange" + /> 加载中...
已选标准
@@ -1081,9 +1193,10 @@ v-for="tag in selectConfigStandList" :key="tag.id" size="mini" + closable @close="handleTagClose(tag)" - closable> - {{tag.standCode}} + > + {{ tag.standCode }}
@@ -1092,14 +1205,23 @@ @@ -1114,18 +1236,28 @@ > - + - + - +