vue2-client 1.5.4 → 1.5.6

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.
package/CHANGELOG.md CHANGED
@@ -1,7 +1,10 @@
1
1
  # Change Log
2
2
  > 所有关于本项目的变化都在该文档里。
3
3
 
4
- **1.5.0 - 1.5.4 -2022-12-04 @江超**
4
+ **1.5.6 -2022-12-05 @江超**
5
+ - 修复待办界面显示异常的问题
6
+
7
+ **1.5.0 - 1.5.5 -2022-12-04 @江超**
5
8
  - 以下可能是不兼容更新:
6
9
  - 重构了XForm,XAddForm,XTable,XFormTable组件
7
10
  - 1.重新封装了XForm的状态,实现更加简洁了,并且修复了[更多条件]功能的BUG
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vue2-client",
3
- "version": "1.5.4",
3
+ "version": "1.5.6",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "serve": "vue-cli-service serve",
@@ -205,7 +205,7 @@ export default {
205
205
  onSearchSubmit (res) {
206
206
  if (res.valid) {
207
207
  // 表单赋值
208
- this.$refs.xTable.setQueryForm(res.form, true)
208
+ this.$refs.xTable.setQueryForm(res.form)
209
209
  // commit
210
210
  this.$emit('afterSearchSubmit', res)
211
211
  } else {
@@ -215,16 +215,6 @@ export default {
215
215
  },
216
216
  mounted () {},
217
217
  methods: {
218
- /**
219
- * 为表格附加查询条件
220
- */
221
- setQueryForm (form = {}, refresh) {
222
- this.form = form
223
- if (refresh) {
224
- this.refresh(true)
225
- }
226
- this.clearRowKeys()
227
- },
228
218
  /**
229
219
  * 初始化表格参数
230
220
  */
@@ -271,7 +261,7 @@ export default {
271
261
  this.scrollXWidth = totalWidth
272
262
  // 加载筛选列完成
273
263
  this.columnSelectLoaded = true
274
- this.setQueryForm({}, true)
264
+ this.setQueryForm({})
275
265
  },
276
266
  /**
277
267
  * 加载表格数据
@@ -307,12 +297,20 @@ export default {
307
297
  clearRowKeys () {
308
298
  this.$refs.table.clearSelected()
309
299
  },
300
+ /**
301
+ * 为表格附加查询条件
302
+ */
303
+ setQueryForm (form = {}) {
304
+ this.form = form
305
+ this.refresh(true)
306
+ },
310
307
  /**
311
308
  * 表格重新加载方法
312
309
  * 如果参数为 true, 则强制刷新到第一页
313
310
  */
314
311
  refresh (bool) {
315
312
  this.$refs.table.refresh(bool)
313
+ this.clearRowKeys()
316
314
  },
317
315
  format (date, format) {
318
316
  return formatDate(date, format)
@@ -115,7 +115,7 @@ export default {
115
115
  showSizeChanger: this.showSizeChanger
116
116
  }) || false
117
117
  this.needTotalList = this.initTotalList(this.columns)
118
- this.loadData()
118
+ // this.loadData()
119
119
  },
120
120
  methods: {
121
121
  /**
@@ -1,48 +1,50 @@
1
1
  <template>
2
- <a-dropdown v-model="show" :trigger="['click']">
3
- <div slot="overlay">
4
- <a-spin :spinning="loading">
5
- <a-tabs
6
- v-model="activeKey"
7
- :style="{width: '297px'}"
8
- :tabBarStyle="{textAlign: 'center'}"
9
- class="dropdown-tabs">
10
- <a-tab-pane key="1" tab="通知">
11
- <a-list class="tab-pane">
12
- </a-list>
13
- </a-tab-pane>
14
- <a-tab-pane key="2" tab="消息">
15
- <a-list class="tab-pane"></a-list>
16
- </a-tab-pane>
17
- <a-tab-pane key="3" tab="待办">
18
- <a-list :data-source="backlog" class="tab-pane" item-layout="horizontal">
19
- <a-list-item slot="renderItem" slot-scope="item">
20
- <a v-if="item.type==='制度待确认'" slot="actions" @click="confirm_institution(item)">查看</a>
21
- <a-list-item-meta :description="item.description" :title="item.title"/>
22
- </a-list-item>
23
- </a-list>
24
- </a-tab-pane>
25
- <a-drawer
26
- :closable="false"
27
- :visible="institutionDetailVisible"
28
- :width="screenWidth * 0.5"
29
- placement="right"
30
- @close="onClose"
31
- >
32
- <institution-detail
33
- :affirmInstitution="affirmInstitution"
34
- :institutionId="institution"
35
- @get_to_be_confirmed="getToBeConfirmed"/>
36
- </a-drawer>
37
- </a-tabs>
38
- </a-spin>
39
- </div>
40
- <span class="header-notice" @click="fetchNotice">
41
- <a-badge :count="backlog.length" class="notice-badge">
42
- <a-icon :class="['header-notice-icon']" type="bell"/>
43
- </a-badge>
44
- </span>
45
- </a-dropdown>
2
+ <div>
3
+ <a-drawer
4
+ :closable="false"
5
+ :visible="institutionDetailVisible"
6
+ :width="screenWidth * 0.5"
7
+ placement="right"
8
+ @close="onClose"
9
+ >
10
+ <institution-detail
11
+ :affirmInstitution="affirmInstitution"
12
+ :institutionId="institution"
13
+ @get_to_be_confirmed="getToBeConfirmed"/>
14
+ </a-drawer>
15
+ <a-dropdown v-model="show" :trigger="['click']">
16
+ <div slot="overlay">
17
+ <a-spin :spinning="loading">
18
+ <a-tabs
19
+ v-model="activeKey"
20
+ :style="{width: '500px'}"
21
+ :tabBarStyle="{textAlign: 'center'}"
22
+ class="dropdown-tabs">
23
+ <a-tab-pane key="1" tab="通知">
24
+ <a-list class="tab-pane">
25
+ </a-list>
26
+ </a-tab-pane>
27
+ <a-tab-pane key="2" tab="消息">
28
+ <a-list class="tab-pane"></a-list>
29
+ </a-tab-pane>
30
+ <a-tab-pane key="3" tab="待办">
31
+ <a-list :data-source="backlog" class="tab-pane" item-layout="horizontal">
32
+ <a-list-item slot="renderItem" slot-scope="item">
33
+ <a v-if="item.type==='制度待确认'" slot="actions" @click="confirm_institution(item)">查看</a>
34
+ <a-list-item-meta :description="item.description" :title="item.title"/>
35
+ </a-list-item>
36
+ </a-list>
37
+ </a-tab-pane>
38
+ </a-tabs>
39
+ </a-spin>
40
+ </div>
41
+ <span class="header-notice" @click="fetchNotice">
42
+ <a-badge :count="backlog.length" class="notice-badge">
43
+ <a-icon :class="['header-notice-icon']" type="bell"/>
44
+ </a-badge>
45
+ </span>
46
+ </a-dropdown>
47
+ </div>
46
48
  </template>
47
49
 
48
50
  <script>
@@ -2,13 +2,13 @@
2
2
  <div style="position: relative;">
3
3
  <h2 style="text-align: center">{{ institutionData.f_title }}</h2>
4
4
  <p>简述: {{ institutionData.f_sketch }}</p>
5
- <p>生效时间: {{ format(institutionData.f_effective_date) }}</p>
5
+ <p>时间: {{ format(institutionData.f_effective_date) }}</p>
6
6
  <div v-if="showDocument" class="content">
7
7
  <iframe :src="institutionDocUrl" frameborder="0" height="100%" width="100%"></iframe>
8
8
  </div>
9
9
  <!-- 其他附件 -->
10
10
  <div class="other-file">
11
- <div class="title">其他附件</div>
11
+ <div class="title">其他信息:</div>
12
12
  <div v-for="file in otherFiles" :key="file.id">
13
13
  <a class="file-item">
14
14
  <span class="file-action" @click="handlePreviewDoc(file.url)">