From 1cf81a64af5bac57f2af8c419db0b22b3d5ba7c8 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 17 十一月 2023 16:37:50 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before
---
src/views/plan/customerorder/customerorder-form.vue | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index 3beeaf4..97c47e0 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -71,9 +71,9 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="瀹㈡埛璁㈠崟鐘舵��" prop="returnStatus">
+ <el-form-item label="瀹㈡埛璁㈠崟鐘舵��" prop="coState">
<el-input
- v-model="dataForm.returnStatus"
+ v-model="dataForm.coState"
placeholder=""
filterable
style="width: 100%"
@@ -909,6 +909,13 @@
)
}
}
+ let val=""
+ this.coStates.forEach(item=>{
+ if(item.value==this.dataForm.coState){
+ val=item.label
+ }
+ })
+ this.dataForm.coState=val
})
} else {
this.title = '鏂板'
@@ -916,6 +923,7 @@
}
})
},
+
getFileList() {
this.fileList = []
const queryParam = { orderNumber: this.dataForm.contractNo }
@@ -1095,10 +1103,23 @@
this.getConfigFiles()
},
delProcessConfigFile(row) {
- if (row.lineNumber !== this.dataForm.otcLineNo) {
- this.$message.error('涓婁紶鏂囦欢琛屽彿涓庡綋鍓嶉攢鍞鍗曡鍙蜂笉涓�鑷达紝涓嶅厑璁稿垹闄�')
- } else {
- this.$confirm('鏄惁鍒犻櫎宸ヨ壓閰嶇疆鏂囦欢', '鎻愮ず', {
+ // if (row.lineNumber !== this.dataForm.otcLineNo) {
+ // this.$message.error('涓婁紶鏂囦欢琛屽彿涓庡綋鍓嶉攢鍞鍗曡鍙蜂笉涓�鑷达紝涓嶅厑璁稿垹闄�')
+ // } else {
+ // this.$confirm('鏄惁鍒犻櫎宸ヨ壓閰嶇疆鏂囦欢', '鎻愮ず', {
+ // confirmButtonText: '纭畾',
+ // cancelButtonText: '鍙栨秷',
+ // type: 'warning',
+ // closeOnClickModal: false
+ // })
+ // .then(function() {
+ // return deleteProcessConfigFile(row.id)
+ // })
+ // .then((data) => {
+ // this.getConfigFiles()
+ // })
+ // }
+ this.$confirm('鏄惁鍒犻櫎宸ヨ壓閰嶇疆鏂囦欢', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning',
@@ -1110,7 +1131,6 @@
.then((data) => {
this.getConfigFiles()
})
- }
},
downloadProcessConfigFile(row) {
downloadProcessConfigFile(
--
Gitblit v1.9.3