cz 1 year ago
parent
commit
0fd98ba080

+ 24 - 1
src/components/process/PurchasePayment.vue

@@ -221,13 +221,22 @@ const formConfig = computed(() => {
     },
     {
       type: "select",
+      label: "归属公司",
+      prop: "corporationId",
+      data: companyData.value,
+      itemWidth: 33,
+      style: "width: 100%",
+    },
+    {
+      type: "select",
       label: "供应商",
       prop: "supplyId",
       data: supplierList.value,
       fn: (val) => {
         changeSupply(val);
       },
-      style: "width: 100%",
+      itemWidth: 35,
+      style: "width: 94%",
     },
     {
       type: "slot",
@@ -387,11 +396,25 @@ const rules = ref({
   ],
   type: [{ required: true, message: "请选择付款类型", trigger: "change" }],
   rate: [{ required: true, message: "请输入税率", trigger: "blur" }],
+  corporationId: [
+    { required: true, message: "请选择归属公司", trigger: "change" },
+  ],
 });
 const fileList = ref([]);
 const uploadData = ref({});
+const companyData = ref([]);
 const getDict = () => {
   proxy
+    .post("/corporation/page", { pageNum: 1, pageSize: 9999 })
+    .then((res) => {
+      companyData.value = res.rows.map((x) => ({
+        ...x,
+        label: x.name,
+        value: x.id,
+      }));
+    });
+
+  proxy
     .post("/dictTenantData/page", {
       pageNum: 1,
       pageSize: 999,

+ 1 - 1
src/views/customer/file/index.vue

@@ -744,7 +744,7 @@ const formConfig = computed(() => {
     },
     {
       type: "input",
-      prop: "customerCode1",
+      prop: "dutyParagraph",
       label: "客户税号",
       required: true,
       itemWidth: 100,

+ 1 - 1
src/views/customer/highseas/index.vue

@@ -689,7 +689,7 @@ const formConfig = computed(() => {
     },
     {
       type: "input",
-      prop: "customerCode1",
+      prop: "dutyParagraph",
       label: "客户税号",
       required: true,
       itemWidth: 100,

+ 1 - 1
src/views/customer/privatesea/index.vue

@@ -690,7 +690,7 @@ const formConfig = computed(() => {
     },
     {
       type: "input",
-      prop: "customerCode1",
+      prop: "dutyParagraph",
       label: "客户税号",
       required: true,
       itemWidth: 100,

+ 4 - 4
src/views/salesMange/shipmentMange/document/index.vue

@@ -156,28 +156,28 @@
           <div style="width: 50%; border-right: 1px solid black; padding-left: 4px">
             <div style="font-weight: 700">买方 SOLD TO MESSRS:</div>
             <div>{{ printDetails.customer.name }}</div>
+            <div style="font-weight: 700;padding-top: 16px" v-if="[ 2].includes(openStatus)">TAX NUMBER:</div>
             <div style="padding: 16px 0">
               {{ printDetails.contract.buyAddress }},{{ printDetails.contract.buyPostalCode }},{{ printDetails.contract.buyCityName }},{{
                 printDetails.contract.buyProvinceName
               }},{{ printDetails.contract.buyCountryName }}
             </div>
-            <div>CONTRACT: {{ printDetails.contract.buyContactName }}</div>
+            <div style="font-weight: 700" v-if="[ 2].includes(openStatus)">POST CODE: {{ printDetails.contract.buyPostalCode }}</div>
+            <div style="padding-top: 16px ">CONTRACT: {{ printDetails.contract.buyContactName }}</div>
             <div>TEL.: {{ printDetails.contract.buyContactNumber }}</div>
           </div>
           <div style="width: 50%; padding-left: 4px">
             <div style="font-weight: 700">卖方 VENDOR:</div>
             <div>{{ printDetails.corporation.name }}</div>
             <div>{{ printDetails.corporation.nameEn }}</div>
-            <div style="font-weight: 700;padding-top: 16px" v-if="[ 2].includes(openStatus)">TAX NUMBER:</div>
 
             <div style="padding: 16px 0">
               {{ printDetails.contract.sellAddress }},{{ printDetails.contract.sellCityName }},{{ printDetails.contract.sellProvinceName }},{{
                 printDetails.contract.sellCountryName
               }}
             </div>
-            <div style="font-weight: 700" v-if="[ 2].includes(openStatus)">POST CODE: {{ printDetails.contract.buyPostalCode }}</div>
 
-            <div style="padding-top: 16px ">CONTRACT: {{ printDetails.contract.sellContactName }}</div>
+            <div >CONTRACT: {{ printDetails.contract.sellContactName }}</div>
             <div>TEL.: {{ printDetails.contract.sellContactNumber }}</div>
           </div>
         </div>