cloud-web-corejs 1.0.54-dev.466 → 1.0.54-dev.467

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,7 +1,7 @@
1
1
  {
2
2
  "name": "cloud-web-corejs",
3
3
  "private": false,
4
- "version": "1.0.54-dev.466",
4
+ "version": "1.0.54-dev.467",
5
5
  "scripts": {
6
6
  "dev": "vue-cli-service serve",
7
7
  "lint": "eslint --ext .js,.vue src",
@@ -142,7 +142,10 @@ export default {
142
142
  tableName: 'basic_common_attribute_list-m1',
143
143
  path: USER_PREFIX + '/common_attribute/listPage',
144
144
  param: () => {
145
- return this.formData;
145
+ return {
146
+ ...this.formData,
147
+ enabled: true
148
+ };
146
149
  },
147
150
  config: {
148
151
  checkboxConfig: {
@@ -96,6 +96,56 @@
96
96
  </el-input>
97
97
  </el-form-item>
98
98
  </td>
99
+ <th>
100
+ <em class="f-red">*</em>
101
+ {{ $t1("有效开始时间") }}
102
+ </th>
103
+ <td>
104
+ <el-form-item
105
+ prop="startDate"
106
+ :rules="[
107
+ {
108
+ required: true,
109
+ trigger: ['blur', 'change'],
110
+ },
111
+ ]"
112
+ >
113
+ <el-date-picker
114
+ v-model="wfTransferSetting.startDate"
115
+ type="datetime"
116
+ size="small"
117
+ clearable
118
+ value-format="yyyy-MM-dd HH:mm:ss"
119
+ default-time="00:00:00"
120
+ :picker-options="$baseStartPickerOptions(wfTransferSetting.endDate)"
121
+ ></el-date-picker>
122
+ </el-form-item>
123
+ </td>
124
+ <th>
125
+ <em class="f-red">*</em>
126
+ {{ $t1("有效结束时间") }}
127
+ </th>
128
+ <td>
129
+ <el-form-item
130
+ prop="endDate"
131
+ :rules="[
132
+ {
133
+ required: true,
134
+ trigger: ['blur', 'change'],
135
+ },
136
+ ]"
137
+ >
138
+ <el-date-picker
139
+ v-model="wfTransferSetting.endDate"
140
+ type="datetime"
141
+ size="small"
142
+ clearable
143
+ value-format="yyyy-MM-dd HH:mm:ss"
144
+ default-time="23:59:59"
145
+ :picker-options="$baseEndPickerOptions(wfTransferSetting.startDate)"
146
+ ></el-date-picker>
147
+ </el-form-item>
148
+ </td>
99
149
  </tr>
100
150
  <tr>
101
151
  <th>{{ $t1("创建人") }}</th>
@@ -147,6 +197,8 @@ export default {
147
197
  transferToName: null,
148
198
  transferFrom: null,
149
199
  transferTo: null,
200
+ startDate: null,
201
+ endDate: null,
150
202
  },
151
203
  showUserDialog1: false,
152
204
  showUserDialog2: false,
@@ -180,6 +180,16 @@ export default {
180
180
  field: "transferToName",
181
181
  width: 250,
182
182
  },
183
+ {
184
+ title: this.$t1("有效开始时间"),
185
+ field: "startDate",
186
+ width: 150,
187
+ },
188
+ {
189
+ title: this.$t1("有效结束时间"),
190
+ field: "endDate",
191
+ width: 150,
192
+ },
183
193
  {
184
194
  title: this.$t1("创建人"),
185
195
  field: "_createBy",