From b8aeb6cdac40fceb04a22c3a5c70275e92898bb2 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 22 十二月 2023 10:49:05 +0800
Subject: [PATCH] 1.递交
---
src/views/mouldManager/mouldList.vue | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 204 insertions(+), 11 deletions(-)
diff --git a/src/views/mouldManager/mouldList.vue b/src/views/mouldManager/mouldList.vue
index 6bbe285..b7b3245 100644
--- a/src/views/mouldManager/mouldList.vue
+++ b/src/views/mouldManager/mouldList.vue
@@ -135,7 +135,8 @@
sortable="custom"
>
<template slot-scope="{row}">
- {{ onstateArr.find(i => parseFloat(i.code) === parseFloat(row.usestatus)).name }}
+ {{ row.usestatus?onstateArr.find(i => parseFloat(i.code) === parseFloat(row.usestatus)).name:'/' }}
+ <!-- {{ onstateArr.find(i => parseFloat(i.code) === parseFloat(row.usestatus)).name }}-->
</template>
</el-table-column>
<el-table-column
@@ -167,10 +168,14 @@
</template>
</el-table-column>
<el-table-column
- prop="surp_life"
- label="棰勮瀵垮懡"
+ prop="location_name"
+ label="搴撲綅鍚嶇О"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ {{ row.location_name ? row.location_name : '/' }}
+ </template>
+ </el-table-column>
<el-table-column
prop="is_part"
label="浜у搧鍏宠仈"
@@ -194,6 +199,11 @@
/>
</template>
</el-table-column>
+ <el-table-column
+ prop="surp_life"
+ label="棰勮瀵垮懡"
+ sortable="custom"
+ />
<el-table-column
prop="serlife"
label="浣跨敤瀵垮懡"
@@ -237,6 +247,9 @@
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
<i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click="del(row)" />
+ </el-tooltip>
+ <el-tooltip class="item" effect="dark" content="灞ュ巻" placement="top">
+ <i class="el-icon-view" :style="{color:$store.state.settings.theme}" style="cursor: pointer" @click="view(row)" />
</el-tooltip>
</div>
</template>
@@ -287,7 +300,7 @@
<el-input v-model="dialogForm.mouldspec" style="width: 200px" />
</el-form-item>
- <el-form-item required label="浣跨敤鐘舵��">
+ <el-form-item required label="妯″叿鐘舵��">
<el-radio-group v-model="dialogForm.status">
<el-radio label="Y">姝ｅ父</el-radio>
<el-radio label="N">鏁呴殰</el-radio>
@@ -312,10 +325,10 @@
<!-- </el-form-item>-->
<el-form-item label="棰勮瀵垮懡">
- <el-input v-model="dialogForm.surplife" style="width: 200px" />
+ <el-input v-model="dialogForm.surplife" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
</el-form-item>
<el-form-item label="鍓╀綑瀵垮懡">
- <el-input v-model="dialogForm.resilife" style="width: 200px" />
+ <el-input v-model="dialogForm.resilife" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
</el-form-item>
</el-form>
@@ -353,19 +366,150 @@
</span>
</el-dialog>
+ <el-dialog
+ v-el-drag-dialog
+ title="灞ュ巻鏌ョ湅"
+ :visible.sync="dialogVisibleResume"
+ width="1000px"
+ :close-on-click-modal="false"
+ top="7vh"
+ class="dialogFormClass"
+ @closed="handleCloseResume"
+ >
+ <div style="display: flex;justify-content: center;font-size: 18px;font-weight: bolder">妯″叿鍦ㄧ嚎淇℃伅鏌ヨ</div>
+ <el-descriptions class="margin-top" title=" " :column="3" size="size" border>
+ <!-- <template slot="extra">-->
+ <!-- <el-button type="primary" size="small">鎿嶄綔</el-button>-->
+ <!-- </template>-->
+ <el-descriptions-item>
+ <template slot="label">
+ <!-- <i class="el-icon-user" />-->
+ 妯″叿缂栫爜
+ </template>
+ {{ formResume.mouldcode }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 妯″叿鍚嶇О
+ </template>
+ {{ formResume.mouldname }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 瑙勬牸鍨嬪彿
+ </template>
+ {{ formResume.mouldspec||'/' }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 妯″叿鐘舵��
+ </template>
+ <!-- {{ formResume.status ==='Y'?'姝ｅ父':'寮傚父' }}-->
+ <el-tag v-if="formResume.status==='Y'" size="small" type="success">姝ｅ父</el-tag>
+ <el-tag v-if="formResume.status==='N'" size="small" type="danger">鏁呴殰</el-tag>
+
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 浣跨敤鐘舵��
+ </template>
+ <!-- {{ formResume.usestatus }}-->
+ {{ formResume.usestatus?onstateArr.find(i => parseFloat(i.code) === parseFloat(formResume.usestatus)).name:'/' }}
+ </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>
+ <el-descriptions-item>
+ <template slot="label">
+ 鏌ョ湅浜哄憳
+ </template>
+ {{ formResume.username }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 鏌ョ湅鏃堕棿
+ </template>
+ {{ formResume.lm_date }}
+ </el-descriptions-item>
+ </el-descriptions>
+
+ <div style="display: flex;justify-content: center;font-size: 18px;font-weight: bolder;margin: 20px 0">妯″叿娴佽浆璁板綍</div>
+
+ <div class="elTableDiv">
+ <el-table
+ ref="tableDataRef2"
+ class="tableFixed"
+ :data="tableResume"
+ height="370px"
+ border
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:'370px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ >
+ <el-table-column
+ prop="rowNum"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="opertype"
+ label="鎿嶄綔绫诲瀷"
+ />
+
+ <el-table-column
+ prop="operuser"
+ label="鎿嶄綔浜哄憳"
+ />
+
+ <el-table-column
+ prop="operdate"
+ label="鎿嶄綔鏃堕棿"
+ />
+ <el-table-column
+ prop="opertype"
+ label="缁撴灉/瀵硅薄"
+ />
+
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="totalResume"
+ :page.sync="formResume.page"
+ :limit.sync="formResume.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getMoldResumeSearch"
+ />
+
+ </el-dialog>
+
</div>
</template>
<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 {
ProductionScheduleReportExcelSearch,
ProductionScheduleReportSearch
} from '@/api/ReportManager'
-import { AddUpdateMouldManger, DeleteMouldManger, MouldMangerSearch } from '@/api/MouldManager'
+import { AddUpdateMouldManger, DeleteMouldManger, MoldResumeSearch, MouldMangerSearch } from '@/api/MouldManager'
import { InventoryTreePermissions, WareHouse } from '@/api/GeneralBasicData'
import arrayToTree from 'array-to-tree'
import { TCunstomerDelete } from '@/api/basicSettings'
@@ -391,7 +535,7 @@
createuser: '', // 鍒涘缓浜哄憳
createdate: '', // 鍗曟嵁鏃ユ湡
- prop: 'code', // 鎺掑簭瀛楁
+ prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
@@ -452,7 +596,16 @@
// }
],
- wareHouseArr: []
+ wareHouseArr: [],
+
+ dialogVisibleResume: false,
+ formResume: {
+ mouldcode: '',
+ page: 1,
+ rows: 20
+ },
+ tableResume: [],
+ totalResume: 10
}
},
@@ -619,6 +772,46 @@
this.$notify.info('宸插彇娑堝垹闄�')
})
},
+
+ // 灞ュ巻
+ async view(row) {
+ this.formResume.mouldcode = row.code
+ this.formResume.mouldname = row.name
+ this.formResume.mouldspec = row.spec
+ this.formResume.username = localStorage.getItem('username')
+ this.formResume.surp_life = row.surp_life
+ this.formResume.serlife = row.serlife
+ this.formResume.lm_date = handleDatetime2(new Date())
+ this.formResume.status = row.status
+ this.formResume.usestatus = row.usestatus
+
+ await this.getMoldResumeSearch()
+ this.dialogVisibleResume = true
+ this.$nextTick(() => {
+ this.$refs.tableDataRef2.doLayout()
+ })
+ },
+ async getMoldResumeSearch() {
+ const data = {
+ mouldcode: this.formResume.mouldcode,
+ createdate: '',
+ page: this.formResume.page,
+ rows: this.formResume.rows,
+ prop: 'operdate',
+ order: 'desc'
+ }
+ const res = await MoldResumeSearch(data)
+
+ if (res.code === '200') {
+ this.tableResume = res.data
+ this.totalResume = res.count
+ }
+ },
+
+ handleCloseResume() {
+ this.tableResume = []
+ },
+
handleClose() {
this.dialogForm = {
mouldcode: '',
--
Gitblit v1.9.3