From ecb9ece90cb766214e682f33d4c670b2d09b8ca3 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 13 十二月 2023 18:03:56 +0800
Subject: [PATCH] 修改
---
web/src/views/layout/main-sidebar.vue | 2
web/src/views/modules/sys/task/stay-task.vue | 7 +
web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue | 3
web/src/views/layout/main.vue | 56 +++++++-------
modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/service/ConfigItemOutboundService.java | 1
web/src/views/modules/configItemOutbound/ConfigItemOutbound-AddOrUpdate.vue | 13 +-
modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/model/ConfigItemOutbound.java | 8 +-
web/src/views/layout/main-sidebar-sub-menu.vue | 146 ++++++++++++++++++-----------------
8 files changed, 124 insertions(+), 112 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/model/ConfigItemOutbound.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/model/ConfigItemOutbound.java
index 15644b9..a59d2c0 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/model/ConfigItemOutbound.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/model/ConfigItemOutbound.java
@@ -38,7 +38,7 @@
@ApiModelProperty(value = "搴撶被鍨�")
private String libraryType;
- @ApiModelProperty(value = "鍙樻洿鍘熷洜")
+ @ApiModelProperty(value = "鍑哄簱鍘熷洜")
private String outboundReason;
@ApiModelProperty(value = "鎵瑰噯鎰忚")
@@ -58,14 +58,14 @@
private String CmOperations;
@ApiModelProperty(value = "鍑哄簱鎿嶄綔浜�")
- private String Operator;
+ private String operator;
@ApiModelProperty(value = "鍑哄簱鎿嶄綔浜篒D")
- private Long OperatorId;
+ private Long operatorId;
@ApiModelProperty(value = "鍑哄簱鎿嶄綔鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
- private Date OperateDate;
+ private Date operateDate;
@ApiModelProperty(value = "澶囨敞")
private String remark;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/service/ConfigItemOutboundService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/service/ConfigItemOutboundService.java
index c691716..8d802c8 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/service/ConfigItemOutboundService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/service/ConfigItemOutboundService.java
@@ -186,7 +186,6 @@
//閫氱敤瀛楀吀鍒楄〃瀛楃涓茬敓鎴�
String libraryTypeStr = getShowDictList.getShowDictList(dataObj.getConfigItemOutbound().getLibraryType(), "library_type", false);
dataObj.getConfigItemOutbound().setLibraryType(libraryTypeStr);
-
String ApprovalOpinionStr = getShowDictList.getShowDictList(dataObj.getConfigItemOutbound().getApprovalOpinions(), "is_agree", false);
dataObj.getConfigItemOutbound().setApprovalOpinions(ApprovalOpinionStr);
for (WarehouseConfigItem configItemList : dataObj.getConfigOutboundList()) {
diff --git a/web/src/views/layout/main-sidebar-sub-menu.vue b/web/src/views/layout/main-sidebar-sub-menu.vue
index e36c5f5..2ab80c1 100644
--- a/web/src/views/layout/main-sidebar-sub-menu.vue
+++ b/web/src/views/layout/main-sidebar-sub-menu.vue
@@ -1,80 +1,84 @@
<template>
- <div>
- <template v-for="navMenu in navMenus">
- <!-- 姝よ彍鍗曚笅杩樻湁瀛愯彍鍗� -->
- <el-submenu v-if="navMenu.children && navMenu.showMenu==1 && navMenu.children.length>=1"
- :key="key" :index="navMenu.id">
- <template slot="title">
- <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true"><use :xlink:href="`#${navMenu.icon}`"></use></svg>
- <span> {{navMenu.name}}</span>
+ <div>
+ <template v-for="navMenu in navMenus">
+ <!-- 姝よ彍鍗曚笅杩樻湁瀛愯彍鍗� -->
+ <el-submenu v-if="navMenu.children && navMenu.showMenu==1 && navMenu.children.length>=1"
+ :key="key" :index="navMenu.id">
+ <template slot="title">
+ <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
+ <use :xlink:href="`#${navMenu.icon}`"></use>
+ </svg>
+ <span> {{navMenu.name}}</span>
+ </template>
+ <!-- 閫掑綊 -->
+ <subMmenu :navMenus="navMenu.children"></subMmenu>
+ </el-submenu>
+ <!-- 鏈�鍚庝竴绾ц彍鍗� -->
+ <el-menu-item v-else-if="navMenu.showMenu==1" :key="navMenu.id" :index="navMenu.id"
+ @click="gotoRouteHandle(navMenu.id)">
+ <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
+ <use :xlink:href="`#${navMenu.icon}`"></use>
+ </svg>
+ <span slot="title">{{navMenu.name}}</span>
+ </el-menu-item>
</template>
- <!-- 閫掑綊 -->
- <subMmenu :navMenus="navMenu.children"></subMmenu>
- </el-submenu>
- <!-- 鏈�鍚庝竴绾ц彍鍗� -->
- <el-menu-item v-else-if="navMenu.showMenu==1" :key="navMenu.id" :index="navMenu.id" @click="gotoRouteHandle(navMenu.id)">
- <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true"><use :xlink:href="`#${navMenu.icon}`"></use></svg>
- <span slot="title">{{navMenu.name}}</span>
- </el-menu-item>
- </template>
- </div>
+ </div>
</template>
<script>
- export default {
- name: 'subMmenu',
- props:{
- navMenus:{
- type: Array,
- default: () => []
- }
-
- },
- // created() {
- // this.filterByKeyword()
- // },
- // props: [
- // 'navMenus'
- // ],
- computed: {
- key() {
- return this.$route.name !== undefined? this.$route.name + +new Date(): this.$route + +new Date()
- }
- },
- methods: {
- // 閫氳繃menuId涓庡姩鎬�(鑿滃崟)璺敱杩涜鍖归厤璺宠浆鑷虫寚瀹氳矾鐢�
- tabRemoveHandle(tabName) {
- if (tabName === 'home') {
- return false
- }
- console.log(this.$store.state.contentTabs,'this.$store.state.contentTabs 1')
- this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName)
- console.log(this.$store.state.contentTabs,'this.$store.state.contentTabs 2')
- if (this.$store.state.contentTabs.length <= 0) {
- this.$store.state.sidebarMenuActiveName = this.$store.state.contentTabsActiveName = 'home'
- return false
- }
- },
- gotoRouteHandle(menuId) {
- var route = window.SITE_CONFIG['dynamicMenuRoutes'].filter(item => item.meta.menuId === menuId)[0]
- if (route) {
- console.log(route,'route')
- let tab = this.$store.state.contentTabs.filter(item => item.name === menuId)[0]
- if (tab)
- {
- if (route.path==='map-network-diagram-edit'
- ||route.path==='map-network-diagram-view'
- ||route.path==='map-flowChart-edit'){
- this.tabRemoveHandle(tab.name)
+ export default {
+ name: 'subMmenu',
+ props: {
+ navMenus: {
+ type: Array,
+ default: () => []
}
- }
- console.log(route.meta.params, 'params: route.meta.params')
- this.$nextTick(() => {
- console.log(route.meta.params,"route.meta.params")
- this.$router.push({name: route.name, query: route.meta.params, params: route.meta.params})
- })
+
+ },
+ // created() {
+ // this.filterByKeyword()
+ // },
+ // props: [
+ // 'navMenus'
+ // ],
+ computed: {
+ key() {
+ return this.$route.name !== undefined ? this.$route.name + +new Date() : this.$route + +new Date()
+ }
+ },
+ methods: {
+ // 閫氳繃menuId涓庡姩鎬�(鑿滃崟)璺敱杩涜鍖归厤璺宠浆鑷虫寚瀹氳矾鐢�
+ tabRemoveHandle(tabName) {
+ if (tabName === 'home') {
+ return false
+ }
+ console.log(this.$store.state.contentTabs, 'this.$store.state.contentTabs 1')
+ this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName)
+ console.log(this.$store.state.contentTabs, 'this.$store.state.contentTabs 2')
+ if (this.$store.state.contentTabs.length <= 0) {
+ this.$store.state.sidebarMenuActiveName = this.$store.state.contentTabsActiveName = 'home'
+ return false
+ }
+ },
+ gotoRouteHandle(menuId) {
+ var route = window.SITE_CONFIG['dynamicMenuRoutes'].filter(item => item.meta.menuId === menuId)[0]
+ if (route) {
+ console.log(route, 'route')
+ let tab = this.$store.state.contentTabs.filter(item => item.name === menuId)[0]
+ if (tab) {
+ if (route.path === 'map-network-diagram-edit'
+ || route.path === 'map-network-diagram-view'
+ || route.path === 'map-flowChart-edit') {
+ this.tabRemoveHandle(tab.name)
+ }
+ }
+ console.log(route.meta.params, 'params: route.meta.params')
+ this.$nextTick(() => {
+ console.log(route.meta.params, "route.meta.params")
+ this.$router.push({name: route.name, query: route.meta.params, params: route.meta.params})
+ })
+ }
+ }
}
- }
}
- }
</script>
diff --git a/web/src/views/layout/main-sidebar.vue b/web/src/views/layout/main-sidebar.vue
index a356a6e..9861ba8 100644
--- a/web/src/views/layout/main-sidebar.vue
+++ b/web/src/views/layout/main-sidebar.vue
@@ -66,7 +66,9 @@
console.log('watch flag')
if(this.flag) {
this.menuData = window.SITE_CONFIG['menuList']
+ console.log('watch flag2')
setTimeout(()=>{
+ console.log('watch flag3')
this.defaultOpeneds()
},50)
}
diff --git a/web/src/views/layout/main.vue b/web/src/views/layout/main.vue
index bee8a2b..ae1adcd 100644
--- a/web/src/views/layout/main.vue
+++ b/web/src/views/layout/main.vue
@@ -88,21 +88,21 @@
},
methods: {
async kwReplacement() {
- let res = await this.$http.get(`sys/dict/type/getDictMap`,{params:{dictType:"key_word"}})
+ let res = await this.$http.get(`sys/dict/type/getDictMap`, {params: {dictType: "key_word"}})
if (res.data != null) {
this.$store.state.word = res.data
}
- console.log(this.$store.state.word,'this.$store.state.word')
+ console.log(this.$store.state.word, 'this.$store.state.word')
},
goSingleSign() {
let username = this.$route.query.username
let system = this.$route.query.system
- console.log('main token:',Cookies.get('token'))
- console.log('main username:',username)
- if (Cookies.get('token') && !username) {
+ console.log('main token:', Cookies.get('token'))
+ console.log('main username:', username)
+ if (Cookies.get('token') && !username) {
this.otherProcess()
return
- }else{
+ } else {
return
}
},
@@ -116,25 +116,25 @@
this.getOssConfig()
this.$store.dispatch('getDictList')
},
- getMenu(){
- this.$http.get('/sys/menu/nav').then(res => {
- if (res.code !== 0) {
- return
- }
- let menuList = res.data
- if (menuList && menuList.length > 0) {
- //window.SITE_CONFIG['menuList'] = menuList
- fnAddDynamicMenuRoutes(menuList, [])
- }
- window.SITE_CONFIG['menuList'] = menuList
- console.log(window.SITE_CONFIG['menuList'], 'window.SITE_CONFIG[\'menuList\']')
- // let that = this
- setTimeout(()=>{
- this.flag = getUUID()
- console.log('set flag')
- },50)
- })
- },
+ getMenu() {
+ this.$http.get('/sys/menu/nav').then(res => {
+ if (res.code !== 0) {
+ return
+ }
+ let menuList = res.data
+ if (menuList && menuList.length > 0) {
+ //window.SITE_CONFIG['menuList'] = menuList
+ fnAddDynamicMenuRoutes(menuList, [])
+ }
+ window.SITE_CONFIG['menuList'] = menuList
+ console.log(window.SITE_CONFIG['menuList'], 'window.SITE_CONFIG[\'menuList\']')
+ // let that = this
+ setTimeout(() => {
+ this.flag = Date.now() //getUUID()
+ console.log(this.flag,'set flag this.flag')
+ }, 50)
+ })
+ },
horizontalSystem() {
if (this.$store.state.menuPos === 'top') {
this.$store.state.horizontalSystem = true
@@ -275,12 +275,12 @@
}
this.$store.state.contentTabs = this.$store.state.contentTabs.concat(tab)
}
- console.log(this.$store.state.contentTabs,'this.$store.state.contentTabs2')
+ console.log(this.$store.state.contentTabs, 'this.$store.state.contentTabs2')
this.$store.state.sidebarMenuActiveName = tab.menuId
- if (tab.name === 'single'){
+ if (tab.name === 'single') {
this.$store.state.contentTabsActiveName = 'home'
- }else{
+ } else {
this.$store.state.contentTabsActiveName = tab.name
}
diff --git a/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue b/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
index fd37e36..76fb4a6 100644
--- a/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
@@ -106,7 +106,8 @@
</div>
<div class="el-border-left acceptDate" style="width: 90%;">
<el-form-item style="width: 100%;padding-left:20px;margin:0;">
- <el-input :disabled="stepMarker!=='pzxbg_first'" v-model="dataForm.configItemChange.changeReason" placeholder="鍙樻洿鍘熷洜..."></el-input>
+ <el-input v-if="stepMarker=='pzxbg_first'" v-model="dataForm.configItemChange.changeReason" placeholder="鍙樻洿鍘熷洜..."></el-input>
+ <span v-else>{{dataForm.configItemOutbound.changeReason}}</span>
</el-form-item>
</div>
</div>
diff --git a/web/src/views/modules/configItemOutbound/ConfigItemOutbound-AddOrUpdate.vue b/web/src/views/modules/configItemOutbound/ConfigItemOutbound-AddOrUpdate.vue
index 0151556..3b0098c 100644
--- a/web/src/views/modules/configItemOutbound/ConfigItemOutbound-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemOutbound/ConfigItemOutbound-AddOrUpdate.vue
@@ -33,7 +33,8 @@
</div>
<div class="el-border-left acceptDate" style="width: 90%;">
<el-form-item style="width: 100%;padding-left:20px;margin:0;">
- <el-input :disabled="stepMarker!=='pzxck_first'" v-model="dataForm.configItemOutbound.changeReason" placeholder="鍑哄簱鍘熷洜..."></el-input>
+ <el-input v-if="stepMarker=='pzxck_first'" v-model="dataForm.configItemOutbound.outboundReason" placeholder="鍑哄簱鍘熷洜..."></el-input>
+ <span v-else>{{dataForm.configItemOutbound.outboundReason}}</span>
</el-form-item>
</div>
</div>
@@ -110,7 +111,7 @@
</div>
<div style="width: calc(100% - 120px)" class="el-border-left">
<el-form-item class="el-wt-form-item-margin" label-width="20px" style="width: 85%">
- <zt-dict :disabled="stepMarker!=='pzxck_bmsh'" v-model="dataForm.configItemOutbound.approvalOpinions"
+ <zt-dict :disabled="stepMarker!=='pzxck_bmsp'" v-model="dataForm.configItemOutbound.approvalOpinions"
dict="is_pass" :radio="true"
clearable></zt-dict>
</el-form-item>
@@ -129,14 +130,14 @@
<div style="width: calc(100% - 120px)" class="el-border-left">
<el-form-item class="el-CMTextarea" style="width: 100%;padding: 5px">
<el-input v-if="stepMarker=='pzxck_cmcz'" type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="dataForm.configItemOutbound.outboundCmOperations"></el-input>
- <span v-else>{{dataForm.configItemOutbound.outboundCmOperations}}</span>
+ v-model="dataForm.configItemOutbound.CmOperations"></el-input>
+ <span v-else>{{dataForm.configItemOutbound.CmOperations}}</span>
</el-form-item>
<el-form-item label-width="80%" label="鎿嶄綔浜猴細" style="width: 65%">
- <span>{{dataForm.configItemOutbound.outboundOperator}}</span>
+ <span>{{dataForm.configItemOutbound.operator}}</span>
</el-form-item>
<el-form-item label="鏃ユ湡锛�" style="width: 20%">
- <span>{{dataForm.configItemOutbound.outboundOperateDate}}</span>
+ <span>{{dataForm.configItemOutbound.operateDate}}</span>
</el-form-item>
</div>
</div>
diff --git a/web/src/views/modules/sys/task/stay-task.vue b/web/src/views/modules/sys/task/stay-task.vue
index 83872bb..1e67235 100644
--- a/web/src/views/modules/sys/task/stay-task.vue
+++ b/web/src/views/modules/sys/task/stay-task.vue
@@ -58,6 +58,7 @@
<ItemCirculatOrder ref="itemCirculatOrder" @refreshDataList="getQuery()"></ItemCirculatOrder>
<ConfigItemWarehouse ref="configItemWarehouse" @refreshDataList="getQuery()"></ConfigItemWarehouse>
<ConfigItemChange ref="configItemChange" @refreshDataList="getQuery()"></ConfigItemChange>
+ <ConfigItemOutbound ref="configItemOutbound" @refreshDataList="getQuery()"></ConfigItemOutbound>
<TestCheckOrder ref="testCheckOrder" @refreshDataList="getQuery()"></TestCheckOrder>
<!-- </zt-table-wraper>-->
</div>
@@ -70,6 +71,7 @@
import ConfigItemWarehouse from '@/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate'
import TestCheckOrder from '@/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate'
import ConfigItemChange from '@/views/modules/configItemChange/ConfigItemChange-AddOrUpdate'
+ import ConfigItemOutbound from '@/views/modules/configItemOutbound/ConfigItemOutbound-AddOrUpdate'
export default {
data() {
@@ -111,7 +113,8 @@
ItemCirculatOrder,
ConfigItemWarehouse,
TestCheckOrder,
- ConfigItemChange
+ ConfigItemChange,
+ ConfigItemOutbound
},
created() {
if (this.$route.path.indexOf('taskCenter') > 0 || this.system == 'smj') {
@@ -227,6 +230,8 @@
this.$refs.testCheckOrder.$refs.dialog.init(row.bizId, row)
} else if (row.flowCode === 'pzxbg') {
this.$refs.configItemChange.$refs.dialog.init(row.bizId, row)
+ }else if (row.flowCode === 'pzxck') {
+ this.$refs.configItemOutbound.$refs.dialog.init(row.bizId, row)
}else {
if (row.stepRouterId === null) {
this.$tip.alert("娌℃湁閰嶇疆鑿滃崟id")
--
Gitblit v1.9.1