From b46bc2dba51a3885a68e4c58316b41a31ea16bb2 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 14 二月 2023 13:35:03 +0800
Subject: [PATCH] 1.存货档案修改

---
 src/views/scgl/gdplgb.vue |   70 +++++++++++++++++++++++++++--------
 1 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/src/views/scgl/gdplgb.vue b/src/views/scgl/gdplgb.vue
index 9cedb07..cf08a4e 100644
--- a/src/views/scgl/gdplgb.vue
+++ b/src/views/scgl/gdplgb.vue
@@ -2,8 +2,8 @@
   <div>
     <div class="body" :style="{height:mainHeight+'px'}">
       <div class="bodyTopButtonGroup" style="justify-content: space-between">
-        <el-button icon="el-icon-switch-button" @click="handleClose('close')">鎵归噺鍏冲崟</el-button>
-        <el-button icon="el-icon-switch-button" @click="handleClose('noClose')">鎵归噺鍙嶅叧鍗�</el-button>
+        <el-button v-waves icon="el-icon-switch-button" @click="handleClose('close')">鎵归噺鍏冲崟</el-button>
+        <el-button v-waves icon="el-icon-switch-button" @click="handleClose('noClose')">鎵归噺鍙嶅叧鍗�</el-button>
       </div>
 
       <div class="bodyTopFormGroup">
@@ -12,10 +12,10 @@
           :model="form"
           label-width="100px"
           inline
-          style="display: flex;justify-content: space-between"
+          style="display: flex;"
         >
           <div class="elForm">
-            <el-form-item label="宸ュ崟鐘舵��" label-width="70px" style=" display: flex;">
+            <el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">
               <el-input v-model="form.mesorderstus" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
@@ -34,7 +34,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-show="isExpandForm" label-width="70px" label="浜у搧缂栫爜" style=" display: flex;">
+            <el-form-item v-show="isExpandForm" label="浜у搧缂栫爜" style=" display: flex;">
               <el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
             </el-form-item>
             <el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
@@ -46,13 +46,13 @@
             <el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
               <el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
             </el-form-item>
-            <el-form-item v-show="isExpandForm" label-width="70px" label="鍒涘缓鏃堕棿" style=" display: flex;">
+            <el-form-item v-show="isExpandForm" label="鍒涘缓鏃堕棿" style=" display: flex;">
               <el-input v-model="form.createdate" style="width: 200px" placeholder="璇疯緭鍏�" />
             </el-form-item>
           </div>
-          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
-            <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
-            <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
+            <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
           </div>
         </el-form>
         <div
@@ -114,6 +114,7 @@
             fixed
           />
           <el-table-column
+            show-tooltip-when-overflow
             prop="status"
             label="璁㈠崟鐘舵��"
             sortable="custom"
@@ -123,6 +124,8 @@
               <div v-if="row.status==='NEW'">鏂板伐鍗�</div>
               <!--              <div v-if="row.status==='CREATING'">鎵ц涓�</div>-->
               <!--              <div v-if="row.status==='CREATED'">宸插叧闂�</div>-->
+              <div v-if="row.status==='NOSCHED'">鏈帓绋�</div>
+              <div v-if="row.status==='SCHED'">宸叉帓绋�</div>
               <div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
               <div v-if="row.status==='START'">寮�宸�</div>
               <div v-if="row.status==='CLOSED'">瀹屽伐</div>
@@ -130,6 +133,7 @@
           </el-table-column>
           <el-table-column
             prop="wo_code"
+            show-tooltip-when-overflow
             label="宸ュ崟缂栧彿"
             sortable="custom"
             min-width="160"
@@ -137,12 +141,19 @@
           <el-table-column
             prop="m_po"
             label="婧愬崟鍗曞彿"
+            show-tooltip-when-overflow
             sortable="custom"
             min-width="160"
-          />
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.m_po">{{ row.m_po }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="wotype"
             label="鍗曟嵁绫诲瀷"
+            show-tooltip-when-overflow
             sortable="custom"
             min-width="120"
           >
@@ -156,18 +167,21 @@
             prop="partcode"
             label="浜у搧缂栫爜"
             sortable="custom"
+            show-tooltip-when-overflow
             min-width="120"
           />
           <el-table-column
             prop="partname"
             min-width="150"
             label="浜у搧鍚嶇О"
+            show-tooltip-when-overflow
             sortable="custom"
           />
           <el-table-column
             prop="partspec"
             label="浜у搧瑙勬牸"
             sortable="custom"
+            show-tooltip-when-overflow
             width="110"
           >
             <template slot-scope="{row}">
@@ -179,28 +193,48 @@
             prop="plan_qty"
             label="浠诲姟鏁伴噺"
             sortable="custom"
+            show-tooltip-when-overflow
             width="110"
           />
           <el-table-column
             prop="good_qty"
             label="鍚堟牸鏁伴噺"
+            show-tooltip-when-overflow
             sortable="custom"
             width="110"
-          />
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.good_qty">{{ row.good_qty }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="ng_qty"
             label="涓嶈壇鏁伴噺"
+            show-tooltip-when-overflow
             sortable="custom"
             width="110"
-          />
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.ng_qty">{{ row.ng_qty }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="bad_qty"
             label="鎶ュ簾鏁伴噺"
+            show-tooltip-when-overflow
             sortable="custom"
             width="110"
-          />
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.bad_qty">{{ row.bad_qty }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="wkshp_name"
+            show-tooltip-when-overflow
             label="鐢熶骇杞﹂棿"
             sortable="custom"
             width="120"
@@ -235,6 +269,7 @@
           <el-table-column
             prop="plan_startdate"
             label="璁″垝寮�濮嬫椂闂�"
+            show-tooltip-when-overflow
             sortable="custom"
             width="160"
           >
@@ -248,6 +283,7 @@
             label="璁″垝缁撴潫鏃堕棿"
             sortable="custom"
             width="160"
+            show-tooltip-when-overflow
           >
             <template slot-scope="{row}">
               <div v-if="row.plan_enddate">{{ row.plan_enddate }}</div>
@@ -258,6 +294,7 @@
             prop="piroque"
             label="宸ュ崟绛夌骇"
             sortable="custom"
+            show-tooltip-when-overflow
             width="120"
           >
             <template slot-scope="{row}">
@@ -270,11 +307,13 @@
           <el-table-column
             prop="lm_user"
             label="鍒涘缓浜哄憳"
+            show-tooltip-when-overflow
             sortable="custom"
             width="120"
           />
           <el-table-column
             prop="lm_date"
+            show-tooltip-when-overflow
             label="鍒涘缓鏃堕棿"
             width="160"
             sortable="custom"
@@ -328,17 +367,16 @@
 
 <script>
 import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
 import ImportPicker from '@/components/ImportPicker'
-import { validateCode } from '@/utils/global'
 import { MesOrderBitchAntiClosedSeave, MesOrderBitchClosedSearch, MesOrderBitchClosedSeave } from '@/api/scgl'
+import waves from '@/directive/waves'
 
 export default {
   name: 'Zzjg',
   components: {
     Pagination, ImportPicker
   },
+  directives: { waves },
   data() {
     return {
       mouseHoverType: 'mouseout',

--
Gitblit v1.9.3