From 46528c3843ce67038ddb2e00dd3d3998c206a69e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 06 五月 2024 17:26:10 +0800
Subject: [PATCH] 1.递交
---
src/views/mouldManager/mouldList.vue | 309 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 272 insertions(+), 37 deletions(-)
diff --git a/src/views/mouldManager/mouldList.vue b/src/views/mouldManager/mouldList.vue
index ff93538..862ffc5 100644
--- a/src/views/mouldManager/mouldList.vue
+++ b/src/views/mouldManager/mouldList.vue
@@ -168,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="浜у搧鍏宠仈"
@@ -196,13 +200,21 @@
</template>
</el-table-column>
<el-table-column
+ prop="surp_life"
+ 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
@@ -238,6 +250,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>
@@ -295,28 +310,47 @@
</el-radio-group>
</el-form-item>
- <!-- <el-form-item label="浠撳簱淇℃伅" prop="warehousecode">-->
- <!-- <el-select-->
- <!-- v-model="dialogForm.warehousecode"-->
- <!-- style="width:200px"-->
- <!-- placeholder="璇烽�夋嫨"-->
- <!-- filterable-->
- <!-- :popper-append-to-body="false"-->
- <!-- >-->
- <!-- <el-option-->
- <!-- v-for="item in wareHouseArr"-->
- <!-- :key="item.code"-->
- <!-- :label="item.name"-->
- <!-- :value="item.code"-->
- <!-- />-->
- <!-- </el-select>-->
- <!-- </el-form-item>-->
-
- <el-form-item label="棰勮瀵垮懡">
- <el-input v-model="dialogForm.surplife" style="width: 200px" />
+ <el-form-item v-if="dialogForm.opertype==='Add'" prop="warehousecode" label="鎵�灞炰粨搴�">
+ <el-select
+ v-model="dialogForm.warehousecode"
+ style="width:200px"
+ placeholder="璇烽�夋嫨"
+ filterable
+ :popper-append-to-body="false"
+ @change="warehousecodeChange"
+ >
+ <el-option
+ v-for="item in wareHouseArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
</el-form-item>
- <el-form-item label="鍓╀綑瀵垮懡">
- <el-input v-model="dialogForm.resilife" style="width: 200px" />
+
+ <el-form-item v-if="dialogForm.opertype==='Add'" prop="location_code" label="鎵�灞炲簱浣�">
+ <el-select
+ v-model="dialogForm.location_code"
+ style="width:200px"
+ :disabled="dialogForm.warehousecode===''"
+ placeholder="璇烽�夋嫨"
+ filterable
+ :popper-append-to-body="false"
+ >
+ <el-option
+ v-for="item in locationArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+
+ <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-input v-model="dialogForm.resilife" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
</el-form-item>
</el-form>
@@ -354,20 +388,162 @@
</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="operusername"
+ 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"
+ />
+ <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>
</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 { InventoryTreePermissions, WareHouse } from '@/api/GeneralBasicData'
+import { AddUpdateMouldManger, DeleteMouldManger, MoldResumeSearch, MouldMangerSearch } from '@/api/MouldManager'
+import { InventoryTreePermissions, WareHouse, WareHouseSelectLocation } from '@/api/GeneralBasicData'
import arrayToTree from 'array-to-tree'
import { TCunstomerDelete } from '@/api/basicSettings'
@@ -423,7 +599,8 @@
mouldcode: '',
mouldname: '',
mouldspec: '',
- // warehousecode: '',
+ warehousecode: '', // 浠撳簱缂栫爜
+ location_code: '', // 搴撲綅缂栫爜
surplife: '',
resilife: '',
status: 'Y',
@@ -436,10 +613,13 @@
],
mouldname: [
{ required: true, message: '璇疯緭鍏ユā鍏峰悕绉�', trigger: ['blur', 'change'] }
+ ],
+ warehousecode: [
+ { required: true, message: '璇疯緭鍏ラ�夋嫨浠撳簱淇℃伅', trigger: ['blur', 'change'] }
+ ],
+ location_code: [
+ { required: true, message: '璇疯緭鍏ラ�夋嫨搴撲綅淇℃伅', trigger: ['blur', 'change'] }
]
- // warehousecode: [
- // { required: true, message: '璇疯緭鍏ラ�夋嫨浠撳簱淇℃伅', trigger: ['blur', 'change'] }
- // ]
},
filterText: '',
defaultProps: {
@@ -453,7 +633,17 @@
// }
],
- wareHouseArr: []
+ wareHouseArr: [], // 浠撳簱鏁扮粍
+ locationArr: [], // 搴撲綅鏁扮粍
+
+ dialogVisibleResume: false,
+ formResume: {
+ mouldcode: '',
+ page: 1,
+ rows: 20
+ },
+ tableResume: [],
+ totalResume: 10
}
},
@@ -564,7 +754,10 @@
this.form.createdate = ''
this.getMouldMangerSearch()
},
-
+ async warehousecodeChange(val) {
+ const { data: res } = await WareHouseSelectLocation({ warhousecode: val })
+ this.locationArr = res
+ },
add() {
this.operation = 'add'
this.dialogForm.opertype = 'Add'
@@ -579,7 +772,8 @@
this.dialogForm.mouldcode = row.code
this.dialogForm.mouldname = row.name
this.dialogForm.mouldspec = row.spec
- // this.dialogForm.warehousecode = row.warehousecode
+ this.dialogForm.warehousecode = row.warehousecode
+ this.dialogForm.location_code = row.location_code
this.dialogForm.surplife = row.surp_life
this.dialogForm.resilife = row.resi_life
this.dialogForm.status = row.status
@@ -620,12 +814,53 @@
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: '',
mouldname: '',
mouldspec: '',
- // warehousecode: '',
+ warehousecode: '',
+ location_code: '',
surplife: '',
resilife: '',
status: 'Y',
--
Gitblit v1.9.3