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:
super_liu
2022-04-11 16:22:53 +08:00
parent 43ff7675c9 10c4f5b718
commit 476422edfd
11 changed files with 329 additions and 997 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+1 -1
View File
@@ -502,7 +502,7 @@ export default {
this.oldData = JSON.parse(JSON.stringify(newArr)) this.oldData = JSON.parse(JSON.stringify(newArr))
let arr = [] let arr = []
newArr.forEach(item => { newArr.forEach(item => {
if (item.state != '3') { if (item.state !== '3') {
arr.push(item) arr.push(item)
} }
}) })
src/pages/processCenter/pages/phone/bzqdfb/step2.vue
-541
View File
@@ -1,541 +0,0 @@
<!--标准法规清单发布 - 会签-->
<template>
<div class="phoneBzqdfbStep4 phoneBox">
<ProcessHeaderPhone toggle>
<template slot="proName">标准清单发布/更新流程</template>
<template slot="proNode">会签</template>
</ProcessHeaderPhone>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<process-title>
<template slot="title">基础信息</template>
</process-title>
<el-form
:model="listForm"
class="label-input-form prc-content-border"
label-width="150px"
>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="清单名称" prop="listName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="listForm.listName"
placeholder="请输入清单名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="listForm.descriptionList"
placeholder="请输入清单说明"
clearable
></el-input>
</el-form-item>
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="fileList.length > 0">
<p v-for="item in fileList"
:key="item.id" @click="clickButtonToUpload2(item.id)">
{{ item.name }}
<i
title="下载"
@click="downloadFile(item.id)"
class="icon-download"
v-btn-permission="''"
/>
<i
title="下载带水印"
@click="downloadFileByWater(item.id, item.name)"
class="icon-download2"
v-btn-permission="''"
/>
</p>
</div>
<div v-else>
暂无数据
</div>
</el-form-item>
</el-col>
</el-row>
</el-form>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<el-table
:data="dataList"
border
tooltip-effect="dark"
height="50%"
style="width: 100%"
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
prop="code"
min-width="160"
align="center"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standSortShow }}
{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="standName"
label="标准名称"
align="center"
width="260px"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
min-width="80"
label="发布日期">
</el-table-column>
<el-table-column
prop="XCXSSRQ"
min-width="130"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="ZCCSSRQ"
min-width="130"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
width="100px"
align="center"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '3'">
<Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
</div>
<ProcessFooter
show-back
show-submit
show-transfer
:transfer-loading="isTransfer"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:approval="true"
@transfer="handleTransfer"
@back="beforeBack"
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="modalshowflag"
@checkedRole="drawerCheck"
/>
</div>
</template>
<script>
import { Dialog } from 'vant';
import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js"
import axios from "axios";
export default {
name: "phoneBzqdfbStep4",
components: {
ProcessHeader,
ProcessFooter,
ProcessHeaderPhone,
ProcessTitle
},
data() {
return {
detailData: [],
// 当前流程类型(1待办/2已办)
processType: 1,
loading: false,
nodeList:[],
dataList: [],//清单里的标准数据
active: "1",
userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
listType: "country", //选择的清单类型
isSubmit: false,
isTransfer: false,
drawerTitle:'',
saveLoading: false,
tabValue: "listOfCountries",
selectedList: [], //选择清单的选择框
selectList: [], //选择标准的选择框
bringData: [],
fileList:[],
fileIds: "",
commentText: "", //填写会签意见
// 调整处理人抽屉状态
drawerModal: false,
page: 1,
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
listForm: {
listType: "", //区分是哪个清单
listName: "", //清单名称
// applyRegion: "", //适用区域
descriptionList: "", //清单说明
enclosure: "", //附件
inforlist: "",//用来存放标准的id
dataList: [{
standNumber: "", //标准号
cnName: "", //中文名称
enName: "", //英文名称
isSubTime: "", //发布日期
newCarTime: "", //新车型实施日期
oldCarTime: "", //在产车实施日期
applyCar: "", //适用车型
textState: "", //文本状态
id: ""
}]
},
choiceForm: {}, //选择标准清单列表
// countryOptions: [], //适用区域下拉框数据
user1: "",
user2: "",
user3: "",
user4: "",
user5: "",
standMap: new Map(),
textStatusMap: {}// 文本状态id与name对应
};
},
methods: {
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : "",
shunxu: this.shunxu
}, {
loading: "loading",
_this: this
}, res => {
this.detailData = res;
}, e => {
});
},
//tab发生变化
handleTabs(name) {
this.active = name;
},
choiceShow() {
this.ListModel = true;
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
}
}).catch(e => {
});
});
},
/**
* @description: 动态表单读取
*/
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.dataList = item.dataList;
this.listForm.jlUserId = item.jlUserId;
this.listForm.zrUserId = item.zrUserId;
item.fileName.forEach(itemId => {
this.fileIds = itemId.id
this.getFileInfo();
});
});
},
// 请求上传的文件信息
getFileInfo() {
this.$http.get("att/attFile/getMultiFileInfos", {
fileIds: this.fileIds
}, {
_this: this
}, res => {
this.$nextTick(() => {
res.data.map(item => {
// 赋值要回显的上传文件内容
this.fileList.push({
name: item.oldFileName,
uid: item.uid,
status: item.status,
id: item.id,
fileSuffix: item.fileSuffix
});
});
});
}, e => {
});
},
//预览
clickButtonToUpload2(file) {
const attId = file
this.$preview(attId)
},
/**
* @Description: 点击下载
*/
downloadFile(attId) {
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
} else {
this.$message.error("请选择要下载的文件");
}
},
downloadFileByWater(attId, fileSuffix) {
if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
this.$message.error('水印下载仅支持PDF,pdf格式文件')
} else {
if (attId != null && attId !== '') {
window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
} else {
this.$message.error('请选择要下载的文件')
}
}
},
//确认转办
checkedRole (data) {
this.assigneeNewLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
} else {
this.$message.warning(res.message)
}
})
},
// 请求转换流程图
processNum (row) {
axios.request({
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
responseType: 'blob',
method: 'get',
params: {
prcNum: this.$route.query.prcNum
}
}).then(res => {
// let blob = new Blob([res.data], {type: 'image/jpg'})
// let url = window.URL.createObjectURL(res.data)
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
},
//提交事件
handleSubmit() {
this.isSubmit = true
this.listForm.commentText = this.commentText;
this.listForm.approvalOpinion = "";
this.listForm.signFlag = "";
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
}, e => {
});
},
//选择标准取消事件
closeDrawer() {
this.ListModel = false;
},
//标准表格选择框改变
selectStandChange(data) {
this.selectList = [];
for (let i = 0; i < data.length; i++) {
this.selectList.push(data[i].id);
}
},
selectThree() {
},
pageChange(page) {
this.page = page;
this.searchData();
},
pageSizeChange(pageSize) {
this.pageSize = this.$store.getters.userInfo.configContent;
this.searchData();
},
// 将文本状态的id与name对应
setMap(data) {
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label);
});
},
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank");
},
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
watch: {},
mounted() {
//从数据库中查询下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", {}, {
_this: this
}, res => {
this.countryOptions = res.data.COUNTRY;
this.standStateOptions = res.data.WBZTCLASS; // 文本状态
this.setMap(this.standStateOptions);
});
this.processTable();
this.getData();
},
};
</script>
<style lang="less" scoped>
@import '~@/assets/styles/phone';
.phoneBzqdfbStep4 {
/deep/.van-dialog__content {
min-height: 300px;
padding: 10px;
}
.prc-content-border {
overflow: auto;
}
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
//.headerTabs {
// height: 52px;
// display: flex;
// align-items: center;
// position: absolute;
// top: 52px;
// right: 10px;
// .headerTabsItem {
// border: 1px solid #c1c1c1;
// padding: 0 5px;
// height: 30px;
// line-height: 30px;
// cursor: pointer;
// }
// .active {
// border: 1px solid #E6A23C;
// color: #fff;
// background: #E6A23C;
// }
//}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
}
}
}
</style>
src/pages/processCenter/pages/phone/bzqdfb/step4.vue
+4 -19
View File
@@ -10,33 +10,19 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div> <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto"> <div style="flex: auto;">
<process-title> <process-title>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</process-title> </process-title>
<el-form <el-form
:model="listForm" :model="listForm"
class="label-input-form prc-content-border" class="label-input-form prc-content-border"
label-width="150px" label-width="100px"
> >
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="清单名称" prop="listName" class="add-form-item form-item-disabled"> <van-field label="清单名称" v-model="listForm.listName" readonly />
<el-input <van-field label="清单说明" v-model="listForm.descriptionList" readonly />
disabled
v-model="listForm.listName"
placeholder="请输入清单名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="listForm.descriptionList"
placeholder="请输入清单说明"
clearable
></el-input>
</el-form-item>
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled"> <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="fileList.length > 0"> <div class="file-box" v-if="fileList.length > 0">
<p v-for="item in fileList" <p v-for="item in fileList"
@@ -167,7 +153,6 @@
check-box check-box
:is-title="drawerTitle" :is-title="drawerTitle"
:is-visible.sync="drawerModal" :is-visible.sync="drawerModal"
@checkedRole="checkedRole"
:nodeList="nodeList" :nodeList="nodeList"
></Role-tree> ></Role-tree>
<phone-role <phone-role
src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue
+3 -4
View File
@@ -10,7 +10,7 @@
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div> <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;"> <div style="flex: auto; ">
<el-form <el-form
ref="bzzqyjForm" ref="bzzqyjForm"
:model="form" :model="form"
@@ -74,15 +74,14 @@
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center" align="center"
sortable
label="章条编号" label="章条编号"
width="101px"> width="70px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center" align="center"
label="章节名称" label="章节名称"
width="200px"> width="180px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
src/pages/processCenter/pages/phone/bzzqyj/step6.vue
+132 -165
View File
@@ -10,7 +10,7 @@
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div> <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;"> <div style="flex: auto; ">
<el-form <el-form
ref="bzzqyjForm" ref="bzzqyjForm"
:model="form" :model="form"
@@ -96,14 +96,13 @@
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center" align="center"
sortable
label="章条编号" label="章条编号"
width="101px"> width="70px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center" align="center"
width="200px" width="180px"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -171,7 +170,6 @@
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit" @submit="handleSubmit"
show-back show-back
@back="handleSubmitNo" @back="handleSubmitNo"
@@ -201,6 +199,7 @@
<script> <script>
import { Dialog } from 'vant'; import { Dialog } from 'vant';
import isMobile from "@/store/isMobile";
import ProcessHeaderPhone from '../../components/ProcessHeaderPhone' import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
@@ -209,56 +208,57 @@
export default { export default {
name: "phoneBzdyStep6", name: "phoneBzdyStep6",
data() { data() {
return { return {
data2: [], data2: [],
itermsConditionsFlag: false, commentText6: '',
itermsConditionsTitle: '', itermsConditionsFlag: false,
drawerModal: false, itermsConditionsTitle: '',
histortData: [], drawerModal: false,
oldData: [], histortData: [],
data: [], oldData: [],
commentText6: "", data: [],
oldText: "", commentText: "",
newText: "", oldText: "",
reason: "", newText: "",
taskIds: this.$route.query.taskIds, reason: "",
pId: this.$route.query.prcId, taskIds: this.$route.query.taskIds,
roleRow: {}, pId: this.$route.query.prcId,
nodeList: [], roleRow: {},
type: "", nodeList: [],
defaultProps: { type: "",
children: "children", defaultProps: {
label: "name" children: "children",
}, label: "name"
treeData: [], // 人员数据 },
modalshowflag: false, // drawer开关 treeData: [], // 人员数据
drawerTitle: "", //drawer标题 modalshowflag: false, // drawer开关
textarea: "", // 意见 drawerTitle: "", //drawer标题
ListModel: false, // 新增编辑抽屉开关 textarea: "", // 意见
active: "1", // 默认显示 ListModel: false, // 新增编辑抽屉开关
isSubmit: false, active: "1", // 默认显示
saveLoading: false, isSubmit: false,
form: { saveLoading: false,
cid: "", // 编号 form: {
endTime: "", // 结束日期 cid: "", // 编号
cname: "", // 名称 endTime: "", // 结束日期
fjList: [], cname: "", // 名称
fjListId: '', fjList: [],
textType: '', fjListId: '',
modelList: [], textType: '',
modelNameList: '', modelList: [],
user7: '', modelNameList: '',
user7Name: '', user7: '',
}, user7Name: ''
formRules: { },
responUserList: [ formRules: {
{required: true, message: "请选择责任人", trigger: "change"} user7: [
] {required: true, message: "请选择审批领导", trigger: "change"}
}, ]
json: {} },
}; json: {}
}, };
},
components: { components: {
[Dialog.Component.name]: Dialog.Component, [Dialog.Component.name]: Dialog.Component,
ProcessHeaderPhone, ProcessHeaderPhone,
@@ -368,122 +368,89 @@
} }
}, },
upload(row, title) { upload(row, title) {
if (row.length > 0) { this.$message.warning('手机端不支持该操作')
var params = {
columnName: {
chapterNumber: "章条编号",
chapterName: "章节名称",
commentText: "修改意见内容（包括理由或依据）",
oldText: "修改前",
newText: "修改后",
reason: "修改理由",
department: "提出部门",
responUserName: "提出人",
stateText: "处理意见",
cause: "原因",
},
dataList: []
};
params.dataList = JSON.parse(JSON.stringify(row));
params.dataList.forEach(item => {
if (item.state === "1") {
item.stateText = "上报";
} else if (item.state === "2") {
item.stateText = "处理后上报";
} else {
item.stateText = "不上报";
}
});
this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
});
} else {
this.$message.warning('无上报数据')
}
}, },
handleTabs(name) { handleTabs(name) {
this.active = name; this.active = name;
}, },
handleSubmit() { handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => { this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) { if (valid) {
this.isSubmit = true; this.isSubmit = true;
var json = this.json; var json = this.json;
json.hqFlag = '0'; json.hqFlag = '0';
json.commentText = this.commentText6; json.commentText = this.commentText6;
json.user7 = this.form.user7; json.user7 = this.form.user7;
json.user7Name = this.form.user7Name; json.user7Name = this.form.user7Name;
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.userId
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success("提交成功"); this.$message.success("提交成功");
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false; this.isSubmit = false;
});
} else {
this.$message.warning('请选择审批领导')
}
})
},
handleSubmitNo() {
if (this.commentText6) {
this.isSubmit = true;
var json = this.json;
json.hqFlag = '1';
json.commentText = this.commentText6;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success("驳回成功");
this.$router.push("/processCenter");
}
this.isSubmit = false;
});
} else {
this.$message.warning("请输入反馈意见");
}
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg);
this.form.fjList = data.fjList || data.form.fjList
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.commentText6 = data.commentText6 || ''
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
let newArr = data.info ? data.info : data.form.data
this.oldData = JSON.parse(JSON.stringify(newArr))
let arr = []
newArr.forEach(item => {
if (item.state != '3') {
arr.push(item)
}
})
this.json = data
this.data2 = newArr
this.data = arr
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.form.modelNameList = data.modelNameList || data.form.modelNameList
}).catch(e => {
});
}); });
} else {
this.$message.warning('请选择审批领导')
}
})
},
handleSubmitNo() {
if (this.commentText6) {
this.isSubmit = true;
var json = this.json;
json.hqFlag = '1';
json.commentText = this.commentText6;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success("驳回成功");
this.$router.push("/processCenter");
}
this.isSubmit = false;
});
} else {
this.$message.warning("请输入反馈意见");
} }
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg);
this.commentText6 = data.commentText6 || ''
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.fjList || data.form.fjList
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.form.user7 = data.form ? data.form.user7 : (data.user7 ? data.user7 : '')
this.form.user7Name = data.form ? data.form.user7Name : (data.user7Name ? data.user7Name : '')
let newArr = data.info ? data.info : data.form.data
this.oldData = JSON.parse(JSON.stringify(newArr))
let arr = []
newArr.forEach(item => {
if (item.state !== '3') {
arr.push(item)
}
})
this.json = data
this.data2 = newArr
this.data = arr
}).catch(e => {
});
});
}
}, },
mounted() { mounted() {
this.getHistoryData(); this.getHistoryData();
src/pages/processCenter/pages/phone/bzzqyj/step7.vue
+72 -107
View File
@@ -10,7 +10,7 @@
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div> <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;"> <div style="flex: auto; ">
<el-form <el-form
ref="bzzqyjForm" ref="bzzqyjForm"
:model="form" :model="form"
@@ -86,14 +86,13 @@
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center" align="center"
sortable
label="章条编号" label="章条编号"
width="101px"> width="70px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center" align="center"
width="200px" width="180px"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -161,7 +160,6 @@
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit" @submit="handleSubmit"
show-back show-back
@back="handleSubmitNo" @back="handleSubmitNo"
@@ -322,113 +320,80 @@
return "处理后上报"; return "处理后上报";
} }
}, },
upload(row, title) { upload(row, title) {
if (row.length > 0) { this.$message.warning('手机端不支持该操作')
var params = { },
columnName: {
chapterNumber: "章条编号",
chapterName: "章节名称",
commentText: "修改意见内容（包括理由或依据）",
oldText: "修改前",
newText: "修改后",
reason: "修改理由",
department: "提出部门",
responUserName: "提出人",
stateText: "处理意见",
cause: "原因",
},
dataList: []
};
params.dataList = JSON.parse(JSON.stringify(row));
params.dataList.forEach(item => {
if (item.state === "1") {
item.stateText = "上报";
} else if (item.state === "2") {
item.stateText = "处理后上报";
} else {
item.stateText = "不上报";
}
});
this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
});
} else {
this.$message.warning('无上报数据')
}
},
handleTabs(name) { handleTabs(name) {
this.active = name; this.active = name;
}, },
handleSubmit() { handleSubmit() {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.bdFlag = '0' json.bdFlag = '0'
json.commentText = this.commentText7 json.commentText = this.commentText7
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.userId
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('提交成功') this.$message.success('提交成功')
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
this.isSubmit = false this.isSubmit = false
}) })
}, },
handleSubmitNo() { handleSubmitNo() {
if (this.commentText7) { if (this.commentText7) {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.bdFlag = '1' json.bdFlag = '1'
json.commentText = this.commentText7 json.commentText = this.commentText7
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.userId
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('驳回成功') this.$message.success('驳回成功')
this.$router.push('/processCenter') this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
} }
}, this.isSubmit = false
getData() { })
return new Promise((resolve, reject) => { } else {
inboundLiaisonDetail({ this.$message.warning('请输入反馈意见')
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg);
this.form.fjList = data.fjList || data.form.fjList
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.commentText7 = data.commentText7 || ''
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))
var arr = []
data.info.forEach(item => {
if (item.state != '3') {
arr.push(item)
}
})
this.json = data
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.form.modelNameList = data.modelNameList || data.form.modelNameList
this.data = arr
}).catch(e => {
});
});
} }
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.commentText7 = data.commentText7 || ''
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.fjList || data.form.fjList
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
let newArr = data.info ? data.info : data.form.data
this.oldData = JSON.parse(JSON.stringify(newArr))
let arr = []
newArr.forEach(item => {
if (item.state !== '3') {
arr.push(item)
}
})
this.json = data
this.data2 = newArr
this.data = arr
}).catch(e => {
})
})
},
}, },
mounted() { mounted() {
this.getHistoryData(); this.getHistoryData();
src/pages/processCenter/pages/phone/bzzqyj/step8.vue
+71 -105
View File
@@ -3,14 +3,14 @@
<!-- 标准调研流程--> <!-- 标准调研流程-->
<ProcessHeaderPhone toggle> <ProcessHeaderPhone toggle>
<template slot="proName">标准征求意见流程</template> <template slot="proName">标准征求意见流程</template>
<template slot="proNode">技术管理中心主任审定</template> <template slot="proNode">审定</template>
</ProcessHeaderPhone> </ProcessHeaderPhone>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div> <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;"> <div style="flex: auto; ">
<el-form <el-form
ref="bzzqyjForm" ref="bzzqyjForm"
:model="form" :model="form"
@@ -86,14 +86,13 @@
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center" align="center"
sortable
label="章条编号" label="章条编号"
width="101px"> width="70px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center" align="center"
width="200px" width="180px"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -323,114 +322,81 @@
} }
}, },
upload(row, title) { upload(row, title) {
if (row.length > 0) { this.$message.warning('手机端不支持该操作')
var params = {
columnName: {
chapterNumber: "章条编号",
chapterName: "章节名称",
commentText: "修改意见内容（包括理由或依据）",
oldText: "修改前",
newText: "修改后",
reason: "修改理由",
department: "提出部门",
responUserName: "提出人",
stateText: "处理意见",
cause: "原因",
},
dataList: []
};
params.dataList = JSON.parse(JSON.stringify(row));
params.dataList.forEach(item => {
if (item.state === "1") {
item.stateText = "上报";
} else if (item.state === "2") {
item.stateText = "处理后上报";
} else {
item.stateText = "不上报";
}
});
this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
});
} else {
this.$message.warning('无上报数据')
}
}, },
handleTabs(name) { handleTabs(name) {
this.active = name; this.active = name;
}, },
handleSave() { handleSave() {
}, },
handleSubmit() { handleSubmit() {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.directorFlag = '0' json.directorFlag = '0'
json.commentText = this.commentText8 json.commentText = this.commentText8
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.userId
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('提交成功') this.$message.success('提交成功')
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
this.isSubmit = false this.isSubmit = false
}) })
}, },
handleSubmitNo() { handleSubmitNo() {
if (this.commentText8) { if (this.commentText8) {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.directorFlag = '1' json.directorFlag = '1'
json.commentText = this.commentText8 json.commentText = this.commentText8
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.userId
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('驳回成功') this.$message.success('驳回成功')
this.$router.push('/processCenter') this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
} }
}, this.isSubmit = false
getData() { })
return new Promise((resolve, reject) => { } else {
inboundLiaisonDetail({ this.$message.warning('请输入反馈意见')
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg);
this.form.fjList = data.fjList || data.form.fjList
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))
var arr = []
this.commentText8 = data.commentText8 || ''
data.info.forEach(item => {
if (item.state != '3') {
arr.push(item)
}
})
this.json = data
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.form.modelNameList = data.modelNameList || data.form.modelNameList
this.data = arr
}).catch(e => {
});
});
} }
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.commentText8 = data.commentText8 || ''
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.fjList || data.form.fjList
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
let newArr = data.info ? data.info : data.form.data
this.oldData = JSON.parse(JSON.stringify(newArr))
let arr = []
newArr.forEach(item => {
if (item.state !== '3') {
arr.push(item)
}
})
this.json = data
this.data2 = newArr
this.data = arr
}).catch(e => {
})
})
},
}, },
mounted() { mounted() {
this.getHistoryData(); this.getHistoryData();
src/pages/processCenter/pages/phone/bzzqyj/step9.vue
+6 -37
View File
@@ -10,7 +10,7 @@
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div> <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;"> <div style="flex: auto; ">
<el-form <el-form
ref="bzzqyjForm" ref="bzzqyjForm"
:model="form" :model="form"
@@ -86,14 +86,13 @@
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center" align="center"
sortable
label="章条编号" label="章条编号"
width="101px"> width="70px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center" align="center"
width="200px" width="180px"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -337,39 +336,9 @@
return "处理后上报"; return "处理后上报";
} }
}, },
upload(row, title) { upload(row, title) {
if (row.length > 0) { this.$message.warning('手机端不支持该操作')
var params = { },
columnName: {
chapterNumber: "章条编号",
chapterName: "章节名称",
commentText: "修改意见内容（包括理由或依据）",
oldText: "修改前",
newText: "修改后",
reason: "修改理由",
department: "提出部门",
responUserName: "提出人",
stateText: "处理意见",
cause: "原因",
},
dataList: []
};
params.dataList = JSON.parse(JSON.stringify(row));
params.dataList.forEach(item => {
if (item.state === "1") {
item.stateText = "上报";
} else if (item.state === "2") {
item.stateText = "处理后上报";
} else {
item.stateText = "不上报";
}
});
this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
});
} else {
this.$message.warning('无上报数据')
}
},
handleTabs(name) { handleTabs(name) {
this.active = name; this.active = name;
}, },
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+26 -5
View File
@@ -1812,6 +1812,8 @@ export default {
}, },
data() { data() {
return { return {
seniorQuery: false, // 是否为高级查询
seniorQueryForm: {},
// 人员树形和部门树形参数 // 人员树形和部门树形参数
nodeList: [], nodeList: [],
nodeList2: [], nodeList2: [],
@@ -3146,6 +3148,13 @@ export default {
}, },
// 点击搜索按钮 // 点击搜索按钮
searchBtnClick() { searchBtnClick() {
if (this.seniorQuery === true) {
this.standCommonlySearch.page = 1
this.seniorQuery = false
}
for (let key in this.sarStandardsSearch) {
this.sarStandardsSearch[key] = ''
}
this.getDomesticStandardTable() this.getDomesticStandardTable()
}, },
// 搜索 // 搜索
@@ -3190,6 +3199,8 @@ export default {
item.page = 1 item.page = 1
this.standCommonlySearch.page = 1 this.standCommonlySearch.page = 1
this.standCommonlySearch.sarStandardsSearch = JSON.stringify(item) || '' this.standCommonlySearch.sarStandardsSearch = JSON.stringify(item) || ''
this.seniorQuery = true
this.seniorQueryForm = item
this.getDomesticStandardTable(item) this.getDomesticStandardTable(item)
}, },
// 清空搜索框 // 清空搜索框
@@ -3883,13 +3894,23 @@ export default {
// 分页点击后方法 // 分页点击后方法
pageChange(page) { pageChange(page) {
this.standCommonlySearch.page = page this.standCommonlySearch.page = page
this.getDomesticStandardTable() if (this.seniorQuery === false) {
this.getDomesticStandardTable()
} else {
this.seniorQueryForm.page = page
this.getDomesticStandardTable(this.seniorQueryForm)
}
}, },
// 分页每页显示数改变后方法 // 分页每页显示数改变后方法
pageSizeChange(pageSize) { pageSizeChange(pageSize) {
this.standCommonlySearch.pageSize = pageSize this.standCommonlySearch.pageSize = pageSize
this.standCommonlySearch.page = 1 this.standCommonlySearch.page = 1
this.getDomesticStandardTable() if (this.seniorQuery === false) {
this.getDomesticStandardTable()
} else {
this.seniorQueryForm.page = page
this.getDomesticStandardTable(this.seniorQueryForm)
}
}, },
/** /**
* // 分页查询标准 * // 分页查询标准
@@ -4031,9 +4052,9 @@ export default {
this.advanceSearchMapping[key] = '' this.advanceSearchMapping[key] = ''
} }
//情况基本字段 //情况基本字段
for (let key in this.sarStandardsSearch) { // for (let key in this.sarStandardsSearch) {
this.sarStandardsSearch[key] = '' // this.sarStandardsSearch[key] = ''
} // }
}, },
// 查询处于游离态的标准 // 查询处于游离态的标准
selectConfiguraStand() { selectConfiguraStand() {
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+14 -3
View File
@@ -932,6 +932,7 @@ export default {
}, },
// 切换tabs // 切换tabs
handleClick(tab, event) { handleClick(tab, event) {
this.page = 1
this.localProEO.prodectCode = this.ifMaintaince; this.localProEO.prodectCode = this.ifMaintaince;
this.insideHandleClick(); this.insideHandleClick();
}, },
@@ -1203,8 +1204,9 @@ export default {
}, },
// 条件分页查询 // 条件分页查询
getLocalProductTableBtn() { getLocalProductTableBtn() {
this.page = 1
this.projectLibrarySearch.page = 1; this.projectLibrarySearch.page = 1;
this.isAdvancedSearch = false; this.isAdvancedSearch = true;
this.getLocalProductTable(); this.getLocalProductTable();
}, },
// 查询本地产品 // 查询本地产品
@@ -1236,6 +1238,7 @@ export default {
}, },
getLocalProductTableBtns() { getLocalProductTableBtns() {
this.page = 1
this.projectLibrarySearch.page = 1; this.projectLibrarySearch.page = 1;
this.isAdvancedSearch = false; this.isAdvancedSearch = false;
this.getLocalProductTables(); this.getLocalProductTables();
@@ -1415,12 +1418,20 @@ export default {
// 分页点击后方法 // 分页点击后方法
pageChange(page) { pageChange(page) {
this.page = page; this.page = page;
this.getLocalProductTable(); if (this.isAdvancedSearch = true) {
this.getLocalProductTable()
} else {
this.getLocalProductTables()
}
}, },
// 分页每页显示数改变后方法 // 分页每页显示数改变后方法
pageSizeChange(pageSize) { pageSizeChange(pageSize) {
this.pageSize = pageSize; this.pageSize = pageSize;
this.getLocalProductTable(); if (this.isAdvancedSearch = true) {
this.getLocalProductTable()
} else {
this.getLocalProductTables()
}
// 此处需要调用接口，修改个人配置 // 此处需要调用接口，修改个人配置
}, },
/** /**
src/router/index.js
-10
View File
@@ -2423,16 +2423,6 @@ const routes = [
title: '标准清单发布/更新流程' title: '标准清单发布/更新流程'
} }
}, },
{
path: '/phoneBzqdfbStep2',
name: 'phoneBzqdfbStep2',
component: () => import('@/pages/processCenter/pages/phone/bzqdfb/step2.vue'),
meta: {
isBoolean: true,
requireAuth: true,
title: '标准清单发布/更新流程'
}
},
{ {
path: '/phoneBzpgStep2', path: '/phoneBzpgStep2',
name: 'phoneBzpgStep2', name: 'phoneBzpgStep2',