WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改已知问题

Browse Source
This commit is contained in:
qq787203167
2022-05-27 11:56:24 +08:00
parent b65ca78d88
commit 328a3ffb28
4 changed files with 152 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/dashboard/components/customContent.vue
+11 -9
View File
@@ -1,15 +1,18 @@
<template> <template>
<div class="customContent-box"> <div class="customContent-box">
<div class="box-content-top"> <div style="display: inline-block">
<div class="box-content" v-for="(item,index) in dataSourceContentList" :key="index" @click="urlClick(item)"> <div class="box-content-top">
<img :src="item.iconPath" class="img" alt=""> <div class="box-content" v-for="(item,index) in dataSourceContentList" :key="index" @click="urlClick(item)">
<div class="text" :title="item.iconName">{{item.iconName}}</div> <img :src="item.iconPath" class="img" alt="">
<div class="text" :title="item.iconName">{{item.iconName}}</div>
</div>
</div>
<div class="box-content" @click="customClick()" style=";margin-top: 0;float: right">
<img src="../../../assets/zdy.png" class="img" alt="">
<div class="text">{{$t('custom')}}</div>
</div> </div>
</div> </div>
<div class="box-content" @click="customClick()" style=";margin-top: 0">
<img src="../../../assets/zdy.png" class="img" alt="">
<div class="text">{{$t('custom')}}</div>
</div>
<a-modal <a-modal
:title="$t('custom')" :title="$t('custom')"
:width="1180" :width="1180"
@@ -177,7 +180,6 @@
display: inline-block; display: inline-block;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
float: left;
} }
.box-content { .box-content {
jero-web/src/views/documentTools/virtualList/components/editModel.vue
+63 -19
View File
@@ -301,12 +301,22 @@
:title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span> :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="typeOfDeliverables"> <a-form-model-item class="itemModel" prop="typeOfDeliverables">
<j-dict-select-tag class="box-input" v-model="formInline.designDeliverableType" <a-tree-select
:disabled="disabled" v-model="formInline.designDeliverableType"
@input="handleInput('designDeliverableType')" :maxTagCount="1"
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')" :getPopupContainer="triggerNode=> triggerNode.parentNode"
:type="'select'" class="box-input"
:triggerChange="false" :dictCode="'deliverable_template'"/> style="width: 100%"
:tree-data="DeliverableTreeList"
tree-checkable
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
/>
<!-- <j-dict-select-tag class="box-input" v-model="formInline.designDeliverableType"-->
<!-- :disabled="disabled"-->
<!-- @input="handleInput('designDeliverableType')"-->
<!-- :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'deliverable_template'"/>-->
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -372,12 +382,22 @@
:title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span> :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="prehomoDeliverableType"> <a-form-model-item class="itemModel" prop="prehomoDeliverableType">
<j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType" <a-tree-select
:disabled="disabled" v-model="formInline.prehomoDeliverableType"
@input="handleInput('prehomoDeliverableType')" :maxTagCount="1"
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')" :getPopupContainer="triggerNode=> triggerNode.parentNode"
:type="'select'" class="box-input"
:triggerChange="false" :dictCode="'deliverable_template'"/> style="width: 100%"
:tree-data="DeliverableTreeList"
tree-checkable
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
/>
<!-- <j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType"-->
<!-- :disabled="disabled"-->
<!-- @input="handleInput('prehomoDeliverableType')"-->
<!-- :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'deliverable_template'"/>-->
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -444,12 +464,22 @@
:title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span> :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="verifyDeliverableType"> <a-form-model-item class="itemModel" prop="verifyDeliverableType">
<j-dict-select-tag class="box-input" v-model="formInline.verifyDeliverableType" <a-tree-select
:disabled="disabled" v-model="formInline.verifyDeliverableType"
@input="handleInput('verifyDeliverableType')" :maxTagCount="1"
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')" :getPopupContainer="triggerNode=> triggerNode.parentNode"
:type="'select'" class="box-input"
:triggerChange="false" :dictCode="'deliverable_template'"/> style="width: 100%"
:tree-data="DeliverableTreeList"
tree-checkable
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
/>
<!-- <j-dict-select-tag class="box-input" v-model="formInline.verifyDeliverableType"-->
<!-- :disabled="disabled"-->
<!-- @input="handleInput('verifyDeliverableType')"-->
<!-- :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'deliverable_template'"/>-->
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -584,11 +614,13 @@
}, },
formInline: {}, formInline: {},
disabled: false, disabled: false,
CategoryTreeList: [] CategoryTreeList: [],
DeliverableTreeList: []
} }
}, },
mounted() { mounted() {
this.getSysCategoryTree() this.getSysCategoryTree()
this.getDeliverableTree()
}, },
methods: { methods: {
getSysCategoryTree() { getSysCategoryTree() {
@@ -600,11 +632,23 @@
} }
}) })
}, },
getDeliverableTree() {
getAction('/sys/category/getDeliverableTree', {}).then((res) => {
if (res.success) {
this.DeliverableTreeList = res.result
} else {
this.DeliverableTreeList = []
}
})
},
editModel(item) { editModel(item) {
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
this.formInline = item || {} this.formInline = item || {}
this.formInline.technologyTerritory = this.formInline.technologyTerritory ? this.formInline.technologyTerritory.split(',') : [] this.formInline.technologyTerritory = this.formInline.technologyTerritory ? this.formInline.technologyTerritory.split(',') : []
this.formInline.designDeliverableType = this.formInline.designDeliverableType ? this.formInline.designDeliverableType.split(',') : []
this.formInline.prehomoDeliverableType = this.formInline.prehomoDeliverableType ? this.formInline.prehomoDeliverableType.split(',') : []
this.formInline.verifyDeliverableType = this.formInline.verifyDeliverableType ? this.formInline.verifyDeliverableType.split(',') : []
this.$refs.ruleForm.clearValidate() this.$refs.ruleForm.clearValidate()
}) })
}, },
jero-web/src/views/projectManagement/components/listEditModel.vue
+66 -20
View File
@@ -322,12 +322,22 @@
:title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span> :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="typeOfDeliverables"> <a-form-model-item class="itemModel" prop="typeOfDeliverables">
<j-dict-select-tag class="box-input" v-model="formInline.designDeliverableType" <a-tree-select
:disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.designDeliverableType ? true : false" v-model="formInline.designDeliverableType"
@input="handleInput('designDeliverableType')" :maxTagCount="1"
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')" :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.designDeliverableType ? true : false"
:type="'select'" :getPopupContainer="triggerNode=> triggerNode.parentNode"
:triggerChange="false" :dictCode="'deliverable_template'"/> class="box-input"
style="width: 100%"
:tree-data="DeliverableTreeList"
tree-checkable
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
/>
<!-- <j-dict-select-tag class="box-input" v-model="formInline.designDeliverableType"-->
<!-- @input="handleInput('designDeliverableType')"-->
<!-- :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'deliverable_template'"/>-->
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -459,13 +469,23 @@
:title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span> :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="prehomoDeliverableType"> <a-form-model-item class="itemModel" prop="prehomoDeliverableType">
<a-tree-select
<j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType" v-model="formInline.prehomoDeliverableType"
:disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoDeliverableType ? true : false" :maxTagCount="1"
@input="handleInput('prehomoDeliverableType')" :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoDeliverableType ? true : false"
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')" :getPopupContainer="triggerNode=> triggerNode.parentNode"
:type="'select'" class="box-input"
:triggerChange="false" :dictCode="'deliverable_template'"/> style="width: 100%"
:tree-data="DeliverableTreeList"
tree-checkable
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
/>
<!-- <j-dict-select-tag class="box-input" v-model="formInline.prehomoDeliverableType"-->
<!-- :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoDeliverableType ? true : false"-->
<!-- @input="handleInput('prehomoDeliverableType')"-->
<!-- :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'deliverable_template'"/>-->
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -598,12 +618,23 @@
:title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span> :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="verifyDeliverableType"> <a-form-model-item class="itemModel" prop="verifyDeliverableType">
<j-dict-select-tag class="box-input" v-model="formInline.verifyDeliverableType" <a-tree-select
:disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyDeliverableType ? true : false" v-model="formInline.verifyDeliverableType"
@input="handleInput('verifyDeliverableType')" :maxTagCount="1"
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')" :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyDeliverableType ? true : false"
:type="'select'" :getPopupContainer="triggerNode=> triggerNode.parentNode"
:triggerChange="false" :dictCode="'deliverable_template'"/> class="box-input"
style="width: 100%"
:tree-data="DeliverableTreeList"
tree-checkable
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
/>
<!-- <j-dict-select-tag class="box-input" v-model="formInline.verifyDeliverableType"-->
<!-- :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyDeliverableType ? true : false"-->
<!-- @input="handleInput('verifyDeliverableType')"-->
<!-- :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'deliverable_template'"/>-->
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -821,12 +852,23 @@
prehomoInitiatorIdDisabled: false, prehomoInitiatorIdDisabled: false,
prehomoDutyIdDisabled: false, prehomoDutyIdDisabled: false,
verifyDutyIdDisabled: false, verifyDutyIdDisabled: false,
verifyInitiatorIdDisabled: false verifyInitiatorIdDisabled: false,
DeliverableTreeList: []
} }
}, },
mounted() { mounted() {
this.getDeliverableTree()
}, },
methods: { methods: {
getDeliverableTree() {
getAction('/sys/category/getDeliverableTree', {}).then((res) => {
if (res.success) {
this.DeliverableTreeList = res.result
} else {
this.DeliverableTreeList = []
}
})
},
dutyTerritoryChange(event) { dutyTerritoryChange(event) {
this.formInline.regulationOwnerId = undefined this.formInline.regulationOwnerId = undefined
this.formInline.engineeringInterfacePerson = undefined this.formInline.engineeringInterfacePerson = undefined
@@ -1001,6 +1043,10 @@
this.verifyInitiatorList = [] this.verifyInitiatorList = []
this.verifyDutyList = [] this.verifyDutyList = []
this.prehomoDutyList = [] this.prehomoDutyList = []
this.getDeliverableTree()
item.designDeliverableType = item.designDeliverableType ? item.designDeliverableType.split(',') : []
item.prehomoDeliverableType = item.prehomoDeliverableType ? item.prehomoDeliverableType.split(',') : []
item.verifyDeliverableType = item.verifyDeliverableType ? item.verifyDeliverableType.split(',') : []
if (item.dutyTerritory) { if (item.dutyTerritory) {
this.queryPersonByProject(item) this.queryPersonByProject(item)
} else { } else {
jero-web/src/views/projectManagement/projectLibrary/index.vue
+12 -8
View File
@@ -66,10 +66,12 @@
<div class="title-text" :title="$t('ModelPlatform')"> <div class="title-text" :title="$t('ModelPlatform')">
<span>{{$t('ModelPlatform')}}</span> <span>{{$t('ModelPlatform')}}</span>
</div> </div>
<j-dict-select-tag class="box-input" v-model="queryParam.vehiclePlatform" <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ModelPlatform')"
:placeholder="$t('PleaseSelect')+$t('ModelPlatform')" v-model="queryParam.vehiclePlatform"></a-input>
:type="'select'" <!-- <j-dict-select-tag class="box-input" v-model="queryParam.vehiclePlatform"-->
:triggerChange="false" :dictCode="'vehicle_platform'"/> <!-- :placeholder="$t('PleaseSelect')+$t('ModelPlatform')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'vehicle_platform'"/>-->
</div> </div>
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
@@ -77,10 +79,12 @@
<div class="title-text" :title="$t('DigitalPlatform')"> <div class="title-text" :title="$t('DigitalPlatform')">
<span>{{$t('DigitalPlatform')}}</span> <span>{{$t('DigitalPlatform')}}</span>
</div> </div>
<j-dict-select-tag class="box-input" v-model="queryParam.digitalPlatform" <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('DigitalPlatform')"
:placeholder="$t('PleaseSelect')+$t('DigitalPlatform')" v-model="queryParam.digitalPlatform"></a-input>
:type="'select'" <!-- <j-dict-select-tag class="box-input" v-model="queryParam.digitalPlatform"-->
:triggerChange="false" :dictCode="'digital_platform'"/> <!-- :placeholder="$t('PleaseSelect')+$t('DigitalPlatform')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'digital_platform'"/>-->
</div> </div>
</a-col> </a-col>
</template> </template>