fix:"优化结算账号页面"

src/assets/language/en.json

@@ -606,6 +606,10 @@
     "stick": "Sticks",
     "water": "Water",
     "wasteWater": "Waste",
+    "chocolate": "Chocolate",
+    "cheese": "Queijo",
+    "peach": "Pêssego",
+    "caramel": "Caramelo",
     "sentSuccessfully": "Sent",
     "turnOffSleep": "Sleep Mode",
     "turnOnSleep": "Active",

src/assets/language/es.json

@@ -606,6 +606,10 @@
         "stick": "Palitos",
         "water": "Agua",
         "wasteWater": "Residuos",
+        "chocolate": "Chocolate",
+        "cheese": "Queijo",
+        "peach": "Pêssego",
+        "caramel": "Caramelo",
         "sentSuccessfully": "Solicitud enviada",
         "turnOffSleep": "Modo descanso",
         "turnOnSleep": "Modo activo",

src/assets/language/fr.json

@@ -606,6 +606,10 @@
         "stick": "Bâtonnet",
         "water": "Eau",
         "wasteWater": "Eaux usées",
+        "chocolate": "Chocolate",
+        "cheese": "Queijo",
+        "peach": "Pêssego",
+        "caramel": "Caramelo",
         "sentSuccessfully": "Envoyé",
         "turnOffSleep": "Veille activée",
         "turnOnSleep": "Veille désactivée",

src/assets/language/ja.json

@@ -600,6 +600,10 @@
         "stick": "スティック",
         "water": "浄水",
         "wasteWater": "汚水",
+        "chocolate": "Chocolate",
+        "cheese": "Queijo",
+        "peach": "Pêssego",
+        "caramel": "Caramelo",
         "sentSuccessfully": "リクエスト送信完了",
         "turnOffSleep": "スリープ中",
         "turnOnSleep": "スリープしていない",

src/assets/language/pt.json

@@ -606,6 +606,10 @@
         "stick": "Palito",
         "water": "Água",
         "wasteWater": "Água Residual",
+        "chocolate": "Chocolate",
+        "cheese": "Queijo",
+        "peach": "Pêssego",
+        "caramel": "Caramelo",
         "sentSuccessfully": "Comando Enviado",
         "turnOffSleep": "Modo Repouso Ativo",
         "turnOnSleep": "Modo Repouso Inativo",

src/assets/language/ru.json

@@ -606,6 +606,10 @@
         "stick": "Палочки",
         "water": "Вода",
         "wasteWater": "Стоки",
+        "chocolate": "Chocolate",
+        "cheese": "Queijo",
+        "peach": "Pêssego",
+        "caramel": "Caramelo",
         "sentSuccessfully": "Отправлено",
         "turnOffSleep": "Сон zzZ",
         "turnOnSleep": "Активно",

src/assets/language/uk.json

@@ -606,6 +606,10 @@
         "stick": "Палочки",
         "water": "Вода",
         "wasteWater": "Стічна вода",
+        "chocolate": "Шоколад",
+        "cheese": "Сир",
+        "peach": "Персик",
+        "caramel": "Карамель",
         "sentSuccessfully": "Запит відправлено",
         "turnOffSleep": "Сон zzZ",
         "turnOnSleep": "Не спить",

src/assets/language/zh.json

@@ -606,12 +606,10 @@
     "stick": "棍子",
     "water": "清水",
     "wasteWater": "废水",
-    
     "chocolate": "巧克力",
     "cheese": "芝士",
     "peach": "水蜜桃",
     "caramel": "焦糖",
-
     "sentSuccessfully": "发送请求成功",
     "turnOffSleep": "睡眠中zzZ",
     "turnOnSleep": "未睡眠",

src/views/settlement/index.vue

@@ -515,7 +515,14 @@ export default {
       }
     }
 
-    let addParams = reactive({
+    const beginDate = ref();
+    const endDate = ref();
+    const beginDateLicense = ref();
+    const endDateLicense = ref();
+    const registeredAddress = ref();
+    const bankAddress = ref();
+
+    const addParams = reactive({
       adminId: user.id, // 当前登录账户的id Long 必填
       altMchName: '', // 分账方名称; string 必填
       altMchNo: '', // 分账方账号; string	必填
@@ -562,7 +569,7 @@ export default {
       loginName: '', // 分账方登录名，即邮箱;	string
     });
     // 汇付字段
-    let huifuParams = reactive({
+    const huifuParams = reactive({
       id: null,
       adminId: user.id, // 当前登录账户的id
       type: '0', // 类型 String 必填 企业:type='1'; 个人:type='0'
@@ -626,6 +633,7 @@ export default {
     // 日期选择
     // 身份证有效开始日期
     const onConfirmBeginDate = ({ selectedValues }) => {
+      beginDate.value = selectedValues.join("-");
       addParams.beginDate = selectedValues.join("-");
       huifuParams.certBeginDate = selectedValues.join("");
       showBeginDate.value = false;
@@ -633,6 +641,7 @@ export default {
     };
     // 身份证有效截止日期
     const onConfirmEndDate = ({ selectedValues }) => {
+      endDate.value = selectedValues.join("-");
       addParams.endDate = selectedValues.join("-");
       huifuParams.certEndDate = selectedValues.join("");
       showEndDate.value = false;
@@ -640,6 +649,7 @@ export default {
     };
     // 营业执照有效开始日期
     const onConfirmEndDateLicense = ({ selectedValues }) => {
+      endDateLicense.value = selectedValues.join("-");
       addParams.endDateLicense = selectedValues.join("-");
       huifuParams.licenseEndDate = selectedValues.join("");
       showEndDateLicense.value = false;
@@ -647,6 +657,7 @@ export default {
     };
     // 营业执照有效截止日期
     const onConfirmBeginDateLicense = ({ selectedValues }) => {
+      beginDateLicense.value = selectedValues.join("-");
       addParams.beginDateLicense = selectedValues.join("-");
       huifuParams.licenseBeginDate = selectedValues.join("");
       showBeginDateLicense.value = false;
@@ -655,7 +666,7 @@ export default {
     // 地址选择
     const onConfirmBankAddress = ({ selectedOptions }) => {
       showBankAddress.value = false;
-      addParams.bankAddress = (selectedOptions[0]?.text != selectedOptions[1]?.text ? selectedOptions[0]?.text : '')
+      bankAddress.value = (selectedOptions[0]?.text != selectedOptions[1]?.text ? selectedOptions[0]?.text : '')
         + selectedOptions[1]?.text;
       huifuParams.cardProvId = selectedOptions[0]?.value || '';
       huifuParams.cardAreaId = selectedOptions[1]?.value || '';
@@ -663,7 +674,7 @@ export default {
     };
     const onConfirmReAddress = ({ selectedOptions }) => {
       showReAddress.value = false;
-      addParams.registeredAddress = (selectedOptions[0]?.text != selectedOptions[1]?.text ? selectedOptions[0]?.text : '')
+      registeredAddress.value = (selectedOptions[0]?.text != selectedOptions[1]?.text ? selectedOptions[0]?.text : '')
         + selectedOptions[1]?.text + selectedOptions[2]?.text;
       huifuParams.regProvId = selectedOptions[0]?.value || '';
       huifuParams.regAreaId = selectedOptions[1]?.value || '';
@@ -769,13 +780,17 @@ export default {
           addParams.manageAddr = areaList.province_list[data.data.provId] + areaList.city_list[data.data.areaId] + areaList.county_list[data.data.districtId];
           huifuMchNO.value = data.data.huifuId;
           addParams.validityType = data.data.certValidityType;
-          addParams.beginDate = dateUtil.formatDate(data.data.certBeginDate);
-          addParams.endDate = dateUtil.formatDate(data.data.certEndDate);
+          if (data.data.certBeginDate != null && data.data.certBeginDate != "") {
+            beginDate.value = dateUtil.formatDate(data.data.certBeginDate);
+          }
+          if (data.data.certEndDate != null && data.data.certEndDate != "") {
+            endDate.value = dateUtil.formatDate(data.data.certEndDate);
+          }
           huifuParams.cardProvId = data.data.cardProvId;
           huifuParams.cardAreaId = data.data.cardAreaId;
           huifuParams.detailAddr = data.data.detailAddr;
           huifuParams.settType = data.data.settType;
-          addParams.bankAddress = areaList.province_list[data.data.cardProvId] == areaList.city_list[data.data.cardAreaId] ? areaList.province_list[data.data.cardProvId] :
+          bankAddress.value = areaList.province_list[data.data.cardProvId] == areaList.city_list[data.data.cardAreaId] ? areaList.province_list[data.data.cardProvId] :
             (areaList.province_list[data.data.cardProvId] + areaList.city_list[data.data.cardAreaId]);
           if (data.data.cardFrontPic != null && data.data.legalCertBackPic != null && data.data.legalCertFrontPic) {
             huifuPicUpStatus.value = 1;
@@ -784,7 +799,7 @@ export default {
             addParams.altMerchantType = "12";
             addParams.regNameValue = data.data.regName;
             addParams.shortNameValue = data.data.shortName;
-            addParams.registeredAddress = areaList.province_list[data.data.regProvId] == areaList.city_list[data.data.regAreaId] ? (areaList.city_list[data.data.regAreaId] + areaList.county_list[data.data.regDistrictId]) :
+            registeredAddress.value = areaList.province_list[data.data.regProvId] == areaList.city_list[data.data.regAreaId] ? (areaList.city_list[data.data.regAreaId] + areaList.county_list[data.data.regDistrictId]) :
               (areaList.province_list[data.data.regProvId] + areaList.city_list[data.data.regAreaId] + areaList.county_list[data.data.regDistrictId]);
             huifuParams.regProvId = data.data.regProvId;
             huifuParams.regAreaId = data.data.regAreaId;
@@ -798,8 +813,12 @@ export default {
               addParams.bankChannelNo = data.data.branchCode;
             }
             addParams.validityType1 = data.data.licenseValidityType;
-            addParams.beginDateLicense = dateUtil.formatDate(data.data.licenseBeginDate);
-            addParams.endDateLicense = dateUtil.formatDate(data.data.licenseEndDate);
+            if (data.data.licenseBeginDate != null && data.data.licenseBeginDate != "") {
+              beginDateLicense.value = dateUtil.formatDate(data.data.licenseBeginDate);
+            }
+            if (data.data.licenseEndDate != null && data.data.licenseEndDate != "") {
+              endDateLicense.value = dateUtil.formatDate(data.data.licenseEndDate);
+            }
             if (data.data.licensePic != null && data.data.certBackPic != null && data.data.certFrontPic != null && data.data.regAcctPic != null) {
               huifuPicUpStatus.value = 1;
             }
@@ -1118,7 +1137,14 @@ export default {
       showPopover,
       regNameVisible,
       shortNameVisible,
-      popoverVisible
+      popoverVisible,
+
+      beginDate,
+      endDate,
+      beginDateLicense,
+      endDateLicense,
+      bankAddress,
+      registeredAddress,
     };
   },
 };