From 95af123562c0a05ae8955d53fcdcd4c8b310ced8 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 29 六月 2022 17:32:00 +0800
Subject: [PATCH] 1.制造模型：工艺路线(新增、删除、预览)功能开发 2.制造模型：工序定义(查询) 功能开发 3.系统设置：编码规则(查询)功能开发4.修改实施部提出的bug
---
src/api/wlgl.js | 14
src/views/jcsz/zzjg.vue | 1
src/views/zzmx/chda.vue | 4
src/views/xtsy/index.vue | 2
src/api/zzmx.js | 68 +-
src/views/jcsz/wldw.vue | 1
src/views/zzmx/gylx.vue | 431 ++++++++-----
src/views/sbgl/sbqd.vue | 4
src/store/modules/permission.js | 5
src/layout/components/TagsView/index.vue | 12
src/router/index.js | 118 +-
src/api/xtsz.js | 27
src/views/jcsz/yhqd.vue | 2
src/views/jcsz/jsqd.vue | 4
src/api/sbgl.js | 26
src/views/wlgl/ckdy.vue | 2
src/views/xtsz/bmgz.vue | 512 ++++++++++++++++
src/layout/components/Sidebar/index.vue | 2
src/views/zzmx/gxdy.vue | 591 ++++++++++++++++++
src/views/wlgl/kwdy.vue | 2
src/views/zzmx/wllx.vue | 2
21 files changed, 1,536 insertions(+), 294 deletions(-)
diff --git a/src/api/sbgl.js b/src/api/sbgl.js
index a615205..6c02711 100644
--- a/src/api/sbgl.js
+++ b/src/api/sbgl.js
@@ -3,7 +3,7 @@
// 璁惧绫诲瀷鏌ヨ
export function DeviceTypeSearch(data) {
return request({
- url: 'BasicSetting/DeviceTypeSearch',
+ url: 'DeviceManager/DeviceTypeSearch',
method: 'get',
params: data
})
@@ -11,7 +11,7 @@
// 璁惧绫诲瀷鏂板
export function AddUpdateDeviceType(data) {
return request({
- url: 'BasicSetting/AddUpdateDeviceType',
+ url: 'DeviceManager/AddUpdateDeviceType',
method: 'post',
data
})
@@ -19,7 +19,7 @@
// 璁惧绫诲瀷鍒犻櫎
export function DeleteDeviceType(data) {
return request({
- url: 'BasicSetting/DeleteDeviceType',
+ url: 'DeviceManager/DeleteDeviceType',
method: 'post',
params: data
})
@@ -27,14 +27,14 @@
// 璁惧绫诲瀷涓嬫媺妗嗘帴鍙�
export function DeviceTypeSelect() {
return request({
- url: 'BasicSetting/DeviceTypeSelect',
+ url: 'DeviceManager/DeviceTypeSelect',
method: 'get'
})
}
// 璁惧缁勬煡璇�
export function DeviceGroupSearch(data) {
return request({
- url: 'BasicSetting/DeviceGroupSearch',
+ url: 'DeviceManager/DeviceGroupSearch',
method: 'get',
params: data
})
@@ -42,7 +42,7 @@
// 璁惧缁勬柊澧�
export function AddUpdateDeviceGroup(data) {
return request({
- url: 'BasicSetting/AddUpdateDeviceGroup',
+ url: 'DeviceManager/AddUpdateDeviceGroup',
method: 'post',
data
})
@@ -50,7 +50,7 @@
// 璁惧缁勫垹闄�
export function DeleteDeviceGroup(data) {
return request({
- url: 'BasicSetting/DeleteDeviceGroup',
+ url: 'DeviceManager/DeleteDeviceGroup',
method: 'post',
params: data
})
@@ -58,7 +58,7 @@
// 璁惧绫诲瀷鏌ユ壘璁惧缁�
export function DeviceTypeSelectGroup(data) {
return request({
- url: 'BasicSetting/DeviceTypeSelectGroup',
+ url: 'DeviceManager/DeviceTypeSelectGroup',
method: 'get',
params: data
})
@@ -66,7 +66,7 @@
// 璁惧娓呭崟鏌ヨ
export function DeviceMangerSearch(data) {
return request({
- url: 'BasicSetting/DeviceMangerSearch',
+ url: 'DeviceManager/DeviceMangerSearch',
method: 'get',
params: data
})
@@ -74,7 +74,7 @@
// 璁惧娓呭崟鏂板缂栬緫
export function AddUpdateDeviceManger(data) {
return request({
- url: 'BasicSetting/AddUpdateDeviceManger',
+ url: 'DeviceManager/AddUpdateDeviceManger',
method: 'post',
data
})
@@ -82,7 +82,7 @@
// 璁惧娓呭崟鍒犻櫎
export function DeleteDeviceManger(data) {
return request({
- url: 'BasicSetting/DeleteDeviceManger',
+ url: 'DeviceManager/DeleteDeviceManger',
method: 'post',
params: data
})
@@ -90,14 +90,14 @@
// 鎵�灞炶溅闂翠笅鎷夋帴鍙�
export function WorkShopSelect() {
return request({
- url: 'BasicSetting/WorkShopSelect',
+ url: 'DeviceManager/WorkShopSelect',
method: 'get'
})
}
// 鎵�灞炶溅闂存煡鎵炬墍灞炰骇绾挎帴鍙�
export function WorkShopSelectLine(data) {
return request({
- url: 'BasicSetting/WorkShopSelectLine',
+ url: 'DeviceManager/WorkShopSelectLine',
method: 'get',
params: data
})
diff --git a/src/api/wlgl.js b/src/api/wlgl.js
index 11fff8e..612a590 100644
--- a/src/api/wlgl.js
+++ b/src/api/wlgl.js
@@ -3,7 +3,7 @@
// 浠撳簱瀹氫箟鏌ヨ
export function WareHouseDefSearch(data) {
return request({
- url: 'BasicSetting/WareHouseDefSearch',
+ url: 'MaterialManager/WareHouseDefSearch',
method: 'get',
params: data
})
@@ -12,7 +12,7 @@
// 浠撳簱瀹氫箟鏂板缂栬緫
export function AddUpdateWareHouseDef(data) {
return request({
- url: 'BasicSetting/AddUpdateWareHouseDef',
+ url: 'MaterialManager/AddUpdateWareHouseDef',
method: 'post',
data
})
@@ -21,7 +21,7 @@
// 浠撳簱鍒犻櫎
export function DeleteWareHouseDef(data) {
return request({
- url: 'BasicSetting/DeleteWareHouseDef',
+ url: 'MaterialManager/DeleteWareHouseDef',
method: 'post',
params: data
})
@@ -30,7 +30,7 @@
// 鎵�灞炰粨搴撴帴鍙�
export function WareHouseSelect() {
return request({
- url: 'BasicSetting/WareHouseSelect',
+ url: 'MaterialManager/WareHouseSelect',
method: 'get'
})
}
@@ -38,7 +38,7 @@
// 搴撲綅瀹氫箟鏌ヨ
export function StorageDefSearch(data) {
return request({
- url: 'BasicSetting/StorageDefSearch',
+ url: 'MaterialManager/StorageDefSearch',
method: 'get',
params: data
})
@@ -46,7 +46,7 @@
// 搴撲綅瀹氫箟鏂板缂栬緫
export function AddUpdateStorageDef(data) {
return request({
- url: 'BasicSetting/AddUpdateStorageDef',
+ url: 'MaterialManager/AddUpdateStorageDef',
method: 'post',
data
})
@@ -54,7 +54,7 @@
// 搴撲綅鍒犻櫎
export function DeleteStorageDef(data) {
return request({
- url: 'BasicSetting/DeleteStorageDef',
+ url: 'MaterialManager/DeleteStorageDef',
method: 'post',
params: data
})
diff --git a/src/api/xtsz.js b/src/api/xtsz.js
new file mode 100644
index 0000000..d3c6b84
--- /dev/null
+++ b/src/api/xtsz.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+// 缂栫爜瑙勫垯鏌ヨ
+export function EncodingRules(data) {
+ return request({
+ url: 'SystemSetting/EncodingRules',
+ method: 'get',
+ params: data
+ })
+}
+// 缂栫爜瑙勫垯缂栬緫淇濆瓨
+export function SaveEncodingRules(data) {
+ return request({
+ url: 'SystemSetting/SaveEncodingRules',
+ method: 'post',
+ data
+ })
+}
+
+// 鑾峰彇瑙勫垯鐢熸垚鐨勭紪鐮�
+export function NewEncodingRules(data) {
+ return request({
+ url: 'SystemSetting/NewEncodingRules',
+ method: 'get',
+ params: data
+ })
+}
diff --git a/src/api/zzmx.js b/src/api/zzmx.js
index 712e51e..57ad744 100644
--- a/src/api/zzmx.js
+++ b/src/api/zzmx.js
@@ -3,7 +3,7 @@
// 瀛樿揣绫诲瀷鎺ュ彛
export function StockTypeSelect() {
return request({
- url: 'BasicSetting/StockTypeSelect',
+ url: 'ProductModel/StockTypeSelect',
method: 'get'
})
}
@@ -11,7 +11,7 @@
// 鐗╂枡绫诲瀷鏌ヨ
export function MaterialTypeSearch(data) {
return request({
- url: 'BasicSetting/MaterialTypeSearch',
+ url: 'ProductModel/MaterialTypeSearch',
method: 'get',
params: data
})
@@ -20,7 +20,7 @@
// 鐗╂枡绫诲瀷鏂板缂栬緫
export function AddUpdateMaterialType(data) {
return request({
- url: 'BasicSetting/AddUpdateMaterialType',
+ url: 'ProductModel/AddUpdateMaterialType',
method: 'post',
data
})
@@ -29,7 +29,7 @@
// 鐗╂枡绫诲瀷鍒犻櫎
export function DeleteMaterialType(data) {
return request({
- url: 'BasicSetting/DeleteMaterialType',
+ url: 'ProductModel/DeleteMaterialType',
method: 'post',
params: data
})
@@ -38,7 +38,7 @@
// 鍗曚綅鍒楄〃鏌ヨ
export function UomSearch(data) {
return request({
- url: 'BasicSetting/UomSearch',
+ url: 'ProductModel/UomSearch',
method: 'get',
params: data
})
@@ -46,7 +46,7 @@
// 鍗曚綅鏂板
export function UomAdd(data) {
return request({
- url: 'BasicSetting/UomAdd',
+ url: 'ProductModel/UomAdd',
method: 'post',
data
})
@@ -54,7 +54,7 @@
// 鍗曚綅鍒犻櫎
export function UomDelete(data) {
return request({
- url: 'BasicSetting/UomDelete',
+ url: 'ProductModel/UomDelete',
method: 'post',
params: data
})
@@ -62,7 +62,7 @@
// 瀛樼被鍨嬫煡鎵剧墿鏂欑被鍨�
export function StockTypeSelectMaterialType(data) {
return request({
- url: 'BasicSetting/StockTypeSelectMaterialType',
+ url: 'ProductModel/StockTypeSelectMaterialType',
method: 'get',
params: data
})
@@ -70,7 +70,7 @@
// 瀛樿揣妗ｆ鏌ヨ
export function InventoryFileSelect(data) {
return request({
- url: 'BasicSetting/InventoryFileSelect',
+ url: 'ProductModel/InventoryFileSelect',
method: 'get',
params: data
})
@@ -79,7 +79,7 @@
// 瀛樿揣妗ｆ鏂板缂栬緫
export function AddUpdateInventoryFile(data) {
return request({
- url: 'BasicSetting/AddUpdateInventoryFile',
+ url: 'ProductModel/AddUpdateInventoryFile',
method: 'post',
data
})
@@ -87,7 +87,7 @@
// 瀛樿揣妗ｆ鍒犻櫎
export function DeleteInventoryFile(data) {
return request({
- url: 'BasicSetting/DeleteInventoryFile',
+ url: 'ProductModel/DeleteInventoryFile',
method: 'post',
params: data
})
@@ -95,7 +95,7 @@
// 瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鏌ヨ
export function InventoryFileAssociationRoute(data) {
return request({
- url: 'BasicSetting/InventoryFileAssociationRoute',
+ url: 'ProductModel/InventoryFileAssociationRoute',
method: 'get',
params: data
})
@@ -103,7 +103,7 @@
// 瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鎻愪氦
export function SaveInventoryFile(partcode, data) {
return request({
- url: 'BasicSetting/SaveInventoryFile?partcode=' + partcode,
+ url: 'ProductModel/SaveInventoryFile?partcode=' + partcode,
method: 'post',
data
})
@@ -111,7 +111,7 @@
// 宸ヨ壓璺嚎鏌ヨ
export function RouteSearch(data) {
return request({
- url: 'BasicSetting/RouteSearch',
+ url: 'ProductModel/RouteSearch',
method: 'get',
params: data
})
@@ -119,7 +119,7 @@
// 宸ヨ壓璺嚎棰勮
export function ViewRoute(data) {
return request({
- url: 'BasicSetting/ViewRoute',
+ url: 'ProductModel/ViewRoute',
method: 'get',
params: data
})
@@ -127,7 +127,7 @@
// 宸ヨ壓璺嚎鏂板缂栬緫
export function AddUpdateRoute(id, opertype, data) {
return request({
- url: 'BasicSetting/AddUpdateRoute?id=' + id + '&opertype=' + opertype,
+ url: 'ProductModel/AddUpdateRoute?id=' + id + '&opertype=' + opertype,
method: 'post',
data
})
@@ -136,7 +136,7 @@
// 宸ヨ壓璺嚎鍒犻櫎
export function DeleteRoute(data) {
return request({
- url: 'BasicSetting/DeleteRoute',
+ url: 'ProductModel/DeleteRoute',
method: 'post',
params: data
})
@@ -144,7 +144,7 @@
// 宸ュ簭鏌ヨ
export function StepSearch(data) {
return request({
- url: 'BasicSetting/StepSearch',
+ url: 'ProductModel/StepSearch',
method: 'get',
params: data
})
@@ -152,7 +152,7 @@
// 宸ュ簭鏂板缂栬緫
export function AddUpdateStep(data) {
return request({
- url: 'BasicSetting/AddUpdateStep',
+ url: 'ProductModel/AddUpdateStep',
method: 'post',
data
})
@@ -160,7 +160,7 @@
// 宸ュ簭鍒犻櫎
export function DeleteStep(data) {
return request({
- url: 'BasicSetting/DeleteStep',
+ url: 'ProductModel/DeleteStep',
method: 'post',
params: data
})
@@ -169,7 +169,7 @@
// 宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐煡璇�
export function StepAssociationEqp(data) {
return request({
- url: 'BasicSetting/StepAssociationEqp',
+ url: 'ProductModel/StepAssociationEqp',
method: 'get',
params: data
})
@@ -177,7 +177,7 @@
// 宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐彁浜�
export function SaveStepAssociationEqp(stepcode, data) {
return request({
- url: 'BasicSetting/SaveStepAssociationEqp?stepcode=' + stepcode,
+ url: 'ProductModel/SaveStepAssociationEqp?stepcode=' + stepcode,
method: 'post',
data
})
@@ -185,7 +185,7 @@
// 宸ュ簭鍏宠仈缂洪櫡鏌ヨ
export function StepAssociationDefect(data) {
return request({
- url: 'BasicSetting/StepAssociationDefect',
+ url: 'ProductModel/StepAssociationDefect',
method: 'get',
params: data
})
@@ -193,7 +193,7 @@
// 宸ュ簭鍏宠仈缂洪櫡鎻愪氦
export function SaveStepAssociationDefect(stepcode, data) {
return request({
- url: 'BasicSetting/SaveStepAssociationDefect?stepcode=' + stepcode,
+ url: 'ProductModel/SaveStepAssociationDefect?stepcode=' + stepcode,
method: 'post',
data
})
@@ -201,14 +201,14 @@
// 浜у搧淇℃伅涓嬫媺妗嗘煡璇�
export function PartSelect() {
return request({
- url: 'BasicSetting/PartSelect',
+ url: 'ProductModel/PartSelect',
method: 'get'
})
}
// 浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺妗�
export function PartSelectRpute(data) {
return request({
- url: 'BasicSetting/PartSelectRpute',
+ url: 'ProductModel/PartSelectRpute',
method: 'get',
params: data
})
@@ -216,7 +216,7 @@
// 鏍规嵁宸ヨ壓璺嚎缂栫爜鏌ユ壘鍏宠仈宸ュ簭闆嗗悎
export function RouteSelectStep(data) {
return request({
- url: 'BasicSetting/RouteSelectStep',
+ url: 'ProductModel/RouteSelectStep',
method: 'get',
params: data
})
@@ -224,7 +224,7 @@
// 鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囬泦鍚�
export function StepSelectEqp(data) {
return request({
- url: 'BasicSetting/StepSelectEqp',
+ url: 'ProductModel/StepSelectEqp',
method: 'get',
params: data
})
@@ -232,7 +232,7 @@
// 鑺傛媿宸ヤ环鏌ヨ
export function BeatRateSearch(data) {
return request({
- url: 'BasicSetting/BeatRateSearch',
+ url: 'ProductModel/BeatRateSearch',
method: 'get',
params: data
})
@@ -240,7 +240,7 @@
// 鑺傛媿宸ヤ环鎻愪氦
export function SaveBeatRate(data) {
return request({
- url: 'BasicSetting/SaveBeatRate',
+ url: 'ProductModel/SaveBeatRate',
method: 'post',
data
})
@@ -248,7 +248,7 @@
// 鑺傛媿宸ヤ环鍒犻櫎
export function DeleteBeatRate(data) {
return request({
- url: 'BasicSetting/DeleteBeatRate',
+ url: 'ProductModel/DeleteBeatRate',
method: 'post',
params: data
})
@@ -257,14 +257,14 @@
// 瀛樿揣妗ｆ浣跨敤鍗曚綅涓嬫媺
export function UomSelect() {
return request({
- url: 'BasicSetting/UomSelect',
+ url: 'ProductModel/UomSelect',
method: 'get'
})
}
// 宸ヨ壓璺嚎宸ヨ壓璁剧疆涓嬫媺
-export function RouteSelect() {
+export function StepSelect() {
return request({
- url: 'BasicSetting/RouteSelect',
+ url: 'ProductModel/StepSelect',
method: 'get'
})
}
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 32f68d3..dc2fddb 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -39,6 +39,7 @@
import SidebarItem from './SidebarItem'
import variables from '@/styles/variables.scss'
import { LoginMenu } from '@/api/user'
+import { setCookie } from '@/utils/auth'
export default {
components: { SidebarItem, Logo },
@@ -59,6 +60,7 @@
const route = this.$route
const { meta, path } = route
// if set path, the sidebar will highlight the path you set
+ setCookie('ruleCode', meta.code)// 灏嗙紪鐮佽鍒檆ode瀛樺埌cookie閲岄潰
if (meta.activeMenu) {
return meta.activeMenu
}
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 12d2bc4..18d4a2c 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -16,12 +16,12 @@
<span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
</router-link>
</scroll-pane>
- <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
- <li @click="refreshSelectedTag(selectedTag)">鍒锋柊</li>
- <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">鍏抽棴</li>
- <li @click="closeOthersTags">鍏抽棴鍏朵粬</li>
- <li @click="closeAllTags(selectedTag)">鍏抽棴鎵�鏈�</li>
- </ul>
+ <!-- <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">-->
+ <!-- <li @click="refreshSelectedTag(selectedTag)">鍒锋柊</li>-->
+ <!-- <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">鍏抽棴</li>-->
+ <!-- <li @click="closeOthersTags">鍏抽棴鍏朵粬</li>-->
+ <!-- <li @click="closeAllTags(selectedTag)">鍏抽棴鎵�鏈�</li>-->
+ <!-- </ul>-->
</div>
</template>
diff --git a/src/router/index.js b/src/router/index.js
index 5076bfa..cc9d183 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -73,7 +73,7 @@
redirect: '/jcsz/zzjg',
name: '鍩虹璁剧疆',
code: '1001',
- meta: { title: '鍩虹璁剧疆', icon: 'tree' },
+ meta: { code: '1001', title: '鍩虹璁剧疆', icon: 'tree' },
alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
children: [
{
@@ -81,31 +81,31 @@
name: '缁勭粐鏋舵瀯',
code: '1010',
component: () => import('@/views/jcsz/zzjg'),
- meta: { title: '缁勭粐鏋舵瀯', icon: '' }
+ meta: { code: '1010', title: '缁勭粐鏋舵瀯', icon: '' }
}, {
path: 'yhqd',
name: '鐢ㄦ埛娓呭崟',
code: '1011',
component: () => import('@/views/jcsz/yhqd'),
- meta: { title: '鐢ㄦ埛娓呭崟', icon: '' }
+ meta: { code: '1011', title: '鐢ㄦ埛娓呭崟', icon: '' }
}, {
path: 'jsqd',
name: '瑙掕壊娓呭崟',
code: '1012',
component: () => import('@/views/jcsz/jsqd'),
- meta: { title: '瑙掕壊娓呭崟', icon: '' }
+ meta: { code: '1012', title: '瑙掕壊娓呭崟', icon: '' }
}, {
path: 'wldw',
name: '寰�鏉ュ崟浣�',
code: '1013',
component: () => import('@/views/jcsz/wldw'),
- meta: { title: '寰�鏉ュ崟浣�', icon: '' }
+ meta: { code: '1013', title: '寰�鏉ュ崟浣�', icon: '' }
}, {
path: 'adsz',
name: '瀹夌伅璁剧疆',
code: '1014',
component: () => import('@/views/jcsz/adsz'),
- meta: { title: '瀹夌伅璁剧疆', icon: '' }
+ meta: { code: '1014', title: '瀹夌伅璁剧疆', icon: '' }
}
]
},
@@ -115,7 +115,7 @@
redirect: '/sbgl/sblx',
name: '璁惧绠＄悊',
code: '1002',
- meta: { title: '璁惧绠＄悊', icon: 'example' },
+ meta: { code: '1002', title: '璁惧绠＄悊', icon: 'example' },
alwaysShow: true,
children: [
{
@@ -123,68 +123,68 @@
name: '璁惧绫诲瀷',
code: '1020',
component: () => import('@/views/sbgl/sblx'),
- meta: { title: '璁惧绫诲瀷', icon: '' }
+ meta: { code: '1020', title: '璁惧绫诲瀷', icon: '' }
},
{
path: 'wxjl',
code: '1029',
name: '缁翠慨璁板綍',
component: () => import('@/views/sbgl/wxjl'),
- meta: { title: '缁翠慨璁板綍', icon: '' }
+ meta: { code: '1029', title: '缁翠慨璁板綍', icon: '' }
}, {
path: 'sbz',
name: '璁惧缁�',
code: '1021',
component: () => import('@/views/sbgl/sbz'),
- meta: { title: '璁惧缁�', icon: '' }
+ meta: { code: '1021', title: '璁惧缁�', icon: '' }
}, {
path: 'sbqd',
name: '璁惧娓呭崟',
code: '1022',
component: () => import('@/views/sbgl/sbqd'),
- meta: { title: '璁惧娓呭崟', icon: '' }
+ meta: { code: '1022', title: '璁惧娓呭崟', icon: '' }
},
{
path: 'djbz',
name: '鐐规鏍囧噯',
code: '1023',
component: () => import('@/views/sbgl/djbz'),
- meta: { title: '鐐规鏍囧噯', icon: '' }
+ meta: { code: '1023', title: '鐐规鏍囧噯', icon: '' }
},
{
path: 'djbw',
name: '鐐规閮ㄤ綅',
code: '1024',
component: () => import('@/views/sbgl/djbw'),
- meta: { title: '鐐规閮ㄤ綅', icon: '' }
+ meta: { code: '1024', title: '鐐规閮ㄤ綅', icon: '' }
},
{
path: 'bybz',
name: '淇濆吇鏍囧噯',
code: '1025',
component: () => import('@/views/sbgl/bybz'),
- meta: { title: '淇濆吇鏍囧噯', icon: '' }
+ meta: { code: '1025', title: '淇濆吇鏍囧噯', icon: '' }
},
{
path: 'bybw',
name: '淇濆吇閮ㄤ綅',
code: '1026',
component: () => import('@/views/sbgl/bybw'),
- meta: { title: '淇濆吇閮ㄤ綅', icon: '' }
+ meta: { code: '1026', title: '淇濆吇閮ㄤ綅', icon: '' }
},
{
path: 'djjl',
name: '鐐规璁板綍',
code: '1027',
component: () => import('@/views/sbgl/djjl'),
- meta: { title: '鐐规璁板綍', icon: '' }
+ meta: { code: '1027', title: '鐐规璁板綍', icon: '' }
},
{
path: 'byjl',
name: '淇濆吇璁板綍',
code: '1028',
component: () => import('@/views/sbgl/byjl'),
- meta: { title: '淇濆吇璁板綍', icon: '' }
+ meta: { code: '1028', title: '淇濆吇璁板綍', icon: '' }
}
]
},
@@ -194,7 +194,7 @@
redirect: '/gzgl/gzlx',
name: '宸ヨ绠＄悊',
code: '1003',
- meta: { title: '宸ヨ绠＄悊', icon: 'component' },
+ meta: { code: '1003', title: '宸ヨ绠＄悊', icon: 'component' },
alwaysShow: true,
children: [
{
@@ -202,67 +202,67 @@
name: '宸ヨ绫诲瀷',
code: '1030',
component: () => import('@/views/gzgl/gzlx'),
- meta: { title: '宸ヨ绫诲瀷', icon: '' }
+ meta: { code: '1030', title: '宸ヨ绫诲瀷', icon: '' }
}, {
path: 'sjxj',
name: '涓婃満涓嬫満',
code: '1039',
component: () => import('@/views/gzgl/sjxj'),
- meta: { title: '涓婃満涓嬫満', icon: '' }
+ meta: { code: '1039', title: '涓婃満涓嬫満', icon: '' }
}, {
path: 'ckrk',
name: '鍑哄簱鍏ュ簱',
code: '1040',
component: () => import('@/views/gzgl/ckrk'),
- meta: { title: '鍑哄簱鍏ュ簱', icon: '' }
+ meta: { code: '1040', title: '鍑哄簱鍏ュ簱', icon: '' }
}, {
path: 'gzqd',
name: '宸ヨ娓呭崟',
code: '1031',
component: () => import('@/views/gzgl/gzqd'),
- meta: { title: '宸ヨ娓呭崟', icon: '' }
+ meta: { code: '1031', title: '宸ヨ娓呭崟', icon: '' }
}, {
path: 'djbz',
name: '鐐规鏍囧噯',
code: '1032',
component: () => import('@/views/gzgl/djbz'),
- meta: { title: '鐐规鏍囧噯', icon: '' }
+ meta: { code: '1032', title: '鐐规鏍囧噯', icon: '' }
}, {
path: 'djbw',
name: '鐐规閮ㄤ綅',
code: '1033',
component: () => import('@/views/gzgl/djbw'),
- meta: { title: '鐐规閮ㄤ綅', icon: '' }
+ meta: { code: '1033', title: '鐐规閮ㄤ綅', icon: '' }
}, {
path: 'bybz',
name: '淇濆吇鏍囧噯',
code: '1034',
component: () => import('@/views/gzgl/bybz'),
- meta: { title: '淇濆吇鏍囧噯', icon: '' }
+ meta: { code: '1034', title: '淇濆吇鏍囧噯', icon: '' }
}, {
path: 'bybw',
name: '淇濆吇閮ㄤ綅',
code: '1035',
component: () => import('@/views/gzgl/bybw'),
- meta: { title: '淇濆吇閮ㄤ綅', icon: '' }
+ meta: { code: '1035', title: '淇濆吇閮ㄤ綅', icon: '' }
}, {
path: 'djjl',
name: '鐐规璁板綍',
code: '1036',
component: () => import('@/views/gzgl/djjl'),
- meta: { title: '鐐规璁板綍', icon: '' }
+ meta: { code: '1036', title: '鐐规璁板綍', icon: '' }
}, {
path: 'byjl',
name: '淇濆吇璁板綍',
code: '1037',
component: () => import('@/views/gzgl/byjl'),
- meta: { title: '淇濆吇璁板綍', icon: '' }
+ meta: { code: '1037', title: '淇濆吇璁板綍', icon: '' }
}, {
path: 'gzwx',
name: '宸ヨ缁翠慨',
code: '1038',
component: () => import('@/views/gzgl/gzwx'),
- meta: { title: '宸ヨ缁翠慨', icon: '' }
+ meta: { code: '1038', title: '宸ヨ缁翠慨', icon: '' }
}
]
},
@@ -272,7 +272,7 @@
redirect: '/wlgl/ckdy',
name: '鐗╂枡绠＄悊',
code: '1004',
- meta: { title: '鐗╂枡绠＄悊', icon: 'table' },
+ meta: { code: '1004', title: '鐗╂枡绠＄悊', icon: 'table' },
alwaysShow: true,
children: [
{
@@ -280,38 +280,38 @@
name: '浠撳簱瀹氫箟',
code: '1050',
component: () => import('@/views/wlgl/ckdy'),
- meta: { title: '浠撳簱瀹氫箟', icon: '' }
+ meta: { code: '1050', title: '浠撳簱瀹氫箟', icon: '' }
},
{
path: 'kwdy',
name: '搴撲綅瀹氫箟',
code: '1051',
component: () => import('@/views/wlgl/kwdy'),
- meta: { title: '搴撲綅瀹氫箟', icon: '' }
+ meta: { code: '1051', title: '搴撲綅瀹氫箟', icon: '' }
}, {
path: 'rqlx',
name: '瀹瑰櫒绫诲瀷',
code: '1052',
component: () => import('@/views/wlgl/rqlx'),
- meta: { title: '瀹瑰櫒绫诲瀷', icon: '' }
+ meta: { code: '1052', title: '瀹瑰櫒绫诲瀷', icon: '' }
}, {
path: 'rqqd',
name: '瀹瑰櫒娓呭崟',
code: '1053',
component: () => import('@/views/wlgl/rqqd'),
- meta: { title: '瀹瑰櫒娓呭崟', icon: '' }
+ meta: { code: '1053', title: '瀹瑰櫒娓呭崟', icon: '' }
}, {
path: 'crkjl',
name: '鍑哄叆搴撹褰�',
code: '1054',
component: () => import('@/views/wlgl/crkjl'),
- meta: { title: '鍑哄叆搴撹褰�', icon: '' }
+ meta: { code: '1054', title: '鍑哄叆搴撹褰�', icon: '' }
}, {
path: 'kccx',
name: '搴撳瓨鏌ヨ',
code: '1055',
component: () => import('@/views/wlgl/kccx'),
- meta: { title: '搴撳瓨鏌ヨ', icon: '' }
+ meta: { code: '1055', title: '搴撳瓨鏌ヨ', icon: '' }
}
]
},
@@ -321,7 +321,7 @@
redirect: '/zzmx/gylx',
name: '鍒堕�犳ā鍨�',
code: '1005',
- meta: { title: '鍒堕�犳ā鍨�', icon: 'icu' },
+ meta: { code: '1005', title: '鍒堕�犳ā鍨�', icon: 'icu' },
alwaysShow: true,
children: [
{
@@ -329,40 +329,40 @@
name: '鐗╂枡绫诲瀷',
code: '1060',
component: () => import('@/views/zzmx/wllx'),
- meta: { title: '鐗╂枡绫诲瀷', icon: '' }
+ meta: { code: '1060', title: '鐗╂枡绫诲瀷', icon: '' }
},
{
path: 'chda',
name: '瀛樿揣妗ｆ',
code: '1061',
component: () => import('@/views/zzmx/chda'),
- meta: { title: '瀛樿揣妗ｆ', icon: '' }
+ meta: { code: '1061', title: '瀛樿揣妗ｆ', icon: '' }
}, {
path: 'wlqd',
name: '鐗╂枡娓呭崟',
code: '1062',
component: () => import('@/views/zzmx/wlqd'),
- meta: { title: '鐗╂枡娓呭崟', icon: '' }
+ meta: { code: '1062', title: '鐗╂枡娓呭崟', icon: '' }
},
{
path: 'gylx',
name: '宸ヨ壓璺嚎',
code: '1063',
component: () => import('@/views/zzmx/gylx'),
- meta: { title: '宸ヨ壓璺嚎', icon: '' }
+ meta: { code: '1063', title: '宸ヨ壓璺嚎', icon: '' }
}, {
path: 'gxdy',
name: '宸ュ簭瀹氫箟',
code: '1064',
component: () => import('@/views/zzmx/gxdy'),
- meta: { title: '宸ュ簭瀹氫箟', icon: '' }
+ meta: { code: '1064', title: '宸ュ簭瀹氫箟', icon: '' }
},
{
path: 'jpgj',
name: '鑺傛媿宸ヤ环',
code: '1065',
component: () => import('@/views/zzmx/jpgj'),
- meta: { title: '鑺傛媿宸ヤ环', icon: '' }
+ meta: { code: '1065', title: '鑺傛媿宸ヤ环', icon: '' }
}
]
},
@@ -372,7 +372,7 @@
redirect: '/scgl/scdd',
name: '鐢熶骇绠＄悊',
code: '1006',
- meta: { title: '鐢熶骇绠＄悊', icon: 'production' },
+ meta: { code: '1006', title: '鐢熶骇绠＄悊', icon: 'production' },
alwaysShow: true,
children: [
{
@@ -380,25 +380,25 @@
name: 'ERP鐢熶骇璁㈠崟',
code: '1070',
component: () => import('@/views/scgl/scdd'),
- meta: { title: 'ERP鐢熶骇璁㈠崟', icon: '' }
+ meta: { code: '1070', title: 'ERP鐢熶骇璁㈠崟', icon: '' }
}, {
path: 'gd',
name: 'MES宸ュ崟',
code: '1071',
component: () => import('@/views/scgl/gd'),
- meta: { title: 'MES宸ュ崟', icon: '' }
+ meta: { code: '1071', title: 'MES宸ュ崟', icon: '' }
}, {
path: 'gdpg',
name: '宸ュ崟娲惧伐',
code: '1072',
component: () => import('@/views/scgl/gdpg'),
- meta: { title: '宸ュ崟娲惧伐', icon: '' }
+ meta: { code: '1072', title: '宸ュ崟娲惧伐', icon: '' }
}, {
path: 'sckbg',
name: '鐢熶骇寮�鎶ュ伐',
code: '1073',
component: () => import('@/views/scgl/sckbg'),
- meta: { title: '鐢熶骇寮�鎶ュ伐', icon: '' }
+ meta: { code: '1073', title: '鐢熶骇寮�鎶ュ伐', icon: '' }
}
]
},
@@ -408,7 +408,7 @@
redirect: '/zlgl/zjbz',
name: '璐ㄩ噺绠＄悊',
code: '1007',
- meta: { title: '璐ㄩ噺绠＄悊', icon: 'quality' },
+ meta: { code: '1007', title: '璐ㄩ噺绠＄悊', icon: 'quality' },
alwaysShow: true,
children: [
{
@@ -416,31 +416,31 @@
name: '璐ㄦ鏍囧噯',
code: '1080',
component: () => import('@/views/zlgl/zjbz'),
- meta: { title: '璐ㄦ鏍囧噯', icon: '' }
+ meta: { code: '1080', title: '璐ㄦ鏍囧噯', icon: '' }
}, {
path: 'qxdy',
name: '缂洪櫡瀹氫箟',
code: '1081',
component: () => import('@/views/zlgl/qxdy'),
- meta: { title: '缂洪櫡瀹氫箟', icon: '' }
+ meta: { code: '1081', title: '缂洪櫡瀹氫箟', icon: '' }
}, {
path: 'gxjy',
name: '宸ュ簭妫�楠�',
code: '1082',
component: () => import('@/views/zlgl/gxjy'),
- meta: { title: '宸ュ簭妫�楠�', icon: '' }
+ meta: { code: '1082', title: '宸ュ簭妫�楠�', icon: '' }
}, {
path: 'wljy',
name: '鐗╂祦妫�楠�',
code: '1083',
component: () => import('@/views/zlgl/wljy'),
- meta: { title: '鐗╂祦妫�楠�', icon: '' }
+ meta: { code: '1083', title: '鐗╂祦妫�楠�', icon: '' }
}, {
path: 'qxsj',
name: '缂洪櫡缁熻',
code: '1084',
component: () => import('@/views/zlgl/qxsj'),
- meta: { title: '缂洪櫡缁熻', icon: '' }
+ meta: { code: '1084', title: '缂洪櫡缁熻', icon: '' }
}
]
},
@@ -450,7 +450,7 @@
redirect: '/xtsz/bmgz',
name: '绯荤粺璁剧疆',
code: '1009',
- meta: { title: '绯荤粺璁剧疆', icon: 'xtsz' },
+ meta: { code: '1009', title: '绯荤粺璁剧疆', icon: 'xtsz' },
alwaysShow: true,
children: [
{
@@ -458,25 +458,25 @@
name: '缂栫爜瑙勫垯',
code: '1101',
component: () => import('@/views/xtsz/bmgz'),
- meta: { title: '缂栫爜瑙勫垯', icon: '' }
+ meta: { code: '1101', title: '缂栫爜瑙勫垯', icon: '' }
}, {
path: 'mmxg',
name: '瀵嗙爜淇敼',
code: '1102',
component: () => import('@/views/xtsz/mmxg'),
- meta: { title: '瀵嗙爜淇敼', icon: '' }
+ meta: { code: '1102', title: '瀵嗙爜淇敼', icon: '' }
}, {
path: 'xtrz',
name: '绯荤粺鏃ュ織',
code: '1103',
component: () => import('@/views/xtsz/xtrz'),
- meta: { title: '绯荤粺鏃ュ織', icon: '' }
+ meta: { code: '1103', title: '绯荤粺鏃ュ織', icon: '' }
}, {
path: 'sc',
name: 'SOP涓婁紶',
code: '1104',
component: () => import('@/views/xtsz/sc'),
- meta: { title: 'SOP涓婁紶', icon: '' }
+ meta: { code: '1104', title: 'SOP涓婁紶', icon: '' }
}
]
}
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index ba5f887..809349b 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -17,11 +17,14 @@
*/
export function getAsyncRoutes(routes, menu) {
const menuCode = []// 灏嗗悗绔痗ode鍙栧嚭瀛樻垚鏁扮粍褰㈠紡
+ const menuNameAndCode = []// 灏嗗悗绔痗ode涓巒ame鍙栧嚭瀛樻垚鏁扮粍褰㈠紡
menu.forEach(item => {
menuCode.push(item.code)
+ menuNameAndCode.push({ code: item.code, name: item.name })
if (item.children && item.children.length > 0) {
item.children.forEach(it => {
menuCode.push(it.code)
+ menuNameAndCode.push({ code: it.code, name: it.name })
})
}
})
@@ -30,10 +33,12 @@
routes.forEach(item => {
if (menuCode.includes(item.code) && item.children && item.children.length > 0) {
+ item.meta.title = menuNameAndCode.find(item2 => item2.code === item.code).name
const children = []
let flag = false// 鍒ゆ柇鏄惁鏈塩hildren瀛樿繘鍘�
item.children.forEach(it => {
if (menuCode.includes(it.code)) {
+ it.meta.title = menuNameAndCode.find(item2 => item2.code === it.code).name
children.push(it)
flag = true
}
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index a828cbb..a6ff328 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -154,6 +154,7 @@
:visible.sync="dialogVisible"
width="50%"
top="15vh"
+ :close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
>
@@ -197,6 +198,7 @@
:visible.sync="settingDialogVisible"
width="50%"
top="15vh"
+ :close-on-click-modal="false"
class="settingDialogVisible"
@close="handleCloseSetting"
>
@@ -277,6 +279,7 @@
title="瑙掕壊鍏宠仈鐢ㄦ埛"
:visible.sync="userDialogVisible"
width="80%"
+ :close-on-click-modal="false"
top="15vh"
class="userDialogVisible"
@closed="handleCloseUser"
@@ -421,6 +424,7 @@
:visible.sync="dialogVisibleRight"
width="50%"
top="15vh"
+ :close-on-click-modal="false"
class="dialogVisibleRight"
@closed="handleCloseRight"
@close="handleCloseRight"
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index 4084e51..5b6d67f 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -166,6 +166,7 @@
:visible.sync="dialogVisible"
width="50%"
top="15vh"
+ :close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
>
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index a4ac8ea..9a79653 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -181,6 +181,7 @@
:title="operation==='add'?'鏂板':'淇敼'"
:visible.sync="dialogVisible"
width="50%"
+ :close-on-click-modal="false"
top="15vh"
@closed="handleClose"
@close="handleClose"
@@ -261,6 +262,7 @@
:visible.sync="dialogVisibleRoles"
width="50%"
top="15vh"
+ :close-on-click-modal="false"
class="dialogVisibleRoles"
@closed="handleCloseRoles"
@close="handleCloseRoles"
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index 235f4ac..9ed8ac4 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -132,6 +132,7 @@
:visible.sync="dialogVisible"
width="50%"
top="15vh"
+ :close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
>
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 22f286a..5532429 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -197,6 +197,7 @@
</div>
<!--璁惧娓呭崟鏂板缂栬緫-->
<el-dialog
+ :close-on-click-modal="false"
:title="operation==='add'?'鏂板':'淇敼'"
:visible.sync="dialogVisible"
width="50%"
@@ -289,7 +290,7 @@
:visible.sync="DeviceTypeDialogVisible"
width="50%"
top="15vh"
-
+ :close-on-click-modal="false"
class="DeviceTypeDialogVisible"
@close="handleCloseDeviceType"
>
@@ -375,6 +376,7 @@
title="璁惧缁�"
:visible.sync="DeviceGroupDialogVisible"
width="70%"
+ :close-on-click-modal="false"
top="15vh"
class="DeviceTypeDialogVisible"
@close="handleCloseDeviceGroup"
diff --git a/src/views/wlgl/ckdy.vue b/src/views/wlgl/ckdy.vue
index dfcfbb4..9f871ec 100644
--- a/src/views/wlgl/ckdy.vue
+++ b/src/views/wlgl/ckdy.vue
@@ -39,6 +39,7 @@
<el-table
:data="tableData"
border
+ stripe
:height="tableHeight"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
@@ -109,6 +110,7 @@
:title="operation==='add'?'鏂板':'淇敼'"
:visible.sync="dialogVisible"
width="50%"
+ :close-on-click-modal="false"
top="15vh"
@closed="handleClose"
@close="handleClose"
diff --git a/src/views/wlgl/kwdy.vue b/src/views/wlgl/kwdy.vue
index f2ec60d..61d9696 100644
--- a/src/views/wlgl/kwdy.vue
+++ b/src/views/wlgl/kwdy.vue
@@ -49,6 +49,7 @@
<el-table
:data="tableData"
border
+ stripe
:height="tableHeight"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
@@ -124,6 +125,7 @@
:title="operation==='add'?'鏂板':'淇敼'"
:visible.sync="dialogVisible"
width="50%"
+ :close-on-click-modal="false"
top="15vh"
@closed="handleClose"
@close="handleClose"
diff --git a/src/views/xtsy/index.vue b/src/views/xtsy/index.vue
index 3cf0876..506d056 100644
--- a/src/views/xtsy/index.vue
+++ b/src/views/xtsy/index.vue
@@ -118,6 +118,8 @@
}
},
created() {
+ console.log(document.documentElement.clientHeight, 1)
+ console.log(document.documentElement.clientWidth, 2)
},
mounted() {
window.addEventListener('resize', this.getHeight)
diff --git a/src/views/xtsz/bmgz.vue b/src/views/xtsz/bmgz.vue
index 5560fd9..f6517c7 100644
--- a/src/views/xtsz/bmgz.vue
+++ b/src/views/xtsz/bmgz.vue
@@ -1,11 +1,517 @@
-<template />
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div style="padding: 10px 5px 0 0">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="80px"
+ inline
+ style="display: flex;justify-content: space-between"
+ >
+ <div class="elForm">
+ <el-form-item label="缂栫爜鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.rightname" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鍥哄畾瀛楃" style=" display: flex;">
+ <el-input v-model="form.prefix" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <!-- <el-select v-model="form.prefix" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">-->
+ <!-- <el-option-->
+ <!-- v-for="item in OrgTypeArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ </el-form-item>
+ <!-- <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">-->
+ <!-- <el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />-->
+ <!-- </el-form-item>-->
+ </div>
+ <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
+ <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ </div>
+ </el-form>
+ </div>
+ <el-divider />
+ <div style="margin-left: 10px;display: flex">
+ <!-- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
+ </div>
+ <!-- <el-divider />-->
+ <div class="elTableDiv">
+ <el-table
+ :data="tableData"
+ :height="tableHeight"
+ border
+ stripe
+ :style="{width: 100+'%',height:tableHeight+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <!-- <el-table-column-->
+ <!-- type="selection"-->
+ <!-- width="50"-->
+ <!-- />-->
+ <el-table-column
+ prop="RowNum"
+ width="50"
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="right_name"
+ label="缂栫爜鍚嶇О"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="prefix"
+ label="鍓嶇紑"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.prefix">{{ row.prefix }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="filingdate"
+ label="鎻愪氦鏃ユ湡"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.filingdate">{{ row.filingdate }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="incbit"
+ label="鑷浣嶆暟"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.incbit">{{ row.incbit }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <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>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getEncodingRules"
+ />
+ </div>
+
+ <el-dialog
+ :title="operation==='add'?'鏂板':'缂栫爜鏍煎紡'"
+ :visible.sync="dialogVisible"
+ width="50%"
+ top="15vh"
+ :close-on-click-modal="false"
+ @closed="handleClose"
+ @close="handleClose"
+ >
+ <el-form ref="dialogForm" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+
+ <el-form-item label="鍥哄畾瀛楃" prop="OrgName">
+ <el-input v-model="dialogForm.OrgName" style="width: 220px" />
+ </el-form-item>
+ <el-form-item prop="SupUnit" label="鎻愪氦鏃ユ湡">
+ <el-select
+ v-model="dialogForm.SupUnit"
+ style="width: 220px"
+ placeholder="璇烽�夋嫨"
+ :popper-append-to-body="false"
+ >
+ <el-option
+ v-for="item in dateType"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鑷浣嶆暟" prop="OrgName">
+ <el-input v-model="dialogForm.OrgName" style="width: 220px" />
+ </el-form-item>
+ <el-form-item label="缂栫爜棰勮">
+ <!-- <el-input v-model="dialogForm.OrgName" style="width: 220px" />-->
+ xxxx
+ </el-form-item>
+ </el-form>
+
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+ </div>
+</template>
<script>
+import Pagination from '@/components/Pagination'
+import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
+import { getCookie } from '@/utils/auth'
+import { EncodingRules } from '@/api/xtsz'
+
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Bmgz'
+ name: 'Zzjg',
+ components: {
+ Pagination
+ },
+ data() {
+ const validateName = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('璇疯緭鍏ョ紪鐮�'))
+ } else {
+ if (SER_HZ.test(value)) {
+ return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
+ } else {
+ callback()
+ }
+ }
+ }
+ return {
+ mainHeight: 0,
+ tableHeight: 0,
+ form: {
+ rightname: '', // 缂栫爜鍚嶇О
+ prefix: '', // 鍥哄畾瀛楃
+ prop: 'right_code', // 鎺掑簭瀛楁
+ order: 'asc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ },
+ dateType: [
+ { label: '骞�', value: 'Y' },
+ { label: '鏈�', value: 'M' },
+ { label: '鏃�', value: 'D' }
+ ],
+
+ total: 10,
+ tableData: [],
+ dialogVisible: false,
+ dialogForm: {
+ OrgType: '',
+ OrgCode: '',
+ OrgName: '',
+ SupUnit: ''// 涓婄骇鍗曚綅
+ },
+ operation: '',
+ dialogFormRules: {
+ // OrgCode: [
+ // { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ // ],
+ OrgName: [
+ { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+ ]
+ }
+
+ }
+ },
+ created() {
+ this.getEncodingRules()
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ methods: {
+ async getEncodingRules() {
+ const res = await EncodingRules(this.form)
+ this.tableData = res.data
+ this.total = res.count
+ // this.tableData = [
+ // { code: 123, name: 'xxx1' }
+ // ]
+ // this.total = 10
+ },
+ // 鎺掑簭鏀瑰彉鏃�
+ sortChange({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.form.order = order
+ this.form.prop = prop
+ this.getEncodingRules()
+ },
+ // 鏌ヨ
+ search() {
+ this.getEncodingRules()
+ },
+ upload() {
+
+ },
+ // 閲嶇疆
+ reset() {
+ this.form.OrgCode = ''
+ this.form.OrgName = ''
+ this.form.OrgType = ''
+ this.form.UserName = ''
+ this.getEncodingRules()
+ },
+
+ // 鏂板鎸夐挳
+ add(operation) {
+ this.operation = operation
+ this.dialogVisible = true
+ },
+ // 淇敼鎸夐挳
+ edit(operation, row) {
+ this.operation = operation
+ this.dialogVisible = true
+
+ this.$nextTick(() => {
+ this.dialogForm.OrgCode = row.org_code
+ this.dialogForm.OrgName = row.org_name
+ this.dialogForm.SupUnit = row.parent_id
+ })
+ },
+ // 鍒犻櫎鎸夐挳
+ async del(row) {
+ this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ DeleteOrganization({ orgid: row.code }).then(res => {
+ if (res.code === '200') {
+ this.$message.success('鍒犻櫎鎴愬姛!')
+ this.getEncodingRules()
+ }
+ })
+ }).catch(() => {
+ this.$message.info('宸插彇娑堝垹闄�')
+ })
+ },
+ // 瀵硅瘽妗嗗叧闂簨浠�
+ handleClose() {
+ this.dialogForm.OrgType = ''
+ this.dialogForm.OrgCode = ''
+ this.dialogForm.OrgName = ''
+ this.dialogForm.SupUnit = ''
+ this.$refs.dialogForm.clearValidate()
+ },
+ // 瀵硅瘽妗嗗彇娑�
+ dialogVisibleCancel() {
+ this.dialogVisible = false
+ },
+ // 瀵硅瘽妗嗙‘璁�
+ dialogVisibleConfirm() {
+ this.$refs.dialogForm.validate(valid => {
+ if (valid) {
+ const data = {
+ OrganCode: this.dialogForm.OrgCode,
+ OrganName: this.dialogForm.OrgName,
+ OperType: this.operation === 'add' ? 'Add' : 'Update',
+ Operator: getCookie('admin')
+ }
+ AddUpdateOrganization(data).then(res => {
+ if (res.code === '200') {
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.dialogVisible = false
+ this.getEncodingRules()
+ } else {
+ this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
+ }
+ })
+ },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 250
+ this.tableHeight = this.mainHeight
+ })
+ }
+ }
}
</script>
-<style scoped>
+<style lang="scss" scoped>
+$main_color: #42b983;
+::v-deep .el-button--primary {
+ background-color: $main_color !important;
+ height: 30px;
+ display: flex;
+ align-items: center;
+ //border: 1px solid $main_color;
+ border: none;
+ padding: 0 20px;
+}
+::v-deep .el-button--primary:hover {
+ border: none;
+}
+::v-deep .el-button--info {
+ height: 30px;
+ display: flex;
+ align-items: center;
+ padding: 0 20px;
+}
+
+::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
+ background-color: $main_color !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
+}
+
+.footerButton {
+ display: flex;
+ justify-content: end;
+}
+
+::v-deep .el-button--default {
+ background-color: #ffffff !important;
+ height: 30px;
+ display: flex;
+ align-items: center;
+ padding: 0 20px;
+}
+
+::v-deep .el-button--default:hover {
+ color: #606266;
+}
+
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
+
+::v-deep .el-radio__input.is-checked .el-radio__inner {
+ background-color: $main_color;
+ border-color: $main_color;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+ color: $main_color !important;
+}
+
+::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
+ border-color: $main_color;
+ background-color: $main_color;
+}
+
+::v-deep .el-input__inner {
+ height: 30px;
+ line-height: 30px;
+}
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-table .caret-wrapper {
+ transform: scale(0.8);
+}
+
+::v-deep .cell {
+ display: flex !important;
+ align-items: center !important;
+ justify-content: space-between !important;
+}
+
+::v-deep .el-button--text {
+ color: $main_color;
+ font-size: 14px;
+ cursor: pointer;
+}
+
+.operationClass {
+ height: 23px;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.el-icon-share {
+ color: $main_color;
+ cursor: pointer;
+}
+
+.el-checkbox.is-bordered.is-checked {
+ border-color: $main_color;
+}
+
+::v-deep .el-radio__input.is-checked .el-radio__inner {
+ border-color: $main_color;
+ background: $main_color;
+}
+
+::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+ border-color: $main_color;
+ background: $main_color;
+}
+
+::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
+ color: $main_color !important;
+}
+
+::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
+ margin: 10px 30px 0px 0;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+ color: $main_color;
+}
+
+::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
+ margin: 10px 30px 0px 0;
+}
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select .el-input__inner:focus{
+ border-color: $main_color;
+}
+
+::v-deep .el-select-dropdown__item.selected{
+ color: $main_color;
+}
+::v-deep .el-checkbox__inner:hover{
+ border-color: $main_color;
+}
+::v-deep .el-textarea__inner:focus{
+ border-color: $main_color;
+}
</style>
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index 8d917a7..a1e97cb 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -84,6 +84,7 @@
<el-table
:data="tableData"
border
+ stripe
:height="tableHeight"
width="100%"
highlight-current-row
@@ -202,6 +203,7 @@
<!--鏂板缂栬緫瀵硅瘽妗�-->
<el-dialog
+ :close-on-click-modal="false"
:title="operation==='add'?'鏂板':'淇敼'"
:visible.sync="dialogVisible"
width="50%"
@@ -298,6 +300,7 @@
<!-- 鍗曚綅鎸夐挳瀵硅瘽妗�-->
<el-dialog
+ :close-on-click-modal="false"
title="鍗曚綅璁剧疆"
:visible.sync="officeDialogVisible"
width="50%"
@@ -417,6 +420,7 @@
<!-- 宸ヨ壓璺嚎瀵硅瘽妗�-->
<el-dialog
+ :close-on-click-modal="false"
title="鍏宠仈宸ヨ壓璺嚎"
:visible.sync="dialogVisibleRoute"
width="50%"
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index af17901..d377590 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -1,11 +1,596 @@
-<template />
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div style="padding: 10px 5px 0 0">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="80px"
+ inline
+ style="display: flex;justify-content: space-between"
+ >
+ <div class="elForm">
+ <el-form-item label="宸ュ簭缂栫爜" style=" display: flex;">
+ <el-input v-model="form.stepcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="宸ュ簭鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.stepname" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鍚敤鐘舵��" style=" display: flex;">
+ <el-select v-model="form.enable" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in enableArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="宸ュ簭绫诲瀷" style=" display: flex;">
+ <el-select
+ v-model="form.steptypecode"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in steptypeArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
+ <el-input v-model="form.createuser" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </div>
+ <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
+ <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ </div>
+ </el-form>
+ </div>
+ <el-divider />
+ <div style="margin-left: 10px;display: flex">
+ <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ </div>
+ <el-divider />
+ <div class="elTableDiv">
+ <el-table
+ :data="tableData"
+ :height="tableHeight"
+ border
+ stripe
+ :style="{width: 100+'%',height:tableHeight+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <!-- <el-table-column-->
+ <!-- type="selection"-->
+ <!-- width="50"-->
+ <!-- />-->
+ <el-table-column
+ prop="RowNum"
+ width="50"
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="stepcode"
+ label="宸ュ簭缂栫爜"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="stepname"
+ label="宸ュ簭鍚嶇О"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="flwtype"
+ label="宸ュ簭绫诲瀷"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.flwtype.indexOf(';')!==-1">鑷埗;澶栧崗</div>
+ <div v-if="row.flwtype==='W'">澶栧崗</div>
+ <div v-if="row.flwtype==='Z'">鑷埗</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="descr"
+ label="宸ュ簭鎻忚堪"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="lm_user"
+ label="鍒涘缓浜哄憳"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="lm_date"
+ label="鍒涘缓鏃堕棿"
+ sortable="custom"
+ />
+ <el-table-column
+ label="鍏宠仈宸ヤ綔绔�"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <i class="el-icon-share" @click="workClick(row)" />
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鍏宠仈缂洪櫡"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <i class="el-icon-share" @click="defectClick(row)" />
+ </div>
+ </template>
+ </el-table-column>
+ <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>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getStepSearch"
+ />
+ </div>
+
+ <el-dialog
+ :title="operation==='add'?'鏂板':'淇敼'"
+ :visible.sync="dialogVisible"
+ width="50%"
+ :close-on-click-modal="false"
+ top="15vh"
+ @closed="handleClose"
+ @close="handleClose"
+ >
+ <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+ <el-form-item label="宸ュ簭缂栫爜" prop="stepcode">
+ <el-input v-model="dialogForm.stepcode" :disabled="operation!=='add'" style="width: 220px" />
+ </el-form-item>
+ <el-form-item label="宸ュ簭鍚嶇О" prop="stepname">
+ <el-input v-model="dialogForm.stepname" style="width: 220px" />
+ </el-form-item>
+ <el-form-item prop="steptypecode" label="宸ュ簭绫诲瀷">
+ <el-select
+ v-model="dialogForm.steptypecode"
+ style="width: 220px"
+ placeholder="璇烽�夋嫨"
+ :popper-append-to-body="false"
+ >
+ <el-option
+ v-for="item in steptypeArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item prop="enable" label="鍚敤鐘舵��">
+ <el-select
+ v-model="dialogForm.enable"
+ style="width: 220px"
+ placeholder="璇烽�夋嫨"
+ :popper-append-to-body="false"
+ >
+ <el-option
+ v-for="item in enableArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="宸ュ簭鎻忚堪" prop="description">
+ <el-input v-model="dialogForm.description" type="textarea" style="width: 220px" />
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+ </div>
+</template>
<script>
+import Pagination from '@/components/Pagination'
+import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
+import { getCookie } from '@/utils/auth'
+import { AddUpdateStep, DeleteStep, StepSearch } from '@/api/zzmx'
+
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Gxdy'
+ name: 'Zzjg',
+ components: {
+ Pagination
+ },
+ data() {
+ const validateName = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('璇疯緭鍏ョ紪鐮�'))
+ } else {
+ if (SER_HZ.test(value)) {
+ return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
+ } else {
+ callback()
+ }
+ }
+ }
+ return {
+ mainHeight: 0,
+ tableHeight: 0,
+ form: {
+ stepcode: '', // 宸ュ簭缂栫爜
+ stepname: '', // 宸ュ簭鍚嶇О
+ enable: '', // 鍚敤鐘舵��
+ steptypecode: [], // 宸ュ簭绫诲瀷缂栫爜
+ createuser: '', // 鍒涘缓浜哄憳
+ prop: 'lm_date', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ },
+ enableArr: [
+ { code: 'Y', name: '鏄�' },
+ { code: 'N', name: '鍚�' }
+ ],
+ steptypeArr: [
+ { code: 'Z', name: '鑷埗' },
+ { code: 'W', name: '澶栧崗' },
+ { code: 'Z;W', name: '鑷埗锛涘鍗�' }
+ ],
+ total: 10,
+ tableData: [],
+ dialogVisible: false,
+ dialogForm: {
+ 'idid': '',
+ 'stepcode': '',
+ 'stepname': '',
+ 'steptypecode': '',
+ 'enable': '',
+ 'description': '',
+ 'OperType': ''
+ },
+ operation: '',
+ dialogFormRules: {
+ stepcode: [
+ { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ ],
+ stepname: [
+ { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+ ],
+ steptypecode: [
+ { required: true, message: '璇烽�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
+ ],
+ enable: [
+ { required: true, message: '璇烽�夋嫨鐘舵��', trigger: ['blur', 'change'] }
+ ]
+
+ }
+
+ }
+ },
+ created() {
+ this.getStepSearch()
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ methods: {
+ async getStepSearch() {
+ const res = await StepSearch(this.form)
+ this.tableData = res.data
+ this.total = res.count
+ },
+ // 鎺掑簭鏀瑰彉鏃�
+ sortChange({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.form.order = order
+ this.form.prop = prop
+ this.getStepSearch()
+ },
+ // 鏌ヨ
+ search() {
+ this.getStepSearch()
+ },
+ upload() {
+
+ },
+ // 閲嶇疆
+ reset() {
+ this.form.stepcode = ''
+ this.form.stepname = ''
+ this.form.enable = ''
+ this.form.steptypecode = ''
+ this.form.createuser = ''
+ this.getStepSearch()
+ },
+
+ // 鏂板鎸夐挳
+ add(operation) {
+ this.operation = operation
+ this.dialogVisible = true
+ },
+ // 淇敼鎸夐挳
+ edit(operation, row) {
+ this.operation = operation
+ this.dialogVisible = true
+
+ this.$nextTick(() => {
+ this.dialogForm.id = row.id
+ this.dialogForm.stepcode = row.stepcode
+ this.dialogForm.stepname = row.stepname
+ this.dialogForm.steptypecode = row.flwtype
+ this.dialogForm.description = row.descr
+ this.dialogForm.enable = row.enable
+ })
+ },
+ // 鍒犻櫎鎸夐挳
+ async del(row) {
+ this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ DeleteStep({ stepcode: row.stepcode }).then(res => {
+ if (res.code === '200') {
+ this.$message.success('鍒犻櫎鎴愬姛!')
+ this.getStepSearch()
+ }
+ })
+ }).catch(() => {
+ this.$message.info('宸插彇娑堝垹闄�')
+ })
+ },
+ // 瀵硅瘽妗嗗叧闂簨浠�
+ handleClose() {
+ this.dialogForm.stepcode = ''
+ this.dialogForm.stepname = ''
+ this.dialogForm.steptypecode = ''
+ this.dialogForm.enable = ''
+ this.dialogForm.description = ''
+ this.$refs.dialogForm.clearValidate()
+ },
+ // 瀵硅瘽妗嗗彇娑�
+ dialogVisibleCancel() {
+ this.dialogVisible = false
+ },
+ // 瀵硅瘽妗嗙‘璁�
+ dialogVisibleConfirm() {
+ this.$refs.dialogForm.validate(valid => {
+ if (valid) {
+ const data = {
+ id: this.dialogForm.id,
+ stepcode: this.dialogForm.stepcode,
+ stepname: this.dialogForm.stepname,
+ steptypecode: this.dialogForm.steptypecode,
+ enable: this.dialogForm.enable,
+ description: this.dialogForm.description,
+ OperType: this.operation === 'add' ? 'Add' : 'Update'
+ }
+ AddUpdateStep(data).then(res => {
+ if (res.code === '200') {
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.dialogVisible = false
+ this.getStepSearch()
+ } else {
+ this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
+ }
+ })
+ },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 250
+ this.tableHeight = this.mainHeight - 100
+ })
+ },
+ /* 鍏宠仈宸ヤ綔绔欐ā鍧�*/
+ // 鍏宠仈宸ヤ綔绔欑偣鍑�
+ workClick(row) {
+
+ },
+
+ /* 鍏宠仈缂洪櫡*/
+ // 鍏宠仈缂洪櫡鐐瑰嚮
+ defectClick(row) {
+
+ }
+ }
}
</script>
-<style scoped>
+<style lang="scss" scoped>
+$main_color: #42b983;
+::v-deep .el-button--primary {
+ background-color: $main_color !important;
+ height: 30px;
+ display: flex;
+ align-items: center;
+ //border: 1px solid $main_color;
+ border: none;
+ padding: 0 20px;
+}
+::v-deep .el-button--primary:hover {
+ border: none;
+}
+::v-deep .el-button--info {
+ height: 30px;
+ display: flex;
+ align-items: center;
+ padding: 0 20px;
+}
+
+::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
+ background-color: $main_color !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
+}
+
+.footerButton {
+ display: flex;
+ justify-content: end;
+}
+
+::v-deep .el-button--default {
+ background-color: #ffffff !important;
+ height: 30px;
+ display: flex;
+ align-items: center;
+ padding: 0 20px;
+}
+
+::v-deep .el-button--default:hover {
+ color: #606266;
+}
+
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
+
+::v-deep .el-radio__input.is-checked .el-radio__inner {
+ background-color: $main_color;
+ border-color: $main_color;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+ color: $main_color !important;
+}
+
+::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
+ border-color: $main_color;
+ background-color: $main_color;
+}
+
+::v-deep .el-input__inner {
+ height: 30px;
+ line-height: 30px;
+}
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-table .caret-wrapper {
+ transform: scale(0.8);
+}
+
+::v-deep .cell {
+ display: flex !important;
+ align-items: center !important;
+ justify-content: space-between !important;
+}
+
+::v-deep .el-button--text {
+ color: $main_color;
+ font-size: 14px;
+ cursor: pointer;
+}
+
+.operationClass {
+ height: 23px;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.el-icon-share {
+ color: $main_color;
+ cursor: pointer;
+}
+
+.el-checkbox.is-bordered.is-checked {
+ border-color: $main_color;
+}
+
+::v-deep .el-radio__input.is-checked .el-radio__inner {
+ border-color: $main_color;
+ background: $main_color;
+}
+
+::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+ border-color: $main_color;
+ background: $main_color;
+}
+
+::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
+ color: $main_color !important;
+}
+
+::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
+ margin: 10px 30px 0px 0;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+ color: $main_color;
+}
+
+::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
+ margin: 10px 30px 0px 0;
+}
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select .el-input__inner:focus{
+ border-color: $main_color;
+}
+
+::v-deep .el-select-dropdown__item.selected{
+ color: $main_color;
+}
+::v-deep .el-checkbox__inner:hover{
+ border-color: $main_color;
+}
+::v-deep .el-textarea__inner:focus{
+ border-color: $main_color;
+}
</style>
diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index 375570a..8535de9 100644
--- a/src/views/zzmx/gylx.vue
+++ b/src/views/zzmx/gylx.vue
@@ -40,6 +40,7 @@
:data="tableData"
:height="tableHeight"
border
+ stripe
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
@@ -96,7 +97,8 @@
<template slot-scope="{row}">
<div class="operationClass">
<!-- <el-button type="text" @click="edit('edit',row)">淇敼</el-button>-->
- <el-button type="text" @click="del(row.id)">鍒犻櫎</el-button>
+ <el-button type="text" @click="edit('edit',row)">棰勮</el-button>
+ <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
</div>
</template>
</el-table-column>
@@ -116,26 +118,28 @@
</div>
<el-dialog
- :title="operation==='add'?'鏂板':'淇敼'"
+ :title="operation==='add'?'鏂板':'棰勮'"
:visible.sync="dialogVisible"
width="70%"
+ :close-on-click-modal="false"
top="15vh"
@closed="handleClose"
@close="handleClose"
>
- <el-form ref="dialogForm" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+ <el-form ref="dialogForm" style="height: 500px" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
<div style="display: flex">
- <el-form-item label="宸ヨ壓缂栫爜" prop="OrgCode" style="margin-right: 20px">
- <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 220px" />
+ <el-form-item label="宸ヨ壓缂栫爜" prop="code" style="margin-right: 20px">
+ <el-input v-model="dialogForm.code" :disabled="operation!=='add'" style="width: 220px" />
</el-form-item>
- <el-form-item label="宸ヨ壓鍚嶇О" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" style="width: 220px" />
+ <el-form-item label="宸ヨ壓鍚嶇О" prop="name">
+ <el-input v-model="dialogForm.name" :disabled="operation==='edit'" style="width: 220px" />
</el-form-item>
</div>
<div style="display: flex">
- <el-form-item prop="SupUnit" label="浣跨敤鐘舵��" style="margin-right: 20px">
+ <el-form-item prop="enable" label="浣跨敤鐘舵��" style="margin-right: 20px">
<el-select
- v-model="dialogForm.isEnable"
+ v-model="dialogForm.enable"
+ :disabled="operation==='edit'"
:popper-append-to-body="false"
style="width: 220px"
placeholder="璇烽�夋嫨"
@@ -148,14 +152,14 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="宸ヨ壓鎻忚堪" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" type="textarea" style="width: 220px" />
+ <el-form-item label="宸ヨ壓鎻忚堪" prop="description">
+ <el-input v-model="dialogForm.description" :disabled="operation==='edit'" type="textarea" style="width: 220px" />
</el-form-item>
</div>
- <el-form-item label="宸ヨ壓璁剧疆" prop="OrgName" style="margin-top: 30px">
+ <el-form-item label="宸ヨ壓璁剧疆" prop="Data" style="margin-top: 30px">
<div class="settingDiv">
<!-- 瀹炵幇宸ヨ壓璁剧疆鍔ㄦ�佹坊鍔�-->
- <div v-for="(tag,index) in dynamicTags" :key="tag.id" style="display: flex;align-items: center">
+ <div v-for="(tag,index) in dynamicTags" :key="tag.seq" style="display: flex;align-items: center">
<div style="display: flex;align-items: center;position: relative;">
<div
class="orderNumber"
@@ -163,54 +167,73 @@
backgroundColor:index===0?'#f8f8fa':'#409EFF',
color:index===0?'#c6bbc4':'#FFFFFF',
border:index===0?'1px solid #c6bbc4':'1px solid #409EFF',
- zIndex:!flag&&tag.label===flagSelected?0:2
+ zIndex:tag.label===selectedName?0:2
}"
>
- {{ index+1 }}</div>
- <el-tooltip class="item" effect="dark" :content="tag.label" placement="top">
- <!-- @close="handleTagClose(tag.label)"-->
- <!-- :closable="index!==0"-->
- <el-tag
- v-if="flag||tag.label!==flagSelected"
- :disable-transitions="false"
- class="elTag"
- :class="tagClass(tag.label)"
- :effect="tag.effect"
- @click="elTagClick(tag)"
- >
- <!-- <div class="orderNumber">{{ index }}</div>-->
- {{ tag.label }}
- <i class="el-icon-edit" @click="tagEdit(tag)" />
- </el-tag>
- </el-tooltip>
+ {{ index+1 }}
+ </div>
+
+ <!-- <el-tooltip-->
+ <!-- class="item"-->
+ <!-- effect="dark"-->
+ <!-- :content="tag.stepname"-->
+ <!-- placement="top"-->
+ <!-- >-->
+ <!-- @close="handleTagClose(tag.stepname)"-->
+ <!-- :closable="index!==0"-->
+
+ <el-tag
+ v-if="tag.stepname!==selectedName"
+ :disable-transitions="false"
+ class="elTag"
+ :effect="tag.effect"
+ @click="elTagClick(tag)"
+ >
+ {{ tag.stepname }}
+ <i
+ v-if="tag.editDisabled&&operation!=='edit'"
+ class="el-icon-edit"
+ @click="tagEdit(tag)"
+ />
+ </el-tag>
+ <!-- </el-tooltip>-->
+
+ <!-- left:tag.stepname===selectedName?'191px':'141px',-->
<i
- v-if="index!==0"
+ v-if="index!==0&&tag.editDisabled&&operation!=='edit'"
:style="{
- left:!flag&&tag.label===flagSelected?'191px':'91px',
- top:!flag&&tag.label===flagSelected?'-2px':'-8px',
+ top:tag.stepname===selectedName?'-2px':'-8px',
}"
class="el-icon-close"
- @click="handleTagClose(tag.label)"
+ @click="handleTagClose(tag)"
/>
<el-autocomplete
- v-if="!flag&&tag.label===flagSelected"
- :ref="'saveTagInput'+tag.id"
- v-model="tagValue"
+ v-if="tag.stepname===selectedName"
+ :ref="'saveTagInput'+tag.seq"
+ v-model="autocompleteValue"
class="input-new-tag"
size="small"
:fetch-suggestions="querySearch"
- style="margin-left: 0;width: 200px;transform: translate(1)"
+ style="margin-left: 0;width: 150px;transform: translate(1)"
autofocus
+ :debounce="300"
+ :popper-append-to-body="false"
+ popper-class="autocompleteClass"
@select="handleSelect"
- @keyup.enter.native="handleInputConfirm2"
+ @keyup.enter.native="handleInputConfirm(tag)"
/>
<!-- @blur="handleBlur2"-->
- <div v-if="index!==dynamicTags.length-1" style="width: 40px;height: 1px;border: 1px solid #42b983" />
+ <div
+ v-if="index!==dynamicTags.length-1"
+ style="width: 40px;height: 1px;border: 1px solid #42b983"
+ />
</div>
</div>
- <!-- :disabled="addDisabled"-->
+
<el-button
+ v-if="operation!=='edit'"
type="success"
+ :disabled="addDisabled"
class="tagSuccess"
size="small"
icon="el-icon-plus"
@@ -222,8 +245,9 @@
</el-form>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button v-if="operation==='edit'" @click="dialogVisibleCancel">杩� 鍥�</el-button>
+ <el-button v-if="operation!=='edit'" @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button v-if="operation!=='edit'" type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
@@ -232,9 +256,7 @@
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
-import { RouteSearch } from '@/api/zzmx'
+import { AddUpdateRoute, DeleteRoute, RouteSearch, RouteSelect, StepSelect, ViewRoute } from '@/api/zzmx'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -252,13 +274,6 @@
} else {
callback()
}
- }
- }
- const validateTypeCode = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇烽�夋嫨涓婄骇'))
- } else {
- callback()
}
}
return {
@@ -282,37 +297,39 @@
tableData: [],
dialogVisible: false,
dialogForm: {
- OrgType: '',
- OrgCode: '',
- OrgName: '',
- SupUnit: ''// 涓婄骇鍗曚綅
+ id: '',
+ code: '',
+ name: '',
+ enable: '',
+ description: '',
+ Data: []
},
dynamicTags: [// 宸ヨ壓璁剧疆鏁扮粍
- { id: 1, label: '鏍囩涓�鏍囩涓�鏍囩涓�鏍囩涓�鏍囩涓�鏍囩涓�', effect: 'light' },
- { id: 2, label: '鏍囩浜�', effect: 'light' },
- { id: 3, label: '鏍囩涓�', effect: 'light' }
+ { editDisabled: true, stepcode: 'Step01', seq: 1, stepname: ' ', effect: 'light' }
+ // { editDisabled: true, stepcode: 'Step02', seq: 2, stepname: '濂�', effect: 'light' },
+ // { editDisabled: true, stepcode: 'Step03', seq: 3, stepname: '澶�', effect: 'light' }
],
- tagSelectedId: '', // tag閫夋嫨涓璱d
- flag: true,
- flagSelected: '', // 鍒ゆ柇鏄惁閫変腑
- tagValue: '',
- restaurants: [],
- addDisabled: false,
-
+ clickSelected: '', // 榧犳爣鐐瑰嚮閫変腑鐨勫��
+ selectedName: '', // 閫変腑鐨勫悕绉�
+ autocompleteValue: '', // 鍙悳绱㈣緭鍏ユ涓殑鍊�
+ routeArr: [], // 宸ヨ壓璁剧疆涓嬫媺鎵�鏈夊��
+ addDisabled: false, // 娣诲姞鎸夐挳鏄惁鍙偣鍑�
+ editDisabled: true, // 淇敼鎸夐挳鏄惁鍙偣鍑�
+ mouseFocusPosition: 0, // 榧犳爣鑱氱劍鐨勪綅缃�
operation: '',
dialogFormRules: {
- OrgType: [
- { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
- ],
- OrgCode: [
+ code: [
{ required: true, validator: validateName, trigger: ['blur', 'change'] }
],
- OrgName: [
+ name: [
{ required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
],
- SupUnit: [
- { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
+ enable: [
+ { required: true, message: '璇烽�夋嫨浣跨敤鐘舵��', trigger: ['blur', 'change'] }
]
+ // Data: [
+ // { required: true, message: '璇疯缃伐鑹�', trigger: ['blur', 'change'] }
+ // ]
}
}
@@ -323,68 +340,94 @@
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
- this.restaurants = this.loadAll()
},
methods: {
+ // 杩滅▼鎼滅储
querySearch(queryString, cb) {
- var restaurants = this.restaurants
- var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
+ const routeArr = this.routeArr
+ routeArr.forEach(item => {
+ item.value = item.stepname
+ })
+ const results = queryString ? routeArr.filter(this.createFilter(queryString)) : routeArr
// 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
cb(results)
},
+ // 杩囨护
createFilter(queryString) {
- return (restaurant) => {
- // return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
- return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) !== -1)
+ return (res) => {
+ return (res.value.toLowerCase().indexOf(queryString.toLowerCase()) !== -1)
}
},
- loadAll() {
- return [
- { 'value': '涓夊叏椴滈锛堝寳鏂版尘搴楋級', 'address': '闀垮畞鍖烘柊娓旇矾144鍙�' },
- { 'value': 'Hot honey 棣栧皵鐐搁浮锛堜粰闇炶矾锛�', 'address': '涓婃捣甯傞暱瀹佸尯娣炶櫣璺�661鍙�' },
- { 'value': '鏂版椇瑙掕尪椁愬巺', 'address': '涓婃捣甯傛櫘闄�鍖虹湡鍖楄矾988鍙峰垱閭戦噾娌欒胺6鍙锋ゼ113' },
- { 'value': '娉峰崈瀹�(澶╁北瑗胯矾搴�)', 'address': '澶╁北瑗胯矾438鍙�' },
- { 'value': '鑳栦粰濂崇焊鏉泲绯曪紙涓婃捣鍑岀┖搴楋級', 'address': '涓婃捣甯傞暱瀹佸尯閲戦挓璺�968鍙�1骞�18鍙锋ゼ涓�灞傚晢閾�18-101' },
- { 'value': '璐¤尪', 'address': '涓婃捣甯傞暱瀹佸尯閲戦挓璺�633鍙�' },
- { 'value': '璞ぇ澶ч楦℃帓瓒呯骇濂剁埜', 'address': '涓婃捣甯傚槈瀹氬尯鏇瑰畨鍏矾鏇瑰畨璺�1685鍙�' },
- { 'value': '鑼惰姖鍏帮紙濂惰尪锛屾墜鎶撻ゼ锛�', 'address': '涓婃捣甯傛櫘闄�鍖哄悓鏅矾1435鍙�' }
- ]
+ // 宸ヨ壓璁剧疆 涓嬫媺鑾峰彇鎵�鏈�
+ async getStepSelectArr() {
+ const { data: res } = await StepSelect()
+ this.routeArr = res
},
+ // 澶勭悊涓嬫媺閫夋嫨
handleSelect(item) {
- console.log(item)
- },
- handleInputConfirm2() {
- console.log(this.flagSelect, 111)
- // this.dynamicTags.forEach((item,index) => {
- // if (item === this.flagSelect) {
- // console.log(item, 111)
- // item = this.flagSelect
- // }
- // })
- console.log(this.value)
- this.addDisabled = false
- this.flagSelect = ''
- this.tagValue = ''
- this.flag = !this.flag
- },
- tagEdit(tag) {
- console.log(tag, 2)
-
- this.addDisabled = true
- this.flagSelected = tag.label
- this.tagValue = tag.label
- this.flag = !this.flag
+ this.autocompleteValue = item.value
this.$nextTick(_ => {
- this.$refs['saveTagInput' + tag.id][0].focus()
+ this.$refs['saveTagInput' + this.mouseFocusPosition][0].focus()
})
},
+ // 杈撳叆妗嗙‘璁や簨浠�
+ handleInputConfirm(tag) {
+ console.log(tag, 111)
+ console.log(this.autocompleteValue, 2)
+ // 1.閫夋嫨鍐呭涓嶈兘涓虹┖
+ if (this.autocompleteValue.trim().length < 1) {
+ return this.$message.info('閫夋嫨鍐呭涓嶈兘涓虹┖锛�')
+ }
+ // 2.杈撳叆妗嗗唴瀹逛笌涓嬫媺閫夐」鍐呭涓嶅尮閰�
+ let flag = false
+ this.routeArr.forEach(item => {
+ if (item.stepname === this.autocompleteValue) {
+ flag = true
+ }
+ })
+ if (!flag) {
+ return this.$message.info('杈撳叆妗嗗唴瀹逛笌涓嬫媺閫夐」鍐呭涓嶅尮閰嶏紒')
+ }
+
+ // 灏嗗�兼浛鎹㈠埌鍘焧ag浣嶇疆涓�
+ this.dynamicTags.forEach((item, index) => {
+ if ((index + 1) === tag.seq) {
+ console.log(tag)
+ item.stepname = this.autocompleteValue
+ }
+ item.editDisabled = true
+ })
+ console.log(this.dynamicTags, 234)
+ this.addDisabled = false
+ this.editDisabled = true
+ this.selectedName = ''
+ },
+ // tag鐐瑰嚮淇敼鎸夐挳
+ tagEdit(tag) {
+ console.log(tag, 2)
+ this.autocompleteValue = ''
+ this.dynamicTags.forEach(item => {
+ item.stepname = item.stepname.trim()
+ if (item.seq !== tag.seq) {
+ item.editDisabled = false
+ // return this.$message.info('璇峰厛濉啓鎴栭�夋嫨宸ヨ壓锛�')
+ }
+ })
+ this.addDisabled = true
+ this.selectedName = tag.stepname
+ this.autocompleteValue = tag.stepname
+ this.$nextTick(_ => {
+ this.$refs['saveTagInput' + tag.seq][0].focus()
+ })
+ this.mouseFocusPosition = tag.seq
+ },
+ // tag鐐瑰嚮浜嬩欢
elTagClick(tag) {
console.log(tag, 1)
-
- this.tagSelectedId = tag.id
+ this.clickSelected = tag.seq
if (tag.effect === 'dark') {
tag.effect = 'light'
- this.tagSelectedId = ''
+ this.clickSelected = ''
} else {
this.dynamicTags.forEach(item => {
item.effect = 'light'
@@ -395,46 +438,69 @@
tag.effect = 'light'
}
}
-
console.log(this.$el)
// console.log(this.$el.style.color = 'red')
},
-
- tagClass() {
- // this.tagSelect.style({ backgroundColor: 'red' })
- // return { backgroundColor: 'red' }
- },
+ // 澶勭悊tag鍏抽棴浜嬩欢
handleTagClose(tag) {
- // this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1)
+ console.log(tag)
+
+ // 褰撻�変腑鐨勬楠よ鍒犻櫎鏃�
+ if (tag.seq === this.clickSelected) {
+ this.clickSelected = ''
+ }
this.dynamicTags.forEach((item, index) => {
- if (item.label === tag) {
- console.log(item.label === tag)
+ if (item.seq === tag.seq) {
this.dynamicTags.splice(index, 1)
}
})
+ // 閲嶆柊鎺掑簭
+ this.dynamicTags.forEach((item, index) => {
+ item.editDisabled = true
+ item.seq = index + 1
+ item.stepcode = 'Step' + ((index + 1).toString().length === 2 ? (index + 1) : '0' + (index + 1))
+ })
+ if (this.clickSelected === '') {
+ this.selectedName = ''
+ }
this.addDisabled = false
},
-
+ // tag娣诲姞鎸夐挳
showInput() {
- // this.inputVisible = true
+ this.autocompleteValue = ''
this.addDisabled = true
- if (this.tagSelectedId === '' || this.tagSelectedId === this.dynamicTags.length) {
+ this.editDisabled = false
+ let seq = 0
+ // 1.绗竴绉嶆儏鍐� 褰撴湭閫変腑鎯呭喌涓嬫垨鑰呴�変腑鏈�鍚庝竴涓殑鎯呭喌涓�
+ if (this.clickSelected === '' || this.clickSelected === this.dynamicTags.length) {
+ seq = this.dynamicTags.length + 1
this.dynamicTags.push(
- { id: (this.dynamicTags.length + 1), label: '', effeft: 'light' }
+ { editDisabled: true, seq: seq, stepname: '', effect: 'light', stepcode: ('Step' + (seq.toString().length === 2 ? seq : '0' + seq)) }
)
} else {
- console.log(this.tagSelectedId, 31)
- this.dynamicTags.splice(this.tagSelectedId, 0, { id: this.dynamicTags.length + 1, label: '', effect: 'light' })
+ // 2.绗簩绉嶆儏鍐� 褰撻�変腑鏌愪釜tag 灏嗗湪tag鍚庨潰娣诲姞
+ seq = this.clickSelected + 1
+ this.dynamicTags.splice(this.clickSelected, 0, { editDisabled: true, seq: seq, stepname: '', effect: 'light' })
+ this.dynamicTags.forEach((item, index) => {
+ item.seq = index + 1
+ item.stepcode = 'Step' + ((index + 1).toString().length === 2 ? (index + 1) : '0' + (index + 1))
+ })
}
- this.flag = !this.flag
+
this.$nextTick(_ => {
- this.$refs['saveTagInput' + this.dynamicTags.length][0].focus()
+ this.$refs['saveTagInput' + seq][0].focus()
})
- // this.$nextTick(_ => {
- // console.log(this.$refs['saveTagInput'], 321)
- // this.$refs.saveTagInput.$refs.input.focus()
- // })
+
+ this.mouseFocusPosition = seq
+
+ this.dynamicTags.forEach((item, index) => {
+ item.editDisabled = seq === index + 1
+ })
+
+ console.log(this.dynamicTags, 1)
},
+
+ // 鑾峰彇宸ヨ壓璺嚎鍒楄〃娓呭崟
async getRouteSearch() {
const res = await RouteSearch(this.form)
this.tableData = res.data
@@ -473,26 +539,37 @@
add(operation) {
this.operation = operation
this.dialogVisible = true
+ this.getStepSelectArr()
},
- // 淇敼鎸夐挳
- edit(operation, row) {
+ // 宸ヨ壓璺嚎棰勮
+ async edit(operation, row) {
this.operation = operation
this.dialogVisible = true
+ const { data: res } = await ViewRoute({ routecode: row.code })
+
+ this.dynamicTags = []
this.$nextTick(() => {
- this.dialogForm.OrgCode = row.org_code
- this.dialogForm.OrgName = row.org_name
- this.dialogForm.SupUnit = row.parent_id
+ this.dialogForm.code = res[0].code
+ this.dialogForm.name = res[0].name
+ this.dialogForm.enable = res[0].enable
+ this.dialogForm.description = res[0].description
+ // this.dialogForm.Data = row.description
+ res[0].Data.forEach(item => {
+ this.dynamicTags.push(
+ { seq: item.seq, stepname: item.stepname, stepcode: item.stepcode, editDisabled: true, effect: 'light' }
+ )
+ })
})
},
// 鍒犻櫎鎸夐挳
- async del(id) {
+ async del(row) {
this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- DeleteOrganization({ orgid: id }).then(res => {
+ DeleteRoute({ routecode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
this.getRouteSearch()
@@ -504,10 +581,14 @@
},
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
- this.dialogForm.OrgType = ''
- this.dialogForm.OrgCode = ''
- this.dialogForm.OrgName = ''
- this.dialogForm.SupUnit = ''
+ this.dialogForm.code = ''
+ this.dialogForm.name = ''
+ this.dialogForm.enable = ''
+ this.dialogForm.description = ''
+ this.dialogForm.Data = []
+ this.dynamicTags = [
+ { editDisabled: true, stepcode: 'Step01', seq: 1, stepname: ' ', effect: 'light' }
+ ]
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -516,25 +597,33 @@
},
// 瀵硅瘽妗嗙‘璁�
dialogVisibleConfirm() {
+ if (this.dynamicTags[0].stepname.trim() === '') {
+ return this.$message.info('宸ヨ壓璁剧疆绗竴椤逛笉鑳戒负绌猴紒')
+ }
+ console.log(this.dynamicTags, 3)
+ const Data = []
+ this.dynamicTags.forEach(item => {
+ Data.push({ seq: item.seq, stepcode: item.stepcode, stepname: item.stepname })
+ })
this.$refs.dialogForm.validate(valid => {
if (valid) {
const data = {
- OrganType: this.dialogFormOrgTypeSelected,
- OrganCode: this.dialogForm.OrgCode,
- OrganName: this.dialogForm.OrgName,
- SupUnit: this.dialogFormOrgTypeSelected === 'F' ? '0' : this.dialogForm.SupUnit,
- OperType: this.operation === 'add' ? 'Add' : 'Update',
- Operator: getCookie('admin')
+ code: this.dialogForm.code,
+ name: this.dialogForm.name,
+ enable: this.dialogForm.enable,
+ description: this.dialogForm.description,
+ Data: Data
}
- // AddUpdateOrganization(data).then(res => {
- // if (res.code === '200') {
- // this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- // this.dialogVisible = false
- // this.getRouteSearch()
- // } else {
- // this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
- // }
- // })
+ console.log(data, 2)
+ AddUpdateRoute(this.dialogForm.id, this.operation === 'add' ? 'Add' : 'Update', data).then(res => {
+ if (res.code === '200') {
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.dialogVisible = false
+ this.getRouteSearch()
+ } else {
+ this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
}
})
},
@@ -748,7 +837,7 @@
position: absolute;
top: -8px;
z-index: 2;
- left: 91px;
+ left: 141px;
cursor: pointer;
color: #FFFFFF;
border-radius: 50%;
@@ -803,15 +892,21 @@
overflow-x: scroll;
overflow-y: hidden;
align-items: center;
+ background: aliceblue;
}
.elTag {
margin-left: 0;
- width: 100px;
+ width: 150px;
position: relative;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
+.autocompleteClass{
+ .el-autocomplete-suggestion li{
+ //color: red;
+ }
+}
</style>
diff --git a/src/views/zzmx/wllx.vue b/src/views/zzmx/wllx.vue
index 088d182..785b395 100644
--- a/src/views/zzmx/wllx.vue
+++ b/src/views/zzmx/wllx.vue
@@ -43,6 +43,7 @@
<el-table
:data="tableData"
border
+ stripe
:height="tableHeight"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
@@ -114,6 +115,7 @@
:visible.sync="dialogVisible"
width="50%"
top="15vh"
+ :close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
>
--
Gitblit v1.9.3