Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -1754,6 +1754,14 @@
|
|||||||
this.form.prcNum = this.prcNum
|
this.form.prcNum = this.prcNum
|
||||||
this.form.prcName = this.prcName
|
this.form.prcName = this.prcName
|
||||||
this.form['id'] = item.id
|
this.form['id'] = item.id
|
||||||
|
|
||||||
|
// 遍历对象初始化文件信息
|
||||||
|
for(const p in this.form) {
|
||||||
|
if (typeof (this.form[p ]) != "function") {
|
||||||
|
this.initializeFileList(p,this.form[p]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
// 将文本状态的id与name对应
|
// 将文本状态的id与name对应
|
||||||
|
|||||||
@@ -195,8 +195,8 @@
|
|||||||
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
|
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
|
||||||
fontWeight: 'bold', height: '48px'}"
|
fontWeight: 'bold', height: '48px'}"
|
||||||
@selection-change="standSelectChange">
|
@selection-change="standSelectChange">
|
||||||
|
<!-- v-if="isPermission('b17f1d035219c47344032e261342d87d,c09dc12531085e30e39bbdc6cb6116ba,5aedea192a77b14c364f19bdcee3513a')>0"-->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
v-if="isPermission('b17f1d035219c47344032e261342d87d,c09dc12531085e30e39bbdc6cb6116ba,5aedea192a77b14c364f19bdcee3513a')>0"
|
|
||||||
type="selection"
|
type="selection"
|
||||||
min-width="5%"
|
min-width="5%"
|
||||||
align="center">
|
align="center">
|
||||||
|
|||||||
@@ -181,8 +181,8 @@
|
|||||||
fontWeight: 'bold', height: '48px'}"
|
fontWeight: 'bold', height: '48px'}"
|
||||||
@selection-change="standSelectChange"
|
@selection-change="standSelectChange"
|
||||||
>
|
>
|
||||||
|
<!-- v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbj,fd83032ae5f41a0021b00e93c88edbbe,fd83032ae5f41a0021b00e93c88edbbd')>0"-->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbj,fd83032ae5f41a0021b00e93c88edbbe,fd83032ae5f41a0021b00e93c88edbbd')>0"
|
|
||||||
|
|
||||||
type="selection"
|
type="selection"
|
||||||
min-width="5%"
|
min-width="5%"
|
||||||
|
|||||||
@@ -183,8 +183,8 @@
|
|||||||
fontWeight: 'bold', height: '48px'}"
|
fontWeight: 'bold', height: '48px'}"
|
||||||
@selection-change="standSelectChange"
|
@selection-change="standSelectChange"
|
||||||
@sort-change="sortChange">
|
@sort-change="sortChange">
|
||||||
|
<!-- v-if="isPermission('4d01342db0f56f01bfceaee7b46904f4,8871ed1be74cf65851659514880bb50a,29bf24bbd156c06f136cc89b1c7b2bb0')>0"-->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
v-if="isPermission('4d01342db0f56f01bfceaee7b46904f4,8871ed1be74cf65851659514880bb50a,29bf24bbd156c06f136cc89b1c7b2bb0')>0"
|
|
||||||
type="selection"
|
type="selection"
|
||||||
min-width="5%"
|
min-width="5%"
|
||||||
align="center">
|
align="center">
|
||||||
|
|||||||
Reference in New Issue
Block a user