From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/resourceDemand/device/component/borrow.vue | 101 +++++++-------------------------------------------
1 files changed, 15 insertions(+), 86 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/borrow.vue b/src/views/CNAS/resourceDemand/device/component/borrow.vue
index a3e98ee..4898f5f 100644
--- a/src/views/CNAS/resourceDemand/device/component/borrow.vue
+++ b/src/views/CNAS/resourceDemand/device/component/borrow.vue
@@ -2,25 +2,24 @@
<template>
<div>
<div class="search">
- <div class="search_thing">
- <div class="search_label">娴佺▼缂栧彿锛�</div>
- <div><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.processNumber"
- @keyup.enter.native="refreshTable()"></el-input></div>
- </div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
- <div class="btns">
+ <el-form :model="queryParams" ref="queryParams" size="small" :inline="true">
+ <el-form-item label="娴佺▼缂栧彿">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.processNumber"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button size="mini" type="primary" @click="refreshTable()">鏌ヨ</el-button>
+ <el-button size="mini" @click="refresh()">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ <div>
<el-button size="small" type="primary" @click="add">鏂板</el-button>
<!-- <el-button size="small" type="primary" @click="handleDown" :loading="outLoading">瀵煎嚭</el-button>-->
</div>
</div>
- <div class="tables" style="margin-top: 10px;">
+ <div class="tables">
<lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 290px)'"
:page="page" @pagination="pagination"></lims-table>
- <!-- <ValueTable ref="ValueTable" :url="$api.deviceBorrow.deviceBorrowPage"
- :delUrl="$api.deviceBorrow.deleteDeviceBorrow" :componentData="componentData" :key="upIndex" /> -->
</div>
<el-dialog title="浠櫒璁惧棰�(鍊�)鐢ㄧ櫥璁�" top="5vh" :visible.sync="dialogVisible" width="60%">
<el-steps :active="currentStep" finish-status="success" align-center>
@@ -118,7 +117,6 @@
<el-col :span="12">
<el-form-item label="褰掕繕浜猴細" prop="rebackUser"
:rules="[{ required: currentStep === 1, message: '璇疯緭鍏ュ綊杩樹汉', trigger: 'change' }]">
- <!-- <el-input v-model="form.rebackUser" size="small" :disabled="currentStep !== 1"></el-input> -->
<el-select v-model="form.rebackUser" filterable placeholder="璇烽�夋嫨" clearable size="small"
style="width: 50%;" :disabled="currentStep !== 1">
<el-option v-for="item in responsibleOptions" :key="item.id" :label="item.name" :value="item.name">
@@ -147,7 +145,6 @@
<el-col :span="12">
<el-form-item label="璁惧璐熻矗浜猴細" prop="deviceUser"
:rules="[{ required: currentStep === 1, message: '璇烽�夋嫨璁惧璐熻矗浜�', trigger: 'change' }]">
- <!-- <el-input v-model="form.deviceUser" size="small" :disabled="currentStep !== 1"></el-input> -->
<el-select v-model="form.deviceUser" filterable placeholder="璇烽�夋嫨" clearable size="small"
style="width: 50%;" :disabled="currentStep !== 1">
<el-option v-for="item in responsibleOptions" :key="item.id" :label="item.name" :value="item.name">
@@ -160,7 +157,6 @@
<el-input type="textarea" v-model="form.note" :disabled="currentStep !== 1" size="small"></el-input>
</el-form-item>
</el-col>
-
</el-row>
</el-card>
<el-row style="margin-top: 1em;">
@@ -182,7 +178,7 @@
</span>
</el-dialog>
<el-dialog title="娴佺▼璺熻釜" top="5vh" :visible.sync="dialogVisible0" width="60%">
- <el-table :data="deviceLogs" style="width: 100%">
+ <el-table :data="deviceLogs" style="width: 100%" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column type="index" width="50">
</el-table-column>
<el-table-column prop="operator" label="鎿嶄綔浜�" width="180">
@@ -565,7 +561,6 @@
})
.then(() => {
deleteDeviceBorrow({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
@@ -577,76 +572,10 @@
</script>
<style scoped>
-h4 {
- font-weight: 400;
- font-size: 16px;
+.search {
+ height: 46px;
display: flex;
justify-content: space-between;
- margin: 10px 0;
-}
-
-h4 .line {
- display: inline-block;
- width: 3px;
- height: 16px;
- background: #3A7BFA;
- margin-right: 4px;
-}
-
-.tables {
- width: 100%;
- height: calc(100vh - 15em);
-}
-
-.search {
- background-color: #fff;
- display: flex;
- align-items: center;
- position: relative;
margin-top: 10px;
-}
-
-.search_thing {
- display: flex;
- align-items: center;
- height: 40px;
-}
-
-.search_label {
- width: 70px;
- font-size: 14px;
- text-align: right;
-}
-
-.search_input {
- width: calc(100% - 120px);
-}
-
-.btns {
- position: absolute;
- right: 0px;
- top: 50%;
- transform: translate(0, -50%);
-}
-
-.btns_thing {
- position: absolute;
- right: 230px;
- top: 50%;
- transform: translate(0, -50%);
-}
-
-.form .search_label {
- width: 120px;
-}
-
-.el-radio {
- margin-right: 10px;
-}
-
-.el-radio-group {
- width: 100%;
- display: flex;
- margin-top: 12px;
}
</style>
--
Gitblit v1.9.3