From c880739ec4cd5ede33b31eb98ad5f7628ea288e5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 十二月 2023 17:41:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/customerorder/customerorder-form.vue | 148 ++++++++++++++++++++++++++++--------------------
1 files changed, 86 insertions(+), 62 deletions(-)
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index 5eed5a3..0dc65bb 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -196,7 +196,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="浜у搧绫诲瀷" prop="productType">
+ <el-form-item label="闅跺睘鍝佺墝" prop="productType">
<el-input
v-model="dataForm.productType"
placeholder=""
@@ -209,13 +209,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>
@@ -248,35 +247,42 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鏀惰揣鍦板潃" prop="shippingAddress">
+ <el-form-item label="宸ヨ壓鏂囦欢鍚嶇О" prop="docName">
<el-input
- v-model="dataForm.shippingAddress"
+ v-model="dataForm.docName"
placeholder=""
+ disabled
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍗曚綅" prop="otcUnit">
+ <el-select
+ v-model="dataForm.otcUnit"
+ placeholder=""
+ filterable
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in units"
+ :key="item.id"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="浜у搧鍨嬪彿" prop="customerPartSpec">
+ <el-input
+ v-model="dataForm.customerPartSpec"
+ placeholder=""
+ disabled
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
- </el-row>
- <el-row>
- <!-- <el-col :span="6">
- <el-form-item label="璐ㄩ噺瑕佹眰" prop="qualityRequire">
- <el-input
- v-model="dataForm.qualityRequire"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col> -->
- <!-- <el-col :span="6">
- <el-form-item label="鐢熶骇闇�姹傝鏄�" prop="otherProductRequire">
- <el-input
- v-model="dataForm.otherProductRequire"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col> -->
<!-- <el-col :span="6">
<el-form-item label="绯荤粺" prop="divisionSystem">
<el-input
@@ -317,6 +323,14 @@
</el-col> -->
</el-row>
<el-row>
+ <el-col :span="6">
+ <el-form-item label="鏀惰揣鍦板潃" prop="shippingAddress">
+ <el-input
+ v-model="dataForm.shippingAddress"
+ placeholder=""
+ ></el-input>
+ </el-form-item>
+ </el-col>
<!-- <el-col :span="6">
<el-form-item label="OTC鎺ㄩ�佺姸鎬�" prop="remark">
<span>{{
@@ -331,7 +345,22 @@
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="璁㈠崟璇存槑" prop="remark">
+ <el-form-item label="璁㈠崟澶囨敞" prop="comment">
+ <el-input
+ type="textarea"
+ :rows="3"
+ placeholder=""
+ v-model="dataForm.comment"
+ maxlength="500"
+ show-word-limit
+ >
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="浜у搧澶囨敞" prop="remark">
<el-input
type="textarea"
:rows="3"
@@ -614,15 +643,16 @@
show-overflow-tooltip
>
</el-table-column>
- <el-table-column prop="lineNumber" align="center" label="琛屽彿">
- </el-table-column>
+ <!-- <el-table-column prop="lineNumber" align="center" label="琛屽彿"> -->
+ <!-- </el-table-column> -->
<el-table-column
prop="originalFileName"
align="center"
label="鍘熸枃浠跺悕"
+ width="200"
>
</el-table-column>
- <el-table-column prop="fileName" align="center" label="鏂囦欢鍚�">
+ <el-table-column prop="fileName" align="center" label="鏂囦欢鍚庣紑">
</el-table-column>
<el-table-column prop="createUser" align="center" label="涓婁紶浜�">
</el-table-column>
@@ -655,13 +685,13 @@
<!-- </el-table-column>-->
<el-table-column fixed="right" align="center" label="鎿嶄綔">
<template slot-scope="scope">
- <el-button
+ <!-- <el-button
@click="synchronizeFile(scope.row)"
type="text"
size="small"
:disabled="scope.row.lineNumber !== dataForm.customerNo"
>鍚屾</el-button
- >
+ > -->
<el-button
@click="delProcessConfigFile(scope.row)"
type="text"
@@ -782,7 +812,6 @@
showSynchronize: false,
selectOrderParam: null,
selectOrderObj: {},
- aaaaa:{},
dataForm: {
id: 0,
sourceId: '',
@@ -798,7 +827,9 @@
productName: '',
productType: '',
partNo: '',
+ technologyDocumentId: '',
docNumber: '',
+ docName: '',
shippingAddress: '',
remark: '',
otcUnit: '',
@@ -1007,9 +1038,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 = '鍚堝悓'
@@ -1018,8 +1047,8 @@
// }
// }
// } else {
- // console.log('2')
this.dataForm = response.data.data
+
// }
// this.fileList = response.data.data.customerOrderAttachmentList
const sourceId = response.data.data.sourceId
@@ -1161,25 +1190,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
@@ -1266,9 +1304,6 @@
this.getConfigFiles()
},
delProcessConfigFile(row) {
- if (row.lineNumber !== this.dataForm.otcLineNo) {
- this.$message.error('涓婁紶鏂囦欢琛屽彿涓庡綋鍓嶉攢鍞鍗曡鍙蜂笉涓�鑷达紝涓嶅厑璁稿垹闄�')
- } else {
this.$confirm('鏄惁鍒犻櫎宸ヨ壓閰嶇疆鏂囦欢', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -1281,7 +1316,6 @@
.then((data) => {
this.getConfigFiles()
})
- }
},
downloadProcessConfigFile(row) {
downloadProcessConfigFile(
@@ -1314,7 +1348,6 @@
// 淇濆瓨閰嶇疆鍗�
saveConfig() {
const configId = this.configContent.id
- console.log(this.configContent)
for (
let i = this.configContent.processConfigDataList.length - 1;
i >= 0;
@@ -1330,7 +1363,6 @@
}
if (configId) {
newProcessConfigEditOne(this.configContent).then((res) => {
- console.log(res)
if (res.data.code === 0) {
this.$message.success('淇濆瓨鎴愬姛')
this.init(this.configContent.orderId)
@@ -1340,7 +1372,6 @@
})
} else {
newProcessConfigAddOne(this.configContent).then((res) => {
- console.log(res)
if (res.data.code === 0) {
this.$message.success('淇濆瓨鎴愬姛')
this.init(this.configContent.orderId)
@@ -1365,7 +1396,6 @@
} else {
this.$message.error('璇ラ攢鍞鍗曞彿涓嬶紝娌℃湁鍏朵粬璁㈠崟琛�')
/* const configId = this.configContent.id
- console.log(this.configContent)
for (
let i = this.configContent.processConfigDataList.length - 1;
i >= 0;
@@ -1381,7 +1411,6 @@
}
if (configId) {
newProcessConfigEdit(this.configContent).then((res) => {
- console.log(res)
if (res.data.code === 0) {
this.$message.success('淇濆瓨鎴愬姛')
this.init(this.configContent.orderId)
@@ -1391,7 +1420,6 @@
})
} else {
newProcessConfigAdd(this.configContent).then((res) => {
- console.log(res)
if (res.data.code === 0) {
this.$message.success('淇濆瓨鎴愬姛')
this.init(this.configContent.orderId)
@@ -1403,7 +1431,6 @@
}
})
/* const configId = this.configContent.id
- console.log(this.configContent)
for (
let i = this.configContent.processConfigDataList.length - 1;
i >= 0;
@@ -1419,7 +1446,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 +1455,6 @@
})
} else {
newProcessConfigAdd(this.configContent).then((res) => {
- console.log(res)
if (res.data.code === 0) {
this.$message.success('淇濆瓨鎴愬姛')
this.init(this.configContent.orderId)
@@ -1491,7 +1516,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