From 4008d83696a6998ce987133ae2d2b0ec912cf178 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期日, 07 四月 2024 09:40:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue | 241 +++++++++++++++++++++++++-----------------------
1 files changed, 125 insertions(+), 116 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
index 76916e1..f18bce5 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
@@ -1,20 +1,38 @@
<script setup>
import {reactive, ref} from "vue";
-import {useRouter} from 'vue-router'
-let router=useRouter()
-const getTableRow = (row,type) =>{
+import {useRouter} from 'vue-router'
+import {changeFilterEvent, filterChanged} from "@/hook"
+import {useI18n} from 'vue-i18n'
+import deepClone from "@/utils/deepClone";
+import {ElMessage} from "element-plus";
+import request from "@/utils/request";
+//璇█鑾峰彇
+const {t} = useI18n()
+let router = useRouter()
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceList = ref([])
+const getTableRow = (row, type) => {
switch (type) {
- case 'edit' :{
+ case 'edit' : {
//alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/reportingWorks/ReportingWorkDetail', query: { id: row.id }})
+ router.push({path: '/main/reportingWorks/ReportingWorkDetail', query: {id: row.id}})
break
}
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
+ case 'delete': {
+ request.post(`/maintenance/deleteMaintenance/${row.id}`).then((res) => {
+ if (res.code === 200) {
+ ElMessage.success(t('workOrder.deleteOk'))
+ router.push({path: '/main/machine/MaintenanceAndRepair', query: {random:Math.random()}})
+ } else {
+
+ ElMessage.warning(res.msg)
+
+ }
+ })
break
}
- case 'setType':{
+ case 'setType': {
alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍙嶅鐘舵��')
break
}
@@ -30,27 +48,38 @@
return count.toFixed(2)
}
-//瀛愮粍浠舵帴鏀跺弬鏁�
+//棣栨鍔犺浇
+request.post(`/maintenance/selectMaintenance`).then((res) => {
+ if (res.code === 200) {
+ produceList = produceList.value.concat(deepClone(res.data.data))
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+})
+//瀛愮粍浠舵帴鏀跺弬鏁�
+const xGrid = ref()
const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
+ border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ stripe: true,//鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
id: 'CustomerList',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
- showOverflow:true,
+ scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
+ showOverflow: true,
columnConfig: {
resizable: true,
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- remote: true
+ // remote: true
},
customConfig: {
storage: true
@@ -60,79 +89,57 @@
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
- columns:[
- {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- {title: '鎿嶄綔', width: 140, slots: { default: 'button_slot' },fixed:"left"},
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
+ columns: [
+ {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+ {title: '鎿嶄綔', width: 140, slots: {default: 'button_slot'}, fixed: "left"},
+ {
+ field: 'id', width: 130, title: 'Id'
+ },
- {field: '璁惧鍚嶇О', width: 130,title: '璁惧鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: '绫诲瀷',width: 120, title: '绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '鏁呴殰鏃ユ湡', width: 100,title: '鏁呴殰鏃ユ湡', sortable: true,showOverflow:"ellipsis"},
- {field: '鏁呴殰鍘熷洜', width: 100,title: '鏁呴殰鍘熷洜', sortable: true},
- {field: '淇濆吇鏃ユ湡',width: 100, title: '淇濆吇鏃ユ湡', sortable: true},
- {field: '淇濆吇璇存槑',width: 120, title: '淇濆吇璇存槑', sortable: true,showOverflow:"ellipsis"},
- {field: '缁翠慨淇濆吇寮�濮嬫椂闂�', width: 160,title: '缁翠慨/淇濆吇寮�濮嬫椂闂�', sortable: true},
- {field: '缁翠慨淇濆吇缁撴潫鏃堕棿',width: 160, title: '缁翠慨/淇濆吇缁撴潫鏃堕棿', sortable: true},
- {field: '鎵�鍦ㄥ伐鑹�',width: 120, title: '鎵�鍦ㄥ伐鑹�', sortable: true},
- {field: '缁翠慨淇濆吇浜哄憳',width: 150, title: '缁翠慨/淇濆吇浜哄憳', sortable: true},
- {field: '璐圭敤',width: 120, title: '璐圭敤', sortable: true},
+ {
+ field: 'deviceName', width: 130, title: '璁惧鍚嶇О', filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'type', width: 120, title: '绫诲瀷', filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {field: 'faultTime', width: 100, title: '鏁呴殰鏃ユ湡', showOverflow: "ellipsis"},
+ {
+ field: 'faultReason', width: 100, title: '鏁呴殰鍘熷洜', filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {field: 'maintenanceTime', width: 100, title: '淇濆吇鏃ユ湡'},
+ {field: 'maintenanceIllustrate', width: 120, title: '淇濆吇璇存槑', showOverflow: "ellipsis"},
+ {field: 'startTime', width: 160, title: '缁翠慨/淇濆吇寮�濮嬫椂闂�'},
+ {field: 'stopTime', width: 160, title: '缁翠慨/淇濆吇缁撴潫鏃堕棿'},
+ {
+ field: 'process', width: 120, title: '鎵�鍦ㄥ伐鑹�', filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {field: 'personnel', width: 150, title: '缁翠慨/淇濆吇浜哄憳'},
+ {field: 'cost', width: 120, title: '璐圭敤'},
],//琛ㄥご鎸夐挳
toolbarConfig: {
// buttons: [{
//
// }],
- import: false,
- export: true,
- print: true,
+ // import: false,
+ // export: true,
+ // print: true,
zoom: true,
custom: true
},
- data: [
- {
- 璁惧鍚嶇О: '閽㈠寲鐐�(22E)',
- 绫诲瀷: '缁翠慨',
- 鏁呴殰鏃ユ湡: '2022-03-16',
- 鏁呴殰鍘熷洜: '鍧忎簡',
- 淇濆吇鏃ユ湡:'',
- 淇濆吇璇存槑:'',
- 缁翠慨淇濆吇寮�濮嬫椂闂�:'2022-03-16',
- 缁翠慨淇濆吇缁撴潫鏃堕棿:'2022-03-16',
- 鎵�鍦ㄥ伐鑹�:'閽㈠寲',
- 缁翠慨淇濆吇浜哄憳:'SSS',
- 璐圭敤:'112',
- },
- {
- 璁惧鍚嶇О: '閽㈠寲鐐�(22E)',
- 绫诲瀷: '缁翠慨',
- 鏁呴殰鏃ユ湡: '2022-03-16',
- 鏁呴殰鍘熷洜: '鍧忎簡',
- 淇濆吇鏃ユ湡:'',
- 淇濆吇璇存槑:'',
- 缁翠慨淇濆吇寮�濮嬫椂闂�:'2022-03-16',
- 缁翠慨淇濆吇缁撴潫鏃堕棿:'2022-03-16',
- 鎵�鍦ㄥ伐鑹�:'閽㈠寲',
- 缁翠慨淇濆吇浜哄憳:'SSS',
- 璐圭敤:'112',
- },
- {
- 璁惧鍚嶇О: '閽㈠寲鐐�(22E)',
- 绫诲瀷: '缁翠慨',
- 鏁呴殰鏃ユ湡: '2022-03-16',
- 鏁呴殰鍘熷洜: '鍧忎簡',
- 淇濆吇鏃ユ湡:'',
- 淇濆吇璇存槑:'',
- 缁翠慨淇濆吇寮�濮嬫椂闂�:'2022-03-16',
- 缁翠慨淇濆吇缁撴潫鏃堕棿:'2022-03-16',
- 鎵�鍦ㄥ伐鑹�:'閽㈠寲',
- 缁翠慨淇濆吇浜哄憳:'SSS',
- 璐圭敤:'112',
- },
- ],//table body瀹為檯鏁版嵁
+ data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['璐圭敤']
- return[
+ footerMethod({columns, data}) {//椤佃剼鍑芥暟
+ let footList = ['璐圭敤']
+ return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return '鍚堣:'
@@ -169,19 +176,19 @@
<template>
<div class="main-div-customer">
<vxe-grid
- max-height="100%"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
ref="xGrid"
+ class="mytable-scrollbar"
+ max-height="100%"
v-bind="gridOptions"
+ @filter-change="filterChanged"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
<template #content="{ row}">
<ul class="expand-wrapper">
- <li v-for="(item,key,index) in row">
- <span style="font-weight: bold">{{key+': '}}</span>
+ <li v-for="(item,key,index) in row">
+ <span style="font-weight: bold">{{ key + ': ' }}</span>
<span>{{ item }}</span>
</li>
</ul>
@@ -189,14 +196,14 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="dialogFormVisible = true" link type="primary" size="small">缂栬緫</el-button>
- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
+ <el-button link size="small" type="primary" @click="dialogFormVisible = true">缂栬緫</el-button>
+ <el-button link size="small" type="primary" @click="getTableRow(row,'delete')">鍒犻櫎</el-button>
</template>
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
@@ -209,91 +216,93 @@
<el-form :model="form">
<el-row>
<el-col :span="12">
- <el-form-item label="璁惧鍚嶇О" :label-width="formLabelWidth">
- <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
+ <el-form-item :label-width="formLabelWidth" label="璁惧鍚嶇О">
+ <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="绫诲瀷" :label-width="formLabelWidth">
+ <el-form-item :label-width="formLabelWidth" label="绫诲瀷">
<el-select v-model="form.region" placeholder="缁翠慨" style="width: 220px">
- <el-option label="淇濆吇" value="shanghai" />
- <el-option label="缁翠慨" value="mobian" />
+ <el-option label="淇濆吇" value="shanghai"/>
+ <el-option label="缁翠慨" value="mobian"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鏁呴殰鏃ユ湡" :label-width="formLabelWidth">
+ <el-form-item :label-width="formLabelWidth" label="鏁呴殰鏃ユ湡">
<el-date-picker
v-model="value1"
- type="date"
+ :size="size"
placeholder="2023-01-01"
- :size="size"
+ type="date"
/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鏁呴殰鍘熷洜" :label-width="formLabelWidth">
- <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
+ <el-form-item :label-width="formLabelWidth" label="鏁呴殰鍘熷洜">
+ <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="淇濆吇鏃ユ湡" :label-width="formLabelWidth">
+ <el-form-item :label-width="formLabelWidth" label="淇濆吇鏃ユ湡">
<el-date-picker
v-model="value1"
- type="date"
- placeholder="2023-02-01"
:size="size"
+ placeholder="2023-02-01"
+ type="date"
/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="淇濆吇璇存槑" :label-width="formLabelWidth">
- <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
+ <el-form-item :label-width="formLabelWidth" label="淇濆吇璇存槑">
+ <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="淇濆吇/缁翠慨寮�濮嬫椂闂�" :label-width="formLabelWidth">
+ <el-form-item :label-width="formLabelWidth" label="淇濆吇/缁翠慨寮�濮嬫椂闂�">
<el-date-picker
v-model="value1"
- type="date"
- placeholder="2023-02-01"
:size="size"
+ placeholder="2023-02-01"
+ type="date"
/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="淇濆吇/缁翠慨瀹屾垚鏃堕棿" :label-width="formLabelWidth">
+ <el-form-item :label-width="formLabelWidth" label="淇濆吇/缁翠慨瀹屾垚鏃堕棿">
<el-date-picker
v-model="value1"
- type="date"
- placeholder="2023-02-01"
:size="size"
+ placeholder="2023-02-01"
+ type="date"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鎵�鍦ㄥ伐鑹�" :label-width="formLabelWidth">
+ <el-form-item :label-width="formLabelWidth" label="鎵�鍦ㄥ伐鑹�">
<el-select v-model="form.region" placeholder="閽㈠寲" style="width: 220px">
- <el-option label="鍒囧壊" value="shanghai" />
- <el-option label="纾ㄨ竟" value="mobian" />
- <el-option label="閽㈠寲" value="ganghua" />
+ <el-option label="鍒囧壊" value="shanghai"/>
+ <el-option label="纾ㄨ竟" value="mobian"/>
+ <el-option label="閽㈠寲" value="ganghua"/>
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12"><el-form-item label="淇濆吇/缁翠慨浜哄憳" :label-width="formLabelWidth">
- <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
- </el-form-item></el-col>
+ <el-col :span="12">
+ <el-form-item :label-width="formLabelWidth" label="淇濆吇/缁翠慨浜哄憳">
+ <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
+ </el-form-item>
+ </el-col>
</el-row>
- <el-form-item label="璐圭敤" :label-width="formLabelWidth">
- <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
+ <el-form-item :label-width="formLabelWidth" label="璐圭敤">
+ <el-input v-model="form.name" autocomplete="off" style="width: 220px"/>
</el-form-item>
</el-form>
<template #footer>
@@ -309,7 +318,7 @@
</template>
<style scoped>
-.main-div-customer{
+.main-div-customer {
width: 99%;
height: 100%;
}
--
Gitblit v1.8.0