From bed893abbebac6a1e43478b693e1f862a6b6c8fe Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 09 七月 2022 17:25:20 +0800
Subject: [PATCH] 1.生产开报工实现部分2.修改bug
---
src/views/jcsz/zzjg.vue | 2
src/views/zzmx/chda.vue | 4
src/views/scgl/scdd.vue | 39 ++-
src/views/scgl/gd.vue | 46 +++-
src/views/zzmx/gylx.vue | 4
src/views/sbgl/sbqd.vue | 2
src/views/scgl/sckbg.vue | 263 ++++++++++++++++---------
src/router/index.js | 202 ++++++++++----------
src/views/jcsz/yhqd.vue | 4
src/views/zzmx/jpgj.vue | 4
src/views/jcsz/jsqd.vue | 2
src/views/wlgl/ckdy.vue | 2
src/views/xtsz/bmgz.vue | 2
src/views/zzmx/gxdy.vue | 4
src/views/wlgl/kwdy.vue | 2
src/views/zzmx/wllx.vue | 2
src/App.vue | 2
17 files changed, 339 insertions(+), 247 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index ec9032c..b281de5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,8 @@
<template>
<div id="app">
+ <!-- <keep-alive>-->
<router-view />
+ <!-- </keep-alive>-->
</div>
</template>
diff --git a/src/router/index.js b/src/router/index.js
index cc9d183..8101a7a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -78,34 +78,34 @@
children: [
{
path: 'zzjg',
- name: '缁勭粐鏋舵瀯',
+ name: 'ZZJG',
code: '1010',
component: () => import('@/views/jcsz/zzjg'),
- meta: { code: '1010', title: '缁勭粐鏋舵瀯', icon: '' }
+ meta: { code: '1010', title: '缁勭粐鏋舵瀯', icon: '', keepAlive: true }
}, {
path: 'yhqd',
- name: '鐢ㄦ埛娓呭崟',
+ name: 'YYQD',
code: '1011',
component: () => import('@/views/jcsz/yhqd'),
- meta: { code: '1011', title: '鐢ㄦ埛娓呭崟', icon: '' }
+ meta: { code: '1011', title: '鐢ㄦ埛娓呭崟', icon: '', keepAlive: true }
}, {
path: 'jsqd',
- name: '瑙掕壊娓呭崟',
+ name: 'JSQD',
code: '1012',
component: () => import('@/views/jcsz/jsqd'),
- meta: { code: '1012', title: '瑙掕壊娓呭崟', icon: '' }
+ meta: { code: '1012', title: '瑙掕壊娓呭崟', icon: '', keepAlive: true }
}, {
path: 'wldw',
- name: '寰�鏉ュ崟浣�',
+ name: 'WLDW',
code: '1013',
component: () => import('@/views/jcsz/wldw'),
- meta: { code: '1013', title: '寰�鏉ュ崟浣�', icon: '' }
+ meta: { code: '1013', title: '寰�鏉ュ崟浣�', icon: '', keepAlive: true }
}, {
path: 'adsz',
- name: '瀹夌伅璁剧疆',
+ name: 'ADZZ',
code: '1014',
component: () => import('@/views/jcsz/adsz'),
- meta: { code: '1014', title: '瀹夌伅璁剧疆', icon: '' }
+ meta: { code: '1014', title: '瀹夌伅璁剧疆', icon: '', keepAlive: true }
}
]
},
@@ -120,71 +120,71 @@
children: [
{
path: 'sblx',
- name: '璁惧绫诲瀷',
+ name: 'SBLX',
code: '1020',
component: () => import('@/views/sbgl/sblx'),
- meta: { code: '1020', title: '璁惧绫诲瀷', icon: '' }
+ meta: { code: '1020', title: '璁惧绫诲瀷', icon: '', keepAlive: true }
},
{
path: 'wxjl',
code: '1029',
- name: '缁翠慨璁板綍',
+ name: 'WXJL',
component: () => import('@/views/sbgl/wxjl'),
- meta: { code: '1029', title: '缁翠慨璁板綍', icon: '' }
+ meta: { code: '1029', title: '缁翠慨璁板綍', icon: '', keepAlive: true }
}, {
path: 'sbz',
- name: '璁惧缁�',
+ name: 'SBZ',
code: '1021',
component: () => import('@/views/sbgl/sbz'),
- meta: { code: '1021', title: '璁惧缁�', icon: '' }
+ meta: { code: '1021', title: '璁惧缁�', icon: '', keepAlive: true }
}, {
path: 'sbqd',
name: '璁惧娓呭崟',
code: '1022',
component: () => import('@/views/sbgl/sbqd'),
- meta: { code: '1022', title: '璁惧娓呭崟', icon: '' }
+ meta: { code: '1022', title: '璁惧娓呭崟', icon: '', keepAlive: true }
},
{
path: 'djbz',
- name: '鐐规鏍囧噯',
+ name: 'DJBZ',
code: '1023',
component: () => import('@/views/sbgl/djbz'),
- meta: { code: '1023', title: '鐐规鏍囧噯', icon: '' }
+ meta: { code: '1023', title: '鐐规鏍囧噯', icon: '', keepAlive: true }
},
{
path: 'djbw',
- name: '鐐规閮ㄤ綅',
+ name: 'DJBW',
code: '1024',
component: () => import('@/views/sbgl/djbw'),
- meta: { code: '1024', title: '鐐规閮ㄤ綅', icon: '' }
+ meta: { code: '1024', title: '鐐规閮ㄤ綅', icon: '', keepAlive: true }
},
{
path: 'bybz',
- name: '淇濆吇鏍囧噯',
+ name: 'BYBZ',
code: '1025',
component: () => import('@/views/sbgl/bybz'),
- meta: { code: '1025', title: '淇濆吇鏍囧噯', icon: '' }
+ meta: { code: '1025', title: '淇濆吇鏍囧噯', icon: '', keepAlive: true }
},
{
path: 'bybw',
- name: '淇濆吇閮ㄤ綅',
+ name: 'BYBW',
code: '1026',
component: () => import('@/views/sbgl/bybw'),
- meta: { code: '1026', title: '淇濆吇閮ㄤ綅', icon: '' }
+ meta: { code: '1026', title: '淇濆吇閮ㄤ綅', icon: '', keepAlive: true }
},
{
path: 'djjl',
- name: '鐐规璁板綍',
+ name: 'DJJL',
code: '1027',
component: () => import('@/views/sbgl/djjl'),
- meta: { code: '1027', title: '鐐规璁板綍', icon: '' }
+ meta: { code: '1027', title: '鐐规璁板綍', icon: '', keepAlive: true }
},
{
path: 'byjl',
- name: '淇濆吇璁板綍',
+ name: 'BYJL',
code: '1028',
component: () => import('@/views/sbgl/byjl'),
- meta: { code: '1028', title: '淇濆吇璁板綍', icon: '' }
+ meta: { code: '1028', title: '淇濆吇璁板綍', icon: '', keepAlive: true }
}
]
},
@@ -199,70 +199,70 @@
children: [
{
path: 'gzlx',
- name: '宸ヨ绫诲瀷',
+ name: 'GZLX',
code: '1030',
component: () => import('@/views/gzgl/gzlx'),
- meta: { code: '1030', title: '宸ヨ绫诲瀷', icon: '' }
+ meta: { code: '1030', title: '宸ヨ绫诲瀷', icon: '', keepAlive: true }
}, {
path: 'sjxj',
- name: '涓婃満涓嬫満',
+ name: 'SJXJ',
code: '1039',
component: () => import('@/views/gzgl/sjxj'),
- meta: { code: '1039', title: '涓婃満涓嬫満', icon: '' }
+ meta: { code: '1039', title: '涓婃満涓嬫満', icon: '', keepAlive: true }
}, {
path: 'ckrk',
- name: '鍑哄簱鍏ュ簱',
+ name: 'CKRK',
code: '1040',
component: () => import('@/views/gzgl/ckrk'),
- meta: { code: '1040', title: '鍑哄簱鍏ュ簱', icon: '' }
+ meta: { code: '1040', title: '鍑哄簱鍏ュ簱', icon: '', keepAlive: true }
}, {
path: 'gzqd',
- name: '宸ヨ娓呭崟',
+ name: 'GZQD',
code: '1031',
component: () => import('@/views/gzgl/gzqd'),
- meta: { code: '1031', title: '宸ヨ娓呭崟', icon: '' }
+ meta: { code: '1031', title: '宸ヨ娓呭崟', icon: '', keepAlive: true }
}, {
path: 'djbz',
- name: '鐐规鏍囧噯',
+ name: 'DJBZ',
code: '1032',
component: () => import('@/views/gzgl/djbz'),
- meta: { code: '1032', title: '鐐规鏍囧噯', icon: '' }
+ meta: { code: '1032', title: '鐐规鏍囧噯', icon: '', keepAlive: true }
}, {
path: 'djbw',
- name: '鐐规閮ㄤ綅',
+ name: 'DJBW',
code: '1033',
component: () => import('@/views/gzgl/djbw'),
- meta: { code: '1033', title: '鐐规閮ㄤ綅', icon: '' }
+ meta: { code: '1033', title: '鐐规閮ㄤ綅', icon: '', keepAlive: true }
}, {
path: 'bybz',
- name: '淇濆吇鏍囧噯',
+ name: 'BYBZ',
code: '1034',
component: () => import('@/views/gzgl/bybz'),
- meta: { code: '1034', title: '淇濆吇鏍囧噯', icon: '' }
+ meta: { code: '1034', title: '淇濆吇鏍囧噯', icon: '', keepAlive: true }
}, {
path: 'bybw',
- name: '淇濆吇閮ㄤ綅',
+ name: 'BYBW',
code: '1035',
component: () => import('@/views/gzgl/bybw'),
- meta: { code: '1035', title: '淇濆吇閮ㄤ綅', icon: '' }
+ meta: { code: '1035', title: '淇濆吇閮ㄤ綅', icon: '', keepAlive: true }
}, {
path: 'djjl',
- name: '鐐规璁板綍',
+ name: 'DJJL',
code: '1036',
component: () => import('@/views/gzgl/djjl'),
- meta: { code: '1036', title: '鐐规璁板綍', icon: '' }
+ meta: { code: '1036', title: '鐐规璁板綍', icon: '', keepAlive: true }
}, {
path: 'byjl',
- name: '淇濆吇璁板綍',
+ name: 'BYJL',
code: '1037',
component: () => import('@/views/gzgl/byjl'),
- meta: { code: '1037', title: '淇濆吇璁板綍', icon: '' }
+ meta: { code: '1037', title: '淇濆吇璁板綍', icon: '', keepAlive: true }
}, {
path: 'gzwx',
- name: '宸ヨ缁翠慨',
+ name: 'GZWX',
code: '1038',
component: () => import('@/views/gzgl/gzwx'),
- meta: { code: '1038', title: '宸ヨ缁翠慨', icon: '' }
+ meta: { code: '1038', title: '宸ヨ缁翠慨', icon: '', keepAlive: true }
}
]
},
@@ -277,41 +277,41 @@
children: [
{
path: 'ckdy',
- name: '浠撳簱瀹氫箟',
+ name: 'CKDY',
code: '1050',
component: () => import('@/views/wlgl/ckdy'),
- meta: { code: '1050', title: '浠撳簱瀹氫箟', icon: '' }
+ meta: { code: '1050', title: '浠撳簱瀹氫箟', icon: '', keepAlive: true }
},
{
path: 'kwdy',
- name: '搴撲綅瀹氫箟',
+ name: 'KWDY',
code: '1051',
component: () => import('@/views/wlgl/kwdy'),
- meta: { code: '1051', title: '搴撲綅瀹氫箟', icon: '' }
+ meta: { code: '1051', title: '搴撲綅瀹氫箟', icon: '', keepAlive: true }
}, {
path: 'rqlx',
- name: '瀹瑰櫒绫诲瀷',
+ name: 'RYLX',
code: '1052',
component: () => import('@/views/wlgl/rqlx'),
- meta: { code: '1052', title: '瀹瑰櫒绫诲瀷', icon: '' }
+ meta: { code: '1052', title: '瀹瑰櫒绫诲瀷', icon: '', keepAlive: true }
}, {
path: 'rqqd',
- name: '瀹瑰櫒娓呭崟',
+ name: 'RQQD',
code: '1053',
component: () => import('@/views/wlgl/rqqd'),
- meta: { code: '1053', title: '瀹瑰櫒娓呭崟', icon: '' }
+ meta: { code: '1053', title: '瀹瑰櫒娓呭崟', icon: '', keepAlive: true }
}, {
path: 'crkjl',
- name: '鍑哄叆搴撹褰�',
+ name: 'CRKJL',
code: '1054',
component: () => import('@/views/wlgl/crkjl'),
- meta: { code: '1054', title: '鍑哄叆搴撹褰�', icon: '' }
+ meta: { code: '1054', title: '鍑哄叆搴撹褰�', icon: '', keepAlive: true }
}, {
path: 'kccx',
- name: '搴撳瓨鏌ヨ',
+ name: 'KCCX',
code: '1055',
component: () => import('@/views/wlgl/kccx'),
- meta: { code: '1055', title: '搴撳瓨鏌ヨ', icon: '' }
+ meta: { code: '1055', title: '搴撳瓨鏌ヨ', icon: '', keepAlive: true }
}
]
},
@@ -326,43 +326,43 @@
children: [
{
path: 'wllx',
- name: '鐗╂枡绫诲瀷',
+ name: 'WLLX',
code: '1060',
component: () => import('@/views/zzmx/wllx'),
- meta: { code: '1060', title: '鐗╂枡绫诲瀷', icon: '' }
+ meta: { code: '1060', title: '鐗╂枡绫诲瀷', icon: '', keepAlive: true }
},
{
path: 'chda',
- name: '瀛樿揣妗ｆ',
+ name: 'CHDA',
code: '1061',
component: () => import('@/views/zzmx/chda'),
- meta: { code: '1061', title: '瀛樿揣妗ｆ', icon: '' }
+ meta: { code: '1061', title: '瀛樿揣妗ｆ', icon: '', keepAlive: true }
}, {
path: 'wlqd',
- name: '鐗╂枡娓呭崟',
+ name: 'WLQD',
code: '1062',
component: () => import('@/views/zzmx/wlqd'),
- meta: { code: '1062', title: '鐗╂枡娓呭崟', icon: '' }
+ meta: { code: '1062', title: '鐗╂枡娓呭崟', icon: '', keepAlive: true }
},
{
path: 'gylx',
- name: '宸ヨ壓璺嚎',
+ name: 'GYLX',
code: '1063',
component: () => import('@/views/zzmx/gylx'),
- meta: { code: '1063', title: '宸ヨ壓璺嚎', icon: '' }
+ meta: { code: '1063', title: '宸ヨ壓璺嚎', icon: '', keepAlive: true }
}, {
path: 'gxdy',
- name: '宸ュ簭瀹氫箟',
+ name: 'GXDY',
code: '1064',
component: () => import('@/views/zzmx/gxdy'),
- meta: { code: '1064', title: '宸ュ簭瀹氫箟', icon: '' }
+ meta: { code: '1064', title: '宸ュ簭瀹氫箟', icon: '', keepAlive: true }
},
{
path: 'jpgj',
- name: '鑺傛媿宸ヤ环',
+ name: 'JPGJ',
code: '1065',
component: () => import('@/views/zzmx/jpgj'),
- meta: { code: '1065', title: '鑺傛媿宸ヤ环', icon: '' }
+ meta: { code: '1065', title: '鑺傛媿宸ヤ环', icon: '', keepAlive: true }
}
]
},
@@ -377,28 +377,28 @@
children: [
{
path: 'scdd',
- name: 'ERP鐢熶骇璁㈠崟',
+ name: 'SCDD',
code: '1070',
component: () => import('@/views/scgl/scdd'),
- meta: { code: '1070', title: 'ERP鐢熶骇璁㈠崟', icon: '' }
+ meta: { code: '1070', title: 'ERP鐢熶骇璁㈠崟', icon: '', keepAlive: true }
}, {
path: 'gd',
- name: 'MES宸ュ崟',
+ name: 'GD',
code: '1071',
component: () => import('@/views/scgl/gd'),
- meta: { code: '1071', title: 'MES宸ュ崟', icon: '' }
+ meta: { code: '1071', title: 'MES宸ュ崟', icon: '', keepAlive: true }
}, {
path: 'gdpg',
- name: '宸ュ崟娲惧伐',
+ name: 'GDPD',
code: '1072',
component: () => import('@/views/scgl/gdpg'),
- meta: { code: '1072', title: '宸ュ崟娲惧伐', icon: '' }
+ meta: { code: '1072', title: '宸ュ崟娲惧伐', icon: '', keepAlive: true }
}, {
path: 'sckbg',
- name: '鐢熶骇寮�鎶ュ伐',
+ name: 'SCKBG',
code: '1073',
component: () => import('@/views/scgl/sckbg'),
- meta: { code: '1073', title: '鐢熶骇寮�鎶ュ伐', icon: '' }
+ meta: { code: '1073', title: '鐢熶骇寮�鎶ュ伐', icon: '', keepAlive: true }
}
]
},
@@ -413,34 +413,34 @@
children: [
{
path: 'zjbz',
- name: '璐ㄦ鏍囧噯',
+ name: 'ZJBZ',
code: '1080',
component: () => import('@/views/zlgl/zjbz'),
- meta: { code: '1080', title: '璐ㄦ鏍囧噯', icon: '' }
+ meta: { code: '1080', title: '璐ㄦ鏍囧噯', icon: '', keepAlive: true }
}, {
path: 'qxdy',
- name: '缂洪櫡瀹氫箟',
+ name: 'QXDY',
code: '1081',
component: () => import('@/views/zlgl/qxdy'),
- meta: { code: '1081', title: '缂洪櫡瀹氫箟', icon: '' }
+ meta: { code: '1081', title: '缂洪櫡瀹氫箟', icon: '', keepAlive: true }
}, {
path: 'gxjy',
- name: '宸ュ簭妫�楠�',
+ name: 'GXDY',
code: '1082',
component: () => import('@/views/zlgl/gxjy'),
- meta: { code: '1082', title: '宸ュ簭妫�楠�', icon: '' }
+ meta: { code: '1082', title: '宸ュ簭妫�楠�', icon: '', keepAlive: true }
}, {
path: 'wljy',
- name: '鐗╂祦妫�楠�',
+ name: 'WLJY',
code: '1083',
component: () => import('@/views/zlgl/wljy'),
- meta: { code: '1083', title: '鐗╂祦妫�楠�', icon: '' }
+ meta: { code: '1083', title: '鐗╂祦妫�楠�', icon: '', keepAlive: true }
}, {
path: 'qxsj',
- name: '缂洪櫡缁熻',
+ name: 'QXSJ',
code: '1084',
component: () => import('@/views/zlgl/qxsj'),
- meta: { code: '1084', title: '缂洪櫡缁熻', icon: '' }
+ meta: { code: '1084', title: '缂洪櫡缁熻', icon: '', keepAlive: true }
}
]
},
@@ -455,28 +455,28 @@
children: [
{
path: 'bmgz',
- name: '缂栫爜瑙勫垯',
+ name: 'BMGZ',
code: '1101',
component: () => import('@/views/xtsz/bmgz'),
- meta: { code: '1101', title: '缂栫爜瑙勫垯', icon: '' }
+ meta: { code: '1101', title: '缂栫爜瑙勫垯', icon: '', keepAlive: true }
}, {
path: 'mmxg',
- name: '瀵嗙爜淇敼',
+ name: 'MMXG',
code: '1102',
component: () => import('@/views/xtsz/mmxg'),
- meta: { code: '1102', title: '瀵嗙爜淇敼', icon: '' }
+ meta: { code: '1102', title: '瀵嗙爜淇敼', icon: '', keepAlive: true }
}, {
path: 'xtrz',
- name: '绯荤粺鏃ュ織',
+ name: 'XTRZ',
code: '1103',
component: () => import('@/views/xtsz/xtrz'),
- meta: { code: '1103', title: '绯荤粺鏃ュ織', icon: '' }
+ meta: { code: '1103', title: '绯荤粺鏃ュ織', icon: '', keepAlive: true }
}, {
path: 'sc',
- name: 'SOP涓婁紶',
+ name: 'SC',
code: '1104',
component: () => import('@/views/xtsz/sc'),
- meta: { code: '1104', title: 'SOP涓婁紶', icon: '' }
+ meta: { code: '1104', title: 'SOP涓婁紶', icon: '', keepAlive: true }
}
]
}
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 7226df7..3428180 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -790,7 +790,7 @@
console.log(window.innerHeight)
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
- this.isFullscreen = window.innerHeight < 800
+ // this.isFullscreen = window.innerHeight < 800
})
},
/* 璁剧疆妯″潡*/
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index a20ec9f..3f5badf 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -445,7 +445,7 @@
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'YYQD',
components: {
Pagination
},
@@ -708,7 +708,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
- this.isFullscreen = window.innerHeight < 800
+ // this.isFullscreen = window.innerHeight < 800
if (window.innerHeight < 800) {
this.tableHeight = this.tableHeight - 50
}
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index 20be7ef..695519f 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -190,7 +190,7 @@
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'ZZJG',
components: {
Pagination
},
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index f18752f..1dbc057 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -496,7 +496,7 @@
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'SBQD',
components: {
Pagination
},
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 353cc11..ef7ab99 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -12,10 +12,11 @@
<div class="elForm">
<el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
<el-select
- v-model="form.erporderstus"
+ v-model="form.mesorderstus"
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
+ @change="erporderstusChange"
>
<el-option
v-for="item in erporderstusArr"
@@ -26,7 +27,7 @@
</el-select>
</el-form-item>
<el-form-item label="璁㈠崟缂栧彿" style=" display: flex;">
- <el-input v-model="form.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input v-model="form.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
@@ -50,14 +51,23 @@
<el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item label="鍒涘缓鏃堕棿" style=" display: flex;">
+ <!-- <el-date-picker-->
+ <!-- v-model="form.createdate"-->
+ <!-- type="daterange"-->
+ <!-- :clearable="false"-->
+ <!-- range-separator="~"-->
+ <!-- start-placeholder="寮�濮嬫棩鏈�"-->
+ <!-- end-placeholder="缁撴潫鏃ユ湡"-->
+ <!-- size="mini"-->
+ <!-- />-->
<el-date-picker
v-model="form.createdate"
- type="daterange"
- :clearable="false"
- range-separator="~"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
+ type="date"
size="mini"
+ :clearable="false"
+ style="width: 200px;"
+ format="yyyy-MM-dd"
+ placeholder="閫夋嫨鏃ユ湡"
/>
</el-form-item>
</div>
@@ -548,7 +558,7 @@
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'GD',
components: {
Pagination
},
@@ -685,10 +695,10 @@
},
methods: {
async getMesOrderSearch() {
- let tempDate = this.form.createdate
- if (tempDate.length > 0) {
- tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
- }
+ // let tempDate = this.form.createdate
+ // if (tempDate.length > 0) {
+ // tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ // }
const data = {
mesorderstus: this.form.mesorderstus, // 宸ュ崟鐘舵�佺爜
@@ -697,7 +707,7 @@
partname: this.form.partname, // 浜у搧鍚嶇О
partspec: this.form.partspec, // 浜у搧瑙勬牸
creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
- createdate: tempDate, // 鍒涘缓鏃堕棿
+ createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
prop: this.form.prop, // 鎺掑簭瀛楁
order: this.form.order, // 鎺掑簭瀛楁
page: this.form.page, // 绗嚑椤�
@@ -717,6 +727,10 @@
// 鑾峰彇鐢熶骇杞﹂棿鏁扮粍
const { data: res2 } = await WorkShopSelect()
this.wkshopArr = res2
+ },
+ // 璁㈠崟鐘舵�佹敼鍙樻椂
+ erporderstusChange(val) {
+ this.form.mesorderstus = val
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -738,8 +752,8 @@
// 閲嶇疆
reset(val) {
- this.form.erporderstus = ''
- this.form.erpordercode = ''
+ this.form.mesorderstus = ''
+ this.form.mesordercode = ''
this.form.partcode = ''
this.form.partname = ''
this.form.partspec = ''
@@ -944,7 +958,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
- this.isFullscreen = window.innerHeight < 800
+ // this.isFullscreen = window.innerHeight < 800
if (this.isFullscreen) {
this.tableHeight = this.tableHeight - 50
}
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 42439ad..1d7193e 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -44,6 +44,7 @@
type="daterange"
range-separator="~"
size="mini"
+ style="width: 240px"
:clearable="false"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
@@ -55,17 +56,25 @@
<el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item label="鍒涘缓鏃堕棿" style=" display: flex;">
+ <!-- <el-date-picker-->
+ <!-- v-model="form.createdate"-->
+ <!-- type="daterange"-->
+ <!-- :clearable="false"-->
+ <!-- range-separator="~"-->
+ <!-- start-placeholder="寮�濮嬫棩鏈�"-->
+ <!-- end-placeholder="缁撴潫鏃ユ湡"-->
+ <!-- size="mini"-->
+ <!-- />-->
+ <!-- :picker-options="expireTimeOption"-->
<el-date-picker
v-model="form.createdate"
- type="daterange"
- :clearable="false"
- range-separator="~"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
+ type="date"
size="mini"
+ :clearable="false"
+ style="width: 200px;"
+ format="yyyy-MM-dd"
+ placeholder="閫夋嫨鏃ユ湡"
/>
- <!-- :picker-options="expireTimeOption"-->
-
</el-form-item>
</div>
<div style="min-height: 100px">
@@ -141,6 +150,7 @@
<!-- />-->
<el-table-column
width="50"
+ fixed
>
<template slot-scope="{row}">
<el-radio
@@ -347,7 +357,7 @@
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'SCDD',
components: {
Pagination
},
@@ -449,10 +459,10 @@
tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
}
- let tempDate = this.form.createdate
- if (tempDate.length > 0) {
- tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
- }
+ // let tempDate = this.form.createdate
+ // if (tempDate.length > 0) {
+ // tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ // }
const data = {
erporderstus: this.form.erporderstus, // 璁㈠崟鐘舵�佺爜
@@ -462,7 +472,8 @@
partspec: this.form.partspec, // 浜у搧瑙勬牸
paydate: tempDate2, // 浜や粯鏃堕棿
creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
- createdate: tempDate, // 鍒涘缓鏃堕棿
+ createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
+ // createdate: tempDate,
prop: this.form.prop, // 鎺掑簭瀛楁
order: this.form.order, // 鎺掑簭瀛楁
page: this.form.page, // 绗嚑椤�
@@ -628,7 +639,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
- this.isFullscreen = window.innerHeight < 800
+ // this.isFullscreen = window.innerHeight < 800
if (this.isFullscreen) {
this.tableHeight = this.tableHeight - 50
}
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 378bd37..9c3ac1c 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -9,7 +9,7 @@
<div style="width: 70px">宸ュ簭鐮侊細</div>
<el-input
v-model="produceCode"
- oninput="value=value.replace(/[^0-9.]/g,'')"
+ oninput="value=value.replace(/[^0-9a-zA-Z;]/g,'')"
name="produceCode"
style="width: 500px"
@keyup.enter.native="val=>enterNative(val,'produceCode')"
@@ -39,87 +39,103 @@
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
- <!-- <el-table-column-->
- <!-- type="selection"-->
- <!-- width="50"-->
- <!-- />-->
- <el-table-column
- width="50"
- >
- <template slot-scope="{row}">
- <!-- <el-radio-->
- <!-- v-model="radioSelected"-->
- <!-- :label="row.wo"-->
- <!-- style="color: #fff;padding-left: 10px; margin-right: -25px;"-->
- <!-- @change.native="getCurrentRow(row.wo)"-->
- <!-- />-->
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- width="50"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <!– <el-radio–>-->
+ <!-- <!– v-model="radioSelected"–>-->
+ <!-- <!– :label="row.wo"–>-->
+ <!-- <!– style="color: #fff;padding-left: 10px; margin-right: -25px;"–>-->
+ <!-- <!– @change.native="getCurrentRow(row.wo)"–>-->
+ <!-- <!– />–>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="RowNum"
width="50"
label="搴忓彿"
/>
<el-table-column
- prop="org_code"
+ prop="status"
label="鐘舵��"
sortable="custom"
- />
+ width="110"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.status==='NEW'">鏂拌鍗�</div>
+ <div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
+ <div v-if="row.status==='START'">寮�宸�</div>
+ <div v-if="row.status==='CLOSED'">瀹屽伐</div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="org_name"
+ prop="wo_code"
label="宸ュ崟鍙�"
sortable="custom"
+ width="160"
/>
<el-table-column
- prop="description"
+ prop="partcode"
label="浜у搧缂栫爜"
sortable="custom"
+ width="150"
/>
<el-table-column
- prop="parentorg_name"
+ prop="partname"
label="浜у搧鍚嶇О"
sortable="custom"
+ width="150"
/>
<el-table-column
- prop="parentorg_name"
+ prop="seq"
+ width="80"
label="宸ュ簭"
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="descr"
label="宸ュ簭鎻忚堪"
+ width="150"
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="plan_qty"
label="浠诲姟鏁伴噺"
+ width="150"
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="good_qty"
label="宸叉姤宸ユ暟閲�"
sortable="custom"
+ width="150"
/>
<el-table-column
- prop="lm_user"
+ prop="ng_qty"
label="涓嶈壇鏁伴噺"
+ width="150"
+
sortable="custom"
/>
<el-table-column
- prop="lm_date"
+ prop="plan_startdate"
label="璁″垝寮�宸ユ棩鏈�"
+ width="185"
sortable="custom"
/>
- <el-table-column
- label="鎿嶄綔"
- >
- <template slot-scope="{row}">
- <div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
- </div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- label="鎿嶄綔"-->
+ <!-- width="150"-->
+ <!-- fixed="right"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div class="operationClass">-->
+ <!-- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>-->
+ <!-- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>-->
+ <!-- </div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
</el-table>
</div>
<!--鍒嗛〉-->
@@ -140,7 +156,7 @@
<div style="width: 70px">宸ュ簭鐮侊細</div>
<el-input
v-model="WXproduceCode"
- oninput="value=value.replace(/[^0-9.]/g,'')"
+ oninput="value=value.replace(/[^0-9a-zA-Z;]/g,'')"
name="WXproduceCode"
style="width: 500px"
@keyup.enter.native="val=>enterNative(val,'WXproduceCode')"
@@ -170,87 +186,103 @@
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
- <!-- <el-table-column-->
- <!-- type="selection"-->
- <!-- width="50"-->
- <!-- />-->
- <el-table-column
- width="50"
- >
- <template slot-scope="{row}">
- <!-- <el-radio-->
- <!-- v-model="radioSelected"-->
- <!-- :label="row.wo"-->
- <!-- style="color: #fff;padding-left: 10px; margin-right: -25px;"-->
- <!-- @change.native="getCurrentRow(row.wo)"-->
- <!-- />-->
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- width="50"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <!– <el-radio–>-->
+ <!-- <!– v-model="radioSelected"–>-->
+ <!-- <!– :label="row.wo"–>-->
+ <!-- <!– style="color: #fff;padding-left: 10px; margin-right: -25px;"–>-->
+ <!-- <!– @change.native="getCurrentRow(row.wo)"–>-->
+ <!-- <!– />–>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="RowNum"
width="50"
label="搴忓彿"
/>
<el-table-column
- prop="org_code"
+ prop="status"
label="鐘舵��"
sortable="custom"
- />
+ width="110"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.status==='NEW'">鏂拌鍗�</div>
+ <div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
+ <div v-if="row.status==='START'">寮�宸�</div>
+ <div v-if="row.status==='CLOSED'">瀹屽伐</div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="org_name"
+ prop="wo_code"
label="宸ュ崟鍙�"
sortable="custom"
+ width="160"
/>
<el-table-column
- prop="description"
+ prop="partcode"
label="浜у搧缂栫爜"
sortable="custom"
+ width="150"
/>
<el-table-column
- prop="parentorg_name"
+ prop="partname"
label="浜у搧鍚嶇О"
sortable="custom"
+ width="150"
/>
<el-table-column
- prop="parentorg_name"
+ prop="seq"
+ width="80"
label="宸ュ簭"
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="descr"
label="宸ュ簭鎻忚堪"
+ width="150"
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="plan_qty"
label="浠诲姟鏁伴噺"
+ width="150"
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="good_qty"
label="宸叉姤宸ユ暟閲�"
sortable="custom"
+ width="150"
/>
<el-table-column
- prop="lm_user"
+ prop="ng_qty"
label="涓嶈壇鏁伴噺"
+ width="150"
+
sortable="custom"
/>
<el-table-column
- prop="lm_date"
+ prop="plan_startdate"
label="璁″垝寮�宸ユ棩鏈�"
+ width="185"
sortable="custom"
/>
- <el-table-column
- label="鎿嶄綔"
- >
- <template slot-scope="{row}">
- <div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
- </div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- label="鎿嶄綔"-->
+ <!-- width="150"-->
+ <!-- fixed="right"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div class="operationClass">-->
+ <!-- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>-->
+ <!-- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>-->
+ <!-- </div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
</el-table>
</div>
<!--鍒嗛〉-->
@@ -282,8 +314,7 @@
>
<el-form ref="dialogForm" inline :model="dialogForm" label-width="110px">
<el-form-item label="宸ュ崟缂栧彿锛�">
- <!-- <el-input v-model="dialogForm.name"></el-input>-->
- <div style="width: 200px">PO2022050500001</div>
+ <div style="width: 200px">{{ dialogForm.wo_code }}</div>
</el-form-item>
<el-form-item label="浜у搧缂栫爜锛�">
<div style="width: 200px">427100</div>
@@ -310,6 +341,7 @@
<el-form-item label="鏈姤/宸叉姤锛�">
<div style="width: 200px">900/100</div>
</el-form-item>
+
<el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" label="寮�宸ユ暟閲忥細">
<div style="width: 200px">1000</div>
</el-form-item>
@@ -547,11 +579,17 @@
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import $ from 'jquery'
-import { MesOrderStepReportSelectUserGroup, MesOrderStepSearch, MesOrderStepStartSelectEqp } from '@/api/scgl'
+import {
+ MesOrderGroupSelectUser,
+ MesOrderStepReportSelectUserGroup,
+ MesOrderStepSearch,
+ MesOrderStepStartSelectEqp,
+ MesOrderWxStepSearch
+} from '@/api/scgl'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'SCKBG',
components: {
Pagination
},
@@ -580,18 +618,18 @@
produceCode: '', // 宸ュ簭鐮�
WXproduceCode: '', // 澶栧崗宸ュ簭鐮�
form: {
- orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
- prop: 'lm_date', // 鎺掑簭瀛楁
- order: 'desc', // 鎺掑簭瀛楁
+ orderstepqrcode: 'PO202206280001_4;Step01', // 鎵弿鐨勪簩缁寸爜淇℃伅
+ prop: 'wo', // 鎺掑簭瀛楁
+ order: 'asc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
total: 10,
tableData: [],
WXform: { // 澶栧崗琛ㄥ崟
- orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
- prop: 'lm_date', // 鎺掑簭瀛楁
- order: 'desc', // 鎺掑簭瀛楁
+ orderstepqrcode: 'PO202206280001_4;Step01', // 鎵弿鐨勪簩缁寸爜淇℃伅
+ prop: 'wo_code', // 鎺掑簭瀛楁
+ order: 'asc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
@@ -601,10 +639,17 @@
dialogVisible: false,
dialogTitle: '', // 鑷埗寮�濮嬨�佽嚜鍒舵姤宸ャ�佸鍗忓彂鏂欍�佸鍗忔敹鏂�
dialogForm: {
- OrgType: '',
- OrgCode: '',
- OrgName: '',
- SupUnit: ''// 涓婄骇鍗曚綅
+ wo_code: '', // 宸ュ崟缂栧彿
+ partcode: '', // 浜у搧缂栫爜
+ partname: '', // 浜у搧鍚嶇О
+ partspec: '', // 浜у搧瑙勬牸
+ currentstep: '', // 褰撳墠宸ュ簭
+ nextstep: '', // 涓嬩竴閬撳伐搴�
+ desr: '', // 宸ュ簭鎻忚堪
+ plan_qty: '', // 浠诲姟鏁伴噺
+ report_qty: '', // 宸叉姤鏁伴噺
+ noreport_qty: '' // 鏈姤鏁伴噺
+
},
userTableData: [
{ RowNum: 1, name: '寮犱笁' },
@@ -645,9 +690,14 @@
},
methods: {
async getMesOrderStepSearch() {
- // const res = await MesOrderStepSearch(this.form)
- // this.tableData = res.data
- // this.total = res.count
+ const res = await MesOrderStepSearch(this.form)
+ this.tableData = res.data
+ this.total = res.count
+ },
+ async MesOrderWxStepSearch() {
+ const res = await MesOrderWxStepSearch(this.WXform)
+ this.WXtableData = res.data
+ this.WXtotal = res.count
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -669,11 +719,13 @@
tabClick(val, d) {
console.log(val, d, 1)
if (this.$refs.elTabs.currentName === '0') {
+ this.getMesOrderStepSearch()
this.$nextTick(() => {
$("input[name='produceCode']")[0].focus()
})
}
if (this.$refs.elTabs.currentName === '1') {
+ this.MesOrderWxStepSearch()
this.$nextTick(() => {
$("input[name='WXproduceCode']")[0].focus()
})
@@ -698,29 +750,42 @@
this.getMesOrderStepSearch()
},
// 鑷埗寮�濮�
- ZZstart() {
+ async ZZstart() {
this.dialogTitle = '鑷埗寮�濮�'
- this.dialogVisible = true
+ // this.dialogVisible = true
+ this.dialogVisibleTrue()
+
+ const res = await MesOrderStepStartSelectEqp({ orderstepqrcode: produceCode })
},
// 鑷埗鎶ュ伐
ZZreport() {
this.dialogTitle = '鑷埗鎶ュ伐'
- this.dialogVisible = true
+ // this.dialogVisible = true
+ this.dialogVisibleTrue()
this.getUserTableData()
},
// 澶栧崗鍙戞枡
- WXsend() {
+ async WXsend() {
this.dialogTitle = '澶栧崗鍙戞枡'
- this.dialogVisible = true
+ this.dialogVisibleTrue()
+ // this.dialogVisible = true
+
+ // const { data: res } = await MesOrderStepReportSelectUserGroup()
+ // this.xx = res
},
// 澶栧崗鏀舵枡
WXback() {
this.dialogTitle = '澶栧崗鏀舵枡'
+ this.dialogVisibleTrue()
+ // this.dialogVisible = true
+ },
+ dialogVisibleTrue() {
this.dialogVisible = true
+ // this.dialogForm.wo_code=
},
// 鎶ュ伐鏌ヨ鐢ㄦ埛琛�
async getUserTableData() {
- // const res = await MesOrderGroupSelectUser({usergroupcode:this.})
+ // const { data: res } = await MesOrderGroupSelectUser({ usergroupcode: 'SC01' })
this.userTableData.forEach(item => {
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
diff --git a/src/views/wlgl/ckdy.vue b/src/views/wlgl/ckdy.vue
index 1c2beaf..776c1fb 100644
--- a/src/views/wlgl/ckdy.vue
+++ b/src/views/wlgl/ckdy.vue
@@ -142,7 +142,7 @@
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'CKDY',
components: {
Pagination
},
diff --git a/src/views/wlgl/kwdy.vue b/src/views/wlgl/kwdy.vue
index b8e649a..8d7bbf3 100644
--- a/src/views/wlgl/kwdy.vue
+++ b/src/views/wlgl/kwdy.vue
@@ -172,7 +172,7 @@
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'KWDY',
components: {
Pagination
},
diff --git a/src/views/xtsz/bmgz.vue b/src/views/xtsz/bmgz.vue
index 28e66fe..2dcc68b 100644
--- a/src/views/xtsz/bmgz.vue
+++ b/src/views/xtsz/bmgz.vue
@@ -181,7 +181,7 @@
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'BMGZ',
components: {
Pagination
},
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index fe0cd74..5d00b84 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -522,7 +522,7 @@
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'CHDA',
components: {
Pagination
},
@@ -789,7 +789,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
- this.isFullscreen = window.innerHeight < 800
+ // this.isFullscreen = window.innerHeight < 800
if (window.innerHeight < 800) {
this.tableHeight = this.tableHeight - 50
}
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index be4ed1b..94f8d50 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -357,7 +357,7 @@
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'GXDY',
components: {
Pagination
},
@@ -568,7 +568,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
- this.isFullscreen = window.innerHeight < 800
+ // this.isFullscreen = window.innerHeight < 800
if (window.innerHeight < 800) {
this.tableHeight = this.tableHeight - 50
}
diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index 2920da3..d2202be 100644
--- a/src/views/zzmx/gylx.vue
+++ b/src/views/zzmx/gylx.vue
@@ -261,7 +261,7 @@
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'GYLX',
components: {
Pagination
},
@@ -634,7 +634,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
- this.isFullscreen = window.innerHeight < 800
+ // this.isFullscreen = window.innerHeight < 800
})
}
}
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index e0cf030..5f98a55 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -427,7 +427,7 @@
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'JPGJ',
components: {
Pagination
},
@@ -817,7 +817,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
- this.isFullscreen = window.innerHeight < 800
+ // this.isFullscreen = window.innerHeight < 800
})
}
}
diff --git a/src/views/zzmx/wllx.vue b/src/views/zzmx/wllx.vue
index 5fac28a..30a2b38 100644
--- a/src/views/zzmx/wllx.vue
+++ b/src/views/zzmx/wllx.vue
@@ -153,7 +153,7 @@
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'WLLX',
components: {
Pagination
},
--
Gitblit v1.9.3