From 35ccec8d8676417c11ad47ee4cde3d1c58c0a20e Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 17 十月 2023 13:23:17 +0800
Subject: [PATCH] modified: src/views/basic/part/index.vue modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/customerorder/sample-customerorder-form.vue
---
src/views/basic/part/index.vue | 12 ++++++------
vue.config.js | 2 +-
src/views/plan/customerorder/sample-customerorder-form.vue | 4 ++--
src/views/plan/customerorder/customerorder-form.vue | 21 ++++++++++++---------
4 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/src/views/basic/part/index.vue b/src/views/basic/part/index.vue
index 576a443..0727e12 100644
--- a/src/views/basic/part/index.vue
+++ b/src/views/basic/part/index.vue
@@ -368,12 +368,12 @@
fun: this.syncIfs,
loading: false
},
- {
- text: '澶ф爣绛�',
- type: 'primary',
- fun: this.printLabel,
- loading: false
- }
+ // {
+ // text: '澶ф爣绛�',
+ // type: 'primary',
+ // fun: this.printLabel,
+ // loading: false
+ // }
],
operator: [
{
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index f1bb5ec..5eed5a3 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -26,7 +26,7 @@
class="l-mes"
:disabled="!editable"
>
- <el-tabs type="border-card" ref="tabs">
+ <el-tabs type="border-card" ref="tabs" @tab-click="tabsClick">
<el-tab-pane label="涓昏" type="card">
<el-row>
<el-col :span="6">
@@ -659,14 +659,14 @@
@click="synchronizeFile(scope.row)"
type="text"
size="small"
- :disabled="scope.row.lineNumber !== dataForm.otcLineNo"
+ :disabled="scope.row.lineNumber !== dataForm.customerNo"
>鍚屾</el-button
>
<el-button
@click="delProcessConfigFile(scope.row)"
type="text"
size="small"
- :disabled="scope.row.lineNumber !== dataForm.otcLineNo"
+ :disabled="scope.row.lineNumber !== dataForm.customerNo"
>鍒犻櫎</el-button
>
<el-button
@@ -990,6 +990,11 @@
this.getManufactureAttrs('manufacture_attr_type')
},
methods: {
+ tabsClick(tab,even){
+ if(tab.index == 2){
+ this.getConfigFiles();
+ }
+ },
init(id) {
this.orderParamList = []
this.dataForm.id = id || 0
@@ -1017,7 +1022,6 @@
this.dataForm = response.data.data
// }
// this.fileList = response.data.data.customerOrderAttachmentList
- console.log(response.data.data.sourceId);
const sourceId = response.data.data.sourceId
if(sourceId === '0'){
this.getFileList()
@@ -1033,7 +1037,6 @@
// this.this.configContent.modelType = '01'
// this.configContent.orderId = this.dataForm.id
// this.configContent.orderId = response.data.data.customerOrderNo
- console.log(response.data.data)
if (response.data.data.processConfigDTO) {
// 鏈変繚瀛樼殑鏁版嵁
this.configContent = response.data.data.processConfigDTO
@@ -1233,8 +1236,8 @@
delOutPutBatch(row) {},
addOutPutBatch() {},
submitUpload() {
- this.paramData.orderNumber = this.dataForm.customerOrderNo
- this.paramData.lineNumber = this.dataForm.otcLineNo
+ this.paramData.orderNumber = this.dataForm.contractNo
+ this.paramData.lineNumber = this.dataForm.customerNo
this.progrecessFileLoading = true
},
uploadSuccess() {
@@ -1243,8 +1246,8 @@
},
getConfigFiles() {
const param = {
- orderNumber: this.dataForm.customerOrderNo,
- lineNumber: this.dataForm.otcLineNo
+ orderNumber: this.dataForm.contractNo,
+ lineNumber: this.dataForm.customerNo
}
getProcessConfigFiles(param).then((res) => {
this.processConfigFileTableData = res.data.data
diff --git a/src/views/plan/customerorder/sample-customerorder-form.vue b/src/views/plan/customerorder/sample-customerorder-form.vue
index 21b97b8..00b1397 100644
--- a/src/views/plan/customerorder/sample-customerorder-form.vue
+++ b/src/views/plan/customerorder/sample-customerorder-form.vue
@@ -147,12 +147,12 @@
:option="option"
:data="tableData">
<template slot="partNo" slot-scope="scope">
- <el-input v-model="scope.row.partNo" placeholder="" readonly>
+ <el-input v-model="scope.row.partNo" placeholder="鏌ヨ闆朵欢鍙�" readonly>
<el-button slot="append" icon="el-icon-search" @click="openPartDialog(scope.row.$index)"></el-button>
</el-input>
</template>
<template slot="otcUnit" slot-scope="scope">
- <el-select v-model="scope.row.otcUnit" placeholder="" style="width: 100%">
+ <el-select v-model="scope.row.otcUnit" placeholder="璇烽�夋嫨鍗曚綅" style="width: 100%">
<el-option
v-for="item in units"
:key="item.value"
diff --git a/vue.config.js b/vue.config.js
index 992eca9..7503dc5 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,7 +2,7 @@
* 閰嶇疆鍙傝��:
* https://cli.vuejs.org/zh/config/
*/
-const url = 'http://127.0.0.1:9999'
+const url = 'http://192.168.83.249:9999'
const localUrl = 'http://localhost:8089'
//const localUrl = 'http://10.88.15.95:8089'
const CompressionWebpackPlugin = require('compression-webpack-plugin')
--
Gitblit v1.9.3