| modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/model/ConfigItemOutbound.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/service/ConfigItemOutboundService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| web/src/views/layout/main-sidebar-sub-menu.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| web/src/views/layout/main-sidebar.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| web/src/views/layout/main.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| web/src/views/modules/configItemOutbound/ConfigItemOutbound-AddOrUpdate.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| web/src/views/modules/sys/task/stay-task.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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 = "出库操作人ID") private Long OperatorId; private Long operatorId; @ApiModelProperty(value = "出库操作日期") @JsonFormat(pattern = "yyyy-MM-dd") private Date OperateDate; private Date operateDate; @ApiModelProperty(value = "备注") private String remark; 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()) { web/src/views/layout/main-sidebar-sub-menu.vue
@@ -5,15 +5,20 @@ <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> <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> <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> @@ -60,8 +65,7 @@ if (route) { console.log(route,'route') let tab = this.$store.state.contentTabs.filter(item => item.name === menuId)[0] if (tab) { if (tab) { if (route.path==='map-network-diagram-edit' ||route.path==='map-network-diagram-view' ||route.path==='map-flowChart-edit'){ 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) } web/src/views/layout/main.vue
@@ -130,8 +130,8 @@ console.log(window.SITE_CONFIG['menuList'], 'window.SITE_CONFIG[\'menuList\']') // let that = this setTimeout(()=>{ this.flag = getUUID() console.log('set flag') this.flag = Date.now() //getUUID() console.log(this.flag,'set flag this.flag') },50) }) }, 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> 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> 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")
