From 2c65c31aceb16c1d06c692266e3fb555ecafdfb5 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期三, 23 十月 2024 09:10:47 +0800
Subject: [PATCH] change-4

---
 jcdm-ui/src/views/main/da/passingStationCollection/index.vue |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/jcdm-ui/src/views/main/da/passingStationCollection/index.vue b/jcdm-ui/src/views/main/da/passingStationCollection/index.vue
index 693da8f..aa2c646 100644
--- a/jcdm-ui/src/views/main/da/passingStationCollection/index.vue
+++ b/jcdm-ui/src/views/main/da/passingStationCollection/index.vue
@@ -76,14 +76,14 @@
 
     <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="宸ュ崟缂栧彿" align="center" prop="workOrderNo">
+      <el-table-column label="宸ュ崟缂栧彿" align="center" width="150" prop="workOrderNo">
       </el-table-column>
       <el-table-column label="鍙戝姩鏈虹紪鐮�" align="center" prop="sfcCode" width="150">
       </el-table-column>
       <el-table-column label="浜у搧缂栧彿" align="center" prop="productCode">
       </el-table-column>
-      <el-table-column label="浜х嚎缂栧彿" align="center" prop="productionLine">
-      </el-table-column>
+<!--      <el-table-column label="浜х嚎缂栧彿" align="center" prop="productionLine">-->
+<!--      </el-table-column>-->
       <el-table-column label="宸ヤ綅缂栧彿" align="center" prop="locationCode">
       </el-table-column>
       <el-table-column label="鍏ョ珯鏃堕棿" align="center" prop="inboundTime" width="160">
@@ -99,8 +99,8 @@
 
       <el-table-column label="鏄惁鍚堟牸" align="center" prop="outRsSign">
       </el-table-column>
-      <el-table-column label="NG鍘熷洜" align="center" prop="outMsgSign">
-      </el-table-column>
+<!--      <el-table-column label="NG鍘熷洜" align="center" prop="outMsgSign">-->
+<!--      </el-table-column>-->
       <el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectionTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -156,15 +156,15 @@
         <el-form-item label="浜у搧缂栧彿" prop="productCode">
           <el-input v-model="form.productCode" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
         </el-form-item>
-        <el-form-item label="浜х嚎缂栧彿" prop="productionLine">
-          <el-input v-model="form.productionLine" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
-        </el-form-item>
+<!--        <el-form-item label="浜х嚎缂栧彿" prop="productionLine">-->
+<!--          <el-input v-model="form.productionLine" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
+<!--        </el-form-item>-->
         <el-form-item label="宸ヤ綅缂栧彿" prop="locationCode">
           <el-input v-model="form.locationCode" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
         </el-form-item>
-        <el-form-item label="璁惧缂栧彿" prop="equipmentNo">
-          <el-input v-model="form.equipmentNo" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
-        </el-form-item>
+<!--        <el-form-item label="璁惧缂栧彿" prop="equipmentNo">-->
+<!--          <el-input v-model="form.equipmentNo" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
+<!--        </el-form-item>-->
         <el-form-item label="鍏ョ珯鏃堕棿" prop="inboundTime">
           <el-date-picker clearable
             v-model="form.inboundTime"
@@ -184,9 +184,9 @@
         <el-form-item label="鏄惁鍚堟牸" prop="outRsSign">
           <el-input v-model="form.outRsSign" placeholder="璇疯緭鍏ュ嚭绔欐槸鍚﹀悎鏍�" />
         </el-form-item>
-        <el-form-item label="NG鍘熷洜" prop="outMsgSign">
-          <el-input v-model="form.outMsgSign" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
-        </el-form-item>
+<!--        <el-form-item label="NG鍘熷洜" prop="outMsgSign">-->
+<!--          <el-input v-model="form.outMsgSign" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
+<!--        </el-form-item>-->
         <el-form-item label="閲囬泦鏃堕棿" prop="collectionTime">
           <el-date-picker clearable
             v-model="form.collectionTime"
@@ -209,6 +209,9 @@
 
 <script>
 import { listPassingStationCollection, getPassingStationCollection, delPassingStationCollection, addPassingStationCollection, updatePassingStationCollection } from "@/api/main/da/passingStationCollection/passingStationCollection";
+import {
+  selectDaPassingStationCollectionForSearch
+} from "../../../../api/main/da/passingStationCollection/passingStationCollection";
 
 export default {
   name: "PassingStationCollection",
@@ -262,7 +265,7 @@
     /** 鏌ヨ浜у搧杩囩珯閲囬泦鍒楄〃 */
     getList() {
       this.loading = true;
-      listPassingStationCollection(this.queryParams).then(response => {
+      selectDaPassingStationCollectionForSearch(this.queryParams).then(response => {
         this.passingStationCollectionList = response.rows;
         this.total = response.total;
         this.loading = false;

--
Gitblit v1.9.3