mes-ocea-before.git

			@@ -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">
			@@ -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,7 +1053,6 @@
			// }
			// }
			// } else {
			// console.log('2')
			this.dataForm = response.data.data

			// }
			@@ -1198,7 +1201,6 @@
			this.showPart = true
			},
			selectPart(part) {
			console.log(part);
			if (part) {
			this.dataForm.partNo = part.partNo
			}
			@@ -1352,7 +1354,6 @@
			// 保存配置单
			saveConfig() {
			const configId = this.configContent.id
			console.log(this.configContent)
			for (
			let i = this.configContent.processConfigDataList.length - 1;
			i >= 0;
			@@ -1368,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)
			@@ -1378,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)
			@@ -1403,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;
			@@ -1419,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)
			@@ -1429,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)
			@@ -1441,7 +1437,6 @@
			}
			})
			/* const configId = this.configContent.id
			console.log(this.configContent)
			for (
			let i = this.configContent.processConfigDataList.length - 1;
			i >= 0;
			@@ -1457,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)
			@@ -1467,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)
			@@ -1529,7 +1522,6 @@
			// var param = Object.assign({ current: 1, size: 20 })
			// getProcessConfigPage(param).then((res) => {
			// const list = res.data.data.records
			// console.log(list)
			// })
			},
			// 获取确认