From dfd3903f59e4d5d32ffa5be546b00458d3e76477 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期一, 11 十二月 2023 14:26:44 +0800
Subject: [PATCH] 项目表
---
web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue b/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
index a0e1ad0..b91c86c 100644
--- a/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
@@ -38,7 +38,7 @@
<div class="el-border-left" style="width: calc(100% - 120px)">
<div class="table-container">
<el-table ref="tableConfigItemList" class="el-software el-margin-top-bot"
- style="width: 99%;margin-left: 5px" border :data="dataForm.configItemList"
+ style="width: 99%;margin-left: 5px" border :data="dataForm.configChangeList"
stripe>
<el-table-column prop="no" align="center" width="60" label="搴忓彿">
<template slot-scope="scope">
@@ -51,7 +51,7 @@
<span v-else>{{row.itemName}}</span>
</template>
</el-table-column>
- <el-table-column prop="itemDentify" align="center" min-width="290" label="閰嶇疆椤规爣璇�">
+ <el-table-column prop="itemIdentify" align="center" min-width="290" label="閰嶇疆椤规爣璇�">
<template v-slot="{ row }">
<el-input v-if="showAddAndEdit" v-model="row.itemIdentify" placeholder="閰嶇疆椤规爣璇�"></el-input>
<span v-else>{{row.itemIdentify}}</span>
@@ -106,7 +106,7 @@
</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.changeReason" placeholder="鍙樻洿鍘熷洜..."></el-input>
+ <el-input :disabled="stepMarker!=='pzxbg_first'" v-model="dataForm.configItemChange.changeReason" placeholder="鍙樻洿鍘熷洜..."></el-input>
</el-form-item>
</div>
</div>
@@ -116,7 +116,7 @@
</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.changeAnalysis" placeholder="鍙樻洿褰卞搷鍒嗘瀽..."></el-input>
+ <el-input :disabled="stepMarker!=='pzxbg_first'" v-model="dataForm.configItemChange.changeAnalysis" placeholder="鍙樻洿褰卞搷鍒嗘瀽..."></el-input>
</el-form-item>
</div>
</div>
@@ -126,7 +126,7 @@
</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=='pzxbg_cmcz'" type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�"
+ <el-input v-if="stepMarker=='pzxbg_first'" type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�"
v-model="dataForm.configItemChange.changeContent"></el-input>
<span v-else>{{dataForm.configItemChange.changeContent}}</span>
</el-form-item>
@@ -259,7 +259,7 @@
</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=='pzxbg_cmcz'" type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�"
+ <el-input v-if="stepMarker=='pzxbg_cmrk'" type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�"
v-model="dataForm.configItemChange.warehouseCmOperations"></el-input>
<span v-else>{{dataForm.configItemChange.warehouseCmOperations}}</span>
</el-form-item>
@@ -284,7 +284,7 @@
</div>
</div>
<add-or-update-check ref="addOrUpdate" @recall="setCheckId"/>
- <ConfigItemList ref="configItemList"></ConfigItemList>
+ <ConfigItemList ref="configItemList" @getChangeItemList="getChangeItemList"></ConfigItemList>
</el-form>
</zt-dialog>
</template>
@@ -299,6 +299,7 @@
disabled: true,
stepMarker: '',
title: '鏌ョ湅',
+ ids:'',
showColumn: false,
showAddAndEdit:false,
menuOptions: [
@@ -399,7 +400,9 @@
// },
handleCommand() {
this.$nextTick(()=>{
- this.$refs.configItemList.$refs.dialog.init(this.dataForm.configItemList)
+ console.log(this.dataForm.projectId,'this.dataForm.projectId')
+ this.ids = this.dataForm.configChangeList.map(item=>item.selectId).join(',')
+ this.$refs.configItemList.$refs.dialog.init(this.dataForm.projectId,this.ids)
})
// this.dataForm.configItemList.push({})
// this.$nextTick(() => {
@@ -407,6 +410,13 @@
// tableBody.scrollTop = tableBody.scrollHeight;
// })
},
+ getChangeItemList(data){
+ console.log(data.configChangeList,'getChangeItemList(data)')
+ if(data.configChangeList){
+ this.dataForm.configChangeList=this.dataForm.configChangeList.concat(data.configChangeList)
+ }
+ console.log(this.dataForm.configChangeList,ids,'this.dataForm.configChangeList')
+ },
openCheckOrderWin(row) {
console.log(row, "openCheckOrderWin(row)")
row.projectId = this.dataForm.projectId
--
Gitblit v1.9.1