From 791f4f0f88eb534b1fc9a875fa71d94bd62e696b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 15 十一月 2023 17:16:02 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before
---
src/views/plan/customerorder/index.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 41d2c4f..2dba483 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,
@@ -1113,13 +1113,13 @@
},
// 浣滃簾
cancelHandle(row) {
- this.$confirm('鏄惁纭浣滃簾閿�鍞鍗曞彿涓�' + row.customerOrderNo + '鎻愮ず', {
+ this.$confirm('鏄惁纭浣滃簾閿�鍞鍗曞彿涓�' + 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