From 1f4c79169a0d3ef46f2430b61d4999e1be6261b3 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 06 五月 2024 14:59:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/customerorder/customerorder-form.vue | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index f131c55..ce6d7f6 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -187,12 +187,14 @@
</el-col>
<el-col :span="6">
<el-form-item label="浜у搧鍚嶇О" prop="productName">
+ <el-tooltip class="item" effect="dark" :content="dataForm.productName" >
<el-input
v-model="dataForm.productName"
placeholder=""
disabled
>
</el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -274,11 +276,13 @@
</el-col>
<el-col :span="6">
<el-form-item label="浜у搧鍨嬪彿" prop="customerPartSpec">
+ <el-tooltip class="item" effect="dark" :content="dataForm.customerPartSpec" >
<el-input
v-model="dataForm.customerPartSpec"
placeholder=""
disabled
></el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
</el-row>
@@ -325,10 +329,12 @@
<el-row>
<el-col :span="6">
<el-form-item label="鏀惰揣鍦板潃" prop="shippingAddress">
+ <el-tooltip class="item" effect="dark" :content="dataForm.shippingAddress" >
<el-input
v-model="dataForm.shippingAddress"
placeholder=""
></el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
<!-- <el-col :span="6">
@@ -884,9 +890,6 @@
customerOrderNo: [
{ required: true, message: '瀹㈡埛璁㈠崟鍙蜂笉鑳戒负绌�', trigger: 'blur' }
],
- customerNo: [
- { required: true, message: '瀹㈡埛缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }
- ],
customerName: [
{ required: true, message: '瀹㈡埛鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }
],
@@ -1038,9 +1041,7 @@
// if (response.data.data.customerOrderList != null) {
// this.dataForm = response.data.data.customerOrderList
//
- // console.log('0')
// if (this.dataForm.OrderOrContract) {
- // console.log('1')
// // 灏嗚鍗曡繕鏄悎鍚岃浆涔�
// if (this.dataForm.OrderOrContract == '0') {
// this.dataForm.OrderOrContract = '鍚堝悓'
@@ -1049,7 +1050,6 @@
// }
// }
// } else {
- // console.log('2')
this.dataForm = response.data.data
// }
@@ -1198,7 +1198,6 @@
this.showPart = true
},
selectPart(part) {
- console.log(part);
if (part) {
this.dataForm.partNo = part.partNo
}
@@ -1352,7 +1351,6 @@
// 淇濆瓨閰嶇疆鍗�
saveConfig() {
const configId = this.configContent.id
- console.log(this.configContent)
for (
let i = this.configContent.processConfigDataList.length - 1;
i >= 0;
@@ -1368,7 +1366,6 @@
}
if (configId) {
newProcessConfigEditOne(this.configContent).then((res) => {
- console.log(res)
if (res.data.code === 0) {
this.$message.success('淇濆瓨鎴愬姛')
this.init(this.configContent.orderId)
@@ -1378,7 +1375,6 @@
})
} else {
newProcessConfigAddOne(this.configContent).then((res) => {
- console.log(res)
if (res.data.code === 0) {
this.$message.success('淇濆瓨鎴愬姛')
this.init(this.configContent.orderId)
@@ -1403,7 +1399,6 @@
} else {
this.$message.error('璇ラ攢鍞鍗曞彿涓嬶紝娌℃湁鍏朵粬璁㈠崟琛�')
/* const configId = this.configContent.id
- console.log(this.configContent)
for (
let i = this.configContent.processConfigDataList.length - 1;
i >= 0;
@@ -1419,7 +1414,6 @@
}
if (configId) {
newProcessConfigEdit(this.configContent).then((res) => {
- console.log(res)
if (res.data.code === 0) {
this.$message.success('淇濆瓨鎴愬姛')
this.init(this.configContent.orderId)
@@ -1429,7 +1423,6 @@
})
} else {
newProcessConfigAdd(this.configContent).then((res) => {
- console.log(res)
if (res.data.code === 0) {
this.$message.success('淇濆瓨鎴愬姛')
this.init(this.configContent.orderId)
@@ -1441,7 +1434,6 @@
}
})
/* const configId = this.configContent.id
- console.log(this.configContent)
for (
let i = this.configContent.processConfigDataList.length - 1;
i >= 0;
@@ -1457,7 +1449,6 @@
}
if (configId) {
newProcessConfigEdit(this.configContent).then((res) => {
- console.log(res)
if (res.data.code === 0) {
this.$message.success('淇濆瓨鎴愬姛')
this.init(this.configContent.orderId)
@@ -1467,7 +1458,6 @@
})
} else {
newProcessConfigAdd(this.configContent).then((res) => {
- console.log(res)
if (res.data.code === 0) {
this.$message.success('淇濆瓨鎴愬姛')
this.init(this.configContent.orderId)
@@ -1529,7 +1519,6 @@
// var param = Object.assign({ current: 1, size: 20 })
// getProcessConfigPage(param).then((res) => {
// const list = res.data.data.records
- // console.log(list)
// })
},
// 鑾峰彇纭
--
Gitblit v1.9.3