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

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
wangzhijiang
2023-03-24 11:39:43 +08:00
parent ce4432cd0f e6e0faf9ca
commit 108b8095e1
9 changed files with 1049 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/dashboard/components/myList.vue
+28 -17
View File
@@ -10,11 +10,11 @@
<div class="myList-box-content" v-if="dataSource.length > 0"> <div class="myList-box-content" v-if="dataSource.length > 0">
<div class="myList-box-content-box" v-for="(item,index) in dataSource" :key="index" @click="prcClick(item)"> <div class="myList-box-content-box" v-for="(item,index) in dataSource" :key="index" @click="prcClick(item)">
<div class="top"> <div class="top">
<span class="top-text" v-if="item.flowType == 10" <span class="top-text" v-if="item.flowType == 10 || item.flowType == 21"
:title="item.projectName+'-'+ item.flowTypeShow"> :title="item.projectName+'-'+ item.flowTypeShow">
{{item.projectName+'-'+ item.flowTypeShow}} {{item.projectName+'-'+ item.flowTypeShow}}
</span> </span>
<span class="top-text" :title="item.serialNumber+'-'+item.flowTypeShow"> <span v-else class="top-text" :title="item.serialNumber+'-'+item.flowTypeShow">
{{item.serialNumber+'-'+item.flowTypeShow}} {{item.serialNumber+'-'+item.flowTypeShow}}
</span> </span>
<!-- <span class="top-admin" :title="prcTypeName[item.prcType]">{{prcTypeName[item.prcType]}}</span>--> <!-- <span class="top-admin" :title="prcTypeName[item.prcType]">{{prcTypeName[item.prcType]}}</span>-->
@@ -31,17 +31,22 @@
<JNoData/> <JNoData/>
</div> </div>
<JLoading style="z-index: 999" :loading="loading">{{$t('dataLoading')}}</JLoading> <JLoading style="z-index: 999" :loading="loading">{{$t('dataLoading')}}</JLoading>
<designCompliance ref="designComplianceRef" @designComplianceList="designComplianceList"/>
</div> </div>
</template> </template>
<script> <script>
import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage' import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
import designCompliance from '../../toDoCenter/projectRegulationTasks/components/designCompliance'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import moment from 'moment' import moment from 'moment'
import store from '@/store/' import store from '@/store/'
export default { export default {
name: 'myList', name: 'myList',
components:{
designCompliance
},
data() { data() {
return { return {
pageSize: 4, pageSize: 4,
@@ -97,6 +102,9 @@
path: '/projectRegulationTasks' path: '/projectRegulationTasks'
}) })
}, },
designComplianceList(){
this.queryProcess()
},
prcClick(row) { prcClick(row) {
let query = {} let query = {}
row.router = this.$route.path row.router = this.$route.path
@@ -126,6 +134,19 @@
} }
}) })
window.open(newUrl.href, '_blank') window.open(newUrl.href, '_blank')
} else if (row.flowType == '21') {
let newUrl = this.$router.resolve({
path: '/ProjectDetails',
query: {
id: row.projectLibraryId,
projectName: row.projectName,
projectNameId: row.projectNameId,
targetMarket: row.targetMarket,
studioEngineer: row.studioEngineer,
type: '106'
}
})
window.open(newUrl.href, '_blank')
} else if (row.flowType == '2') { } else if (row.flowType == '2') {
row.taskId = row.taskId + '' row.taskId = row.taskId + ''
if (row.taskId.length > 30) { if (row.taskId.length > 30) {
@@ -143,7 +164,7 @@
TaskKey: row.taskDefinitionKey, TaskKey: row.taskDefinitionKey,
isDisplay: true, isDisplay: true,
flowType: 2, flowType: 2,
Sponsor: 'designInitiatorName', Sponsor: 'regulationOwnerName',
personLiable: 'designDutyName', personLiable: 'designDutyName',
typeOfDeliverables: 'designDeliverableTypeName', typeOfDeliverables: 'designDeliverableTypeName',
deliverableTemplate: 'designDeliverableTemplate', deliverableTemplate: 'designDeliverableTemplate',
@@ -153,13 +174,8 @@
targetMarket: row.targetMarket, targetMarket: row.targetMarket,
projectNameId: row.projectNameId, projectNameId: row.projectNameId,
primaryKeyId: row.primaryKeyId, primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.personChargeFeedback
} }
let newUrl = this.$router.resolve({ this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceReview'))
path: '/taskListProcess',
query: query
})
window.open(newUrl.href, '_blank')
} else if (row.flowType == '3') { } else if (row.flowType == '3') {
row.taskId = row.taskId + '' row.taskId = row.taskId + ''
if (row.taskId.length > 30) { if (row.taskId.length > 30) {
@@ -211,7 +227,7 @@
TaskKey: row.taskDefinitionKey, TaskKey: row.taskDefinitionKey,
flowType: 4, flowType: 4,
isDisplay: true, isDisplay: true,
Sponsor: 'verifyInitiatorName', Sponsor: 'regulationOwnerName',
personLiable: 'verifyDutyName', personLiable: 'verifyDutyName',
typeOfDeliverables: 'verifyDeliverableTypeName', typeOfDeliverables: 'verifyDeliverableTypeName',
deliverableTemplate: 'verifyDeliverableTemplate', deliverableTemplate: 'verifyDeliverableTemplate',
@@ -221,15 +237,10 @@
targetMarket: row.targetMarket, targetMarket: row.targetMarket,
projectNameId: row.projectNameId, projectNameId: row.projectNameId,
primaryKeyId: row.primaryKeyId, primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.personChargeFeedback
} }
let newUrl = this.$router.resolve({ this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('verificationComplianceReview'))
path: '/taskListProcess',
query: query
})
window.open(newUrl.href, '_blank')
} }
}, }
} }
} }
</script> </script>
jero-web/src/views/projectManagement/components/TaskListModel.vue
+9 -1
View File
@@ -176,7 +176,15 @@
data() { data() {
return { return {
formInline: {}, formInline: {},
rules: {}, rules: {
certificationProgressRemark:[
{
max: 500,
message: this.$t('remarks') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
trigger: 'blur'
}
],
},
title: this.$t('CertificationProgress'), title: this.$t('CertificationProgress'),
visible: false, visible: false,
confirmLoading: false, confirmLoading: false,
jero-web/src/views/projectManagement/components/certificationList/index.vue
+5 -9
View File
@@ -70,7 +70,8 @@
<!-- 导出--> <!-- 导出-->
<div @click="handleExport" v-if="roleSwitchingCode == 1 || roleSwitchingCode == 11 || <div @click="handleExport" v-if="roleSwitchingCode == 1 || roleSwitchingCode == 11 ||
roleSwitchingCode == 12 || roleSwitchingCode == 13 || roleSwitchingCode == 14" roleSwitchingCode == 12 || roleSwitchingCode == 13 || roleSwitchingCode == 14 ||
roleSwitchingCode == 20 || roleSwitchingCode == 21"
class="operator-text"> class="operator-text">
<a-icon type="export" :rotate="-90"/> <a-icon type="export" :rotate="-90"/>
{{ $t('export') }} {{ $t('export') }}
@@ -129,7 +130,7 @@
<!-- 模板下载--> <!-- 模板下载-->
<div @click="handleModule" <div @click="handleModule"
v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2 || roleSwitchingCode == 20 || roleSwitchingCode == 21" v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
class="operator-text-title"> class="operator-text-title">
<a-icon type="download"/> <a-icon type="download"/>
{{ $t('templateDownload') }} {{ $t('templateDownload') }}
@@ -144,7 +145,7 @@
</div> </div>
<!-- 导入--> <!-- 导入-->
<div class="operator-text-title" v-if="roleSwitchingCode != 1"> <div class="operator-text-title" v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2">
<ImportFile :url="url" :projectLibraryId=$route.query.id :isTrue="true" :accept="'.zip'" <ImportFile :url="url" :projectLibraryId=$route.query.id :isTrue="true" :accept="'.zip'"
@getList="getPersonnelList"/> @getList="getPersonnelList"/>
</div> </div>
@@ -167,7 +168,7 @@
</div> </div>
</template> </template>
<div class="operator-text" style="position: relative" <div class="operator-text" style="position: relative"
v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2 || roleSwitchingCode == 20 || roleSwitchingCode == 21"> v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2">
<span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }} <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
</div> </div>
</a-popconfirm> </a-popconfirm>
@@ -513,11 +514,6 @@
value: 'category', value: 'category',
text: this.$t('category') text: this.$t('category')
}, },
{
type: 'string',
value: 'inspectionItem',
text: this.$t('inspectionItems')
},
{ {
type: 'string', type: 'string',
value: 'configItem', value: 'configItem',
jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+13
View File
@@ -208,6 +208,19 @@
} }
}) })
window.open(newUrl.href, '_blank') window.open(newUrl.href, '_blank')
} else if (row.flowType == '21') {
let newUrl = this.$router.resolve({
path: '/ProjectDetails',
query: {
id: row.projectLibraryId,
projectName: row.projectName,
projectNameId: row.projectNameId,
targetMarket: row.targetMarket,
studioEngineer: row.studioEngineer,
type: '106'
}
})
window.open(newUrl.href, '_blank')
} else if (row.flowType == '2') { } else if (row.flowType == '2') {
row.taskId = row.taskId + '' row.taskId = row.taskId + ''
if (row.taskId.length > 30) { if (row.taskId.length > 30) {
jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+13
View File
@@ -203,6 +203,19 @@
} }
}) })
window.open(newUrl.href, '_blank') window.open(newUrl.href, '_blank')
} else if (row.flowType == '21') {
let newUrl = this.$router.resolve({
path: '/ProjectDetails',
query: {
id: row.projectLibraryId,
projectName: row.projectName,
projectNameId: row.projectNameId,
targetMarket: row.targetMarket,
studioEngineer: row.studioEngineer,
type: '106'
}
})
window.open(newUrl.href, '_blank')
}else if(row.flowType == '2'){ }else if(row.flowType == '2'){
row.taskId = row.taskId + '' row.taskId = row.taskId + ''
if (row.taskId.length > 30) { if (row.taskId.length > 30) {
jero-web/src/views/virtualAuthenticationList/components/transferList.vue
+262 -187
View File
@@ -1,215 +1,290 @@
<template> <template>
<a-drawer <div>
:title="$t('Transfer')" <a-drawer
:maskClosable="false" :title="$t('Transfer')"
:width="1000" :maskClosable="false"
placement="right" :width="1000"
:closable="true" placement="right"
@close="handleCancel" :closable="true"
:visible="visible" @close="handleCancel"
style="height: 100%;overflow: auto;padding-bottom: 53px;"> :visible="visible"
<div style="margin-bottom: 60px"> style="height: 100%;overflow: auto;padding-bottom: 53px;">
<div class="table-page-search-wrapper"> <div style="margin-bottom: 60px">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <div class="table-page-search-wrapper">
<a-row :gutter="24"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-col :md="12" :sm="8"> <a-row :gutter="24">
<div class="box-title-text"> <a-col :md="12" :sm="8">
<div class="title-text" :title="$t('CertificationListName')"> <div class="box-title-text">
<span>{{$t('CertificationListName')}}</span> <div class="title-text" :title="$t('CertificationListName')">
<span>{{$t('CertificationListName')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('CertificationListName')"
v-model="queryParam.name"></j-input>
</div> </div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('CertificationListName')" </a-col>
></j-input> <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24"> <a-col :md="12" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button> <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-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
</a-col> </a-col>
</span> </span>
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
<a-table <a-table
:columns="columns" :components="drag(columns,'columns')"
rowKey="id" :columns="columns"
:scroll="{x: 800}" rowKey="id"
:data-source="dataList" :scroll="{x: 800}"
:pagination="false" :data-source="dataList"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }" :pagination="false"
:loading="loading"> :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
:loading="loading">
</a-table> </a-table>
<div class="page" v-if="dataList.length > 0"> <div class="page" v-if="dataList.length > 0">
<a-pagination <a-pagination
:show-total="total => $t('total')+` ${total} `+$t('strip')" :show-total="total => $t('total')+` ${total} `+$t('strip')"
show-quick-jumper show-quick-jumper
show-size-changer show-size-changer
:page-size.sync="pageSize" :page-size.sync="pageSize"
:total="total" :total="total"
:current="pageNo" :current="pageNo"
@change="onChange" @change="onChange"
@showSizeChange="SizeChange" @showSizeChange="SizeChange"
/> />
</div>
</div> </div>
</div>
<div class="drawer-bootom-button"> <div class="drawer-bootom-button">
<a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button> <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
<a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button> <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('determine')}}
</div> </a-button>
</a-drawer> </div>
</a-drawer>
<transferListvirtal :url="url" @transferListFormHomo="transferListFormHomo" ref="transferListvirtalRef"/>
</div>
</template> </template>
<script> <script>
export default { import { getAction, postAction } from '@/api/manage'
name: 'transferList', import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
data() { import transferListvirtal from './transferListvirtal'
return {
visible: false, export default {
confirmLoading: false, name: 'transferList',
selectedRowKeys: [], components: {
columns: [ transferListvirtal
{
title: this.$t('VirtualListName'),
dataIndex: 'name',
align: 'left',
ellipsis: true,
width: 223
},
{
title: this.$t('instructionForUse'),
dataIndex: 'useExplain',
align: 'left',
ellipsis: true,
width: 223
},
{
title: this.$t('updateTime'),
dataIndex: 'updateTime',
align: 'left',
ellipsis: true,
width: 223
},
{
title: this.$t('creater'),
dataIndex: 'createBy',
align: 'left',
ellipsis: true,
width: 223
}
],
dataList: [],
loading: false,
pageNo: 1,
pageSize: 10,
total: 0
}
},
methods: {
transferModel() {
this.visible = true
}, },
searchQuery() { props: ['url'],
this.pageNo = 1 mixins: [ResizeHeader, ResizeColumnProvide],
this.replacePage() data() {
}, return {
searchReset() { visible: false,
this.pageNo = 1 queryParam: {},
this.queryParam = {} confirmLoading: false,
this.replacePage() selectedRowKeys: [],
}, columns: [
onChange(page, pageSize) { {
this.pageNo = page title: this.$t('CertificationListName'),
this.replacePage() dataIndex: 'name',
}, align: 'left',
SizeChange(page, pageSize) { ellipsis: true,
this.pageNo = 1 width: 223
this.pageSize = pageSize },
this.replacePage() {
}, title: this.$t('instructionForUse'),
replacePage() { dataIndex: 'useExplain',
let query = { align: 'left',
pageNo: this.pageNo, ellipsis: true,
pageSize: this.pageSize, width: 223
...this.queryParam },
{
title: this.$t('updateTime'),
dataIndex: 'updateTime',
align: 'left',
ellipsis: true,
width: 223
},
{
title: this.$t('creater'),
dataIndex: 'createBy',
align: 'left',
ellipsis: true,
width: 223
}
],
dataList: [],
content: [],
loading: false,
pageNo: 1,
pageSize: 10,
total: 0
} }
this.loading = true
// postAction('', query).then((res) => {
// if (res.success) {
// this.dataList = res.result.records || []
// this.total = res.result.total
// this.loading = false
// } else {
// this.loading = false
// }
// })
}, },
handleSubmit(){ mounted() {
}, },
onSelectChange(value) { methods: {
this.selectedRowKeys = value transferModel() {
if (this.selectedRowKeys.length > 1) { this.visible = true
this.selectedRowKeys.shift() this.queryParam = {}
this.selectedRowKeys = []
this.replacePage()
},
searchQuery() {
this.pageNo = 1
this.replacePage()
},
searchReset() {
this.pageNo = 1
this.queryParam = {}
this.replacePage()
},
onChange(page, pageSize) {
this.pageNo = page
this.replacePage()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.replacePage()
},
replacePage() {
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
...this.queryParam,
state:'1',
}
this.loading = true
getAction('/authDummy/authDummyInventoryBaseEO/page', query).then((res) => {
if (res.success) {
if (res.result.current > 1 && res.result.records.length == 0) {
this.pageNo = 1
this.replacePage()
return
}
this.dataList = res.result.records || []
this.total = res.result.total
this.loading = false
} else {
this.loading = false
}
})
},
transferListFormHomo() {
this.visible = false
this.selectedRowKeys = []
this.$emit('transferListForm')
},
onSelectChange(value) {
this.selectedRowKeys = value
if (this.selectedRowKeys.length > 1) {
this.selectedRowKeys.shift()
}
},
handleCancel() {
this.visible = false
this.selectedRowKeys = []
this.$emit('visible')
},
handleSubmit(flag) {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
this.confirmLoading = true
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
this.confirmLoading = false
// this.$emit('transferListForm',selectedRowKeys.join(','))
this.$refs.transferListvirtalRef.transferModel(selectedRowKeys.join(','))
// this.selectedRowKeys = []
// postAction('project/projectLawsInventoryEO/add', {
// dummyInventoryBaseId: selectedRowKeys.join(','),
// projectLibraryId: this.$route.query.id,
// flag: flag
// }).then((res) => {
// if (res.success) {
// this.confirmLoading = false
// // this.$message.success(this.$t('OperationSuccessful'))
// // this.visible = false
// this.selectedRowKeys = []
// this.$emit('transferListForm',selectedRowKeys.join(','))
// } else {
// // if (res.message == '该虚拟清单的维护清单中没有数据,是否需要添加') {
// // this.confirmLoading = false
// // this.getAdd()
// // return
// // }
// this.$message.warning(this.$t('operationFailed'))
// this.confirmLoading = false
// }
// })
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
},
getAdd() {
let _this = this
this.$confirm({
content: _this.$t('TheDoesNotContainData'),
onOk() {
_this.handleSubmit('1')
}
})
} }
}, }
handleCancel() {
this.visible = false
},
} }
}
</script> </script>
<style scoped> <style scoped>
.box-title-text { .page {
line-height: 1.4; text-align: right;
display: flex; margin-top: 20px;
align-items: center; }
margin-bottom: 10px;
}
.title-text { .drawer-bootom-button {
width: 20%; position: absolute;
min-width: 110px; bottom: 0;
color: #000F16; z-index: 100;
display: inline-block; width: 100%;
font-weight: 500; border-top: 1px solid #e8e8e8;
font-size: 14px; padding: 10px 16px;
margin-right: 16px; text-align: right;
margin-top: 3px; left: 0;
text-align: right; background: #fff;
white-space: nowrap; border-radius: 0 0 2px 2px;
overflow: hidden; }
text-overflow: ellipsis;
}
.box-input { .box-title-text {
display: inline-block; line-height: 1.4;
width: 70%; display: flex;
height: 38px; align-items: center;
margin-top: 2px; margin-bottom: 10px;
} }
.box-button { .title-text {
height: 38px; width: 20%;
} min-width: 110px;
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;
}
.page { .box-input {
text-align: right; display: inline-block;
margin-top: 20px; width: 70%;
} height: 38px;
margin-top: 2px;
}
.drawer-bootom-button { .box-button {
position: absolute; height: 38px;
bottom: 0; }
z-index: 100;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
</style> </style>
jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue
+313
View File
@@ -0,0 +1,313 @@
<template>
<a-drawer
:title="$t('Transfer')"
:maskClosable="false"
:width="1000"
placement="right"
:closable="true"
@close="handleCancel"
:visible="visible"
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="5">
<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>
</a-col>
<a-col :md="12" :sm="5">
<div class="box-title-text">
<div class="title-text" :title="$t('category')">
<span>{{$t('category')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('category')"
v-model="queryParam.category"></j-input>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24">
<!-- <globalAdvancedQuery ref="globalAdvancedQueryRef"-->
<!-- @handleSuperQuery="handleSuperQuery"-->
<!-- :fieldList="fieldList"/>-->
<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>
<a-table
:columns="columns"
rowKey="id"
:scroll="{x: 800,y:600}"
:data-source="dataList"
:pagination="false"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:'' }"
:loading="loading">
</a-table>
<!-- <div class="page" v-if="dataList.length > 0">-->
<!-- <a-pagination-->
<!-- :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
<!-- show-quick-jumper-->
<!-- show-size-changer-->
<!-- :page-size.sync="pageSize"-->
<!-- :total="total"-->
<!-- :current="pageNo"-->
<!-- @change="onChange"-->
<!-- @showSizeChange="SizeChange"-->
<!-- />-->
<!-- </div>-->
</div>
<div class="drawer-bootom-button">
<a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
<a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
</div>
</a-drawer>
</template>
<script>
import { getAction, postAction } from '@/api/manage'
import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
export default {
name: 'transferList',
components: {
globalAdvancedQuery
},
props: ['url'],
data() {
return {
visible: false,
queryParam: {},
confirmLoading: false,
selectedRowKeys: [],
columns: [
{
title: this.$t('category'),
align: 'left',
dataIndex: 'category',
width: 150,
ellipsis: true,
},
{
title: this.$t('inspectionItems'),
align: 'left',
dataIndex: 'inspectionItem',
width: 150,
ellipsis: true,
scopedSlots: { customRender: 'inspectionItems' }
},
{
title: 'WVTA ID',
align: 'left',
dataIndex: 'wvtaId',
width: 150,
ellipsis: true,
},
{
title: this.$t('standard'),
align: 'left',
dataIndex: 'serialNumber',
width: 150,
ellipsis: true,
},
{
title: this.$t('areaOfResponsibility'),
align: 'left',
dataIndex: 'dutyTerritoryName',
width: 200,
ellipsis: true,
},
{
title: this.$t('typeOfDeliverables'),
align: 'left',
dataIndex: 'deliverableTypeName',
width: 200,
ellipsis: true,
},
],
fieldList: [
{
type: 'string',
value: 'wvtaId',
text: 'WVTA ID'
},
{
type: 'string',
value: 'inspectionItem',
text: this.$t('inspectionItems'),
},
{
type: '',
value: 'dutyTerritory',
text: this.$t('areaOfResponsibility'),
dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
},
],
dataList: [],
content: [],
loading: false,
dummyInventoryBaseId:'',
pageNo: 1,
pageSize: 10,
total: 0
}
},
mounted() {
},
methods: {
transferModel(id) {
this.visible = true
this.dummyInventoryBaseId = id
this.queryParam = {}
this.selectedRowKeys = []
this.replacePage()
},
searchQuery() {
this.pageNo = 1
this.replacePage()
},
searchReset() {
this.pageNo = 1
this.queryParam = {}
this.replacePage()
// this.$refs.globalAdvancedQueryRef.resetLine()
// this.$refs.globalAdvancedQueryRef.emitCallback()
},
onChange(page, pageSize) {
this.pageNo = page
this.replacePage()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.replacePage()
},
// handleSuperQuery(params, matchType) {
// let sqp = {}
// if (!params || (params && params.length == 0)) {
// sqp['superQueryParams'] = ''
// this.$refs.globalAdvancedQueryRef.superQueryFlag = false
// } else {
// this.$refs.globalAdvancedQueryRef.superQueryFlag = true
// sqp['superQueryParams'] = encodeURI(JSON.stringify(params))
// sqp['superQueryMatchType'] = matchType
// }
// this.queryParamQuery = sqp
// this.replacePage()
// },
replacePage() {
let query = {
// pageNo: this.pageNo,
// pageSize: this.pageSize,
...this.queryParamQuery,
...this.queryParam,
authDummyInventoryBaseId: this.dummyInventoryBaseId
}
this.loading = true
getAction('/authDummy/authDummyInventoryInfoEO/list', query).then((res) => {
if (res.success) {
this.dataList = res.result || []
this.loading = false
} else {
this.loading = false
}
})
},
onSelectChange(value) {
this.selectedRowKeys = value
// if (this.selectedRowKeys.length > 1) {
// this.selectedRowKeys.shift()
// }
},
handleCancel() {
this.visible = false
},
handleSubmit(flag) {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
this.confirmLoading = true
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
postAction('/authDummy/authDummyInventoryInfoEO/acquireAdd', {
authDummyInventoryBaseId: this.dummyInventoryBaseId,
ids: selectedRowKeys.join(','),
}).then((res) => {
if (res.success) {
this.confirmLoading = false
this.$message.success(this.$t('OperationSuccessful'))
this.visible = false
this.selectedRowKeys = []
this.$emit('transferListFormHomo')
} else {
this.$message.warning(this.$t('operationFailed'))
this.confirmLoading = false
}
})
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
},
}
}
</script>
<style scoped>
.page {
text-align: right;
margin-top: 20px;
}
.drawer-bootom-button {
position: absolute;
bottom: 0;
z-index: 100;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
.box-title-text {
line-height: 1.4;
display: flex;
align-items: center;
margin-bottom: 10px;
}
.title-text {
width: 20%;
min-width: 110px;
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;
}
</style>
jero-web/src/views/virtualAuthenticationList/index.vue
+395 -379
View File
@@ -49,7 +49,7 @@
:loading="loading" :loading="loading"
:pagination="false" :pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 300px)'}" :scroll="{x: '100%',y:'calc(100vh - 300px)'}"
rowKey="id" :rowKey="(record)=>JSON.stringify(record)"
:data-source="dataSource" :data-source="dataSource"
:columns="columns" :columns="columns"
@change="tableOnChange" @change="tableOnChange"
@@ -113,7 +113,8 @@
<div class="box-title-text-add"> <div class="box-title-text-add">
<div class="title-text-add"> <div class="title-text-add">
<span class="Required">*</span> <span class="Required">*</span>
<span class="title-text-text" :title="$t('CertificationListName')">{{$t('CertificationListName')}}</span> <span class="title-text-text"
:title="$t('CertificationListName')">{{$t('CertificationListName')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="name"> <a-form-model-item class="itemModel" prop="name">
<a-input class="box-input-add" <a-input class="box-input-add"
@@ -147,144 +148,198 @@
</template> </template>
<script> <script>
import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage' import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
import VueDraggableResizable from 'vue-draggable-resizable' import VueDraggableResizable from 'vue-draggable-resizable'
import tableDragResize from '@/mixins/tableDragResize' import tableDragResize from '@/mixins/tableDragResize'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default { export default {
name:'index', name: 'index',
components: { components: {
VueDraggableResizable VueDraggableResizable
}, },
mixins: [tableDragResize, ResizeHeader, ResizeColumnProvide], mixins: [tableDragResize, ResizeHeader, ResizeColumnProvide],
data() { data() {
return { return {
selectedRowKeys: [], selectedRowKeys: [],
rules: { rules: {
name: [ name: [
{
required: true,
message: this.$t('CertificationListName') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{
max: 100,
message: this.$t('CertificationListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
trigger: 'blur'
}
],
useExplain: [
{
required: true,
message: this.$t('instructionForUse') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{
max: 500,
message: this.$t('instructionForUse') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
trigger: 'blur'
}
]
},
confirmLoading: false,
formInline: {},
visible: false,
title: this.$t('newlyAdded'),
userData: {},
administrators: false,
loading: false,
total: 0,
pageSize: 10,
pageNo: 1,
queryParam: {},
orderBy: '1',
orderByField: '',
url: {
list: '/authDummy/authDummyInventoryBaseEO/page',//分页列表查询
add: '/authDummy/authDummyInventoryBaseEO/add',//添加
edit: '/authDummy/authDummyInventoryBaseEO/edit',//编辑
deleteBatch: '/authDummy/authDummyInventoryBaseEO/deleteBatch',//批量删除
urlWithdraw: '/authDummy/authDummyInventoryBaseEO/issue'//批量发布或撤回
},
dataSource: [],
columns: [
{ {
required: true, title: this.$t('CertificationListName'),
message: this.$t('CertificationListName') + this.$t('cannotEmpty'), align: 'left',
trigger: 'blur' dataIndex: 'name',
width: 260,
ellipsis: true,
scopedSlots: { customRender: 'CertificationListName' }
}, },
{ {
max: 100, title: this.$t('listStatus'),
message: this.$t('CertificationListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'), align: 'left',
trigger: 'blur' width: 260,
} ellipsis: true,
], dataIndex: 'state_dictText'
useExplain: [
{
required: true,
message: this.$t('instructionForUse') + this.$t('cannotEmpty'),
trigger: 'blur'
}, },
{ {
max: 500, title: this.$t('creater'),
message: this.$t('instructionForUse') + this.$t('cannotExceed') + 500 + this.$t('Characters'), align: 'left',
trigger: 'blur' width: 260,
ellipsis: true,
dataIndex: 'createBy'
},
{
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 400,
scopedSlots: { customRender: 'operation' }
} }
] ]
}, }
confirmLoading: false,
formInline: {},
visible: false,
title: this.$t('newlyAdded'),
userData: {},
administrators:false,
loading: false,
total: 0,
pageSize: 10,
pageNo: 1,
queryParam: {},
orderBy: '1',
orderByField: '',
url: {
list: '/authDummy/authDummyInventoryBaseEO/page',//分页列表查询
add: '/authDummy/authDummyInventoryBaseEO/add',//添加
edit: '/authDummy/authDummyInventoryBaseEO/edit',//编辑
deleteBatch: '/authDummy/authDummyInventoryBaseEO/deleteBatch',//批量删除
urlWithdraw: '/authDummy/authDummyInventoryBaseEO/issue'//批量发布或撤回
},
dataSource: [],
columns: [
{
title: this.$t('CertificationListName'),
align: 'left',
dataIndex: 'name',
width: 260,
ellipsis: true,
scopedSlots: { customRender: 'CertificationListName' }
},
{
title: this.$t('listStatus'),
align: 'left',
width: 260,
ellipsis: true,
dataIndex: 'state_dictText'
},
{
title: this.$t('creater'),
align: 'left',
width: 260,
ellipsis: true,
dataIndex: 'createBy'
},
{
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 400,
scopedSlots: { customRender: 'operation' }
}
],
}
},
mounted() {
this.getList()
this.userData = this.userInfo()
this.administrators = false
if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
this.userInfo().userRoleList.forEach(res => {
if (res.roleCode == 'admin') {
this.administrators = true
}
})
}
},
methods: {
...mapGetters(['userInfo']),
onSelectChange(value) {
this.selectedRowKeys = value
}, },
tableOnChange(pagination, filters, sorter) { mounted() {
this.orderBy = sorter.order == 'ascend' ? '1' : '2'
this.orderByField = sorter.columnKey
this.getList() this.getList()
this.userData = this.userInfo()
this.administrators = false
if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
this.userInfo().userRoleList.forEach(res => {
if (res.roleCode == 'admin') {
this.administrators = true
}
})
}
}, },
//添加 methods: {
handleAdd() { ...mapGetters(['userInfo']),
this.title = this.$t('newlyAdded') onSelectChange(value) {
this.formInline = {} this.selectedRowKeys = value
this.visible = true },
this.$nextTick(() => { tableOnChange(pagination, filters, sorter) {
this.$refs.ruleForm.clearValidate() this.orderBy = sorter.order == 'ascend' ? '1' : '2'
}) this.orderByField = sorter.columnKey
}, this.getList()
//批量删除 },
handleDel() { //添加
if (this.selectedRowKeys.length > 0) { handleAdd() {
this.title = this.$t('newlyAdded')
this.formInline = {}
this.visible = true
this.$nextTick(() => {
this.$refs.ruleForm.clearValidate()
})
},
//批量删除
handleDel() {
if (this.selectedRowKeys.length > 0) {
let _this = this
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
let isTrue
for (let i = 0; i < selectedRowKeys.length; i++) {
selectedRowKeys[i] = JSON.parse(selectedRowKeys[i])
if (selectedRowKeys[i].state == 1) {
isTrue = false
break
} else {
isTrue = true
}
}
if (isTrue){
this.$confirm({
content: _this.$t('ConfirmBatchDeletion'),
onOk() {
let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
deleteAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.selectedRowKeys = []
_this.getList()
} else {
_this.$message.warning(res.message)
}
})
}
})
}else{
this.$message.warning(this.$t(''))
}
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
},
//编辑
edit(item) {
this.title = this.$t('edit')
this.formInline = JSON.parse(JSON.stringify(item))
this.visible = true
this.$nextTick(() => {
this.$refs.ruleForm.clearValidate()
})
},
//撤回
withdraw(val) {
let item = {}
let content = ''
if (!val.state || val.state == 2) {
content = this.$t('confirmRelease')
item.state = 1
} else {
item.state = 2
content = this.$t('confirmWithdraw')
}
item.id = val.id
let _this = this let _this = this
this.$confirm({ this.$confirm({
content: _this.$t('ConfirmBatchDeletion'), content: content,
onOk() { onOk() {
let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) postAction(_this.url.urlWithdraw, item).then((res) => {
deleteAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => {
if (res.success) { if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful')) _this.$message.success(_this.$t('OperationSuccessful'))
_this.selectedRowKeys = []
_this.getList() _this.getList()
} else { } else {
_this.$message.warning(res.message) _this.$message.warning(res.message)
@@ -292,285 +347,246 @@ export default {
}) })
} }
}) })
} else { },
this.$message.warning(this.$t('selectLeastOne')) //认证清单维护
} maintenanceList(item) {
}, let newUrl = this.$router.resolve({
//编辑 path: '/certificationListMaintenance',
edit(item) { query: {
this.title = this.$t('edit') name: item.name,
this.formInline = JSON.parse(JSON.stringify(item)) useExplain: item.useExplain,
this.visible = true id: item.id,
this.$nextTick(() => { title: '认证清单维护'
this.$refs.ruleForm.clearValidate()
})
},
//撤回
withdraw(val) {
let item = {}
let content = ''
if (!val.state || val.state == 2) {
content = this.$t('confirmRelease')
item.state = 1
} else {
item.state = 2
content = this.$t('confirmWithdraw')
}
item.id = val.id
let _this = this
this.$confirm({
content: content,
onOk() {
postAction(_this.url.urlWithdraw, item).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.getList()
} else {
_this.$message.warning(res.message)
}
})
}
})
},
//认证清单维护
maintenanceList(item) {
let newUrl = this.$router.resolve({
path: '/certificationListMaintenance',
query: {
name: item.name,
useExplain: item.useExplain,
id: item.id,
title: '认证清单维护'
}
})
window.open(newUrl.href, '_blank')
},
//订阅
subscribe(val) {
let _this = this
this.$confirm({
content: val.readFlag == 0 || !val.readFlag ? _this.$t('ConfirmSubscribe') : _this.$t('cancelConfirmSubscribe'),
onOk() {
let url = ''
if (val.readFlag == 0 || !val.readFlag) {
url = '/authDummy/authDummyInventoryBaseEO/read'
} else {
url = '/authDummy/authDummyInventoryBaseEO/cancelRead'
} }
getAction(url, { id: val.id }).then((res) => { })
if (res.success) { window.open(newUrl.href, '_blank')
_this.$message.success(_this.$t('OperationSuccessful')) },
_this.getList() //订阅
subscribe(val) {
let _this = this
this.$confirm({
content: val.readFlag == 0 || !val.readFlag ? _this.$t('ConfirmSubscribe') : _this.$t('cancelConfirmSubscribe'),
onOk() {
let url = ''
if (val.readFlag == 0 || !val.readFlag) {
url = '/authDummy/authDummyInventoryBaseEO/read'
} else { } else {
_this.$message.warning(_this.$t('operationFailed')) url = '/authDummy/authDummyInventoryBaseEO/cancelRead'
} }
}) getAction(url, { id: val.id }).then((res) => {
} if (res.success) {
}) _this.$message.success(_this.$t('OperationSuccessful'))
}, _this.getList()
//删除 } else {
deleteLib(val) { _this.$message.warning(_this.$t('operationFailed'))
let _this = this }
this.$confirm({ })
content: _this.$t('ConfirmDelete'),
onOk() {
deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.getList()
} else {
_this.$message.warning(res.message)
}
})
}
})
},
//虚拟认证清单名称事件
CertificationListNameClick(item) {
let newUrl = this.$router.resolve({
path: '/certificationListMaintenance',
query: {
name: item.name,
useExplain: item.useExplain,
id: item.id,
title: '虚拟认证清单详情'
}
})
window.open(newUrl.href, '_blank')
},
searchQuery() {
this.pageNo = 1
this.getList()
},
searchReset() {
this.queryParam = {}
this.pageNo = 1
this.getList()
},
pageOnChange(page, pageSize) {
this.pageNo = page
this.getList()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
},
handleCancel() {
this.visible = false
},
handleSubmit() {
this.$refs.ruleForm.validate(valid => {
if (valid) {
let url = ''
if (this.formInline.id) {
url = this.url.edit
} else {
url = this.url.add
} }
this.confirmLoading = true })
postAction(url, this.formInline).then((res) => { },
if (res.success) { //删除
this.confirmLoading = false deleteLib(val) {
this.$message.success(this.$t('OperationSuccessful')) let _this = this
this.visible = false this.$confirm({
content: _this.$t('ConfirmDelete'),
onOk() {
deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.getList()
} else {
_this.$message.warning(res.message)
}
})
}
})
},
//虚拟认证清单名称事件
CertificationListNameClick(item) {
let newUrl = this.$router.resolve({
path: '/certificationListMaintenance',
query: {
name: item.name,
useExplain: item.useExplain,
id: item.id,
title: '市场认证清单详情'
}
})
window.open(newUrl.href, '_blank')
},
searchQuery() {
this.pageNo = 1
this.getList()
},
searchReset() {
this.queryParam = {}
this.pageNo = 1
this.getList()
},
pageOnChange(page, pageSize) {
this.pageNo = page
this.getList()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
},
handleCancel() {
this.visible = false
},
handleSubmit() {
this.$refs.ruleForm.validate(valid => {
if (valid) {
let url = ''
if (this.formInline.id) {
url = this.url.edit
} else {
url = this.url.add
}
this.confirmLoading = true
postAction(url, this.formInline).then((res) => {
if (res.success) {
this.confirmLoading = false
this.$message.success(this.$t('OperationSuccessful'))
this.visible = false
this.getList()
} else {
this.$message.warning(this.$t('operationFailed'))
this.confirmLoading = false
}
})
}
})
},
getList() {
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
...this.queryParam
}
this.loading = true
getAction(this.url.list, query).then((res) => {
if (res.success) {
if (res.result.current > 1 && res.result.records.length == 0) {
this.pageNo = 1
this.getList() this.getList()
} else { return
this.$message.warning(this.$t('operationFailed'))
this.confirmLoading = false
} }
}) this.dataSource = res.result.records || []
} this.total = res.result.total
}) this.loading = false
}, } else {
getList() { this.loading = false
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
...this.queryParam
}
this.loading = true
getAction(this.url.list,query).then((res) => {
if (res.success) {
if (res.result.current > 1 && res.result.records.length == 0) {
this.pageNo = 1
this.getList()
return
} }
this.dataSource = res.result.records || [] })
this.total = res.result.total }
this.loading = false }
} else {
this.loading = false
}
})
},
} }
}
</script> </script>
<style scoped> <style scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
.box-title-text { .box-title-text {
line-height: 1.4; line-height: 1.4;
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 10px; margin-bottom: 10px;
} }
.title-text { .title-text {
width: 20%; width: 20%;
min-width: 110px; min-width: 110px;
color: #000F16; color: #000F16;
display: inline-block; display: inline-block;
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
margin-right: 16px; margin-right: 16px;
margin-top: 3px; margin-top: 3px;
text-align: right; text-align: right;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.box-input { .box-input {
display: inline-block; display: inline-block;
width: 70%; width: 70%;
height: 38px; height: 38px;
margin-top: 2px; margin-top: 2px;
} }
.box-button { .box-button {
height: 38px; height: 38px;
/*margin-top: 2px;*/ /*margin-top: 2px;*/
} }
.text-operation { .text-operation {
margin-right: 8px; margin-right: 8px;
} }
.page { .page {
text-align: right; text-align: right;
margin-top: 20px; margin-top: 20px;
} }
.formAdd { .formAdd {
margin-bottom: 40px; margin-bottom: 40px;
} }
.box-title-text-add { .box-title-text-add {
line-height: 1.4; line-height: 1.4;
display: flex; display: flex;
} }
.title-text-add { .title-text-add {
width: 114px; width: 114px;
text-align: right; text-align: right;
display: inline-block; display: inline-block;
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
margin-right: 16px; margin-right: 16px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
height: 42px; height: 42px;
line-height: 42px; line-height: 42px;
margin-top: 3px; margin-top: 3px;
} }
.Required { .Required {
color: red; color: red;
margin-right: 4px; margin-right: 4px;
} }
.title-text-text { .title-text-text {
margin-top: 9px; margin-top: 9px;
} }
.itemModel { .itemModel {
width: calc(100% - 130px); width: calc(100% - 130px);
display: inline-block; display: inline-block;
margin-top: 2px; margin-top: 2px;
} }
.box-input-add { .box-input-add {
display: inline-block; display: inline-block;
height: 38px; height: 38px;
width: 100%; width: 100%;
} }
.drawer-bootom-button { .drawer-bootom-button {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
z-index: 100; z-index: 100;
width: 100%; width: 100%;
border-top: 1px solid #e8e8e8; border-top: 1px solid #e8e8e8;
padding: 10px 16px; padding: 10px 16px;
text-align: right; text-align: right;
left: 0; left: 0;
background: #fff; background: #fff;
border-radius: 0 0 2px 2px; border-radius: 0 0 2px 2px;
} }
</style> </style>
jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+11 -7
View File
@@ -232,7 +232,7 @@
</div> </div>
</div> </div>
<UpdateLog :url="url" ref="UpdateLogRef"/> <UpdateLog :url="url" ref="UpdateLogRef"/>
<transfer-list ref="transferListRef"></transfer-list> <transferList :url="url" @transferListForm="transferListForm" ref="transferListRef"/>
<addModel :url="url" ref="addModelRef" @addModelList="addModelList"/> <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
<edit-model :url="url" ref="editModelRef" @editModelList="editModelList"></edit-model> <edit-model :url="url" ref="editModelRef" @editModelList="editModelList"></edit-model>
<bat-setting :url="url" ref="batSettingRef" @batSettingList="batSettingList"></bat-setting> <bat-setting :url="url" ref="batSettingRef" @batSettingList="batSettingList"></bat-setting>
@@ -292,7 +292,7 @@
title: this.$t('category'), title: this.$t('category'),
align: 'left', align: 'left',
dataIndex: 'category', dataIndex: 'category',
width: 150, width: 200,
fixed: 'left', fixed: 'left',
ellipsis: true ellipsis: true
}, },
@@ -300,7 +300,7 @@
title: this.$t('inspectionItems'), title: this.$t('inspectionItems'),
align: 'left', align: 'left',
dataIndex: 'inspectionItem', dataIndex: 'inspectionItem',
width: 150, width: 200,
ellipsis: true, ellipsis: true,
fixed: 'left', fixed: 'left',
scopedSlots: { customRender: 'inspectionItems' } scopedSlots: { customRender: 'inspectionItems' }
@@ -323,7 +323,7 @@
title: this.$t('standard'), title: this.$t('standard'),
align: 'left', align: 'left',
dataIndex: 'serialNumber', dataIndex: 'serialNumber',
width: 150, width: 210,
ellipsis: true ellipsis: true
}, },
{ {
@@ -353,7 +353,7 @@
} }
}, },
created() { created() {
if (this.$route.query.title == '虚拟认证清单详情') { if (this.$route.query.title == '市场认证清单详情') {
document.title = this.$t('virtualAuthenticationListDetails') document.title = this.$t('virtualAuthenticationListDetails')
this.columns.splice(7, 1) this.columns.splice(7, 1)
} else { } else {
@@ -362,8 +362,8 @@
}, },
mounted() { mounted() {
this.title = this.$route.query.title this.title = this.$route.query.title
this.isTrue = this.$route.query.title == '虚拟认证清单详情' ? false : true this.isTrue = this.$route.query.title == '市场认证清单详情' ? false : true
this.isFalse = this.$route.query.title == '虚拟认证清单详情' ? true : false this.isFalse = this.$route.query.title == '市场认证清单详情' ? true : false
this.getList() this.getList()
}, },
computed: {}, computed: {},
@@ -382,6 +382,10 @@
searchQuery() { searchQuery() {
this.getList() this.getList()
}, },
transferListForm() {
this.selectedRowKeys = []
this.getList()
},
//清空 //清空
searchReset() { searchReset() {
this.queryParam = {} this.queryParam = {}