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

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

@@ -29,6 +29,14 @@
             {{ item.code }}
           </div>
         </template>
+        <template #contractCode="{ item }">
+          <div
+            style="cursor: pointer; color: #409eff"
+            @click="handleClickcontractCode(item)"
+          >
+            {{ item.code }}
+          </div>
+        </template>
       </byTable>
     </div>
     <el-dialog
@@ -494,6 +502,13 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "关联销售合同",
+        prop: "contractCode",
+        slot: "contractCode",
+      },
+    },
+    {
+      attrs: {
         label: "供应商",
         prop: "supplyName",
       },
@@ -511,6 +526,16 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "已付款金额（CNY）",
+        prop: "paySumAmount",
+        width: 160,
+      },
+      render(amount) {
+        return proxy.moneyFormat(amount, 2);
+      },
+    },
+    {
+      attrs: {
         label: "采购人",
         prop: "purchaseName",
       },
@@ -833,6 +858,15 @@ const handleClickCode = (row) => {
   });
 };
 
+const handleClickcontractCode = (row) => {
+  proxy.$router.push({
+    name: "Contract",
+    query: {
+      code: row.code,
+    },
+  });
+};
+
 const openPdf = ref(false);
 const pdfData = ref({});
 const rowData = ref({});

src/views/purchaseManage/purchaseManage/handoverSlip/index.vue

@@ -382,6 +382,13 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "已发起数量",
+        prop: "startPurchaseCount",
+        width: "110",
+      },
+    },
+    {
+      attrs: {
         label: "待处理数量",
         prop: "expendQuantity",
         width: "110",