From 5881cf33d6410528f713f8b49c708d83cff27c11 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期二, 26 十二月 2023 14:33:34 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/common/rawMaterial-part.vue | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/views/common/rawMaterial-part.vue b/src/views/common/rawMaterial-part.vue
index 7d4a24f..13d5b07 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%"
@@ -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