From 0dd0bf217772b61681f8a24d277305af97d561a2 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 08 一月 2024 11:05:48 +0800
Subject: [PATCH] 1.导入问题修改

---
 src/views/mouldManager/mouldList.vue |   38 ++++++++++++++++++++++++++------------
 1 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/views/mouldManager/mouldList.vue b/src/views/mouldManager/mouldList.vue
index 6d79533..78768ee 100644
--- a/src/views/mouldManager/mouldList.vue
+++ b/src/views/mouldManager/mouldList.vue
@@ -201,17 +201,20 @@
           </el-table-column>
           <el-table-column
             prop="surp_life"
-            label="棰勮瀵垮懡"
+            label="棰勮瀵垮懡(娆�)"
+            width="125"
             sortable="custom"
           />
           <el-table-column
             prop="serlife"
-            label="浣跨敤瀵垮懡"
+            label="浣跨敤瀵垮懡(娆�)"
+            width="125"
             sortable="custom"
           />
           <el-table-column
             prop="resi_life"
-            label="鍓╀綑瀵垮懡"
+            label="鍓╀綑瀵垮懡(娆�)"
+            width="125"
             sortable="custom"
           />
           <el-table-column
@@ -324,10 +327,10 @@
         <!--          </el-select>-->
         <!--        </el-form-item>-->
 
-        <el-form-item label="棰勮瀵垮懡">
+        <el-form-item label="棰勮瀵垮懡(娆�)">
           <el-input v-model="dialogForm.surplife" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
         </el-form-item>
-        <el-form-item label="鍓╀綑瀵垮懡">
+        <el-form-item label="鍓╀綑瀵垮懡(娆�)">
           <el-input v-model="dialogForm.resilife" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
         </el-form-item>
 
@@ -418,13 +421,13 @@
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label">
-            棰勮瀵垮懡(灏忔椂)
+            棰勮瀵垮懡(娆�)
           </template>
           {{ formResume.surp_life }}
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label">
-            鍓╀綑瀵垮懡(灏忔椂)
+            鍓╀綑瀵垮懡(娆�)
           </template>
           {{ formResume.serlife }}
         </el-descriptions-item>
@@ -469,7 +472,7 @@
           />
 
           <el-table-column
-            prop="operuser"
+            prop="operusername"
             label="鎿嶄綔浜哄憳"
           />
 
@@ -494,7 +497,18 @@
         popper-class="select_bottom"
         @pagination="getMoldResumeSearch"
       />
-
+      <span slot="footer" class="dialog-footer">
+        <div class="footerButton">
+          <el-button v-waves @click="dialogVisibleResume=false">杩� 鍥�</el-button>
+          <!--          <el-button-->
+          <!--            v-waves-->
+          <!--            type="primary"-->
+          <!--            :loading="$store.state.app.buttonIsDisabled"-->
+          <!--            :disabled="$store.state.app.buttonIsDisabled"-->
+          <!--            @click="dialogVisibleConfirm"-->
+          <!--          >纭� 瀹�</el-button>-->
+        </div>
+      </span>
     </el-dialog>
 
   </div>
@@ -502,7 +516,7 @@
 
 <script>
 import Pagination from '@/components/Pagination'
-import { handleDatetime, validateCode } from '@/utils/global'
+import { handleDatetime, handleDatetime2, validateCode } from '@/utils/global'
 import elDragDialog from '@/directive/el-drag-dialog'
 import waves from '@/directive/waves'
 import {
@@ -778,10 +792,10 @@
       this.formResume.mouldcode = row.code
       this.formResume.mouldname = row.name
       this.formResume.mouldspec = row.spec
-      this.formResume.username = row.username
+      this.formResume.username = localStorage.getItem('username')
       this.formResume.surp_life = row.surp_life
       this.formResume.serlife = row.serlife
-      this.formResume.lm_date = row.lm_date
+      this.formResume.lm_date = handleDatetime2(new Date())
       this.formResume.status = row.status
       this.formResume.usestatus = row.usestatus
 

--
Gitblit v1.9.3