From e969c1f0523c69fe854fdcad7d8d8e2da6dcf30d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 28 十一月 2023 17:44:53 +0800
Subject: [PATCH] modified: src/views/product/workbench/feed-form.vue modified: src/views/product/workbench/feed-pane.vue modified: src/views/warehouse/pallettransports/index.vue modified: vue.config.js
---
src/views/plan/customerorder/customerorder-form.vue | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index 2997ba9..ec8dfc5 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -215,7 +215,7 @@
slot="append"
icon="el-icon-search"
@click="openSalesPartDialog()"
- v-show="dataForm.id"
+ v-show="dataForm.id==null"
></el-button>
</el-input>
</el-form-item>
@@ -248,10 +248,11 @@
</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>
@@ -323,6 +324,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>{{
@@ -635,15 +644,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>
@@ -676,13 +686,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"
@@ -818,7 +828,9 @@
productName: '',
productType: '',
partNo: '',
+ technologyDocumentId: '',
docNumber: '',
+ docName: '',
shippingAddress: '',
remark: '',
otcUnit: '',
@@ -1287,9 +1299,6 @@
this.getConfigFiles()
},
delProcessConfigFile(row) {
- if (row.lineNumber !== this.dataForm.otcLineNo) {
- this.$message.error('涓婁紶鏂囦欢琛屽彿涓庡綋鍓嶉攢鍞鍗曡鍙蜂笉涓�鑷达紝涓嶅厑璁稿垹闄�')
- } else {
this.$confirm('鏄惁鍒犻櫎宸ヨ壓閰嶇疆鏂囦欢', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -1302,7 +1311,6 @@
.then((data) => {
this.getConfigFiles()
})
- }
},
downloadProcessConfigFile(row) {
downloadProcessConfigFile(
--
Gitblit v1.9.3