From 03fd56d1a050b9ca6e795de15a4f48b50fe41aff Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 16 八月 2024 12:22:13 +0800
Subject: [PATCH] 修改流程卡打印样式
---
UI-Project/src/views/User/userlist.vue | 140 ++++++++++++++++++----------------------------
1 files changed, 55 insertions(+), 85 deletions(-)
diff --git a/UI-Project/src/views/User/userlist.vue b/UI-Project/src/views/User/userlist.vue
index da399b6..5d79a7b 100644
--- a/UI-Project/src/views/User/userlist.vue
+++ b/UI-Project/src/views/User/userlist.vue
@@ -5,7 +5,6 @@
const router = useRouter()
const add = ref(false)
const adda = ref(false)
-const editingUser = ref({}); // 鐢ㄤ簬瀛樺偍褰撳墠缂栬緫鐨勭敤鎴锋暟鎹�
import request from "@/utils/request"
import { ref, onMounted } from "vue";
// import { ref } from 'vue'
@@ -14,7 +13,7 @@
const { t } = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
// import LanguageMixin from './lang/LanguageMixin'
-const selectedProjectNoa = ref(''); // 褰撳墠閫変腑鐨勮鑹�
+const selectedProjectNoa = ref(null); // 褰撳墠閫変腑鐨勮鑹�
// const options = ref<any[]>([]); // 涓嬫媺閫夐」鍒楄〃
const userName = ref('');
const password = ref('');
@@ -86,7 +85,7 @@
const response = await request.post('/loadGlass/sys/role/queryRole',{
key: ''
});
- if (response.code == 200) {
+ if (response.code === 200) {
titleSelectJsona.value.processTypea = response.data;
console.log(response.data);
@@ -99,26 +98,54 @@
};
// 澶勭悊缂栬緫鎸夐挳鐐瑰嚮
function handleEdit(row) {
- editingUser.value = { ...row }; // 浣跨敤灞曞紑杩愮畻绗﹀鍒跺綋鍓嶈鏁版嵁
+ userName.value = row.userName;
+ if (row.roleList && row.roleList.length > 0) {
+ const firstRole = row.roleList[0];
+ selectedProjectNoa.value = firstRole.id; // 璁剧疆涓篒D锛岃�屼笉鏄痭ame
+ }
adda.value = true; // 鏄剧ず瀵硅瘽妗�
+ window.localStorage.setItem('id', row.id)
+
}
+
+function closeDialog(row) {
+ add.value = false;
+ userName.value = '';
+ nickName.value = '';
+ password.value = '';
+ selectedProjectNoa.value = '';
+}
+function closeDialoga(row) {
+ adda.value = false;
+ userName.value = '';
+ nickName.value = '';
+ password.value = '';
+}
// 娣诲姞
const getTableRow = async () => {
try {
const response = await request.post('/loadGlass/sys/user/saveUser', {
userName: userName.value,
+ nickName: userName.value,
password: password.value,
- name: selectedProjectNoa.value,
+ roleList: [
+ {
+ id: selectedProjectNoa.value,
+ // name: selectedProjectNoa.value.name,
+ }]
+ // roleList: selectedProjectNoa.value.map(item => ({
+ // id: item.id,
+ // name: item.name
+ // }))
});
-
- if (response.code == 200) {
+ if (response.code === 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
add.value = false;
- // tableData.value = response.data;
+ tableData.value = response.data;
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.msg);
+ ElMessage.error(response.message);
}
} catch (error) {
// 澶勭悊閿欒
@@ -127,22 +154,26 @@
};
// 缂栬緫
const getTableRowa = async () => {
+ let id = window.localStorage.getItem('id')
try {
const response = await request.post('/loadGlass/sys/user/updateUser', {
+ id: id,
userName: userName.value,
- password: password.value,
- name: selectedProjectNoa.value,
- });
-
- if (response.code == 200) {
+ roleList: [
+ {
+ id: selectedProjectNoa.value,
+ // roleKey: selectedProjectNoa.value.id,
+ }]
+ }
+ );
+ if (response.code === 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
- editingUser.value = {};
adda.value = false;
tableData.value = response.data;
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.msg);
+ ElMessage.error(response.message);
}
} catch (error) {
// 澶勭悊閿欒
@@ -163,9 +194,7 @@
);
if (confirmResult === 'confirm') {
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
- const response = await request.post("/loadGlass/sys/user/deleteUser", {
- ids: [row.id],
- })
+ const response = await request.post("/loadGlass/sys/user/deleteUser", [row.id])
if (response.code === 200) {
ElMessage.success(response.message);
} else {
@@ -180,44 +209,6 @@
}
};
-const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
- keepSource: true,//淇濇寔婧愭暟鎹�
- align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'OrderList',
- showFooter: true,//鏄剧ず鑴�
- printConfig: {},
- importConfig: {},
- exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
- showOverflow:true,
- columnConfig: {
- resizable: true,
- useKey: true
- },
- filterConfig: { //绛涢�夐厤缃」
- remote: true
- },
- customConfig: {
- storage: true
- },
- editConfig: {
- trigger: 'click',
- mode: 'row',
- showStatus: true
- },
- data: [
- {
- 'id': '1',
- 'long': '5',
- 'wide': '1005',
- 'thick': '183.6',
- }
- ]
-
-})
</script>
<template>
@@ -276,7 +267,7 @@
v-for="item in titleSelectJsona['processTypea']"
:key="item.id"
:label="item.name"
- :value="item.name"
+ :value="item.id"
/>
</el-select>
</el-form-item></div></div>
@@ -304,20 +295,20 @@
<el-button type="primary" @click="getTableRow">
{{ $t('productStock.sure') }}
</el-button>
- <el-button @click="add = false">{{ $t('productStock.cancel') }}</el-button>
+ <el-button @click="closeDialog">{{ $t('productStock.cancel') }}</el-button>
</div>
</template>
</el-dialog>
<el-dialog v-model="adda" top="23vh" width="37%" :title="$t('productStock.reusername')" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form :model="editingUser" ref="formRef" size="mini" label-width="150px">
+ <el-form ref="formRef" size="mini" label-width="150px">
<el-form label-width="100px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
<el-form-item :label="$t('productStock.usernamea')" :required="true" style="width: 25vw">
- <el-input :placeholder="$t('productStock.inusername')" v-model="editingUser.userName" autocomplete="off" />
+ <el-input :placeholder="$t('productStock.inusername')" v-model="userName" autocomplete="off" />
</el-form-item></div></div>
</el-col>
</el-row>
@@ -325,13 +316,6 @@
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <!-- <el-table-column align="center" label="瑙掕壊" min-width="80">
- <template #default="scope">
- <el-tag v-for="role in scope.row.roleList">
- {{role.name}}
- </el-tag>
- </template>
- </el-table-column> -->
<el-form-item :label="$t('productStock.rolea')" :required="true" style="width: 25vw;">
<el-select
v-model="selectedProjectNoa"
@@ -341,26 +325,12 @@
style="width: 330px"
>
<el-option
- v-for="item in titleSelectJsona['processTypea']"
+ v-for="item in titleSelectJsona['processTypea']"
:key="item.id"
:label="item.name"
- :value="item.name"
+ :value="item.id"
/>
</el-select>
- </el-form-item></div></div>
- </el-col>
- </el-row>
- <el-row style="margin-top: 10px;">
- <el-col :span="6">
- <div id="dt" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('productStock.password')" :required="true" style="width: 25vw;">
- <el-input style="width: 340px;"
- v-model="editingUser.password"
- :placeholder="$t('productStock.inpassword')"
- autocomplete="off"
- :prefix-icon="Lock"
- show-password/>
</el-form-item></div></div>
</el-col>
</el-row>
@@ -372,7 +342,7 @@
<el-button type="primary" @click="getTableRowa">
{{ $t('productStock.sure') }}
</el-button>
- <el-button @click="adda = false">{{ $t('productStock.cancel') }}</el-button>
+ <el-button @click="closeDialoga">{{ $t('productStock.cancel') }}</el-button>
</div>
</template>
</el-dialog>
--
Gitblit v1.8.0