From 45c8c0e59828fbcd8fac4a4bb75a551145e8094e Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 30 十一月 2023 15:20:16 +0800
Subject: [PATCH] 	modified:   src/views/plan/productionschedul/index.vue

---
 src/views/product/workbench/feed-pane.vue |   32 +++++++++++++++-----------------
 1 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/views/product/workbench/feed-pane.vue b/src/views/product/workbench/feed-pane.vue
index 3dd5b5f..743e9a2 100644
--- a/src/views/product/workbench/feed-pane.vue
+++ b/src/views/product/workbench/feed-pane.vue
@@ -144,14 +144,14 @@
             ><span style="font-size:14px;font-weight:bold">绾胯竟浠撳悎鏍肩墿鏂�</span>
           </div>
           <div>
-            <el-button
+            <!-- <el-button
               v-if="permissions.product_feed_scan"
               class="feeding-btn"
               type="primary"
               icon="feed-btn-feeding"
               @click="scanAddFeed()"
               >鎵爜鎶曟枡</el-button
-            >
+            > -->
             <el-button
               class="feeding-btn"
               type="primary"
@@ -229,16 +229,16 @@
             </template>
           </el-table-column> -->
           <el-table-column
-            label="闆朵欢鎻忚堪"
-            prop="partDescription"
+            label="闆朵欢"
+            prop="partName"
             align="center" show-overflow-tooltip
           >
             <template slot="header">
-              <div style="line-height: 14px;">闆朵欢鎻忚堪</div>
+              <div style="line-height: 14px;">闆朵欢</div>
               <div class="th" @click.stop>
                 <el-input
                   type="text"
-                  v-model="queryParamTwo.partDescription"
+                  v-model="queryParamTwo.partName"
                   @keyup.enter.native="handleStockList"
                   clearable
                   @clear="handleStockList"
@@ -247,7 +247,7 @@
               </div>
             </template>
             <template slot-scope="scope">
-              <span>{{ scope.row.partDescription }}</span>
+              <span>{{ scope.row.partName }}</span>
             </template>
           </el-table-column>
           <el-table-column label="IFS鎵规鍙�" prop="ifsBatchNo" align="center">
@@ -1130,7 +1130,7 @@
         ><span style="font-size:14px;font-weight:bold">宸叉姇鍏ユ湭娑堣�楃墿鏂�</span>
       </div>
       <div>
-				<el-button
+				<!-- <el-button
 				  class="return-btn"
 				  type="primary"
 				  @click="submitIns()"
@@ -1141,7 +1141,7 @@
 				  type="primary"
 				  @click="inputHandle()"
 				  >灏炬枡澶勭悊</el-button
-				>
+				> -->
         <el-button
           class="return-btn"
           type="primary"
@@ -1202,7 +1202,7 @@
         :show-overflow-tooltip="true"
       >
         <template slot="header" slot-scope="scope">
-          <div style="line-height: 14px;">闆朵欢鎻忚堪</div>
+          <div style="line-height: 14px;">闆朵欢</div>
           <div class="th" @click.stop>
             <el-input
               type="text"
@@ -1487,11 +1487,11 @@
 </template>
 
 <script>
-import { getStock, getFeed, getTodoStock, submitInsPart, inputHandle } from '@/api/product/personboard'
+import { getStock, getFeed,getFeed2, getTodoStock, submitInsPart, inputHandle } from '@/api/product/personboard'
 import { getMaterial } from '@/api/plan/operationtask'
 import {
   getERPStockListByPart,
-  fetchList
+  fetchList,
 } from '@/api/warehouse/joinstockorder'
 import feedFormDialog from './feed-form'
 import returnMaterialFormDialog from './returnmaterial-form'
@@ -1814,7 +1814,7 @@
           this.paramObject,
           this.queryParamThree
         )
-        getFeed(query, stationId)
+        getFeed2(query, stationId)
           .then((response) => {
             var data = response.data
             if (data.code === 0) {
@@ -2035,8 +2035,7 @@
       getERPStockListByPart({
         partNo: part.partNo,
         partBatchNo: part.partBatchNo
-      })
-        .then((resp) => {
+      }).then((resp) => {
           const respCode = resp.data.code
           const respData = resp.data.data
           if (respCode === 0) {
@@ -2045,8 +2044,7 @@
             this.isSubmit = false
             this.$message.error('搴撳瓨鍒楄〃鏌ヨ澶辫触')
           }
-        })
-        .catch(() => {
+        }).catch(() => {
           this.isSubmit = false
           console.log('鏌ヨ闆朵欢瀵瑰簲鐨勫簱瀛樺垪琛ㄦ椂锛屽彂鐢熼敊璇�')
         })

--
Gitblit v1.9.3