centaline-data-driven 1.2.17 → 1.2.20

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/config/dev.env.js CHANGED
@@ -5,7 +5,7 @@ const prodEnv = require('./prod.env')
5
5
  module.exports = merge(prodEnv, {
6
6
  NODE_ENV: '"development"',
7
7
  // BASE_API: '"http://10.88.1.151:8085/v1/form/router"',//aplus黄兰
8
- BASE_API: '"http://10.88.22.13:7070/v1/form/router"',//max本地
8
+ BASE_API: '"http://10.88.22.50:7070/v1/form/router"',//max本地
9
9
  //BASE_API: '"http://10.88.22.71:5008/api/doaction/router"',
10
10
  // BASE_API: '"http://tjcptest.centaline.com.cn/v1/form/router"',
11
11
  // BASE_API: '"http://10.88.200.31:5000/gateway/redirect"',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "centaline-data-driven",
3
- "version": "1.2.17",
3
+ "version": "1.2.20",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
Binary file
Binary file
Binary file
Binary file
Binary file
@@ -309,7 +309,7 @@ html {
309
309
 
310
310
  .errorMessage {
311
311
  font-size: 12px;
312
- color: #ff5b5b;
312
+ color: #ff5b5b !important;
313
313
  padding: 3px 5px;
314
314
  white-space: nowrap;
315
315
  }
@@ -92,7 +92,7 @@
92
92
  </div>
93
93
  </div>
94
94
  </div>
95
- </div>
95
+ </div>
96
96
  </div>
97
97
  <div class="hous-b">
98
98
  <img src="../../../assets/ewm.png" alt="" class="code-ewm">
@@ -162,7 +162,7 @@
162
162
  </div>
163
163
  </div>
164
164
  <div class="open-mero" @click="allInfo=!allInfo">{{allInfo?'收起全部':'查看全部'}}
165
- <img src="../../../assets/mero.png" alt="" class="mero" > <!--:class="allInfo?'more-colose':'more-open'" -->
165
+ <!--<img src="../../../assets/mero.png" alt="" class="mero" > :class="allInfo?'more-colose':'more-open'" -->
166
166
 
167
167
 
168
168
  </div>
@@ -343,7 +343,7 @@
343
343
  <el-tab-pane label="楼主" name="second">楼主</el-tab-pane>
344
344
  </el-tabs>
345
345
  <div class="open-mero" @click="allIn=!allIn">{{allIn?'收起全部':'查看全部'}}
346
- <img src="../../../assets/mero.png" alt="" class="mero" > <!--:class="allIn?'more-colose':'more-open'" -->
346
+ <!--<img src="../../../assets/mero.png" alt="" class="mero" > :class="allIn?'more-colose':'more-open'" -->
347
347
  </div>
348
348
  </div>
349
349
  <div class="operation-list p0">
@@ -30,25 +30,28 @@
30
30
  <div>
31
31
  <component v-if="model.otherTradeActionRouter!==null" v-bind="model.otherTradeActionRouter" class="max-default"
32
32
  :is="model.otherTradeActionRouter.is" :vmodel="model.otherTradeActionRouter" :api="model.optionApi" @click="fieldClickHandler(model.otherTradeActionRouter,$event)"></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" @click="fieldClickHandler(model.actionRouters[0],$event)"></component>
33
+ <img src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:11px">
34
+ <img src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:8px">
35
35
  </div>
36
36
  <div class="mt5">
37
+ <component class="max-report w93" v-if="model.actionRouters!==null && model.actionRouters[0]!==null"
38
+ :is="model.actionRouters[0].is" :vmodel="model.actionRouters[0]" :api="model.optionApi" @click="fieldClickHandler(model.actionRouters[0],$event)"></component>
37
39
  <component class="max-report" v-if="model.actionRouters!==null && model.actionRouters[1]!==null"
38
40
  :is="model.actionRouters[1].is" :vmodel="model.actionRouters[1]" :api="model.optionApi" @click="fieldClickHandler(model.actionRouters[1],$event)"></component>
39
41
  </div>
40
42
  <div class="mt5">
41
- <button type="button" class="el-button el-button--info el-button--mini max-report rel"
42
- v-if="model.actionRoutersMoreList !== null">
43
+ <button type="button" class="el-button el-button--info el-button--mini max-report rel w64"
44
+ v-if="model.actionRoutersMoreList !== null && model.actionRoutersMoreList.length>0">
43
45
  <img src="../../../assets/dian.png" alt="" class="report">
44
46
  <ul class="report-cont">
45
47
  <li v-for="(col, index) in model.actionRoutersMoreList" :key="index" v-if="col.show !== false">
46
48
  <component class="max-report" :is="col.is" :vmodel="col" :api="model.optionApi" @click="fieldClickHandler(col,$event)"></component>
47
49
  </li>
48
50
  </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" @click="fieldClickHandler(model.actionRouters[2],$event)"></component>
51
+ </button>
52
+ <component v-else-if="model.actionRouters!==null && model.actionRouters.legth===3" class="max-report"
53
+ :is="model.actionRouters[2].is" :vmodel="model.actionRouters[2]" :api="model.optionApi" @click="fieldClickHandler(model.actionRouters[2],$event)">
54
+ </component>
52
55
  </div>
53
56
  </div>
54
57
  </div>
@@ -105,7 +108,7 @@
105
108
  <img :src="model.fields1Dic.ewmUrl.value" alt="" class="code-ewm">
106
109
  <div class="info-row mb20 mt5">
107
110
  <div class="row-i"><span>{{model.fields1Dic.Price.label}}</span><span class="base-clolr expand-f">{{model.fields1Dic.Price.value}}</span><span class="base-clolr">{{model.fields1Dic.Price.unitName}}</span>
108
- <img src="" alt="">
111
+ <img src="../../../assets/jsq.png" class="img-jsq" alt="">
109
112
  </div>
110
113
  <div class="row-i"><span>{{model.fields1Dic.PriceUnit.label}}</span><span class="base-clolr">{{model.fields1Dic.PriceUnit.value}}</span><span class="base-clolr">{{model.fields1Dic.PriceUnit.unitName}}</span></div>
111
114
  <div class="row-i"><span>{{model.fields1Dic.PriceLine.label}}</span><div>{{model.fields1Dic.PriceLine.value}}{{model.fields1Dic.PriceLine.unitName}}</div></div></div>
@@ -132,7 +135,8 @@
132
135
  </div>
133
136
  </div>
134
137
  <div class="open-mero" @click="allInfo=!allInfo">{{allInfo?'收起全部':'查看全部'}}
135
- <img src="../../../assets/mero.png" alt="" class="mero" > <!--:class="allInfo?'more-colose':'more-open'" -->
138
+ <!-- <img src="../../../assets/mero.png" alt="" class="mero" > :class="allInfo?'more-colose':'more-open'" -->
139
+ <i :class="allInfo?'more-colose':'mero-open'"></i>
136
140
  </div>
137
141
  </div>
138
142
  <div class="contacts-info base-box">
@@ -247,7 +251,8 @@
247
251
  <div class="text">{{info.mobileNo}}</div>
248
252
  </div>
249
253
  <div class="open-mero" @click="allIn=!allIn">{{allIn?'收起全部':'查看全部'}}
250
- <img src="../../../assets/mero.png" alt="" class="mero" > <!--:class="allIn?'more-colose':'more-open'" -->
254
+ <!-- <img src="../../../assets/mero.png" alt="" class="mero" > :class="allIn?'more-colose':'more-open'" -->
255
+ <i :class="allIn?'more-colose':'mero-open'"></i>
251
256
  </div>
252
257
  </div>
253
258
  </div>
@@ -262,7 +267,7 @@
262
267
  <div class="t-item">
263
268
  <span class="i">{{col.operationName}}</span>
264
269
  </div>
265
- <div class="t-item"><span class="i">{{col.desc}}</span></div>
270
+ <div class="t-item"><span class="i" :class="'operation'+col.flagKey">{{col.desc}}</span></div>
266
271
  <div class="t-item" style="height: 50px;">
267
272
  <component class="el-button t-but el-button--info max-info" v-if="col.router && col.router.show" :is="col.router.is" :vmodel="col.router" :api="model.optionApi" @click="fieldClickHandler(col.router,$event)"></component>
268
273
  </div>
@@ -502,7 +507,6 @@
502
507
  loadOperation() {
503
508
  this.model._operationList=null;
504
509
  this.model._operationRouters=[];
505
- this.model.operationKey=this.model.operationKey+1;
506
510
  this.model.getOperationList();
507
511
  },
508
512
  lookOwner() {
@@ -697,9 +701,17 @@
697
701
  }
698
702
  </script>
699
703
  <style lang="scss" scoped>
704
+ .operation0{
705
+ color: #000000;
706
+ }
707
+ .operation1{
708
+ color: #388cd3;
709
+ }
710
+ .operation2{
711
+ color: #388cd3;
712
+ }
700
713
  .main{
701
- background: #ECEFF2;
702
-
714
+ background: #ECEFF2;
703
715
  }
704
716
  .rel{
705
717
  position: relative;
@@ -708,6 +720,8 @@
708
720
  overflow-y: auto;
709
721
  overflow-x: auto;
710
722
  }
723
+ .w64{width: 64px!important}
724
+ .w93{width: 93px!important}
711
725
  .w300 {
712
726
  width: 300px;
713
727
  }
@@ -869,6 +883,12 @@
869
883
  font-size: 18px;
870
884
  font-weight: bold;
871
885
  }
886
+ .img-jsq{
887
+ width: 14px;
888
+ height: 14px;
889
+ display: inline-block;
890
+ margin-left: 10px;
891
+ }
872
892
  .info-conten {
873
893
  display: flex;
874
894
  .info-row {
@@ -987,12 +1007,25 @@
987
1007
  text-align: center;
988
1008
  padding: 3px 0;
989
1009
  }
990
- .mero{
991
- width: 12px;
992
- height: 6px;
993
- vertical-align: 2px;
994
- overflow: hidden;
995
- margin-left: 5px;
1010
+ // .mero{
1011
+
1012
+ // vertical-align: 2px;
1013
+ // overflow: hidden;
1014
+ // margin-left: 5px;
1015
+ // }
1016
+ .more-colose{
1017
+ background: url('../../../assets/mero-colose.png')no-repeat;
1018
+ background-size: 100% 100%;
1019
+ width: 18px;
1020
+ height: 9px;
1021
+ display: inline-block;
1022
+ }
1023
+ .mero-open{
1024
+ background: url('../../../assets/more-open.png')no-repeat;
1025
+ background-size: 100% 100%;
1026
+ width: 18px;
1027
+ height: 9px;
1028
+ display: inline-block;
996
1029
  }
997
1030
  .hous-mero {
998
1031
  display: flex;
@@ -1154,12 +1187,19 @@
1154
1187
  text-align: center;
1155
1188
  padding: 3px 0;
1156
1189
  }
1157
- .mero{
1158
- width: 12px;
1159
- height: 6px;
1160
- vertical-align: 2px;
1161
- overflow: hidden;
1162
- margin-left: 5px;
1190
+ .more-colose{
1191
+ background: url('../../../assets/mero-colose.png')no-repeat;
1192
+ background-size: 100% 100%;
1193
+ width: 18px;
1194
+ height: 9px;
1195
+ display: inline-block;
1196
+ }
1197
+ .mero-open{
1198
+ background: url('../../../assets/more-open.png')no-repeat;
1199
+ background-size: 100% 100%;
1200
+ width: 18px;
1201
+ height: 9px;
1202
+ display: inline-block;
1163
1203
  }
1164
1204
  .hous-mero {
1165
1205
  display: flex;
@@ -1,6 +1,6 @@
1
1
  <template>
2
2
  <div style="width:100%" v-if="model !== null" class="block ct-file" :class="[model.attrs.size?'ct-checkbox-'+model.attrs.size:'']">
3
- <el-upload :class="model.lock?'ct-upload-display-none':''"
3
+ <el-upload :class="disableUpload?'ct-upload-display-none':''"
4
4
  :disabled="model.lock"
5
5
  :accept="model.fileAccept"
6
6
  :on-change="handleChange"
@@ -14,9 +14,12 @@
14
14
  :before-upload="beforeUploadProcess"
15
15
  :on-success="handleAvatarSuccess"
16
16
  :on-progress="uploadProcess"
17
- >
17
+ :limit="parseInt(model.max||999)"
18
+ :on-exceed="handleExceed">
18
19
  <i slot="default" class="el-icon-plus"></i>
19
- <div slot="tip" class="el-upload__tip errorMessage" v-show="!imgValid">{{validMessage}}</div>
20
+ <!--<i slot="default" class="el-icon-plus" style="position: relative;"><div @click="testss($event)" class="max-ewmsc"></div></i>-->
21
+
22
+ <div slot="tip" class="el-upload__tip errorMessage" v-show="!valid">{{validMessage}}</div>
20
23
  <div slot="file" slot-scope="{file}" :title="file.fileName">
21
24
  <div class="cover-list-item">
22
25
  <el-image fit="fill" :src="file.url"
@@ -44,7 +47,7 @@
44
47
  </span>
45
48
  <el-dropdown-menu slot="dropdown" class="el-upload-list__item-preview">
46
49
  <el-dropdown-item v-for="(option, index) in model.optionModel.options" :key="index" :command="{option:option,file:file}">
47
- {{option[model.optionModel.optionAttrs.label]}}
50
+ {{option[model.optionModel.optionAttrs.label]}}
48
51
  </el-dropdown-item>
49
52
  </el-dropdown-menu>
50
53
  </el-dropdown>
@@ -66,7 +69,7 @@
66
69
  },
67
70
  data() {
68
71
  return {
69
- imgValid:true,
72
+ disableUpload:false,
70
73
  };
71
74
  },
72
75
  computed: {
@@ -90,12 +93,18 @@
90
93
  self.load(data);
91
94
  });
92
95
  }
96
+ this.disableUpload=this.model.lock;
93
97
  });
94
98
  },
95
99
  methods: {
96
100
  load(data) {
97
101
  this.model = data;
98
102
  },
103
+ handleExceed()
104
+ {
105
+ this.validMessage = "附件数量最多" + this.model.max+ "张";
106
+ this.valid = false;
107
+ },
99
108
  //删除
100
109
  handleRemove(file) {
101
110
  this.$common.confirm("确定删除该附件?", "提示", {
@@ -104,6 +113,7 @@
104
113
  //type: 'warning'
105
114
  }).then(() => {
106
115
  this.model.deleteFile(file, false);
116
+ this.selfValidExcute('remove');
107
117
  }).catch(() => {
108
118
  });
109
119
  },
@@ -156,16 +166,19 @@
156
166
  //上传之前的钩子
157
167
  beforeUploadProcess(files) {
158
168
  let that=this;
159
- if (this.model.max) {
160
- if (this.model.getfileListLength() >= this.model.max) {
161
- this.validMessage = "附件最多" + this.model.max + "个";
162
- this.imgValid = false;
163
- setTimeout(() => {
164
- that.imgValid = true;
165
- }, 3000)
166
- return false;
167
- }
168
- }
169
+
170
+ // if (this.model.max) {
171
+ // console.log('beforeUploadProcess')
172
+ // console.log(this.model.fileList)
173
+ // if (this.model.getfileListLength() >= this.model.max) {
174
+ // this.validMessage = "附件最多" + this.model.max + "个";
175
+ // this.valid = false;
176
+ // setTimeout(() => {
177
+ // that.valid = true;
178
+ // }, 3000)
179
+ // return false;
180
+ // }
181
+ // }
169
182
  return true;
170
183
  },
171
184
  //文件上传时的钩子
@@ -185,6 +198,7 @@
185
198
  },
186
199
  //不能共用的数据校验
187
200
  selfValidExcute: function (eventName) {
201
+
188
202
  if (this.model.required) {
189
203
  if (this.model.getfileListLength() === 0) {
190
204
  this.validMessage = "必须上传附件";
@@ -194,16 +208,43 @@
194
208
  }
195
209
 
196
210
  if (this.model.max) {
197
- if (this.model.getfileListLength() > this.model.max) {
198
- this.validMessage = "附件最多" + this.model.max+ "个";
199
- this.valid = false;
200
- return false;
211
+ //change
212
+ if(this.model.getfileListLength() >= this.model.max)
213
+ {
214
+ this.disableUpload=true;
215
+ }else
216
+ {
217
+ this.disableUpload=false;
201
218
  }
219
+
220
+ // if (this.model.getfileListLength() > this.model.max) {
221
+ // this.validMessage = "附件数量";
222
+ // if(this.model.min)
223
+ // {
224
+ // this.validMessage += "最少" + this.model.min + "个"+",";
225
+ // }
226
+ // // this.validMessage += "最多" + this.model.max+ "个";
227
+ // this.valid = false;
228
+ // return false;
229
+ // }
202
230
  }
203
231
  if (this.model.min) {
204
232
  if (this.model.getfileListLength() < this.model.min) {
205
- this.validMessage = "附件最少" + this.model.min + "个";
206
- this.valid = false;
233
+ //change时需要判断有没有上传图片如果没有图片则不提示
234
+
235
+ if(eventName=='change' && this.model.getfileListLength()>0)
236
+ {
237
+ this.validMessage = "附件数量还差" + (parseInt(this.model.min)-this.model.getfileListLength()) + "张";
238
+ this.valid = false;
239
+ }else if(eventName=='valid')
240
+ {
241
+ this.validMessage = "附件数量还差" + (parseInt(this.model.min)-this.model.getfileListLength()) + "张";
242
+ this.valid = false;
243
+ }else if(eventName=='remove')
244
+ {
245
+ this.valid = true;
246
+ }
247
+
207
248
  return false;
208
249
  }
209
250
  }
@@ -286,4 +327,16 @@
286
327
  width: 100px;
287
328
  height: 100px;
288
329
  }
330
+ .el-upload .max-ewmsc {
331
+ background: url("../../../assets/ewm.png") no-repeat;
332
+ content: '';
333
+ display: block;
334
+ width: 30px;
335
+ height: 30px;
336
+ font-size: 30px;
337
+ background-size: 30px;
338
+ position: absolute;
339
+ top: -35px;
340
+ left: 35px;
341
+ }
289
342
  </style>