From eab75b5d771b5f7edc717859c45ab28ee9ba8670 Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期四, 10 七月 2025 12:17:27 +0800
Subject: [PATCH] 1
---
src/views/wel/index.vue | 136 ++++++++++++++++++++++++++++++++-------------
1 files changed, 96 insertions(+), 40 deletions(-)
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 21d7d98..75c5b13 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 == 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" 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>
@@ -33,18 +34,24 @@
<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>
@@ -53,6 +60,7 @@
export default {
data() {
return {
+ upgradeModal: false,
file: null,
fileContent: "",
isSM: false, //鏄惁鏄秹瀵嗙綉 锛屽伐鎺х綉5涓紝娑夊瘑缃�4涓�
@@ -60,6 +68,17 @@
nodeTypeList: [],
fileList: [],
tabsType: "tab1",
+ upgradeModalForm: {},
+ upgradeModalOption: {
+ emptyText: "鍙栨秷",
+ menuPosition: "right",
+ column: [{
+ label: '鍗囩増',
+ prop: 'processEdition',
+ labelWidth: "80",
+ span: 22
+ }]
+ },
tabsOption: {},
tabsOption1: {
column: [{
@@ -142,6 +161,7 @@
{
label: '鑺傜偣绫诲瀷',
prop: 'nodeType',
+ labelWidth: "120",
type: 'select',
dicUrl: '/blade-system/dict-biz/dictionary?code=nc_node_type',
props: {
@@ -153,6 +173,7 @@
{
label: '璁惧锛堟満搴婏級',
prop: 'machineCode',
+ labelWidth: "120",
type: 'select',
dicUrl: '/blade-mdm/machine/page',
props: {
@@ -165,17 +186,20 @@
},
{
label: '鑺傜偣鍚嶇О',
- prop: 'name'
+ prop: 'name',
+ labelWidth: "120",
},
{
label: '鑺傜偣鎻忚堪',
prop: 'description',
+ labelWidth: "120",
hide: true
},
{
label: '澶囨敞',
prop: 'remark',
type: "textarea",
+ labelWidth: "120",
span: 24
}
]
@@ -270,6 +294,7 @@
{
label: '鑺傜偣绫诲瀷',
prop: 'nodeType',
+ labelWidth: "120",
type: 'select',
dicUrl: '/blade-system/dict-biz/dictionary?code=nc_node_type',
props: {
@@ -281,6 +306,7 @@
{
label: '璁惧缂栧彿',
prop: 'machineCode',
+ labelWidth: "120",
type: 'select',
dicUrl: '/blade-mdm/machine/page',
props: {
@@ -293,19 +319,23 @@
},
{
label: '闆剁粍浠跺彿/鍥惧彿',
- prop: 'drawingNo'
+ prop: 'drawingNo',
+ labelWidth: "120"
},
{
label: '宸ュ簭',
- prop: 'processName'
+ prop: 'processName',
+ labelWidth: "120"
},
{
label: '宸ュ簭鐗堟湰',
- prop: 'processEdition'
+ prop: 'processEdition',
+ labelWidth: "120"
},
{
label: '鑺傜偣鍒嗙被',
prop: 'category',
+ labelWidth: "120",
type: 'select',
dicUrl: '/blade-system/dict-biz/dictionary?code=node_file_type',
props: {
@@ -316,6 +346,7 @@
{
label: '閫夋嫨鏂囦欢',
prop: 'uploadFile',
+ labelWidth: "120",
type: 'upload',
data: {nodeId: this.id},
action: "",
@@ -325,9 +356,15 @@
action: "/blade-mdm/program/ncfile/upload"
},
{
+ label: '鏂囦欢鍒楄〃',
+ prop: 'fileList',
+ labelWidth: "120"
+ },
+ {
label: '澶囨敞',
prop: 'remark',
type: "textarea",
+ labelWidth: "120",
span: 24
}
]
@@ -340,30 +377,38 @@
}
},
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,
+ data: {id:row.id,newProcessEdition: row.processEdition},
}).then(
- resp => {
- this.$message.success('鍗囩骇鎴愬姛');
+ res => {
+ done();
+ this.upgradeModal = false;
+ //this.$message.success('鎿嶄綔鎴愬姛');
}
);
+ },
+ upgradeCancel() {
+ this.upgradeModal = false;
+ },
+ downsend(row) { //涓嬪彂
+ this.loading = true;
+ axios({
+ url: '/blade-mdm/program/ncfile/send-to-machine-by-nodeid',
+ method: 'get',
+ params: {nodeId:id},
+ }).then(
+ res => {
+ this.loading = false;
+ this.$message.success('鎿嶄綔鎴愬姛');
+ }
+ );
+ },
+ upgrade(row) { //鍗囩増
+ this.upgradeModalForm = row;
+ this.upgradeModal = true;
},
delFile(item) {
this.loading = true;
@@ -380,13 +425,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;
@@ -406,7 +452,7 @@
res => {
this.loading = false;
this.uploadmodalBox = false;
- this.addLocalTreeNode(row.parentId); //閲嶆柊鍔犺浇涓嬩竴绾�
+ this.addLocalTreeNode(row.id); //閲嶆柊鍔犺浇涓嬩竴绾�
done();
}
);
@@ -436,8 +482,21 @@
this.tabsType = tabs.prop;
},
showUpload(row) {
+ this.fileList = [];
this.uploadmodalForm = row;
- this.uploadmodalBox = true;
+ //鑾峰彇鏂囦欢鍐呭
+ this.loading = true;
+ axios({
+ url: '/blade-mdm/program/ncfile/list-by-node',
+ method: 'get',
+ params: {nodeId: row.id},
+ }).then(
+ res => {
+ this.loading = false;
+ this.fileList = res.data.data;
+ this.uploadmodalBox = true;
+ }
+ );
},
getFile(id) { //鏌ョ湅鏂囦欢鍐呭
this.loading = true;
@@ -637,9 +696,6 @@
</script>
<style lang="scss">
-.el-form-item__label {
- width: 120px!important;
-}
.delFile {
color: red;
margin-left: 12px;
--
Gitblit v1.9.3