From 7e4c95dee70b72cf582e086816589cbd776d8af4 Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期二, 22 七月 2025 11:30:02 +0800
Subject: [PATCH] 1
---
src/views/wel/index.vue | 321 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 199 insertions(+), 122 deletions(-)
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 1914d6a..a89c268 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -13,9 +13,6 @@
@refresh-change="refreshChange"
@on-load="onLoad"
@tree-load="treeLoad"
- @row-del="rowDel"
- @row-save="rowSave"
- @row-update="rowUpdate"
@row-click="rowClick"
>
<template #menu-left>
@@ -27,7 +24,9 @@
<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 == 60" 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>
</avue-crud>
@@ -36,33 +35,51 @@
<avue-form :option="modalOption" v-model="modalForm" @submit="modalSubmit" @reset-change="modalCancel"/>
</el-dialog>
<el-dialog title="涓婁紶鏂囦欢" append-to-body v-model="uploadmodalBox">
- <avue-form :option="uploadmodalOption" v-model="uploadmodalForm" @submit="uploadmodalSubmit" @reset-change="uploadmodalCancel" :upload-before="uploadBefore" :upload-after="uploadAfter" ref="uploadRef"></avue-form>
+ <avue-form :option="uploadmodalOption" v-model="uploadmodalForm" @submit="uploadmodalSubmit" @reset-change="uploadmodalCancel" :upload-before="uploadBefore" :upload-after="uploadAfter">
+ <template #fileList="{}" slot-scope="{ value }">
+ <div v-for="(file, index) in fileList" :key="index" v-if="fileList.length != 0">
+ {{ file.name }}
+ </div>
+ <div v-else>娌℃湁涓婁紶鏂囦欢</div>
+ </template>
+ </avue-form>
</el-dialog>
<avue-tabs :option="tabsOption" @change="tabsHandleChange" style="margin-top: 30px;" v-if="isShowTabs"></avue-tabs>
- <avue-form v-if="tabsType == 'tab1'" :option="tabsFormOption" v-model="tabsForm"></avue-form>
- <span v-else-if="tabsType == 'tab2'">鐗堟湰淇℃伅</span>
- <template v-else-if="tabsType == 'tab3'">
- {{fileContent}}
- <!-- <div v-for="item in fileList" v-if="fileList.length > 0" class="fileListStyle">
- <span>{{item.name}}</span>
- <span class="delFile" @click="delFile(item)">X</span>
- </div> -->
- </template>
+ <avue-form v-if="tabsType == 'tab1'" :option="tabsFormOption" v-model="tabsForm"></avue-form>
+ <span v-else-if="tabsType == 'tab2'">鐗堟湰淇℃伅</span>
+ <template v-else-if="tabsType == 'tab3'">
+ {{fileContent}}
+ </template>
+ <el-dialog title="鍗囩増" append-to-body v-model="upgradeModal" width="500">
+ <avue-form :option="upgradeModalOption" v-model="upgradeModalForm" @submit="upgradeSubmit" @reset-change="upgradeCancel"></avue-form>
+ </el-dialog>
</basic-container>
</template>
<script>
-
+import { ElMessage } from 'element-plus';
export default {
data() {
return {
+ upgradeModal: false,
file: null,
fileContent: "",
- isSM: false, //鏄惁鏄秹瀵嗙綉 锛屽伐鎺х綉5涓紝娑夊瘑缃�4涓�
+ isSM: true, //鏄惁鏄秹瀵嗙綉 锛屽伐鎺х綉5涓紝娑夊瘑缃�4涓�
isShowTabs: true,
nodeTypeList: [],
fileList: [],
tabsType: "tab1",
+ upgradeModalForm: {},
+ upgradeModalOption: {
+ emptyText: "鍙栨秷",
+ menuPosition: "right",
+ column: [{
+ label: '宸ュ簭鐗堟',
+ prop: 'processEdition',
+ labelWidth: "80",
+ span: 22
+ }]
+ },
tabsOption: {},
tabsOption1: {
column: [{
@@ -129,6 +146,12 @@
prop: 'updateTime',
disabled: true,
placeholder: " "
+ },
+ {
+ label: '澶囨敞',
+ prop: 'remark',
+ disabled: true,
+ placeholder: " "
}
]
},
@@ -145,6 +168,7 @@
{
label: '鑺傜偣绫诲瀷',
prop: 'nodeType',
+ labelWidth: "120",
type: 'select',
dicUrl: '/blade-system/dict-biz/dictionary?code=nc_node_type',
props: {
@@ -156,6 +180,7 @@
{
label: '璁惧锛堟満搴婏級',
prop: 'machineCode',
+ labelWidth: "120",
type: 'select',
dicUrl: '/blade-mdm/machine/page',
props: {
@@ -168,17 +193,20 @@
},
{
label: '鑺傜偣鍚嶇О',
- prop: 'name'
+ prop: 'name',
+ labelWidth: "120",
},
{
label: '鑺傜偣鎻忚堪',
prop: 'description',
+ labelWidth: "120",
hide: true
},
{
label: '澶囨敞',
prop: 'remark',
type: "textarea",
+ labelWidth: "120",
span: 24
}
]
@@ -273,6 +301,7 @@
{
label: '鑺傜偣绫诲瀷',
prop: 'nodeType',
+ labelWidth: "120",
type: 'select',
dicUrl: '/blade-system/dict-biz/dictionary?code=nc_node_type',
props: {
@@ -284,6 +313,7 @@
{
label: '璁惧缂栧彿',
prop: 'machineCode',
+ labelWidth: "120",
type: 'select',
dicUrl: '/blade-mdm/machine/page',
props: {
@@ -292,45 +322,103 @@
},
dicFormatter(res) {
return res.data.records;
- }
+ },
+ rules: [
+ {
+ required: true,
+ message: '璇疯緭鍏ヨ澶囩紪鍙�',
+ trigger: 'blur'
+ }
+ ]
},
{
label: '闆剁粍浠跺彿/鍥惧彿',
- prop: 'partNo'
+ prop: 'drawingNo',
+ labelWidth: "120",
+ rules: [
+ {
+ required: true,
+ message: '璇疯緭鍏ラ浂缁勪欢鍙�/鍥惧彿',
+ trigger: 'blur'
+ }
+ ]
},
{
label: '宸ュ簭',
- prop: 'processName'
+ prop: 'processName',
+ labelWidth: "120",
+ rules: [
+ {
+ required: true,
+ message: '璇疯緭鍏ュ伐搴�',
+ trigger: 'blur'
+ }
+ ]
},
{
label: '宸ュ簭鐗堟湰',
- prop: 'processEdition'
+ prop: 'processEdition',
+ labelWidth: "120",
+ rules: [
+ {
+ required: true,
+ message: '璇疯緭鍏ュ伐搴忕増鏈�',
+ trigger: 'blur'
+ }
+ ]
},
{
- label: '鑺傜偣鍒嗙被',
+ label: '鏂囦欢鍒嗙被',
prop: 'category',
+ labelWidth: "120",
type: 'select',
dicUrl: '/blade-system/dict-biz/dictionary?code=node_file_type',
props: {
label: 'dictValue',
value: 'dictKey',
- }
+ },
+ rules: [
+ {
+ required: true,
+ message: '璇烽�夋嫨鏂囦欢鍒嗙被',
+ trigger: 'change'
+ }
+ ]
},
{
label: '閫夋嫨鏂囦欢',
prop: 'uploadFile',
+ labelWidth: "120",
type: 'upload',
data: {nodeId: this.id},
action: "",
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: '宸蹭笂浼犳枃浠�',
+ prop: 'fileList',
+ labelWidth: "120"
},
{
label: '澶囨敞',
prop: 'remark',
type: "textarea",
+ labelWidth: "120",
span: 24
}
]
@@ -343,30 +431,39 @@
}
},
methods: {
- downsend(row) { //涓嬪彂
- // this.loading = true;
- // axios({
- // url: '/program/ncfile/send-to-machine-by-nodeid',
- // method: 'get',
- // params: {nodeId:id},
- // }).then(
- // res => {
-
- // }
- // );
- },
- upgrade(row) { //鍗囩骇
- this.loading = true;
- var obj = {id: row.id}
+ upgradeSubmit(row,done) { //鍗囩増
axios({
url: '/blade-mdm/program/ncfile/upgrade-process-edition',
method: 'post',
- data: obj,
+ params: {bindNcNodeId:row.id,newProcessEdition: row.processEdition},
}).then(
- resp => {
- this.$message.success('鍗囩骇鎴愬姛');
+ res => {
+ done();
+ this.upgradeModal = false;
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.addLocalTreeNode(row.parentId);
}
);
+ },
+ upgradeCancel() {
+ this.upgradeModal = false;
+ },
+ downsend(row) { //涓嬪彂
+ 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.upgradeModal = true;
},
delFile(item) {
this.loading = true;
@@ -383,13 +480,14 @@
);
},
uploadBefore(file,done,loading,column) {
- //done();
this.file = file;
+ this.fileList.push(file);
+ //done(); 鏀惧紑灏变笂浼犱簡
return false;
},
uploadAfter() {
},
- uploadmodalSubmit(row,done) {
+ uploadmodalSubmit(row,done) { //涓婁紶鎻愪氦鎺ュ彛
if(this.file == null) {
this.$message.error('璇蜂笂浼犳枃浠�');
return;
@@ -397,6 +495,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]);
});
@@ -405,11 +506,33 @@
url: '/blade-mdm/program/ncfile/upload',
method: 'post',
data: formData,
- }).then(
- res => {
+ }).then(res => {
this.loading = false;
- this.uploadmodalBox = false;
- this.addLocalTreeNode(row.parentId); //閲嶆柊鍔犺浇涓嬩竴绾�
+ 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();
}
);
@@ -438,9 +561,21 @@
tabsHandleChange(tabs) {
this.tabsType = tabs.prop;
},
- showUpload(row) {
+ showUpload(row) {//鑾峰彇鏂囦欢鍐呭
+ this.fileList = [];
this.uploadmodalForm = row;
- this.uploadmodalBox = true;
+ this.loading = true;
+ var obj = {parentId: row.id}
+ axios({
+ url: '/blade-mdm/program/node/lazy-list',
+ method: 'get',
+ params: obj,
+ }).then(
+ res => {
+ this.loading = false;
+ this.uploadmodalBox = true;
+ }
+ );
},
getFile(id) { //鏌ョ湅鏂囦欢鍐呭
this.loading = true;
@@ -454,15 +589,6 @@
this.fileContent = res.data.data;
}
);
- },
- rowDel(row, index, done) {
- done(row);
- },
- rowSave (row, done) {
- done(row);
- },
- rowUpdate (row, index, done) {
- done(row);
},
showEdit(row,done) {
this.modalTitle = "淇敼";
@@ -484,7 +610,7 @@
}).then(
res => {
this.loading = false;
- this.$refs.crud.rowDel(row);
+ this.addLocalTreeNode(row.parentId);
}
);
})
@@ -525,7 +651,7 @@
this.modalBox = false;
// 淇敼锛屾洿鏂版湰鍦版暟鎹�
if (this.modalTitle === "淇敼") {
- this.updateLocalTreeNode(this.modalForm);
+ this.addLocalTreeNode(row.parentId);
}else {
// 濡傛灉鏄柊澧炴搷浣滐紝鍙兘闇�瑕侀噸鏂板姞杞芥暟鎹�
//this.$refs.crud.refreshTable();
@@ -552,60 +678,14 @@
}).then(
res => {
var children = res.data.data || [];
- this.updateParentNodeChildren(parentId, children);
+ if(parentId == 0) {
+ this.data = [...children];
+ }else {
+ this.$refs.crud.$refs.table.store.states.lazyTreeNodeMap.value[parentId] = [...children];
+ }
this.loading = false;
}
);
- },
- updateParentNodeChildren(parentId, newChildren) { //鏂板鐨勬柟娉�
- const updateTree = (nodes) => {
- for (let i = 0; i < nodes.length; i++) {
- if (nodes[i].id === parentId) {
- // 鏇存柊鑺傜偣鏁版嵁
- nodes[i].children = [...newChildren];
- this.data = [...this.data]; // 鏇挎崲椤跺眰寮曠敤
- return true;
- }
- if (Array.isArray(nodes[i].children) && nodes[i].children.length > 0) {
- if (updateTree(nodes[i].children)) {
- return true;
- }
- }
- }
- return false;
- };
- updateTree(this.data);
- // this.upData = JSON.parse(JSON.stringify(this.data));
- // this.data = [];
- // 寮哄埗鍒锋柊
- this.$nextTick(() => {
- this.$refs.crud?.refreshTable();
- // this.data = this.upData;
- // this.option.defaultExpandAll = true;
- });
- // setTimeout(()=> {
- // this.data = this.upData;
- // this.option.defaultExpandAll = true;
- // console.log(this.data,222)
- // },3000)
- },
- 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;
@@ -667,21 +747,18 @@
this.nodeTypeList = res.data.data;
}
);
- //鍒ゆ柇鐗堟湰 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;
- }
- }
- );
+ //鍒ゆ柇鐗堟湰 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;
+ // }
+ // }
+ // );
}
};
</script>
<style lang="scss">
-.el-form-item__label {
- width: 120px!important;
-}
.delFile {
color: red;
margin-left: 12px;
--
Gitblit v1.9.3