From 2fb857721d32d3fce01f3487a623f5a9be2a3ac9 Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期四, 17 七月 2025 18:29:41 +0800
Subject: [PATCH] 1
---
src/views/wel/index.vue | 156 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 98 insertions(+), 58 deletions(-)
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 015fe6f..e1b132b 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -24,7 +24,8 @@
<el-button :size="size" text icon="el-icon-delete" type="primary" @click="showDel(row)" placeholder="鍒犻櫎" title="鍒犻櫎"></el-button>
<el-button :size="size" text v-if="row.nodeType < 60" icon="el-icon-document-add" type="primary" @click="showAdd(row)" placeholder="鏂板瀛愮骇" title="鏂板瀛愮骇"></el-button>
<el-button :size="size" text v-if="row.nodeType == 60" icon="el-icon-upload" type="primary" @click="showUpload(row)" placeholder="鏂囦欢涓婁紶" title="鏂囦欢涓婁紶"></el-button>
- <el-button :size="size" text v-if="row.nodeType == 70" icon="el-icon-pie-chart" type="primary" @click="upgrade(row)" placeholder="鍗囩増" title="鍗囩増"></el-button>
+ <!-- 娑夊瘑缃戞墠鏈� -->
+ <el-button :size="size" text v-if="row.nodeType == 70 && isSM" icon="el-icon-pie-chart" type="primary" @click="upgrade(row)" placeholder="鍗囩増" title="鍗囩増"></el-button>
<!-- 宸ユ帶缃戞墠鏈� -->
<el-button :size="size" text v-if="row.nodeType == 70 && !isSM" icon="el-icon-position" type="primary" @click="downsend(row)" placeholder="涓嬪彂" title="涓嬪彂"></el-button>
</template>
@@ -63,7 +64,7 @@
upgradeModal: false,
file: null,
fileContent: "",
- isSM: false, //鏄惁鏄秹瀵嗙綉 锛屽伐鎺х綉5涓紝娑夊瘑缃�4涓�
+ isSM: true, //鏄惁鏄秹瀵嗙綉 锛屽伐鎺х綉5涓紝娑夊瘑缃�4涓�
isShowTabs: true,
nodeTypeList: [],
fileList: [],
@@ -73,7 +74,7 @@
emptyText: "鍙栨秷",
menuPosition: "right",
column: [{
- label: '鍗囩増',
+ label: '宸ュ簭鐗堟',
prop: 'processEdition',
labelWidth: "80",
span: 22
@@ -143,6 +144,12 @@
{
label: '鏈�鍚庝慨鏀规椂闂�',
prop: 'updateTime',
+ disabled: true,
+ placeholder: " "
+ },
+ {
+ label: '澶囨敞',
+ prop: 'remark',
disabled: true,
placeholder: " "
}
@@ -315,25 +322,53 @@
},
dicFormatter(res) {
return res.data.records;
- }
+ },
+ rules: [
+ {
+ required: true,
+ message: '璇疯緭鍏ヨ澶囩紪鍙�',
+ trigger: 'blur'
+ }
+ ]
},
{
label: '闆剁粍浠跺彿/鍥惧彿',
prop: 'drawingNo',
- labelWidth: "120"
+ labelWidth: "120",
+ rules: [
+ {
+ required: true,
+ message: '璇疯緭鍏ラ浂缁勪欢鍙�/鍥惧彿',
+ trigger: 'blur'
+ }
+ ]
},
{
label: '宸ュ簭',
prop: 'processName',
- labelWidth: "120"
+ labelWidth: "120",
+ rules: [
+ {
+ required: true,
+ message: '璇疯緭鍏ュ伐搴�',
+ trigger: 'blur'
+ }
+ ]
},
{
label: '宸ュ簭鐗堟湰',
prop: 'processEdition',
- labelWidth: "120"
+ labelWidth: "120",
+ rules: [
+ {
+ required: true,
+ message: '璇疯緭鍏ュ伐搴忕増鏈�',
+ trigger: 'blur'
+ }
+ ]
},
{
- label: '鑺傜偣鍒嗙被',
+ label: '鏂囦欢鍒嗙被',
prop: 'category',
labelWidth: "120",
type: 'select',
@@ -341,7 +376,14 @@
props: {
label: 'dictValue',
value: 'dictKey',
- }
+ },
+ rules: [
+ {
+ required: true,
+ message: '璇烽�夋嫨鏂囦欢鍒嗙被',
+ trigger: 'change'
+ }
+ ]
},
{
label: '閫夋嫨鏂囦欢',
@@ -353,10 +395,22 @@
showFileList: false,
span: 24,
tip: "璇蜂笂浼犳枃浠讹紝灏嗗湪鎻愪氦鏃剁粺涓�澶勭悊",
- action: "/blade-mdm/program/ncfile/upload"
+ action: "/blade-mdm/program/ncfile/upload",
+ rules: [
+ {
+ validator: (rule, value, callback) => {
+ if (this.fileList.length === 0) {
+ callback(new Error('璇蜂笂浼犳枃浠�'));
+ } else {
+ callback();
+ }
+ },
+ trigger: 'blur'
+ }
+ ]
},
{
- label: '鏂囦欢鍒楄〃',
+ label: '宸蹭笂浼犳枃浠�',
prop: 'fileList',
labelWidth: "120"
},
@@ -381,12 +435,13 @@
axios({
url: '/blade-mdm/program/ncfile/upgrade-process-edition',
method: 'post',
- data: {id:row.id,newProcessEdition: row.processEdition},
+ params: {bindNcNodeId:row.id,newProcessEdition: row.processEdition},
}).then(
res => {
done();
this.upgradeModal = false;
- //this.$message.success('鎿嶄綔鎴愬姛');
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.addLocalTreeNode(row.parentId);
}
);
},
@@ -394,19 +449,20 @@
this.upgradeModal = false;
},
downsend(row) { //涓嬪彂
- // this.loading = true;
- // axios({
- // url: '/program/ncfile/send-to-machine-by-nodeid',
- // method: 'get',
- // params: {nodeId:id},
- // }).then(
- // res => {
- //this.loading = false;
- // }
- // );
+ this.loading = true;
+ axios({
+ url: '/blade-mdm/program/ncfile/send-to-machine-by-nodeid',
+ method: 'post',
+ params: {nodeId:row.id},
+ }).then(
+ res => {
+ this.loading = false;
+ this.$message.success('鎿嶄綔鎴愬姛');
+ }
+ );
},
upgrade(row) { //鍗囩増
- this.upgradeModalForm = row;
+ this.upgradeModalForm = {...row};
this.upgradeModal = true;
},
delFile(item) {
@@ -480,19 +536,18 @@
tabsHandleChange(tabs) {
this.tabsType = tabs.prop;
},
- showUpload(row) {
+ showUpload(row) {//鑾峰彇鏂囦欢鍐呭
this.fileList = [];
this.uploadmodalForm = row;
- //鑾峰彇鏂囦欢鍐呭
this.loading = true;
+ var obj = {parentId: row.id}
axios({
- url: '/blade-mdm/program/ncfile/list-by-node',
+ url: '/blade-mdm/program/node/lazy-list',
method: 'get',
- params: {nodeId: row.id},
+ params: obj,
}).then(
res => {
this.loading = false;
- this.fileList = res.data.data;
this.uploadmodalBox = true;
}
);
@@ -530,9 +585,7 @@
}).then(
res => {
this.loading = false;
- var nodeArr = this.$refs.crud.$refs.table.store.states.lazyTreeNodeMap.value[row.parentId];
- var arr = nodeArr.filter(item => item.id !== row.id);
- this.$refs.crud.$refs.table.store.states.lazyTreeNodeMap.value[row.parentId] = arr;
+ this.addLocalTreeNode(row.parentId);
}
);
})
@@ -573,7 +626,7 @@
this.modalBox = false;
// 淇敼锛屾洿鏂版湰鍦版暟鎹�
if (this.modalTitle === "淇敼") {
- this.updateLocalTreeNode(this.modalForm);
+ this.addLocalTreeNode(row.parentId);
}else {
// 濡傛灉鏄柊澧炴搷浣滐紝鍙兘闇�瑕侀噸鏂板姞杞芥暟鎹�
//this.$refs.crud.refreshTable();
@@ -600,28 +653,14 @@
}).then(
res => {
var children = res.data.data || [];
- this.$refs.crud.$refs.table.store.states.lazyTreeNodeMap.value[parentId] = [...children];
+ if(parentId == 0) {
+ this.data = [...children];
+ }else {
+ this.$refs.crud.$refs.table.store.states.lazyTreeNodeMap.value[parentId] = [...children];
+ }
this.loading = false;
}
);
- },
- updateLocalTreeNode(nodeData) { //淇敼鐨勬柟娉�
- const updateNode = (nodes) => {
- for (let i = 0; i < nodes.length; i++) {
- if (nodes[i].id === nodeData.id) {
- // 鏇存柊鑺傜偣鏁版嵁
- Object.assign(nodes[i], nodeData);
- return true;
- }
- if (Array.isArray(nodes[i].children) && nodes[i].children.length > 0) {
- if (updateNode(nodes[i].children)) {
- return true;
- }
- }
- }
- return false;
- };
- updateNode(this.data);
},
modalCancel() {
this.modalBox = false;
@@ -638,6 +677,7 @@
params: obj,
}).then(
res => {
+ console.log(res.data,111)
this.loading = false;
resolve(res.data.data);
}
@@ -684,12 +724,12 @@
}
);
//鍒ゆ柇鐗堟湰 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;
- }
- }
- );
+ // axios({url: '/blade-mdm/system/param/getValue?paramKey=networkType',method: 'get'}).then(res => {
+ // if(res.data.data === "0") {
+ // this.isSM = true;
+ // }
+ // }
+ // );
}
};
</script>
--
Gitblit v1.9.3