cloud-web-corejs 1.0.54-dev.600 → 1.0.54-dev.601

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 (24) hide show
  1. package/package.json +1 -1
  2. package/src/components/xform/form-designer/setting-panel/form-setting.vue +4 -4
  3. package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/table-column-dialog.vue +3 -3
  4. package/src/views/bd/setting/formVersion/button.vue +1 -1
  5. package/src/views/bd/setting/formVersion/compareDialog.vue +286 -0
  6. package/src/views/bd/setting/formVersion/fieldCompare.vue +51 -0
  7. package/src/views/bd/setting/formVersion/ftHistoryDialog.vue +91 -60
  8. package/src/views/bd/setting/formVersion/preformDialog.vue +2 -2
  9. package/src/views/bd/setting/formVersion/reverButton.vue +12 -14
  10. package/src/views/bd/setting/form_script/edit.vue +79 -34
  11. package/src/views/bd/setting/form_script/edit1.vue +143 -61
  12. package/src/views/bd/setting/form_script/mixins/edit.js +76 -53
  13. package/src/views/bd/setting/form_script/mixins/edit1.js +75 -52
  14. package/src/views/bd/setting/form_template/edit.vue +93 -36
  15. package/src/views/bd/setting/form_template/formDesignerDialog.vue +166 -0
  16. package/src/views/bd/setting/form_template/list.vue +10 -42
  17. package/src/views/bd/setting/form_template/mixins/edit.js +19 -2
  18. package/src/views/bd/setting/form_template/mixins/list.js +2 -4
  19. package/src/views/bd/setting/form_template/mixins/wf_list.js +0 -4
  20. package/src/views/bd/setting/form_template/wf_list.vue +161 -127
  21. package/src/views/bd/setting/table_model/edit.vue +388 -203
  22. package/src/views/bd/setting/table_model/mixins/edit.js +87 -72
  23. package/src/views/user/form/vform/designer.vue +300 -284
  24. package/src/views/bd/setting/form_template/mixins/list2.js +0 -411
package/src/views/bd/setting/table_model/edit.vue CHANGED
@@ -96,13 +96,19 @@
96
96
  prop="taBm"
97
97
  :rules="[{ required: false, trigger: ['blur', 'change'] }]"
98
98
  >
99
- <el-input
100
- type="text"
101
- autocomplete="off"
102
- v-model="szTaMb.taBm"
103
- clearable
104
- :disabled="!!dataId"
105
- />
99
+ <fieldCompare
100
+ :isCompare="isCompare"
101
+ :oldVal="oldSzTaMb.taBm"
102
+ :newVal="szTaMb.taBm"
103
+ >
104
+ <el-input
105
+ type="text"
106
+ autocomplete="off"
107
+ v-model="szTaMb.taBm"
108
+ clearable
109
+ :disabled="!!dataId"
110
+ />
111
+ </fieldCompare>
106
112
  </el-form-item>
107
113
  </td>
108
114
  </tr>
@@ -126,12 +132,18 @@
126
132
  prop="taEn"
127
133
  :rules="[{ required: true, trigger: ['blur', 'change'] }]"
128
134
  >
129
- <el-input
130
- type="text"
131
- autocomplete="off"
132
- v-model="szTaMb.taEn"
133
- clearable
134
- />
135
+ <fieldCompare
136
+ :isCompare="isCompare"
137
+ :oldVal="oldSzTaMb.taEn"
138
+ :newVal="szTaMb.taEn"
139
+ >
140
+ <el-input
141
+ type="text"
142
+ autocomplete="off"
143
+ v-model="szTaMb.taEn"
144
+ clearable
145
+ />
146
+ </fieldCompare>
135
147
  </el-form-item>
136
148
  </td>
137
149
  </tr>
@@ -142,12 +154,18 @@
142
154
  prop="taCh"
143
155
  :rules="[{ required: true, trigger: ['blur', 'change'] }]"
144
156
  >
145
- <el-input
146
- type="text"
147
- autocomplete="off"
148
- v-model="szTaMb.taCh"
149
- clearable
150
- />
157
+ <fieldCompare
158
+ :isCompare="isCompare"
159
+ :oldVal="oldSzTaMb.taCh"
160
+ :newVal="szTaMb.taCh"
161
+ >
162
+ <el-input
163
+ type="text"
164
+ autocomplete="off"
165
+ v-model="szTaMb.taCh"
166
+ clearable
167
+ />
168
+ </fieldCompare>
151
169
  </el-form-item>
152
170
  </td>
153
171
  </tr>
@@ -158,10 +176,16 @@
158
176
  prop="taType"
159
177
  :rules="[{ required: true, trigger: ['blur', 'change'] }]"
160
178
  >
161
- <el-radio-group v-model="szTaMb.taType">
162
- <el-radio :label="1">{{ $t1("是") }}</el-radio>
163
- <el-radio :label="0">{{ $t1("否") }}</el-radio>
164
- </el-radio-group>
179
+ <fieldCompare
180
+ :isCompare="isCompare"
181
+ :oldVal="oldSzTaMb.taType"
182
+ :newVal="szTaMb.taType"
183
+ >
184
+ <el-radio-group v-model="szTaMb.taType">
185
+ <el-radio :label="1">{{ $t1("是") }}</el-radio>
186
+ <el-radio :label="0">{{ $t1("否") }}</el-radio>
187
+ </el-radio-group>
188
+ </fieldCompare>
165
189
  </el-form-item>
166
190
  </td>
167
191
  <th>
@@ -178,25 +202,31 @@
178
202
  },
179
203
  ]"
180
204
  >
181
- <el-input
182
- class="search-input"
183
- max="200"
184
- v-model="szTaMb.sszstEn"
185
- @clear="
186
- szTaMb.sszst = null;
187
- szTaMb.sszstBm = null;
188
- $forceUpdate();
189
- "
190
- :disabled="szTaMb.taType == 0"
191
- v-el-readonly
192
- clearable
205
+ <fieldCompare
206
+ :isCompare="isCompare"
207
+ :oldVal="oldSzTaMb.sszstEn"
208
+ :newVal="szTaMb.sszstEn"
193
209
  >
194
- <i
195
- slot="suffix"
196
- class="el-input__icon el-icon-search"
197
- @click="showSzTaMbDialog = true"
198
- ></i>
199
- </el-input>
210
+ <el-input
211
+ class="search-input"
212
+ max="200"
213
+ v-model="szTaMb.sszstEn"
214
+ @clear="
215
+ szTaMb.sszst = null;
216
+ szTaMb.sszstBm = null;
217
+ $forceUpdate();
218
+ "
219
+ :disabled="szTaMb.taType == 0"
220
+ v-el-readonly
221
+ clearable
222
+ >
223
+ <i
224
+ slot="suffix"
225
+ class="el-input__icon el-icon-search"
226
+ @click="showSzTaMbDialog = true"
227
+ ></i>
228
+ </el-input>
229
+ </fieldCompare>
200
230
  </el-form-item>
201
231
  </td>
202
232
  </tr>
@@ -207,10 +237,16 @@
207
237
  prop="taRule"
208
238
  :rules="[{ required: true, trigger: ['blur', 'change'] }]"
209
239
  >
210
- <el-radio-group v-model="szTaMb.taRule" @change="changeTaRule">
211
- <el-radio :label="1">{{ $t1("是") }}</el-radio>
212
- <el-radio :label="0">{{ $t1("否") }}</el-radio>
213
- </el-radio-group>
240
+ <fieldCompare
241
+ :isCompare="isCompare"
242
+ :oldVal="oldSzTaMb.taRule"
243
+ :newVal="szTaMb.taRule"
244
+ >
245
+ <el-radio-group v-model="szTaMb.taRule" @change="changeTaRule">
246
+ <el-radio :label="1">{{ $t1("是") }}</el-radio>
247
+ <el-radio :label="0">{{ $t1("否") }}</el-radio>
248
+ </el-radio-group>
249
+ </fieldCompare>
214
250
  </el-form-item>
215
251
  </td>
216
252
  <th><em class="f-red">*</em>{{ $t1("数据范围") }}</th>
@@ -219,10 +255,16 @@
219
255
  prop="dataRange"
220
256
  :rules="[{ required: true, trigger: ['blur', 'change'] }]"
221
257
  >
222
- <el-radio-group v-model="szTaMb.dataRange">
223
- <el-radio :label="1">{{ $t1("集团") }}</el-radio>
224
- <el-radio :label="0">{{ $t1("当前组织") }}</el-radio>
225
- </el-radio-group>
258
+ <fieldCompare
259
+ :isCompare="isCompare"
260
+ :oldVal="oldSzTaMb.dataRange"
261
+ :newVal="szTaMb.dataRange"
262
+ >
263
+ <el-radio-group v-model="szTaMb.dataRange">
264
+ <el-radio :label="1">{{ $t1("集团") }}</el-radio>
265
+ <el-radio :label="0">{{ $t1("当前组织") }}</el-radio>
266
+ </el-radio-group>
267
+ </fieldCompare>
226
268
  </el-form-item>
227
269
  </td>
228
270
  </tr>
@@ -241,24 +283,30 @@
241
283
  },
242
284
  ]"
243
285
  >
244
- <el-input
245
- class="search-input"
246
- max="200"
247
- v-model="szTaMb.menuKindName"
248
- @clear="
249
- szTaMb.menuKindCode = '';
250
- $forceUpdate();
251
- "
252
- v-el-readonly
253
- clearable
254
- :disabled="otherFlag"
286
+ <fieldCompare
287
+ :isCompare="isCompare"
288
+ :oldVal="oldSzTaMb.menuKindName"
289
+ :newVal="szTaMb.menuKindName"
255
290
  >
256
- <i
257
- slot="suffix"
258
- class="el-input__icon el-icon-search"
259
- @click="showMenuKindDialog = true"
260
- ></i>
261
- </el-input>
291
+ <el-input
292
+ class="search-input"
293
+ max="200"
294
+ v-model="szTaMb.menuKindName"
295
+ @clear="
296
+ szTaMb.menuKindCode = '';
297
+ $forceUpdate();
298
+ "
299
+ v-el-readonly
300
+ clearable
301
+ :disabled="otherFlag"
302
+ >
303
+ <i
304
+ slot="suffix"
305
+ class="el-input__icon el-icon-search"
306
+ @click="showMenuKindDialog = true"
307
+ ></i>
308
+ </el-input>
309
+ </fieldCompare>
262
310
  </el-form-item>
263
311
  </td>
264
312
  </tr>
@@ -277,10 +325,16 @@
277
325
  prop="enabled"
278
326
  :rules="[{ required: false, trigger: 'blur' }]"
279
327
  >
280
- <el-radio-group v-model="szTaMb.enabled">
281
- <el-radio :label="true">{{ $t1("启用") }}</el-radio>
282
- <el-radio :label="false">{{ $t1("禁用") }}</el-radio>
283
- </el-radio-group>
328
+ <fieldCompare
329
+ :isCompare="isCompare"
330
+ :oldVal="oldSzTaMb.enabled"
331
+ :newVal="szTaMb.enabled"
332
+ >
333
+ <el-radio-group v-model="szTaMb.enabled">
334
+ <el-radio :label="true">{{ $t1("启用") }}</el-radio>
335
+ <el-radio :label="false">{{ $t1("禁用") }}</el-radio>
336
+ </el-radio-group>
337
+ </fieldCompare>
284
338
  </el-form-item>
285
339
  </td>
286
340
  </tr>
@@ -289,7 +343,15 @@
289
343
  {{ $t1("服务名") }}
290
344
  </th>
291
345
  <td colspan="7">
292
- {{ szTaMb.serviceName }}
346
+ <el-form-item>
347
+ <fieldCompare
348
+ :isCompare="isCompare"
349
+ :oldVal="oldSzTaMb.serviceName"
350
+ :newVal="szTaMb.serviceName"
351
+ >
352
+ {{ szTaMb.serviceName }}
353
+ </fieldCompare>
354
+ </el-form-item>
293
355
  </td>
294
356
  </tr>
295
357
  <tr>
@@ -345,60 +407,88 @@
345
407
  @resizable-change="$vxeTableUtil.onColumnWitchChange"
346
408
  @custom="$vxeTableUtil.customHandle"
347
409
  >
348
- <template #zdType="{ row }">
349
- <el-select
350
- v-model="row.zdType"
351
- clearable
352
- :disabled="!!row.systems || !!row.relationZd"
353
- @change="changeZdType(row)"
354
- >
355
- <el-option value="Boolean" :label="$t1('布尔')"></el-option>
356
- <el-option value="Integer" :label="$t1('整数')"></el-option>
357
- <el-option value="Long" :label="$t1('长整数')"></el-option>
358
- <el-option value="Decimal" :label="$t1('精度小数')"></el-option>
359
- <el-option value="Money" :label="$t1('金额')"></el-option>
360
- <el-option value="Text" :label="$t1('文本')"></el-option>
361
- <el-option value="TextArea" :label="$t1('长文本')"></el-option>
362
- <el-option value="DateTime" :label="$t1('日期时间')"></el-option>
363
- <el-option value="Reference" :label="$t1('关联表')"></el-option>
364
- </el-select>
410
+ <template #zdType="{ row, column }">
411
+ <el-form-item>
412
+ <fieldCompare
413
+ :isCompare="isCompare"
414
+ :oldVal="getHValue(row, column)"
415
+ :newVal="zdTypeMap[row[column.property]]"
416
+ >
417
+ <el-select
418
+ v-model="row.zdType"
419
+ clearable
420
+ :disabled="!!row.systems || !!row.relationZd"
421
+ @change="changeZdType(row)"
422
+ >
423
+ <el-option value="Boolean" :label="$t1('布尔')"></el-option>
424
+ <el-option value="Integer" :label="$t1('整数')"></el-option>
425
+ <el-option value="Long" :label="$t1('长整数')"></el-option>
426
+ <el-option value="Decimal" :label="$t1('精度小数')"></el-option>
427
+ <el-option value="Money" :label="$t1('金额')"></el-option>
428
+ <el-option value="Text" :label="$t1('文本')"></el-option>
429
+ <el-option value="TextArea" :label="$t1('长文本')"></el-option>
430
+ <el-option value="DateTime" :label="$t1('日期时间')"></el-option>
431
+ <el-option value="Reference" :label="$t1('关联表')"></el-option>
432
+ </el-select>
433
+ </fieldCompare>
434
+ </el-form-item>
365
435
  </template>
366
- <template #zdLength="{ row, rowIndex }">
436
+ <template #zdLength="{ row, rowIndex, column }">
367
437
  <el-form-item
368
438
  :prop="'szTaZdMbDTOs.' + rowIndex + '.zdLength'"
369
439
  :rules="[{ required: false, trigger: ['blur', 'change'] }]"
370
440
  >
371
- <el-input
372
- v-model="row.zdLength"
373
- clearable
374
- :disabled="!!row.systems || !!row.relationZd"
375
- />
441
+ <fieldCompare
442
+ :isCompare="isCompare"
443
+ :oldVal="getHValue(row, column)"
444
+ :newVal="row[column.property]"
445
+ >
446
+ <el-input
447
+ v-model="row.zdLength"
448
+ clearable
449
+ :disabled="!!row.systems || !!row.relationZd"
450
+ />
451
+ </fieldCompare>
376
452
  </el-form-item>
377
453
  </template>
378
- <template #referenceZd="{ row, rowIndex, $table }">
379
- <el-input
380
- class="search-input"
381
- v-model="row.referenceZd"
382
- v-el-readonly
383
- v-if="row.zdType == 'Reference'"
384
- :disabled="!row.zdEn"
385
- clearable
386
- >
387
- <i
388
- slot="suffix"
389
- class="el-input__icon el-icon-search"
390
- @click="openReferenceZdDialog(row, rowIndex, $table)"
391
- ></i>
392
- </el-input>
393
- <template v-else>
394
- {{ row.referenceZd }}
395
- </template>
454
+ <template #referenceZd="{ row, rowIndex, column, $table }">
455
+ <el-form-item>
456
+ <fieldCompare
457
+ :isCompare="isCompare"
458
+ :oldVal="getHValue(row, column)"
459
+ :newVal="row[column.property]"
460
+ >
461
+ <el-input
462
+ class="search-input"
463
+ v-model="row.referenceZd"
464
+ v-el-readonly
465
+ v-if="row.zdType == 'Reference'"
466
+ :disabled="!row.zdEn"
467
+ clearable
468
+ >
469
+ <i
470
+ slot="suffix"
471
+ class="el-input__icon el-icon-search"
472
+ @click="openReferenceZdDialog(row, rowIndex, $table)"
473
+ ></i>
474
+ </el-input>
475
+ <template v-else>
476
+ {{ row.referenceZd }}
477
+ </template>
478
+ </fieldCompare>
479
+ </el-form-item>
396
480
  </template>
397
- <template #zdEn="{ row, rowIndex }">
481
+ <template #zdEn="{ row, rowIndex, column }">
398
482
  <template v-if="!!row.systems || row.fromTable">
399
- <div>
400
- {{ row.zdEn }}
401
- </div>
483
+ <el-form-item>
484
+ <fieldCompare
485
+ :isCompare="isCompare"
486
+ :oldVal="getHValue(row, column)"
487
+ :newVal="row[column.property]"
488
+ >
489
+ {{ row.zdEn }}
490
+ </fieldCompare>
491
+ </el-form-item>
402
492
  </template>
403
493
  <template v-else>
404
494
  <el-form-item
@@ -406,126 +496,220 @@
406
496
  :rules="[{ required: true, trigger: ['blur', 'change'] }]"
407
497
  :style="!!row.relationZd ? 'padding-left:20px' : ''"
408
498
  >
409
- <el-input
410
- v-model="row.zdEn"
411
- @keydown.native="inputZdEn(row)"
412
- @input="
413
- (val) => {
414
- changeZdEn(val, row);
415
- }
416
- "
417
- />
499
+ <fieldCompare
500
+ :isCompare="isCompare"
501
+ :oldVal="getHValue(row, column)"
502
+ :newVal="row[column.property]"
503
+ >
504
+ <el-input
505
+ v-model="row.zdEn"
506
+ @keydown.native="inputZdEn(row)"
507
+ @input="
508
+ (val) => {
509
+ changeZdEn(val, row);
510
+ }
511
+ "
512
+ />
513
+ </fieldCompare>
418
514
  </el-form-item>
419
515
  </template>
420
516
  </template>
421
- <template #zdCh="{ row, rowIndex }">
517
+ <template #zdCh="{ row, rowIndex, column }">
422
518
  <el-form-item
423
519
  :prop="'szTaZdMbDTOs.' + rowIndex + '.zdCh'"
424
520
  :rules="[{ required: true, trigger: ['blur', 'change'] }]"
425
521
  >
426
- <el-input v-model="row.zdCh" clearable :disabled="!!row.systems" />
522
+ <fieldCompare
523
+ :isCompare="isCompare"
524
+ :oldVal="getHValue(row, column)"
525
+ :newVal="row[column.property]"
526
+ >
527
+ <el-input v-model="row.zdCh" clearable :disabled="!!row.systems" />
528
+ </fieldCompare>
427
529
  </el-form-item>
428
530
  </template>
429
- <template #zdTypeValues="{ row, rowIndex }">
531
+ <template #zdTypeValues="{ row, rowIndex, column }">
430
532
  <el-form-item
431
533
  :prop="'szTaZdMbDTOs.' + rowIndex + '.zdTypeValues'"
432
534
  :rules="[{ required: false, trigger: ['blur', 'change'] }]"
433
535
  >
434
- <el-input
435
- v-model="row.zdTypeValues"
436
- clearable
437
- :disabled="!!row.systems || !!row.relationZd"
438
- />
536
+ <fieldCompare
537
+ :isCompare="isCompare"
538
+ :oldVal="getHValue(row, column)"
539
+ :newVal="row[column.property]"
540
+ >
541
+ <el-input
542
+ v-model="row.zdTypeValues"
543
+ clearable
544
+ :disabled="!!row.systems || !!row.relationZd"
545
+ />
546
+ </fieldCompare>
439
547
  </el-form-item>
440
548
  </template>
441
- <template #required="{ row, rowIndex }">
442
- <el-checkbox
443
- v-model="row.required"
444
- :disabled="!!row.systems || !!row.relationZd"
445
- />
549
+ <template #required="{ row, rowIndex, column }">
550
+ <el-form-item>
551
+ <fieldCompare
552
+ :isCompare="isCompare"
553
+ :oldVal="getHValue(row, column)"
554
+ :newVal="row[column.property]"
555
+ >
556
+ <el-checkbox
557
+ v-model="row.required"
558
+ :disabled="!!row.systems || !!row.relationZd"
559
+ />
560
+ </fieldCompare>
561
+ </el-form-item>
446
562
  </template>
447
- <template #enabled="{ row, rowIndex }">
448
- <el-checkbox
449
- v-model="row.enabled"
450
- :disabled="!!row.systems || !!row.relationZd"
451
- />
563
+ <template #enabled="{ row, rowIndex, column }">
564
+ <el-form-item>
565
+ <fieldCompare
566
+ :isCompare="isCompare"
567
+ :oldVal="getHValue(row, column)"
568
+ :newVal="row[column.property]"
569
+ >
570
+ <el-checkbox
571
+ v-model="row.enabled"
572
+ :disabled="!!row.systems || !!row.relationZd"
573
+ />
574
+ </fieldCompare>
575
+ </el-form-item>
452
576
  </template>
453
- <template #generateCode="{ row, rowIndex }">
454
- <el-checkbox
455
- v-model="row.generateCode"
456
- :disabled="!!row.systems || !!row.relationZd"
457
- />
577
+ <template #generateCode="{ row, rowIndex, column }">
578
+ <el-form-item>
579
+ <fieldCompare
580
+ :isCompare="isCompare"
581
+ :oldVal="getHValue(row, column)"
582
+ :newVal="row[column.property]"
583
+ >
584
+ <el-checkbox
585
+ v-model="row.generateCode"
586
+ :disabled="!!row.systems || !!row.relationZd"
587
+ />
588
+ </fieldCompare>
589
+ </el-form-item>
458
590
  </template>
459
- <template #atened="{ row, rowIndex }">
460
- <el-checkbox
461
- v-model="row.atened"
462
- :disabled="!!row.systems || !!row.relationZd"
463
- />
591
+ <template #atened="{ row, rowIndex, column }">
592
+ <el-form-item>
593
+ <fieldCompare
594
+ :isCompare="isCompare"
595
+ :oldVal="getHValue(row, column)"
596
+ :newVal="row[column.property]"
597
+ >
598
+ <el-checkbox
599
+ v-model="row.atened"
600
+ :disabled="!!row.systems || !!row.relationZd"
601
+ />
602
+ </fieldCompare>
603
+ </el-form-item>
464
604
  </template>
465
- <template #updateIgnore="{ row, rowIndex }">
466
- <el-checkbox
467
- v-model="row.updateIgnore"
468
- :disabled="!!row.systems || !!row.relationZd"
469
- />
605
+ <template #updateIgnore="{ row, rowIndex, column }">
606
+ <el-form-item>
607
+ <fieldCompare
608
+ :isCompare="isCompare"
609
+ :oldVal="getHValue(row, column)"
610
+ :newVal="row[column.property]"
611
+ >
612
+ <el-checkbox
613
+ v-model="row.updateIgnore"
614
+ :disabled="!!row.systems || !!row.relationZd"
615
+ />
616
+ </fieldCompare>
617
+ </el-form-item>
470
618
  </template>
471
- <template #codeType="{ row, rowIndex }">
619
+ <template #codeType="{ row, rowIndex, column }">
472
620
  <el-form-item
473
621
  :prop="'szTaZdMbDTOs.' + rowIndex + '.codeType'"
474
622
  :rules="[{ required: false, trigger: ['blur', 'change'] }]"
475
623
  >
476
- <el-input
477
- v-model="row.codeType"
478
- clearable
479
- :disabled="!!row.systems || !!row.relationZd"
480
- />
624
+ <fieldCompare
625
+ :isCompare="isCompare"
626
+ :oldVal="getHValue(row, column)"
627
+ :newVal="row[column.property]"
628
+ >
629
+ <el-input
630
+ v-model="row.codeType"
631
+ clearable
632
+ :disabled="!!row.systems || !!row.relationZd"
633
+ />
634
+ </fieldCompare>
481
635
  </el-form-item>
482
636
  </template>
483
- <template #orders="{ row, rowIndex }">
637
+ <template #orders="{ row, rowIndex, column }">
484
638
  <el-form-item
485
639
  :prop="'szTaZdMbDTOs.' + rowIndex + '.orders'"
486
640
  :rules="[{ required: false, trigger: ['blur', 'change'] }]"
487
641
  >
488
- <base-input-number
489
- v-model="row.orders"
490
- clearable
491
- :disabled="!!row.systems"
492
- @change="changeOrders(row)"
493
- />
642
+ <fieldCompare
643
+ :isCompare="isCompare"
644
+ :oldVal="getHValue(row, column)"
645
+ :newVal="row[column.property]"
646
+ >
647
+ <base-input-number
648
+ v-model="row.orders"
649
+ clearable
650
+ :disabled="!!row.systems"
651
+ @change="changeOrders(row)"
652
+ />
653
+ </fieldCompare>
494
654
  </el-form-item>
495
655
  </template>
496
- <template #toTaBmZd="{ row, rowIndex, $table }">
497
- <el-input
498
- class="search-input"
499
- v-model="row.toTaBmZd"
500
- clearable
501
- @clear="$forceUpdate()"
502
- v-el-readonly
503
- :disabled="!!row.systems || !!row.relationZd"
656
+ <template #toTaBmZd="{ row, rowIndex, column, $table }">
657
+ <el-form-item
658
+ :prop="'szTaZdMbDTOs.' + rowIndex + '.toTaBmZd'"
659
+ :rules="[{ required: false, trigger: ['blur', 'change'] }]"
504
660
  >
505
- <i
506
- slot="suffix"
507
- class="el-input__icon el-icon-search"
508
- @click="openToTaBmZdDialog(row, rowIndex, $table)"
509
- ></i>
510
- </el-input>
661
+ <fieldCompare
662
+ :isCompare="isCompare"
663
+ :oldVal="getHValue(row, column)"
664
+ :newVal="row[column.property]"
665
+ >
666
+ <el-input
667
+ class="search-input"
668
+ v-model="row.toTaBmZd"
669
+ clearable
670
+ @clear="$forceUpdate()"
671
+ v-el-readonly
672
+ :disabled="!!row.systems || !!row.relationZd"
673
+ >
674
+ <i
675
+ slot="suffix"
676
+ class="el-input__icon el-icon-search"
677
+ @click="openToTaBmZdDialog(row, rowIndex, $table)"
678
+ ></i>
679
+ </el-input>
680
+ </fieldCompare>
681
+ </el-form-item>
511
682
  </template>
512
- <template #treeFlag="{ row }">
513
- <el-select
514
- v-model="row.treeFlag"
515
- clearable
516
- :disabled="!!row.systems || !!row.relationZd || szTaMb.taRule !== 1"
517
- >
518
- <el-option value="name" :label="$t1('名称')"></el-option>
519
- <el-option value="wbs" :label="$t1('WBS码')"></el-option>
520
- <el-option value="parent" :label="$t1('上级ID')"></el-option>
521
- <el-option value="treePath" :label="$t1('树ID路径')"></el-option>
522
- <el-option
523
- value="treePathName"
524
- :label="$t1('树名称路径')"
525
- ></el-option>
526
- <el-option value="hasChild" :label="$t1('是否有下级')"></el-option>
527
- <el-option value="grade" :label="$t1('层级')"></el-option>
528
- </el-select>
683
+ <template #treeFlag="{ row, column }">
684
+ <el-form-item>
685
+ <fieldCompare
686
+ :isCompare="isCompare"
687
+ :oldVal="getHValue(row, column)"
688
+ :newVal="treeFlagMap[row[column.property]]"
689
+ >
690
+ <el-select
691
+ v-model="row.treeFlag"
692
+ clearable
693
+ :disabled="
694
+ !!row.systems || !!row.relationZd || szTaMb.taRule !== 1
695
+ "
696
+ >
697
+ <el-option value="name" :label="$t1('名称')"></el-option>
698
+ <el-option value="wbs" :label="$t1('WBS码')"></el-option>
699
+ <el-option value="parent" :label="$t1('上级ID')"></el-option>
700
+ <el-option value="treePath" :label="$t1('树ID路径')"></el-option>
701
+ <el-option
702
+ value="treePathName"
703
+ :label="$t1('树名称路径')"
704
+ ></el-option>
705
+ <el-option
706
+ value="hasChild"
707
+ :label="$t1('是否有下级')"
708
+ ></el-option>
709
+ <el-option value="grade" :label="$t1('层级')"></el-option>
710
+ </el-select>
711
+ </fieldCompare>
712
+ </el-form-item>
529
713
  </template>
530
714
  </vxe-grid>
531
715
  </div>
@@ -875,13 +1059,14 @@
875
1059
  import mixin from "./mixins/edit";
876
1060
  import formVersionButton from "@base/views/bd/setting/formVersion/button.vue";
877
1061
  import reverButton from "@base/views/bd/setting/formVersion/reverButton.vue";
878
-
1062
+ import fieldCompare from "@base/views/bd/setting/formVersion/fieldCompare.vue";
879
1063
  export default {
880
1064
  name: "szTaMbEdit",
881
1065
  mixins: [mixin],
882
1066
  components: {
883
1067
  formVersionButton,
884
1068
  reverButton,
1069
+ fieldCompare,
885
1070
  },
886
1071
  methods: {},
887
1072
  };