From bd6229ebd9cb543a22944ecb1142fad92b675dce Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 13 十月 2025 14:26:25 +0800
Subject: [PATCH] bug 修复
---
admin/src/views/business/receiveWeight.vue | 73 ++++++++----------------------------
1 files changed, 16 insertions(+), 57 deletions(-)
diff --git a/admin/src/views/business/receiveWeight.vue b/admin/src/views/business/receiveWeight.vue
index 07f7dd6..5168e36 100644
--- a/admin/src/views/business/receiveWeight.vue
+++ b/admin/src/views/business/receiveWeight.vue
@@ -1,51 +1,5 @@
<template>
<TableLayout :permissions="['business:receiveweight:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="涓婚敭" prop="id">
- <el-input v-model="searchForm.id" placeholder="璇疯緭鍏ヤ富閿�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�" prop="deleted">
- <el-input v-model="searchForm.deleted" placeholder="璇疯緭鍏ユ槸鍚﹀凡鍒犻櫎 0鏈垹闄� 1宸插垹闄�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鐘舵��:0=鍚敤锛�1=绂佺敤锛�" prop="status">
- <el-input v-model="searchForm.status" placeholder="璇疯緭鍏ョ姸鎬�:0=鍚敤锛�1=绂佺敤锛�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="createUser">
- <el-input v-model="searchForm.createUser" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createTime">
- <el-date-picker v-model="searchForm.createTime" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="updateUser">
- <el-input v-model="searchForm.updateUser" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="updateTime">
- <el-date-picker v-model="searchForm.updateTime" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="searchForm.remark" placeholder="璇疯緭鍏ュ娉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏈�澶ф帴鍗曢噺" prop="receiveMax">
- <el-input v-model="searchForm.receiveMax" placeholder="璇疯緭鍏ユ渶澶ф帴鍗曢噺" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏈�灏忔帴鍗曢噺" prop="receiveMin">
- <el-input v-model="searchForm.receiveMin" placeholder="璇疯緭鍏ユ渶灏忔帴鍗曢噺" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="浼樺厛绾�" prop="level">
- <el-input v-model="searchForm.level" placeholder="璇疯緭鍏ヤ紭鍏堢骇" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="璁㈠崟鏌ョ湅寤惰繜鏃堕棿" prop="delayTime">
- <el-input v-model="searchForm.delayTime" placeholder="璇疯緭鍏ヨ鍗曟煡鐪嬪欢杩熸椂闂�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="searchForm.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:receiveweight:create', 'business:receiveweight:delete']">
@@ -53,25 +7,30 @@
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:receiveweight:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
+ :height="tableHeightNew"
v-loading="isWorking.search"
:data="tableData.list"
stripe
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="id" label="涓婚敭" min-width="100px"></el-table-column>
- <el-table-column prop="deleted" label="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�" min-width="100px"></el-table-column>
- <el-table-column prop="status" label="鐘舵��:0=鍚敤锛�1=绂佺敤锛�" min-width="100px"></el-table-column>
- <el-table-column prop="createUser" label="鍒涘缓浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="updateUser" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="updateTime" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="receiveMax" label="鏈�澶ф帴鍗曢噺" min-width="100px"></el-table-column>
- <el-table-column prop="receiveMin" label="鏈�灏忔帴鍗曢噺" min-width="100px"></el-table-column>
+ <el-table-column prop="receiveMax" label="鏈�澶ф帴鍗曢噺" min-width="100px">
+ <template slot-scope="{row}">
+ {{row.receiveMin||0}}{{' - '}}{{row.receiveMax||0}}
+ </template>
+ </el-table-column>
+<!-- <el-table-column label="鐘舵��">
+ <template slot-scope="{row}">
+ <el-switch :disabled="row.isFixed ==1" @change="changeStatus($event, row)" v-model="row.status" active-color="#13ce66"
+ inactive-color="#ff4949" :active-value="0" :inactive-value="1">
+ </el-switch>
+ </template>
+ </el-table-column>-->
<el-table-column prop="level" label="浼樺厛绾�" min-width="100px"></el-table-column>
<el-table-column prop="delayTime" label="璁㈠崟鏌ョ湅寤惰繜鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
+ <el-table-column prop="updateUserName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="updateTime" label="鏈�杩戞搷浣滄椂闂�" min-width="150px"></el-table-column>
+ <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:receiveweight:update', 'business:receiveweight:delete'])"
label="鎿嶄綔"
--
Gitblit v1.9.3