From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突
---
src/views/common/rawMaterial-part.vue | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/views/common/rawMaterial-part.vue b/src/views/common/rawMaterial-part.vue
index 7d4a24f..27a3d34 100644
--- a/src/views/common/rawMaterial-part.vue
+++ b/src/views/common/rawMaterial-part.vue
@@ -1,4 +1,5 @@
<template>
+ <div class="body">
<el-dialog
v-diadrag
width="60%"
@@ -18,7 +19,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
:isShowPagination="false"
@@ -32,6 +33,7 @@
<el-button type="primary" @click="saveSelectRow">纭� 瀹�</el-button>
</div>
</el-dialog>
+ </div>
</template>
<script>
import ttable from '@/views/common/ztt-table'
@@ -65,7 +67,6 @@
return {
ajaxFun: chooseIFS,
innerVisible: false,
- listLoading: true,
currentRow: null,
multipleSelection: [],
uploadInfo: {
@@ -111,6 +112,14 @@
isSearch: true,
searchInfoType: 'text'
},
+ {
+ minWidth: '120',
+ prop: 'projectName',
+ label: '椤圭洰鍚嶇О',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
{
minWidth: '100',
prop: 'name',
@@ -178,6 +187,7 @@
mounted() {
},
+ // props:['currentRow'],
methods: {
getData() {
if (this.$refs.rawPartTable !== undefined) {
@@ -196,6 +206,7 @@
)
}
this.innerVisible = false
+ this.$parent.costPlannedAmountChange(this.currentRow)
},
handleCurrentChange(row) {
this.currentRow = row
@@ -210,6 +221,7 @@
this.innerVisible = this.currshowlist
if (this.currshowlist) {
this.$nextTick(() => {
+ // this.table.data=[]
this.getData()
})
}
@@ -236,5 +248,10 @@
margin-top: 0px;
margin-bottom: 5px;
}
+ /* @media screen and (max-width: 800px) {
+ .el-dialog {
+ height: 600px !important;
+ }
+ } */
</style>
\ No newline at end of file
--
Gitblit v1.9.3