Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
fc420843 1 parent 96a0ed67

feat: 修复BUG

Inline Side-by-side
Showing 4 changed files with 84 additions and 68 deletions
...@@ -53,16 +53,12 @@ ...@@ -53,16 +53,12 @@
53 </el-select> 53 </el-select>
54 </Formitem> 54 </Formitem>
55 </el-col> 55 </el-col>
56 - <!-- String | File | Boolean | Integer | Long --> 56 +
57 - <el-col :span="8"> 57 + <el-col
58 - <Formitem 58 + :span="8"
59 - label="配置项值" 59 + v-if="formData.configType === 'String' || !formData.configType"
60 - prop="configValue" 60 + >
61 - type="edit" 61 + <Formitem label="配置项值" prop="configValue" type="edit">
62 - v-if="
63 - formData.configType === 'String' || formData.configType === ''
64 - "
65 - >
66 <el-input 62 <el-input
67 type="text" 63 type="text"
68 class="inputShadow" 64 class="inputShadow"
...@@ -71,46 +67,51 @@ ...@@ -71,46 +67,51 @@
71 v-model="formData.configValue" 67 v-model="formData.configValue"
72 clearable 68 clearable
73 placeholder="" 69 placeholder=""
70 + maxlength="500"
74 ></el-input> 71 ></el-input>
75 </Formitem> 72 </Formitem>
76 - <Formitem 73 + </el-col>
77 - label="配置项值" 74 +
78 - prop="configValue" 75 + <el-col
79 - type="edit" 76 + :span="8"
80 - v-if="formData.configType === 'Number' && formData.configType" 77 + v-if="formData.configType === 'Number' && formData.configType"
81 - > 78 + >
79 + <Formitem label="配置项值" prop="configValueNumber" type="edit">
82 <el-input 80 <el-input
83 type="number" 81 type="number"
84 class="inputShadow" 82 class="inputShadow"
85 - id="inputInner-edit-configValue" 83 + id="inputInner-edit-configValueNumber"
86 resize="none" 84 resize="none"
87 - v-model="formData.configValue" 85 + v-model="formData.configValueNumber"
88 clearable 86 clearable
89 placeholder="" 87 placeholder=""
88 + maxlength="500"
90 ></el-input> 89 ></el-input>
91 </Formitem> 90 </Formitem>
92 - <Formitem 91 + </el-col>
93 - label="配置项值" 92 +
94 - prop="configValue" 93 + <el-col
95 - type="edit" 94 + :span="8"
96 - v-if="formData.configType === 'Boolean' && formData.configType" 95 + v-if="formData.configType === 'Boolean' && formData.configType"
97 - > 96 + >
97 + <Formitem label="配置项值" prop="configValueBoolean">
98 <el-select 98 <el-select
99 - type="text" 99 + id="inputInner--configValueBoolean"
100 - id="inputInner-edit-configValue" 100 + v-model="formData.configValueBoolean"
101 - v-model="formData.configValue"
102 clearable 101 clearable
103 - filterable
104 placeholder="" 102 placeholder=""
105 > 103 >
106 - <el-option label="true" value="true"></el-option> 104 + <el-option label="true" value="true" :key="1"></el-option>
107 - <el-option label="false" value="false"></el-option> 105 + <el-option label="false" value="false" :key="2"></el-option>
108 </el-select> 106 </el-select>
109 </Formitem> 107 </Formitem>
110 - <div 108 + </el-col>
111 - class="uploadItem" 109 +
112 - v-if="formData.configType === 'File' && formData.configType" 110 + <el-col
113 - > 111 + :span="8"
112 + v-if="formData.configType === 'File' && formData.configType"
113 + >
114 + <div class="uploadItem">
114 <div 115 <div
115 class="uploadbox" 116 class="uploadbox"
116 :style="{ 117 :style="{
...@@ -257,51 +258,38 @@ export default { ...@@ -257,51 +258,38 @@ export default {
257 }, 258 },
258 }, 259 },
259 260
260 - watch: {
261 - outerVisible(val) {
262 - if (val) {
263 - //
264 - this.formData = {
265 - configType: "String",
266 - ...this.activeOjb,
267 - file: {
268 - name: this.activeOjb?.configFileName || "",
269 - file: this.activeOjb?.configValue || "",
270 - },
271 - };
272 - }
273 - },
274 - },
275 data() { 261 data() {
276 return { 262 return {
277 formData: { 263 formData: {
278 - configName: "", 264 + configName: null,
279 configType: "String", 265 configType: "String",
280 - configValue: "", 266 + configValue: null, // 默认string
281 - configApp: "", 267 + configApp: null,
282 - configIp: "", 268 + configIp: null,
283 - description: "", 269 + description: null,
284 file: null, 270 file: null,
271 + configValueNumber: null,
272 + configValueBoolean: null,
285 }, 273 },
286 rules: { 274 rules: {
287 configName: [ 275 configName: [
288 { 276 {
289 required: true, 277 required: true,
290 - trigger: "blur", 278 + trigger: "change",
291 message: "请输入配置项名称！", 279 message: "请输入配置项名称！",
292 }, 280 },
293 ], 281 ],
294 configType: [ 282 configType: [
295 { 283 {
296 required: true, 284 required: true,
297 - trigger: "blur", 285 + trigger: "change",
298 message: "请选择配置项类型！", 286 message: "请选择配置项类型！",
299 }, 287 },
300 ], 288 ],
301 configValue: [ 289 configValue: [
302 { 290 {
303 required: true, 291 required: true,
304 - trigger: "blur", 292 + trigger: "change",
305 message: "请输入配置项值！", 293 message: "请输入配置项值！",
306 }, 294 },
307 ], 295 ],
...@@ -309,7 +297,7 @@ export default { ...@@ -309,7 +297,7 @@ export default {
309 configApp: [ 297 configApp: [
310 { 298 {
311 required: true, 299 required: true,
312 - trigger: "blur", 300 + trigger: "change",
313 message: "请选择配置所属应用！", 301 message: "请选择配置所属应用！",
314 }, 302 },
315 ], 303 ],
...@@ -317,7 +305,7 @@ export default { ...@@ -317,7 +305,7 @@ export default {
317 configIp: [ 305 configIp: [
318 { 306 {
319 required: true, 307 required: true,
320 - trigger: "blur", 308 + trigger: "change",
321 message: "请输入应用IP列表！", 309 message: "请输入应用IP列表！",
322 }, 310 },
323 ], 311 ],
...@@ -333,11 +321,26 @@ export default { ...@@ -333,11 +321,26 @@ export default {
333 }; 321 };
334 }, 322 },
335 323
324 + mounted() {
325 + this.formData = {
326 + configType: "String",
327 + ...this.activeOjb,
328 + configValueNumber: this.activeOjb.configValue,
329 + configValueBoolean: this.activeOjb.configValue,
330 + file: {
331 + name: this.activeOjb?.configFileName || "",
332 + file: this.activeOjb?.configValue || "",
333 + },
334 + };
335 + },
336 +
336 methods: { 337 methods: {
337 // 配置项类型改变时，根据类型设置配置项值的输入类型 338 // 配置项类型改变时，根据类型设置配置项值的输入类型
338 handleChange() { 339 handleChange() {
339 console.log("======================="); 340 console.log("=======================");
340 this.formData.configValue = ""; 341 this.formData.configValue = "";
342 + this.formData.configValueNumber = null;
343 + this.formData.configValueBoolean = null;
341 this.formData.file = null; 344 this.formData.file = null;
342 }, 345 },
343 // 上传文件 346 // 上传文件
...@@ -384,10 +387,9 @@ export default { ...@@ -384,10 +387,9 @@ export default {
384 const formData = new FormData(); 387 const formData = new FormData();
385 formData.append("configName", val.configName); 388 formData.append("configName", val.configName);
386 formData.append("configType", val.configType); 389 formData.append("configType", val.configType);
387 -
388 formData.append("configApp", val.configApp); 390 formData.append("configApp", val.configApp);
389 formData.append("configIp", val.configIp); 391 formData.append("configIp", val.configIp);
390 - formData.append("description", val.description); 392 + formData.append("description", val.description || "");
391 if (val.configType === "File") { 393 if (val.configType === "File") {
392 if (!val.file) { 394 if (!val.file) {
393 this.alertWarningMsg("请上传文件！"); 395 this.alertWarningMsg("请上传文件！");
...@@ -395,6 +397,12 @@ export default { ...@@ -395,6 +397,12 @@ export default {
395 } 397 }
396 formData.append("configValue", val.file.file); 398 formData.append("configValue", val.file.file);
397 formData.append("configFileName", val.file.name); 399 formData.append("configFileName", val.file.name);
400 + } else if (val.configType === "String") {
401 + formData.append("configValue", val.configValue);
402 + } else if (val.configType === "Number") {
403 + formData.append("configValue", val.configValueNumber);
404 + } else {
405 + formData.append("configValue", val.configValueBoolean);
398 } 406 }
399 this.loadings.dialogLoading = true; 407 this.loadings.dialogLoading = true;
400 if (this.activeOjb && this.activeOjb?.id) { 408 if (this.activeOjb && this.activeOjb?.id) {
...@@ -426,6 +434,8 @@ export default { ...@@ -426,6 +434,8 @@ export default {
426 configIp: "", 434 configIp: "",
427 description: "", 435 description: "",
428 file: null, 436 file: null,
437 + configValueNumber: null,
438 + configValueBoolean: null,
429 }; 439 };
430 this.loadings.dialogLoading = false; 440 this.loadings.dialogLoading = false;
431 this.$emit("close", flag); 441 this.$emit("close", flag);
......
...@@ -145,13 +145,15 @@ ...@@ -145,13 +145,15 @@
145 </el-table-column> 145 </el-table-column>
146 </template> 146 </template>
147 </Table> 147 </Table>
148 - <DialogVue 148 + <template v-if="outerVisible">
149 - :outerVisible="outerVisible" 149 + <DialogVue
150 - @close="dialogClose" 150 + :outerVisible="outerVisible"
151 - :configTypeList="configTypeList" 151 + @close="dialogClose"
152 - :configAppList="configAppList" 152 + :configTypeList="configTypeList"
153 - :activeOjb="activeOjb" 153 + :configAppList="configAppList"
154 - /> 154 + :activeOjb="activeOjb"
155 + />
156 + </template>
155 </div> 157 </div>
156 </template> 158 </template>
157 159
......
...@@ -110,6 +110,7 @@ ...@@ -110,6 +110,7 @@
110 clearable 110 clearable
111 placeholder="" 111 placeholder=""
112 @blur="receiptXml" 112 @blur="receiptXml"
113 + maxlength="18"
113 ></el-input> 114 ></el-input>
114 </Formitem> 115 </Formitem>
115 </el-col> 116 </el-col>
...@@ -124,6 +125,7 @@ ...@@ -124,6 +125,7 @@
124 clearable 125 clearable
125 placeholder="" 126 placeholder=""
126 @blur="receiptXml" 127 @blur="receiptXml"
128 + maxlength="20"
127 ></el-input> 129 ></el-input>
128 </Formitem> 130 </Formitem>
129 </el-col> 131 </el-col>
......
...@@ -210,6 +210,7 @@ ...@@ -210,6 +210,7 @@
210 clearable 210 clearable
211 placeholder="" 211 placeholder=""
212 @blur="receiptXml" 212 @blur="receiptXml"
213 + maxlength="18"
213 ></el-input> 214 ></el-input>
214 </Formitem> 215 </Formitem>
215 </el-col> 216 </el-col>
...@@ -253,6 +254,7 @@ ...@@ -253,6 +254,7 @@
253 clearable 254 clearable
254 placeholder="" 255 placeholder=""
255 @blur="receiptXml" 256 @blur="receiptXml"
257 + maxlength="20"
256 ></el-input> 258 ></el-input>
257 </Formitem> 259 </Formitem>
258 </el-col> 260 </el-col>
......