From 8043f5f0d90a652e90532421aaf5c5145e03305c Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期三, 03 一月 2024 08:06:57 +0800
Subject: [PATCH] 代码更新

---
 jcdm-ui/src/views/main/da/passingStationCollection/index.vue |   56 ++++++++++++++++----------------------------------------
 1 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/jcdm-ui/src/views/main/da/passingStationCollection/index.vue b/jcdm-ui/src/views/main/da/passingStationCollection/index.vue
index 45658e5..facae08 100644
--- a/jcdm-ui/src/views/main/da/passingStationCollection/index.vue
+++ b/jcdm-ui/src/views/main/da/passingStationCollection/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <el-card class="box-card">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="鍏ョ珯鏃堕棿" prop="inboundTime">
         <el-date-picker clearable
@@ -17,12 +18,13 @@
           placeholder="璇烽�夋嫨鍑虹珯鏃堕棿">
         </el-date-picker>
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="float: right">
         <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-form-item>
     </el-form>
-
+    </el-card>
+    <el-card style="margin-top: 10px" class="box-card">
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -69,38 +71,19 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="passingStationCollectionList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="passingStationCollectionList" @selection-change="handleSelectionChange" v-if="passingStationCollectionList.length > 0">
       <el-table-column type="selection" width="55" align="center" />
-<!--      <el-table-column label="涓婚敭id" align="center" prop="id" />-->
       <el-table-column label="宸ュ崟缂栧彿" align="center" prop="workOrderNo">
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.workOrderNo"/>-->
-<!--        </template>-->
       </el-table-column>
       <el-table-column label="鎬绘垚搴忓垪鍙�" align="center" prop="sfcCode">
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.sfcCode"/>-->
-<!--        </template>-->
       </el-table-column>
       <el-table-column label="浜у搧缂栧彿" align="center" prop="productCode">
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.productCode"/>-->
-<!--        </template>-->
       </el-table-column>
       <el-table-column label="浜х嚎缂栧彿" align="center" prop="productionLine">
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.productionLine"/>-->
-<!--        </template>-->
       </el-table-column>
       <el-table-column label="宸ヤ綅缂栧彿" align="center" prop="locationCode">
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.locationCode"/>-->
-<!--        </template>-->
       </el-table-column>
       <el-table-column label="璁惧缂栧彿" align="center" prop="equipmentNo">
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.equipmentNo"/>-->
-<!--        </template>-->
       </el-table-column>
       <el-table-column label="鍏ョ珯鏃堕棿" align="center" prop="inboundTime" width="100">
         <template slot-scope="scope">
@@ -113,24 +96,12 @@
         </template>
       </el-table-column>
       <el-table-column label="鍏ョ珯鏄惁鍚堟牸" align="center" prop="inRsSign">
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.inRsSign"/>-->
-<!--        </template>-->
       </el-table-column>
       <el-table-column label="鍏ョ珯NG鍘熷洜" align="center" prop="inMsgSign">
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.inMsgSign"/>-->
-<!--        </template>-->
       </el-table-column>
       <el-table-column label="鍑虹珯鏄惁鍚堟牸" align="center" prop="outRsSign">
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.outRsSign"/>-->
-<!--        </template>-->
       </el-table-column>
       <el-table-column label="鍑虹珯NG鍘熷洜" align="center" prop="outMsgSign">
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.outMsgSign"/>-->
-<!--        </template>-->
       </el-table-column>
       <el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectionTime" width="180">
         <template slot-scope="scope">
@@ -138,22 +109,23 @@
         </template>
       </el-table-column>
       <el-table-column label="鑺傛媿鏃堕棿" align="center" prop="beatTime">
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.beatTime"/>-->
-<!--        </template>-->
       </el-table-column>
-      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+      <el-table-column fixed="right" label="鎿嶄綔" width="200" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
+            type="success"
+            plain
+            style="width: 72px"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['da:passingStationCollection:edit']"
           >淇敼</el-button>
           <el-button
             size="mini"
-            type="text"
+            type="danger"
+            plain
+            style="width: 72px"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['da:passingStationCollection:remove']"
@@ -161,6 +133,10 @@
         </template>
       </el-table-column>
     </el-table>
+      <el-empty v-else>
+        <span slot="description">鏆傛棤鏁版嵁</span>
+      </el-empty>
+    </el-card>
 
     <pagination
       v-show="total>0"

--
Gitblit v1.9.3