centaline-data-driven 1.1.43 → 1.1.47

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 (32) hide show
  1. package/package.json +1 -1
  2. package/src/Form.vue +14 -2
  3. package/src/centaline/css/common.css +29 -7
  4. package/src/centaline/css/max.css +10 -1
  5. package/src/centaline/dialogList/src/dialog.vue +4 -2
  6. package/src/centaline/dynamicBtn/src/dynamicBtn.vue +1 -1
  7. package/src/centaline/dynamicCb/src/dynamicCb.vue +1 -1
  8. package/src/centaline/dynamicComboBoxWithTextBox/src/dynamicComboBoxWithTextBox.vue +1 -1
  9. package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue +2 -5
  10. package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue +44 -36
  11. package/src/centaline/dynamicForm/src/dynamicForm.vue +18 -7
  12. package/src/centaline/dynamicForm/src/dynamicFormList.vue +1 -1
  13. package/src/centaline/dynamicForm/src/dynamicFormListTable.vue +0 -2
  14. package/src/centaline/dynamicInputNumber/src/dynamicInputNumber.vue +1 -1
  15. package/src/centaline/dynamicMo/src/dynamicMo.vue +12 -9
  16. package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchList.vue +17 -1
  17. package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchListTable.vue +4 -1
  18. package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +4 -2
  19. package/src/centaline/dynamicSearchList/src/dynamicTableTip.vue +1 -1
  20. package/src/centaline/dynamicSeg/src/dynamicSeg.vue +2 -2
  21. package/src/centaline/dynamicSo/src/dynamicSo.vue +11 -11
  22. package/src/centaline/dynamicSos/src/dynamicSos - /345/244/215/345/210/266.vue" +2 -2
  23. package/src/centaline/dynamicSos/src/dynamicSos.vue +9 -9
  24. package/src/centaline/dynamicTags/src/dynamicTags - /345/244/215/345/210/266.vue" +3 -3
  25. package/src/centaline/dynamicTags/src/dynamicTags.vue +12 -9
  26. package/src/centaline/formData/index.js +19 -8
  27. package/src/centaline/loader/src/ctl/Detail.js +135 -10
  28. package/src/centaline/loader/src/ctl/Form.js +3 -1
  29. package/src/centaline/loader/src/ctl/lib/Enum.js +5 -0
  30. package/src/main.js +2 -1
  31. package/wwwroot/static/centaline/centaline-data-driven.js +1 -1
  32. package/wwwroot/static/centaline/centaline-data-driven.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "centaline-data-driven",
3
- "version": "1.1.43",
3
+ "version": "1.1.47",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
package/src/Form.vue CHANGED
@@ -6,7 +6,9 @@
6
6
  <!--<ct-form :source="formdata.content"></ct-form>-->
7
7
  <!--<ct-form :api="'/api/form/formdata/contractDetail'" :apiParam="apiParam"></ct-form>-->
8
8
  <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
9
- <ct-form :api="'/forminfo/readDetail'" :apiParam="apiParam"></ct-form>
9
+ <!-- <ct-form :api="'/forminfo/readDetail'" :apiParam="apiParam"></ct-form> -->
10
+ <ct-form :api="'PropertyKey/getLayoutOfNew'" :apiParam="apiParam"></ct-form>
11
+ <!-- <ct-form :api="'/api/distribution/transaction/add'" :apiParam="apiParam"></ct-form> -->
10
12
  <ct-dialog-list></ct-dialog-list>
11
13
  </div>
12
14
  </template>
@@ -19,7 +21,17 @@
19
21
  // apiParam: {originalTraId: "1481454808274235394", actionType: 3, pageTitle: "成交报告", pageOnly: true} ,
20
22
  // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
21
23
  // apiParam: {SN: "13557_132", UserID: "wuhan3"},
22
- apiParam: {actionType: 3,formId: "2c12649f-09c5-4aa9-8011-b6d1c7b56a41"} ,
24
+ // apiParam: {actionType: 3,formId: "2c12649f-09c5-4aa9-8011-b6d1c7b56a41"} ,
25
+ apiParam: {chanceID: "1", actionType: 2} ,
26
+ // apiParam: {
27
+ // actionType: 2,
28
+ // agentId: "1450283160825425922",
29
+ // estateId: "B6E6B3D8-FDF2-4AF8-91E6-B348D637E993",
30
+ // pageOnly: true,
31
+ // pageStyle: 2,
32
+ // propertyId: "14102015-0736-9265-205A-451687BF7062",
33
+ // relProId: "1475708315466829833",
34
+ // }
23
35
  }
24
36
  },
25
37
  methods: {
@@ -34,7 +34,7 @@ html {
34
34
  color: #606266;
35
35
  display: inline-block;
36
36
  font-size: inherit;
37
- line-height: 28px;
37
+ line-height: 26px;
38
38
  outline: 0;
39
39
  padding: 0 15px;
40
40
  padding-right: 30px;
@@ -237,7 +237,7 @@ html {
237
237
  /* 有边框是26,无边框是28*/
238
238
  .ct-Seg.ct-Seg-mini .ct-radios, .ct-Seg.ct-Seg-mini .ct-radios .el-radio__label {
239
239
  min-height: 28px;
240
- line-height: 28px;
240
+ line-height: 26px;
241
241
  }
242
242
 
243
243
  .ct-Seg.ct-Seg-small .ct-radios, .ct-Seg.ct-Seg-small .ct-radios .el-radio__label {
@@ -270,7 +270,7 @@ html {
270
270
  color: transparent;
271
271
  display: inline-block;
272
272
  font-size: inherit;
273
- line-height: 28px;
273
+ line-height: 26px;
274
274
  outline: 0;
275
275
  padding: 0 15px;
276
276
  padding-right: 30px;
@@ -292,7 +292,7 @@ html {
292
292
  box-sizing: border-box;
293
293
  display: inline-block;
294
294
  font-size: inherit;
295
- line-height: 28px;
295
+ line-height: 26px;
296
296
  outline: 0;
297
297
  padding: 0 15px;
298
298
  padding-right: 30px;
@@ -431,7 +431,11 @@ html {
431
431
  color: #fff;
432
432
 
433
433
  } */
434
+ .el-button--mini, .el-button--mini.is-round{
435
+ padding: 0px 19px;
436
+ }
434
437
  .el-button--primary {
438
+ height: 26px;
435
439
  background-color: #EE6B6B ;
436
440
  border-color: #EE6B6B ;
437
441
  }
@@ -713,11 +717,29 @@ html {
713
717
  .ct-table-content{
714
718
  padding: 0 15px;
715
719
  }
716
- .el-card.is-always-shadow{
717
- box-shadow: none!important;
720
+ .el-card.is-always-shadow {
721
+ border: none;
722
+ box-shadow: none !important;
718
723
  }
719
724
 
720
725
  .domDisabled {
721
726
  pointer-events: none;
722
727
  opacity:0.4;
723
- }
728
+ }
729
+ .el-radio__label{
730
+ padding-left: 5px!important;
731
+ }
732
+ .el-input--mini .el-input__inner{
733
+ height: 26px!important;
734
+ line-height: 26px!important;
735
+ }
736
+ .ct-Seg.ct-Seg-mini .ct-radios, .ct-Seg.ct-Seg-mini .ct-radios .el-radio__label {
737
+ min-height: 26px!important;
738
+ line-height: 26px;
739
+ }
740
+ .ct-rich-text {
741
+ min-height: 26px!important;
742
+ }
743
+ .ct-dialog_body .el-card__body{
744
+ padding-top: 0px!important;
745
+ }
@@ -192,4 +192,13 @@
192
192
  }
193
193
  .ct-radios .ct-font-size-mini .el-radio-button__inner{
194
194
  padding: 5px 10px;
195
- }
195
+ }
196
+ .ct-Seg .ct-radios .el-input__icon.el-icon-circle-close{
197
+ min-height: 26px;
198
+ line-height: 26px;
199
+
200
+ }
201
+ .ct-Seg.ct-Seg-mini .ct-radios, .ct-Seg.ct-Seg-mini .ct-radios .el-radio__label {
202
+ min-height: 26px;
203
+ line-height: 26px;
204
+ }
@@ -109,10 +109,12 @@
109
109
  },
110
110
  this.vmodel.title),
111
111
  h('i', {
112
- class: ['el-dialog__close', 'el-icon', 'el-icon-close'],
112
+ class: ['el-icon', 'el-icon-close'],
113
113
  style: {
114
114
  'position': 'absolute',
115
- 'right': '20px'
115
+ 'right': '8px',
116
+ 'top':'7px',
117
+ 'font-size':'22px'
116
118
  },
117
119
  on: {
118
120
  click: (event) => { this.close(event); }
@@ -85,7 +85,7 @@
85
85
  },
86
86
  dropClick(event) {
87
87
  var self = this;
88
- this.$nextTick(function () {
88
+ this.$nextTick(function () {
89
89
  if (self.optionApi) {
90
90
  self.model.getOptions(self.optionApi);
91
91
  }
@@ -65,7 +65,7 @@
65
65
  color: #606266;
66
66
  /* border-radius: 4px; */
67
67
  /* border: 1px solid #dcdfe6; */
68
- padding-left: 15px;
68
+ /* padding-left: 15px; */
69
69
  padding-bottom: 3px;
70
70
  padding-top: 3px;
71
71
  }
@@ -221,7 +221,7 @@
221
221
  .ct-combobox-with-textbox {
222
222
  font-size: 12px;
223
223
  align-items: center;
224
- height: 28px;
224
+ height: 26px;
225
225
  }
226
226
 
227
227
  .ct-combobox-with-textbox .ct-combobox-with-textbox-label {
@@ -737,11 +737,9 @@
737
737
  }
738
738
  .head-but{
739
739
  margin-left: auto;
740
- font-size: 12px;
741
- height: 26px;
740
+ font-size: 12px;
741
+ text-align: right;
742
742
  .max-report{
743
- float: right;
744
- position: relative;
745
743
  height: 26px;
746
744
  color: #333333;
747
745
  background-color: #FFFFFF;
@@ -1237,7 +1235,6 @@
1237
1235
  border: 1px solid #EE6B6B;
1238
1236
  color: #EE6B6B;
1239
1237
  height: 26px;
1240
- vertical-align: middle;
1241
1238
  border-radius: 6px;
1242
1239
  font-size: 12px;
1243
1240
  }
@@ -19,24 +19,37 @@
19
19
  <img :src="model.fields1Dic.LocationUrl.value" alt="" class="location">
20
20
  </div>
21
21
  <div class="title-tags">
22
- <div class="t-tag">联卖</div>
23
- <div class="t-tag">无抵押</div>
24
- <div class="t-tag">满五</div>
25
- <div class="t-tag"> 满二</div>
22
+ <div class="t-tag" v-for="(tag, index) in model.actionRouterLabel" :key="index"
23
+ :style="{color:tag.textColor,backgroundColor:tag.bgColor,borderColor:tag.borderColor}">
24
+ {{tag.label}}
25
+ </div>
26
26
  </div>
27
27
  </div>
28
28
 
29
29
  <div class="head-but">
30
- <button type="button" class="el-button f-wb el-button--default el-button--mini max-default">去出租 &gt;&gt;</button>
31
- <button type="button" class="el-button el-button--info el-button--mini max-report">
32
- <img src="../../../assets/dian.png" alt="" class="report">
33
- <ul class="report-cont">
34
- <li>举报房源</li>
35
- <li>操作日志</li>
36
- <li>裁判记录</li>
37
- </ul>
38
- </button>
39
-
30
+ <div>
31
+ <component v-if="model.otherTradeActionRouter!==null" v-bind="model.otherTradeActionRouter" class="max-default"
32
+ :is="model.otherTradeActionRouter.is" :vmodel="model.otherTradeActionRouter" :api="model.optionApi"></component>
33
+ <component class="max-report" v-if="model.actionRouters!==null && model.actionRouters[0]!==null"
34
+ :is="model.actionRouters[0].is" :vmodel="model.actionRouters[0]" :api="model.optionApi"></component>
35
+ </div>
36
+ <div class="mt5">
37
+ <component class="max-report" v-if="model.actionRouters!==null && model.actionRouters[1]!==null"
38
+ :is="model.actionRouters[1].is" :vmodel="model.actionRouters[1]" :api="model.optionApi"></component>
39
+ </div>
40
+ <div class="mt5">
41
+ <button type="button" class="el-button el-button--info el-button--mini max-report"
42
+ v-if="model.actionRoutersMoreList !== null">
43
+ <img src="../../../assets/dian.png" alt="" class="report">
44
+ <ul class="report-cont">
45
+ <li v-for="(col, index) in model.actionRoutersMoreList" :key="index" v-if="col.show !== false">
46
+ <component class="max-report" :is="col.is" :vmodel="col" :api="model.optionApi"></component>
47
+ </li>
48
+ </ul>
49
+ </button>
50
+ <component v-else-if="model.actionRouters!==null && model.actionRouters[2]!==null" class="max-report"
51
+ :is="model.actionRouters[2].is" :vmodel="model.actionRouters[2]" :api="model.optionApi"></component>
52
+ </div>
40
53
  </div>
41
54
  </div>
42
55
 
@@ -101,24 +114,22 @@
101
114
  <div class="row-i">
102
115
  <span >{{model.fields1Dic.AssessPrice.label}}</span><span>{{model.fields1Dic.AssessPrice.value}} </span><span>{{model.fields1Dic.AssessPrice.unitName}}</span>
103
116
  </div>
104
- <div class="row-i"><span>预估租总价:</span><div>4621
105
- <span>万</span></div></div>
106
- <div class="row-i"><span>预估租单价:</span><span>11.00</span><span>元/平</span></div>
117
+ <div class="row-i"><span>{{model.fields1Dic.EstimatePriceRent.label}}</span><div>{{model.fields1Dic.EstimatePriceRent.value}}<span>{{model.fields1Dic.EstimatePriceRent.unitName}}</span></div></div>
118
+ <div class="row-i"><span>{{model.fields1Dic.EstimatePriceRentUnit.label}}</span><span>{{model.fields1Dic.EstimatePriceRentUnit.value}}</span><span>{{model.fields1Dic.EstimatePriceRentUnit.unitName}}</span></div>
107
119
  </div>
108
120
 
109
121
  <div class="info-mid">
110
122
  <div class="mid-i">
111
- <div>建筑面积</div><div>2000.00平</div></div>
112
- <div class="mid-i"><div>实用面积</div><div>2000.00平</div></div>
113
- <div class="mid-i"><div>楼层</div><div>中楼层(16/33)</div></div>
114
- <div class="mid-i"><div>朝向</div><div>南北</div></div></div>
123
+ <div>{{model.fields1Dic.Area.label}}</div><div>{{model.fields1Dic.Area.value}}{{model.fields1Dic.Area.unitName}}</div></div>
124
+ <div class="mid-i"><div>{{model.fields1Dic.AreaNet.label}}</div><div>{{model.fields1Dic.AreaNet.value}}{{model.fields1Dic.AreaNet.unitName}}</div></div>
125
+ <div class="mid-i"><div>{{model.fields1Dic.FloorName.label}}</div><div>{{model.fields1Dic.FloorName.value}}</div></div>
126
+ <div class="mid-i"><div>{{model.fields1Dic.PropertyDirectionID.label}}</div><div>{{model.fields1Dic.PropertyDirectionID.value}}</div></div>
127
+ </div>
115
128
  </div>
116
129
  </div>
117
130
  <div class="info-conten-b" v-show="allInfo">
118
131
  <div class="info-row mb20">
119
- <div class="row-i">
120
- <span>建筑用途:</span><span>写字楼</span>
121
- </div>
132
+ <div class="row-i"><span>建筑用途:</span><span>写字楼</span></div>
122
133
  <div class="row-i"><span>产权:</span><span>公司</span></div>
123
134
  <div class="row-i"><span>产权状况:</span><span>拍卖</span></div>
124
135
  <div class="row-i"><span>现状:</span><span>空房</span></div>
@@ -140,25 +151,21 @@
140
151
  </div>
141
152
  <div class="info-conten-b" v-show="allInfo">
142
153
  <div class="info-row mb20">
143
- <div class="row-i"><span>按揭银行:</span><span>中国农行</span></div>
154
+ <div class="row-i"><span>按揭银行:</span><span>中国农行</span></div>
144
155
  <div class="row-i"><span>欠款额度:</span><span>0.00万</span></div>
145
156
  <div class="row-i"><span>管理费:</span><span></span></div>
146
157
  <div class="row-i"><span>使用年限:</span><span>3年</span></div>
147
158
  <div class="row-i"><span>来源:</span><span></span></div>
148
159
  <div class="row-i"><span> </span><span> </span></div>
149
-
150
160
  </div>
151
161
  </div>
152
162
  <div class="info-conten-b" v-show="allInfo">
153
- <div class="info-row mb20">
154
-
163
+ <div class="info-row mb20">
155
164
  <div class="row-i"><span>房源描述:</span><span></span></div>
156
165
  </div>
157
166
  </div>
158
167
  <div class="open-mero" @click="allInfo=!allInfo">{{allInfo?'收起全部':'查看全部'}}
159
168
  <img src="../../../assets/mero.png" alt="" class="mero" > <!--:class="allInfo?'more-colose':'more-open'" -->
160
-
161
-
162
169
  </div>
163
170
  </div>
164
171
  <div class="contacts-info base-box">
@@ -340,11 +347,11 @@
340
347
  <img src="../../../assets/mero.png" alt="" class="mero" > <!--:class="allIn?'more-colose':'more-open'" -->
341
348
  </div>
342
349
  </div>
343
- <div class="operation-list p0">
350
+ <!-- <div class="operation-list p0">
344
351
  <button data-v-6fe32525="" type="button" class="el-button list-item base-box el-button--default">编辑房源</button>
345
352
  <button data-v-6fe32525="" type="button" class="el-button list-item base-box el-button--default">转潜盘</button>
346
353
  <button data-v-6fe32525="" type="button" class="el-button list-item base-box el-button--default">激活房源</button>
347
- </div>
354
+ </div> -->
348
355
  <div class="operation-table base-box">
349
356
  <div class="table-box">
350
357
  <div class="t-item">
@@ -639,6 +646,9 @@
639
646
  .w300 {
640
647
  width: 300px;
641
648
  }
649
+ .mt5{
650
+ margin-top: 5px;
651
+ }
642
652
  .mt10{
643
653
  margin-top: 10px;
644
654
  }
@@ -742,10 +752,8 @@
742
752
  .head-but{
743
753
  margin-left: auto;
744
754
  font-size: 12px;
745
- height: 26px;
755
+ text-align: right;
746
756
  .max-report{
747
- float: right;
748
- position: relative;
749
757
  height: 26px;
750
758
  color: #333333;
751
759
  background-color: #FFFFFF;
@@ -1241,7 +1249,7 @@
1241
1249
  border: 1px solid #EE6B6B;
1242
1250
  color: #EE6B6B;
1243
1251
  height: 26px;
1244
- vertical-align: middle;
1252
+
1245
1253
  border-radius: 6px;
1246
1254
  font-size: 12px;
1247
1255
  }
@@ -223,7 +223,7 @@
223
223
  var self = this;
224
224
  this.model.scripts.$fd = field.id;
225
225
  this.model.scripts.$result = [];
226
-
226
+
227
227
  var clickAcion = function (field) {
228
228
  if (field.isSubmit) {
229
229
  let verified = true;
@@ -376,9 +376,11 @@
376
376
  changeHandler(field) {
377
377
  var self = this;
378
378
  if (typeof field.change !== 'undefined') {
379
+ if (typeof this.model.scripts !== 'undefined') {
380
+ this.model.scripts.formData.setExcuteListData(this.model.fields);
381
+ }
379
382
  this.model.scripts.$fd = field.id;
380
383
  this.$common.excute.call(this.model.scripts, field.change);
381
-
382
384
  }
383
385
 
384
386
  self.model.isChanged = true;
@@ -389,12 +391,17 @@
389
391
  },
390
392
  changeCallBackHandler(field, callBackFunName, callBackPara) {
391
393
  var self = this;
392
- this.model.scripts.$fd = field.id;
393
- this.$common.excuteFunStr.call(this.model.scripts, callBackFunName, callBackPara);
394
+ if(callBackFunName){
395
+ this.model.scripts.$fd = field.id;
396
+ this.$common.excuteFunStr.call(this.model.scripts, callBackFunName, callBackPara);
397
+ }
394
398
  self.$forceUpdate();
395
399
  },
396
400
  inputHandler(field) {
397
401
  if (typeof field.input !== 'undefined') {
402
+ if (typeof this.model.scripts !== 'undefined') {
403
+ this.model.scripts.formData.setExcuteListData(this.model.fields);
404
+ }
398
405
  this.model.scripts.$fd = field.id;
399
406
  this.$common.excute.call(this.model.scripts, field.input);
400
407
  }
@@ -439,7 +446,7 @@
439
446
  },
440
447
  on: {
441
448
  submit(option) {
442
- if (typeof callBack === "function") {
449
+ if (typeof callBack === "function" && !router.callBackFunName) {
443
450
  callBack(option);
444
451
  }
445
452
 
@@ -510,8 +517,7 @@
510
517
  }
511
518
  });
512
519
  },
513
- getFormObj()
514
- {
520
+ getFormObj(){
515
521
  let formData=this.model.getFormObj();
516
522
  if(this.$route && this.$route.query && this.$route.query.pageStyle)
517
523
  {
@@ -523,3 +529,8 @@
523
529
  }
524
530
  }
525
531
  </script>
532
+ <style scoped>
533
+ .el-collapse{
534
+ border-top: none;
535
+ }
536
+ </style>
@@ -187,7 +187,7 @@
187
187
  }
188
188
  .ct-form-list.ct-form-list-mini, .ct-form-list.ct-form-list-mini td {
189
189
  min-height: 28px;
190
- line-height: 28px;
190
+ line-height: 26px;
191
191
  font-size: 12px;
192
192
  }
193
193
  .ct-form-list.ct-form-list-small, .ct-form-list.ct-form-list-small td {
@@ -130,7 +130,6 @@
130
130
  },
131
131
  //修改
132
132
  saveRow(row, index, isCancel) {
133
- console.log(row);
134
133
  let app = this;
135
134
  if (app.model.dialogEdit) {
136
135
  this.editRow(row.$sourceIndex);
@@ -247,7 +246,6 @@
247
246
  this.model.change = field.change;
248
247
  this.model.currentRowIndex = index;
249
248
  this.model.currentEventField = field;
250
-
251
249
  self.$emit('change');
252
250
 
253
251
  //如果有汇总列,触发重新计算汇总
@@ -139,7 +139,7 @@
139
139
  box-sizing: border-box;
140
140
  color: #606266;
141
141
  display: inline-block;
142
- height: 28px;
142
+ height: 26px;
143
143
  outline: 0;
144
144
  padding: 0 15px;
145
145
  -webkit-transition: border-color .2s cubic-bezier(.645,.045,.355,1);
@@ -1,7 +1,7 @@
1
1
  <template>
2
2
  <div class="field-top">
3
3
  <div class="ct-mo" style="width:100%;display:flex">
4
- <div style="flex:1;display:flex" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-mo-'+model.attrs.size:''
4
+ <div style="flex:1;display:flex;margin-right: 5px;" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-mo-'+model.attrs.size:''
5
5
  ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
6
6
  <div style="flex:1;position: relative;" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
7
7
  <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
@@ -17,7 +17,7 @@
17
17
  </span>
18
18
  </div>
19
19
  <el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']"
20
- :trigger="'click'" :disabled="model.lock">
20
+ :trigger="(model.popupSearchListType > 0 || model.lock) ? 'manual' : 'click'" :disabled="model.lock">
21
21
  <div>
22
22
  <ct-select-option :model="model" :optionRowCount="optionRowCount" @click="selectOption($event)"></ct-select-option>
23
23
  </div>
@@ -43,8 +43,8 @@
43
43
  </transition>
44
44
  </div>
45
45
  <div v-if="model.popupSearchListType === 1 && !model.lock">
46
- <el-button v-if="!model.moreActionBtnName" size="mini" type="primary" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
47
- <el-button v-else size="mini" type="primary" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
46
+ <el-button v-if="!model.moreActionBtnName" class="h26" size="mini" type="primary" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
47
+ <el-button v-else size="mini" type="primary" class="h26" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
48
48
  </div>
49
49
  </div>
50
50
  </div>
@@ -71,7 +71,7 @@
71
71
  return {
72
72
  focus: false,
73
73
  showDrop: false,
74
- inputHeight: 28,
74
+ inputHeight: 26,
75
75
  tagsWidth: 175,
76
76
  showClear: false,
77
77
  globalOptions: []
@@ -110,7 +110,7 @@
110
110
  get: function () {
111
111
  switch (this.model.attrs.size) {
112
112
  case 'mini':
113
- return 28;
113
+ return 26;
114
114
  case 'small':
115
115
  return 32;
116
116
  case 'medium':
@@ -271,9 +271,9 @@
271
271
  selectOptionArr(optionArr) {
272
272
  var self = this;
273
273
  optionArr.forEach((s) => {
274
- if (!self.model.value.find((v) => { return v === s.Code })) {
274
+ if (!self.model.value.find((v) => { return v === s[self.model.optionAttrs.value] })) {
275
275
  self.model.options.push(s);
276
- self.model.value.push(s.Code);
276
+ self.model.value.push(s[self.model.optionAttrs.value]);
277
277
  }
278
278
  });
279
279
 
@@ -335,7 +335,7 @@
335
335
  color: transparent;
336
336
  display: inline-block;
337
337
  font-size: inherit;
338
- line-height: 28px;
338
+ line-height: 26px;
339
339
  outline: 0;
340
340
  padding: 0 15px;
341
341
  padding-right: 30px;
@@ -412,4 +412,7 @@
412
412
  .ct-mo-value-label {
413
413
  padding-left:15px;
414
414
  }
415
+ .h26{
416
+ height: 26px;
417
+ }
415
418
  </style>
@@ -1,7 +1,7 @@
1
1
  <template>
2
2
  <div v-loading="loading" style="width:100%">
3
3
  <div v-if="model !== null && !loading" class="ct-form">
4
- <div class="ct-ptb5">
4
+ <div class="ct-ptb5 max-flex">
5
5
  <template v-for="(col, index) in model.fields" v-if="col.show !== false">
6
6
  <br v-if="col.is === 'ct-linefeed'" />
7
7
  <component ref="Fields" :is="col.is" v-bind="col.listBind" :vmodel="col" :api="model.optionApi" @click="getClickHandler(col.action)"></component>
@@ -107,12 +107,21 @@
107
107
  searchData() {
108
108
  this.$refs.table.searchComplate(this.model);
109
109
  },
110
+ reset() {
111
+ this.model.fields.forEach((v) => {
112
+ v.reset();
113
+ });
114
+ },
110
115
  getClickHandler(action) {
111
116
  var fun = {};
112
117
  switch (action) {
113
118
  case 'search':
114
119
  this.searchData();
115
120
  break;
121
+ case 'reset':
122
+ this.reset();
123
+ this.searchData();
124
+ break;
116
125
  default:
117
126
  break;
118
127
  }
@@ -138,4 +147,11 @@
138
147
  }
139
148
  </script>
140
149
  <style>
150
+ .max-flex{
151
+ display: flex;
152
+
153
+ }
154
+ .max-flex .field-top{
155
+ margin-right: 10px;
156
+ }
141
157
  </style>
@@ -23,7 +23,7 @@
23
23
  <el-input v-if="jumpBtnName" size="mini" v-model="jumpStr" placeholder="定位" style="width:150px"></el-input>
24
24
  <el-button v-if="jumpBtnName" size="mini" @click="jumpClickHandler()">{{jumpBtnName}}</el-button>
25
25
  <el-button v-if="filterBtnName" size="mini" @click="filterClickHandler()" style="margin-left: 0px;">{{filterBtnName}}</el-button>
26
- <el-button size="mini" @click="confirmClickHandler()" style="float:right;" type="primary">确认</el-button>
26
+ <el-button size="mini" @click="confirmClickHandler()" class="max-search-btn" style="float:right;" type="primary">确认</el-button>
27
27
  </div>
28
28
  </div>
29
29
  <div style="min-height:250px" v-loading="loading" v-if="loading"></div>
@@ -231,4 +231,7 @@
231
231
  .el-table {
232
232
  font-size: 12px !important;
233
233
  }
234
+ .el-table .el-table__header th {
235
+ background-color: #f4f7fa!important;
236
+ }
234
237
  </style>
@@ -192,10 +192,11 @@
192
192
  self.colHasWidth[vi] = 'nowidth';
193
193
  }
194
194
  });
195
+ debugger;
195
196
  self.isLoading = false;
196
197
  self.$forceUpdate();
197
198
  this.model.scripts.formData = this.model.formData;
198
- this.model.scripts.formData.form = this.model;
199
+ this.model.scripts.formData.formTable = this.model;
199
200
 
200
201
  self.$emit('loaded');
201
202
  self.$emit('showTitle');
@@ -764,6 +765,7 @@
764
765
  // let parm={submitData:submitData,field:field}
765
766
  // self.$common.excuteFunStr.call(self.model.scripts, field.action,parm);
766
767
  let title=field.pageTitle==undefined ?field.label:field.pageTitle;
768
+ submitData.actionType=field.actionType;
767
769
  var fun =self.$common.getDataDrivenOpts().handler[action];
768
770
  fun(submitData,title,self.model);
769
771
  // var fun = self.model.scripts.formData[action];
@@ -923,7 +925,7 @@
923
925
 
924
926
  .ct-table-mini {
925
927
  font-size: 12px;
926
- line-height: 28px;
928
+ line-height: 26px;
927
929
  min-height: 28px;
928
930
  }
929
931
 
@@ -28,7 +28,7 @@
28
28
  }
29
29
  .ct-table-tip-mini {
30
30
  font-size: 12px;
31
- line-height: 28px;
31
+ line-height: 26px;
32
32
  min-height: 0px;
33
33
  }
34
34