From f568b4ae20f500cb10403559ea3fe5a451d3750d Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 07 十二月 2023 17:45:55 +0800
Subject: [PATCH] 配置变更表
---
web/src/views/modules/configItemChange/ConfigItemChange.vue | 6 +-
web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue | 150 ++++++++++++++++++++++++++++++++-----------------
web/src/views/modules/project/Project-select.vue | 6 +
3 files changed, 104 insertions(+), 58 deletions(-)
diff --git a/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue b/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
index 106574f..e5319d4 100644
--- a/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
@@ -1,14 +1,14 @@
<template>
<zt-dialog ref="dialog" column="3" :title="title" :stepMarker="stepMarker" @confirm="formSubmit">
<el-form ref="dataForm" style="padding-top: 0" :inline="true" :disabled="dataForm.disabled" :model="dataForm"
- label-width="120px" class="warehouseFormAuto">
+ label-width="120px" class="configChangeFormAuto">
<div>
<el-form-item label-width="60px" label="缂栧彿:" style="width:100%;margin-bottom: -5px">
<span>{{dataForm.configItemChange.code || '缂栧彿鑷姩鐢熸垚'}}</span>
</el-form-item>
</div>
<div style="border: 1px solid rgba(0,0,0,.2);width: 99%">
- <div style="border-bottom: 1px solid rgba(0,0,0,.2);" class="warehouseContentWidth">
+ <div style="border-bottom: 1px solid rgba(0,0,0,.2);" class="configChangeContentWidth">
<el-form-item class="marginTopAndMarginBottom" label="椤圭洰缂栧彿" style="width: 49%">
<el-input v-model="dataForm.project.code" placeholder="璇疯緭鍏ラ」鐩紪鍙�"></el-input>
</el-form-item>
@@ -31,9 +31,9 @@
<zt-dict v-model="dataForm.configItemChange.libraryType" :radio="true" dict="library_type"></zt-dict>
</el-form-item>
</div>
- <div class="el-flexManageDialog el-border-bottom">
+ <div class="el-configChangeDialog el-border-bottom">
<div class="DFormWidth DAlign DHold">
- 鍏ュ簱閰嶇疆椤�
+ 鍙樻洿鐢宠閰嶇疆椤�
</div>
<div class="el-border-left" style="width: calc(100% - 120px)">
<div class="table-container">
@@ -93,24 +93,88 @@
</template>
</el-table-column>
</el-table>
- <div v-if="showAddAndEdit" class="icon-container">
- <el-dropdown @command="handleCommand">
- <span class="el-dropdown-link">
- <i class="el-icon-plus"></i>
- </span>
- <el-dropdown-menu slot="dropdown">
- <el-dropdown-item v-for="item in menuOptions" :key="item.pageCode" :command="item.pageCode">
- {{ item.name }}
- </el-dropdown-item>
- </el-dropdown-menu>
- </el-dropdown>
+ <div v-if="showAddAndEdit" class="icon-container" @click="handleCommand">
<!-- 鏀剧疆鍥哄畾鐨勫浘鏍� -->
- <!-- <i class="el-icon-plus"></i>-->
+ <i class="el-icon-plus"></i>
</div>
</div>
</div>
</div>
- <div class="el-flexManageDialog el-border-bottom">
+ <div class="el-configChangeDialog el-border-bottom">
+ <div style="width: 120px;text-align: center;font-weight: 600">
+ 鍙樻洿鍘熷洜
+ </div>
+ <div class="el-border-left acceptDate" style="width: 90%;">
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ <el-input v-model="dataForm.configItemChange.problemProcess" placeholder="鍙樻洿鍘熷洜..."></el-input>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-configChangeDialog el-border-bottom">
+ <div style="width: 120px;text-align: center;font-weight: 600">
+ 鍙樻洿褰卞搷鍒嗘瀽
+ </div>
+ <div class="el-border-left acceptDate" style="width: 90%;">
+ <el-form-item style="width: 100%;padding-left:20px;margin:0;">
+ <el-input v-model="dataForm.configItemChange.problemProcess" placeholder="鍙樻洿褰卞搷鍒嗘瀽..."></el-input>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-configChangeDialog el-border-bottom">
+ <div style="width: 120px;text-align: center;font-weight: 600">
+ 鍙樻洿鍐呭
+ </div>
+ <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=='pzxrk_cmcz'" type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�"
+ v-model="dataForm.configItemChange.projectCmOperations"></el-input>
+ <span v-else>{{dataForm.configItemChange.projectCmOperations}}</span>
+ </el-form-item>
+ <el-form-item label-width="80%" label="鍙樻洿瀹炴柦浜猴細" style="width: 65%">
+ <span>{{dataForm.configItemChange.operator}}</span>
+ </el-form-item>
+ <el-form-item label="鏃ユ湡锛�" style="width: 20%">
+ <span>{{dataForm.configItemChange.operateDate}}</span>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-configChangeDialog el-border-bottom">
+ <div class="DFormWidth DAlign DHold">
+ 鎵瑰噯鎰忚
+ </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!=='pzxrk_bmsh'" v-model="dataForm.configItemChange.approvalOpinions"
+ dict="is_pass" :radio="true"
+ clearable></zt-dict>
+ </el-form-item>
+ <el-form-item label-width="80%" label="绛惧瓧锛�" style="width: 65%">
+ <span>{{dataForm.configItemChange.approvalSign}}</span>
+ </el-form-item>
+ <el-form-item label="鏃ユ湡锛�" style="width: 20%">
+ <span>{{dataForm.configItemChange.approvalDate}}</span>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-configChangeDialog el-border-bottom">
+ <div style="width: 120px;text-align: center;font-weight: 600">
+ 椤圭洰CM鍑哄簱鎿嶄綔
+ </div>
+ <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=='pzxrk_cmcz'" type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�"
+ v-model="dataForm.configItemChange.projectCmOperations"></el-input>
+ <span v-else>{{dataForm.configItemChange.projectCmOperations}}</span>
+ </el-form-item>
+ <el-form-item label-width="80%" label="鎿嶄綔浜猴細" style="width: 65%">
+ <span>{{dataForm.configItemChange.operator}}</span>
+ </el-form-item>
+ <el-form-item label="鏃ユ湡锛�" style="width: 20%">
+ <span>{{dataForm.configItemChange.operateDate}}</span>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="el-configChangeDialog el-border-bottom">
<div class="DFormWidth DAlign DHold">
椤圭洰QA瀹℃牳
</div>
@@ -149,7 +213,7 @@
</div>
</div>
</div>
- <div class="el-flexManageDialog el-border-bottom">
+ <div class="el-configChangeDialog el-border-bottom">
<div class="DFormWidth DAlign DHold">
CM瀹℃牳
</div>
@@ -188,27 +252,10 @@
</div>
</div>
</div>
- <div class="el-flexManageDialog el-border-bottom">
+
+ <div class="el-configChangeDialog el-border-bottom">
<div class="DFormWidth DAlign DHold">
- 鎵瑰噯鎰忚
- </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!=='pzxrk_bmsh'" v-model="dataForm.configItemChange.approvalOpinions"
- dict="is_pass" :radio="true"
- clearable></zt-dict>
- </el-form-item>
- <el-form-item label-width="80%" label="绛惧瓧锛�" style="width: 65%">
- <span>{{dataForm.configItemChange.approvalSign}}</span>
- </el-form-item>
- <el-form-item label="鏃ユ湡锛�" style="width: 20%">
- <span>{{dataForm.configItemChange.approvalDate}}</span>
- </el-form-item>
- </div>
- </div>
- <div class="el-flexManageDialog el-border-bottom">
- <div class="DFormWidth DAlign DHold">
- 椤圭洰CM鎿嶄綔
+ 椤圭洰CM鍏ュ簱鎿嶄綔
</div>
<div style="width: calc(100% - 120px)" class="el-border-left">
<el-form-item class="el-CMTextarea" style="width: 100%;padding: 5px">
@@ -224,7 +271,7 @@
</el-form-item>
</div>
</div>
- <div class="el-flexManageDialog">
+ <div class="el-configChangeDialog">
<div class="DFormWidth DAlign DHold">
澶囨敞
</div>
@@ -271,6 +318,7 @@
qaAuditResults: "",
qaAuditor: "",
qaAuditDate: "",
+ problemProcess:'',
cmAuditResults: "",
cmAuditor: "",
cmAuditDate: "",
@@ -339,14 +387,8 @@
// tableBody.scrollTop = tableBody.scrollHeight;
// })
// },
- handleCommand(pageCode) {
- const selectedItem = this.menuOptions.find(item => item.pageCode === pageCode);
- console.log(selectedItem, "handleCommand(pageCode) selectedItem")
- if (selectedItem.pageCode === 'other') {
- this.dataForm.configItemList.push({})
- } else if (selectedItem) {
- this.dataForm.configItemList.push({itemName: selectedItem.name, pageCode: selectedItem.pageCode})
- }
+ handleCommand() {
+ this.dataForm.configItemList.push({})
this.$nextTick(() => {
const tableBody = this.$refs.tableConfigItemList.$el.querySelector('.el-table__body-wrapper')
tableBody.scrollTop = tableBody.scrollHeight;
@@ -431,7 +473,7 @@
border: 1px solid;
}
- .el-flexManageDialog {
+ .el-configChangeDialog {
display: flex;
align-items: center;
}
@@ -487,20 +529,22 @@
font-size: 14px;
}
- .warehouseContentWidth > .el-form-item > .el-form-item__content {
+ .configChangeContentWidth > .el-form-item > .el-form-item__content {
width: calc(100% - 120px);
}
- .warehouseContentWidth > .el-form-item.lastChild > .el-form-item__content {
+ .configChangeContentWidth > .el-form-item.lastChild > .el-form-item__content {
width: calc(100% - 142px);
}
-
- .warehouseFormAuto .marginTopAndMarginBottom {
+ .configChangeFormAuto .acceptDate > .el-form-item > .el-form-item__content {
+ width: 100%;
+ }
+ .configChangeFormAuto .marginTopAndMarginBottom {
margin-top: 10px !important;
margin-bottom: 0 !important;
}
- .warehouseFormAuto .marginTopAndMarginBottom2 {
+ .configChangeFormAuto .marginTopAndMarginBottom2 {
margin-top: -10px !important;
margin-bottom: 0 !important;
}
diff --git a/web/src/views/modules/configItemChange/ConfigItemChange.vue b/web/src/views/modules/configItemChange/ConfigItemChange.vue
index f3ba208..f8e33c5 100644
--- a/web/src/views/modules/configItemChange/ConfigItemChange.vue
+++ b/web/src/views/modules/configItemChange/ConfigItemChange.vue
@@ -16,8 +16,8 @@
</el-form-item>
<el-form-item>
<zt-button type="query" @click="table.query()"/>
- <zt-button type="primary" class="el-icon-edit" perm="configItemChange:add" @click="add()">鏂板</zt-button>
- <zt-button type="delete" perm="configItemChange:delete" @click="table.deleteHandle()"/>
+ <zt-button type="primary" class="el-icon-edit" @click="add()">鏂板</zt-button>
+ <zt-button type="delete" @click="table.deleteHandle()"/>
</el-form-item>
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}" border @selection-change="table.selectionChangeHandle">
@@ -58,7 +58,7 @@
},
methods:{
add() {
- this.$refs.projectSelect.$refs.dialog.init("config_item_warehouse")
+ this.$refs.projectSelect.$refs.dialog.init("config_item_change")
},
openAddWin(row) {
console.log(row.id, 'row.id')
diff --git a/web/src/views/modules/project/Project-select.vue b/web/src/views/modules/project/Project-select.vue
index 104e869..06023dd 100644
--- a/web/src/views/modules/project/Project-select.vue
+++ b/web/src/views/modules/project/Project-select.vue
@@ -70,8 +70,10 @@
methods: {
init(tableName,row) {
this.dataForm.tableName = tableName
- if(row.pageCode!=null){
- this.pageCode = row.pageCode
+ if(row){
+ if(row.pageCode!=null){
+ this.pageCode = row.pageCode
+ }
}
this.$nextTick(()=>{
this.$refs.tableObj.query()
--
Gitblit v1.9.1