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
+289 -245
View File
@@ -1,93 +1,101 @@
<template>
<div class="tag-content">
<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>
<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">
<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-col>
</a-row>
</a-form>
</a-row>
</a-form>
</div>
<div class="table-operator">
<div class="operator-text" @click="handleAdd" v-has="'dict:add'">
<a-icon type="plus"/>
{{$t('newlyAdded')}}
</div>
<div class="table-operator">
<div class="operator-text" @click="handleAdd" v-has="'dict:add'">
<a-icon type="plus" />
{{$t('newlyAdded')}}
</div>
<div class="operator-text" @click="batDelete" v-has="'dict:logicDeleteBatch'">
<a-icon type="delete" />
{{$t('BatchDelete')}}
</div>
<div class="operator-text" @click="batDelete" v-has="'dict:logicDeleteBatch'">
<a-icon type="delete"/>
{{$t('BatchDelete')}}
</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-form-model
class="tag-content"
ref="ruleForm"
:model="form"
:rules="rules"
:label-col="labelCol"
:wrapper-col="wrapperCol"
>
<a-form-model-item ref="tagName" :label="$t('LabeItemName')" prop="dictName" class="tag-item">
<a-input
v-model="form.dictName"
:placeholder="$t('PleaseEnterLabelName')"
/>
</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')" />
</a-form-model-item>
<a-form-model-item ref="describe" :label="$t('describe')" prop="description" class="tag-item">
<a-input
v-model="form.description"
:placeholder="$t('PleaseEnterDescription')"
/>
</a-form-model-item>
</a-form-model>
</a-modal>
<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">
<template slot="action" slot-scope="text, record">
<a class="action-dict" @click="handleDicPop(record)">{{$t('DictionaryConfiguration')}}</a>
<a class="action-edit" @click="actionEdit(record)" v-has="'dict:edit'">{{$t('edit')}}</a>
<a class="action-delete" href="javascript:;" @click="onDelete(record)" v-has="'dict:logicDelete'">{{$t('delete')}}</a>
</template>
</a-table>
<div class="page" v-if="tableData.length > 0">
<a-pagination
:show-total="total => $t('total')+` ${total} `+$t('strip')"
show-quick-jumper
show-size-changer
:page-size.sync="queryParams.pageSize"
:total="total"
@change="onChangePage"
@showSizeChange="SizeChange"
/>
</div>
<a-drawer
class="dict-drawer"
:title="$t('DictionaryList')"
placement="right"
:closable="true"
:visible="dicVisible"
:after-visible-change="afterDicVisibleChange"
@close="onDicClose"
width="1000px"
</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-form-model
class="tag-content"
ref="ruleForm"
:model="form"
:rules="rules"
:label-col="labelCol"
:wrapper-col="wrapperCol"
>
<dic-list :dictVal="dictVal" :record="record" v-if="dicVisible"></dic-list>
</a-drawer>
<a-form-model-item ref="tagName" :label="$t('LabeItemName')" prop="dictName" class="tag-item">
<a-input
v-model="form.dictName"
:placeholder="$t('PleaseEnterLabelName')"
/>
</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')"/>
</a-form-model-item>
<a-form-model-item ref="describe" :label="$t('describe')" prop="description" class="tag-item">
<a-input
v-model="form.description"
:placeholder="$t('PleaseEnterDescription')"
/>
</a-form-model-item>
</a-form-model>
</a-modal>
<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">
<template slot="action" slot-scope="text, record">
<a class="action-dict" @click="handleDicPop(record)">{{$t('DictionaryConfiguration')}}</a>
<a class="action-edit" @click="actionEdit(record)" v-has="'dict:edit'">{{$t('edit')}}</a>
<a class="action-delete" href="javascript:;" @click="onDelete(record)" v-has="'dict:logicDelete'">{{$t('delete')}}</a>
</template>
</a-table>
<div class="page" v-if="tableData.length > 0">
<a-pagination
:show-total="total => $t('total')+` ${total} `+$t('strip')"
show-quick-jumper
show-size-changer
:page-size.sync="queryParams.pageSize"
:total="total"
@change="onChangePage"
@showSizeChange="SizeChange"
/>
</div>
<a-drawer
class="dict-drawer"
:title="$t('DictionaryList')"
placement="right"
:closable="true"
:visible="dicVisible"
:after-visible-change="afterDicVisibleChange"
@close="onDicClose"
width="1000px"
>
<dic-list :dictVal="dictVal" :record="record" v-if="dicVisible"></dic-list>
</a-drawer>
</div>
</template>
@@ -97,137 +105,136 @@
// 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:{
components: {
// tabTable,
DicList
},
data(){
return{
data() {
return {
title: this.$t('add'),
total:0,
queryParams:{
pageNo:1,
pageSize:10
total: 0,
queryParams: {
pageNo: 1,
pageSize: 10
},
ids:[],
loading:false,
ids: [],
loading: false,
selectedRowKeys: [],
contentVisible:false,
tableData:[],
contentVisible: false,
tableData: [],
columns: [
{
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
width: 300
},
{
title: this.$t('operation'),
dataIndex: 'action',
scopedSlots: {customRender: 'action'},
align: "center",
scopedSlots: { customRender: 'action' },
align: 'center',
width: 170
}
],
labelCol: { span:6 },
labelCol: { span: 6 },
wrapperCol: { span: 16 },
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' },],
attributeType:[
{ required: true, message: this.$t('PleaseSelectLabelType'), trigger: 'blur' },
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' }],
attributeType: [
{ required: true, message: this.$t('PleaseSelectLabelType'), trigger: 'blur' }
],
description:[
{ min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
description: [
{ min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' }
]
},
// typeVisible:{},
dicVisible:false,
dictVal:'list',
dicVisible: false,
dictVal: 'list',
record: {},
isEdit:1,
flag:false, //表单提交标识
isEdit: 1,
flag: false //表单提交标识
}
},
computed:{
},
computed: {},
mounted() {
this.loadData();
this.loadData()
},
methods:{
methods: {
//获取列表数据
loadData(param){
this.loading=true
let params={
loadData(param) {
this.loading = true
let params = {
...this.queryParams,
isTagDict:1,
isTagDict: 1
}
// sys/dict/tagDictPage
// sys/dict/page
postAction(`sys/dict/tagDictPage`,params).then(res=>{
if(res.success){
this.total=res.result.total
this.tableData=[...res.result.records]
postAction(`sys/dict/tagDictPage`, params).then(res => {
if (res.success) {
this.total = res.result.total
this.tableData = [...res.result.records]
}
}).finally(()=>{
this.loading=false
}).finally(() => {
this.loading = false
})
},
//查询
searchQuery(){
this.queryParams.pageNo=1
searchQuery() {
this.queryParams.pageNo = 1
this.loadData()
},
searchReset(){
this.queryParams={
pageNo:1,
searchReset() {
this.queryParams = {
pageNo: 1,
pageSize: 10
}
this.loadData()
},
handleAdd(){
this.title=this.$t('add')
this.isEdit=1
this.contentVisible=true
this.form={}
handleAdd() {
this.title = this.$t('add')
this.isEdit = 1
this.contentVisible = true
this.form = {}
},
hideModal(){
let params={
...this.form,
hideModal() {
let params = {
...this.form
}
this.$refs.ruleForm.validate((valid)=>{
this.$refs.ruleForm.validate((valid) => {
// console.log('valide',valide)
if(valid){
if (valid) {
if(!this.flag){
this.flag=true
if(this.isEdit==1){
if (!this.flag) {
this.flag = true
if (this.isEdit == 1) {
params.id=''
params.isTagDict=1
params.isReadOnly=0
postAction(`sys/dict/add`,params).then(res=> {
params.id = ''
params.isTagDict = 1
params.isReadOnly = 0
postAction(`sys/dict/add`, params).then(res => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.contentVisible = false
@@ -244,26 +251,26 @@
}
}
}).finally(()=>{
this.flag=false
})
}else if(this.isEdit==0){
this.$delete(params,'isReadOnly')
this.$delete(params,'isTagDict')
// console.log('editparams',params)
putAction(`sys/dict/edit`,params).then(res=>{
if(res.success){
this.$message.success( this.$t('OperationSuccessful'))
this.reFresh()
this.loadData()
this.contentVisible=false
this.form={}
}else{
this.$message.warning(this.$t('operationFailed'))
}
}).finally(()=>{
this.flag=false
})
}).finally(() => {
this.flag = false
})
} else if (this.isEdit == 0) {
this.$delete(params, 'isReadOnly')
this.$delete(params, 'isTagDict')
// console.log('editparams',params)
putAction(`sys/dict/edit`, params).then(res => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.reFresh()
this.loadData()
this.contentVisible = false
this.form = {}
} else {
this.$message.warning(this.$t('operationFailed'))
}
}).finally(() => {
this.flag = false
})
}
}
}
@@ -271,7 +278,7 @@
},
//刷新缓存
reFresh(){
reFresh() {
getAction('sys/dict/refleshCache').then((res) => {
if (res.success) {
//重新加载缓存
@@ -286,17 +293,17 @@
console.log('刷新失败', e)
})
},
cancelModel(){
this.contentVisible=false
this.form={}
cancelModel() {
this.contentVisible = false
this.form = {}
},
onCellChange(){
onCellChange() {
},
//删除
onDelete(val){
let param={
id:val.id
onDelete(val) {
let param = {
id: val.id
}
this.$confirm({
title: this.$t('ConfirmDelete'),
@@ -307,12 +314,12 @@
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.reFresh()
if(this.tableData&&this.tableData.length==1&&this.queryParams.pageNo!=1){
this.queryParams.pageNo=this.queryParams.pageNo-1
if (this.tableData && this.tableData.length == 1 && this.queryParams.pageNo != 1) {
this.queryParams.pageNo = this.queryParams.pageNo - 1
}
this.loadData()
}else{
this.$message.warning(this.$t('operationFailed'));
} else {
this.$message.warning(this.$t('operationFailed'))
}
})
}
@@ -320,16 +327,16 @@
},
onSelectChange(selectedRowKeys) {
// console.log('selectedRowKeys changed: ', selectedRowKeys);
this.selectedRowKeys = selectedRowKeys;
this.ids = this.selectedRowKeys;
console.log('selRows',selectedRowKeys)
this.selectedRowKeys = selectedRowKeys
this.ids = this.selectedRowKeys
console.log('selRows', selectedRowKeys)
},
//批量删除
batDelete(){
let params={
ids:this.ids.join(',')
batDelete() {
let params = {
ids: this.ids.join(',')
}
if(this.ids&&this.ids.length>0){
if (this.ids && this.ids.length > 0) {
this.$confirm({
title: this.$t('ConfirmDelete'),
content: '',
@@ -339,46 +346,45 @@
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.reFresh()
this.selectedRowKeys=[]
if(this.ids.length==this.tableData.length&&this.queryParams.pageNo!=1){
this.queryParams.pageNo=this.queryParams.pageNo-1
this.selectedRowKeys = []
if (this.ids.length == this.tableData.length && this.queryParams.pageNo != 1) {
this.queryParams.pageNo = this.queryParams.pageNo - 1
}
this.loadData()
// postAction(`online/cgform/api/doDbSynch/48308196e7b04761b533dc31bc899707/normal
// `,{}).then(res=>{
// })
}else{
// postAction(`online/cgform/api/doDbSynch/48308196e7b04761b533dc31bc899707/normal
// `,{}).then(res=>{
// })
} else {
this.$message.warning(this.$t('operationFailed'))
}
})
}
})
}
else{
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
},
//编辑
actionEdit(val){
this.title=this.$t('edit')
this.isEdit=0
this.form={...val}
this.contentVisible=true
actionEdit(val) {
this.title = this.$t('edit')
this.isEdit = 0
this.form = { ...val }
this.contentVisible = true
},
//字典配置
handleDicPop(record){
this.record=record
if(record.attributeType=='1'){
handleDicPop(record) {
this.record = record
if (record.attributeType == '1') {
// console.log('attribu',record.attributeType,record.attributeType=='1')
// this.typeVisible[record.id]=false
this.dictVal='list'
this.dicVisible=true
this.dictVal = 'list'
this.dicVisible = true
}else if(record.attributeType=='2'){
} else if (record.attributeType == '2') {
// this.typeVisible[record.id]=false
this.dictVal='tree'
this.dicVisible=true
this.dictVal = 'tree'
this.dicVisible = true
}
},
afterDicVisibleChange(val) {
@@ -387,69 +393,107 @@
},
//字典列表关闭
onDicClose() {
this.dicVisible = false;
this.dicVisible = false
},
//点击页数
onChangePage(page,pageSize){
console.log('page',page)
onChangePage(page, pageSize) {
console.log('page', page)
this.queryParams.pageNo = page
this.loadData()
},
//一页显示条数
SizeChange(page,pageSize){
SizeChange(page, pageSize) {
this.queryParams.pageSize = pageSize
this.queryParams.pageNo=1
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{
.tag-content {
.tag-con-table {
.action-dict, .action-edit {
margin-right: 10px;
}
.action-delete{
color:red;
.action-delete {
color: red;
}
}
.page{
.page {
margin-top: 20px;
text-align: right;
}
}
.type-popover{
p{
margin:5px 0;
.type-popover {
p {
margin: 5px 0;
}
p:hover{
p:hover {
cursor: pointer;
color:#0c8fcf;
color: #0c8fcf;
}
}
.dict-drawer{
.ant-drawer-content-wrapper{
.dict-drawer {
.ant-drawer-content-wrapper {
width: 100%;
}
}
</style>
<style lang="less">
.show-content{
.ant-modal-footer{
text-align: center;
.box-title-text {
line-height: 1.4;
display: flex;
align-items: center;
margin-bottom: 10px;
}
}
.tag-content{
.tag-item{
.ant-col-6{
min-width: 130px;
.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 {
.ant-modal-footer {
text-align: center;
}
}
.tag-content {
.tag-item {
.ant-col-6 {
min-width: 130px;
}
}
}
}
</style>
jero-web/src/views/documentManage/tags/tabs/TagItem.vue
+328 -263
View File
@@ -1,256 +1,279 @@
<template>
<div class="tag-item">
<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>
<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>
<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')">
<a-select-option :value="item.id" v-for="item in areas">{{item.showArea}}</a-select-option>
</a-select>
</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>
</a-col>
</a-row>
</a-form>
</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" 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="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"'>
<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>
</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>
<div class="table-operator">
<div class="operator-text" @click="handleAddPop" v-has="'tag:add'">
<a-icon type="plus" />
{{$t('newlyAdded')}}
<a-icon type="plus"/>
{{$t('newlyAdded')}}
</div>
<div class="operator-text" @click="handleShow" v-if="key=='1'">
<a-icon type="rocket" :rotate="45" />
<a-icon type="rocket" :rotate="45"/>
{{$t('ExhibitionAreaManagement')}}
</div>
<div class="operator-text" @click="batDelete" v-has="'tag:logicDeleteBatch'">
<a-icon type="delete" />
<a-icon type="delete"/>
{{$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>
<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>
<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 @click="handleCancel" style="margin-bottom: 0;">{{$t('close')}}</a-button>
</div>
<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 @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>
<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>
</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 :tableData="tableData" :columns="taglabColumns" @visibleEd="visibleEd" @visibleDelete="visibleDelete" :total="total" :parm="queryParam"></tab-table>-->
</a-tab-pane>
</a-tabs>
</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>
<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>
</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 :tableData="tableData" :columns="taglabColumns" @visibleEd="visibleEd" @visibleDelete="visibleDelete" :total="total" :parm="queryParam"></tab-table>-->
</a-tab-pane>
</a-tabs>
</a-spin>
</div>
</div>
</template>
<script>
import { putAction,postAction,getAction,deleteAction } from '@/api/manage'
import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
import JInput from '@/components/jero/JInput'
import TabTable from './TabTable'
import AreaManage from '../dialog/AreaManage'
import TagForm from '../dialog/TagForm'
export default {
name: 'tagItem',
components:{
components: {
JInput,
TabTable,
AreaManage,
TagForm
},
data(){
return{
spinning:false,
queryParamOne:{
pageNo:1,
pageSize:10,
data() {
return {
spinning: false,
queryParamOne: {
pageNo: 1,
pageSize: 10
},
queryParamTwo:{
pageNo:1,
pageSize:10,
queryParamTwo: {
pageNo: 1,
pageSize: 10
},
titleTag:this.$t('NewLabelItem'),
typeVisible:false,
isTagContent:false,
editData:{}, //编辑的数据
editFlag:true,
areas:[],
tableData:[],
titleTag: this.$t('NewLabelItem'),
typeVisible: false,
isTagContent: false,
editData: {}, //编辑的数据
editFlag: true,
areas: [],
tableData: [],
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'
},
{
title: this.$t('operation'),
dataIndex: 'action',
scopedSlots: {customRender: 'action'},
align: "center",
scopedSlots: { customRender: 'action' },
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'
},
{
title: this.$t('operation'),
dataIndex: 'action',
scopedSlots: {customRender: 'action'},
align: "center",
scopedSlots: { customRender: 'action' },
align: 'center',
width: 170
}
],
areaVisible:false,
areaTable:[],
areaTotal:0,
drawerVisible:false,
value:1,
editId:'',
submitEdit:'add',
key:1,
total:0,
type:'input',
ids:[],
disableSubmit:false,
selectedRowKey:[],
spinningDrawer:false,
disableEdit:true,
submitKey:'1'
areaVisible: false,
areaTable: [],
areaTotal: 0,
drawerVisible: false,
value: 1,
editId: '',
submitEdit: 'add',
key: 1,
total: 0,
type: 'input',
ids: [],
disableSubmit: false,
selectedRowKey: [],
spinningDrawer: false,
disableEdit: true,
submitKey: '1'
}
},
mounted() {
this.loadData(1)
this.loadShowArea()
},
methods:{
methods: {
//获取展示区域
loadShowArea(){
let params = {};
getAction(`tag/onlCgformArea/queryShowArea`,params).then((res)=>{
if(res.success){
this.areas=res.result
loadShowArea() {
let params = {}
getAction(`tag/onlCgformArea/queryShowArea`, params).then((res) => {
if (res.success) {
this.areas = res.result
}
});
})
},
searchQuery(){
this.queryParamOne.pageNo=1
this.queryParamTwo.pageNo=1
if(this.key==1){
searchQuery() {
this.queryParamOne.pageNo = 1
this.queryParamTwo.pageNo = 1
if (this.key == 1) {
this.loadData(1)
}else if(this.key==2){
} else if (this.key == 2) {
this.loadData(0)
}
},
searchReset(){
this.queryParamOne={
pageNo:0,
searchReset() {
this.queryParamOne = {
pageNo: 0,
pageSize: 10
}
this.queryParamTwo={
pageNo:0,
this.queryParamTwo = {
pageNo: 0,
pageSize: 10
}
this.searchQuery()
},
handleAdd(){
this.drawerVisible=true
handleAdd() {
this.drawerVisible = true
},
//区域管理列表数据
handleShow(){
this.areaVisible=true
handleShow() {
this.areaVisible = true
// getAction(`tag/onlCgformArea/page`,{}).then(res=>{
// if(res.success){
// this.areaTable=res.result
@@ -259,99 +282,99 @@
// })
},
//标签项管理文档库初始数据
loadData(val){
this.spinning=true
this.tableData=[]
let paramsOne={
loadData(val) {
this.spinning = true
this.tableData = []
let paramsOne = {
...this.queryParamOne,
isModel:1
isModel: 1
}
let paramsTwo={
let paramsTwo = {
...this.queryParamTwo,
isModel:1
isModel: 1
}
let paramsItem
// console.log('params',params)
if(val==1){
if (val == 1) {
// console.log('1')
paramsOne.isModel=1
paramsOne.isModel = 1
paramsItem = paramsOne
}else if(val==0){
paramsTwo.isModel=0
} else if (val == 0) {
paramsTwo.isModel = 0
paramsItem = paramsTwo
}
postAction(`tag/onlCgformTag/page`,paramsItem).then(res=>{
if(res.success){
this.total=res.result.total
this.tableData= [ ...res.result.records]
this.spinning=false
}else{
postAction(`tag/onlCgformTag/page`, paramsItem).then(res => {
if (res.success) {
this.total = res.result.total
this.tableData = [...res.result.records]
this.spinning = false
} else {
this.$message.warning(res.message)
this.spinning=false
this.spinning = false
}
})
},
//标签项管理tab切换
callbackTab(value){
this.key=value
if(value==1){
this.queryParamOne.dbFieldTxt=''
this.submitKey='1'
this.queryParamOne.pageNo=1
callbackTab(value) {
this.key = value
if (value == 1) {
this.queryParamOne.dbFieldTxt = ''
this.submitKey = '1'
this.queryParamOne.pageNo = 1
this.loadData(1)
// this.tableData=this.taglab
// this.tableData=this.taglabSplit
}else if(value==2){
this.queryParamTwo.dbFieldTxt=''
this.submitKey='2'
this.queryParamTwo.pageNo=1
} else if (value == 2) {
this.queryParamTwo.dbFieldTxt = ''
this.submitKey = '2'
this.queryParamTwo.pageNo = 1
this.loadData(0)
}
},
diaHide(vis){
this.areaVisible=vis
diaHide(vis) {
this.areaVisible = vis
},
hideModal(){
this.visible = false;
hideModal() {
this.visible = false
},
close(){
this.drawerVisible=false
close() {
this.drawerVisible = false
},
submitOk(value){
submitOk(value) {
this.handleShow()
},
deleteOk(value){
deleteOk(value) {
this.handleShow()
},
//编辑按钮
updateOk(value){
updateOk(value) {
this.handleShow()
},
//编辑
visibleEd(val,id,title){
this.editFlag=false
this.disableEdit=true
this.drawerVisible=val
this.titleTag=title
this.editId=id
this.submitEdit='edit'
let params={
id:id,
visibleEd(val, id, title) {
this.editFlag = false
this.disableEdit = true
this.drawerVisible = val
this.titleTag = title
this.editId = id
this.submitEdit = 'edit'
let params = {
id: id
}
this.spinningDrawer=true
getAction(`tag/onlCgformTag/queryById`,params).then(res=>{
if(res.success){
this.editData=res.result
this.editFlag=true
this.spinningDrawer = true
getAction(`tag/onlCgformTag/queryById`, params).then(res => {
if (res.success) {
this.editData = res.result
this.editFlag = true
}
}).finally(()=>{
this.spinningDrawer=false
}).finally(() => {
this.spinningDrawer = false
})
},
//删除
visibleDelete(id){
let params={
id:id
visibleDelete(id) {
let params = {
id: id
}
this.$confirm({
title: this.$t('ConfirmDelete'),
@@ -384,88 +407,87 @@
}
})
},
selecteds(val){
this.ids=val
selecteds(val) {
this.ids = val
},
//批量删除
batDelete(val){
let params={
ids:this.ids.join(',')
batDelete(val) {
let params = {
ids: this.ids.join(',')
}
if(this.ids){
this.$confirm({
title: this.$t('ConfirmDelete'),
content: '',
onOk:
async () => {
if (this.ids) {
this.$confirm({
title: this.$t('ConfirmDelete'),
content: '',
onOk:
async () => {
getAction(`tag/onlCgformTag/logicDeleteBatch`, params).then(res => {
if (res.success) {
if (this.key == 1) {
this.$message.success(this.$t('OperationSuccessful'))
if(this.ids&&this.ids.length==this.tableData.length){
this.queryParamOne.pageNo=this.queryParamOne.pageNo-1
if (this.ids && this.ids.length == this.tableData.length) {
this.queryParamOne.pageNo = this.queryParamOne.pageNo - 1
}
this.selectedRowKey=[]
this.selectedRowKey = []
this.loadData(1)
} else if (this.key == 2) {
this.$message.success(this.$t('OperationSuccessful'))
if(this.ids&&this.ids.length==this.tableData.length){
this.queryParamTwo.pageNo=this.queryParamTwo.pageNo-1
if (this.ids && this.ids.length == this.tableData.length) {
this.queryParamTwo.pageNo = this.queryParamTwo.pageNo - 1
}
this.loadData(0)
}
// postAction(`online/cgform/api/doDbSynch/48308196e7b04761b533dc31bc899707/normal
// `,{}).then(res=>{
// })
}else{
// postAction(`online/cgform/api/doDbSynch/48308196e7b04761b533dc31bc899707/normal
// `,{}).then(res=>{
// })
} else {
this.$message.warning(this.$t('operationFailed'))
}
})
}
})
})
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
else{
this.$message.warning(this.$t('selectLeastOne'))
}
},
//新增关闭
closeTag(val){
this.drawerVisible=val
if(this.key==1){
closeTag(val) {
this.drawerVisible = val
if (this.key == 1) {
this.loadData(1)
}else if(this.key==2){
} else if (this.key == 2) {
this.loadData(0)
}
},
afterVisibleChange(val){
afterVisibleChange(val) {
// console.log('val',val)
},
handleAddPop(val){
this.editData={}
if(this.submitKey=='1'){
this.editData.isModel='1'
}else if(this.submitKey=='2'){
this.editData.isModel='0'
handleAddPop(val) {
this.editData = {}
if (this.submitKey == '1') {
this.editData.isModel = '1'
} else if (this.submitKey == '2') {
this.editData.isModel = '0'
}
this.disableEdit=false
this.drawerVisible=true
this.titleTag=this.$t('NewLabelItem')
this.submitEdit='add'
this.disableEdit = false
this.drawerVisible = true
this.titleTag = this.$t('NewLabelItem')
this.submitEdit = 'add'
// this.type=val
if(val=='input'){
this.typeVisible=false
this.isTagContent=false
} else if(val='select'){
this.typeVisible=false
this.isTagContent=true
if (val == 'input') {
this.typeVisible = false
this.isTagContent = false
} else if (val = 'select') {
this.typeVisible = false
this.isTagContent = true
}
},
queryParamsOne(val) {
this.queryParamOne.pageNo=val.pageNo
this.queryParamOne.pageSize=val.pageSize
if(this.key==1){
this.queryParamOne.pageNo = val.pageNo
this.queryParamOne.pageSize = val.pageSize
if (this.key == 1) {
this.loadData(1)
}
// else if(this.key==2){
@@ -473,12 +495,12 @@
// }
},
queryParamsTwo(val) {
this.queryParamTwo.pageNo=val.pageNo
this.queryParamTwo.pageSize=val.pageSize
this.queryParamTwo.pageNo = val.pageNo
this.queryParamTwo.pageSize = val.pageSize
// if(this.key==1){
// this.loadData(1)
// } else
if(this.key==2){
if (this.key == 2) {
this.loadData(0)
}
},
@@ -493,11 +515,11 @@
// }
//
// },
handleOk () {
this.$refs.realForm.submitForm();
handleOk() {
this.$refs.realForm.submitForm()
},
handleCancel () {
this.drawerVisible=false
handleCancel() {
this.drawerVisible = false
this.close()
}
}
@@ -506,47 +528,90 @@
<style lang="less" scoped>
@import '~@assets/less/common.less';
.type-popover{
p{
margin:5px;
.type-popover {
p {
margin: 5px;
}
p:hover {
color: #0c8fcf;
cursor: pointer;
}
}
p:hover{
color: #0c8fcf;
cursor: pointer;
}
}
.new-tag-drawer{
.drawer-footer{
.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>
<style lang="less">
.show-area{
.ant-modal-wrap{
.ant-modal{
width: 1000px!important;
.show-area {
.ant-modal-wrap {
.ant-modal {
width: 1000px !important;
}
}
.diolag-area{
.table-operator{
.diolag-area {
.table-operator {
text-align: right;
}
.page{
.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
+772 -762
View File
File diff suppressed because it is too large Load Diff
jero-web/src/views/projectManagement/components/TaskList.vue
+28 -26
View File
@@ -1,34 +1,36 @@
<template>
<a-card :bordered="false">
<div class="table-page-search-wrapper">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('standard')">
<span>{{$t('standard')}}</span>
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('standard')">
<span>{{$t('standard')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
v-model="queryParam.serialNumber"></j-input>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
v-model="queryParam.serialNumber"></j-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" style="width: 64px" :title="$t('areaOfResponsibility')">
<span>{{$t('areaOfResponsibility')}}</span>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" style="width: 64px" :title="$t('areaOfResponsibility')">
<span>{{$t('areaOfResponsibility')}}</span>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
:type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
:type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
</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-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
+120 -115
View File
@@ -1,23 +1,25 @@
<template>
<a-card :bordered="false">
<div class="table-page-search-wrapper">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('title')">
<span>{{$t('title')}}</span>
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('title')">
<span>{{$t('title')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
v-model="queryParam.title"></a-input>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
v-model="queryParam.title"></a-input>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
</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-row>
</a-form>
</div>
<div class="table-operator">
<div @click="handleAdd" class="operator-text">
@@ -53,7 +55,7 @@
<span slot="paramsManifestClick" slot-scope="text,record">
<a @click="paramsManifestClick(record)">{{text}}</a>
</span>
<span slot="operation" slot-scope="text,record">
<span slot="operation" slot-scope="text,record">
<a class="text-operation" @click="configure(record)">{{$t('configure')}}</a>
<a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
<a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
@@ -72,21 +74,23 @@
@showSizeChange="SizeChange"
/>
</div>
<!-- 参数模板-->
<!-- 参数模板-->
<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'/>
<!-- 历史版本-->
<!-- 历史版本-->
<a-modal v-model="historicalVisible" :title="$t('historicalVersion')" width='750px' :footer="null">
<historical-version v-if='historicalVisible' :historicalRow='historicalRow'></historical-version>
</a-modal>
<!-- 复制参数模板-->
<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>
@@ -96,107 +100,108 @@
import ParameterTemplateAdd from '../dialog/ParameterTemplateAdd'
import ParameterTemplateCody from '../dialog/ParameterTemplateCody'
import HistoricalVersion from '../dialog/historicalVersion'
import { getAction,postAction } from '../../../api/manage'
import { getAction, postAction } from '../../../api/manage'
import Configure from '../dialog/configure'
import axios from 'axios'
import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types'
export default {
name: 'TaskParameterCollection',
components:{
components: {
ImportFile,
ParameterTemplateAdd,
Configure,
HistoricalVersion,
ParameterTemplateCody
},
data(){
return{
columns:[
{
title: this.$t('title'),
align: 'center',
dataIndex: 'title',
scopedSlots: { customRender: 'paramsManifestClick' }
},
{
title: this.$t('status'),
align: 'center',
dataIndex: 'state',
},
{
title: this.$t('parameterTemplateName'),
align: 'center',
dataIndex: 'paramsTemplateName',
},
{
title: this.$t('collectionCompletionTime'),
align: 'center',
dataIndex: 'finishTime',
},
{
title: this.$t('Version'),
align: 'center',
dataIndex: 'version',
},
{
title: this.$t('creator'),
align: 'center',
dataIndex: 'createBy',
},
{
title: this.$t('createTime'),
align: 'center',
dataIndex: 'createTime',
},
{
title: this.$t('operation'),
align: 'center',
fixed: 'right',
width: 200,
scopedSlots: { customRender: 'operation' }
}
],
token:Vue.ls.get(ACCESS_TOKEN),
selectedRowKeys: [],
queryParam: {},
url: {
list: 'params/manifest/page',
add: 'params/manifest/add',
edit: 'params/manifest/edit',
queryById: 'params/manifest/queryById',
deleteBatch: 'params/manifest/delete',
deleteAll: 'params/manifest/deleteBatch',
conAdd: 'params/config/addBatch',
conList: 'params/config/list',
},
loading: false,
dataSource: [],
areaVisible: false, // 弹框的控制
configureareaVisible: false, // 配置的彈框
pageNo: 1,
pageSize: 10,
total: 0,
selectedRowKeysArray: '',
templatetitle: '',
templatetitleId: '',
rowId: '',
version: 0,
itemId: '',
historicalVisible: false,
historicalRow: {}, // 历史版本得数据
areaVisibleCody: false, // 复制参数清单得弹框
}
data() {
return {
columns: [
{
title: this.$t('title'),
align: 'center',
dataIndex: 'title',
scopedSlots: { customRender: 'paramsManifestClick' }
},
{
title: this.$t('status'),
align: 'center',
dataIndex: 'state'
},
{
title: this.$t('parameterTemplateName'),
align: 'center',
dataIndex: 'paramsTemplateName'
},
{
title: this.$t('collectionCompletionTime'),
align: 'center',
dataIndex: 'finishTime'
},
{
title: this.$t('Version'),
align: 'center',
dataIndex: 'version'
},
{
title: this.$t('creator'),
align: 'center',
dataIndex: 'createBy'
},
{
title: this.$t('createTime'),
align: 'center',
dataIndex: 'createTime'
},
{
title: this.$t('operation'),
align: 'center',
fixed: 'right',
width: 200,
scopedSlots: { customRender: 'operation' }
}
],
token: Vue.ls.get(ACCESS_TOKEN),
selectedRowKeys: [],
queryParam: {},
url: {
list: 'params/manifest/page',
add: 'params/manifest/add',
edit: 'params/manifest/edit',
queryById: 'params/manifest/queryById',
deleteBatch: 'params/manifest/delete',
deleteAll: 'params/manifest/deleteBatch',
conAdd: 'params/config/addBatch',
conList: 'params/config/list'
},
loading: false,
dataSource: [],
areaVisible: false, // 弹框的控制
configureareaVisible: false, // 配置的彈框
pageNo: 1,
pageSize: 10,
total: 0,
selectedRowKeysArray: '',
templatetitle: '',
templatetitleId: '',
rowId: '',
version: 0,
itemId: '',
historicalVisible: false,
historicalRow: {}, // 历史版本得数据
areaVisibleCody: false // 复制参数清单得弹框
}
},
mounted() {
this.getlist()
},
methods:{
methods: {
paramsManifestClick(item) {
localStorage.setItem('paramsManifest',JSON.stringify(item))
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')
},
@@ -247,7 +252,7 @@
this.selectedRowKeys = val
this.selectedRowKeysArray = val.join(',')
},
edit(edit){
edit(edit) {
this.areaVisible = true
let _this = this
let query = {
@@ -263,15 +268,15 @@
}
})
},
handleAdd(){
handleAdd() {
this.areaVisible = true
},
handleModule(){
handleModule() {
let _this = this
axios({
url: `/jero-boot/params/manifest/changeExtension?id=${this.selectedRowKeys[0]}`,
method: 'get',
transformRequest: [function (data) {
transformRequest: [function(data) {
let ret = ''
for (let it in data) {
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
@@ -280,22 +285,22 @@
}],
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
'X-Access-Token':_this.token
'X-Access-Token': _this.token
}
})
.then( (res) =>{
.then((res) => {
if (res.data.success) {
_this.$message.success(res.data.message)
}else{
} else {
_this.$message.warning(res.data.message)
}
})
.catch( (error) =>{
console.log(error);
});
.catch((error) => {
console.log(error)
})
},
handleDel(){
let param={
handleDel() {
let param = {
ids: this.selectedRowKeysArray
}
if (this.selectedRowKeys.length > 0) {
@@ -320,7 +325,7 @@
handleCody() {
this.areaVisibleCody = true
},
getPersonnelList(){
getPersonnelList() {
},
pageOnChange() {
@@ -337,8 +342,8 @@
...this.queryParam
}
getAction(this.url.list, query).then((res) => {
if(res.success) {
this.total = res.result.total
if (res.success) {
this.total = res.result.total
this.dataSource = res.result.records || []
this.loading = false
} else {
@@ -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
+14 -12
View File
@@ -10,23 +10,25 @@
style="height: 100%;overflow: auto;padding-bottom: 53px;">
<div style="margin-bottom: 60px">
<div class="table-page-search-wrapper">
<a-row :gutter="24">
<a-col :md="12" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('VirtualListName')">
<span>{{$t('VirtualListName')}}</span>
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="12" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('VirtualListName')">
<span>{{$t('VirtualListName')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('VirtualListName')"
v-model="queryParam.name"></j-input>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('VirtualListName')"
v-model="queryParam.name"></j-input>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="12" :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-row>
</a-form>
</div>
<a-table
:columns="columns"
@@ -210,7 +212,7 @@
.drawer-bootom-button {
position: absolute;
bottom: 0;
z-index:100;
z-index: 100;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
jero-web/src/views/projectManagement/historicalVersion/index.vue
+29 -27
View File
@@ -4,35 +4,36 @@
{{ $t('DocumentStandard') }}
</div>
<div class="table-page-search-wrapper">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('standard')">
<span>{{ $t('standard') }}</span>
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('standard')">
<span>{{ $t('standard') }}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
v-model="queryParam.serialNumber"></j-input>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
v-model="queryParam.serialNumber"></j-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('title')">
<span>{{ $t('title') }}</span>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('title')">
<span>{{ $t('title') }}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
v-model="queryParam.title"></j-input>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
v-model="queryParam.title"></j-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" style="width: 44px" :title="$t('subtitle')">
<span>{{ $t('subtitle') }}</span>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" style="width: 44px" :title="$t('subtitle')">
<span>{{ $t('subtitle') }}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('subtitle')"
v-model="queryParam.subtitle"></j-input>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('subtitle')"
v-model="queryParam.subtitle"></j-input>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
@@ -42,7 +43,8 @@
@click="searchReset">{{ $t('reset') }}</a-button>
</a-col>
</span>
</a-row>
</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
+24 -22
View File
@@ -1,34 +1,36 @@
<template>
<a-card :bordered="false">
<div class="table-page-search-wrapper">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('entryName')">
<span>{{$t('entryName')}}</span>
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('entryName')">
<span>{{$t('entryName')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
v-model="queryParam.projectName"></j-input>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
v-model="queryParam.projectName"></j-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('targetMarket')">
<span>{{$t('targetMarket')}}</span>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('targetMarket')">
<span>{{$t('targetMarket')}}</span>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam.targetMarket"
:placeholder="$t('PleaseSelect')+$t('targetMarket')"
:type="'select'"
:triggerChange="false" :dictCode="'region'"/>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam.targetMarket"
:placeholder="$t('PleaseSelect')+$t('targetMarket')"
:type="'select'"
:triggerChange="false" :dictCode="'region'"/>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
</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-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