From 8f9a22ffd1ecb3d4a427150c02538dc235e30d3b Mon Sep 17 00:00:00 2001 From: liaozetao <1107136310@qq.com> Date: Mon, 17 Jun 2024 11:24:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=93=AD=E7=89=8C=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E6=96=87=E6=A1=88=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/nameplate/NameplateInfoView.vue | 104 +++++++++++++++++----- 1 file changed, 84 insertions(+), 20 deletions(-) diff --git a/src/views/nameplate/NameplateInfoView.vue b/src/views/nameplate/NameplateInfoView.vue index 1d29a67..0aa2110 100644 --- a/src/views/nameplate/NameplateInfoView.vue +++ b/src/views/nameplate/NameplateInfoView.vue @@ -110,11 +110,24 @@ -
- -
- +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
@@ -269,7 +282,7 @@ export default { }, { field: 'isCustomWordStr', title: '是否自定义文案', align: 'middle', width: '5%' }, { - field: 'fixedWord', + field: 'fixedWord.zh', title: '固定文案', align: 'middle', width: '5%', @@ -281,6 +294,32 @@ export default { } } }, + { + field: 'fixedWord.ar', + title: '阿语固定文案', + align: 'middle', + width: '5%', + formatter: function (val, row, index) { + if (isEmpty(val)) { + return '/'; + } else { + return val; + } + } + }, + { + field: 'fixedWord.en', + title: '英语固定文案', + align: 'middle', + width: '5%', + formatter: function (val, row, index) { + if (isEmpty(val)) { + return '/'; + } else { + return val; + } + } + }, { field: 'days', title: '有效期(天)', align: 'middle', width: '5%' }, { field: 'statusStr', title: '状态', align: 'middle', width: '5%' }, { field: 'typeStr', title: '铭牌款式', align: 'middle', width: '5%' }, @@ -351,16 +390,26 @@ export default { console.log(res); request.success({ "rows": res.rows.map(i=>{ - let value = i.name; - if (value.startsWith('{') && value.endsWith('}')) { + let nameValue = i.name; + if (nameValue.startsWith('{') && nameValue.endsWith('}')) { i.name = JSON.parse(i.name); } else { i.name = { - zh: value, - ar: value, - en: value, + zh: nameValue, + ar: nameValue, + en: nameValue, }; } + let fixedWordValue = i.fixedWord; + if (fixedWordValue.startsWith('{') && fixedWordValue.endsWith('}')) { + i.fixedWord = JSON.parse(i.fixedWord); + } else { + i.name = { + zh: fixedWordValue, + ar: fixedWordValue, + en: fixedWordValue, + }; + } return i; }), "total": res.total @@ -410,19 +459,28 @@ export default { $("#ar_name1").val(name); $("#en_name1").val(name); } - + let fixedWord = json.fixedWord; + if (fixedWord.startsWith('{') && fixedWord.endsWith('}')) { + let jsonValue = JSON.parse(json.fixedWord); + $('#zhFixedWord').val(jsonValue.zh); + $('#arFixedWord').val(jsonValue.ar); + $('#enFixedWord').val(jsonValue.en); + } else { + $('#zhFixedWord').val(fixedWord); + $('#arFixedWord').val(fixedWord); + $('#enFixedWord').val(fixedWord); + } $('#nameplateType1').attr("disabled", "true"); if (!json.isCustomWord) { $('input[name="isCustomWord"]').get(0).checked = true; $('#fixedWord-div').addClass("hidden"); + $('#zhFixedWord').val(''); + $('#arFixedWord').val(''); + $('#enFixedWord').val(''); } else { $('input[name="isCustomWord"]').get(1).checked = true; $('#fixedWord-div').removeClass("hidden"); - $('#fixedWord').val(''); } - - //$('input[name="isCustomWord"]').val(json.isCustomWord); - $("#fixedWord").val(json.fixedWord); $("#days").val(json.days); $("#status1").val(json.status); $("#type1").val(json.type); @@ -492,7 +550,11 @@ export default { var status = $('#status1').val(); var type = $('#type1').val(); var days = $('#days').val(); - var fixedWord = $('#fixedWord').val(); + var zhFixedWord = $('#zhFixedWord').val(); + var arFixedWord = $('#arFixedWord').val(); + var enFixedWord = $('#enFixedWord').val(); + let jsonFixedWord = {'zh': zhFixedWord, 'ar': arFixedWord, 'en': enFixedWord}; + const fixedWordValue = JSON.stringify(jsonFixedWord); var isCustomWord = $('input[name="isCustomWord"]:checked').val(); var name = $('#name1').val(); var ar_name = $('#ar_name1').val(); @@ -561,7 +623,7 @@ export default { nameplateType: nameplateType, name: nameValue, isCustomWord: isCustomWord, - fixedWord: fixedWord, + fixedWord: fixedWordValue, days: days, status: status, type: type, @@ -703,7 +765,9 @@ function cleanNamePlateModal() { $('#status1').val(''); $('#type1').val(''); $('#days').val(''); - $('#fixedWord').val(''); + $('#zhFixedWord').val(''); + $('#arFixedWord').val(''); + $('#enFixedWord').val(''); $('input[name="isCustomWord"]').each(function () { $(this).removeAttr("checked"); }); @@ -794,4 +858,4 @@ function setTypeSelectOption() { .pull-left { width: 100% !important; -} \ No newline at end of file +}