Merge branch 'dev0.3' of http://36.137.93.232:3000/hf/byte-sailing-new into dev0.3

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,
@@ -686,6 +709,15 @@ if (
 ) {
   isHave.value = true;
 }
+// 判断当前用户有无采购合同页面权限
+const isHavePurchase = ref(false);
+if (
+  useUserStore().permissions &&
+  useUserStore().permissions.includes("alreadyPurchase")
+) {
+  isHavePurchase.value = true;
+}
+
 const getFormData = () => {
   return proxy.deepClone(formData.data);
 };
@@ -748,6 +780,17 @@ const getDecisionAids = () => {
       auxiliaryData.value[1].data = res.purchaseInfoList.map((item) => {
         return [
           {
+            label: "合同编号",
+            value: item.purchaseCode,
+            style: {
+              color: "#0084FF",
+              cursor: isHavePurchase.value ? "pointer" : "revert",
+            },
+            fn: isHavePurchase.value ? handlePushRouteOne : () => {},
+            id: item.purchaseId,
+            num: 1,
+          },
+          {
             label: "物品编码",
             value: item.productCode,
             id: item.productId,
@@ -782,6 +825,17 @@ const getDecisionAids = () => {
         }
         return [
           {
+            label: "合同编号",
+            value: item.purchaseCode,
+            style: {
+              color: "#0084FF",
+              cursor: isHavePurchase.value ? "pointer" : "revert",
+            },
+            fn: isHavePurchase.value ? handlePushRouteOne : () => {},
+            id: item.purchaseId,
+            num: 1,
+          },
+          {
             label: "物品编码",
             value: item.productCode,
             id: item.productId,
@@ -826,6 +880,14 @@ const handlePushRoute = (row) => {
     },
   });
 };
+const handlePushRouteOne = (row) => {
+  proxy.$router.push({
+    name: "AlreadyPurchase",
+    query: {
+      code: row.value,
+    },
+  });
+};
 </script>
 
 <style lang="scss" scoped>

src/views/customer/file/index.vue

@@ -1173,6 +1173,14 @@ const formConfig = computed(() => {
       itemType: "text",
     },
     {
+      type: "input",
+      prop: "dutyParagraph",
+      label: "客户税号",
+      required: true,
+      itemWidth: 100,
+      itemType: "text",
+    },
+    {
       type: "select",
       label: "客户来源",
       prop: "source",

src/views/customer/highseas/index.vue

@@ -688,6 +688,14 @@ const formConfig = computed(() => {
       itemType: "text",
     },
     {
+      type: "input",
+      prop: "dutyParagraph",
+      label: "客户税号",
+      required: true,
+      itemWidth: 100,
+      itemType: "text",
+    },
+    {
       type: "select",
       label: "客户来源",
       prop: "source",

src/views/customer/privatesea/index.vue

@@ -689,6 +689,14 @@ const formConfig = computed(() => {
       itemType: "text",
     },
     {
+      type: "input",
+      prop: "dutyParagraph",
+      label: "客户税号",
+      required: true,
+      itemWidth: 100,
+      itemType: "text",
+    },
+    {
       type: "select",
       label: "客户来源",
       prop: "source",

src/views/purchaseManage/purchaseManage/alreadyPurchase/index.vue

@@ -338,6 +338,7 @@ import byTable from "@/components/byTable/index";
 import byForm from "@/components/byForm/index";
 import { NumberToChinese } from "@/utils/util.js";
 import PurchasePDF from "@/components/PDF/purchasePDF.vue";
+const route = useRoute();
 
 const loading = ref(false);
 const submitLoading = ref(false);
@@ -854,6 +855,9 @@ const handleArrival = (row) => {
 
 getDict();
 getHeaderData();
+if (route.query.code) {
+  sourceList.value.pagination.keyword = route.query.code;
+}
 getList();
 
 const start = () => {

src/views/salesMange/shipmentMange/document/index.vue

@@ -156,24 +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="padding: 16px 0">
               {{ printDetails.contract.sellAddress }},{{ printDetails.contract.sellCityName }},{{ printDetails.contract.sellProvinceName }},{{
                 printDetails.contract.sellCountryName
               }}
             </div>
-            <div>CONTRACT: {{ printDetails.contract.sellContactName }}</div>
+
+            <div >CONTRACT: {{ printDetails.contract.sellContactName }}</div>
             <div>TEL.: {{ printDetails.contract.sellContactNumber }}</div>
           </div>
         </div>
@@ -193,12 +197,14 @@
           <div style="width: 50%; padding-left: 4px">
             <div style="font-weight: 700">买方 BUYER:</div>
             <div>{{ printDetails.customer.name }}</div>
+            <div style="font-weight: 700;padding-top: 16px "  >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">POST CODE: {{ printDetails.contract.buyPostalCode }}</div>
+            <div style="padding-top: 16px ">CONTRACT: {{ printDetails.contract.buyContactName }}</div>
             <div>TEL.: {{ printDetails.contract.buyContactNumber }}</div>
           </div>
         </div>