From 9645a35c1303281cfac9cc02b8773f07f9320b8a Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 27 八月 2025 00:20:32 +0800
Subject: [PATCH] 增加去空格的功能
---
src/views/flowmgr/taskassign.vue | 70 +++++++++++++++++++++-
src/views/tasks/machinereturnfiles.vue | 74 +++++++++++++++++++++++-
src/views/wel/gongkong.vue | 1
3 files changed, 135 insertions(+), 10 deletions(-)
diff --git a/src/views/flowmgr/taskassign.vue b/src/views/flowmgr/taskassign.vue
index 05aed38..0ce10ea 100644
--- a/src/views/flowmgr/taskassign.vue
+++ b/src/views/flowmgr/taskassign.vue
@@ -8,7 +8,7 @@
-->
<template>
<basic-container>
- <avue-form ref="form" :option="attachOption" v-model="attachForm" @submit="formSubmit"></avue-form>
+ <avue-form ref="form" :option="attachOption" v-model="attachForm" @submit="formSubmit" @blur="handleTrim"></avue-form>
</basic-container>
</template>
@@ -41,10 +41,9 @@
var isTempFlow = getQueryString("isTempFlow");
isTempFlow = isTempFlow === 'Y'?'Y':'N';
- console.log('isTempFlow='+isTempFlow);
+
var that = this;
return {
- isTempFlow:isTempFlow,//鏄惁涓存椂娴佺▼
form: {},
machineCodeList: [],
attachOption: {
@@ -59,7 +58,10 @@
type: 'input',
span: 24,
dataType: 'string',
- rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
+ rules: [{ required: true, message: '蹇呭～'}],
+ blur: (col) => {
+ this.handleTrim(col)
+ }
},
{
label: '闆剁粍浠跺彿',
@@ -67,6 +69,9 @@
type: 'input',
span: 12,
dataType: 'string',
+ blur: (col) => {
+ this.handleTrim(col)
+ },
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
},
{
@@ -76,6 +81,9 @@
span: 12,
dataType: 'string',
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
+ blur: (col) => {
+ this.handleTrim(col)
+ },
},
{
label: '浜у搧鍨嬪彿',
@@ -84,6 +92,9 @@
span: 12,
dataType: 'string',
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
+ blur: (col) => {
+ this.handleTrim(col)
+ },
},
{
label: '宸ュ簭鍙�',
@@ -93,8 +104,10 @@
step: 1,
precision: 0,
dataType: 'string',
- max: 999,
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
+ blur: (col) => {
+ this.handleTrim(col)
+ },
},
{
label: '宸ュ簭鍚嶇О',
@@ -103,6 +116,9 @@
span: 12,
dataType: 'string',
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
+ blur: (col) => {
+ this.handleTrim(col)
+ },
},
{
label: '宸ュ簭鐗堟',
@@ -111,6 +127,9 @@
span: 12,
dataType: 'string',
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
+ blur: (col) => {
+ this.handleTrim(col)
+ },
},
{
label: '宸ヨ壓鐗堟',
@@ -121,6 +140,9 @@
dataType: 'string',
maxlength: 10,
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
+ blur: (col) => {
+ this.handleTrim(col)
+ },
},
{
label: '鍔犲伐鏈哄簥',
@@ -167,6 +189,9 @@
type: 'input',
span: 12,
dataType: 'string',
+ blur: (col) => {
+ this.handleTrim(col)
+ },
// rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
}
],
@@ -175,6 +200,19 @@
};
},
methods: {
+
+ handleTrim(col){
+ //console.log(col)
+ let value = this.attachForm[col.column.prop];
+ if (typeof value === 'string') {
+ const trimmedValue = value.trim();
+ // 鍙湁褰撳�肩‘瀹炲彂鐢熷彉鍖栨椂鎵嶆洿鏂�
+ if (trimmedValue !== value) {
+ this.attachForm[col.column.prop] = trimmedValue;
+ }
+ }
+ // this.attachForm[col.column.prop]='dddd'
+ },
formSubmit(form, done) {
var form = { ...form };
this.machineCodeList.forEach(item => {
@@ -201,6 +239,28 @@
done();
}
);
+ },
+ handleGlobalBlur( {prop, value} ) {
+ console.log('prop')
+ // 1. 绛涢�夐渶瑕佸鐞嗙殑瀛楁绫诲瀷锛堜粎杈撳叆绫伙細input/textarea锛�
+ const inputTypes = ["input", "textarea"];
+ const currentColumn = this.attachOption.column.find(item => item.prop === prop);
+
+ // 2. 鑻ヤ负杈撳叆绫诲瓧娈碉紝涓斿�间负瀛楃涓诧紝鎵ц trim 澶勭悊
+ if (currentColumn && inputTypes.includes(currentColumn.type) && typeof value === "string") {
+ const trimmedValue = value.trim();
+ // 3. 鍚屾澶勭悊鍚庣殑鍊煎埌琛ㄥ崟 model锛堥伩鍏嶇洿鎺ヤ慨鏀� prop锛岄�氳繃 $set 纭繚鍝嶅簲寮忥級
+ this.$set(this.attachForm, prop, trimmedValue);
+ }
+ },
+ handleBlur(prop, value) {
+ if (typeof value === 'string') {
+ const trimmedValue = value.trim();
+ // 鍙湁褰撳�肩‘瀹炲彂鐢熷彉鍖栨椂鎵嶆洿鏂�
+ if (trimmedValue !== value) {
+ this.attachForm[prop] = trimmedValue;
+ }
+ }
}
},
};
diff --git a/src/views/tasks/machinereturnfiles.vue b/src/views/tasks/machinereturnfiles.vue
index 91f5f48..1a3492c 100644
--- a/src/views/tasks/machinereturnfiles.vue
+++ b/src/views/tasks/machinereturnfiles.vue
@@ -1,4 +1,9 @@
<template>
+ <div class="gongkongMain">
+ <div>
+ <el-tree :data="treeData" :props="defaultProps" node-key="id" :default-expand-all="false" :default-expanded-keys="defaultKeys" @node-click="handleNodeClick" />
+ </div>
+ <div>
<basic-container>
<avue-crud
:addBtn="false"
@@ -18,7 +23,7 @@
>
<template #menu-left>
<!-- el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleExport">瀵煎嚭</el-button> -->
- <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="receiveBtn">鎵归噺鎺ユ敹</el-button>
+ <el-button type="primary" :disabled="this.selection.length==0" size="default" icon="el-icon-circle-plus" plain @click="receiveBtn">鎵归噺鎺ユ敹</el-button>
</template>
<template #menu="scope">
<el-button type="primary" text size="default" icon="el-icon-document-delete" @click.stop="rejectBtn(scope.row, scope.index)">鎷掔粷</el-button>
@@ -26,6 +31,8 @@
</template>
</avue-crud>
</basic-container>
+ </div>
+ </div>
</template>
<script>
@@ -44,6 +51,13 @@
machineGroupCode: ""
},
loading: true,
+ treeData: [],
+ defaultProps: {
+ children: 'children',
+ label: 'name',
+ isLeaf: (data) => !data.hasChildren
+ },
+ currentNode:{},//褰撳墠鑺傜偣鏁版嵁
mypage: {
size: 10,
current: 1,
@@ -220,6 +234,10 @@
machineSpec: this.search.machineSpec,
current: this.mypage.current,
size: this.mypage.size,
+ nodeType: this.currentNode.nodeType,
+ nodeId: this.currentNode.nodeType!='dir'?this.currentNode.id:undefined,
+ dirType:this.currentNode.dirType,
+ machineCode: this.currentNode.machineCode,
}
axios({
url: '/blade-mdm/machineback/file/page',
@@ -237,11 +255,59 @@
}
);
- }
+ },
+ handleNodeClick(treeNode,b,c,d) {
+ console.log(treeNode)
+ this.currentNode = treeNode;
+ this.onLoad();
+ //this.fileName = "";
+ //this.searchTable(TreeNode);
+ },
+ treeLoad () {
+ axios({
+ url: '/blade-mdm/gkw/node/load-tree',
+ method: 'get',
+ }).then(
+ res => {
+ this.treeData = res.data.data;
+ var firstIndex = 0;
+ res.data.data.forEach((item,index)=> {
+ if(item.children.length != 0) {
+ firstIndex = index;
+ }
+ })
+ //defaultKeys.push(item.id);
+ this.defaultKeys = [res.data.data[firstIndex].id];
+ }
+ )
+ },
},
+ mounted() {
+ this.treeLoad();
+ }
};
</script>
-
<style lang="scss">
-
+.gongkongMain {
+ display: flex;
+ padding: 0px;
+ margin: 0px 7px 10px 7px;
+ background-color: #fff;
+ border-top: 1px solid #ccc;
+ > div {
+ padding: 12px;
+ }
+}
+.gongkongMain > div:nth-child(1) {
+ width:25%;
+ border-right: 1px solid #ccc;
+}
+.gongkongMain div:nth-child(2) {
+ flex: 1;
+}
+.paginationTree {
+ margin-top: 12px;
+ display: flex;
+ justify-content: flex-end;
+}
</style>
\ No newline at end of file
diff --git a/src/views/wel/gongkong.vue b/src/views/wel/gongkong.vue
index 0e9df4e..3abca46 100644
--- a/src/views/wel/gongkong.vue
+++ b/src/views/wel/gongkong.vue
@@ -63,7 +63,6 @@
label: 'name',
isLeaf: (data) => !data.hasChildren
},
- treeData: [],
current: 1,
size: 10,
fileTotal: 0,
--
Gitblit v1.9.3