From 45acf15aa5844863a7e3be51aa2a5262741ca26d Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 13 九月 2022 13:11:22 +0800
Subject: [PATCH] 1.项目优化
---
src/views/sbgl/bybz.vue | 44 ++++++++++++--------------------------------
1 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/src/views/sbgl/bybz.vue b/src/views/sbgl/bybz.vue
index a2cc60f..66e8cf2 100644
--- a/src/views/sbgl/bybz.vue
+++ b/src/views/sbgl/bybz.vue
@@ -138,7 +138,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getDeviceRepairStandArdSearch"
/>
@@ -387,46 +387,26 @@
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
+
import ImportPicker from '@/components/ImportPicker'
import {
- AddUpdateDeviceCheckStandArd, AddUpdateDeviceRepairStandArd,
- DeleteDeviceCheckStaned, DeleteDeviceRepairStaned,
- DeviceCheckItemSelect,
- DeviceCheckStandArdSearch,
- DeviceCheckStanedAssociationEqp, DeviceRepairItemSelect,
- DeviceRepairStandArdSearch, DeviceRepairStanedAssociationEqp,
- SaveDeviceCheckStanedAssociationEqp, SaveDeviceRepairStanedAssociationEqp,
- ViewDeviceCheckStanedSearch, ViewDeviceRepairStanedSearch
+ AddUpdateDeviceRepairStandArd,
+ DeleteDeviceRepairStaned,
+ DeviceRepairItemSelect,
+ DeviceRepairStandArdSearch,
+ DeviceRepairStanedAssociationEqp,
+ SaveDeviceRepairStanedAssociationEqp,
+ ViewDeviceRepairStanedSearch
} from '@/api/sbgl'
import $ from 'jquery'
+import { validateCode } from '@/utils/global'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
name: 'Zzjg',
components: {
Pagination, ImportPicker
},
data() {
- const validateName = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇疯緭鍏ョ紪鐮�'))
- } else {
- if (SER_HZ.test(value)) {
- return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
- } else {
- callback()
- }
- }
- }
- const validateTypeCode = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇烽�夋嫨涓婄骇'))
- } else {
- callback()
- }
- }
return {
mainHeight: 0,
tableHeight: 0,
@@ -462,7 +442,7 @@
dialogFormRules: {
code: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
name: [
{ required: true, message: '璇疯緭鍏ユ爣鍑嗗悕绉�', trigger: ['blur', 'change'] }
@@ -601,7 +581,7 @@
item.isVisible = 0
item.repairitem_code = item.code
item.repairitem_name = item.name
- item.repairitem_descr = item.chkdesc
+ item.repairitem_descr = item.chk_desc
})
this.repairItemSelectArr = [...this.repairItemSelectArr].filter(x => [...this.tableDataDialog].every(y => y.repairitem_code !== x.code))
--
Gitblit v1.9.3