1

src/components/PDF/purchasePDFOne.vue

@@ -240,7 +240,11 @@
         >
           <tr v-for="item in pdfData.purchaseArrivalList" :key="item.id">
             <td>{{ item.productName }}</td>
-            <td>{{ item.arrivalTime }}</td>
+            <td>
+              <span v-if="item.arrivalTime"
+                >{{ item.arrivalTime.slice(0, 10) }}
+              </span>
+            </td>
             <td>{{ item.quantity }}</td>
           </tr>
         </template>

src/components/process/EHSD/Contract.vue

@@ -1385,8 +1385,8 @@ const selectProduct = (goods) => {
       formData.data.contractProductList.push({
         fileUrl: fileUrl,
         productId: goods.id,
-        productCnName: goods.nameEnglish,
-        productName: goods.name,
+        productCnName: goods.name,
+        productName: goods.nameEnglish,
         productModel:
           goods.productLong + "*" + goods.productWide + "*" + goods.productHigh,
         quantity: undefined,
@@ -1400,8 +1400,8 @@ const selectProduct = (goods) => {
         {
           fileUrl: fileUrl,
           productId: goods.id,
-          productCnName: goods.nameEnglish,
-          productName: goods.name,
+          productCnName: goods.name,
+          productName: goods.nameEnglish,
           productModel:
             goods.productLong +
             "*" +
@@ -1419,7 +1419,7 @@ const selectProduct = (goods) => {
     formData.data.contractShipmentList.push({
       productCode: goods.code,
       productId: goods.id,
-      productName: goods.name,
+      productName: goods.nameEnglish,
       shipmentTime: "",
       quantity: undefined,
     });

src/components/process/EHSD/ContractChange.vue

@@ -1378,8 +1378,8 @@ const selectProduct = (goods) => {
       formData.data.contractProductList.push({
         fileUrl: fileUrl,
         productId: goods.id,
-        productCnName: goods.nameEnglish,
-        productName: goods.name,
+        productCnName: goods.name,
+        productName: goods.nameEnglish,
         productModel:
           goods.productLong + "*" + goods.productWide + "*" + goods.productHigh,
         quantity: undefined,
@@ -1393,8 +1393,8 @@ const selectProduct = (goods) => {
         {
           fileUrl: fileUrl,
           productId: goods.id,
-          productCnName: goods.nameEnglish,
-          productName: goods.name,
+          productCnName: goods.name,
+          productName: goods.nameEnglish,
           productModel:
             goods.productLong +
             "*" +
@@ -1412,7 +1412,7 @@ const selectProduct = (goods) => {
     formData.data.contractShipmentList.push({
       productCode: goods.code,
       productId: goods.id,
-      productName: goods.name,
+      productName: goods.nameEnglish,
       shipmentTime: "",
       quantity: undefined,
     });

src/components/process/EHSD/Purchase.vue

@@ -319,7 +319,7 @@
                   width: 100%;
                   font-weight: 700;
                   background: #eee;
-                  line-height: 50px;
+                 padding: 10px 0px;
                 "
                 :gutter="5"
                 type="flex"

src/components/process/EHSD/Sample.vue

@@ -1307,8 +1307,8 @@ const selectProduct = (goods) => {
       formData.data.sampleProductList.push({
         fileUrl: fileUrl,
         productId: goods.id,
-        productCnName: goods.nameEnglish,
-        productName: goods.name,
+        productCnName: goods.name,
+        productName: goods.nameEnglish,
         productModel:
           goods.productLong + "*" + goods.productWide + "*" + goods.productHigh,
         quantity: undefined,
@@ -1322,8 +1322,8 @@ const selectProduct = (goods) => {
         {
           fileUrl: fileUrl,
           productId: goods.id,
-          productCnName: goods.nameEnglish,
-          productName: goods.name,
+          productCnName: goods.name,
+          productName: goods.nameEnglish,
           productModel:
             goods.productLong +
             "*" +
@@ -1341,7 +1341,7 @@ const selectProduct = (goods) => {
     formData.data.sampleShipmentList.push({
       productCode: goods.code,
       productId: goods.id,
-      productName: goods.name,
+      productName: goods.nameEnglish,
       shipmentTime: "",
       quantity: undefined,
     });

src/views/salesMange/saleContract/claim/index.vue

@@ -227,12 +227,18 @@ const claim = ref([
     value: "2",
   },
 ]);
-const selectConfig = reactive([
+const accountList = ref([]);
+const selectConfig = computed(() => [
   {
     label: "认领状态",
     prop: "isClaim",
     data: claim.value,
   },
+  {
+    label: "账户名称",
+    prop: "accountManagementId",
+    data: accountList.value,
+  },
 ]);
 const config = computed(() => {
   return [
@@ -503,21 +509,18 @@ const getDtl = (row) => {
   });
 };
 
-const warehouseType = ref([]);
 const getDict = () => {
   proxy
-    .post("/dictTenantData/page", {
-      pageNum: 1,
-      pageSize: 999,
-      tenantId: useUserStore().user.tenantId,
-      dictCode: "warehouse_type",
-    })
+    .post("/accountManagement/page", { pageNum: 1, pageSize: 999 })
     .then((res) => {
-      warehouseType.value = res.rows;
-      formConfig[0].data = res.rows.map((x) => ({
-        label: x.dictValue,
-        value: x.dictKey,
-      }));
+      if (res.rows && res.rows.length > 0) {
+        accountList.value = res.rows.map((item) => {
+          return {
+            label: item.alias,
+            value: item.id,
+          };
+        });
+      }
     });
 };
 const handleBeforeUpload = async (file) => {