1

src/components/process/EHSD/Sample.vue

@@ -1642,8 +1642,8 @@ const handleSubmit = async () => {
           }
         }
       }
-    }else{
-       ElMessage("请添加出货计划");
+    } else {
+      ElMessage("请添加出货计划");
       return false;
     }
     return true;
@@ -1788,6 +1788,7 @@ onMounted(() => {
       ) {
         for (let i = 0; i < formData.data.sampleProductList.length; i++) {
           const e = formData.data.sampleProductList[i];
+          e.productCnName = e.productNameCn;
           if (e.ehsdJson) {
             let obj = JSON.parse(e.ehsdJson);
             e.packMethod = obj.packMethod;
@@ -1883,6 +1884,7 @@ watch(
         ) {
           for (let i = 0; i < formData.data.sampleProductList.length; i++) {
             const e = formData.data.sampleProductList[i];
+            e.productCnName = e.productNameCn;
             if (e.ehsdJson) {
               let obj = JSON.parse(e.ehsdJson);
               e.packMethod = obj.packMethod;

src/components/process/EHSD/SampleChange.vue

@@ -1813,6 +1813,7 @@ onMounted(() => {
       ) {
         for (let i = 0; i < formData.data.sampleProductList.length; i++) {
           const e = formData.data.sampleProductList[i];
+          e.productCnName = e.productNameCn;
           if (e.ehsdJson) {
             let obj = JSON.parse(e.ehsdJson);
             e.packMethod = obj.packMethod;
@@ -1852,7 +1853,6 @@ onMounted(() => {
       if (res && res.dataJson) {
         res = { ...res, ...JSON.parse(res.dataJson) };
       }
-
       res.sampleShipmentList = res.sampleShipmentLists;
       res.countryId = res.buyCountryId;
       res.provinceId = res.buyProvinceId;
@@ -1908,6 +1908,7 @@ onMounted(() => {
         }
         for (let i = 0; i < formData.data.sampleProductList.length; i++) {
           const e = formData.data.sampleProductList[i];
+          e.productCnName = e.productNameCn;
           if (e.ehsdJson) {
             let obj = JSON.parse(e.ehsdJson);
             e.packMethod = obj.packMethod;