From b3ebb6f99f647a08cac70ebd9cf1baabdffc6852 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 20 十二月 2023 14:55:56 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/plan/customerorder/customerorder-form.vue | 64 +++++++++++++++----------------
1 files changed, 31 insertions(+), 33 deletions(-)
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index 9427657..47ad1d9 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">
@@ -209,13 +211,12 @@
<el-input
v-model="dataForm.partNo"
placeholder=""
- disabled
>
<el-button
slot="append"
icon="el-icon-search"
- @click="openSalesPartDialog()"
- v-show="dataForm.id"
+ @click="openPartDialog()"
+
></el-button>
</el-input>
</el-form-item>
@@ -275,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>
@@ -326,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">
@@ -828,6 +833,7 @@
productName: '',
productType: '',
partNo: '',
+ technologyDocumentId: '',
docNumber: '',
docName: '',
shippingAddress: '',
@@ -1038,9 +1044,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,9 +1053,8 @@
// }
// }
// } else {
- // console.log('2')
this.dataForm = response.data.data
-
+
// }
// this.fileList = response.data.data.customerOrderAttachmentList
const sourceId = response.data.data.sourceId
@@ -1193,25 +1196,34 @@
}
})
},
- // 闆朵欢閫夋嫨
+ // 闆朵欢閫夋嫨
openPartDialog() {
- if (
- this.dataForm.coState === '01partUnCheck' ||
- this.dataForm.coState === '02technologyUnCheck'
- ) {
- this.showPart = true
- } else {
- this.$message.warning(
- '璁㈠崟鍙湁鍦ㄣ�愰浂浠跺緟閫夈�戙�併�愬伐鑹烘枃浠跺緟閫夈�戠姸鎬佷笅锛屾墠鑳借繘琛岄浂浠朵慨鏀�'
- )
- }
+ this.showPart = true
},
selectPart(part) {
if (part) {
this.dataForm.partNo = part.partNo
- this.$refs.dataForm.validateField('partNo', (valid) => {})
}
},
+ // 闆朵欢閫夋嫨
+ // openPartDialog() {
+ // if (
+ // this.dataForm.coState === '01partUnCheck' ||
+ // this.dataForm.coState === '02technologyUnCheck'
+ // ) {
+ // this.showPart = true
+ // } else {
+ // this.$message.warning(
+ // '璁㈠崟鍙湁鍦ㄣ�愰浂浠跺緟閫夈�戙�併�愬伐鑹烘枃浠跺緟閫夈�戠姸鎬佷笅锛屾墠鑳借繘琛岄浂浠朵慨鏀�'
+ // )
+ // }
+ // },
+ // selectPart(part) {
+ // if (part) {
+ // this.dataForm.partNo = part.partNo
+ // this.$refs.dataForm.validateField('partNo', (valid) => {})
+ // }
+ // },
// 鍏ㄥ睆
fullscreen() {
this.isFullScreen = !this.isFullScreen
@@ -1298,9 +1310,6 @@
this.getConfigFiles()
},
delProcessConfigFile(row) {
- if (row.lineNumber !== this.dataForm.otcLineNo) {
- this.$message.error('涓婁紶鏂囦欢琛屽彿涓庡綋鍓嶉攢鍞鍗曡鍙蜂笉涓�鑷达紝涓嶅厑璁稿垹闄�')
- } else {
this.$confirm('鏄惁鍒犻櫎宸ヨ壓閰嶇疆鏂囦欢', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -1313,7 +1322,6 @@
.then((data) => {
this.getConfigFiles()
})
- }
},
downloadProcessConfigFile(row) {
downloadProcessConfigFile(
@@ -1346,7 +1354,6 @@
// 淇濆瓨閰嶇疆鍗�
saveConfig() {
const configId = this.configContent.id
- console.log(this.configContent)
for (
let i = this.configContent.processConfigDataList.length - 1;
i >= 0;
@@ -1362,7 +1369,6 @@
}
if (configId) {
newProcessConfigEditOne(this.configContent).then((res) => {
- console.log(res)
if (res.data.code === 0) {
this.$message.success('淇濆瓨鎴愬姛')
this.init(this.configContent.orderId)
@@ -1372,7 +1378,6 @@
})
} else {
newProcessConfigAddOne(this.configContent).then((res) => {
- console.log(res)
if (res.data.code === 0) {
this.$message.success('淇濆瓨鎴愬姛')
this.init(this.configContent.orderId)
@@ -1397,7 +1402,6 @@
} else {
this.$message.error('璇ラ攢鍞鍗曞彿涓嬶紝娌℃湁鍏朵粬璁㈠崟琛�')
/* const configId = this.configContent.id
- console.log(this.configContent)
for (
let i = this.configContent.processConfigDataList.length - 1;
i >= 0;
@@ -1413,7 +1417,6 @@
}
if (configId) {
newProcessConfigEdit(this.configContent).then((res) => {
- console.log(res)
if (res.data.code === 0) {
this.$message.success('淇濆瓨鎴愬姛')
this.init(this.configContent.orderId)
@@ -1423,7 +1426,6 @@
})
} else {
newProcessConfigAdd(this.configContent).then((res) => {
- console.log(res)
if (res.data.code === 0) {
this.$message.success('淇濆瓨鎴愬姛')
this.init(this.configContent.orderId)
@@ -1435,7 +1437,6 @@
}
})
/* const configId = this.configContent.id
- console.log(this.configContent)
for (
let i = this.configContent.processConfigDataList.length - 1;
i >= 0;
@@ -1451,7 +1452,6 @@
}
if (configId) {
newProcessConfigEdit(this.configContent).then((res) => {
- console.log(res)
if (res.data.code === 0) {
this.$message.success('淇濆瓨鎴愬姛')
this.init(this.configContent.orderId)
@@ -1461,7 +1461,6 @@
})
} else {
newProcessConfigAdd(this.configContent).then((res) => {
- console.log(res)
if (res.data.code === 0) {
this.$message.success('淇濆瓨鎴愬姛')
this.init(this.configContent.orderId)
@@ -1523,7 +1522,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