Commit 11e3922f authored by 15008242619's avatar 15008242619

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

parents 57388555 99fd3c5b
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<el-option <el-option
v-for="citem in UserData" v-for="citem in UserData"
:key="citem.id" :key="citem.id"
:label="citem.name" :label="citem.name+'('+citem.userAccount+')'"
:value="basicData.subTypeName==='ScrapNoticeDoc'?`${citem.name}(${citem.userAccount})`:citem.id" :value="basicData.subTypeName==='ScrapNoticeDoc'?`${citem.name}(${citem.userAccount})`:citem.id"
/> />
</el-select> </el-select>
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
</template> </template>
<script> <script>
import { getUsersByAccount, getFuzzyMatchUser } from '@/api/user' import { getFuzzyMatchUser } from '@/api/user'
import { post } from '@/utils/http'
import config from './config' import config from './config'
export default { export default {
name: 'GeneralUserSelect', name: 'GeneralUserSelect',
...@@ -157,14 +158,63 @@ export default { ...@@ -157,14 +158,63 @@ export default {
}) })
} else { } else {
// 针对非审计页面查人 // 针对非审计页面查人
const params = { userAccount: query, containInnerUser: this.item.containInnerUse || false } // const params = { userAccount: query, containInnerUser: this.item.containInnerUse || false }
// if (this.item.secret) {
// params.secretCode = this.$store.state.user.userInfo.secretCode
// }
const params = {
'pageFrom': 1,
'pageSize': 200,
'openProps': [],
'sortItem': [
{
'fieldName': 'modifyTime',
'sortOrder': 'desc'
}
],
'searchItems': {
'operator': 'AND',
'children': [
{
'items': [
{
'fieldName': 'userAccount',
'operator': 'LIKE',
'value': query
},
{
'fieldName': 'name',
'operator': 'LIKE',
'value': query
}
],
'operator': 'OR'
},
{
'items': [
{
'fieldName': 'enableFlag',
'operator': 'EQ',
'value': true
}
],
'operator': 'AND'
}
]
}
}
if (this.item.secret) { if (this.item.secret) {
params.secretCode = this.$store.state.user.userInfo.secretCode // params.secretCode = this.$store.state.user.userInfo.secretCode
params.searchItems.items.push({
'fieldName': 'secretCode',
'operator': 'EQ',
'value': this.$store.state.user.userInfo.secretCode
},)
} }
this.loading = true this.loading = true
getUsersByAccount(params) post('/DxUserInfo/search', params)
.then(res => { .then(res => {
this.UserData = res.items ? res.items : [] this.UserData = res.items && res.items.content ? res.items.content : []
}) })
.finally(() => { .finally(() => {
this.loading = false this.loading = false
......
...@@ -81,6 +81,23 @@ export default { ...@@ -81,6 +81,23 @@ export default {
if (this.item.secret) { if (this.item.secret) {
params.secretCode = this.$store.state.user.userInfo.secretCode params.secretCode = this.$store.state.user.userInfo.secretCode
} }
let subTypeName = ''
switch (this.item.title) {
case '计划员':
subTypeName = 'PositionPlanner'
break
case '工程师':
subTypeName = 'PositionEngineer'
break
case '站位长':
subTypeName = 'ExtPositionUserLink'
break
case '准备工':
subTypeName = 'PropareLink'
break
default:
break
}
getUsersByAccount(params).then(res => { getUsersByAccount(params).then(res => {
const arr = [] const arr = []
this.bindValue.forEach(item => { this.bindValue.forEach(item => {
...@@ -97,7 +114,7 @@ export default { ...@@ -97,7 +114,7 @@ export default {
disabled: element.disabled, disabled: element.disabled,
target: element, target: element,
targetId: element.id, targetId: element.id,
subTypeName: this.basicData && this.basicData.propareLinks && this.basicData.propareLinks[0] && this.basicData.propareLinks[0].subTypeName || '' subTypeName: this.basicData && this.basicData.propareLinks && this.basicData.propareLinks[0] && this.basicData.propareLinks[0].subTypeName || this.basicData.extPositionUserLinks && this.basicData.extPositionUserLinks[0] && this.basicData.extPositionUserLinks[0].subTypeName || subTypeName || ''
} }
}) })
} else { } else {
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
:lay-config="layConfig" :lay-config="layConfig"
@row-click="rowClick" @row-click="rowClick"
/> --> /> -->
<stationPlanList @getMissData="getMissData" /> <stationPlanList :state-options="stateOptions" @getMissData="getMissData" />
</div> </div>
</template> </template>
<template slot="paneR"> <template slot="paneR">
......
...@@ -83,12 +83,20 @@ ...@@ -83,12 +83,20 @@
<dee-as-com <dee-as-com
ref="detailComSI2" ref="detailComSI2"
:key="layConfig2.typeName" :key="layConfig2.typeName"
:basic-data="{stateOptions}"
:lay-config="layConfig2" :lay-config="layConfig2"
table-height="calc(100vh - 200px)" table-height="calc(100vh - 200px)"
@row-click="rowClick" @row-click="rowClick"
/> />
</div> </div>
</dee-tab> </dee-tab>
<span v-if="areaUpdatingLists[form.sorties]==='Y'" class="areaUpdateTip">
<i class="el-icon-warning" />
<span>温馨提示: </span>
<span class="tipInfo">
当前架次下区域正在更新中......
</span>
</span>
</div> </div>
</template> </template>
</dee-fold-pane> </dee-fold-pane>
...@@ -99,6 +107,14 @@ ...@@ -99,6 +107,14 @@
import { post } from '@/utils/http' import { post } from '@/utils/http'
export default { export default {
name: 'StationPlanList', name: 'StationPlanList',
props: {
stateOptions: {
type: Array,
default: () => {
return []
}
}
},
data() { data() {
return { return {
keyword: '', keyword: '',
...@@ -169,7 +185,8 @@ export default { ...@@ -169,7 +185,8 @@ export default {
}, },
activeTab: '0', activeTab: '0',
activeNodeData: {}, activeNodeData: {},
currentNodekey: '' currentNodekey: '',
areaUpdatingLists: {}
} }
}, },
watch: { watch: {
...@@ -388,7 +405,9 @@ export default { ...@@ -388,7 +405,9 @@ export default {
res.items.content.unshift(res.items.content.splice(index, 1)[0]) res.items.content.unshift(res.items.content.splice(index, 1)[0])
} }
}) })
this.areaUpdatingLists = {}
this.sortiesData = res.items.content.map((row) => { this.sortiesData = res.items.content.map((row) => {
this.areaUpdatingLists[row.id] = row.areaUpdating
return { return {
value: row.id, value: row.id,
label: row.defName label: row.defName
...@@ -771,8 +790,15 @@ export default { ...@@ -771,8 +790,15 @@ export default {
} }
} }
.right-container { .right-container {
position: relative;
// width: 82%; // width: 82%;
margin-left: 20px; margin-left: 20px;
.areaUpdateTip{
position: absolute;
top: 20px;
right: 40px;
color: #ff0000;
}
} }
} }
</style> </style>
...@@ -120,12 +120,11 @@ ...@@ -120,12 +120,11 @@
/> />
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <!-- <el-row>
<el-form-item label="站位长/站位计划员/站位工程师" prop="receiver" label-width="250px"> <el-form-item label="站位长/站位计划员/站位工程师" prop="receiver" label-width="250px">
<!-- <DxUserSelect /> -->
<GeneralUserSelect v-model="form.receiver" :item="{multiple:true}" /> <GeneralUserSelect v-model="form.receiver" :item="{multiple:true}" />
</el-form-item> </el-form-item>
</el-row> </el-row> -->
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button <el-button
...@@ -327,10 +326,10 @@ export default { ...@@ -327,10 +326,10 @@ export default {
res.forEach(item => { res.forEach(item => {
result.push({ operator: 'ADD', target: item }) result.push({ operator: 'ADD', target: item })
}) })
var receiver = '' // var receiver = ''
this.form.receiver.forEach((item, i) => { // this.form.receiver.forEach((item, i) => {
receiver += (item + (this.form.receiver.length - 1 > i ? ',' : '')) // receiver += (item + (this.form.receiver.length - 1 > i ? ',' : ''))
}) // })
const params = { const params = {
operator: 'ADD', operator: 'ADD',
subTypeName: 'SpotProblem', subTypeName: 'SpotProblem',
...@@ -347,7 +346,7 @@ export default { ...@@ -347,7 +346,7 @@ export default {
airModel: this.form.airModel, airModel: this.form.airModel,
sorties: this.form.sorties, sorties: this.form.sorties,
standPosition: this.form.standPosition, standPosition: this.form.standPosition,
receiver: receiver, // receiver: receiver,
objFileLinks: result objFileLinks: result
} }
......
...@@ -537,12 +537,14 @@ ...@@ -537,12 +537,14 @@
<el-drawer <el-drawer
v-if="drawerShowExperimentAdd" v-if="drawerShowExperimentAdd"
title="试验申请" title="试验申请"
size="50%" class="DeeDrawerCmp"
size="70%"
append-to-body append-to-body
:before-close="onClose" :before-close="onClose"
:visible.sync="drawerShowExperimentAdd" :visible.sync="drawerShowExperimentAdd"
> >
<dee-as-com <dee-as-com
style="margin: 10px;"
:lay-config="{ :lay-config="{
typeName: 'ExperimentRecord', typeName: 'ExperimentRecord',
layKey: 'NotGeneral_Experiment_Create' layKey: 'NotGeneral_Experiment_Create'
......
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