n20-common-lib 2.6.80 → 2.6.82

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "n20-common-lib",
3
- "version": "2.6.80",
3
+ "version": "2.6.82",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "serve": "vue-cli-service serve",
@@ -36,7 +36,6 @@
36
36
  :placeholder="'请选择加签类型' | $lc"
37
37
  style="width: 10em"
38
38
  >
39
- <!-- <el-option v-if="addTaskModel === '1'" :label="'向后加签' | $lc" value="1" /> -->
40
39
  <template>
41
40
  <el-option
42
41
  v-if="authList.includes('isAddForwardTask') || preAddTask"
@@ -50,29 +49,23 @@
50
49
  />
51
50
  </template>
52
51
  </el-select>
52
+
53
53
  <el-select
54
- v-if="addTaskModel === '1'"
54
+ v-if="addTaskMode === '0' || addTaskWay === '2'"
55
55
  v-model="addTaskType"
56
+ disabled
56
57
  clearable
57
58
  :placeholder="'请选择审批方式' | $lc"
58
59
  style="width: 10em"
59
60
  >
60
61
  <el-option :label="'普通节点' | $lc" value="1" />
61
- <el-option :label="'会签并行' | $lc" value="2" />
62
- <el-option :label="'普通串行' | $lc" value="3" />
63
62
  </el-select>
64
- <el-select
65
- v-else
66
- v-model="addTaskType"
67
- disabled
68
- clearable
69
- :placeholder="'请选择审批方式' | $lc"
70
- style="width: 10em"
71
- >
63
+ <el-select v-else v-model="addTaskType" clearable :placeholder="'请选择审批方式' | $lc" style="width: 10em">
72
64
  <el-option :label="'普通节点' | $lc" value="1" />
73
- <!-- <el-option :label="'会签并行' | $lc" value="2" :disabled="addTaskWay === '2'" /> -->
74
- <!-- <el-option :label="'普通串行' | $lc" value="3" /> -->
65
+ <el-option :label="'会签并行' | $lc" value="2" />
66
+ <el-option :label="'普通串行' | $lc" value="3" />
75
67
  </el-select>
68
+
76
69
  <el-input
77
70
  class="flex-item"
78
71
  type="textarea"
@@ -7,12 +7,7 @@
7
7
  :data="data"
8
8
  :height="height"
9
9
  :class="{ 'cell-default-set--': cellDefault }"
10
- :checkbox-config="{
11
- checkField: 'checked',
12
- checkMethod: forbidSelect,
13
- ...$attrs.checkboxConfig,
14
- ...$attrs['checkbox-config']
15
- }"
10
+ :checkbox-config="{ checkField: 'checked', checkMethod: forbidSelect }"
16
11
  show-header-overflow
17
12
  show-overflow
18
13
  :row-config="{ isHover: true, useKey: true, ...$attrs.rowConfig, ...$attrs['row-config'] }"