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

修改禅道已知bug

Browse Source
This commit is contained in:
qq787203167
2022-05-23 17:45:30 +08:00
parent 3d97252141
commit dbd7c662a6
17 changed files with 1623 additions and 1473 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/documentManage/collection/index.vue
+2
View File
@@ -4,6 +4,7 @@
<div class="collection-search-wrapper">
<div class="collection-search-header">
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
@@ -42,6 +43,7 @@
</a-col>
</span>
</a-row>
</a-form>
</div>
</div>
</div>
jero-web/src/views/documentManage/tags/tabs/TagContent.vue
+80 -36
View File
@@ -3,17 +3,21 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="12">
<a-form-item :label="$t('LabelName')">
<a-input :placeholder="$t('PleaseEnter')+$t('LabelName')" v-model="queryParams.dictName"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="8">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">{{$t('query')}}</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{$t('reset')}}</a-button>
</span>
<div class="box-title-text">
<div class="title-text" :title="$t('LabelName')">
<span>{{$t('LabelName')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('LabelName')"
v-model="queryParams.dictName"></a-input>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
</a-col>
</span>
</a-row>
</a-form>
</div>
@@ -27,7 +31,9 @@
{{$t('BatchDelete')}}
</div>
</div>
<a-modal class="show-content" v-model="contentVisible" :visible="contentVisible" :title="title" :ok-text="$t('preservation')" :cancel-text="$t('cancel')" @ok="hideModal" @cancel="cancelModel" v-if="contentVisible">
<a-modal class="show-content" v-model="contentVisible" :visible="contentVisible" :title="title"
:ok-text="$t('preservation')" :cancel-text="$t('cancel')" @ok="hideModal" @cancel="cancelModel"
v-if="contentVisible">
<a-form-model
class="tag-content"
ref="ruleForm"
@@ -43,7 +49,8 @@
/>
</a-form-model-item>
<a-form-model-item :label="$t('LabelType')" prop="attributeType" v-if="isEdit==1" class="tag-item">
<j-dict-select-tag type="list" v-model="form.attributeType" dictCode="attribute_type" :placeholder="$t('PleaseSelectLabelType')" />
<j-dict-select-tag type="list" v-model="form.attributeType" dictCode="attribute_type"
:placeholder="$t('PleaseSelectLabelType')"/>
</a-form-model-item>
<a-form-model-item ref="describe" :label="$t('describe')" prop="description" class="tag-item">
@@ -57,7 +64,8 @@
<a-table :data-source="tableData" rowKey="id" :columns="columns"
:scroll="{x: true}"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" :loading="loading" class="tag-con-table">
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false"
:loading="loading" class="tag-con-table">
<template slot="action" slot-scope="text, record">
<a class="action-dict" @click="handleDicPop(record)">{{$t('DictionaryConfiguration')}}</a>
@@ -97,7 +105,8 @@
// import tabTable from './tabTable'
import DicList from '../dialog/DicList'
import Vue from 'vue'
import { UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types"
import { UI_CACHE_DB_DICT_DATA } from '@/store/mutation-types'
export default {
name: 'tagContent',
components: {
@@ -122,19 +131,19 @@
title: this.$t('LabelName'),
dataIndex: 'dictName',
key: 'dictName',
align: "center",
align: 'center',
ellipsis: true,
width: 100,
width: 100
},
{
title: this.$t('LabelType'),
align: "center",
align: 'center',
width: 100,
dataIndex: 'attributeTypeName',
dataIndex: 'attributeTypeName'
},
{
title: this.$t('describe'),
align: "center",
align: 'center',
dataIndex: 'description',
ellipsis: true,
width: 300
@@ -143,7 +152,7 @@
title: this.$t('operation'),
dataIndex: 'action',
scopedSlots: { customRender: 'action' },
align: "center",
align: 'center',
width: 170
}
],
@@ -152,13 +161,13 @@
form: {},
rules: {
dictName: [{ required: true, message: this.$t('PleaseEnterLabelName'), trigger: 'change' },
{ min:1, max: 100, message: this.$t('cantExeed')+'100'+this.$t('characters'), trigger: 'blur' },],
{ min: 1, max: 100, message: this.$t('cantExeed') + '100' + this.$t('characters'), trigger: 'blur' }],
attributeType: [
{ required: true, message: this.$t('PleaseSelectLabelType'), trigger: 'blur' },
{ required: true, message: this.$t('PleaseSelectLabelType'), trigger: 'blur' }
],
description: [
{ min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
{ min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' }
]
},
// typeVisible:{},
@@ -166,14 +175,12 @@
dictVal: 'list',
record: {},
isEdit: 1,
flag:false, //表单提交标识
flag: false //表单提交标识
}
},
computed:{
},
computed: {},
mounted() {
this.loadData();
this.loadData()
},
methods: {
//获取列表数据
@@ -181,7 +188,7 @@
this.loading = true
let params = {
...this.queryParams,
isTagDict:1,
isTagDict: 1
}
// sys/dict/tagDictPage
// sys/dict/page
@@ -214,7 +221,7 @@
},
hideModal() {
let params = {
...this.form,
...this.form
}
this.$refs.ruleForm.validate((valid) => {
// console.log('valide',valide)
@@ -312,7 +319,7 @@
}
this.loadData()
} else {
this.$message.warning(this.$t('operationFailed'));
this.$message.warning(this.$t('operationFailed'))
}
})
}
@@ -320,8 +327,8 @@
},
onSelectChange(selectedRowKeys) {
// console.log('selectedRowKeys changed: ', selectedRowKeys);
this.selectedRowKeys = selectedRowKeys;
this.ids = this.selectedRowKeys;
this.selectedRowKeys = selectedRowKeys
this.ids = this.selectedRowKeys
console.log('selRows', selectedRowKeys)
},
//批量删除
@@ -354,8 +361,7 @@
}
})
}
else{
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
},
@@ -387,7 +393,7 @@
},
//字典列表关闭
onDicClose() {
this.dicVisible = false;
this.dicVisible = false
},
//点击页数
onChangePage(page, pageSize) {
@@ -400,18 +406,20 @@
this.queryParams.pageSize = pageSize
this.queryParams.pageNo = 1
this.loadData()
},
}
}
}
</script>
<style lang="less" scoped>
@import '~@assets/less/common.less';
.tag-content {
.tag-con-table {
.action-dict, .action-edit {
margin-right: 10px;
}
.action-delete {
color: red;
}
@@ -423,20 +431,55 @@
text-align: right;
}
}
.type-popover {
p {
margin: 5px 0;
}
p:hover {
cursor: pointer;
color: #0c8fcf;
}
}
.dict-drawer {
.ant-drawer-content-wrapper {
width: 100%;
}
}
.box-title-text {
line-height: 1.4;
display: flex;
align-items: center;
margin-bottom: 10px;
}
.title-text {
width: 60px;
color: #000F16;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
margin-top: 3px;
text-align: right;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.box-input {
display: inline-block;
width: 70%;
height: 38px;
margin-top: 2px;
}
.box-button {
height: 38px;
/*margin-top: 2px;*/
}
</style>
<style lang="less">
.show-content {
@@ -445,6 +488,7 @@
}
}
.tag-content {
.tag-item {
.ant-col-6 {
jero-web/src/views/documentManage/tags/tabs/TagItem.vue
+117 -52
View File
@@ -3,29 +3,40 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="12" v-show='submitKey=="1"'>
<a-form-item :label="$t('ChineseName')">
<a-input :placeholder="$t('PleaseEnter')+$t('ChineseName')" v-model="queryParamOne.dbFieldTxt"></a-input>
</a-form-item>
<a-col :md="6" :sm="8" v-show='submitKey=="1"'>
<div class="box-title-text">
<div class="title-text" :title="$t('ChineseName')">
<span>{{$t('ChineseName')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ChineseName')"
v-model="queryParamOne.dbFieldTxt"></a-input>
</div>
</a-col>
<a-col :md="6" :sm="12" v-show='submitKey=="2"'>
<a-form-item :label="$t('ChineseName')">
<a-input :placeholder="$t('PleaseEnter')+$t('ChineseName')" v-model="queryParamTwo.dbFieldTxt"></a-input>
</a-form-item>
<a-col :md="6" :sm="8" v-show='submitKey=="2"'>
<div class="box-title-text">
<div class="title-text" :title="$t('ChineseName')">
<span>{{$t('ChineseName')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ChineseName')"
v-model="queryParamOne.dbFieldTxt"></a-input>
</div>
</a-col>
<a-col :md="6" :sm="8" v-show='submitKey=="1"'>
<a-form-item :label="$t('DisplayArea')">
<a-select v-model="queryParamOne.showArea" :placeholder="$t('pleaseSelect')">
<div class="box-title-text">
<div class="title-text" :title="$t('DisplayArea')">
<span>{{$t('DisplayArea')}}</span>
</div>
<a-select class="box-input" v-model="queryParamOne.showArea" :placeholder="$t('pleaseSelect')">
<a-select-option :value="item.id" v-for="item in areas">{{item.showArea}}</a-select-option>
</a-select>
</a-form-item>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
</a-col>
<a-col :md="6" :sm="8">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">{{$t('query')}}</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{$t('reset')}}</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
@@ -43,30 +54,41 @@
{{$t('BatchDelete')}}
</div>
</div>
<a-drawer class="show-drawer" :title="titleTag" placement="right" width="1000px" @close="close" :visible="drawerVisible" :after-visible-change="afterVisibleChange" >
<a-drawer class="show-drawer" :title="titleTag" placement="right" width="1000px" @close="close"
:visible="drawerVisible" :after-visible-change="afterVisibleChange">
<div class="new-tag-drawer">
<a-spin :spinning="spinningDrawer" style="width: 100%;height:100%">
<tag-form v-if="drawerVisible&&editFlag" ref="realForm" @ok="closeTag" :isTagContent="isTagContent" :editData="editData" :editId=editId :submitEdit="submitEdit" :disableEdit="disableEdit" :disabled="disableSubmit" :submitKey="submitKey" normal> </tag-form>
<tag-form v-if="drawerVisible&&editFlag" ref="realForm" @ok="closeTag" :isTagContent="isTagContent"
:editData="editData" :editId=editId :submitEdit="submitEdit" :disableEdit="disableEdit"
:disabled="disableSubmit" :submitKey="submitKey" normal></tag-form>
<div class="drawer-footer" v-if="drawerVisible&&editFlag">
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">{{$t('preservation')}}</a-button>
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">
{{$t('preservation')}}
</a-button>
<a-button @click="handleCancel" style="margin-bottom: 0;">{{$t('close')}}</a-button>
</div>
</a-spin>
</div>
</a-drawer>
<a-modal class="show-area" v-model="areaVisible" :title="$t('ExhibitionAreaManagement')" :footer="null" @cancel="hideModal">
<area-manage v-if="areaVisible" @diaHide="diaHide" @submitOk="submitOk" @deleteOk="deleteOk" @updateOk="updateOk"></area-manage>
<a-modal class="show-area" v-model="areaVisible" :title="$t('ExhibitionAreaManagement')" :footer="null"
@cancel="hideModal">
<area-manage v-if="areaVisible" @diaHide="diaHide" @submitOk="submitOk" @deleteOk="deleteOk"
@updateOk="updateOk"></area-manage>
</a-modal>
<div class="tag-doc-tab">
<a-spin :spinning="spinning">
<a-tabs default-active-key="1" @change="callbackTab">
<a-tab-pane key="1" :tab="$t('DocumentLibrary')">
<tab-table v-if="spinning==false" :tableData="tableData" :columns="taglabColumns" :parm="queryParamOne" :selectedRowKey="selectedRowKey" @visibleEd="visibleEd" @visibleDelete="visibleDelete" @queryParams="queryParamsOne" @selecteds="selecteds" :total="total"></tab-table>
<tab-table v-if="spinning==false" :tableData="tableData" :columns="taglabColumns" :parm="queryParamOne"
:selectedRowKey="selectedRowKey" @visibleEd="visibleEd" @visibleDelete="visibleDelete"
@queryParams="queryParamsOne" @selecteds="selecteds" :total="total"></tab-table>
</a-tab-pane>
<a-tab-pane key="2" :tab="$t('DocumentSplitting')">
<tab-table v-if="spinning==false" :tableData="tableData" :columns="taglabColumns1" :parm="queryParamTwo" :selectedRowKey="selectedRowKey" @visibleEd="visibleEd" @visibleDelete="visibleDelete" @queryParams="queryParamsTwo" @selecteds="selecteds" :total="total"></tab-table>
<tab-table v-if="spinning==false" :tableData="tableData" :columns="taglabColumns1" :parm="queryParamTwo"
:selectedRowKey="selectedRowKey" @visibleEd="visibleEd" @visibleDelete="visibleDelete"
@queryParams="queryParamsTwo" @selecteds="selecteds" :total="total"></tab-table>
<!-- <tab-table :tableData="tableData" :columns="taglabColumns" @visibleEd="visibleEd" @visibleDelete="visibleDelete" :total="total" :parm="queryParam"></tab-table>-->
</a-tab-pane>
</a-tabs>
@@ -81,6 +103,7 @@
import TabTable from './TabTable'
import AreaManage from '../dialog/AreaManage'
import TagForm from '../dialog/TagForm'
export default {
name: 'tagItem',
components: {
@@ -94,11 +117,11 @@
spinning: false,
queryParamOne: {
pageNo: 1,
pageSize:10,
pageSize: 10
},
queryParamTwo: {
pageNo: 1,
pageSize:10,
pageSize: 10
},
titleTag: this.$t('NewLabelItem'),
typeVisible: false,
@@ -110,37 +133,37 @@
taglabColumns: [
{
title: this.$t('ChineseName'),
align: "center",
align: 'center',
width: 100,
dataIndex: 'dbFieldTxt',
dataIndex: 'dbFieldTxt'
},
{
title: this.$t('enName'),
align: "center",
align: 'center',
width: 100,
dataIndex: 'dbFieldEnName',
dataIndex: 'dbFieldEnName'
},
{
title: this.$t('AttributeType'),
align: "center",
align: 'center',
width: 100,
dataIndex: 'fieldShowTypeName',
dataIndex: 'fieldShowTypeName'
},
{
title: this.$t('FieldLength'),
align: "center",
align: 'center',
width: 80,
dataIndex: 'dbLength'
},
{
title: this.$t('DisplayOrder'),
align: "center",
align: 'center',
width: 80,
dataIndex: 'orderNum'
},
{
title: this.$t('DisplayArea'),
align: "center",
align: 'center',
width: 80,
dataIndex: 'showAreaName'
},
@@ -148,38 +171,38 @@
title: this.$t('operation'),
dataIndex: 'action',
scopedSlots: { customRender: 'action' },
align: "center",
align: 'center',
width: 170
}
],
taglabColumns1: [
{
title: this.$t('ChineseName'),
align: "center",
align: 'center',
width: 100,
dataIndex: 'dbFieldTxt',
dataIndex: 'dbFieldTxt'
},
{
title: this.$t('enName'),
align: "center",
align: 'center',
width: 100,
dataIndex: 'dbFieldEnName',
dataIndex: 'dbFieldEnName'
},
{
title: this.$t('AttributeType'),
align: "center",
align: 'center',
width: 100,
dataIndex: 'fieldShowTypeName',
dataIndex: 'fieldShowTypeName'
},
{
title: this.$t('FieldLength'),
align: "center",
align: 'center',
width: 80,
dataIndex: 'dbLength'
},
{
title: this.$t('DisplayOrder'),
align: "center",
align: 'center',
width: 80,
dataIndex: 'orderNum'
},
@@ -187,7 +210,7 @@
title: this.$t('operation'),
dataIndex: 'action',
scopedSlots: { customRender: 'action' },
align: "center",
align: 'center',
width: 170
}
],
@@ -216,12 +239,12 @@
methods: {
//获取展示区域
loadShowArea() {
let params = {};
let params = {}
getAction(`tag/onlCgformArea/queryShowArea`, params).then((res) => {
if (res.success) {
this.areas = res.result
}
});
})
},
searchQuery() {
this.queryParamOne.pageNo = 1
@@ -312,7 +335,7 @@
this.areaVisible = vis
},
hideModal() {
this.visible = false;
this.visible = false
},
close() {
this.drawerVisible = false
@@ -336,7 +359,7 @@
this.editId = id
this.submitEdit = 'edit'
let params = {
id:id,
id: id
}
this.spinningDrawer = true
getAction(`tag/onlCgformTag/queryById`, params).then(res => {
@@ -424,8 +447,7 @@
}
})
}
else{
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
},
@@ -494,7 +516,7 @@
//
// },
handleOk() {
this.$refs.realForm.submitForm();
this.$refs.realForm.submitForm()
},
handleCancel() {
this.drawerVisible = false
@@ -506,28 +528,63 @@
<style lang="less" scoped>
@import '~@assets/less/common.less';
.type-popover {
p {
margin: 5px;
}
p:hover {
color: #0c8fcf;
cursor: pointer;
}
}
.new-tag-drawer {
.drawer-footer {
height: 32px;
display: flex;
justify-content: center;
.ant-btn {
margin-left: 30px;
margin-bottom: 30px;
float: right;
}
}
}
.box-title-text {
line-height: 1.4;
display: flex;
align-items: center;
margin-bottom: 10px;
}
.title-text {
width: 60px;
color: #000F16;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
margin-top: 3px;
text-align: right;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.box-input {
display: inline-block;
width: 70%;
height: 38px;
margin-top: 2px;
}
.box-button {
height: 38px;
/*margin-top: 2px;*/
}
</style>
@@ -539,14 +596,22 @@
width: 1000px !important;
}
}
.diolag-area {
.table-operator {
text-align: right;
}
.page {
text-align: right;
}
}
}
.box-input .ant-select-selection__rendered {
line-height: 38px;
height: 38px;
}
.box-input .ant-select-selection--single {
height: 38px;
}
</style>
jero-web/src/views/documentTools/virtualList/components/addModel.vue
+2
View File
@@ -10,6 +10,7 @@
style="height: 100%;overflow: auto;padding-bottom: 53px;">
<div style="margin-bottom: 60px">
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="12" :sm="8">
<div class="box-title-text">
@@ -50,6 +51,7 @@
</a-col>
</span>
</a-row>
</a-form>
</div>
<div style="width: 100%">
<a-table
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+2
View File
@@ -42,6 +42,7 @@
{{$t('listSubclauses')}}
</div>
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
@@ -80,6 +81,7 @@
</a-col>
</span>
</a-row>
</a-form>
</div>
<div class="table-operator">
<!-- 导入-->
jero-web/src/views/documentTools/virtualList/index.vue
+2
View File
@@ -1,6 +1,7 @@
<template>
<a-card :bordered="false">
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
@@ -29,6 +30,7 @@
</a-col>
</span>
</a-row>
</a-form>
</div>
<div class="table-operator">
<div @click="handleAdd" class="operator-text" v-has="'document:getInfoById'">
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+37 -27
View File
@@ -2,6 +2,7 @@
<a-card :bordered="false">
<div class="table-page-search-wrapper">
<!-- 认证参数收集-参数项收集清单-10控件-->
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
@@ -59,6 +60,7 @@
</a-col>
</span>
</a-row>
</a-form>
</div>
<div class="table-operator">
<a-popconfirm overlayClassName='popconfirm' placement="bottomRight">
@@ -126,7 +128,8 @@
</div>
<div style="width: 100%">
<!-- 表格-10控件-->
<table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue' :formInline='formInline' @LoginUserType='LoginUserType' @value='value'/>
<table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue'
:formInline='formInline' @LoginUserType='LoginUserType' @value='value'/>
</div>
<!-- 添加--->
<a-modal v-model="areaVisible" :title="$t('ParameterLibrary')" width='750px' :footer="null">
@@ -159,22 +162,27 @@
<div class="imports-footer">
<div class="imports-footer-wrap">
<a-button class="imports-btn imports-sub" type="primary" @click="handleSubmitFreeze" v-has="'split:sarFileSplitItems:importSplitResult'">{{$t('preservation')}}</a-button>
<a-button class="imports-btn imports-sub" type="primary" @click="handleSubmitFreeze"
v-has="'split:sarFileSplitItems:importSplitResult'">{{$t('preservation')}}
</a-button>
<a-button class="imports-btn" type="primary" @click="cancleImportsFreeze">{{$t('cancel')}}</a-button>
</div>
</div>
</a-modal>
<!-- 分配填写人--->
<a-modal v-model="areaVisibleAssignedby" :title="$t('Assignedby')" width='950px' :footer="null">
<assigned-by v-if='areaVisibleAssignedby' :selectedRowKeysArray='selectedRowKeysArray' @areaVisibleAssignedbyflag='areaVisibleAssignedbyflag'/>
<assigned-by v-if='areaVisibleAssignedby' :selectedRowKeysArray='selectedRowKeysArray'
@areaVisibleAssignedbyflag='areaVisibleAssignedbyflag'/>
</a-modal>
<!-- 截至时间--->
<a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('TaskCutOffTime')" width='650px' :footer="null">
<task-cut-off-time v-if='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray' @areaVisibleTaskCutOffTimeflag='areaVisibleTaskCutOffTimeflag'/>
<task-cut-off-time v-if='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray'
@areaVisibleTaskCutOffTimeflag='areaVisibleTaskCutOffTimeflag'/>
</a-modal>
<!-- 引用参数--->
<a-modal v-model="areaVisiblereferenceparameter" :title="$t('referenceparameter')" width='650px' :footer="null">
<reference-parameter v-if='areaVisiblereferenceparameter' :paramsManifest='paramsManifest' :selectedRowKeysArray='selectedRowKeysArray'/>
<reference-parameter v-if='areaVisiblereferenceparameter' :paramsManifest='paramsManifest'
:selectedRowKeysArray='selectedRowKeysArray'/>
</a-modal>
</a-card>
</template>
@@ -190,6 +198,7 @@ import axios from 'axios'
import { ACCESS_TOKEN } from '@/store/mutation-types'
import Vue from 'vue'
import moment from 'moment'
export default {
name: 'ParameterItemCollectionList',
components: {
@@ -211,32 +220,32 @@ export default {
{
title: this.$t('status'),
align: 'center',
dataIndex: 'state',
dataIndex: 'state'
},
{
title: this.$t('parameterTemplateName'),
align: 'center',
dataIndex: 'paramsTemplateName',
dataIndex: 'paramsTemplateName'
},
{
title: this.$t('collectionCompletionTime'),
align: 'center',
dataIndex: 'finishTime',
dataIndex: 'finishTime'
},
{
title: this.$t('Version'),
align: 'center',
dataIndex: 'version',
dataIndex: 'version'
},
{
title: this.$t('creator'),
align: 'center',
dataIndex: 'createBy',
dataIndex: 'createBy'
},
{
title: this.$t('createTime'),
align: 'center',
dataIndex: 'createTime',
dataIndex: 'createTime'
},
{
title: this.$t('operation'),
@@ -255,7 +264,7 @@ export default {
getLoginUserType: 'params/collectManifest/getLoginUserType', // 获取当前登陆人
getquerySdtList: 'params/collectManifest/querySdtList', // 获取工程接口人的列表
updateSdt: 'params/collectManifest/updateSdt', // 提交工程接口人
deleteBatch: 'params/collectManifest/deleteBatch',
deleteBatch: 'params/collectManifest/deleteBatch'
// deleteAll: 'params/manifest/deleteBatch',
// conAdd: 'params/config/addBatch',
// conList: 'params/config/list',
@@ -292,7 +301,7 @@ export default {
sm: { span: 7 }
},
rules: {},
FreezeList: [], // 冻结字段
FreezeList: [] // 冻结字段
}
},
props: {
@@ -302,7 +311,8 @@ export default {
require: true
}
},
mounted() {},
mounted() {
},
methods: {
// 认证工程师的权限
// 认证工程师 退回 权限
@@ -500,8 +510,8 @@ export default {
}
})
.catch((error) => {
console.log(error);
});
console.log(error)
})
},
// 冻结配置取消
cancleImportsFreeze() {
@@ -535,8 +545,8 @@ export default {
}
})
.catch((error) => {
console.log(error);
});
console.log(error)
})
},
// 下发收集的权限
distributionAndCollectionJurisdiction() {
@@ -582,8 +592,8 @@ export default {
}
})
.catch((error) => {
console.log(error);
});
console.log(error)
})
},
handleSynchronousReportLibraryJurisdiction() {
let homoJurisdictionSynchronousLibrary = this.homoJurisdictionSynchronousLibrary()
@@ -681,8 +691,8 @@ export default {
}
})
.catch((error) => {
console.log(error);
});
console.log(error)
})
},
compulsoryWithdrawaljurisdiction() {
let homoJurisdictionCompulsoryWithdrawal = this.homoJurisdictionCompulsoryWithdrawal()
@@ -725,8 +735,8 @@ export default {
}
})
.catch((error) => {
console.log(error);
});
console.log(error)
})
},
// 分配填写人
assignedBy() {
@@ -819,8 +829,8 @@ export default {
}
})
.catch((error) => {
console.log(error);
});
console.log(error)
})
}
})
} else {
@@ -832,7 +842,7 @@ export default {
},
SizeChange() {
},
}
}
}
</script>
jero-web/src/views/projectManagement/components/TaskList.vue
+7 -5
View File
@@ -1,6 +1,7 @@
<template>
<a-card :bordered="false">
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
@@ -29,6 +30,7 @@
</a-col>
</span>
</a-row>
</a-form>
</div>
<div class="table-operator">
<div @click="CertificationDirectory" class="operator-text">
@@ -212,7 +214,7 @@
'To be tracked': 'TrackedColor',
'NA': 'notInvolvedColor',
'No rating': 'submittedColor',
'Termination of task': 'nonConformityColor',
'Termination of task': 'nonConformityColor'
},
statusText: {
'Compliance': this.$t('accord'),
@@ -220,7 +222,7 @@
'To be tracked': this.$t('Tracked'),
'NA': this.$t('notInvolved'),
'No rating': this.$t('toBeConfirmed'),
'Termination of task': this.$t('taskTermination'),
'Termination of task': this.$t('taskTermination')
},
CertificationColor: {
'Test passed': 'accordColor',
@@ -299,7 +301,7 @@
projectName: this.$route.query.projectName,
projectNameId: this.$route.query.projectNameId,
primaryKeyId: val.designTaskDetailId,
PersonChargeFeedback:val.designPersonChargeFeedback,
PersonChargeFeedback: val.designPersonChargeFeedback
}
break
case 2:
@@ -323,7 +325,7 @@
projectName: this.$route.query.projectName,
projectNameId: this.$route.query.projectNameId,
primaryKeyId: val.prehomoTaskDetailId,
PersonChargeFeedback:val.prehomoPersonChargeFeedback,
PersonChargeFeedback: val.prehomoPersonChargeFeedback
}
break
case 3:
@@ -347,7 +349,7 @@
projectName: this.$route.query.projectName,
projectNameId: this.$route.query.projectNameId,
primaryKeyId: val.verifyTaskDetailId,
PersonChargeFeedback:val.verifyPersonChargeFeedback,
PersonChargeFeedback: val.verifyPersonChargeFeedback
}
break
}
jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+19 -14
View File
@@ -1,6 +1,7 @@
<template>
<a-card :bordered="false">
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
@@ -18,6 +19,7 @@
</a-col>
</span>
</a-row>
</a-form>
</div>
<div class="table-operator">
<div @click="handleAdd" class="operator-text">
@@ -75,7 +77,8 @@
<!-- 参数模板-->
<a-modal v-model="areaVisible" :title="$t('parameterTemplate')" width='750px' :footer="null">
<parameter-template-add v-if='areaVisible' @areaVisible='handleCancel' :templateTitle='templatetitle'
:selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version' :projectId='this.$route.query.id'></parameter-template-add>
:selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version'
:projectId='this.$route.query.id'></parameter-template-add>
</a-modal>
<!-- 配置-->
<configure ref="configureRef" :url='url' :itemId='itemId'/>
@@ -86,7 +89,8 @@
<!-- 复制参数模板-->
<a-modal v-model="areaVisibleCody" :title="$t('CopyProjectCollectionparameters')" width='750px' :footer="null">
<parameter-template-cody v-if='areaVisibleCody' @areaVisible='handleCancel' :templateTitle='templatetitle'
:selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version' :projectId='this.$route.query.id'></parameter-template-cody>
:selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version'
:projectId='this.$route.query.id'></parameter-template-cody>
</a-modal>
</a-card>
</template>
@@ -101,6 +105,7 @@
import axios from 'axios'
import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types'
export default {
name: 'TaskParameterCollection',
components: {
@@ -122,32 +127,32 @@
{
title: this.$t('status'),
align: 'center',
dataIndex: 'state',
dataIndex: 'state'
},
{
title: this.$t('parameterTemplateName'),
align: 'center',
dataIndex: 'paramsTemplateName',
dataIndex: 'paramsTemplateName'
},
{
title: this.$t('collectionCompletionTime'),
align: 'center',
dataIndex: 'finishTime',
dataIndex: 'finishTime'
},
{
title: this.$t('Version'),
align: 'center',
dataIndex: 'version',
dataIndex: 'version'
},
{
title: this.$t('creator'),
align: 'center',
dataIndex: 'createBy',
dataIndex: 'createBy'
},
{
title: this.$t('createTime'),
align: 'center',
dataIndex: 'createTime',
dataIndex: 'createTime'
},
{
title: this.$t('operation'),
@@ -168,7 +173,7 @@
deleteBatch: 'params/manifest/delete',
deleteAll: 'params/manifest/deleteBatch',
conAdd: 'params/config/addBatch',
conList: 'params/config/list',
conList: 'params/config/list'
},
loading: false,
dataSource: [],
@@ -185,7 +190,7 @@
itemId: '',
historicalVisible: false,
historicalRow: {}, // 历史版本得数据
areaVisibleCody: false, // 复制参数清单得弹框
areaVisibleCody: false // 复制参数清单得弹框
}
},
mounted() {
@@ -196,7 +201,7 @@
localStorage.setItem('paramsManifest', JSON.stringify(item))
let newUrl = this.$router.resolve({
path: '/ParameterItemCollection',
query: this.$route.query,
query: this.$route.query
})
window.open(newUrl.href, '_blank')
},
@@ -291,8 +296,8 @@
}
})
.catch((error) => {
console.log(error);
});
console.log(error)
})
},
handleDel() {
let param = {
@@ -346,7 +351,7 @@
}
})
}
},
}
}
</script>
jero-web/src/views/projectManagement/components/listAddModel.vue
+2
View File
@@ -10,6 +10,7 @@
style="height: 100%;overflow: auto;padding-bottom: 53px;">
<div style="margin-bottom: 60px">
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="12" :sm="8">
<div class="box-title-text">
@@ -50,6 +51,7 @@
</a-col>
</span>
</a-row>
</a-form>
</div>
<a-table
:columns="columns"
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+2
View File
@@ -4,6 +4,7 @@
{{ $t('DocumentStandard') }}
</div>
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
@@ -43,6 +44,7 @@
</a-col>
</span>
</a-row>
</a-form>
</div>
<div class="table-operator" style="overflow:hidden;">
<div style="float: left;margin-bottom: 10px;margin-left: 20px" v-if="isDisplay">
jero-web/src/views/projectManagement/components/nonConformance.vue
+2
View File
@@ -1,6 +1,7 @@
<template>
<a-card :bordered="false">
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
@@ -38,6 +39,7 @@
</a-col>
</span>
</a-row>
</a-form>
</div>
<div class="table-operator">
<div @click="handleExport" class="operator-text">
jero-web/src/views/projectManagement/components/transferList.vue
+2
View File
@@ -10,6 +10,7 @@
style="height: 100%;overflow: auto;padding-bottom: 53px;">
<div style="margin-bottom: 60px">
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="12" :sm="8">
<div class="box-title-text">
@@ -27,6 +28,7 @@
</a-col>
</span>
</a-row>
</a-form>
</div>
<a-table
:columns="columns"
jero-web/src/views/projectManagement/historicalVersion/index.vue
+2
View File
@@ -4,6 +4,7 @@
{{ $t('DocumentStandard') }}
</div>
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
@@ -43,6 +44,7 @@
</a-col>
</span>
</a-row>
</a-form>
</div>
<div style="width: 100%">
<a-table
jero-web/src/views/projectManagement/projectLibrary/index.vue
+2
View File
@@ -1,6 +1,7 @@
<template>
<a-card :bordered="false">
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
@@ -94,6 +95,7 @@
</a-col>
</span>
</a-row>
</a-form>
</div>
<div class="table-operator">
<div @click="handleAdd" class="operator-text" v-has="'document:getInfoById'">
jero-web/src/views/projectManagement/projectNonConformance/index.vue
+3 -1
View File
@@ -1,6 +1,7 @@
<template>
<a-card :bordered="false">
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
@@ -22,7 +23,7 @@
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" style="width: 64px" :title="$t('areaOfResponsibility')">
<div class="title-text" :title="$t('areaOfResponsibility')">
<span>{{$t('areaOfResponsibility')}}</span>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
@@ -138,6 +139,7 @@
</a-col>
</span>
</a-row>
</a-form>
</div>
<div class="table-operator">
<div @click="handleExport" class="operator-text">
jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+3 -1
View File
@@ -1,6 +1,7 @@
<template>
<a-card :bordered="false">
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
@@ -29,6 +30,7 @@
</a-col>
</span>
</a-row>
</a-form>
</div>
<div class="box-top">
<span class="box-top-text">{{$t('regulatoryCertificationTaskPlan')}}</span>
@@ -315,7 +317,7 @@
fontFamily: 'Blue Sky Noto',
color: '#000F16',
fontSize: '16'
},
}
},
axisLine: {
show: false