From 1f9c32908a68eef81f549b6986a9bc1f05056108 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 16 十一月 2023 16:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 03bd22c..973dd86 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -38,8 +38,9 @@
             </el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item
+                :key="index"
                 :command="item.command"
-                v-for="item in documentTagArr"
+                v-for="(item,index) in documentTagArr"
                 :disabled="item.disabled">
                 {{ item.label }}
               </el-dropdown-item>
@@ -56,8 +57,9 @@
             </el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item
+                :key="index"
                 :command="item.command"
-                v-for="item in commitStateTagArr"
+                v-for="(item,index) in commitStateTagArr"
                 :disabled="item.disabled"
                 >{{ item.label }}</el-dropdown-item
               >
@@ -82,13 +84,13 @@
             @click="()=>exportDialogVisible=true"
             >瀵煎嚭鍙拌处</el-button
           >
-          <el-button
+          <!-- <el-button
             v-if="permissions.plan_customerorder_return"
             style="margin-left:10px;"
             type="primary"
             @click="returnOrder"
             >璁㈠崟閫�鍥�</el-button
-          >
+          > -->
         </template>
       </ttable>
 
@@ -1186,13 +1188,13 @@
     },
     // 浣滃簾
     cancelHandle(row) {
-      this.$confirm('鏄惁纭浣滃簾閿�鍞鍗曞彿涓�' + row.customerOrderNo + '鎻愮ず', {
+      this.$confirm('纭浣滃簾id涓恒��' + row.id + '銆戠殑鏁版嵁?','鎻愮ず' , {
         confirmButtonText: '纭畾',
         cancelButtonText: '鍙栨秷',
         closeOnClickModal: false,
         type: 'warning'
       }).then(() => {
-        dropByContractNo(row.customerOrderNo).then((res) => {
+        dropByContractNo({id:row.id}).then((res) => {
           if (res.data.code === 0) {
             this.$message.success('浣滃簾鎴愬姛')
             this.getData()

--
Gitblit v1.9.3