From c1343ffa4bb95941a70ceb8bc64e72d8a982b873 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 00:42:22 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/wel/shemi.vue | 89 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 72 insertions(+), 17 deletions(-)
diff --git a/src/views/wel/shemi.vue b/src/views/wel/shemi.vue
index 0d3926c..52b8eb9 100644
--- a/src/views/wel/shemi.vue
+++ b/src/views/wel/shemi.vue
@@ -17,15 +17,24 @@
>
<template #search>
<el-row :gutter="24">
- <el-col :span="6">
- <el-input v-model="search.name" placeholder="璇疯緭鍏ヨ妭鐐瑰悕绉�" clearable/>
+ <el-col :span="8" class="search-data-flex">
+ <span class="search-data-title">绋嬪簭鐘舵��:</span>
+ <el-checkbox-group v-model="searchTreeData.programStatus">
+ <el-checkbox value="1" label="璇曞垏" />
+ <el-checkbox value="2" label="鍥哄寲" />
+ <el-checkbox value="3" label="鍋忕" />
+ </el-checkbox-group>
</el-col>
- <el-col :span="6">
- <el-select v-model="search.nodeType" placeholder="璇疯緭鍏ヨ妭鐐圭被鍨�" clearable>
- <el-option v-for="item in nodeTypeList" :key="item.dictValue" :label="item.dictValue" :value="item.dictKey"/>formApprove.
- </el-select>
+ <el-col :span="8" class="search-data-flex">
+ <span class="search-data-title">闆剁粍浠跺彿:</span>
+ <el-select v-model="searchTreeData.drawingNo" filterable remote reserve-keyword placeholder="闆剁粍浠跺彿" :remote-method="remoteMethod" :loading="searchLoading">
+ <el-option v-for="item in drawingNoList" :key="item.value" :label="item.label" :value="item.value"/></el-select>
</el-col>
- <el-col :span="6">
+ <el-col :span="8" class="search-data-flex">
+ <span class="search-data-title">鏃堕棿鑼冨洿:</span>
+ <el-date-picker v-model="searchTreeData.createTime" type="daterange" range-separator="To" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿" :size="size" format="YYYY-MM-DD" value-format="YYYY-MM-DD" @change="createTimeChange"/>
+ </el-col>
+ <el-col :span="8">
<el-button type="primary" @click="searchTree"><el-icon class="el-icon--right" style="margin-right: 6px;"><Search /></el-icon>鎼滅储</el-button>
<el-button :icon="Delete" @click="setClearTree"><el-icon class="el-icon--right" style="margin-right: 6px;"><Delete /></el-icon>娓呯┖</el-button>
</el-col>
@@ -114,9 +123,18 @@
data() {
let rejectText = '椹冲洖';//+this.row.categoryName;
return {
+ drawingNoList: [],
+ searchLoading: false,
+ searchTreeData: {
+ programStatus: [],
+ drawingNo: "",
+ createTime: [],
+ createTimeBegin: "",
+ createTimeEnd: ""
+ },
drawingNo: '',
processNo: '',
- processEdition: '',
+ processEdition: '',
replaceDataId: "",
formApprove: {
title: '',
@@ -344,10 +362,6 @@
modalTitle: "",
id: "",
parentId:1,
- search: {
- name: "",
- nodeType: ""
- },
loading: true,
mypage: {
size: 10,
@@ -630,6 +644,29 @@
},
methods: {
+ createTimeChange(value) {
+ this.searchTreeData.createTimeBegin = value[0];
+ this.searchTreeData.createTimeEnd = value[1];
+ },
+ remoteMethod(query) {
+ if (query) {
+ this.searchLoading = true;
+ axios({
+ url: '/blade-mdm/program/node/drawing-no-pick',
+ method: 'get',
+ params: {drawingNo: query}
+ }).then(resp => {
+ this.searchLoading = false;
+ var drawingNoList = [];
+ resp.data.data.forEach(item=> {
+ drawingNoList.push({label: item,value: item})
+ })
+ this.drawingNoList = drawingNoList;
+ });
+ }else {
+ this.drawingNoList = [];
+ }
+ },
locked(row, isLock) {
row.isLocked == isLock
this.$confirm(`鏄惁${isLock ? '瑙ｉ攣' : '閿佸畾'}`, {
@@ -664,8 +701,7 @@
url: '/blade-mdm/flow/replace/start',
method: 'post',
data: obj
- }).then(
- resp => {
+ }).then(resp => {
this.$message({
type: 'success',
message: '鎿嶄綔鎴愬姛!',
@@ -716,8 +752,7 @@
url: '/blade-mdm/flow/replace/pre',
method: 'post',
params: {nodeId: row.id}
- }).then(
- resp => {
+ }).then(resp => {
this.row = row;
this.replaceDataId = resp.data.data.processInstanceId;
this.processNo = resp.data.data.processNo;
@@ -780,11 +815,14 @@
}
},
searchTree() {
+ if(this.searchTreeData.programStatus.length == 0) return;
+ if(this.searchTreeData.drawingNo == "") return;
axios({
url: '/blade-mdm/program/node/search-list',
method: 'get',
- params: this.search,
+ params: this.searchTreeData,
}).then(res => {
+ if(res.data.data.length == 0) return;
this.option.defaultExpandAll = true;
this.treeData = this.removeHasChildren(res.data.data);
this.$nextTick(() => {
@@ -803,6 +841,13 @@
},
setClearTree() {
this.option.defaultExpandAll = false;
+ this.searchTreeData = {
+ programStatus: [],
+ drawingNo: "",
+ createTime: [],
+ createTimeBegin: "",
+ createTimeEnd: ""
+ };
this.treeData = [];
this.$nextTick(()=> {
this.onLoad();
@@ -1222,4 +1267,14 @@
.code-box .el-drawer__header {
margin-bottom: 0;
}
+ .search-data-title {
+ font-size: 12px;
+ margin-right: 8px;
+ display: inline-block;
+ width: 68px;
+ }
+ .search-data-flex {
+ display: flex!important;
+ align-items: center;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3