cloud-web-corejs 1.0.54-dev.702 → 1.0.54-dev.703

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.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/views/bd/setting/formVersion/ftHistoryDialog.vue +85 -11
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.702",
4
+ "version": "1.0.54-dev.703",
5
5
  "scripts": {
6
6
  "dev": "vue-cli-service serve",
7
7
  "lint": "eslint --ext .js,.vue src",
package/src/views/bd/setting/formVersion/ftHistoryDialog.vue CHANGED
@@ -90,6 +90,76 @@
90
90
  <el-input v-model="formData.remark" clearable />
91
91
  </template>
92
92
  </vxe-form-item>
93
+ <vxe-form-item :title="$t1('创建人') + ':'">
94
+ <template v-slot>
95
+ <el-input
96
+ v-model="formData.createBy"
97
+ size="small"
98
+ clearable
99
+ />
100
+ </template>
101
+ </vxe-form-item>
102
+ <vxe-form-item :title="$t1('更新人') + ':'">
103
+ <template v-slot>
104
+ <el-input
105
+ v-model="formData.modifyBy"
106
+ size="small"
107
+ clearable
108
+ />
109
+ </template>
110
+ </vxe-form-item>
111
+ <vxe-form-item title="创建时间:">
112
+ <template v-slot>
113
+ <el-date-picker
114
+ v-model="formData.startCreateDate"
115
+ type="datetime"
116
+ placeholder=""
117
+ size="small"
118
+ clearable
119
+ value-format="yyyy-MM-dd HH:mm:ss"
120
+ :picker-options="$baseStartPickerOptions(formData.endCreateDate)"
121
+ ></el-date-picker>
122
+ <span>-</span>
123
+ <el-date-picker
124
+ v-model="formData.endCreateDate"
125
+ type="datetime"
126
+ placeholder=""
127
+ size="small"
128
+ clearable
129
+ value-format="yyyy-MM-dd HH:mm:ss"
130
+ default-time="23:59:59"
131
+ :picker-options="
132
+ $baseEndPickerOptions(formData.startCreateDate)
133
+ "
134
+ ></el-date-picker>
135
+ </template>
136
+ </vxe-form-item>
137
+ <vxe-form-item title="更新时间:">
138
+ <template v-slot>
139
+ <el-date-picker
140
+ v-model="formData.startModifyDate"
141
+ type="datetime"
142
+ placeholder=""
143
+ size="small"
144
+ clearable
145
+ value-format="yyyy-MM-dd HH:mm:ss"
146
+ :picker-options="$baseStartPickerOptions(formData.endModifyDate)"
147
+ ></el-date-picker>
148
+ <span>-</span>
149
+ <el-date-picker
150
+ v-model="formData.endModifyDate"
151
+ type="datetime"
152
+ placeholder=""
153
+ size="small"
154
+ clearable
155
+ value-format="yyyy-MM-dd HH:mm:ss"
156
+ default-time="23:59:59"
157
+ :picker-options="
158
+ $baseEndPickerOptions(formData.startModifyDate)
159
+ "
160
+ ></el-date-picker>
161
+ </template>
162
+ </vxe-form-item>
93
163
  </vxe-form>
94
164
  </template>
95
165
  </vxe-grid>
@@ -135,10 +205,13 @@ export default {
135
205
  components: {
136
206
  formDesignerDialog: () =>
137
207
  import("@base/views/bd/setting/form_template/formDesignerDialog.vue"),
138
- compareDialog: () => import("@base/views/bd/setting/formVersion/compareDialog.vue"),
139
- FormTemplateEdit: () => import("@base/views/bd/setting/form_template/edit.vue"),
208
+ compareDialog: () =>
209
+ import("@base/views/bd/setting/formVersion/compareDialog.vue"),
210
+ FormTemplateEdit: () =>
211
+ import("@base/views/bd/setting/form_template/edit.vue"),
140
212
  FormScriptEdit: () => import("@base/views/bd/setting/form_script/edit.vue"),
141
- FormScriptEdit1: () => import("@base/views/bd/setting/form_script/edit1.vue"),
213
+ FormScriptEdit1: () =>
214
+ import("@base/views/bd/setting/form_script/edit1.vue"),
142
215
  SzTaMbEdit: () => import("@base/views/bd/setting/table_model/edit.vue"),
143
216
  },
144
217
  created() {
@@ -187,13 +260,14 @@ export default {
187
260
  },
188
261
  methods: {
189
262
  getCompareData(row1, row2, callback) {
190
- Promise.all([this.getFormVersion(row1.id), this.getFormVersion(row2.id)]).then(
191
- (res) => {
192
- let compareHData1 = res[0].objx;
193
- let compareHData2 = res[1].objx;
194
- callback && callback(compareHData1, compareHData2);
195
- }
196
- );
263
+ Promise.all([
264
+ this.getFormVersion(row1.id),
265
+ this.getFormVersion(row2.id),
266
+ ]).then((res) => {
267
+ let compareHData1 = res[0].objx;
268
+ let compareHData2 = res[1].objx;
269
+ callback && callback(compareHData1, compareHData2);
270
+ });
197
271
  },
198
272
  getFormVersion(id) {
199
273
  return this.$http({
@@ -284,7 +358,7 @@ export default {
284
358
  title: this.$t1("创建人"),
285
359
  field: "_createBy",
286
360
  width: 150,
287
- },
361
+ },
288
362
  {
289
363
  title: this.$t1("创建时间"),
290
364
  field: "createDate",