From 2518e47a3ac999978fbf14612c967c3bbf421d25 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 17 十一月 2023 13:31:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/plan/customerorder/index.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 19666d1..1c1af1d 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -445,7 +445,7 @@
           {
             minWidth: '100',
             width: '100px',
-            prop: 'customerOrderNo',
+            prop: 'contractNo',
             label: '鍚堝悓缂栧彿',
             sort: true,
             isTrue: true,
@@ -841,7 +841,7 @@
     }
     if (this.permissions.customerorder_submit_oa) {
       this.table.toolbar.push({
-        text: '鎻愪氦瀹℃牳',
+        text: '鎻愪氦OA瀹℃牳',
         type: 'primary',
         fun: this.auditCustomerOrder,
         disabled: false,
@@ -1119,7 +1119,7 @@
         closeOnClickModal: false,
         type: 'warning'
       }).then(() => {
-        dropByContractNo({contractNo:row.contractNo}).then((res) => {
+        dropByContractNo({id:row.id}).then((res) => {
           if (res.data.code === 0) {
             this.$message.success('浣滃簾鎴愬姛')
             this.getData()

--
Gitblit v1.9.3