From 604ac4fe83bf0641a58fb7dd1a7e2d3481d1be83 Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期五, 25 七月 2025 19:24:59 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/wel/index.vue | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index e1b132b..9624d69 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -57,7 +57,7 @@
</template>
<script>
-
+import { ElMessage } from 'element-plus';
export default {
data() {
return {
@@ -274,7 +274,24 @@
},
{
label: '娴佺▼鐘舵��',
- prop: 'abc'
+ prop: 'flowStatus',
+ formatter: (val, value, label) => {
+ if(val.nodeType != '70'){
+ //闈炵▼搴忚妭鐐�
+ return '';
+ }else{
+
+ if(value==0||value==null){
+ return '鏈惎鍔�';
+ }else if(value == 1){
+ return '瀹℃壒涓�';
+ }else if(value == 2){
+ return '宸查�氳繃';
+ }else{
+ return '鏈畾涔�';
+ }
+ }
+ },
},
{
label: '娴嬭瘯绋嬪簭',
@@ -495,6 +512,9 @@
var formData = new FormData();
formData.append('file', this.file);
formData.append('nodeId', this.id);
+ if(this.isRepeatUpload) {
+ formData.append('cofirm','1');
+ }
Object.keys(this.uploadmodalForm).forEach(key => {
formData.append(key, this.uploadmodalForm[key]);
});
@@ -503,11 +523,33 @@
url: '/blade-mdm/program/ncfile/upload',
method: 'post',
data: formData,
- }).then(
- res => {
+ }).then(res => {
this.loading = false;
- this.uploadmodalBox = false;
- this.addLocalTreeNode(row.id); //閲嶆柊鍔犺浇涓嬩竴绾�
+ if(res.data.code == 2) {
+ this.$confirm('鏂囦欢鍚嶅凡瀛樺湪锛岀‘瀹氫笂浼犲悧?', '鎻愮ず', {
+ distinguishCancelAndClose: true,
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ this.isRepeatUpload = true;
+ this.uploadmodalSubmit(row,done);
+ }).catch(action => {
+ this.isRepeatUpload = false;
+ this.$message({
+ type: 'info',
+ message:'鍙栨秷涓婁紶'
+ })
+ });
+ }else if(res.data.success) {
+ this.isRepeatUpload = false;
+ this.uploadmodalBox = false;
+ this.$message({type: 'success',message: '鎿嶄綔鎴愬姛!'});
+ this.addLocalTreeNode(row.id); //閲嶆柊鍔犺浇涓嬩竴绾�
+ }else {
+ this.isRepeatUpload = false;
+ alert(1)
+ }
done();
}
);
@@ -677,7 +719,6 @@
params: obj,
}).then(
res => {
- console.log(res.data,111)
this.loading = false;
resolve(res.data.data);
}
@@ -723,7 +764,7 @@
this.nodeTypeList = res.data.data;
}
);
- //鍒ゆ柇鐗堟湰 0:娑夊瘑缃戯紝1:宸ユ帶缃戯紱//宸ユ帶缃�5涓紝娑夊瘑缃�4涓�
+ //鍒ゆ柇鐗堟湰 0:娑夊瘑缃戯紝1:宸ユ帶缃戯紱//宸ユ帶缃�5涓紝娑夊瘑缃�4涓� ,宸ユ帶缃戝彇娑�
// axios({url: '/blade-mdm/system/param/getValue?paramKey=networkType',method: 'get'}).then(res => {
// if(res.data.data === "0") {
// this.isSM = true;
--
Gitblit v1.9.3