FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhutianqi
2021-09-16 18:01:35 +08:00
parent 538f718b89 d55e5076f5
commit f3217c0fbb
8 changed files with 1273 additions and 1231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home1/components/empennage/index.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="link"> <div class="link">
<ul> <ul>
<li v-for="(link, index) in linkList" v-if="index<5" :key="index"> <li v-for="(link, index) in linkList" v-if="index<5" :key="index">
<a v-if="link.name.length>15" @click="openLinkUrl(link.url)" v-html="link.name.substring(0,15)+'...'" :title="link.name"></a> <a v-if="link.name.length>13" @click="openLinkUrl(link.url)" v-html="link.name.substring(0,13)+'...'" :title="link.name"></a>
<a v-else @click="openLinkUrl(link.url)" v-html="link.name" :title="link.name"></a> <a v-else @click="openLinkUrl(link.url)" v-html="link.name" :title="link.name"></a>
src/pages/home1/components/solicitopinions/index.vue
+2 -7
View File
@@ -4,7 +4,7 @@
<ul> <ul>
<li v-for="item in domesticDynamics" :key="item.id" class="time-title"> <li v-for="item in domesticDynamics" :key="item.id" class="time-title">
<div style="height: 18px"> <div style="height: 18px">
<a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cname }}</a> <a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cid }}</a>
<span class="time">{{ item.endTime }}</span> <span class="time">{{ item.endTime }}</span>
</div> </div>
</li> </li>
@@ -44,12 +44,7 @@ export default {
}, { }, {
_this: this _this: this
}, res => { }, res => {
let arr = res.data.records; this.domesticDynamics = res.data.records
arr.forEach(item => {
if (item.cname !== "") {
this.domesticDynamics.push(item);
}
});
}, e => { }, e => {
}); });
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+20 -16
View File
@@ -863,7 +863,7 @@
<el-form-item prop="zrUserName" style="margin-bottom: 0"> <el-form-item prop="zrUserName" style="margin-bottom: 0">
<h4>会签责任人</h4> <h4>会签责任人</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.zrUserName" placeholder="选择会签责任人" @click.native="choiceZRR('zrUserId', '选择责任人', form.zrUserId)"> <el-input v-model="roleForm.zrUserName" placeholder="选择会签责任人" @click.native="choiceZRRS('zrUserId', '选择责任人', form.zrUserId)">
</el-input></div> </el-input></div>
</el-form-item> </el-form-item>
</el-card> </el-card>
@@ -1598,16 +1598,16 @@
}, },
}, },
methods: { methods: {
choiceZRRS () { // choiceZRRS () {
if (this.userType === 'zrUserId') { // if (this.userType === 'zrUserId') {
this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",") // this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",")
this.roleForm.zrUserName = this.zrUserIds.map(item => item.name).join(",") // this.roleForm.zrUserName = this.zrUserIds.map(item => item.name).join(",")
} // }
this.modalshowflag2 = true // this.modalshowflag2 = true
}, // },
checkedRole2 (data) { checkedRole2 (data) {
var idList = '' let idList = ''
var nameList = '' let nameList = ''
data.forEach( item => { data.forEach( item => {
if (nameList.length > 0) { if (nameList.length > 0) {
nameList += ',' nameList += ','
@@ -1616,17 +1616,13 @@
idList += item.id idList += item.id
nameList += item.name nameList += item.name
}) })
this.zrUserIds = idList this.roleForm.zrUserId=idList;
this.zrUserIds = nameList this.roleForm.zrUserName=nameList;
}, },
checkedRole (data) { checkedRole (data) {
if (this.userType === 'jlUserId') { if (this.userType === 'jlUserId') {
this.roleForm.jlUserId = data[0].id this.roleForm.jlUserId = data[0].id
this.roleForm.jlUserName = data[0].name this.roleForm.jlUserName = data[0].name
}else if(this.userType === 'zrUserId'){
this.roleForm.zrUserId=data[0].id;
this.roleForm.zrUserName=data[0].name;
} }
@@ -1898,6 +1894,14 @@
this.drawerTitle = title this.drawerTitle = title
this.modalShowFlag = true this.modalShowFlag = true
}, },
choiceZRRS (type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag = true
},
choiceZRR1 (type, title, id) { choiceZRR1 (type, title, id) {
this.drawerTitle = title this.drawerTitle = title
this.modalShowFlag1 = true this.modalShowFlag1 = true
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+52 -20
View File
@@ -516,14 +516,6 @@
ref="formTongGuo" ref="formTongGuo"
:model="formTongGuo" :model="formTongGuo"
:rules="rules"> :rules="rules">
<el-form-item
prop="approvalOpinion"
>
<el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">
<el-option label="驳回" value="1"></el-option>
<el-option label="通过" value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item <el-form-item
prop="commentText" prop="commentText"
> >
@@ -557,7 +549,8 @@
<h4>责任人</h4> <h4>责任人</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="user2" placeholder="选择责任人"> <el-input v-model="user2" placeholder="选择责任人">
</el-input></div> </el-input>
</div>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<el-timeline-item timestamp="填写意见" placement="top" :color="user3 ? '#66b1ff' : ''"> <el-timeline-item timestamp="填写意见" placement="top" :color="user3 ? '#66b1ff' : ''">
@@ -661,10 +654,12 @@
:show-save="false" :show-save="false"
show-submit show-submit
show-transfer show-transfer
show-back
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@transfer="handleTransfer" @transfer="handleTransfer"
@save="handleSave" @save="handleSave"
@back="handleSubmitNo"
@submit="handleSubmit" @submit="handleSubmit"
> >
</ProcessFooter> </ProcessFooter>
@@ -686,6 +681,7 @@
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew} from 'api/process' import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew} from 'api/process'
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import {completeTask} from "@/api/process";
export default { export default {
name: "bzrkStep2", name: "bzrkStep2",
@@ -977,7 +973,8 @@
_this: this _this: this
}, res => { }, res => {
this.detailData = res this.detailData = res
}, e => {}) }, e => {
})
}, },
getData() { getData() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@@ -1048,7 +1045,41 @@
this.drawerModal = true this.drawerModal = true
this.drawerTitle = '转办处理人' this.drawerTitle = '转办处理人'
}, },
handleSave() {}, handleSave() {
},
// 退回按钮
handleSubmitNo() {
const val = this.form.country;
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
if (val instanceof Array) {
this.form.country = val.join(",");
} else {
this.form.country = val
}
} else if (val === '') {
this.form.country = []
}
this.$refs['formTongGuo'].validate((valid) => {
if (valid) {
this.form.commentText = this.formTongGuo.commentText
this.form.approvalOpinion = '1'
const json = JSON.stringify(this.form);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.warning("驳回成功")
// 流程提交之后，应该流转至待办任务页面
this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
}
})
}
})
},
handleSubmit() { handleSubmit() {
const val = this.form.country; const val = this.form.country;
if (val !== '' && val !== null && typeof (val) !== 'undefined') { if (val !== '' && val !== null && typeof (val) !== 'undefined') {
@@ -1064,7 +1095,7 @@
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
this.form.commentText = this.formTongGuo.commentText this.form.commentText = this.formTongGuo.commentText
this.form.approvalOpinion = this.formTongGuo.approvalOpinion this.form.approvalOpinion = '0'
const json = JSON.stringify(this.form); const json = JSON.stringify(this.form);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds, taskIds: this.taskIds,
@@ -1073,19 +1104,12 @@
}, { }, {
_this: this _this: this
}, res => { }, res => {
console.log(res);
if (res.success) { if (res.success) {
if(this.formTongGuo.approvalOpinion === '1'){
this.$message.warning("驳回成功")
this.isSubmit = false
// 流程提交之后，应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}else{
this.processCreateStand(json) this.processCreateStand(json)
} }
})
} }
}) })
}})
}, },
/** /**
@@ -1147,6 +1171,7 @@
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.bzrkStep2 { .bzrkStep2 {
/deep/ .el-drawer__container { /deep/ .el-drawer__container {
.prc-content-border { .prc-content-border {
@@ -1154,8 +1179,10 @@
padding: 0 20px 0; padding: 0 20px 0;
} }
} }
position: relative; position: relative;
height: 100%; height: 100%;
.headerTabs { .headerTabs {
height: 52px; height: 52px;
display: flex; display: flex;
@@ -1163,6 +1190,7 @@
position: absolute; position: absolute;
top: 0; top: 0;
right: 10px; right: 10px;
.headerTabsItem { .headerTabsItem {
border: 1px solid #c1c1c1; border: 1px solid #c1c1c1;
padding: 0 5px; padding: 0 5px;
@@ -1170,18 +1198,21 @@
line-height: 30px; line-height: 30px;
cursor: pointer; cursor: pointer;
} }
.active { .active {
border: 1px solid #E6A23C; border: 1px solid #E6A23C;
color: #fff; color: #fff;
background: #E6A23C; background: #E6A23C;
} }
} }
.content { .content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
height: calc(~'100% - 103px'); height: calc(~'100% - 103px');
overflow: auto; overflow: auto;
.tableTitle { .tableTitle {
margin-bottom: 10px; margin-bottom: 10px;
height: 30px; height: 30px;
@@ -1189,6 +1220,7 @@
position: relative; position: relative;
font-size: 13px; font-size: 13px;
font-weight: bold; font-weight: bold;
.tableButton { .tableButton {
position: absolute; position: absolute;
right: 0; right: 0;
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+1 -1
View File
@@ -67,7 +67,7 @@
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
@click="upload(oldData, '征求意见搞.xls')" @click="upload(oldData, '征求意见搞.xls')"
size="mini">导出征求意见搞 size="mini">导出征求意见稿
</el-button> </el-button>
</div> </div>
<el-table <el-table
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+18 -7
View File
@@ -181,7 +181,10 @@
label="标准号" label="标准号"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
scope.row.standSortShow
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{
scope.row.standSortShow scope.row.standSortShow
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a> }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
@@ -194,7 +197,8 @@
label="标准名称" label="标准名称"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a> <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -203,7 +207,10 @@
width="110px" width="110px"
label="发布日期"> label="发布日期">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="color: #2d8cf0"> <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
{{ formatIssueDate(scope.row.issueTime) }}
</div>
<div v-else style="color: #2d8cf0">
{{ formatIssueDate(scope.row.issueTime) }} {{ formatIssueDate(scope.row.issueTime) }}
</div> </div>
</template> </template>
@@ -215,7 +222,8 @@
label="实施日期"> label="实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- {{ formatIssueDate(scope.row.putTime) }}--> <!-- {{ formatIssueDate(scope.row.putTime) }}-->
<span style="color: #2d8cf0">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span> <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
<span v-else style="color: #2d8cf0">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -225,7 +233,8 @@
width="150px" width="150px"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="color: #2d8cf0">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span> <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
<span v-else style="color: #2d8cf0">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -234,7 +243,8 @@
width="150px" width="150px"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="color: #2d8cf0">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span> <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
<span v-else style="color: #2d8cf0">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -248,7 +258,8 @@
<!-- </el-tooltip>--> <!-- </el-tooltip>-->
<!-- </template>--> <!-- </template>-->
<template slot-scope="scope"> <template slot-scope="scope">
<span style="color: #2d8cf0">{{ textStatusMap[scope.row.textStatus] }}</span> <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ textStatusMap[scope.row.textStatus] }}</span>
<span v-else style="color: #2d8cf0">{{ textStatusMap[scope.row.textStatus] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right"> <el-table-column label="操作" align="center" width="50" fixed="right">
src/pages/regulatoryRepository/standardForComments/index.vue
+2 -2
View File
@@ -74,11 +74,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="cname" prop="cid"
label="标准名称/政策名称" label="标准名称/政策名称"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.cname }}</a> <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.cid }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+9 -9
View File
@@ -10,21 +10,21 @@
<transition name="el-zoom-in-top"> <transition name="el-zoom-in-top">
<div v-show="heightShow" class="transition-box"> <div v-show="heightShow" class="transition-box">
<p class="transition-box-p"> <p class="transition-box-p">
<label class="transition-box-label">标准号：</label> <label class="transition-box-label">标准名称：</label>
<span class="transition-box-span table-jump" <span class="transition-box-span table-jump"
@click="handlePreview(itemData)" @click="handlePreview(itemData)"
> >
{{ this.$route.query.item.cid }} {{ this.$route.query.item.cid }}
</span> </span>
</p> </p>
<p class="transition-box-p"> <!-- <p class="transition-box-p">-->
<label class="transition-box-label">标准名称：</label> <!-- <label class="transition-box-label">标准名称：</label>-->
<span class="transition-box-span table-jump" <!-- <span class="transition-box-span table-jump"-->
@click="handlePreview(itemData)" <!-- @click="handlePreview(itemData)"-->
> <!-- >-->
{{ this.$route.query.item.cname || '-' }} <!-- {{ this.$route.query.item.cname || '-' }}-->
</span> <!-- </span>-->
</p> <!-- </p>-->
<p class="transition-box-p"> <p class="transition-box-p">
<label class="transition-box-label">附件：</label> <label class="transition-box-label">附件：</label>
<span class="file-box" v-if="fileInfoList.length > 0"> <span class="file-box" v-if="fileInfoList.length > 0">