From e3cc5fb859a4e3c56c1dfa4d7892b233a30874fa Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 四月 2024 15:32:33 +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/SelectMachine.vue | 137 ++++++++++++++++-----------------------------
1 files changed, 49 insertions(+), 88 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue
index 8583b81..2ef6277 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue
@@ -1,8 +1,24 @@
<script setup>
-
import {reactive, ref} from "vue";
import {useRouter} from 'vue-router'
+import request from "@/utils/request";
+import deepClone from "@/utils/deepClone";
+import {ElDatePicker, ElMessage} from "element-plus";
+import { useI18n } from 'vue-i18n'
+import {changeFilterEvent, filterChanged} from "@/hook"
+import {Search} from "@element-plus/icons-vue";
+//璇█鑾峰彇
+const { t } = useI18n()
let router=useRouter()
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceList = ref([])
+
+const getBasicData = ref({
+ id: '',
+ basic_type: '',
+ basic_name: '',
+ d_basic_name: '',
+})
const getTableRow = (row,type) =>{
switch (type) {
case 'edit' :{
@@ -30,8 +46,25 @@
return count.toFixed(2)
}
-//瀛愮粍浠舵帴鏀跺弬鏁�
+const hasDecimal = (value) => {
+ const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+ return regex.test(value); // 杩斿洖true/false
+}
+
+//棣栨鍔犺浇
+request.post(`/maintenance/selectMachine`).then((res) => {
+ if (res.code == 200) {
+ xGrid.value.loadData(res.data.data)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+})
+
+
+//瀛愮粍浠舵帴鏀跺弬鏁�
+const xGrid = ref()
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
@@ -50,7 +83,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- remote: true
+ // remote: true
},
customConfig: {
storage: true
@@ -62,23 +95,17 @@
},//琛ㄥご鍙傛暟
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 },
- {field: '璁惧缂栧彿', width: 120, title: '璁惧缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
- {field: '鏍囧噯鍚嶇О',width: 120, title: '鏍囧噯鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {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: 120,title: '淇濆吇娆℃暟', sortable: true},
- {field: '鏈�鍚庣淮淇椂闂�',width: 120, title: '鏈�鍚庣淮淇椂闂�', sortable: true},
- {field: '鏈�鍚庝繚鍏绘椂闂�',width: 120, title: '鏈�鍚庝繚鍏绘椂闂�', sortable: true},
- {field: '缁翠慨璐圭敤',width: 120, title: '缁翠慨璐圭敤', sortable: true},
- {field: '淇濆吇璐圭敤',width: 120, title: '淇濆吇璐圭敤', sortable: true},
- {field: '鎵�鍦ㄥ伐鑹�',width: 120, title: '鎵�鍦ㄥ伐鑹�', sortable: true},
- {field: '浣滃簾鐘舵��',width: 120, title: '浣滃簾鐘舵��', sortable: true},
+ {field: 'deviceId', width: 120, title: '璁惧缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged },
+ {field: 'deviceName', width: 130,title: '璁惧鍚嶇О' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ {field: 'type',width: 100, title: '浣跨敤鐘舵��',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged },
+ {field: 'faultCount',width: 120, title: '缁翠慨娆℃暟' ,showOverflow:"ellipsis"},
+ {field: 'maintenanceCount', width: 120,title: '淇濆吇娆℃暟', },
+ {field: 'faultLastTime',width: 120, title: '鏈�鍚庣淮淇椂闂�', },
+ {field: 'maintenanceLastTime',width: 120, title: '鏈�鍚庝繚鍏绘椂闂�', },
+ {field: 'faultCost',width: 120, title: '缁翠慨璐圭敤', },
+ {field: 'maintenanceCost',width: 120, title: '淇濆吇璐圭敤', },
+ {field: 'process',width: 120, title: '鎵�鍦ㄥ伐鑹�',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged }
],
//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -92,61 +119,10 @@
custom: true
},
data: [
- {
- "璁惧缂栧彿": 'SB2209211',
- '鏍囧噯鍚嶇О': '閽㈠寲鐐�(22E)',
- '璁惧鍚嶇О': '閽㈠寲鐐�(22E)',
- '璐拱鏃堕棿': '2022-03-16',
- '瀹夎鏃堕棿':'2022-03-16',
- '浣跨敤鍛ㄦ湡':'313',
- '浣跨敤鐘舵��':'浣跨敤涓�',
- '缁翠慨娆℃暟':'0',
- '淇濆吇娆℃暟':'0',
- '鏈�鍚庣淮淇椂闂�':'',
- '鏈�鍚庝繚鍏绘椂闂�':'',
- '缁翠慨璐圭敤':'',
- '淇濆吇璐圭敤':'',
- '鎵�鍦ㄥ伐鑹�':'閽㈠寲',
- '浣滃簾鐘舵��':'姝ｅ父',
- },
- {
- "璁惧缂栧彿": 'SB2209211',
- '鏍囧噯鍚嶇О': '閽㈠寲鐐�(22E)',
- '璁惧鍚嶇О': '閽㈠寲鐐�(22E)',
- '璐拱鏃堕棿': '2022-03-16',
- '瀹夎鏃堕棿':'2022-03-16',
- '浣跨敤鍛ㄦ湡':'313',
- '浣跨敤鐘舵��':'浣跨敤涓�',
- '缁翠慨娆℃暟':'0',
- '淇濆吇娆℃暟':'0',
- '鏈�鍚庣淮淇椂闂�':'',
- '鏈�鍚庝繚鍏绘椂闂�':'',
- '缁翠慨璐圭敤':'',
- '淇濆吇璐圭敤':'',
- '鎵�鍦ㄥ伐鑹�':'閽㈠寲',
- '浣滃簾鐘舵��':'姝ｅ父',
- },
- {
- "璁惧缂栧彿": 'SB2209211',
- '鏍囧噯鍚嶇О': '閽㈠寲鐐�(22E)',
- '璁惧鍚嶇О': '閽㈠寲鐐�(22E)',
- '璐拱鏃堕棿': '2022-03-16',
- '瀹夎鏃堕棿':'2022-03-16',
- '浣跨敤鍛ㄦ湡':'313',
- '浣跨敤鐘舵��':'浣跨敤涓�',
- '缁翠慨娆℃暟':'0',
- '淇濆吇娆℃暟':'0',
- '鏈�鍚庣淮淇椂闂�':'',
- '鏈�鍚庝繚鍏绘椂闂�':'',
- '缁翠慨璐圭敤':'',
- '淇濆吇璐圭敤':'',
- '鎵�鍦ㄥ伐鑹�':'閽㈠寲',
- '浣滃簾鐘舵��':'姝ｅ父',
- },
],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['缁翠慨娆℃暟','淇濆吇娆℃暟','缁翠慨璐圭敤','淇濆吇璐圭敤']
+ let footList=['','','','']
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
@@ -168,16 +144,7 @@
const dialogFormVisible = ref(false)
const formLabelWidth = '140px'
-const form = reactive({
- name: '',
- region: '',
- date1: '',
- date2: '',
- delivery: false,
- type: [],
- resource: '',
- desc: '',
-})
+
</script>
@@ -185,7 +152,6 @@
<div class="main-div-customer">
<vxe-grid
max-height="100%"
- @filter-change="filterChanged"
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
@@ -202,16 +168,11 @@
</ul>
</template>
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <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>
- </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 type="text" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
--
Gitblit v1.8.0