From f24b25731e8f1c42c9d123327cfe3453e18b3fd1 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 01 四月 2025 09:02:57 +0800
Subject: [PATCH] 用户管理和外购件调整
---
src/views/system/user/index.vue | 17 +++++---
src/api/system/user.js | 2
src/views/business/outsourcedParts/index.vue | 51 +++++++++++++++----------
src/views/business/materialOrder/index.vue | 10 ++--
4 files changed, 47 insertions(+), 33 deletions(-)
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 752aa45..ad8d3ce 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -155,7 +155,7 @@
return request({
url: "/companies/addPersonUser",
method: "post",
- params: data,
+ data: data,
});
}
// 鑾峰彇瑙掕壊
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index ebdbcc9..7d9ba95 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -17,10 +17,6 @@
<el-input v-model="entity.partNo" clearable placeholder="璇疯緭鍏�" size="small" @keyup.enter.native="goSearch">
</el-input>
</el-form-item>
- <el-form-item label="闆朵欢鎻忚堪" prop="partDesc">
- <el-input v-model="entity.partDesc" clearable placeholder="璇疯緭鍏�" size="small" @keyup.enter.native="goSearch">
- </el-input>
- </el-form-item>
<el-form-item label="鎶ユ绫诲瀷" prop="inspectionType">
<el-select v-model="entity.inspectionType" clearable placeholder="璇烽�夋嫨" size="small" @change="refreshTable"
style="width: 100%">
@@ -29,12 +25,16 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button v-if="tabIndex === 2 || tabIndex === 3 || tabIndex === 4"
+ <el-button v-if="tabIndex === 1 || tabIndex === 2 || tabIndex === 3 || tabIndex === 4"
:icon="!more ? 'el-icon-arrow-down' : 'el-icon-arrow-up'" style="color: #3A7BFA;" type="text"
@click="more = !more">{{ !more ? '鏇村' : '鏀惰捣' }}</el-button>
<el-button size="mini" type="primary" @click="goSearch">鏌ヨ</el-button>
<el-button size="mini" @click="refresh()">閲嶇疆</el-button>
</el-form-item>
+ <el-form-item label="闆朵欢鎻忚堪" prop="partDesc" v-if="more">
+ <el-input v-model="entity.partDesc" clearable placeholder="璇疯緭鍏�" size="small" @keyup.enter.native="goSearch">
+ </el-input>
+ </el-form-item>
<el-form-item label="渚涘簲鍟嗗悕绉�" prop="supplierName"
v-if="(tabIndex === 2 || tabIndex === 3 || tabIndex === 4) && more">
<el-input v-model="entity.supplierName" clearable placeholder="璇疯緭鍏�" size="small"
diff --git a/src/views/business/outsourcedParts/index.vue b/src/views/business/outsourcedParts/index.vue
index 8da7077..74b3fa2 100644
--- a/src/views/business/outsourcedParts/index.vue
+++ b/src/views/business/outsourcedParts/index.vue
@@ -23,62 +23,60 @@
<!-- <el-button size="mini" type="primary" @click="openAdd('鏂板')">鏂板</el-button> -->
</div>
</div>
- <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 220px)'"
+ <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 240px)'"
:page="page" @pagination="pagination"></lims-table>
<!-- 鏂板/缂栬緫 -->
<el-dialog :title="title" :visible.sync="addDia" width="500px">
<el-form :model="addForm" v-if="addDia" ref="addForm" :rules="addRules" label-position="right"
label-width="120px">
<el-form-item label="浜у搧" prop="name">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addForm.name"
- :disabled="title == '妫�楠�'"></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addForm.name" disabled></el-input>
</el-form-item>
<el-form-item label="鏉ユ枡鏁伴噺" prop="num">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addForm.num" :disabled="title == '妫�楠�'">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addForm.num" disabled>
</el-input>
</el-form-item>
<el-form-item label="渚涜揣鍘傚" prop="supplier">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addForm.supplier" :disabled="title == '妫�楠�'">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addForm.supplier" disabled>
</el-input>
</el-form-item>
<el-form-item label="璁㈠崟鍙�" prop="orderNum">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addForm.orderNum" :disabled="title == '妫�楠�'">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addForm.orderNum" disabled>
</el-input>
</el-form-item>
<el-form-item label="SP鍙�" prop="spNum">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addForm.spNum" :disabled="title == '妫�楠�'">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addForm.spNum" disabled>
</el-input>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input size="small" placeholder="璇疯緭鍏�" type="textarea" :rows="2" clearable v-model="addForm.remark"
- :disabled="title == '妫�楠�'">
+ disabled>
</el-input>
</el-form-item>
- <el-form-item label="澶栬" prop="inspectionItems" v-if="title == '妫�楠�'">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addForm.inspectionItems">
+ <el-form-item label="澶栬" prop="inspectionItems">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addForm.inspectionItems"
+ :disabled="title != '妫�楠�'">
</el-input>
</el-form-item>
- <el-form-item label="妫�娴嬬粨鏋�" prop="result" v-if="title == '妫�楠�'">
- <el-select v-model="addForm.result" placeholder="璇烽�夋嫨">
+ <el-form-item label="妫�娴嬬粨鏋�" prop="result">
+ <el-select v-model="addForm.result" placeholder="璇烽�夋嫨" :disabled="title != '妫�楠�'">
<el-option label="鍚堟牸" value="鍚堟牸">
</el-option>
<el-option label="涓嶅悎鏍�" value="涓嶅悎鏍�">
</el-option>
- <el-option label="涓嶅垽鏂�" value="涓嶅垽鏂�">
+ <el-option label="涓嶅垽鏂�" value="涓嶅垽鏂�">
</el-option>
</el-select>
- <!-- <el-switch v-model="addForm.result" active-text="鍚堟牸" inactive-text="涓嶅悎鏍�" active-value="鍚堟牸"
- inactive-value="涓嶅悎鏍�">
- </el-switch> -->
</el-form-item>
- <el-form-item label="娴嬭瘯鏂囦欢" prop="file" v-if="title == '妫�楠�'">
- <el-upload action="#" :auto-upload="false" :multiple="false"
+ <el-form-item label="娴嬭瘯鏂囦欢" prop="file">
+ <el-upload action="#" :auto-upload="false" :multiple="false" v-if="title == '妫�楠�'"
accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.pdf,' :on-change="handleChangeUpload">
<el-button size="mini" type="primary">涓婁紶闄勪欢</el-button>
</el-upload>
+ <a @click="handleDown(addForm)" v-else style="color: #3a7bfa;">{{ addForm.fileName }}</a>
</el-form-item>
</el-form>
- <span slot="footer" class="dialog-footer">
+ <span slot="footer" class="dialog-footer" v-if="title == '妫�楠�'">
<el-button @click="addDia = false">鍙� 娑�</el-button>
<el-button :loading="uploading" type="primary" @click="submitProduct('addForm')">纭� 璁�</el-button>
</span>
@@ -151,6 +149,16 @@
type: "text",
clickFun: (row) => {
this.openAdd('妫�楠�', row);
+ },
+ disabled: (row) => {
+ return row.inspectionStatus > 0
+ },
+ },
+ {
+ name: "鏌ョ湅",
+ type: "text",
+ clickFun: (row) => {
+ this.openAdd('鏌ョ湅', row);
},
},
],
@@ -303,7 +311,10 @@
handleChangeUpload(file, fileLists) {
this.addForm.file = file
},
-
+ // 涓嬭浇闄勪欢鐨勬枃浠�
+ handleDown(row) {
+ this.$download.saveAs(row.fileUrl, row.fileName);
+ },
}
}
</script>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 878a405..a2d25a5 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -215,8 +215,8 @@
<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="defaultProps0" @node-click="nodeClick2"
- style="height: calc(100% - 42px);" @node-expand="nodeOpen0" :filter-node-method="filterNode2" ref="tree2"
- highlight-current>
+ 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;">
@@ -416,7 +416,8 @@
addOb: {
fatherId: 10001,
nickName: '',
- }
+ },
+ multipleSelection: []
};
},
watch: {
@@ -550,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) {
@@ -584,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 = [];
@@ -629,14 +631,14 @@
}
},
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;
return data['companyName'].indexOf(value) !== -1;
},
addUser2() {
- if (this.ids.length === 0) {
+ if (this.multipleSelection.length === 0) {
return this.$message.error('璇烽�夋嫨浜哄憳')
}
if (this.currentCompaniesList.length === 0) {
@@ -654,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