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

Merge branch 'dev_2nd_period_test' into 'feature_dev_20221010_extend'

Browse Source 
# Conflicts:
#   jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
This commit is contained in:
高嵩
2022-10-28 16:34:39 +08:00
parent 44d8dea8a7 419e4c9be2
commit cd6dc3c44a
113 changed files with 9798 additions and 670 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/assets/ditu.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

jero-web/src/common/lang/en-us.js
+22
View File
@@ -1337,4 +1337,26 @@ module.exports = {
Topping:'Topping',
cancelTopping:'Cancel Topping',
relatedProjectVersion:'Related project version',
taskType:'Task Type',
taskStatus:'Task Status',
taskConfirmationHandling:'Task confirmation handling',
relatedVersion:'Related version',
filledBy:'Filled by',
parameterToBeInitiated:'Parameter to be initiated',
listTaskConfirmation:'List task confirmation',
completednum: 'Quantity to be filled',
filledBynum:'Filled by',
parameterToBeInitiatednum:'Parameter to be initiated',
listToConfirm:'List to confirm',
toSubmit:'To submit',
toAudit:'To audit',
secondaryDirectory:'Secondary Directory',
OnlyPersonsCanBeSelected:'The maximum upper limit is exceeded; Only 100 persons can be selected',
projectVersion:'Project Version',
softwareVersion:'Authentication Software version',
versionStatistics:'Version statistics',
addSubproject:'Add Subproject',
Topping:'Topping',
cancelTopping:'Cancel Topping',
relatedProjectVersion:'Related project version',
}
jero-web/src/common/lang/zh-cn.js
+24 -2
View File
@@ -516,8 +516,8 @@ module.exports = {
AddProcess: '添加流程',
RelatedItems: '相关项目',
Sponsor: '发起人',
CurrentProcessor: '当前处理人',
LastProcessor: '上一处理人',
CurrentProcessor: '当前操作人',
LastProcessor: '上一操作人',
ProcessingTime: '办理时间',
cutoffTime: '截止时间',
ProcessStatus: '流程状态',
@@ -1438,4 +1438,26 @@ module.exports = {
Topping:'置顶',
cancelTopping:'取消置顶',
relatedProjectVersion:'相关项目版本',
taskType:'任务类型',
taskStatus:'任务状态',
taskConfirmationHandling:'任务确认办理',
relatedVersion:'相关版本',
filledBy:'待分配填写人',
parameterToBeInitiated:'参数待发起',
listTaskConfirmation:'清单任务确认',
completednum: '待填写',
filledBynum:'待分配填写人',
parameterToBeInitiatednum:'参数待发起',
listToConfirm:'待确认',
toSubmit:'待提交',
toAudit:'待审核',
secondaryDirectory:'二级目录',
OnlyPersonsCanBeSelected:'超出最大上限；最多只能选择100个人员',
projectVersion:'项目版本',
softwareVersion:'认证软件版本',
versionStatistics:'版本统计',
addSubproject:'添加子项目',
Topping:'置顶',
cancelTopping:'取消置顶',
relatedProjectVersion:'相关项目版本',
}
jero-web/src/components/menu/index.js
+6 -3
View File
@@ -109,8 +109,10 @@ export default {
props = { to: { path: menu.path } }
}
const attrs = { href: menu.path, target: menu.meta.target , title:menu.meta.title }
const attrs = { href: menu.path, target: menu.meta.target, title: menu.meta.title }
if (menu.meta && menu.meta.existTask) {
attrs.style = 'color:red'
}
if (menu.children && menu.alwaysShow) {
// 把有子菜单的 并且 父菜单是要隐藏子菜单的
// 都给子菜单增加一个 hidden 属性
@@ -162,7 +164,8 @@ export default {
span
slot = 'title' >
{ this.renderIcon(menu.meta.icon) }
< span title={menu.meta.title}> { menu.meta.title } < /span>
< span
title = { menu.meta.title } > { menu.meta.title } < /span>
< /span>
{
itemArr
jero-web/src/components/tableCollection/index.vue
+63 -31
View File
@@ -19,12 +19,16 @@
<span slot="titleName" slot-scope="text,record" :title="text">
{{ text }}
</span>
<span slot="paramsName" slot-scope="text,record">
<span class="textName" :title="text">{{text}}</span>
</span>
<div :slot="'titleName'+(index+1)" v-for="(item,index) in content">
<span v-if='item.isLock == 1' style='padding-right: 20px'><a-icon type="lock" theme="twoTone" two-tone-color="#00B3BE" /></span>
<span v-if='item.isLock == 1' style='padding-right: 20px'><a-icon type="lock" theme="twoTone"
two-tone-color="#00B3BE"/></span>
<span style='padding-right: 10px'>{{ item.db_field_txt }} </span>
<a-button @click='onClickSee(item)'>{{$t('See')}}</a-button>
</div>
<!-- {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }}-->
<!-- {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }}-->
<span slot="ParameterDescription" slot-scope="text,record" :title="text">
<a-button @click='onClickTitle(record)'>{{$t('See')}}</a-button>
@@ -55,7 +59,7 @@
<span
v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "To be collected" || record.state == "Rejected by eng. interface"'>
<span :title='record.dataValue'
@click='ondataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}</span>
@click='ondataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}</span>
</span>
<span v-else>
<span :title='record.dataValue' @click='dataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }}</span>
@@ -135,14 +139,14 @@
<a-row :gutter='24'>
<a-col :span='24'>
<a-form-model-item ref='region' :label="$t('areaOfResponsibility')" prop='queryzr'>
<!-- <a-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"-->
<!-- v-model="Dateline.querySdt">-->
<!-- <a-select-option v-for="(item, key) in querySdtList" :key="key" :value="item.value">-->
<!-- <span style="display: inline-block;width: 100%" :title=" item.label ">-->
<!-- {{ item.label }}-->
<!-- </span>-->
<!-- </a-select-option>-->
<!-- </a-select>-->
<!-- <a-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"-->
<!-- v-model="Dateline.querySdt">-->
<!-- <a-select-option v-for="(item, key) in querySdtList" :key="key" :value="item.value">-->
<!-- <span style="display: inline-block;width: 100%" :title=" item.label ">-->
<!-- {{ item.label }}-->
<!-- </span>-->
<!-- </a-select-option>-->
<!-- </a-select>-->
<j-dict-select-tag class="box-input" v-model="Dateline.queryzr"
@input="handleInput('queryzr')"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
@@ -155,7 +159,8 @@
<div class="imports-footer">
<div class="imports-footer-wrap">
<a-button class="imports-btn imports-sub" :loading="confirmLoading" type="primary" @click="handleSubmitzr">{{$t('preservation')}}
<a-button class="imports-btn imports-sub" :loading="confirmLoading" type="primary" @click="handleSubmitzr">
{{$t('preservation')}}
</a-button>
<a-button class="imports-btn" type="primary" @click="cancel">{{$t('cancel')}}</a-button>
</div>
@@ -235,7 +240,7 @@
default: {},
require: true
},
description:'',
description: '',
formInline: {
type: Object,
default: true
@@ -300,7 +305,7 @@
indeterminate: false,
columns: [],
content: [],
confirmLoading:false,
confirmLoading: false,
selectedRowKeys: [],
selectedRowrowValue: [],
dataSource: [],
@@ -316,7 +321,7 @@
sdt: 0, // 工程接口人
dre: 0, // 填写人
areaVisible: false,
areaVisiblezr:false,
areaVisiblezr: false,
form: {},
rules: {
querySdt: [
@@ -342,13 +347,13 @@
xs: { span: 24 },
sm: { span: 7 }
},
queryParamQuery:{},
queryParam:{},
queryParamQuery: {},
queryParam: {},
querySdtList: [], // 工程接口人
Dateline: {},
getquerySdtId: '', // 当前工程接口人的id
areaVisibleView: false, // 查看配置得弹框
seeVisibleView:false,
seeVisibleView: false,
configDetail: {} // 查看配置得详细信息
}
},
@@ -394,7 +399,7 @@
this.$emit('handlePreservation')
this.getTableList()
},
onClickTitle(val){
onClickTitle(val) {
console.log(val)
this.description = val.description
this.seeVisibleView = true
@@ -455,7 +460,11 @@
// 责任领域 保存
handleSubmitzr(record) {
let _this = this
let param = { dutyTerritory: this.Dateline.queryzr, ids: this.getquerySdtId,paramsManifestId: this.$route.query.id, }
let param = {
dutyTerritory: this.Dateline.queryzr,
ids: this.getquerySdtId,
paramsManifestId: this.$route.query.id
}
this.$refs.ruleFormOne.validate(valid => {
if (valid) {
this.confirmLoading = true
@@ -538,7 +547,7 @@
this.areaVisible = false
this.$refs['ruleForm'].resetFields()
},
cancel(){
cancel() {
this.areaVisiblezr = false
this.$refs['ruleFormOne'].resetFields()
},
@@ -597,7 +606,7 @@
}
getAction('/params/userTypeLog/queryCurrentType', query).then((res) => {
if (res.success) {
this.queryParamQuery = {...this.queryParamQuery}
this.queryParamQuery = { ...this.queryParamQuery }
if (res.result && res.result.userType) {
if (!(result.some(val => val.value == res.result.userType))) {
@@ -631,7 +640,7 @@
let params = {
paramsManifestId: paramsManifestid,
flag: '7',
userType:userType,
userType: userType
}
getAction(url, params).then((res) => {
if (res.success) {
@@ -662,25 +671,27 @@
dataIndex: res.db_field_name,
align: 'center',
// ellipsis: true,
fixed: res.click5?'left':'',
fixed: res.click5 ? 'left' : '',
sorter: res.sort,
width: 160
})
console.log(res)
this.columns[index].scopedSlots = {
customRender: 'titleName'
}
if(res.click1){
if (res.db_field_name == 'nioNumber') {
this.columns[index].width = 100
}
if (res.click1) {
this.columns[index].scopedSlots = {
customRender: 'operationzr'
}
}
if(res.click2){
if (res.click2) {
this.columns[index].scopedSlots = {
customRender: 'ParameterDescription'
}
}
if(res.click3){
if (res.click3) {
this.columns[index].scopedSlots = {
customRender: 'paramsNameDescription'
}
@@ -691,6 +702,12 @@
customRender: 'operationbtn'
}
}
if (res.db_field_name == 'paramsName') {
this.columns[index].width = 300
this.columns[index].scopedSlots = {
customRender: 'paramsName'
}
}
}
})
this.columns = [...this.columns]
@@ -707,7 +724,7 @@
let params = {
paramsManifestId: this.$route.query.id,
pageNo: this.pageNo,
pageSize: this.pageSize,
pageSize: this.pageSize
// userTypes: this.currentPersonRole
}
let url
@@ -812,7 +829,7 @@
// })
let tt = []
if (this.currentPersonRole !== 'dre') {
console.log(res.result.records,'res.result.records')
console.log(res.result.records, 'res.result.records')
res.result.records.forEach((Obj) => {
Object.keys(Obj).forEach((item) => {
if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
@@ -912,6 +929,7 @@
border: none !important;
padding: 0 !important;
}
//::v-deep .ant-table-row:first-child {
// background: #fff!important;
// /*opacity: 0.9;*/
@@ -952,6 +970,7 @@
font-weight: 400;
}
}
.textfield {
width: 100%;
margin-bottom: 8px;
@@ -981,6 +1000,19 @@
}
}
}
.textName {
width: 100%;
overflow: hidden;
display: -webkit-box;
text-overflow: ellipsis;
/*! autoprefixer: off */
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
/*! autoprefixer: on;*/
text-justify: inter-ideograph;
word-break: break-all
}
</style>
<style>
.resize-table-th {
@@ -1001,7 +1033,7 @@
}
.rowClassRed {
background: #f3d9de ;
background: #f3d9de;
}
.rowClassRedYellow {
jero-web/src/components/tableCollection/index1.vue
+55 -25
View File
@@ -28,22 +28,25 @@
<a-button @click='onClickTitle(record)'>{{$t('See')}}</a-button>
</span>
<!-- <span slot="operationbtn" slot-scope="record">-->
<!-- <span v-if='currentPersonRole === "homo"'>-->
<!--&lt;!&ndash; 认证工程师 &ndash;&gt;-->
<!-- <span-->
<!-- v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "Wait Collect" || record.state == "Sdt Back" || record.state == "Change"'>-->
<!--&lt;!&ndash; <span&ndash;&gt;-->
<!--&lt;!&ndash; @click='ondataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>&ndash;&gt;-->
<!-- </span>-->
<!-- <span v-else>-->
<!-- <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>-->
<!-- </span>-->
<!-- </span>-->
<!-- <span v-else>-->
<!-- <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>-->
<!-- </span>-->
<!-- </span>-->
<span slot="paramsName" slot-scope="text,record">
<span class="textName" :title="text">{{text}}</span>
</span>
<!-- <span slot="operationbtn" slot-scope="record">-->
<!-- <span v-if='currentPersonRole === "homo"'>-->
<!--&lt;!&ndash; 认证工程师 &ndash;&gt;-->
<!-- <span-->
<!-- v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "Wait Collect" || record.state == "Sdt Back" || record.state == "Change"'>-->
<!--&lt;!&ndash; <span&ndash;&gt;-->
<!--&lt;!&ndash; @click='ondataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>&ndash;&gt;-->
<!-- </span>-->
<!-- <span v-else>-->
<!-- <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>-->
<!-- </span>-->
<!-- </span>-->
<!-- <span v-else>-->
<!-- <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>-->
<!-- </span>-->
<!-- </span>-->
<span slot="detailClick" slot-scope="text,record">
<collection-type :detailDate='text'/>
</span>
@@ -99,7 +102,8 @@
</div>
</a-modal>
<!-- 配置信息--->
<a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null" @cancel="hideModal">
<a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null"
@cancel="hideModal">
<div class="content-text">
<div class="text-field">
<span class="text-field-left" :title="$t('configurationName')">{{$t('configurationName')}}:</span>
@@ -246,7 +250,7 @@
sdt: 0, // 工程接口人
dre: 0, // 填写人
areaVisible: false,
seeVisibleView:false,
seeVisibleView: false,
form: {},
rules: {
querySdt: [
@@ -293,7 +297,7 @@
return 'rowClassRed'
}
},
onClickTitle(val){
onClickTitle(val) {
console.log(val)
this.description = val.description
this.seeVisibleView = true
@@ -310,7 +314,7 @@
// this.$emit('handlePreservation')
this.getTableList()
},
hideModal(){
hideModal() {
this.areaVisibleView = false
},
// 查看配置详细信息
@@ -507,17 +511,27 @@
this.columns[index].scopedSlots = {
customRender: 'titleName'
}
if (res.db_field_name == 'nioNumber') {
this.columns[index].width = 100
}
if (res.click) {
// 工程接口人列表修改
this.columns[index].scopedSlots = {
customRender: 'operationbtn'
}
}
if(res.click2){
if (res.click2) {
this.columns[index].scopedSlots = {
customRender: 'ParameterDescription'
}
}
if (res.db_field_name == 'paramsName') {
this.columns[index].width = 300
this.columns[index].ellipsis = false
this.columns[index].scopedSlots = {
customRender: 'paramsName'
}
}
}
})
this.columns = [...this.columns]
@@ -532,8 +546,8 @@
let params = {
paramsManifestId: this.$route.query.id,
userTypes: this.currentPersonRole,
pageNo:this.pageNo,
pageSize:this.pageSize
pageNo: this.pageNo,
pageSize: this.pageSize
}
this.loading = true
this.$emit('listReset', '')
@@ -723,14 +737,16 @@
border: none !important;
padding: 0 !important;
}
::v-deep .ant-table-row:first-child {
background: #fff!important;
background: #fff !important;
opacity: 0.9;
}
::v-deep .ant-table-body {
background: transparent!important;
background: transparent !important;
}
.textfield {
width: 100%;
margin-bottom: 8px;
@@ -759,6 +775,7 @@
font-weight: 400;
}
}
.content-text {
width: 100%;
display: flex;
@@ -791,6 +808,19 @@
}
}
}
.textName {
width: 100%;
overflow: hidden;
display: -webkit-box;
text-overflow: ellipsis;
/*! autoprefixer: off */
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
/*! autoprefixer: on;*/
text-justify: inter-ideograph;
word-break: break-all
}
</style>
<style>
.resize-table-th {
jero-web/src/components/tools/HeaderNotice.vue
+11 -3
View File
@@ -15,7 +15,7 @@
<a-list-item :key="index" v-for="(record, index) in announcement1" v-if="index <= 4">
<div style="margin-left: 5%;width: 80%;">
<p style="overflow: hidden; text-overflow: ellipsis;white-space: nowrap;color:#00B3BE">
<a :title="record.titile" @click="showAnnouncement(record)">{{ record.titile }}</a>
<a :title="record.msgContent" @click="showAnnouncement(record)">{{ record.msgContent }}</a>
</p>
</div>
</a-list-item>
@@ -110,6 +110,11 @@
// clearInterval(this.timer)
// },
methods: {
getText(str) {
let words = str.replace(/<[^<>]+>/g, '').replace(/&nbsp;/gi, '') //这里是去除标签
//.replace(/\s/g, '') //这里是去除空格
return words
},
loadData() {
getAction(this.url.listCementByUser).then((res) => {
if (res.success) {
@@ -134,9 +139,12 @@
showAnnouncement(record) {
getAction(this.url.readAllMsg, { ids: record.id }).then((res) => {
})
localStorage.setItem('msgContent', record.msgContent)
this.$router.push({
path: '/system/MessageDetails',
query: record
path: '/isps/userAnnouncement',
query: {
Date: Date.now()
}
})
},
toMyAnnouncement() {
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
+7 -2
View File
@@ -604,7 +604,7 @@
this.formInline[this.uploadName] = attIdList.join(',')
this.formInline = { ...this.formInline }
},
tempSaveClick(){
tempSaveClick() {
},
submit(releaseStatus) {
@@ -845,10 +845,15 @@
.box-input-index {
width: calc(100% - 130px);
display: inline-block;
height: 38px;
height: 48px;
margin-right: 10px;
}
::v-deep .box-input-index .ant-select-selection--multiple::-webkit-scrollbar {
/*height: 52px!important;*/
display: block;
}
.itemOption {
display: inline-block;
width: 100%;
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
+5 -1
View File
@@ -96,9 +96,13 @@
{{item.standNumber}}
</div>
<div class="content-box-button-text" v-if="item.targetMarket_dicText">
<a-icon type="idcard"/>
<img src="../../../../assets/ditu.png" style="width: 15px;margin-top: -3px" alt="">
{{item.targetMarket_dicText}}
</div>
<div class="content-box-button-text" v-if="item.showPermissions_dicText">
<a-icon type="eye" />
{{item.showPermissions_dicText}}
</div>
<div class="content-box-button-text">
<a-icon type="history"/>
{{item.createTime}}
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue
+5 -1
View File
@@ -38,9 +38,13 @@
{{queryForm.standNumber}}
</div>
<div class="content-box-button-text" v-if="queryForm.targetMarket_dicText">
<a-icon type="idcard"/>
<img src="../../../../assets/ditu.png" style="width: 15px;margin-top: -3px" alt="">
{{queryForm.targetMarket_dicText}}
</div>
<div class="content-box-button-text" v-if="queryForm.showPermissions_dicText">
<a-icon type="eye" />
{{queryForm.showPermissions_dicText}}
</div>
<div class="content-box-button-text">
<a-icon type="history"/>
{{queryForm.createTime}}
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+14 -1
View File
@@ -65,6 +65,9 @@
<div class="text-content">
{{item.contentOne}}
</div>
<div class="text-text-right-text-Two">
{{item.showPermissions_dicText}}
</div>
<div class="text-text-right-text-One">
{{item.releaseStatus == 'Draft'?$t('draft'):$t('HaveReleased')}}
</div>
@@ -322,11 +325,21 @@
.text-text-right {
padding: 19px 19px;
width: calc(100% - 300px);
width: calc(100% - 420px);
box-sizing: border-box;
/*margin-left: 38px;*/
}
.text-text-right-text-Two {
width: 120px;
height: 100%;
text-align: center;
position: absolute;
right: 300px;
top: 50%;
transform: translate-Y(-50%);
}
.text-text-right-text-One {
width: 120px;
height: 100%;
jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
+2 -2
View File
@@ -92,14 +92,14 @@
@click="viewClick(record)">
{{$t('view')}}
</a>
<!-- v-if="record.createBy == userData.username || administrators"-->
<a class="text-operation"
v-if="record.createBy == userData.username || administrators"
v-has="'monthlyReportFilling:edit'"
@click="edit(record)">
{{$t('edit')}}
</a>
<!-- v-if="record.createBy == userData.username || administrators"-->
<a class="text-operation"
v-if="record.createBy == userData.username || administrators"
v-has="'monthlyReportFilling:delete'"
@click="deleteLib(record)">
{{$t('deleteLib')}}
jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+29 -21
View File
@@ -9,10 +9,14 @@
:title="$t('title')">{{$t('title')}}</span>
</div>
<a-form-model-item class="itemModel" prop="titleCn">
<a-input class="box-input"
:disabled="disabled"
v-model.trim="formInline.titleCn"
:placeholder="$t('PleaseEnter')+$t('title')"/>
<a-textarea
:disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('title')"
v-model.trim="formInline.titleCn" :rows="3"/>
<!-- <a-input class="box-input"-->
<!-- :disabled="disabled"-->
<!-- v-model.trim="formInline.titleCn"-->
<!-- :placeholder="$t('PleaseEnter')+$t('title')"/>-->
</a-form-model-item>
</div>
</a-col>
@@ -24,10 +28,14 @@
:title="$t('englishTitle')">{{$t('englishTitle')}}</span>
</div>
<a-form-model-item class="itemModel" prop="titleEn">
<a-input class="box-input"
:disabled="disabled"
v-model.trim="formInline.titleEn"
:placeholder="$t('PleaseEnter')+$t('englishTitle')"/>
<a-textarea
:disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('englishTitle')"
v-model.trim="formInline.titleEn" :rows="3"/>
<!-- <a-input class="box-input"-->
<!-- :disabled="disabled"-->
<!-- v-model.trim="formInline.titleEn"-->
<!-- :placeholder="$t('PleaseEnter')+$t('englishTitle')"/>-->
</a-form-model-item>
</div>
</a-col>
@@ -115,7 +123,7 @@
:disabled="disabled"
:placeholder="$t('PleaseSelect')+$t('status')"
:type="'radio'"
:triggerChange="false" :dictCode="'state'"/>
:triggerChange="false" :dictCode="'fa3_gui1_yue4_bao4_tian2_xie3_-_-_zhuang4_tai4'"/>
</a-form-model-item>
</div>
</a-col>
@@ -156,7 +164,7 @@
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('ImplementationDate')">{{$t('ImplementationDate')}}</span>
:title="$t('releaseDate')">{{$t('releaseDate')}}</span>
</div>
<a-form-model-item class="itemModel" prop="newCarImplementTime">
<!-- :placeholder="$t('PleaseEnter')+$t('ImplementationDate')"-->
@@ -171,7 +179,7 @@
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('vehicleInProductionDate')">{{$t('vehicleInProductionDate')}}</span>
:title="$t('implemenDate')">{{$t('implemenDate')}}</span>
</div>
<a-form-model-item class="itemModel" prop="productionCarImplementTime">
<!-- $t('PleaseEnter')+$t('vehicleInProductionDate')-->
@@ -331,36 +339,36 @@
],
productionCarImplementTime: [
{
max: 100,
message: this.$t('vehicleInProductionDate') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
max: 500,
message: this.$t('implemenDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
trigger: 'blur'
}
],
newCarImplementTime: [
{
max: 100,
message: this.$t('ImplementationDate') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
max: 500,
message: this.$t('releaseDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
trigger: 'blur'
}
],
issueTime: [
{
max: 100,
message: this.$t('releaseDate') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
max: 500,
message: this.$t('releaseDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
trigger: 'blur'
}
],
implementCar: [
{
max: 100,
message: this.$t('implementationModel') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
max: 500,
message: this.$t('implementationModel') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
trigger: 'blur'
}
],
link: [
{
max: 100,
message: this.$t('link') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
max: 5000,
message: this.$t('link') + this.$t('cannotExceed') + 5000 + this.$t('Characters'),
trigger: 'blur'
}
],
jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue
+28 -20
View File
@@ -9,10 +9,14 @@
:title="$t('title')">{{$t('title')}}</span>
</div>
<a-form-model-item class="itemModel" prop="titleCn">
<a-input class="box-input"
:disabled="disabled"
v-model.trim="formInline.titleCn"
:placeholder="$t('PleaseEnter')+$t('title')"/>
<a-textarea
:disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('title')"
v-model.trim="formInline.titleCn" :rows="3"/>
<!-- <a-input class="box-input"-->
<!-- :disabled="disabled"-->
<!-- v-model.trim="formInline.titleCn"-->
<!-- :placeholder="$t('PleaseEnter')+$t('title')"/>-->
</a-form-model-item>
</div>
</a-col>
@@ -24,10 +28,14 @@
:title="$t('englishTitle')">{{$t('englishTitle')}}</span>
</div>
<a-form-model-item class="itemModel" prop="titleEn">
<a-input class="box-input"
:disabled="disabled"
v-model.trim="formInline.titleEn"
:placeholder="$t('PleaseEnter')+$t('englishTitle')"/>
<a-textarea
:disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('englishTitle')"
v-model.trim="formInline.titleEn" :rows="3"/>
<!-- <a-input class="box-input"-->
<!-- :disabled="disabled"-->
<!-- v-model.trim="formInline.titleEn"-->
<!-- :placeholder="$t('PleaseEnter')+$t('englishTitle')"/>-->
</a-form-model-item>
</div>
</a-col>
@@ -194,43 +202,43 @@
],
relatedAreasEn: [
{
max: 100,
message: this.$t('relatedFieldsEn') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
max: 500,
message: this.$t('relatedFieldsEn') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
trigger: 'blur'
}
],
relatedAreasCn: [
{
max: 100,
message: this.$t('relatedFields') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
max: 500,
message: this.$t('relatedFields') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
trigger: 'blur'
}
],
sourceCn: [
{
max: 100,
message: this.$t('source') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
max: 500,
message: this.$t('source') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
trigger: 'blur'
}
],
sourceEn: [
{
max: 100,
message: this.$t('sourceEn') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
max: 500,
message: this.$t('sourceEn') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
trigger: 'blur'
}
],
time: [
{
max: 100,
message: this.$t('date') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
max: 500,
message: this.$t('date') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
trigger: 'blur'
}
],
link: [
{
max: 100,
message: this.$t('link') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
max: 5000,
message: this.$t('link') + this.$t('cannotExceed') + 5000 + this.$t('Characters'),
trigger: 'blur'
}
],
jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue
+3 -3
View File
@@ -20,7 +20,7 @@
</div>
<a-form-model-item class="itemModel"
:prop="'dataList.'+index+'.standardNumber'"
:rules="[{max: 100,message: $t('standardNo') + $t('cannotExceed') + 100 + $t('Characters'),trigger: 'blur'
:rules="[{max: 500,message: $t('standardNo') + $t('cannotExceed') + 500 + $t('Characters'),trigger: 'blur'
}]">
<a-input class="box-input"
:disabled="disabled"
@@ -37,7 +37,7 @@
</div>
<a-form-model-item class="itemModel"
:prop="'dataList.'+index+'.standardNameCn'"
:rules="[{max: 100,message: $t('standardNameCn') + $t('cannotExceed') + 100 + $t('Characters'),trigger: 'blur'
:rules="[{max: 500,message: $t('standardNameCn') + $t('cannotExceed') + 500 + $t('Characters'),trigger: 'blur'
}]">
<a-input class="box-input"
:disabled="disabled"
@@ -55,7 +55,7 @@
</div>
<a-form-model-item class="itemModel"
:prop="'dataList.'+index+'.standardNameEn'"
:rules="[{max: 100,message: $t('standardNameEn') + $t('cannotExceed') + 100 + $t('Characters'),trigger: 'blur'
:rules="[{max: 500,message: $t('standardNameEn') + $t('cannotExceed') + 500 + $t('Characters'),trigger: 'blur'
}]">
<a-input class="box-input"
:disabled="disabled"
jero-web/src/views/businessSupport/regulationReport/components/modules/solicitOpinions.vue
+3 -3
View File
@@ -20,7 +20,7 @@
</div>
<a-form-model-item class="itemModel"
:prop="'dataList.'+index+'.planNumberCn'"
:rules="[{max: 100,message: $t('planNoChinese') + $t('cannotExceed') + 100 + $t('Characters'),trigger: 'blur'
:rules="[{max: 500,message: $t('planNoChinese') + $t('cannotExceed') + 500 + $t('Characters'),trigger: 'blur'
}]">
<a-input class="box-input"
:disabled="disabled"
@@ -37,7 +37,7 @@
</div>
<a-form-model-item class="itemModel"
:prop="'dataList.'+index+'.standardNameCn'"
:rules="[{max: 100,message: $t('standardNameCn') + $t('cannotExceed') + 100 + $t('Characters'),trigger: 'blur'
:rules="[{max: 500,message: $t('standardNameCn') + $t('cannotExceed') + 500 + $t('Characters'),trigger: 'blur'
}]">
<a-input class="box-input"
:disabled="disabled"
@@ -55,7 +55,7 @@
</div>
<a-form-model-item class="itemModel"
:prop="'dataList.'+index+'.standardNameEn'"
:rules="[{max: 100,message: $t('standardNameEn') + $t('cannotExceed') + 100 + $t('Characters'),trigger: 'blur'
:rules="[{max: 500,message: $t('standardNameEn') + $t('cannotExceed') + 500 + $t('Characters'),trigger: 'blur'
}]">
<a-input class="box-input"
:disabled="disabled"
jero-web/src/views/dashboard/components/myList.vue
+142 -22
View File
@@ -10,11 +10,17 @@
<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="top">
<span class="top-text" :title="item.prcName">{{item.prcName}}</span>
<!-- <span class="top-admin" :title="prcTypeName[item.prcType]">{{prcTypeName[item.prcType]}}</span>-->
<span class="top-text" v-if="item.flowType == 10"
:title="item.flowTypeShow+'-'+item.projectName">
{{item.flowTypeShow+'-'+item.projectName}}
</span>
<span class="top-text" :title="item.flowTypeShow+'-'+item.serialNumber">
{{item.flowTypeShow+'-'+item.serialNumber}}
</span>
<!-- <span class="top-admin" :title="prcTypeName[item.prcType]">{{prcTypeName[item.prcType]}}</span>-->
</div>
<div class="button">
{{item.creatTime}}
{{item.endTime}}
</div>
<div class="with">
{{$t('Pending')}}
@@ -43,9 +49,13 @@
dataSource: [],
loading: false,
prcTypeName: {
1: this.$t('taskConfirmationProcess'),
5:this.$t('collectionOfRegulatoryOpinionsProcess'),
6:this.$t('regulatoryTechnologyAssessmentProcess')
1: this.$t('listTaskConfirmation'),
2: this.$t('designComplianceReview'),
3: this.$t('preHomeConfirmation'),
4: this.$t('verificationComplianceReview'),
10: this.$t('confirmationOfRegulationsList'),
5: this.$t('collectionOfRegulatoryOpinionsProcess'),
6: this.$t('regulatoryTechnologyAssessmentProcess')
}
}
},
@@ -74,11 +84,11 @@
queryProcess() {
this.loading = true
let parmes = {}
parmes.current = this.pageNo
parmes.size = this.pageSize
parmes.userId = this.userInfo().userId
postAction('task/todoTaskList', parmes).then((res) => {
this.dataSource = res.list || []
parmes.pageNo = this.pageNo
parmes.pageSize = this.pageSize
// parmes.userId = this.userInfo().userId
getAction('/todoCenter/projectProcess/todoTaskList', parmes).then((res) => {
this.dataSource = res.result.records || []
this.loading = false
})
},
@@ -88,29 +98,138 @@
})
},
prcClick(row) {
// let index = row.taskIds.lastIndexOf(',')
// row.taskIds = row.taskIds.slice(0, index)
let query = {}
row.router = this.$route.path
if (row.prcType == '1') {
if (row.flowType == '1') {
query = {
taskDefinitionKey: row.taskDefinitionKey,
taskIds: row.taskId,
prcType: row.flowType,
prcNum: row.prcNum,
isTrue: true
}
let newUrl = this.$router.resolve({
path: '/handshakeProcess',
query: row
query: query
})
window.open(newUrl.href, '_blank')
} else if (row.prcType == '5') {
} else if (row.flowType == '10') {
let newUrl = this.$router.resolve({
path: '/regulatoryProcessReview',
query: row
path: '/ProjectDetails',
query: {
id: row.projectLibraryId,
projectName: row.projectName,
projectNameId: row.projectNameId,
targetMarket: row.targetMarket,
studioEngineer: row.studioEngineer,
type: '102'
}
})
window.open(newUrl.href, '_blank')
} else if (row.prcType == '6') {
} else if (row.flowType == '2') {
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {
row.taskId = ''
}
query = {
router: row.router,
taskIds: row.taskId,
actiProcInstId: row.actiProcInstId,
projectTaskInventoryId: row.projectLawsInventoryId,
projectLibraryId: row.projectLibraryId,
id: row.projectLibraryId,
studioEngineer: row.studioEngineer,
serialNumber: row.serialNumber,
TaskKey: row.taskDefinitionKey,
isDisplay: true,
flowType: 2,
Sponsor: 'designInitiatorName',
personLiable: 'designDutyName',
typeOfDeliverables: 'designDeliverableTypeName',
deliverableTemplate: 'designDeliverableTemplate',
DueDate: 'designDueDate',
remarks: 'designRemark',
projectName: row.projectName,
targetMarket: row.targetMarket,
projectNameId: row.projectNameId,
primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.personChargeFeedback
}
let newUrl = this.$router.resolve({
path: '/evaluationProcess',
query: row
path: '/taskListProcess',
query: query
})
window.open(newUrl.href, '_blank')
} else if (row.flowType == '3') {
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {
row.taskId = ''
}
query = {
router: row.router,
taskIds: row.taskId,
actiProcInstId: row.actiProcInstId,
projectTaskInventoryId: row.projectLawsInventoryId,
studioEngineer: row.studioEngineer,
projectLibraryId: row.projectLibraryId,
serialNumber: row.serialNumber,
TaskKey: row.taskDefinitionKey,
flowType: 3,
isDisplay: true,
id: row.projectLibraryId,
Sponsor: 'prehomoInitiatorName',
personLiable: 'prehomoDutyName',
typeOfDeliverables: 'prehomoDeliverableTypeName',
deliverableTemplate: 'prehomoDeliverableTemplate',
DueDate: 'prehomoDueDate',
remarks: 'prehomoRemark',
projectName: row.projectName,
targetMarket: row.targetMarket,
projectNameId: row.projectNameId,
primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.personChargeFeedback
}
let newUrl = this.$router.resolve({
path: '/taskListProcess',
query: query
})
window.open(newUrl.href, '_blank')
} else if (row.flowType == '4') {
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {
row.taskId = ''
}
query = {
router: row.router,
taskIds: row.taskId,
actiProcInstId: row.actiProcInstId,
id: row.projectLibraryId,
projectLibraryId: row.projectLibraryId,
studioEngineer: row.studioEngineer,
serialNumber: row.serialNumber,
projectTaskInventoryId: row.projectLawsInventoryId,
TaskKey: row.taskDefinitionKey,
flowType: 4,
isDisplay: true,
Sponsor: 'verifyInitiatorName',
personLiable: 'verifyDutyName',
typeOfDeliverables: 'verifyDeliverableTypeName',
deliverableTemplate: 'verifyDeliverableTemplate',
DueDate: 'verifyDueDate',
remarks: 'verifyRemark',
projectName: row.projectName,
targetMarket: row.targetMarket,
projectNameId: row.projectNameId,
primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.personChargeFeedback
}
let newUrl = this.$router.resolve({
path: '/taskListProcess',
query: query
})
window.open(newUrl.href, '_blank')
}
}
},
}
}
</script>
@@ -167,6 +286,7 @@
text-overflow: ellipsis;
white-space: nowrap;
}
/*.top-admin {*/
/* font-size: 16px;*/
/* font-family: Blue Sky Noto;*/
jero-web/src/views/dashboard/components/myNews.vue
+7 -4
View File
@@ -11,8 +11,8 @@
<div class="myNews-box-content-box" v-for="(item,index) in dataSource" :key="index" @click="magClick(item)">
<img src="../../../assets/wdxx.png" alt="">
<div class="content-box">
<div class="top" :title="item.titile">
{{item.titile}}
<div class="top" :title="item.msgContent">
{{item.msgContent}}
</div>
<div class="botton">
{{item.sendTime}}
@@ -69,9 +69,12 @@
magClick(row) {
getAction(this.url.readAllMsg, { ids: row.id }).then((res) => {
})
localStorage.setItem('msgContent', row.msgContent)
this.$router.push({
path: '/system/MessageDetails',
query: row
path: '/isps/userAnnouncement',
query: {
Date: Date.now()
}
})
},
moreClick() {
jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
+1 -1
View File
@@ -266,7 +266,7 @@
form: {},
rules: {
name: [
{ required: true, message: this.$t('PleaseEnter') + this.$t('clauseNo'), trigger: 'blur' },
// { required: true, message: this.$t('PleaseEnter') + this.$t('clauseNo'), trigger: 'blur' },
{ min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' }
],
itemName: [
jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue
+11 -4
View File
@@ -60,7 +60,9 @@
<span style="cursor: pointer"
@click="fileClick(resultData.fileNameRight,resultData.fileIdRight)">{{resultData.fileNameRight}}</span>
</div>
<div class="detail-content-header-content-rightOne" :title="$t('comparisonDifferenceComment')">
<div class="detail-content-header-content-rightOne"
:class="{'detail-content-header-content-rightOne-active':isDisplay}"
:title="$t('comparisonDifferenceComment')">
{{$t('comparisonDifferenceComment')}}
</div>
<div class="detail-content-header-content-right" v-if="!isDisplay">
@@ -567,6 +569,10 @@
white-space: nowrap;
}
.detail-content-header-content-rightOne-active {
border-right: none;
}
.detail-content-header-content-right {
width: 128px;
display: inline-block;
@@ -751,7 +757,7 @@
}
.detail-content-header-content-left-active {
width: 50% !important;
width: calc(50% - 130px) !important;
}
.detail-content-bottom-left-text {
@@ -761,7 +767,8 @@
.detail-content-bottom-right-text {
width: calc(50% - 256px);
}
.operator-text-text-text{
color: #00B3BE!important;
.operator-text-text-text {
color: #00B3BE !important;
}
</style>
jero-web/src/views/processCenter/ProcessMapping.vue
+1 -1
View File
@@ -16,7 +16,7 @@
data() {
return {
name: '',
actUrl: 'http://10.0.1.13:17210/bat-wkflow/modeler.html?modelId='//本地
actUrl: 'http://localhost:17210/bat-wkflow/modeler.html?modelId='//本地
// actUrl: 'http://10.255.35.25:8082/modeler.html?modelId=' //正式
// actUrl: 'http://10.255.128.148:8888/modeler.html?modelId=' //测试
}
jero-web/src/views/processCenter/components/evaluatorFeedback.vue
+37 -8
View File
@@ -15,7 +15,15 @@
<span class="title-text-text" :title="$t('complianceResults')">{{$t('complianceResults')}}</span>
</div>
<div class="title-text-right" v-if="disabled">
{{formInline.complianceResult == 'Compliance'?$t('accord'):$t('nonConformity')}}
<span v-if="formInline.complianceResult == 'Compliance'">
{{$t('accord')}}
</span>
<span v-else-if="formInline.complianceResult == 'Non-Compliance'">
{{$t('nonConformity')}}
</span>
<span v-else>
--
</span>
</div>
<a-form-model-item class="itemModel" v-if="!disabled" :prop="!disabled?'complianceResult':''">
<a-radio-group style="margin-top: 2px" class="box-input"
@@ -51,7 +59,7 @@
<span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
</div>
<div class="title-text-right" :title="item.relatedSection" v-if="disabled">
{{item.relatedSection}}
{{item.relatedSection ?item.relatedSection : '--'}}
</div>
<a-form-model-item class="itemModel" v-if="!disabled"
:prop="'dataList.'+index+'.relatedSection'"
@@ -73,7 +81,7 @@
:title="$t('problemDescription')">{{$t('problemDescription')}}</span>
</div>
<div class="title-text-right" :title="item.issueOrSuggest" v-if="disabled">
{{item.issueOrSuggest}}
{{item.issueOrSuggest ? item.issueOrSuggest :'--'}}
</div>
<a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'" v-if="!disabled"
:rules="[{ required: true, message: $t('problemDescription') + $t('cannotEmpty'), trigger: 'blur'},
@@ -121,7 +129,7 @@
<span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
</div>
<div class="title-text-right" :class="{'title-text-right-text':disabled}" :title="item.relatedSection">
{{item.relatedSection}}
{{item.relatedSection?item.relatedSection : '--'}}
</div>
</div>
</a-col>
@@ -132,7 +140,7 @@
:title="$t('problemDescription')">{{$t('problemDescription')}}</span>
</div>
<div class="title-text-right" :class="{'title-text-right-text':disabled}" :title="item.issueOrSuggest">
{{item.issueOrSuggest}}
{{item.issueOrSuggest ? item.issueOrSuggest:'--'}}
</div>
</div>
</a-col>
@@ -156,12 +164,13 @@
</a-col>
</a-row>
</div>
<div class="box-text" style="margin-top: 10px" v-if="disabled">
<div class="box-text" style="margin-top: 10px"
v-if="disabled && $route.query.taskDefinitionKey == 'fqrsc' && !isTrue">
<div class="header-text">
{{$t('sponsorReview')}}
</div>
</div>
<a-row :gutter="24" v-if="disabled">
<a-row :gutter="24" v-if="disabled && $route.query.taskDefinitionKey == 'fqrsc' && !isTrue">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
@@ -175,6 +184,18 @@
</div>
</a-col>
</a-row>
<!-- <a-row :gutter="24" v-if="disabled && $route.query.taskDefinitionKey == 'fqrsc' && isTrue">-->
<!-- <a-col :span="24">-->
<!-- <div class="box-title-text">-->
<!-- <div class="title-text">-->
<!-- <span class="title-text-text" :title="$t('reviewComments')">{{$t('reviewComments')}}</span>-->
<!-- </div>-->
<!-- <div class="title-text-right" :class="{'title-text-right-text':disabled}" :title="formInline.approvalOpinion">-->
<!-- {{formInline.approvalOpinion}}-->
<!-- </div>-->
<!-- </div>-->
<!-- </a-col>-->
<!-- </a-row>-->
</a-form-model>
</div>
<uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
@@ -259,7 +280,8 @@
},
disabled: false,
uploadIndex: '',
dataList: []
dataList: [],
isTrue: false
}
},
mounted() {
@@ -283,8 +305,14 @@
})
if (this.$route.query.taskDefinitionKey == 'pgrqr') {
this.disabled = false
if (this.$route.query.isDisabled) {
this.disabled = JSON.parse(this.$route.query.isDisabled)
}
} else {
this.disabled = true
if (this.$route.query.isDisabled) {
this.isTrue = JSON.parse(this.$route.query.isDisabled)
}
}
},
methods: {
@@ -443,4 +471,5 @@
white-space: normal;
word-break: break-all;
}
</style>
jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
+97 -8
View File
@@ -74,7 +74,9 @@
<span v-else>--</span>
</span>
<span slot="Results" slot-scope="text,result">
{{text == 'Compliance' ? $t('accord'):$t('nonConformity')}}
<span v-if="text == 'Compliance'">{{$t('accord')}}</span>
<span v-else-if="text == 'Non-Compliance'">{{$t('nonConformity')}}</span>
<span v-else>--</span>
</span>
<span slot="sponsorFeedback" slot-scope="text,result">
<a-textarea :placeholder="$t('pleaseEnter')+$t('sponsorFeedback')"
@@ -282,6 +284,81 @@
ellipsis: true,
scopedSlots: { customRender: 'sponsorFeedback' }
}
],
columnsOne: [
{
title: this.$t('clauseNo'),
dataIndex: 'itemNum',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('clauseName'),
dataIndex: 'itemName',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('clauseContent'),
dataIndex: 'itemContent',
align: 'center',
width: 280,
scopedSlots: { customRender: 'clauseContent' }
},
{
title: this.$t('evaluationMethod'),
dataIndex: 'evaluationMethodsName',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('complianceResults'),
dataIndex: 'complianceResult',
align: 'center',
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'Results' }
},
{
title: this.$t('nameTechnicalDocument'),
dataIndex: 'technicalFileName',
align: 'center',
width: 280,
ellipsis: true
},
{
title: this.$t('chapter'),
dataIndex: 'section',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('opinion'),
dataIndex: 'opinion',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('enclosure'),
dataIndex: 'accessoryFile',
align: 'center',
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'accessoryFile' }
},
{
title: this.$t('sponsorFeedback'),
dataIndex: 'sponsorFeedback',
align: 'center',
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'sponsorFeedbackIndex' }
}
]
}
},
@@ -296,7 +373,11 @@
antTableHeader[0].style = 'margin-bottom: -8px;padding-bottom: 0px;min-width: 8px;overflow: hidden'
})
}
if (this.$route.query.taskDefinitionKey != 'pgrqr') {
let disabled = false
if (this.$route.query.isDisabled) {
disabled = JSON.parse(this.$route.query.isDisabled)
}
if (this.$route.query.taskDefinitionKey != 'pgrqr' && !disabled) {
this.dataSource.forEach(res => {
res.sponsorFeedback = ''
})
@@ -306,10 +387,18 @@
},
computed: {
columns() {
if (this.$route.query.taskDefinitionKey == 'pgrqr') {
return this.columnsTwo
let disabled = false
if (this.$route.query.isDisabled) {
disabled = JSON.parse(this.$route.query.isDisabled)
}
if (disabled) {
return this.columnsOne
} else {
return this.columnsThree
if (this.$route.query.taskDefinitionKey == 'pgrqr') {
return this.columnsTwo
} else {
return this.columnsThree
}
}
}
},
@@ -345,14 +434,14 @@
this.$message.warning(this.$t('PleaseCompleteList'))
return
}
Object.keys(this.dataSource[i]).forEach(res=>{
Object.keys(this.dataSource[i]).forEach(res => {
if (this.dataSource[i][res] && typeof this.dataSource[i][res] == 'string') {
this.dataSource[i][res] = this.dataSource[i][res].replace(/\"/g, '“')
this.dataSource[i][res] = this.dataSource[i][res].replace(/\'/g, '‘')
}
})
}
if (this.$route.query.taskDefinitionKey == 'pgrqr'){
if (this.$route.query.taskDefinitionKey == 'pgrqr') {
let feedbackTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
for (let i = 0; i < this.dataSource.length; i++) {
this.dataSource[i].feedbackTime = feedbackTime
@@ -361,7 +450,7 @@
callBack && callBack(this.dataSource)
},
preservationData(callBack) {
if (this.$route.query.taskDefinitionKey == 'pgrqr'){
if (this.$route.query.taskDefinitionKey == 'pgrqr') {
let feedbackTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
for (let i = 0; i < this.dataSource.length; i++) {
this.dataSource[i].feedbackTime = feedbackTime
jero-web/src/views/processCenter/components/feedbackInformation.vue
+16 -6
View File
@@ -12,18 +12,18 @@
{{$t('feedbackPoint')+(index+1)}}
<a-icon class="icon-size"
@click="addData"
v-if="(formInline.dataList.length-1) == index"
v-if="(formInline.dataList.length-1) == index && !disabled"
type="plus-circle"/>
<a-icon class="icon-size"
@click="deleteData"
v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index"
v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index && !disabled"
type="minus-circle"/>
</div>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="Required" v-if="!disabled">*</span>
<span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
</div>
<a-form-model-item class="itemModel"
@@ -33,6 +33,7 @@
}]">
<a-textarea :placeholder="$t('PleaseEnter')+$t('relevantSections')"
:disabled="disabled"
:title="item.relatedSection"
v-model="item.relatedSection" :rows="4"/>
<!-- <a-input class="box-input"-->
<!-- :disabled="disabled"-->
@@ -53,6 +54,7 @@
}]">
<a-textarea :placeholder="$t('PleaseEnter')+$t('clauseContent')"
:disabled="disabled"
:title="item.clauseContent"
v-model="item.clauseContent" :rows="4"/>
</a-form-model-item>
</div>
@@ -62,7 +64,7 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="Required" v-if="!disabled">*</span>
<span class="title-text-text"
:title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
</div>
@@ -72,6 +74,7 @@
}]">
<a-textarea :placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"
:disabled="disabled"
:title="item.issueOrSuggest"
v-model="item.issueOrSuggest" :rows="4"/>
</a-form-model-item>
</div>
@@ -79,7 +82,7 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="Required" v-if="!disabled">*</span>
<span class="title-text-text" :title="$t('reason')">{{$t('reason')}}</span>
</div>
<a-form-model-item class="itemModel"
@@ -89,6 +92,7 @@
{max: 300,message: $t('reason') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
}]">
<a-textarea :placeholder="$t('PleaseEnter')+$t('reason')"
:title="item.reason"
:disabled="disabled"
v-model="item.reason" :rows="4"/>
</a-form-model-item>
@@ -112,6 +116,7 @@
</div>
</a-col>
</a-row>
</div>
</a-form-model>
</div>
@@ -166,7 +171,9 @@
}
this.formInline = { ...this.formInline }
})
if (this.$route.query.isDisabled) {
this.disabled = JSON.parse(this.$route.query.isDisabled)
}
},
methods: {
clickButtonToUpload(item, index) {
@@ -301,4 +308,7 @@
margin-left: 8px;
cursor: pointer;
}
::v-deep .ant-input-disabled{
color: #000F16;
}
</style>
jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+16 -3
View File
@@ -72,7 +72,7 @@
</a-col>
</a-row>
<a-row :gutter="24" v-if="$route.query.TaskKey == 'dreDispose'">
<a-col :span="12">
<a-col :span="12" v-if="$route.query.isDisplay">
<div class="box-title-text">
<div class="title-text-fq">
<span class="Required" v-if="$route.query.isDisplay">*</span>
@@ -88,16 +88,29 @@
</a-form-model-item>
</div>
</a-col>
<a-col :span="24" v-else>
<div class="box-title-text">
<div class="title-text-fq">
<span class="title-text-text"
:title="$t('feedbackFromTheEngineer')">{{$t('feedbackFromTheEngineer')}}</span>
</div>
<a-form-model-item class="itemModel">
<span class="text-header">
{{formInline.engineerFeedbackContent}}
</span>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24" v-if="$route.query.TaskKey == 'dreDispose'">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text-fq">
<!-- <span class="Required" v-if="this.$route.query.isDisplay">*</span>-->
<!-- <span class="Required" v-if="this.$route.query.isDisplay">*</span>-->
<span class="title-text-text"
:title="$t('Deliverables')">{{$t('Deliverables')}}</span>
</div>
<!-- :prop="!this.$route.query.isDisplay?'':'fileId'"-->
<!-- :prop="!this.$route.query.isDisplay?'':'fileId'"-->
<a-form-model-item class="itemModel">
<a-button type="primary" class="button-text"
@click="clickButtonToUpload('fileId')">
jero-web/src/views/processCenter/components/taskCirculationHistory.vue
+1 -1
View File
@@ -80,7 +80,7 @@
methods: {
getList() {
let query = {
actiProcInstId: this.$route.query.actiProcInstId
actiProcInstId: this.$route.query.actiProcInstId || this.$route.query.prcId
}
this.loading = true
getAction('/wkflow/processHistoryEO/list', query).then((res) => {
jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+5 -1
View File
@@ -26,7 +26,7 @@
:title="$t('evaluatorFeedback')"
/>
<footerProcess
v-if="isDisplay"
v-if="isDisplay && !disabled"
:isPreservation="isPreservation"
:isSubmit="true"
:isSendBack="isSendBack"
@@ -78,6 +78,7 @@
isPreservation: false,
isSendBack: false,
isTrue: false,
disabled:false,
standardContentList: [],
standardContent: [
{
@@ -155,6 +156,9 @@
this.isSendBack = true
}
this.queryTaskDetailByTask()
if (this.$route.query.isDisabled) {
this.disabled = JSON.parse(this.$route.query.isDisabled)
}
},
methods: {
...mapGetters(['userInfo']),
jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+9 -4
View File
@@ -28,7 +28,7 @@
"/>
<examineInformation
:isFlag="isFlag"
v-if="isDisplay"
v-if="isDisplay && isTrue"
isApprovalOpinion
:title="titleName"
:isSendBack="isSendBackOne"
@@ -37,6 +37,7 @@
<!-- @terminationProcess="terminationProcess"-->
<footerProcess
is-submit
v-if="isTrue"
:isSendBack="isSendBack"
@submit="submit"
@sendBack="sendBack"
@@ -116,7 +117,8 @@
queryProject: {},
loading: false,
titleName: '',
textLoading: this.$t('dataLoading')
textLoading: this.$t('dataLoading'),
isTrue: false
}
},
created() {
@@ -130,6 +132,9 @@
} else {
this.titleName = this.$t('taskConfirmationResponsiblePerson')
}
if (this.$route.query.isTrue) {
this.isTrue = JSON.parse(this.$route.query.isTrue)
}
this.queryTaskDetailByTask(function() {
_this.queryProjectLawsInventoryInfo()
})
@@ -181,10 +186,10 @@
this.loading = true
getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
if (res instanceof String) {
this.queryBy = JSON.parse(res)
this.queryBy = JSON.parse(res) || {}
callback()
} else {
this.queryBy = res
this.queryBy = res || {}
callback()
}
})
jero-web/src/views/processCenter/processForm/processDetails/index.vue
+4 -1
View File
@@ -15,6 +15,7 @@
</div>
<regulatoryCirculationHistory :isTrue="isTrue"
v-if="$route.query.prcType == '5' || $route.query.prcType == '6'"/>
<taskCirculationHistory v-else-if="$route.query.prcType == '2' || $route.query.prcType == '3' || $route.query.prcType == '4'"/>
<circulationHistory v-else/>
</div>
</template>
@@ -22,6 +23,7 @@
<script>
import circulationHistory from '../../components/circulationHistory'
import regulatoryCirculationHistory from '../../components/regulatoryCirculationHistory'
import taskCirculationHistory from '../../components/taskCirculationHistory'
import axios from 'axios'
import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types'
@@ -30,7 +32,8 @@
name: 'processDetails',
components: {
circulationHistory,
regulatoryCirculationHistory
regulatoryCirculationHistory,
taskCirculationHistory
},
data() {
return {
jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+12 -2
View File
@@ -19,7 +19,7 @@
:title="$t('feedbackInformation')"
/>
<footerProcess
v-if="isDisplay"
v-if="isDisplay && !disabled"
isPreservation
:isSubmit="true"
@preservation="preservation"
@@ -61,6 +61,7 @@
},
loading: false,
isDisplay: true,
disabled: false,
feedbackDataList: [],
queryProject: {},
standardContentList: [
@@ -101,6 +102,9 @@
},
mounted() {
this.isDisplay = false
if (this.$route.query.isDisabled) {
this.disabled = JSON.parse(this.$route.query.isDisabled)
}
this.queryTaskDetailByTask(() => {
this.lawsOpinionAssessmentResult()
})
@@ -120,10 +124,16 @@
})
},
lawsOpinionAssessmentResult() {
let createBy = ''
if (this.$route.query.taskDefinitionKey == 'gcsfq' && this.disabled){
createBy = ''
}else{
createBy = this.userInfo().username
}
getAction(this.url.list, {
lawsOpinionGatherId: this.queryProject.id,
actiProcInstId: this.$route.query.prcId,
createBy: this.userInfo().username
createBy: createBy
}).then((res) => {
if (res.success) {
this.feedbackDataList = res.result || []
jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+28 -17
View File
@@ -324,14 +324,19 @@
putAction(this.url.dreSubmit, query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.$router.push({
path: '/ProjectDetails',
query: {
type: '103',
...this.$route.query
}
})
if (this.$route.query.router) {
this.$router.push({
path: '/projectRegulationTasks'
})
} else {
this.$router.push({
path: '/ProjectDetails',
query: {
type: '103',
...this.$route.query
}
})
}
// setTimeout(() => {
// this.loading = false
// window.close()
@@ -375,13 +380,19 @@
if (res.success) {
setTimeout(() => {
this.loading = false
this.$router.push({
path: '/ProjectDetails',
query: {
type: '103',
...this.$route.query
}
})
if (this.$route.query.router) {
this.$router.push({
path: '/projectRegulationTasks'
})
} else {
this.$router.push({
path: '/ProjectDetails',
query: {
type: '103',
...this.$route.query
}
})
}
}, 1000)
}
})
@@ -390,10 +401,10 @@
this.loading = true
getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
if (res instanceof String) {
this.queryBy = JSON.parse(res)
this.queryBy = JSON.parse(res) || {}
callback()
} else {
this.queryBy = res
this.queryBy = res || {}
callback()
}
})
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+59 -29
View File
@@ -684,6 +684,10 @@
// }
},
mounted() {
console.log(this.$route.query)
if(this.$route.query.type == '1'){
this.handleOkRoleSwitching()
}
this.GetgetLoginUserType()
console.log(this.currentPersonRole)
setTimeout(() => {
@@ -718,36 +722,62 @@
})
},
handleOkRoleSwitching() {
this.$refs.ruleFormRoleSwitching.validate(valid => {
if (valid) {
let query = {
userType: this.formInlineRoleSwitching.roleSwitchingCode,
paramsManifestId: this.$route.query.id,
projectId: this.$route.query.projectId,
userId: this.userInfo().id
}
this.confirmLoadingRoleSwitching = true
postAction('/params/userTypeLog/edit', query).then((res) => {
if (res.success) {
this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode
this.$message.success(this.$t('OperationSuccessful'))
this.$refs.CollectionTabel.getHeader(this.currentPersonRole)
this.visibleRoleSwitching = false
this.confirmLoadingRoleSwitching = false
localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode))
this.RoleType.forEach((item,index) => {
if(item.value == this.currentPersonRole){
this.rolename = item.label
}
})
this.selectedRowKeysValue = []
} else {
this.confirmLoadingRoleSwitching = false
this.$message.warning(this.$t('operationFailed'))
}
})
if(this.$route.query.type == '1'){
let query = {
userType:this.$route.query.userType,
paramsManifestId: this.$route.query.id,
projectId: this.$route.query.projectId,
userId: this.userInfo().id
}
})
this.confirmLoadingRoleSwitching = true
postAction('/params/userTypeLog/edit', query).then((res) => {
if (res.success) {
this.currentPersonRole = this.$route.query.userType
this.visibleRoleSwitching = false
this.confirmLoadingRoleSwitching = false
localStorage.setItem('currentPersonRole', JSON.stringify(this.$route.query.userType))
this.RoleType.forEach((item,index) => {
if(item.value == this.currentPersonRole){
this.rolename = item.label
}
})
this.selectedRowKeysValue = []
} else {
this.confirmLoadingRoleSwitching = false
this.$message.warning(this.$t('operationFailed'))
}
})
}else {
this.$refs.ruleFormRoleSwitching.validate(valid => {
if (valid) {
let query = {
userType: this.formInlineRoleSwitching.roleSwitchingCode,
paramsManifestId: this.$route.query.id,
projectId: this.$route.query.projectId,
userId: this.userInfo().id
}
this.confirmLoadingRoleSwitching = true
postAction('/params/userTypeLog/edit', query).then((res) => {
if (res.success) {
this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode
this.$message.success(this.$t('OperationSuccessful'))
this.visibleRoleSwitching = false
this.confirmLoadingRoleSwitching = false
localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode))
this.RoleType.forEach((item,index) => {
if(item.value == this.currentPersonRole){
this.rolename = item.label
}
})
this.selectedRowKeysValue = []
} else {
this.confirmLoadingRoleSwitching = false
this.$message.warning(this.$t('operationFailed'))
}
})
}
})
}
},
roleSwitchingClick() {
this.visibleRoleSwitching = true
jero-web/src/views/system/PermissionList.vue
+11 -1
View File
@@ -56,7 +56,7 @@
<a href="javascript:;" @click="handleDataRule(record)">{{$t('DataRules')}}</a>
</a-menu-item>
<a-menu-item>
<a-menu-item v-if="isTrue(record)">
<a-popconfirm :title="$t('areYouSure')" @confirm="() => handleDelete(record.id)">
<a>{{$t('delete')}}</a>
</a-popconfirm>
@@ -187,6 +187,16 @@
}
},
methods: {
isTrue(record) {
if (record.id == '1580735287309119489' ||
record.id == '1580735611793059842' ||
record.id == '1580735965892980738' ||
record.id == '1580734309507805185' ||
record.id == '1580762600394469378') {
return false
}
return true
},
loadData() {
this.dataSource = []
getPermissionList().then((res) => {
jero-web/src/views/system/UserAnnouncementList.vue
+91 -26
View File
@@ -6,12 +6,12 @@
<a-row :gutter="24">
<a-col :md="6" :sm="8" style="line-height: 48px">
<div class="box-title-text">
<div class="title-text" :title="$t('MessageTitle')">
<span>{{this.$t('MessageTitle')}}</span>
<div class="title-text" :title="$t('MessageContent')">
<span>{{this.$t('MessageContent')}}</span>
</div>
<a-input class="box-input"
:placeholder="$t('pleaseEnter')+$t('MessageTitle')"
v-model="queryParam.titile">
:placeholder="$t('pleaseEnter')+$t('MessageContent')"
v-model="queryParam.msgContent">
</a-input>
</div>
</a-col>
@@ -63,18 +63,28 @@
:dataSource="dataSource"
:scroll="{x: '100%'}"
:pagination="ipagination"
:expandIconAsCell='false'
:expandIconColumnIndex="5"
:expandIcon="expandIcon"
:loading="loading"
@expand="expandChange"
@change="handleTableChange">
<span slot="msgTitile" slot-scope="text,scope">
<a :style="{'color':scope.readFlag == 0 ? 'red':'#00A0E9'}" :title="text" @click="msgContentClick(scope)">
<!-- @click="msgContentClick(scope)"-->
<a :style="{'color':scope.readFlag == 0 ? 'red':'#00A0E9'}" :title="text">
{{text}}
</a>
</span>
<span slot="msgCategory" slot-scope="text,scope">
<a :style="{'color':scope.readFlag == 0 ? 'red':'#00A0E9'}" @click="msgContentClick(scope)">
<!-- :style="{'color':scope.readFlag == 0 ? 'red':'#00A0E9'}" @click="msgContentClick(scope)"-->
<span :title="msgCategoryQuery[text]">
{{msgCategoryQuery[text]}}
</a>
</span>
</span>
<p slot="expandedRowRender" slot-scope="record" style="margin: 0;padding-left: 58px;">
<span v-html="record.msgContentInfo">
</span>
</p>
</a-table>
<show-announcement ref="ShowAnnouncement"></show-announcement>
<dynamic-notice ref="showDynamNotice" :path="openPath" :formData="formData"/>
@@ -104,8 +114,8 @@
msgCategoryQuery: {
'1': this.$t('SubscriptionNotification'),
'2': this.$t('warningInformation'),
'3': this.$t('ForwardPush'),
'4': this.$t('CollectinguthenticationParameters'),
'3': this.$t('ForwardPush')
// '4': this.$t('CollectinguthenticationParameters'),
// '6':this.$t('RegulationListConfirmationTask'),
// '7':this.$t('RegulationListConfirmationNotification'),
// '8':this.$t('RegulationTaskConfirmation'),
@@ -115,39 +125,48 @@
// '12':this.$t('DesignComplianceNotification'),
// '13':this.$t('PreHomoNotification'),
// '14':this.$t('ValidationComplianceNotification'),
'15':this.$t('RegulationTaskConfirmationNotification'),
'17':this.$t('listConfirmation'),
'18':this.$t('taskAffirm'),
'19':this.$t('complianceConfirmation'),
'20':this.$t('collectionLegislativeComments'),
'21':this.$t('regulatoryAndTechnicalAssessment'),
// '15':this.$t('RegulationTaskConfirmationNotification'),
// '17':this.$t('listConfirmation'),
// '18':this.$t('taskAffirm'),
// '19':this.$t('complianceConfirmation'),
// '20':this.$t('collectionLegislativeComments'),
// '21':this.$t('regulatoryAndTechnicalAssessment'),
},
columns: [
{
title: this.$t('MessageTitle'),
align: 'center',
dataIndex: 'titile',
title: this.$t('MessageContent'),
align: 'left',
dataIndex: 'msgContent',
ellipsis: true,
scopedSlots: { customRender: 'msgTitile' }
},
{
title: this.$t('Sponsor'),
align: 'center',
align: 'left',
ellipsis: true,
dataIndex: 'initiator',
width: 200,
width: 200
},
{
title: this.$t('MessageType'),
align: 'center',
align: 'left',
ellipsis: true,
dataIndex: 'msgCategory',
width: 200,
scopedSlots: { customRender: 'msgCategory' }
},
{
title: this.$t('NotificationTime'),
align: 'center',
align: 'left',
ellipsis: true,
width: 200,
dataIndex: 'sendTime'
},
{
title:'',
align: 'left',
ellipsis: true,
width: 50,
}
],
url: {
@@ -161,7 +180,42 @@
formData: ''
}
},
watch: {
$route: function(res) {
console.log(res)
this.loadData()
}
},
methods: {
expandIcon(props) {
if (props.expanded) {
return <a-icon type='down' onClick={e => {
props.onExpand(props.record, e);
}}/>;
} else {
return <a-icon type='right' onClick={e => {
props.onExpand(props.record, e);
}}/>;
}
},
getQueryParams() {
//获取查询条件
let sqp = {}
if (this.superQueryParams) {
sqp['superQueryParams'] = encodeURI(this.superQueryParams)
sqp['superQueryMatchType'] = this.superQueryMatchType
}
if (localStorage.getItem('msgContent')) {
this.queryParam.msgContent = localStorage.getItem('msgContent')
this.queryParam = { ...this.queryParam }
localStorage.removeItem('msgContent')
}
var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters)
param.field = this.getQueryField()
param.pageNo = this.ipagination.current
param.pageSize = this.ipagination.pageSize
return filterObj(param)
},
showAnnouncement(record) {
putAction(this.url.editCementSend, { anntId: record.anntId }).then((res) => {
if (res.success) {
@@ -177,6 +231,13 @@
this.$refs.ShowAnnouncement.detail(record)
}
},
expandChange(isTrue, val) {
if (isTrue) {
if (val.readFlag == '0') {
this.msgContentClick(val)
}
}
},
readAll() {
var that = this
if (this.selectedRowKeys.length > 0) {
@@ -204,11 +265,12 @@
},
msgContentClick(row) {
getAction(this.url.readAllMsg, { ids: row.id }).then((res) => {
// this.loadData()
})
this.$router.push({
path: '/system/MessageDetails',
query: row
})
// this.$router.push({
// path: '/system/MessageDetails',
// query: row
// })
},
handleDel() {
var that = this
@@ -297,6 +359,9 @@
height: 38px;
/*margin-top: 2px;*/
}
::v-deep .ant-table .ant-table-row-indent + .ant-table-row-expand-icon{
margin-right: 0;
}
</style>
<style>
.box-input .ant-select-selection {
jero-web/src/views/toDoCenter/projectParameterTasks/index.vue
+308
View File
@@ -0,0 +1,308 @@
<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">
<div class="title-text" :title="$t('RelatedItems')">
<span>{{$t('RelatedItems')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('RelatedItems')"
v-model.trim="queryParam.projectName"></a-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('ListTitle')">
<span>{{$t('ListTitle')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ListTitle')"
v-model.trim="queryParam.title"></a-input>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
</a-col>
</span>
</a-row>
</a-form>
</div>
<div>
<a-table
ref="table"
size="middle"
:loading="loading"
:pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 140px)'}"
rowKey="id"
:data-source="dataSource"
:columns="columns"
>
<!-- -->
<span slot="projectVersion" slot-scope="text,record">
<span class="text-operation">{{text ? text:'--'}}</span>
</span>
<span slot="waitFillNumoperation" slot-scope="text,record">
<a class="text-operation" v-if='text'
@click="waitFillClick(record)">{{text}}</a>
<span class="text-operation" v-else >{{'--'}}</span>
</span>
<span slot="waitSdtNumoperation" slot-scope="text,record">
<a class="text-operation" v-if='text'
@click="waitSdtClick(record)">{{text}}</a>
<span class="text-operation" v-else >{{'--'}}</span>
</span>
<span slot="waitCollectNumoperation" slot-scope="text,record">
<a class="text-operation" v-if='text'
@click="waitCollectClick(record)">{{text}}</a>
<span class="text-operation" v-else >{{'--'}}</span>
</span>
</a-table>
<div class="page" v-if="dataSource.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="pageOnChange"
@showSizeChange="SizeChange"
/>
</div>
</div>
</a-card>
</template>
<script>
import { getAction, postAction, deleteAction } from '@/api/manage'
export default {
name: 'index',
components: {},
data() {
return {
queryParam: {},
taskTypeList: [],
taskStatusList: [],
dataSource: [],
selectedRowKeys: [],
pageSize: 10,
pageNo: 1,
total: 0,
loading: false,
url:{
list:'',
},
columns: [
{
title: this.$t('RelatedItems'),
align: 'center',
dataIndex: 'projectName',
ellipsis: true,
width: 170
},
{
title: this.$t('ListTitle'),
align: 'center',
dataIndex: 'title',
ellipsis: true,
width: 170
},
{
title: this.$t('relatedVersion'),
align: 'center',
dataIndex: 'projectVersion',
ellipsis: true,
width: 170,
scopedSlots: { customRender: 'projectVersion' }
},
{
title: this.$t('completednum'),
align: 'center',
dataIndex: 'waitFillNum',
ellipsis: true,
width: 170,
scopedSlots: { customRender: 'waitFillNumoperation' }
},
{
title: this.$t('filledBynum'),
align: 'center',
dataIndex: 'waitSdtNum',
ellipsis: true,
width: 170,
scopedSlots: { customRender: 'waitSdtNumoperation' }
},
{
title: this.$t('parameterToBeInitiatednum'),
align: 'center',
dataIndex: 'waitCollectNum',
ellipsis: true,
width: 170,
scopedSlots: { customRender: 'waitCollectNumoperation' }
}
]
}
},
mounted() {
this.getList()
},
methods: {
searchQuery() {
this.pageNo = 1
this.getList()
},
searchReset() {
this.pageNo = 1
this.queryParam = {}
this.getList()
},
pageOnChange(page) {
this.pageNo = page
this.getList()
},
//待填写数量
waitFillClick(item) {
let _this = this
item.type = '1'
item.userType = 'dre'
console.log(item)
let newUrl = _this.$router.resolve({
path: '/ParameterItemCollection',
query: item
// projectName:this.$route.query.projectName
})
window.open(newUrl.href, '_blank')
},
//待分配填写人数量
waitSdtClick(item) {
let _this = this
item.type = '1'
item.userType = 'sdt'
console.log(item)
let newUrl = _this.$router.resolve({
path: '/ParameterItemCollection',
query: item
// projectName:this.$route.query.projectName
})
window.open(newUrl.href, '_blank')
},
//参数待发起数量
waitCollectClick(item) {
let _this = this
item.type = '1'
item.userType = 'homo'
console.log(item)
let newUrl = _this.$router.resolve({
path: '/ParameterItemCollection',
query: item
// projectName:this.$route.query.projectName
})
window.open(newUrl.href, '_blank')
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
},
getList() {
let queryParam = JSON.parse(JSON.stringify(this.queryParam))
Object.keys(queryParam).forEach(val => {
if (queryParam[val] instanceof Array) {
queryParam[val] = queryParam[val].join(',')
}
})
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
...queryParam
}
this.loading = true
getAction('todoCenter/params/manifest/page', 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>
<style scoped lang="less">
@import '~@assets/less/common.less';
.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;
/*margin-top: 2px;*/
}
.text-operation {
margin-right: 8px;
}
.itemModel {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
}
.Required {
color: red;
margin-right: 4px;
}
::v-deep .ant-table-row:first-child {
background: #fff !important;
opacity: 0.9;
}
::v-deep .ant-table-body {
background: transparent !important;
}
.page {
text-align: right;
margin-top: 20px;
}
</style>
jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+354
View File
@@ -0,0 +1,354 @@
<template>
<div class="box">
<a-table
ref="table"
size="middle"
:loading="loading"
:pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 140px)'}"
rowKey="id"
:data-source="dataSource"
:columns="columns"
>
<!-- -->
<span slot="operation" slot-scope="text,record">
<a class="text-operation" v-if="record.flowType != '10'"
@click="monitoringProcessClick(record)">{{$t('monitoringProcess')}}</a>
<a class="text-operation"
@click="viewClick(record)">{{$t('view')}}</a>
</span>
<span slot="RelatedItems" slot-scope="text,record">
<a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
</span>
<span slot="standardInformation" slot-scope="text,record">
<a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
{{text}}
</a>
<span v-else>--</span>
</span>
</a-table>
<div class="page" v-if="dataSource && dataSource.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="pageOnChange"
@showSizeChange="SizeChange"
/>
</div>
</div>
</template>
<script>
import { getAction, postAction, deleteAction } from '@/api/manage'
export default {
name: 'SentList',
data() {
return {
dataSource: [],
loading: false,
columns: [
{
title: this.$t('RelatedItems'),
align: 'center',
dataIndex: 'projectName',
scopedSlots: { customRender: 'RelatedItems' },
ellipsis: true,
width: 170
},
{
title: this.$t('standardInformation'),
align: 'center',
dataIndex: 'standardInfo',
scopedSlots: { customRender: 'standardInformation' },
ellipsis: true,
width: 170
},
{
title: this.$t('taskType'),
align: 'center',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
},
{
title: this.$t('LastProcessor'),
align: 'center',
dataIndex: 'lastAssigneeName',
ellipsis: true,
width: 170
},
{
title: this.$t('CurrentProcessor'),
align: 'center',
dataIndex: 'assigneeName',
ellipsis: true,
width: 170
},
{
title: this.$t('TaskCutOffTime'),
align: 'center',
dataIndex: 'endTime',
ellipsis: true,
width: 170
},
{
title: this.$t('taskStatus'),
align: 'center',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
},
{
title: this.$t('operation'),
align: 'center',
fixed: 'right',
width: 120,
scopedSlots: { customRender: 'operation' }
}
],
selectedRowKeys: [],
pageSize: 10,
pageNo: 1,
total: 0,
url: {
list: '/todoCenter/projectProcess/issuedProcess'
},
queryParam: {}
}
},
mounted() {
this.getList()
},
methods: {
monitoringProcessClick(row) {
let newUrl = this.$router.resolve({
path: '/processDetails',
query: {
prcNum: row.prcNum,
prcType: row.flowType,
prcId: row.actiProcInstId
}
})
window.open(newUrl.href, '_blank')
},
RelatedItemsClick(item) {
let newUrl = this.$router.resolve({
path: '/ProjectDetails',
query: {
id: item.projectLibraryId,
projectName: item.projectName,
projectNameId: item.projectNameId,
targetMarket: item.targetMarket,
studioEngineer: item.studioEngineer
}
})
window.open(newUrl.href, '_blank')
},
standardInformationClick(item) {
let newUrl = this.$router.resolve({
path: '/docManage/library/detail',
query: {
id: item.bussDocumentLibraryId
}
})
window.open(newUrl.href, '_blank')
},
viewClick(row) {
let query = {}
row.router = this.$route.path
if (row.flowType == '1') {
query = {
taskDefinitionKey: row.taskDefinitionKey,
taskIds: row.taskId,
prcType: row.flowType,
prcNum: row.prcNum,
isTrue: false
}
let newUrl = this.$router.resolve({
path: '/handshakeProcess',
query: query
})
window.open(newUrl.href, '_blank')
} else if (row.flowType == '10') {
let newUrl = this.$router.resolve({
path: '/ProjectDetails',
query: {
id: row.projectLibraryId,
projectName: row.projectName,
projectNameId: row.projectNameId,
targetMarket: row.targetMarket,
studioEngineer: row.studioEngineer,
type: '102'
}
})
window.open(newUrl.href, '_blank')
} else if (row.flowType == '2') {
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {
row.taskId = ''
}
query = {
router: row.router,
taskIds: row.taskId,
actiProcInstId: row.actiProcInstId,
projectTaskInventoryId: row.projectLawsInventoryId,
projectLibraryId: row.projectLibraryId,
id: row.projectLibraryId,
studioEngineer: row.studioEngineer,
serialNumber: row.serialNumber,
TaskKey: row.taskDefinitionKey,
isDisplay: false,
flowType: 2,
Sponsor: 'designInitiatorName',
personLiable: 'designDutyName',
typeOfDeliverables: 'designDeliverableTypeName',
deliverableTemplate: 'designDeliverableTemplate',
DueDate: 'designDueDate',
remarks: 'designRemark',
projectName: row.projectName,
targetMarket: row.targetMarket,
projectNameId: row.projectNameId,
primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.personChargeFeedback
}
let newUrl = this.$router.resolve({
path: '/taskListProcess',
query: query
})
window.open(newUrl.href, '_blank')
} else if (row.flowType == '3') {
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {
row.taskId = ''
}
query = {
router: row.router,
taskIds: row.taskId,
actiProcInstId: row.actiProcInstId,
projectTaskInventoryId: row.projectLawsInventoryId,
studioEngineer: row.studioEngineer,
projectLibraryId: row.projectLibraryId,
serialNumber: row.serialNumber,
TaskKey: row.taskDefinitionKey,
flowType: 3,
isDisplay: false,
id: row.projectLibraryId,
Sponsor: 'prehomoInitiatorName',
personLiable: 'prehomoDutyName',
typeOfDeliverables: 'prehomoDeliverableTypeName',
deliverableTemplate: 'prehomoDeliverableTemplate',
DueDate: 'prehomoDueDate',
remarks: 'prehomoRemark',
projectName: row.projectName,
targetMarket: row.targetMarket,
projectNameId: row.projectNameId,
primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.personChargeFeedback
}
let newUrl = this.$router.resolve({
path: '/taskListProcess',
query: query
})
window.open(newUrl.href, '_blank')
} else if (row.flowType == '4') {
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {
row.taskId = ''
}
query = {
router: row.router,
taskIds: row.taskId,
actiProcInstId: row.actiProcInstId,
id: row.projectLibraryId,
projectLibraryId: row.projectLibraryId,
studioEngineer: row.studioEngineer,
serialNumber: row.serialNumber,
projectTaskInventoryId: row.projectLawsInventoryId,
TaskKey: row.taskDefinitionKey,
flowType: 4,
isDisplay: false,
Sponsor: 'verifyInitiatorName',
personLiable: 'verifyDutyName',
typeOfDeliverables: 'verifyDeliverableTypeName',
deliverableTemplate: 'verifyDeliverableTemplate',
DueDate: 'verifyDueDate',
remarks: 'verifyRemark',
projectName: row.projectName,
targetMarket: row.targetMarket,
projectNameId: row.projectNameId,
primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.personChargeFeedback
}
let newUrl = this.$router.resolve({
path: '/taskListProcess',
query: query
})
window.open(newUrl.href, '_blank')
}
},
searchQuery(value) {
this.queryParam = value
this.pageNo = 1
this.getList()
},
searchReset() {
this.queryParam = {}
this.pageNo = 1
this.getList()
},
pageOnChange(page) {
this.pageNo = page
this.getList()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
},
getList() {
let queryParam = JSON.parse(JSON.stringify(this.queryParam))
Object.keys(queryParam).forEach(val => {
if (queryParam[val] instanceof Array) {
queryParam[val] = queryParam[val].join(',')
}
})
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
...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>
<style scoped>
.page {
text-align: right;
margin-top: 20px;
}
.text-operation {
margin-right: 8px;
}
</style>
jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+338
View File
@@ -0,0 +1,338 @@
<template>
<div class="box">
<a-table
ref="table"
size="middle"
:loading="loading"
:pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 140px)'}"
rowKey="id"
:data-source="dataSource"
:columns="columns"
>
<!-- -->
<span slot="endTime" slot-scope="text,record">
<span :title="text" :class="{'activeRed':record.endTimePastDueFlag}">{{text}}</span>
</span>
<span slot="operation" slot-scope="text,record">
<a class="text-operation"
@click="ProcessingClick(record)">{{$t('Processing')}}</a>
</span>
<span slot="RelatedItems" slot-scope="text,record">
<a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
</span>
<span slot="standardInformation" slot-scope="text,record">
<a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
{{text}}
</a>
<span v-else>--</span>
</span>
</a-table>
<div class="page" v-if="dataSource && dataSource.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="pageOnChange"
@showSizeChange="SizeChange"
/>
</div>
</div>
</template>
<script>
import { getAction, postAction, deleteAction } from '@/api/manage'
export default {
name: 'dealtWith',
data() {
return {
dataSource: [],
loading: false,
columns: [
{
title: this.$t('RelatedItems'),
align: 'center',
dataIndex: 'projectName',
ellipsis: true,
scopedSlots: { customRender: 'RelatedItems' },
width: 170
},
{
title: this.$t('standardInformation'),
align: 'center',
dataIndex: 'standardInfo',
ellipsis: true,
scopedSlots: { customRender: 'standardInformation' },
width: 170
},
{
title: this.$t('taskType'),
align: 'center',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
},
{
title: this.$t('Sponsor'),
align: 'center',
dataIndex: 'createBy',
ellipsis: true,
width: 170
},
{
title: this.$t('TaskCutOffTime'),
align: 'center',
dataIndex: 'endTime',
ellipsis: true,
width: 170,
scopedSlots: { customRender: 'endTime' }
},
{
title: this.$t('taskStatus'),
align: 'center',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
},
{
title: this.$t('operation'),
align: 'center',
fixed: 'right',
width: 120,
scopedSlots: { customRender: 'operation' }
}
],
selectedRowKeys: [],
pageSize: 10,
pageNo: 1,
total: 0,
url: {
list: '/todoCenter/projectProcess/todoTaskList'
},
queryParam: {}
}
},
mounted() {
this.getList()
},
methods: {
RelatedItemsClick(item) {
let newUrl = this.$router.resolve({
path: '/ProjectDetails',
query: {
id: item.projectLibraryId,
projectName: item.projectName,
projectNameId: item.projectNameId,
targetMarket: item.targetMarket,
studioEngineer: item.studioEngineer
}
})
window.open(newUrl.href, '_blank')
},
standardInformationClick(item) {
let newUrl = this.$router.resolve({
path: '/docManage/library/detail',
query: {
id: item.bussDocumentLibraryId
}
})
window.open(newUrl.href, '_blank')
},
ProcessingClick(row) {
let query = {}
row.router = this.$route.path
if (row.flowType == '1') {
query = {
taskDefinitionKey: row.taskDefinitionKey,
taskIds: row.taskId,
prcType: row.flowType,
prcNum: row.prcNum,
isTrue: true
}
let newUrl = this.$router.resolve({
path: '/handshakeProcess',
query: query
})
window.open(newUrl.href, '_blank')
} else if (row.flowType == '10') {
let newUrl = this.$router.resolve({
path: '/ProjectDetails',
query: {
id: row.projectLibraryId,
projectName: row.projectName,
projectNameId: row.projectNameId,
targetMarket: row.targetMarket,
studioEngineer: row.studioEngineer,
type: '102'
}
})
window.open(newUrl.href, '_blank')
} else if (row.flowType == '2') {
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {
row.taskId = ''
}
query = {
router: row.router,
taskIds: row.taskId,
actiProcInstId: row.actiProcInstId,
projectTaskInventoryId: row.projectLawsInventoryId,
projectLibraryId: row.projectLibraryId,
id: row.projectLibraryId,
studioEngineer: row.studioEngineer,
serialNumber: row.serialNumber,
TaskKey: row.taskDefinitionKey,
isDisplay: true,
flowType: 2,
Sponsor: 'designInitiatorName',
personLiable: 'designDutyName',
typeOfDeliverables: 'designDeliverableTypeName',
deliverableTemplate: 'designDeliverableTemplate',
DueDate: 'designDueDate',
remarks: 'designRemark',
projectName: row.projectName,
targetMarket: row.targetMarket,
projectNameId: row.projectNameId,
primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.personChargeFeedback
}
let newUrl = this.$router.resolve({
path: '/taskListProcess',
query: query
})
window.open(newUrl.href, '_blank')
} else if (row.flowType == '3') {
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {
row.taskId = ''
}
query = {
router: row.router,
taskIds: row.taskId,
actiProcInstId: row.actiProcInstId,
projectTaskInventoryId: row.projectLawsInventoryId,
studioEngineer: row.studioEngineer,
projectLibraryId: row.projectLibraryId,
serialNumber: row.serialNumber,
TaskKey: row.taskDefinitionKey,
flowType: 3,
isDisplay: true,
id: row.projectLibraryId,
Sponsor: 'prehomoInitiatorName',
personLiable: 'prehomoDutyName',
typeOfDeliverables: 'prehomoDeliverableTypeName',
deliverableTemplate: 'prehomoDeliverableTemplate',
DueDate: 'prehomoDueDate',
remarks: 'prehomoRemark',
projectName: row.projectName,
targetMarket: row.targetMarket,
projectNameId: row.projectNameId,
primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.personChargeFeedback
}
let newUrl = this.$router.resolve({
path: '/taskListProcess',
query: query
})
window.open(newUrl.href, '_blank')
} else if (row.flowType == '4') {
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {
row.taskId = ''
}
query = {
router: row.router,
taskIds: row.taskId,
actiProcInstId: row.actiProcInstId,
id: row.projectLibraryId,
projectLibraryId: row.projectLibraryId,
studioEngineer: row.studioEngineer,
serialNumber: row.serialNumber,
projectTaskInventoryId: row.projectLawsInventoryId,
TaskKey: row.taskDefinitionKey,
flowType: 4,
isDisplay: true,
Sponsor: 'verifyInitiatorName',
personLiable: 'verifyDutyName',
typeOfDeliverables: 'verifyDeliverableTypeName',
deliverableTemplate: 'verifyDeliverableTemplate',
DueDate: 'verifyDueDate',
remarks: 'verifyRemark',
projectName: row.projectName,
targetMarket: row.targetMarket,
projectNameId: row.projectNameId,
primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.personChargeFeedback
}
let newUrl = this.$router.resolve({
path: '/taskListProcess',
query: query
})
window.open(newUrl.href, '_blank')
}
},
searchQuery(value) {
this.queryParam = value
this.pageNo = 1
this.getList()
},
searchReset() {
this.queryParam = {}
this.pageNo = 1
this.getList()
},
pageOnChange(page) {
this.pageNo = page
this.getList()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
},
getList() {
let queryParam = JSON.parse(JSON.stringify(this.queryParam))
Object.keys(queryParam).forEach(val => {
if (queryParam[val] instanceof Array) {
queryParam[val] = queryParam[val].join(',')
}
})
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
...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>
<style scoped>
.page {
text-align: right;
margin-top: 20px;
}
.activeRed {
color: red;
}
</style>
jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+355
View File
@@ -0,0 +1,355 @@
<template>
<div class="box">
<a-table
ref="table"
size="middle"
:loading="loading"
:pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 140px)'}"
rowKey="id"
:data-source="dataSource"
:columns="columns"
>
<!-- -->
<span slot="operation" slot-scope="text,record">
<a class="text-operation" v-if="record.flowType != '10'"
@click="monitoringProcessClick(record)">{{$t('monitoringProcess')}}</a>
<a class="text-operation"
@click="viewClick(record)">{{$t('view')}}</a>
</span>
<span slot="RelatedItems" slot-scope="text,record">
<a @click="RelatedItemsClick(record)" :title="text">
{{text}}
</a>
</span>
<span slot="standardInformation" slot-scope="text,record">
<a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
{{text}}
</a>
<span v-else>--</span>
</span>
</a-table>
<div class="page" v-if="dataSource && dataSource.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="pageOnChange"
@showSizeChange="SizeChange"
/>
</div>
</div>
</template>
<script>
import { getAction, postAction, deleteAction } from '@/api/manage'
export default {
name: 'doneList',
data() {
return {
dataSource: [],
loading: false,
url: {
list: '/todoCenter/projectProcess/doneProcess'
},
queryParam: {},
columns: [
{
title: this.$t('RelatedItems'),
align: 'center',
dataIndex: 'projectName',
ellipsis: true,
scopedSlots: { customRender: 'RelatedItems' },
width: 170
},
{
title: this.$t('standardInformation'),
align: 'center',
dataIndex: 'standardInfo',
ellipsis: true,
scopedSlots: { customRender: 'standardInformation' },
width: 170
},
{
title: this.$t('taskType'),
align: 'center',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
},
{
title: this.$t('Sponsor'),
align: 'center',
dataIndex: 'createBy',
ellipsis: true,
width: 170
},
{
title: this.$t('CurrentProcessor'),
align: 'center',
dataIndex: 'assigneeName',
ellipsis: true,
width: 170
},
{
title: this.$t('TaskCutOffTime'),
align: 'center',
dataIndex: 'endTime',
ellipsis: true,
width: 170
},
{
title: this.$t('taskStatus'),
align: 'center',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
},
{
title: this.$t('operation'),
align: 'center',
fixed: 'right',
width: 120,
scopedSlots: { customRender: 'operation' }
}
],
selectedRowKeys: [],
pageSize: 10,
pageNo: 1,
total: 0
}
},
mounted() {
this.getList()
},
methods: {
monitoringProcessClick(row){
let newUrl = this.$router.resolve({
path: '/processDetails',
query: {
prcNum: row.prcNum,
prcType:row.flowType,
prcId:row.actiProcInstId,
}
})
window.open(newUrl.href, '_blank')
},
RelatedItemsClick(item) {
let newUrl = this.$router.resolve({
path: '/ProjectDetails',
query: {
id: item.projectLibraryId,
projectName: item.projectName,
projectNameId: item.projectNameId,
targetMarket: item.targetMarket,
studioEngineer:item.studioEngineer,
}
})
window.open(newUrl.href, '_blank')
},
standardInformationClick(item){
let newUrl = this.$router.resolve({
path: '/docManage/library/detail',
query: {
id: item.bussDocumentLibraryId,
}
})
window.open(newUrl.href, '_blank')
},
viewClick(row) {
let query = {}
row.router = this.$route.path
if (row.flowType == '1') {
query = {
taskDefinitionKey:row.taskDefinitionKey,
taskIds:row.taskId,
prcType:row.flowType,
prcNum:row.prcNum,
isTrue:false,
}
let newUrl = this.$router.resolve({
path: '/handshakeProcess',
query: query
})
window.open(newUrl.href, '_blank')
}else if(row.flowType == '10'){
let newUrl = this.$router.resolve({
path: '/ProjectDetails',
query: {
id: row.projectLibraryId,
projectName: row.projectName,
projectNameId: row.projectNameId,
targetMarket: row.targetMarket,
studioEngineer:row.studioEngineer,
type:'102',
}
})
window.open(newUrl.href, '_blank')
}else if(row.flowType == '2'){
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {
row.taskId = ''
}
query = {
router: row.router,
taskIds:row.taskId,
actiProcInstId: row.actiProcInstId,
projectTaskInventoryId: row.projectLawsInventoryId,
projectLibraryId:row.projectLibraryId,
id: row.projectLibraryId,
studioEngineer: row.studioEngineer,
serialNumber: row.serialNumber,
TaskKey: row.taskDefinitionKey,
isDisplay: false,
flowType: 2,
Sponsor: 'designInitiatorName',
personLiable: 'designDutyName',
typeOfDeliverables: 'designDeliverableTypeName',
deliverableTemplate: 'designDeliverableTemplate',
DueDate: 'designDueDate',
remarks: 'designRemark',
projectName: row.projectName,
targetMarket: row.targetMarket,
projectNameId: row.projectNameId,
primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.personChargeFeedback
}
let newUrl = this.$router.resolve({
path: '/taskListProcess',
query: query
})
window.open(newUrl.href, '_blank')
}else if(row.flowType == '3'){
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {
row.taskId = ''
}
query = {
router: row.router,
taskIds:row.taskId,
actiProcInstId: row.actiProcInstId,
projectTaskInventoryId: row.projectLawsInventoryId,
studioEngineer: row.studioEngineer,
projectLibraryId:row.projectLibraryId,
serialNumber: row.serialNumber,
TaskKey: row.taskDefinitionKey,
flowType: 3,
isDisplay: false,
id: row.projectLibraryId,
Sponsor: 'prehomoInitiatorName',
personLiable: 'prehomoDutyName',
typeOfDeliverables: 'prehomoDeliverableTypeName',
deliverableTemplate: 'prehomoDeliverableTemplate',
DueDate: 'prehomoDueDate',
remarks: 'prehomoRemark',
projectName: row.projectName,
targetMarket: row.targetMarket,
projectNameId: row.projectNameId,
primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.personChargeFeedback
}
let newUrl = this.$router.resolve({
path: '/taskListProcess',
query: query
})
window.open(newUrl.href, '_blank')
}else if(row.flowType == '4'){
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {
row.taskId = ''
}
query = {
router: row.router,
taskIds: row.taskId,
actiProcInstId: row.actiProcInstId,
id: row.projectLibraryId,
projectLibraryId: row.projectLibraryId,
studioEngineer: row.studioEngineer,
serialNumber: row.serialNumber,
projectTaskInventoryId: row.projectLawsInventoryId,
TaskKey: row.taskDefinitionKey,
flowType: 4,
isDisplay: false,
Sponsor: 'verifyInitiatorName',
personLiable: 'verifyDutyName',
typeOfDeliverables: 'verifyDeliverableTypeName',
deliverableTemplate: 'verifyDeliverableTemplate',
DueDate: 'verifyDueDate',
remarks: 'verifyRemark',
projectName: row.projectName,
targetMarket: row.targetMarket,
projectNameId: row.projectNameId,
primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.personChargeFeedback
}
let newUrl = this.$router.resolve({
path: '/taskListProcess',
query: query
})
window.open(newUrl.href, '_blank')
}
},
searchQuery(value) {
this.queryParam = value
this.pageNo = 1
this.getList()
},
searchReset() {
this.queryParam = {}
this.pageNo = 1
this.getList()
},
pageOnChange(page) {
this.pageNo = page
this.getList()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
},
getList() {
let queryParam = JSON.parse(JSON.stringify(this.queryParam))
Object.keys(queryParam).forEach(val => {
if (queryParam[val] instanceof Array) {
queryParam[val] = queryParam[val].join(',')
}
})
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
...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>
<style scoped>
.page {
text-align: right;
margin-top: 20px;
}
.text-operation{
margin-right: 8px;
}
</style>
jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
+259
View File
@@ -0,0 +1,259 @@
<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">
<div class="title-text" :title="$t('RelatedItems')">
<span>{{$t('RelatedItems')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('RelatedItems')"
v-model="queryParam.projectName"></a-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('standardInformation')">
<span>{{$t('standardInformation')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardInformation')"
v-model="queryParam.standardInfo"></a-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text tree-select">
<div class="title-text" :title="$t('taskType')">
<span>{{$t('taskType')}}</span>
</div>
<a-select :placeholder="$t('PleaseSelect')+$t('taskType')"
class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
allowClear
v-model="queryParam.flowType">
<a-select-option v-for="(item, key) in taskTypeList"
:key="key"
:value="item.value">
<span style="display: inline-block;width: 100%" :title=" item.name">
{{ item.name }}
</span>
</a-select-option>
</a-select>
</div>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('taskStatus')">
<span>{{$t('taskStatus')}}</span>
</div>
<a-select :placeholder="$t('PleaseSelect')+$t('taskStatus')"
class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
allowClear
v-model="queryParam.status">
<a-select-option v-for="(item, key) in taskStatusList"
:key="key"
:value="item.value">
<span style="display: inline-block;width: 100%" :title=" item.name">
{{ item.name }}
</span>
</a-select-option>
</a-select>
</div>
</a-col>
</template>
<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 @click="handleToggleSearch" style="margin-left: 8px">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</a-col>
</span>
</a-row>
</a-form>
</div>
<div class="table-operator" style="margin-bottom: 8px">
<div @click="taskConfirmationHandlingClick"
class="operator-text">
<a-icon type="apartment"/>
{{$t('taskConfirmationHandling')}}
</div>
</div>
<a-tabs v-model="tabActive" @change="callback">
<a-tab-pane :key="$t('toDoProcess')" :tab="$t('toDoProcess')">
<dealtWith v-if="tabActive == $t('toDoProcess')" ref="dealtWithRef"/>
</a-tab-pane>
<a-tab-pane :key="$t('processDone')" :tab="$t('processDone')">
<doneList v-if="tabActive == $t('processDone')" ref="doneListRef"/>
</a-tab-pane>
<a-tab-pane :key="$t('sentProcess')" :tab="$t('sentProcess')">
<SentList v-if="tabActive == $t('sentProcess')" ref="SentListRef"/>
</a-tab-pane>
</a-tabs>
</a-card>
</template>
<script>
import { getAction, postAction, deleteAction } from '@/api/manage'
import dealtWith from './components/dealtWith'
import doneList from './components/doneList'
import SentList from './components/SentList'
export default {
name: 'index',
components: {
dealtWith,
doneList,
SentList
},
data() {
return {
queryParam: {},
toggleSearchStatus: false,
taskTypeList: [
{
name:this.$t('confirmationOfRegulationsList'),
value:'10',
},
{
name:this.$t('listTaskConfirmation'),
value:'1',
},
{
name:this.$t('designComplianceReview'),
value:'2',
},
{
name:this.$t('preHomeConfirmation'),
value:'3',
},
{
name:this.$t('verificationComplianceReview'),
value:'4',
},
],
taskStatusList: [
{
name:this.$t('listToConfirm'),
value:'List to confirm',
},
{
name:this.$t('Finished'),
value:'Completed',
},
{
name:this.$t('inquiry'),
value:'Inquiry',
},
{
name:this.$t('toSubmit'),
value:'To submit',
},
{
name:this.$t('toAudit'),
value:'To audit',
},
],
tabActive: this.$t('toDoProcess')
}
},
methods: {
callback(value) {
this.tabActive = value
},
handleToggleSearch() {
this.toggleSearchStatus = !this.toggleSearchStatus
},
searchQuery() {
if (this.tabActive == this.$t('toDoProcess')) {
this.$refs.dealtWithRef.searchQuery(this.queryParam )
} else if (this.tabActive == this.$t('processDone')) {
this.$refs.doneListRef.searchQuery(this.queryParam )
} else if (this.tabActive == this.$t('sentProcess')) {
this.$refs.SentListRef.searchQuery(this.queryParam )
}
},
searchReset() {
this.queryParam = {}
if (this.tabActive == this.$t('toDoProcess')) {
this.$refs.dealtWithRef.searchReset()
} else if (this.tabActive == this.$t('processDone')) {
this.$refs.doneListRef.searchReset()
} else if (this.tabActive == this.$t('sentProcess')) {
this.$refs.SentListRef.searchReset()
}
},
taskConfirmationHandlingClick() {
this.$router.push({
path: '/toDoTaskConfirmation'
})
}
}
}
</script>
<style scoped lang="less">
@import '~@assets/less/common.less';
.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;
/*margin-top: 2px;*/
}
.text-operation {
margin-right: 8px;
}
.itemModel {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
}
.Required {
color: red;
margin-right: 4px;
}
::v-deep .ant-table-row:first-child {
background: #fff !important;
opacity: 0.9;
}
::v-deep .ant-table-body {
background: transparent !important;
}
</style>
jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue
+231
View File
@@ -0,0 +1,231 @@
<template>
<div class="box">
<a-table
ref="table"
size="middle"
:loading="loading"
:pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 140px)'}"
rowKey="id"
:data-source="dataSource"
:columns="columns"
>
<!-- -->
<span slot="operation" slot-scope="text,record">
<a class="text-operation"
@click="monitoringProcessClick(record)">{{$t('monitoringProcess')}}</a>
<a class="text-operation"
@click="viewClick(record)">{{$t('view')}}</a>
</span>
<span slot="standardInformation" slot-scope="text,record">
<a @click="standardInformationClick(record)" :title="text">
{{text}}
</a>
</span>
</a-table>
<div class="page" v-if="dataSource && dataSource.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="pageOnChange"
@showSizeChange="SizeChange"
/>
</div>
</div>
</template>
<script>
import { getAction, postAction, deleteAction } from '@/api/manage'
export default {
name: 'SentList',
data() {
return {
dataSource: [],
loading: false,
url: {
list: '/todoCenter/lawsAssess/issuedProcess'
},
columns: [
{
title: this.$t('standardInformation'),
align: 'center',
dataIndex: 'standardInfo',
scopedSlots: { customRender: 'standardInformation' },
ellipsis: true,
width: 170
},
{
title: this.$t('taskType'),
align: 'center',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
},
{
title: this.$t('LastProcessor'),
align: 'center',
dataIndex: 'lastAssigneeName',
ellipsis: true,
width: 170
},
{
title: this.$t('CurrentProcessor'),
align: 'center',
dataIndex: 'assigneeName',
ellipsis: true,
width: 170
},
{
title: this.$t('TaskCutOffTime'),
align: 'center',
dataIndex: 'endTime',
ellipsis: true,
width: 170
},
{
title: this.$t('taskStatus'),
align: 'center',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
},
{
title: this.$t('operation'),
align: 'center',
fixed: 'right',
width: 120,
scopedSlots: { customRender: 'operation' }
}
],
selectedRowKeys: [],
pageSize: 10,
pageNo: 1,
total: 0,
queryParam: {}
}
},
mounted() {
this.getList()
},
methods: {
monitoringProcessClick(row) {
let newUrl = this.$router.resolve({
path: '/processDetails',
query: {
prcNum: row.prcNum,
prcType: row.flowType,
prcId: row.actiProcInstId
}
})
window.open(newUrl.href, '_blank')
},
standardInformationClick(item) {
let newUrl = this.$router.resolve({
path: '/docManage/library/detail',
query: {
id: item.bussDocumentLibraryId
}
})
window.open(newUrl.href, '_blank')
},
viewClick(row) {
row.router = this.$route.path
let query = {}
if (row.flowType == '5') {
query = {
prcId: row.actiProcInstId,
taskIds: row.taskId,
prcType: row.flowType,
router: row.router,
prcNum: row.prcNum,
taskDefinitionKey: row.taskDefinitionKey,
isDisabled: true
}
let newUrl = this.$router.resolve({
path: '/regulatoryProcessReview',
query: query
})
window.open(newUrl.href, '_blank')
} else if (row.flowType == '6') {
query = {
taskDefinitionKey: row.taskDefinitionKey,
taskIds: row.taskId,
prcType: row.flowType,
prcNum: row.prcNum,
prcId: row.actiProcInstId,
router: row.router,
isDisabled: true
}
let newUrl = this.$router.resolve({
path: '/evaluationProcess',
query: query
})
window.open(newUrl.href, '_blank')
}
},
searchQuery(value) {
this.queryParam = value
this.pageNo = 1
this.getList()
},
searchReset() {
this.queryParam = {}
this.pageNo = 1
this.getList()
},
pageOnChange(page) {
this.pageNo = page
this.getList()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
},
getList() {
let queryParam = JSON.parse(JSON.stringify(this.queryParam))
Object.keys(queryParam).forEach(val => {
if (queryParam[val] instanceof Array) {
queryParam[val] = queryParam[val].join(',')
}
})
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
...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>
<style scoped>
.page {
text-align: right;
margin-top: 20px;
}
.text-operation {
margin-right: 8px;
}
</style>
jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue
+214
View File
@@ -0,0 +1,214 @@
<template>
<div class="box">
<a-table
ref="table"
size="middle"
:loading="loading"
:pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 140px)'}"
rowKey="id"
:data-source="dataSource"
:columns="columns"
>
<!-- -->
<span slot="operation" slot-scope="text,record">
<a class="text-operation"
@click="ProcessingClick(record)">{{$t('Processing')}}</a>
</span>
<span slot="endTime" slot-scope="text,record">
<span :title="text" :class="{'activeRed':record.endTimePastDueFlag}">{{text}}</span>
</span>
<span slot="standardInformation" slot-scope="text,record">
<a @click="standardInformationClick(record)" :title="text">
{{text}}
</a>
</span>
</a-table>
<div class="page" v-if="dataSource && dataSource.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="pageOnChange"
@showSizeChange="SizeChange"
/>
</div>
</div>
</template>
<script>
import { getAction, postAction, deleteAction } from '@/api/manage'
export default {
name: 'dealtWith',
data() {
return {
dataSource: [],
loading: false,
columns: [
{
title: this.$t('standardInformation'),
align: 'center',
dataIndex: 'standardInfo',
scopedSlots: { customRender: 'standardInformation' },
ellipsis: true,
width: 170
},
{
title: this.$t('taskType'),
align: 'center',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
},
{
title: this.$t('Sponsor'),
align: 'center',
dataIndex: 'createBy',
ellipsis: true,
width: 170
},
{
title: this.$t('TaskCutOffTime'),
align: 'center',
dataIndex: 'endTime',
ellipsis: true,
width: 170,
scopedSlots: { customRender: 'endTime' }
},
{
title: this.$t('taskStatus'),
align: 'center',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
},
{
title: this.$t('operation'),
align: 'center',
fixed: 'right',
width: 120,
scopedSlots: { customRender: 'operation' }
}
],
selectedRowKeys: [],
pageSize: 10,
pageNo: 1,
url: {
list: '/todoCenter/lawsAssess/todoTaskList'
},
total: 0,
queryParam: {}
}
},
mounted() {
this.getList()
},
methods: {
standardInformationClick(item) {
let newUrl = this.$router.resolve({
path: '/docManage/library/detail',
query: {
id: item.bussDocumentLibraryId
}
})
window.open(newUrl.href, '_blank')
},
searchQuery(value) {
this.queryParam = value
this.pageNo = 1
this.getList()
},
searchReset() {
this.queryParam = {}
this.pageNo = 1
this.getList()
},
ProcessingClick(row){
row.router = this.$route.path
let query = {}
if (row.flowType == '5') {
query = {
prcId:row.actiProcInstId,
taskIds:row.taskId,
prcType:row.flowType,
router:row.router,
prcNum:row.prcNum,
taskDefinitionKey:row.taskDefinitionKey,
isDisabled:false
}
let newUrl = this.$router.resolve({
path: '/regulatoryProcessReview',
query: query
})
window.open(newUrl.href, '_blank')
} else if (row.flowType == '6') {
query = {
taskDefinitionKey:row.taskDefinitionKey,
taskIds:row.taskId,
prcType:row.flowType,
prcNum:row.prcNum,
prcId:row.actiProcInstId,
router:row.router,
isDisabled:false,
}
let newUrl = this.$router.resolve({
path: '/evaluationProcess',
query: query
})
window.open(newUrl.href, '_blank')
}
},
pageOnChange(page) {
this.pageNo = page
this.getList()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
},
getList() {
let queryParam = JSON.parse(JSON.stringify(this.queryParam))
Object.keys(queryParam).forEach(val => {
if (queryParam[val] instanceof Array) {
queryParam[val] = queryParam[val].join(',')
}
})
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
...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>
<style scoped>
.page {
text-align: right;
margin-top: 20px;
}
.activeRed{
color: red;
}
</style>
jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue
+231
View File
@@ -0,0 +1,231 @@
<template>
<div class="box">
<a-table
ref="table"
size="middle"
:loading="loading"
:pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 140px)'}"
rowKey="id"
:data-source="dataSource"
:columns="columns"
>
<!-- -->
<span slot="operation" slot-scope="text,record">
<a class="text-operation"
@click="monitoringProcessClick(record)">{{$t('monitoringProcess')}}</a>
<a class="text-operation"
@click="viewClick(record)">{{$t('view')}}</a>
</span>
<span slot="standardInformation" slot-scope="text,record">
<a @click="standardInformationClick(record)" :title="text">
{{text}}
</a>
</span>
</a-table>
<div class="page" v-if="dataSource && dataSource.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="pageOnChange"
@showSizeChange="SizeChange"
/>
</div>
</div>
</template>
<script>
import { getAction, postAction, deleteAction } from '@/api/manage'
export default {
name: 'doneList',
data() {
return {
dataSource: [],
loading: false,
columns: [
{
title: this.$t('standardInformation'),
align: 'center',
dataIndex: 'standardInfo',
ellipsis: true,
scopedSlots: { customRender: 'standardInformation' },
width: 170
},
{
title: this.$t('taskType'),
align: 'center',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
},
{
title: this.$t('Sponsor'),
align: 'center',
dataIndex: 'createBy',
ellipsis: true,
width: 170
},
{
title: this.$t('CurrentProcessor'),
align: 'center',
dataIndex: 'assigneeName',
ellipsis: true,
width: 170
},
{
title: this.$t('TaskCutOffTime'),
align: 'center',
dataIndex: 'endTime',
ellipsis: true,
width: 170
},
{
title: this.$t('taskStatus'),
align: 'center',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
},
{
title: this.$t('operation'),
align: 'center',
fixed: 'right',
width: 120,
scopedSlots: { customRender: 'operation' }
}
],
selectedRowKeys: [],
pageSize: 10,
pageNo: 1,
total: 0,
queryParam: {},
url: {
list: '/todoCenter/lawsAssess/doneProcess'
}
}
},
mounted() {
this.getList()
},
methods: {
monitoringProcessClick(row) {
let newUrl = this.$router.resolve({
path: '/processDetails',
query: {
prcNum: row.prcNum,
prcType: row.flowType,
prcId: row.actiProcInstId
}
})
window.open(newUrl.href, '_blank')
},
standardInformationClick(item) {
let newUrl = this.$router.resolve({
path: '/docManage/library/detail',
query: {
id: item.bussDocumentLibraryId
}
})
window.open(newUrl.href, '_blank')
},
viewClick(row) {
row.router = this.$route.path
let query = {}
if (row.flowType == '5') {
query = {
prcId: row.actiProcInstId,
taskIds: row.taskId,
prcType: row.flowType,
router: row.router,
prcNum: row.prcNum,
taskDefinitionKey: row.taskDefinitionKey,
isDisabled: true
}
let newUrl = this.$router.resolve({
path: '/regulatoryProcessReview',
query: query
})
window.open(newUrl.href, '_blank')
} else if (row.flowType == '6') {
query = {
taskDefinitionKey: row.taskDefinitionKey,
taskIds: row.taskId,
prcType: row.flowType,
prcNum: row.prcNum,
prcId: row.actiProcInstId,
router: row.router,
isDisabled: true
}
let newUrl = this.$router.resolve({
path: '/evaluationProcess',
query: query
})
window.open(newUrl.href, '_blank')
}
},
searchQuery(value) {
this.queryParam = value
this.pageNo = 1
this.getList()
},
searchReset() {
this.queryParam = {}
this.pageNo = 1
this.getList()
},
pageOnChange(page) {
this.pageNo = page
this.getList()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
},
getList() {
let queryParam = JSON.parse(JSON.stringify(this.queryParam))
Object.keys(queryParam).forEach(val => {
if (queryParam[val] instanceof Array) {
queryParam[val] = queryParam[val].join(',')
}
})
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
...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>
<style scoped>
.page {
text-align: right;
margin-top: 20px;
}
.text-operation {
margin-right: 8px;
}
</style>
jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue
+174
View File
@@ -0,0 +1,174 @@
<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">
<div class="title-text" :title="$t('standardInformation')">
<span>{{$t('standardInformation')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardInformation')"
v-model="queryParam.standardInfo"></a-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text tree-select">
<div class="title-text" :title="$t('taskType')">
<span>{{$t('taskType')}}</span>
</div>
<a-select :placeholder="$t('PleaseSelect')+$t('taskType')"
class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
allowClear
v-model="queryParam.flowType">
<a-select-option v-for="(item, key) in taskTypeList"
:key="key"
:value="item.value">
<span style="display: inline-block;width: 100%" :title=" item.name">
{{ item.name }}
</span>
</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>
<a-tabs v-model="tabActive" @change="callback">
<a-tab-pane :key="$t('toDoProcess')" :tab="$t('toDoProcess')">
<dealtWith v-if="tabActive == $t('toDoProcess')" ref="dealtWithRef"/>
</a-tab-pane>
<a-tab-pane :key="$t('processDone')" :tab="$t('processDone')">
<doneList v-if="tabActive == $t('processDone')" ref="doneListRef"/>
</a-tab-pane>
<a-tab-pane :key="$t('sentProcess')" :tab="$t('sentProcess')">
<SentList v-if="tabActive == $t('sentProcess')" ref="SentListRef"/>
</a-tab-pane>
</a-tabs>
</a-card>
</template>
<script>
import { getAction, postAction, deleteAction } from '@/api/manage'
import dealtWith from './components/dealtWith'
import doneList from './components/doneList'
import SentList from './components/SentList'
export default {
name: 'index',
components: {
dealtWith,
doneList,
SentList
},
data() {
return {
queryParam: {},
taskTypeList: [
{
name: this.$t('collectionOfRegulatoryOpinions'),
value: '5'
},
{
name: this.$t('regulatoryTechnicalAssessment'),
value: '6'
}
],
tabActive: this.$t('toDoProcess')
}
},
methods: {
callback(value) {
this.tabActive = value
},
searchQuery() {
if (this.tabActive == this.$t('toDoProcess')) {
this.$refs.dealtWithRef.searchQuery(this.queryParam )
} else if (this.tabActive == this.$t('processDone')) {
this.$refs.doneListRef.searchQuery(this.queryParam )
} else if (this.tabActive == this.$t('sentProcess')) {
this.$refs.SentListRef.searchQuery(this.queryParam )
}
},
searchReset() {
this.queryParam = {}
if (this.tabActive == this.$t('toDoProcess')) {
this.$refs.dealtWithRef.searchReset()
} else if (this.tabActive == this.$t('processDone')) {
this.$refs.doneListRef.searchReset()
} else if (this.tabActive == this.$t('sentProcess')) {
this.$refs.SentListRef.searchReset()
}
},
}
}
</script>
<style scoped lang="less">
@import '~@assets/less/common.less';
.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;
/*margin-top: 2px;*/
}
.text-operation {
margin-right: 8px;
}
.itemModel {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
}
.Required {
color: red;
margin-right: 4px;
}
::v-deep .ant-table-row:first-child {
background: #fff !important;
opacity: 0.9;
}
::v-deep .ant-table-body {
background: transparent !important;
}
</style>
jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue
+266
View File
@@ -0,0 +1,266 @@
<template>
<div>
<a-modal
:title="$t('batchProcessing')"
:width="700"
:visible="visible"
:confirm-loading="confirmLoading"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
>
<template slot="footer">
<a-button key="back" @click="handleCancel">
{{$t('cancel')}}
</a-button>
<a-button type="danger" :loading="confirmLoading" v-if="taskDefinitionKey == 'dreqr'" @click="sendBackClick">
{{$t('sendBack')}}
</a-button>
<a-button type="primary" :loading="confirmLoading" @click="handleOk">
{{$t('confirm')}}
</a-button>
</template>
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<a-row :gutter="24" v-if="taskDefinitionKey != 'dreqr'">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"></span>
</div>
<a-form-model-item class="itemModel" prop="flag">
<a-radio-group style="margin-top: 2px" @change="flagChange" class="box-input" v-model="formInline.flag">
<a-radio value="0">
{{$t('accept')}}
</a-radio>
<a-radio value="1">
{{$t('disagree')}}
</a-radio>
<a-radio value="3" v-if="taskDefinitionKey == 'zrrjsrw'">
{{$t('inquiry')}}
</a-radio>
<a-radio value="4" v-if="taskDefinitionKey == 'zrrqr'">
{{$t('sendBack')}}
</a-radio>
</a-radio-group>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24" v-if="isTrue">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('selectInquiry')">{{$t('selectInquiry')}}</span>
</div>
<a-form-model-item class="itemModel" prop="dreUserIdName">
<PersonnelSelection class="box-input"
:personneQuery="formInline"
:query="{db_field_name:'dreUserId',db_field_txt:$t('selectInquiry')}"
:isInput="true"
:isSingleChoice="true"
@change="PersonnelSelectionChange"
v-model="formInline.dreUserIdName"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
</div>
<a-form-model-item class="itemModel" prop="approvalOpinion">
<a-textarea :placeholder="$t('pleaseEnter')+$t('feedbackMessage')" v-model="formInline.approvalOpinion"
:rows="4"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
</a-form-model>
</a-modal>
</div>
</template>
<script>
import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
import PersonnelSelection from '@/components/PersonnelSelection/index'
import moment from 'moment'
import { mapGetters } from 'vuex'
export default {
name: 'batchProcessing',
components: {
PersonnelSelection
},
data() {
return {
formInline: {},
rules: {
flag: [
{
required: true,
message: this.$t('reviewResults') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
dreUserIdName: [
{
required: true,
message: this.$t('selectInquiry') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
approvalOpinion: [
{
max: 300,
message: this.$t('feedbackMessage') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur'
}
]
},
confirmLoading: false,
visible: false,
selectedRowKeys: [],
issue: false,
isTrue: false,
taskDefinitionKey: '',
taskIds: [],
projectLawsInventoryIds: []
}
},
methods: {
...mapGetters(['userInfo']),
getData(data) {
this.selectedRowKeys = data
this.taskDefinitionKey = this.selectedRowKeys[0].taskDefinitionKey
this.taskIds = []
this.projectLawsInventoryIds = []
this.selectedRowKeys.forEach(res => {
this.taskIds.push(res.taskId)
this.projectLawsInventoryIds.push(res.projectLawsInventoryId)
})
this.confirmLoading = false
this.visible = true
this.isTrue = false
this.$nextTick(() => {
this.formInline = {}
this.$refs.ruleForm.clearValidate()
})
},
sendBackClick() {
this.formInline.flag = '1'
this.handleOk()
},
flagChange(event) {
if (event.target.value == 3) {
this.isTrue = true
} else {
this.isTrue = false
}
},
PersonnelSelectionChange(value, id) {
this.formInline[value] = id
this.formInline = { ...this.formInline }
},
addBatch() {
let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
let query = {
rejectUserId: this.userInfo().id,
rejectTime: rejectTime,
rejectCause: this.formInline.approvalOpinion,
taskIds: this.taskIds.join(','),
rejectType: '1'
}
postAction('/project/projectLawsInventoryRejectCauseEO/addBatch', query).then((res) => {
})
},
handleOk() {
this.$refs.ruleForm.validate(valid => {
if (valid) {
let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
let query = {
...this.formInline,
taskIds: this.taskIds.join(','),
userId: this.userInfo().id,
taskDefinitionKey: this.taskDefinitionKey,
handlingTime: handlingTime,
projectLawsInventoryIds: this.projectLawsInventoryIds.join(',')
}
if (this.formInline.flag == '1') {
this.addBatch()
}
if (!this.formInline.flag) {
query.flag = '0'
}
this.confirmLoading = true
postAction('/workFlow/completeTaskBatch', query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.visible = false
this.confirmLoading = false
this.$emit('batchProcessingForm')
} else {
this.confirmLoading = false
this.$message.warning(this.$t('operationFailed'))
}
})
}
})
},
handleCancel() {
this.visible = false
}
}
}
</script>
<style scoped>
.box-title-text {
line-height: 1.4;
display: flex;
}
.title-text {
width: 84px;
text-align: right;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
line-height: 42px;
}
.box-input {
display: inline-block;
height: 38px;
width: 100%;
}
.itemModel {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
}
.title-text-text {
margin-top: 9px;
}
.formAdd {
margin-bottom: 40px;
}
.Required {
color: red;
margin-right: 4px;
}
</style>
jero-web/src/views/toDoCenter/taskConfirmation/index.vue
+354
View File
@@ -0,0 +1,354 @@
<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">
<div class="title-text" :title="$t('RelatedItems')">
<span>{{$t('RelatedItems')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('RelatedItems')"
v-model="queryParam.projectName"></a-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('standardInformation')">
<span>{{$t('standardInformation')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardInformation')"
v-model="queryParam.serialNumber"></a-input>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
</a-col>
</span>
</a-row>
</a-form>
</div>
<div class="table-operator" style="margin-bottom: 16px">
<div @click="batchProcessingClick"
class="operator-text">
<a-icon type="apartment"/>
{{$t('batchProcessing')}}
</div>
</div>
<div>
<a-table
ref="table"
size="middle"
:loading="loading"
:pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 140px)'}"
:data-source="dataSource"
:rowKey="(record)=>JSON.stringify(record)"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="columns"
>
<!-- -->
<span slot="operation" slot-scope="text,record">
<a class="text-operation"
@click="ProcessingClick(record)">{{$t('Processing')}}</a>
</span>
<span slot="RelatedItems" slot-scope="text,record">
<a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
</span>
<span slot="standardInformation" slot-scope="text,record">
<a @click="standardInformationClick(record)" :title="text">{{text}}</a>
</span>
</a-table>
<div class="page" v-if="dataSource && dataSource.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="pageOnChange"
@showSizeChange="SizeChange"
/>
</div>
</div>
<batchProcessing ref="batchProcessingRef" @batchProcessingForm="batchProcessingForm"/>
</a-card>
</template>
<script>
import batchProcessing from './components/batchProcessing'
import { getAction, postAction, deleteAction } from '@/api/manage'
export default {
name: 'index',
components: {
batchProcessing
},
data() {
return {
dataSource: [],
queryParam: {},
loading: false,
columns: [
{
title: this.$t('RelatedItems'),
align: 'center',
dataIndex: 'projectName',
ellipsis: true,
scopedSlots: { customRender: 'RelatedItems' },
width: 170
},
{
title: this.$t('standardInformation'),
align: 'center',
dataIndex: 'serialNumber',
ellipsis: true,
scopedSlots: { customRender: 'standardInformation' },
width: 170
},
{
title: this.$t('taskType'),
align: 'center',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
},
{
title: this.$t('Sponsor'),
align: 'center',
dataIndex: 'createBy',
ellipsis: true,
width: 170
},
{
title: this.$t('TaskCutOffTime'),
align: 'center',
dataIndex: 'endTime',
ellipsis: true,
width: 170
},
{
title: this.$t('taskStatus'),
align: 'center',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
},
{
title: this.$t('operation'),
align: 'center',
fixed: 'right',
width: 120,
scopedSlots: { customRender: 'operation' }
}
],
selectedRowKeys: [],
pageSize: 10,
pageNo: 1,
total: 0,
url: {
list: '/todoCenter/projectProcess/todoTaskList'
}
}
},
mounted() {
this.getList()
},
methods: {
RelatedItemsClick(item) {
let newUrl = this.$router.resolve({
path: '/ProjectDetails',
query: {
id: item.projectLibraryId,
projectName: item.projectName,
projectNameId: item.projectNameId,
targetMarket: item.targetMarket,
studioEngineer: item.studioEngineer
}
})
window.open(newUrl.href, '_blank')
},
standardInformationClick(item) {
let newUrl = this.$router.resolve({
path: '/docManage/library/detail',
query: {
id: item.projectLawsInventoryId
}
})
window.open(newUrl.href, '_blank')
},
batchProcessingForm() {
this.selectedRowKeys = []
this.getList()
},
batchProcessingClick() {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
let content = []
selectedRowKeys.forEach(res => {
content.push(JSON.parse(res))
})
for (let i = 0; i < content.length; i++) {
if (content[i].taskDefinitionKey != content[0].taskDefinitionKey) {
this.$message.warning(this.$t('processNodesAreInconsistentPleaseSelectConsistentData'))
return
}
}
this.$refs.batchProcessingRef.getData(JSON.parse(JSON.stringify(content)))
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
},
searchQuery() {
this.selectedRowKeys = []
this.pageNo = 1
this.getList()
},
searchReset() {
this.selectedRowKeys = []
this.pageNo = 1
this.queryParam = {}
this.getList()
},
ProcessingClick(row) {
let query = {}
if (row.flowType == '1') {
query = {
taskDefinitionKey: row.taskDefinitionKey,
taskIds: row.taskId,
prcType: row.flowType,
prcNum: row.prcNum,
isTrue: true
}
let newUrl = this.$router.resolve({
path: '/handshakeProcess',
query: query
})
window.open(newUrl.href, '_blank')
}
},
onSelectChange(value) {
this.selectedRowKeys = []
if (value && value.length > 0) {
value.forEach(res => {
res = JSON.parse(res)
if (res.flowType == '1') {
this.selectedRowKeys.push(JSON.stringify(res))
} else {
this.$message.warning(this.$t('onlyDataTaskConfirmationProcessSelected'))
}
})
}
},
pageOnChange(page) {
this.pageNo = page
this.getList()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
},
getList() {
let queryParam = JSON.parse(JSON.stringify(this.queryParam))
Object.keys(queryParam).forEach(val => {
if (queryParam[val] instanceof Array) {
queryParam[val] = queryParam[val].join(',')
}
})
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
flowType: '1',
...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>
<style scoped lang="less">
@import '~@assets/less/common.less';
.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;
/*margin-top: 2px;*/
}
.text-operation {
margin-right: 8px;
}
.itemModel {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
}
.Required {
color: red;
margin-right: 4px;
}
::v-deep .ant-table-row:first-child {
background: #fff !important;
opacity: 0.9;
}
::v-deep .ant-table-body {
background: transparent !important;
}
.page {
text-align: right;
margin-top: 20px;
}
</style>