From 5dbf3ac4647bc2ab26dc3cccee3e853ffe1491e3 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 10 四月 2025 10:49:28 +0800
Subject: [PATCH] 原辅材和成品下单修正
---
src/views/system/user/index.vue | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 90909b3..a2d25a5 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -34,8 +34,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
+ <el-button type="primary" size="mini" @click="handleQuery">鏌ヨ</el-button>
+ <el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
</div>
@@ -47,7 +47,8 @@
</div>
</div>
<el-col>
- <el-table v-loading="loading" :data="userList" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
+ <el-table v-loading="loading" :data="userList"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" align="center" type="index" />
<el-table-column label="濮撳悕" align="center" key="nickName" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="璐﹀彿" align="center" key="userName" prop="userName" :show-overflow-tooltip="true" />
@@ -59,7 +60,7 @@
</template>
</el-table-column>
<el-table-column label="鎵嬫満鍙风爜" align="center" key="phonenumber" prop="phonenumber" width="120" />
- <el-table-column label="鎿嶄綔" align="center" width="160" class-nickName="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" width="160" class="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:user:edit']">淇敼</el-button>
@@ -213,9 +214,9 @@
<el-col :span="8" style="height: 70vh;overflow: hidden;" v-if="companiesList.length != 1">
<el-input v-model="search2" placeholder="杈撳叆鍏抽敭瀛楁悳绱�" clearable size="small" @clear="searchFilter2"
@keyup.enter.native="searchFilter2" prefix-icon="el-icon-search" style="margin-bottom: 20px;width: 90%" />
- <el-tree :data="datathirdParty" node-key="companyId" :props="defaultProps" @node-click="nodeClick2"
- style="height: calc(100% - 42px);" @node-expand="nodeOpen0" :filter-node-method="filterNode2" ref="tree2"
- highlight-current>
+ <el-tree :data="datathirdParty" node-key="companyId" :props="defaultProps0" @node-click="nodeClick2"
+ style="height: calc(100% - 42px);overflow-y: auto;" @node-expand="nodeOpen0"
+ :filter-node-method="filterNode2" ref="tree2" highlight-current>
</el-tree>
</el-col>
<el-col :span="companiesList.length == 1 ? 24 : 16" style="height: 70vh;padding-left: 8px;">
@@ -225,13 +226,13 @@
style="width: 50%" @keyup.enter.native="searchPerson()"></el-input>
</div>
<el-table height="67vh" stripe :data="personList" v-loading="personLoad" ref="personTable"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="50">
</el-table-column>
<el-table-column prop="employeeID" label="鍛樺伐鍙�">
</el-table-column>
- <el-table-column prop="nickName" label="鍛樺伐濮撳悕">
+ <el-table-column prop="name" label="鍛樺伐濮撳悕">
</el-table-column>
<el-table-column prop="department" label="閮ㄩ棬" min-width="200">
</el-table-column>
@@ -330,6 +331,10 @@
children: "children",
label: "label"
},
+ defaultProps0: {
+ children: "children",
+ label: "companyName"
+ },
// 鐢ㄦ埛瀵煎叆鍙傛暟
upload: {
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鐢ㄦ埛瀵煎叆锛�
@@ -412,6 +417,7 @@
fatherId: 10001,
nickName: '',
},
+ multipleSelection: []
};
},
watch: {
@@ -545,6 +551,7 @@
this.ids = selection.map(item => item.userId);
this.single = selection.length != 1;
this.multiple = !selection.length;
+ this.multipleSelection = selection
},
// 鏇村鎿嶄綔瑙﹀彂
handleCommand(command, row) {
@@ -579,7 +586,7 @@
}).catch(() => {
this.thirdPartyLoading = false;
})
- if (this.componentData.entity.roleId > 10000) this.$message.warning('鐢变簬鏈�変腑鍏蜂綋瑙掕壊锛屾柊澧炵敤鎴峰皢鎴愪负榛樿瑙掕壊')
+ if (this.queryParams.deptId > 10000) this.$message.warning('鐢变簬鏈�変腑鍏蜂綋瑙掕壊锛屾柊澧炵敤鎴峰皢鎴愪负榛樿瑙掕壊')
},
tranListToTreeData(list, rootValue) {
const arr = [];
@@ -624,7 +631,7 @@
}
},
nodeOpen0(data, node, el) {
- this.currentCompaniesList[node.level - nodeOpen01] = data.id
+ // this.currentCompaniesList[node.level - nodeOpen01] = data.id
},
filterNode2(value, data) {
if (!value) return true;
@@ -649,10 +656,11 @@
arr.push(obj)
})
this.addLoad = true
+ // console.log(11111, this.multipleSelection)
addPersonUser({
company: arr,
person: this.multipleSelection,
- roleId: this.componentData.entity.roleId
+ deptId: this.queryParams.deptId
}).then(res => {
this.$message.success('鎿嶄綔鎴愬姛')
this.multipleSelection = []
--
Gitblit v1.9.3