Commit 725c573d authored by jingnan's avatar jingnan 👀

Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

parents 6f65d20f ede9945b
...@@ -14,10 +14,13 @@ ...@@ -14,10 +14,13 @@
trigger="click" trigger="click"
> >
<upload-files ref="chemical" v-model="form.chemicalObjFileLinks" :view-or-edit="'view'" /> <upload-files ref="chemical" v-model="form.chemicalObjFileLinks" :view-or-edit="'view'" />
<el-button slot="reference">查看附件</el-button> <el-button slot="reference" size="medium" type="primary">查看附件</el-button>
</el-popover> </el-popover>
</div> </div>
<dee-tools :tools="tools" mode="normal" style="flex-direction: row-reverse;margin-bottom: 12px;" /> <div class="right-button">
<el-button type="primary" size="medium" @click="savePDF">下载</el-button>
</div>
<!-- <dee-tools :tools="tools" mode="normal" style="flex-direction: row-reverse;margin-bottom: 12px;" /> -->
</div> </div>
<el-form ref="form" :model="form" class="checkNo-container" :rules="formRules"> <el-form ref="form" :model="form" class="checkNo-container" :rules="formRules">
<el-col :span="6"> <el-col :span="6">
...@@ -979,8 +982,14 @@ export default { ...@@ -979,8 +982,14 @@ export default {
.material-checkNo { .material-checkNo {
.head{ .head{
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-start;
align-items: center; align-items: center;
.right-button {
margin-left:10px;
}
}
.link-to-page-dialog-box{
max-height: 100%;
} }
// .el-select { // .el-select {
// width: 220px // width: 220px
......
...@@ -205,7 +205,12 @@ export default { ...@@ -205,7 +205,12 @@ export default {
.searchApi('AircraftSorties', params) .searchApi('AircraftSorties', params)
.then((res) => { .then((res) => {
this.sortiesData = [] this.sortiesData = []
if (res) { if (res.items && res.items.content) {
res.items.content.map((item, index) => {
if (item.defCode === 'NA') {
res.items.content.unshift(res.items.content.splice(index, 1)[0])
}
})
this.sortiesData = res.items.content.map((row) => { this.sortiesData = res.items.content.map((row) => {
return { return {
value: row.id, value: row.id,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment