From a3529db7fc5c1457eddd38b7faeea2df3d375bbb Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 17 Jun 2025 11:42:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E8=88=AC=E9=87=87=E8=B4=AD=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE=E7=99=BB=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/contract/contractList.vue           | 26 ++++++++++---------
 .../contract/paymentRegistrationList.vue      |  1 -
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index fc669bd..c211e9f 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -487,12 +487,7 @@
                       class="slot-btns-item"
                       size="small"
                       type="primary"
-                      @click="
-                        $refs['paymentRegistration'].getContract(scope.row),
-                          ($refs[
-                            'paymentRegistration'
-                          ].isShowPaymentRegistration = true)
-                      "
+                      @click="showPayment(scope.row)"
                     >
                       付款登记
                     </Button>
@@ -503,12 +498,7 @@
                     class="slot-btns-item"
                     size="small"
                     type="primary"
-                    @click="
-                      $refs['paymentRegistration'].getContract(scope.row),
-                        ($refs[
-                          'paymentRegistration'
-                        ].isShowPaymentRegistration = true)
-                    "
+                    @click="showPayment(scope.row)"
                   >付款登记
                   </Button>
                 </template>
@@ -1682,6 +1672,18 @@ export default {
     };
   },
   methods: {
+    // 一般采购从oa 付款登记
+    showPayment(row){
+      if(row.is_common_purchase){
+        Message({
+          type: "warning",
+          message: "一般采购请从综合办公平台发起",
+        });
+        return
+      }
+      this.$refs['paymentRegistration'].getContract(row)
+      this.$refs['paymentRegistration'].isShowPaymentRegistration = true
+    },
     // 一般采购 申购人
     changeEdit(e){
       console.log(e)
diff --git a/src/views/contract/paymentRegistrationList.vue b/src/views/contract/paymentRegistrationList.vue
index 818725d..8660d60 100644
--- a/src/views/contract/paymentRegistrationList.vue
+++ b/src/views/contract/paymentRegistrationList.vue
@@ -235,7 +235,6 @@ export default {
           align: "left",
           fixed: this.$store.getters.device === 'mobile'?false:'left',
           customFn: row => {
-            console.log("row",row)
             return (<span>{ row.contract_id ? (row.contract?row.contract.name:'') : row.away.title }</span>)
           }
         },