From a306b8a30765248e431aaf0f27dc55e3a182c9b5 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 23 十月 2023 15:13:54 +0800
Subject: [PATCH] 1.班组工资统计100% 2.人员工资统计100%
---
src/views/mouldManager/mouldList.vue | 260 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 208 insertions(+), 52 deletions(-)
diff --git a/src/views/mouldManager/mouldList.vue b/src/views/mouldManager/mouldList.vue
index 5517990..ff93538 100644
--- a/src/views/mouldManager/mouldList.vue
+++ b/src/views/mouldManager/mouldList.vue
@@ -3,8 +3,15 @@
<div class="body" :style="{height:mainHeight+'px'}">
<div class="bodyTopButtonGroup" style="justify-content: space-between">
<el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <el-button
+ v-waves
+ type="success"
+ icon="el-icon-download"
+ @click="$router.push('./../systemSetting/dataImport?fileCode=12')"
+ >瀵煎叆
+ </el-button>
<!-- <el-button v-waves type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>-->
- <!-- <el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>-->
+
</div>
<div class="bodyTopFormGroup">
@@ -27,7 +34,7 @@
</el-select>
</el-form-item>
<el-form-item label="浣跨敤鐘舵��" style=" display: flex;">
- <el-select v-model="form.onstate" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.usestatus" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in onstateArr"
:key="item.code"
@@ -118,16 +125,18 @@
sortable="custom"
>
<template slot-scope="{row}">
- {{ row.status === 'Y' ? '姝ｅ父' : '鏁呴殰' }}
+ <el-tag v-if="row.status==='Y'" size="small" type="success">姝ｅ父</el-tag>
+ <el-tag v-if="row.status==='N'" size="small" type="danger">鏁呴殰</el-tag>
</template>
</el-table-column>
<el-table-column
- prop="onstate"
+ prop="usestatus"
label="浣跨敤鐘舵��"
sortable="custom"
>
<template slot-scope="{row}">
- {{ onstateArr.find(i => parseFloat(i.code) === parseFloat(row.usestaus)).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
@@ -144,12 +153,20 @@
prop="spec"
label="瑙勬牸鍨嬪彿"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ {{ row.spec ? row.spec : '/' }}
+ </template>
+ </el-table-column>
<el-table-column
prop="warehousename"
label="浠撳簱鍚嶇О"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ {{ row.warehousename ? row.warehousename : '/' }}
+ </template>
+ </el-table-column>
<el-table-column
prop="surp_life"
label="棰勮瀵垮懡"
@@ -161,8 +178,21 @@
sortable="custom"
>
<template slot-scope="{row}">
- <el-tag v-if="row.is_part==='Y'" size="small" type="success">鏄�</el-tag>
- <el-tag v-if="row.is_part==='N'" size="small" type="danger">鍚�</el-tag>
+ <!-- <el-tag v-if="row.is_part==='Y'" size="small" type="success">鏄�</el-tag>-->
+ <!-- <el-tag v-if="row.is_part==='N'" size="small" type="danger">鍚�</el-tag>-->
+ <i
+ v-if="row.is_part==='Y'"
+ :style="{color:$store.state.settings.theme}"
+ class="el-icon-share"
+ style="cursor: pointer"
+ @click="connectClick(row)"
+ />
+ <i
+ v-if="row.is_part==='N'"
+ class="el-icon-share"
+ style="color: rgb(180 ,181, 185);cursor:pointer;"
+ @click="connectClick(row)"
+ />
</template>
</el-table-column>
<el-table-column
@@ -203,7 +233,7 @@
<i
class="el-icon-edit-outline"
:style="{color:$store.state.settings.theme}"
- @click="edit('edit',row)"
+ @click="edit(row)"
/>
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
@@ -228,17 +258,25 @@
<el-dialog
v-el-drag-dialog
- :title="operation==='add'?'鏂板':'缂栬緫'"
+ :title="operation==='add'?'鏂板':(operation==='edit'?'缂栬緫':'浜у搧鍏宠仈')"
:visible.sync="dialogVisible"
width="800px"
:close-on-click-modal="false"
- top="7vh"
+ :top="operation!=='connect'? '7vh':'15vh'"
class="dialogFormClass"
@closed="handleClose"
@close="handleClose"
>
- <el-form ref="dialogForm" class="" inline :rules="dialogFormRules" :model="dialogForm" label-width="110px">
+ <el-form
+ v-if="operation!=='connect'"
+ ref="dialogForm"
+ class=""
+ inline
+ :rules="dialogFormRules"
+ :model="dialogForm"
+ label-width="110px"
+ >
<el-divider content-position="left">鍩烘湰淇℃伅</el-divider>
<el-form-item label="妯″叿缂栫爜" prop="mouldcode">
<el-input v-model="dialogForm.mouldcode" :disabled="operation!=='add'" style="width: 200px" />
@@ -250,22 +288,29 @@
<el-input v-model="dialogForm.mouldspec" style="width: 200px" />
</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 required label="妯″叿鐘舵��">
+ <el-radio-group v-model="dialogForm.status">
+ <el-radio label="Y">姝ｅ父</el-radio>
+ <el-radio label="N">鏁呴殰</el-radio>
+ </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" />
@@ -274,14 +319,8 @@
<el-input v-model="dialogForm.resilife" style="width: 200px" />
</el-form-item>
- <el-form-item required label="浣跨敤鐘舵��">
- <el-radio-group v-model="dialogForm.status">
- <el-radio label="Y">姝ｅ父</el-radio>
- <el-radio label="N">鏁呴殰</el-radio>
- </el-radio-group>
- </el-form-item>
</el-form>
- <el-divider content-position="left">鍏宠仈浜у搧</el-divider>
+ <el-divider v-if="operation!=='connect'" content-position="left">鍏宠仈浜у搧</el-divider>
<el-input
v-model="filterText"
@@ -327,9 +366,10 @@
ProductionScheduleReportExcelSearch,
ProductionScheduleReportSearch
} from '@/api/ReportManager'
-import { MouldMangerSearch } from '@/api/MouldManager'
+import { AddUpdateMouldManger, DeleteMouldManger, MouldMangerSearch } from '@/api/MouldManager'
import { InventoryTreePermissions, WareHouse } from '@/api/GeneralBasicData'
import arrayToTree from 'array-to-tree'
+import { TCunstomerDelete } from '@/api/basicSettings'
export default {
name: 'Zzjg',
@@ -345,14 +385,14 @@
tableHeight: 0,
form: {
mouldstaus: '', // 妯″叿鐘舵��
- onstate: '', // 浣跨敤鐘舵��
+ usestatus: '', // 浣跨敤鐘舵��
mouldcode: '', // 妯″叿缂栫爜
mouldname: '', // 妯″叿鍚嶇О
mouldspec: '', // 妯″叿瑙勬牸鍨嬪彿
createuser: '', // 鍒涘缓浜哄憳
createdate: '', // 鍗曟嵁鏃ユ湡
- prop: 'code', // 鎺掑簭瀛楁
+ prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
@@ -367,8 +407,11 @@
{ code: 1, name: '鍑哄簱' },
{ code: 2, name: '涓婃満' },
{ code: 3, name: '涓嬫満' },
- { code: 4, name: '缁翠慨' },
- { code: 5, name: '澶栧��' }
+ { code: 4, name: '寰呯淮淇�' },
+ { code: 5, name: '宸茬淮淇�' },
+ { code: 6, name: '宸查獙璇�' },
+ { code: 7, name: '澶栧��' },
+ { code: 8, name: '褰掕繕' }
],
total: 10,
@@ -380,7 +423,7 @@
mouldcode: '',
mouldname: '',
mouldspec: '',
- warehousecode: '',
+ // warehousecode: '',
surplife: '',
resilife: '',
status: 'Y',
@@ -393,10 +436,10 @@
],
mouldname: [
{ required: true, message: '璇疯緭鍏ユā鍏峰悕绉�', trigger: ['blur', 'change'] }
- ],
- warehousecode: [
- { required: true, message: '璇疯緭鍏ラ�夋嫨浠撳簱淇℃伅', trigger: ['blur', 'change'] }
]
+ // warehousecode: [
+ // { required: true, message: '璇疯緭鍏ラ�夋嫨浠撳簱淇℃伅', trigger: ['blur', 'change'] }
+ // ]
},
filterText: '',
defaultProps: {
@@ -405,9 +448,9 @@
},
Inventory: [
- { code: '-1',
- name: '鍏ㄩ儴'
- }
+ // { code: '-1',
+ // name: '鍏ㄩ儴'
+ // }
],
wareHouseArr: []
@@ -430,13 +473,13 @@
this.getHeight()
},
methods: {
- async getInventoryTreePermissions() {
+ async getInventoryTreePermissions() {
const res = await InventoryTreePermissions()
res.data.forEach(i => {
i.name = i.code + ' ' + i.name
})
- this.Inventory = arrayToTree(this.Inventory.concat(res.data), {
+ this.Inventory = arrayToTree(res.data, {
parentProperty: 'parentid',
customID: 'code',
childrenProperty: 'children'
@@ -512,7 +555,7 @@
// 閲嶇疆
reset() {
this.form.mouldstaus = ''
- this.form.onstate = ''
+ this.form.usestatus = ''
this.form.mouldcode = ''
this.form.mouldname = ''
@@ -524,17 +567,130 @@
add() {
this.operation = 'add'
+ this.dialogForm.opertype = 'Add'
this.dialogVisible = true
},
+ edit(row) {
+ this.operation = 'edit'
+ this.dialogVisible = true
+ this.dialogForm.opertype = 'Update'
+ this.$nextTick(() => {
+ this.dialogForm.mouldcode = row.code
+ this.dialogForm.mouldname = row.name
+ this.dialogForm.mouldspec = row.spec
+ // this.dialogForm.warehousecode = row.warehousecode
+ this.dialogForm.surplife = row.surp_life
+ this.dialogForm.resilife = row.resi_life
+ this.dialogForm.status = row.status
+ this.dialogForm.mouldpart = row.partcode ? row.partcode.split(',') : []
+ this.$refs.tree.setCheckedKeys(this.dialogForm.mouldpart)
+ })
+ },
+ connectClick(row) {
+ this.operation = 'connect'
+ this.dialogVisible = true
+ this.dialogForm.opertype = 'Update'
+
+ this.$nextTick(() => {
+ this.dialogForm.mouldcode = row.code
+ this.dialogForm.mouldname = row.name
+ this.dialogForm.mouldspec = row.spec
+ // this.dialogForm.warehousecode = row.warehousecode
+ this.dialogForm.surplife = row.surp_life
+ this.dialogForm.resilife = row.resi_life
+ this.dialogForm.status = row.status
+ this.dialogForm.mouldpart = row.partcode ? row.partcode.split(',') : []
+ this.$refs.tree.setCheckedKeys(this.dialogForm.mouldpart)
+ })
+ },
+ del(row) {
+ this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ DeleteMouldManger({ mouldcode: row.code }).then(res => {
+ if (res.code === '200') {
+ this.$notify.success('鍒犻櫎鎴愬姛!')
+ this.getMouldMangerSearch()
+ }
+ })
+ }).catch(() => {
+ this.$notify.info('宸插彇娑堝垹闄�')
+ })
+ },
handleClose() {
-
+ this.dialogForm = {
+ mouldcode: '',
+ mouldname: '',
+ mouldspec: '',
+ // warehousecode: '',
+ surplife: '',
+ resilife: '',
+ status: 'Y',
+ mouldpart: '',
+ opertype: ''
+ }
+ if (this.operation !== 'connect') {
+ this.$refs.dialogForm.clearValidate()
+ }
},
dialogVisibleCancel() {
this.dialogVisible = false
},
dialogVisibleConfirm() {
- console.log(this.$refs.tree.getCheckedKeys())
+ if (this.operation !== 'connect') {
+ this.$refs.dialogForm.validate(valid => {
+ if (valid) {
+ const checkData = this.$refs.tree.getCheckedNodes()
+ this.dialogForm.mouldpart = []
+ checkData.forEach(item => {
+ if (!Object.keys(item).includes('children')) {
+ this.dialogForm.mouldpart.push(item.code)
+ }
+ })
+ // if (this.dialogForm.mouldpart.length === 0) {
+ // return this.$message.info('鍏宠仈浜у搧涓嶈兘涓虹┖锛�')
+ // }
+ this.$store.state.app.buttonIsDisabled = true
+ AddUpdateMouldManger(this.dialogForm).then(res => {
+ if (res.code === '200') {
+ this.$notify.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.$refs.tree.setCheckedKeys([])
+
+ this.dialogVisible = false
+ this.$store.state.app.buttonIsDisabled = false
+ this.getMouldMangerSearch()
+ } else {
+ this.$store.state.app.buttonIsDisabled = false
+ this.$notify.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
+ }
+ })
+ } else {
+ const checkData = this.$refs.tree.getCheckedNodes()
+ this.dialogForm.mouldpart = []
+ checkData.forEach(item => {
+ if (!Object.keys(item).includes('children')) {
+ this.dialogForm.mouldpart.push(item.code)
+ }
+ })
+ this.$store.state.app.buttonIsDisabled = true
+ AddUpdateMouldManger(this.dialogForm).then(res => {
+ if (res.code === '200') {
+ this.$notify.success('鍏宠仈鎴愬姛锛�')
+ this.$refs.tree.setCheckedKeys([])
+ this.dialogVisible = false
+ this.$store.state.app.buttonIsDisabled = false
+ this.getMouldMangerSearch()
+ } else {
+ this.$store.state.app.buttonIsDisabled = false
+ this.$notify.error('鍏宠仈澶辫触锛�')
+ }
+ })
+ }
},
filterNode(value, data) {
if (!value) return true
--
Gitblit v1.9.3