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

Merge branch 'develop' into 'test'

Browse Source 
Develop

See merge request !116
This commit is contained in:
王夏晖
2021-09-03 01:11:52 +00:00
parent 8378ece942 08237cbf1f
commit 2800ace636
24 changed files with 488 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/components/ProcessFooter.vue
+13
View File
@@ -66,6 +66,15 @@
:loading="submitLoading"
v-if="showSubmit"
>{{ submitBTNTextShow }}</el-button>
<el-button
type="primary"
size="small"
class="common-button-primary"
icon="el-icon-check"
@click="handleSubmit"
:loading="submitLoading"
v-if="showConfirm"
>确认</el-button>
</div>
<!-- 组织机构树 -->
@@ -131,6 +140,10 @@ export default {
type: Boolean,
default: false
},
showConfirm: {
type: Boolean,
default: false
},
// 是否显示委托按钮
showEntrust: {
type: Boolean,
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+50 -45
View File
@@ -593,7 +593,7 @@
class="common-button-primary"
size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="getStandData">
@click="getStandDataBtn">
查询
</el-button>
</el-form-item>
@@ -746,7 +746,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import {saveTaskFirst, queryTaskFirst} from "api/process";
import { saveTaskFirst, queryTaskFirst } from "api/process";
import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
export default {
@@ -774,7 +774,7 @@ export default {
pageSizeNo: this.$store.getters.userInfo.configContent
},
standList: [], //新添加的标准
commentText: '',
commentText: "",
modalshowflag: false, // drawer开关
modalshowflag2: false,
nodeList2: [],
@@ -796,21 +796,21 @@ export default {
},
formRules: {
listType: [
{required: true, message: "请选择清单类型", trigger: "change"}
{ required: true, message: "请选择清单类型", trigger: "change" }
],
listName: [
{required: true, message: "请填写清单名称", trigger: "change"}
{ required: true, message: "请填写清单名称", trigger: "change" }
]
},
roleFormRules: {
dockUserName: [
{required: true, message: "请选择会签责任人", trigger: "change"}
{ required: true, message: "请选择会签责任人", trigger: "change" }
],
ministerUserName: [
{required: true, message: "请选择修订责任人", trigger: "change"}
{ required: true, message: "请选择修订责任人", trigger: "change" }
],
directorUserName: [
{required: true, message: "请选择审批责任人", trigger: "change"}
{ required: true, message: "请选择审批责任人", trigger: "change" }
]
},
dataList: [],//清单里的标准数据
@@ -968,17 +968,17 @@ export default {
this.sarAccessListDatas.forEach(item => {
// 适用车型转换
if (item.carType !== null) {
let k = (item.carType || "").split(',')
let k = (item.carType || "").split(",");
for (let i in this.energyKindOptions) {
for (let m = 0; m < k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label
k[m] = this.energyKindOptions[i].label;
}
item.carType = k.join(',')
item.carType = k.join(",");
}
}
}
})
});
this.total = res.data.total;
}, e => {
});
@@ -1024,6 +1024,11 @@ export default {
};
this.getStandData();
},
//查询标准按钮
getStandDataBtn() {
this.pageNo = 1;
this.getStandData();
},
getStandData() {
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
standType: this.standardSearch.standType,
@@ -1082,14 +1087,14 @@ export default {
//保存事件
handleSave() {
this.saveLoading = true;
this.listForm.fileName = this.fileInfoList
this.listForm.fileName = this.fileInfoList;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("createUser", this.$store.getters.userInfo.userId);
_formData.append("createUserName", this.$store.getters.userInfo.userName);
_formData.append("prcType", "4");
_formData.append("json", JSON.stringify({
taskInfo: '引入法规标准清单',
taskInfo: "引入法规标准清单",
form: this.listForm,
roleForm: this.roleForm,
commentText: this.commentText
@@ -1107,15 +1112,15 @@ export default {
if (this.dataList.length < 1) {
this.$message.warning("标准不能为空");
} else {
this.listForm.commentText = this.commentText
this.listForm.fileName = this.fileInfoList
this.listForm.commentText = this.commentText;
this.listForm.fileName = this.fileInfoList;
var json = Object.assign(this.listForm, this.roleForm);
this.$refs["qdfbForm"].validate((valid) => {
if (valid) {
this.$refs["Form"].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get("lawss/activiti/startProcess", {type: "4"}, {
this.isSubmit = true;
this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
_this: this
}, res => {
if (res.ok) {
@@ -1130,7 +1135,7 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
this.isSubmit = false;
});
}
});
@@ -1148,9 +1153,9 @@ export default {
delFileInfo(file, fileList) {
this.fileInfoList.forEach((item, index) => {
if (item.name === file.name || item.id === file.id) {
this.fileInfoList.splice(index, 1)
this.fileInfoList.splice(index, 1);
}
})
});
},
fileUpload() {
this.fileMadel = true;
@@ -1158,7 +1163,7 @@ export default {
// 上传文件成功回调
uploadBackSuccess(res, file, fileList) {
if (res.ok) {
this.fileInfoList.push(res.data)
this.fileInfoList.push(res.data);
this.$message.success("上传成功");
} else {
this.$message.error(res.message);
@@ -1168,7 +1173,7 @@ export default {
// 相关附件 上传之前钩子
beforeUpload(file) {
var filename = file.name;
this.listForm.fileName = this.listForm.fileName + ',' + file.name
this.listForm.fileName = this.listForm.fileName + "," + file.name;
var index1 = filename.lastIndexOf(".");
var index2 = filename.length;
var fileSuffix = filename.substring(index1, index2);
@@ -1295,30 +1300,30 @@ export default {
this.listForm.descriptionList = this.selectedList[0].remark;
// 将查询出的文件名字和id组合成数组
if (this.selectedList[0].fileName !== null) {
let textName = this.selectedList[0].fileName.split(',').map(item => {
let textName = this.selectedList[0].fileName.split(",").map(item => {
return {
name: item
}
})
let textId = this.selectedList[0].fileIds.split(',').map(item => {
};
});
let textId = this.selectedList[0].fileIds.split(",").map(item => {
return {
id: item
}
})
};
});
textName.forEach(item => {
this.$set(item, 'id', '')
})
this.$set(item, "id", "");
});
for (let i = 0; i < textName.length; i++) {
textName[i].id = textId[i].id
textName[i].id = textId[i].id;
}
this.fileInfoList = textName
this.fileInfoList = textName;
} else {
this.fileInfoList = []
this.fileInfoList = [];
}
this.ListModel = false;
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
{id: this.selectedList[0].id, page: this.page, Size: this.pageSize}, {
{ id: this.selectedList[0].id, page: this.page, Size: this.pageSize }, {
_this: this
}, res => {
if (res.data === null) {
@@ -1327,13 +1332,13 @@ export default {
this.dataList = res.data.records;
this.dataList.forEach(item => {
if (item.xcxssrqgj === null) {
this.$set(item, "XCXSSRQ", '');
this.$set(item, "ZCCSSRQ", '');
this.$set(item, "XCXSSRQ", "");
this.$set(item, "ZCCSSRQ", "");
} else {
this.$set(item, "XCXSSRQ", item.xcxssrqgj);
this.$set(item, "ZCCSSRQ", item.zccssrqgj);
}
})
});
this.listForm.dataList = res.data.records;
let formId = [];
this.dataList.map(item => {
@@ -1355,8 +1360,8 @@ export default {
},
// 表格某一行的单击事件
rowClick(row, column) {
const selectData = this.selectList
this.$refs.selection.clearSelection()
const selectData = this.selectList;
this.$refs.selection.clearSelection();
if (selectData.length === 1) {
selectData.forEach(item => {
// 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
@@ -1367,18 +1372,18 @@ export default {
else {
this.$refs.selection.toggleRowSelection(row, true);
}
})
});
} else {
this.$refs.selection.toggleRowSelection(row, true);
}
},
select(selection, row) {
// 清除 所有勾选项
this.$refs.selection.clearSelection()
this.$refs.selection.clearSelection();
// 当表格数据都没有被勾选的时候 就返回
// 主要用于将当前勾选的表格状态清除
if (selection.length === 0) return
this.$refs.selection.toggleRowSelection(row, true)
if (selection.length === 0) return;
this.$refs.selection.toggleRowSelection(row, true);
},
//标准表格选择框改变
selectStandChange(data) {
@@ -1436,7 +1441,7 @@ export default {
this.$http.get("sys/dictype/getDicTypeListCode", {}, {
_this: this
}, res => {
this.energyKindOptions = res.data.ENERGYTYPES //适用车型
this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
this.countryOptions = res.data.COUNTRY;
this.standStateOptions = res.data.WBZTCLASS; // 文本状态
this.setMap(this.standStateOptions);
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+5 -1
View File
@@ -563,7 +563,7 @@
class="common-button-primary"
size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="getStandData">
@click="getStandDataBtn">
查询
</el-button>
</el-form-item>
@@ -998,6 +998,10 @@ export default {
};
this.getStandData();
},
getStandDataBtn(){
this.pageNo =1;
this.getStandData();
},
//查询项目下的标准
getStandData() {
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+11 -6
View File
@@ -272,7 +272,7 @@
class="common-button-primary"
size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="getStandData">
@click="getStandDataBtn">
查询
</el-button>
</el-form-item>
@@ -519,6 +519,11 @@ export default {
};
this.getStandData();
},
//标准查询按钮
getStandDataBtn(){
this.pageNo = 1;
this.getStandData();
},
getStandData() {
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
standType: this.standardSearch.standType,
@@ -787,16 +792,16 @@ export default {
this.searchData();
},
pageSizeChange(pageSize) {
this.pageSize = this.$store.getters.userInfo.configContent;
this.pageSize = pageSize;
this.searchData();
},
pageChangeNo(page){
this.page = page
this.addList()
this.pageNo = page
this.getStandData();
},
pageSizeChangeNo(pageSize){
this.pageSizeNo = this.$store.getters.userInfo.configContent;
this.addList()
this.pageSizeNo = pageSize;
this.getStandData();
},
// 将文本状态的id与name对应
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+1 -1
View File
@@ -289,7 +289,7 @@
@selection-change="handleSelection2"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="附件名" align="center" prop="fileName"></el-table-column>
<el-table-column label="附件名" align="center" prop="fileOldName"></el-table-column>
</el-table>
</div>
</div>
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+5
View File
@@ -240,6 +240,7 @@ export default {
name: "wfhxzgStep2",
data() {
return {
passInfo: 0,
detailData: [],
loading: false,
textarea: '', // 意见
@@ -336,6 +337,9 @@ export default {
},
getFormFieldList (item) {
this.$nextTick(() => {
if (item.passInfo !== undefined) {
this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
}
this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
this.textarea = JSON.parse(JSON.stringify(item)).commentText
})
@@ -406,6 +410,7 @@ export default {
}
let json = {
dockUserList: list,
passInfo: this.passInfo
}
let flag=false
this.dataList.forEach(item => {
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+6 -16
View File
@@ -247,6 +247,7 @@ export default {
name: "wfhxzgStep3",
data() {
return {
passInfo: 0,
detailData: [],
loading: false,
commentText: '', // 意见
@@ -320,6 +321,9 @@ export default {
},
getFormFieldList (item) {
this.$nextTick(() => {
if (item.passInfo !== undefined) {
this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
}
let fileData = JSON.parse(JSON.stringify(item)).dockUserList
for (let i = 0; i<fileData.length; i++) {
if (fileData[i].name === this.$store.getters.userInfo.userName) {
@@ -358,11 +362,11 @@ export default {
if (this.commentText) {
var json = {
passInfo: 1,
actionFlag: 1,
commentText: this.commentText,
standardInfoList: this.standardInfoList,
}
this.isSubmit = true
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
@@ -372,25 +376,10 @@ export default {
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
}
/* this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: 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('请输入反馈意见')
}*/
},
// 点击查看
handlePreview (item) {
@@ -468,6 +457,7 @@ export default {
list.push(item[1])
}
let json = {
passInfo: this.passInfo,
responUserList: list,
actionFlag: 0
}
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+7 -2
View File
@@ -218,7 +218,7 @@
class="common-button-primary"
size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="getStandData">
@click="getStandDataBtn">
查询
</el-button>
</el-form-item>
@@ -818,7 +818,7 @@ export default {
this.getStandData();
},
pageSizeChange(pageSize) {
this.pageSize = this.$store.getters.userInfo.configContent;
this.pageSize = pageSize;
this.getStandData();
},
pageChangeNo(page) {
@@ -843,6 +843,11 @@ export default {
});
},
//获取标准查询按钮
getStandDataBtn(){
this.page = 1;
this.getStandData();
},
//获取标准数据
getStandData() {
this.$http.post("SarStandItems/sar-stand-items/findStand", {
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+35 -29
View File
@@ -94,8 +94,9 @@
prop="distributePerson"
label="分发责任人">
<template slot-scope="scope">
<el-input v-model="scope.row.distributePersonId" style="display: none;"/>
<el-input v-model="scope.row.distributePerson" placeholder="请选择责任人" @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"/>
<el-input v-model="scope.row.distributePersonId" style="display: none;" />
<el-input v-model="scope.row.distributePerson" placeholder="请选择责任人"
@click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)" />
</template>
</el-table-column>
</el-table>
@@ -106,11 +107,11 @@
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
@@ -205,7 +206,7 @@
class="common-button-primary"
size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="getStandData">
@click="getStandDataBtn">
查询
</el-button>
</el-form-item>
@@ -392,11 +393,11 @@ export default {
productData: [], //添加抽屉的数据
standList: [], //新添加的标准
modalshowflag: false, // drawer开关
commentText: '',
commentText: "",
drawerTitle: "", //drawer标题
// 查询相关参数
searching: false,
fileType: 'FBGBJBD',
fileType: "FBGBJBD",
standardSearch: {
standType: "",
standName: ""
@@ -540,20 +541,20 @@ export default {
if (this.selectList.length) {
this.dataList.forEach((item, index) => {
if (this.selectList.includes(item.productLine)) {
const newItem = JSON.parse(JSON.stringify(item))
newItem.distributePersonId = data[0].id
newItem.distributePerson = data[0].name
this.$set(this.dataList, index, newItem)
const newItem = JSON.parse(JSON.stringify(item));
newItem.distributePersonId = data[0].id;
newItem.distributePerson = data[0].name;
this.$set(this.dataList, index, newItem);
}
})
});
} else {
const newItem = JSON.parse(JSON.stringify(this.dataList[this.currentIndex]))
newItem.distributePersonId = data[0].id
newItem.distributePerson = data[0].name
this.$set(this.dataList, this.currentIndex, newItem)
const newItem = JSON.parse(JSON.stringify(this.dataList[this.currentIndex]));
newItem.distributePersonId = data[0].id;
newItem.distributePerson = data[0].name;
this.$set(this.dataList, this.currentIndex, newItem);
this.listForm.dataList[this.currentIndex].distributePersonId = data[0].id;
this.listForm.dataList[this.currentIndex].distributePerson = data[0].name;
this.currentIndex = -1
this.currentIndex = -1;
}
}
this.modalshowflag = false;
@@ -589,7 +590,7 @@ export default {
this.standModel = true;
this.$nextTick(() => {
this.$refs.projectTable.clearSelection();
})
});
},
// 点击批量删除事件
deleteList() {
@@ -656,7 +657,7 @@ export default {
_formData.append("createUserName", this.$store.getters.userInfo.uName);
_formData.append("prcType", "5");
_formData.append("json", JSON.stringify({
taskInfo: '选择已拆分标准',
taskInfo: "选择已拆分标准",
form: this.listForm,
roleForm: this.roleForm,
commentText: this.commentText
@@ -677,7 +678,7 @@ export default {
if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
this.$message.warning("请选择分发责任人");
} else {
this.isSubmit = true
this.isSubmit = true;
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm);
this.$refs["listForm"].validate((valid) => {
@@ -699,7 +700,7 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
this.isSubmit = false;
});
}
});
@@ -734,12 +735,12 @@ export default {
//选择拆分标准确定事件
OkDrawer() {
if (this.selectedList.length === 1) {
this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ;
this.listForm.standNumber = this.selectedList[0].standSortShow + "\xa0\xa0" + this.selectedList[0].standNumber + "-" + this.selectedList[0].standYear;
this.listForm.standName = this.selectedList[0].standName;
this.listForm.standType = this.selectedList[0].standType;
this.listForm.standId = this.selectedList[0].id;
this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj
this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj
this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj;
this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj;
this.listForm.id = this.selectedList[0].id;
this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
ids: this.listForm.id,
@@ -793,7 +794,7 @@ export default {
this.getStandData();
},
pageSizeChange(pageSize) {
this.pageSize = this.$store.getters.userInfo.configContent;
this.pageSize = pageSize;
this.getStandData();
},
pageChangeNo(page) {
@@ -818,6 +819,11 @@ export default {
});
},
//获取标准查询按钮
getStandDataBtn() {
this.page = 1;
this.getStandData();
},
//获取标准数据
getStandData() {
this.$http.post("SarStandItems/sar-stand-items/findStand", {
@@ -846,7 +852,7 @@ export default {
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label);
});
},
}
},
computed: {},
watch: {
src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+15 -8
View File
@@ -280,7 +280,7 @@
class="common-button-primary"
size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="getProjectData">
@click="getProjectDataBtn">
查询
</el-button>
</el-form-item>
@@ -417,8 +417,6 @@ export default {
searching: false,
//项目检索条件
projectSearch: {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
projectNumber: "",
projectName: ""
},
@@ -451,15 +449,22 @@ export default {
choiceShow() {
this.projectModel = true;
},
//项目查询按钮
getProjectDataBtn() {
this.page = 1;
this.getProjectData();
},
//获取项目数据
getProjectData() {
this.$http.get("sarStandProjectLibrary/queryProject", {
page: this.page,
pageSize: this.pageSize,
...this.projectSearch
}, {
_this: this
}, res => {
this.ProjectDatas = res.data.Maintenance.records;
this.total = res.data.Maintenance.total
this.total = res.data.Maintenance.total;
});
},
//点击清空按钮事件
@@ -524,7 +529,12 @@ export default {
this.selectedList = data;
},
pageChange(page) {
this.page = page;
this.getProjectData();
},
pageSizeChange(pageSize) {
this.pageSize = pageSize;
this.getProjectData();
},
// 点击查看
handlePreview(item) {
@@ -536,9 +546,6 @@ export default {
}
});
window.open(routeUrl.href, "_blank");
},
pageSizeChange(pageSize) {
},
//流程保存事件
handleSave() {
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+15 -8
View File
@@ -282,7 +282,7 @@
class="common-button-primary"
size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="getProjectData">
@click="getProjectDataBtn">
查询
</el-button>
</el-form-item>
@@ -305,7 +305,7 @@
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectListChange"
ref="selection"
ref="listSelection"
>
<el-table-column
type="selection"
@@ -420,8 +420,6 @@ export default {
searching: false,
//项目检索条件
projectSearch: {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
projectNumber: "",
projectName: ""
},
@@ -443,9 +441,16 @@ export default {
choiceShow() {
this.projectModel = true;
},
//项目查询按钮
getProjectDataBtn(){
this.page = 1;
this.getProjectData();
},
//获取项目数据
getProjectData() {
this.$http.get("sarStandProjectLibrary/queryProjectWorkFlow", {
page: this.page,
pageSize: this.pageSize,
...this.projectSearch
}, {
_this: this
@@ -535,18 +540,20 @@ export default {
selectListChange(data) {
// 单选
if (data.length > 1) {
this.$refs.selection.clearSelection()
this.$refs.selection.toggleRowSelection(data.pop())
this.$refs.listSelection.clearSelection()
this.$refs.listSelection.toggleRowSelection(data.pop())
}
this.multipleSelection = data
this.selectedList = data;
},
pageChange(page) {
this.page = page;
this.getProjectData();
},
pageSizeChange(pageSize) {
this.pageSize = pageSize;
this.getProjectData();
},
//流程保存事件
handleSave() {
src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue
+18 -8
View File
@@ -156,7 +156,7 @@
class="common-button-primary"
size="small"
v-btn-permission=""
@click="getProjectData">
@click="getProjectDataBtn">
查询
</el-button>
</el-form-item>
@@ -179,7 +179,7 @@
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectProjectChange"
ref="selection"
ref="projectSelection"
>
<el-table-column
type="selection"
@@ -260,7 +260,7 @@
type="primary"
class="common-button-primary"
size="small"
@click="searchSarAccess">
@click="searchSarAccessBtn">
查询
</el-button>
</el-form-item>
@@ -282,7 +282,7 @@
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectListChange"
ref="selection"
ref="listSelection"
>
<el-table-column
type="selection"
@@ -448,6 +448,11 @@ export default {
handleTabs(type) {
this.active = type;
},
//项目清单查询按钮
getProjectDataBtn(){
this.page = 1;
this.getProjectData();
},
//查询项目列表
getProjectData() {
this.$http.get("sarStandProjectLibrary/queryProjectConfirm", {
@@ -490,6 +495,11 @@ export default {
}
},
//清单查询按钮
searchSarAccessBtn(){
this.pageNo = 1;
this.searchSarAccess();
},
//查询清单列表
searchSarAccess() {
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
@@ -594,8 +604,8 @@ export default {
selectListChange(data) {
// 单选
if (data.length > 1) {
this.$refs.selection.clearSelection()
this.$refs.selection.toggleRowSelection(data.pop())
this.$refs.listSelection.clearSelection()
this.$refs.listSelection.toggleRowSelection(data.pop())
}
this.multipleSelection = data
@@ -605,8 +615,8 @@ export default {
selectProjectChange(data) {
// 单选
if (data.length > 1) {
this.$refs.selection.clearSelection()
this.$refs.selection.toggleRowSelection(data.pop())
this.$refs.projectSelection.clearSelection()
this.$refs.projectSelection.toggleRowSelection(data.pop())
}
this.multipleSelection = data
src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue
+9 -8
View File
@@ -349,14 +349,15 @@ export default {
//动态表单读取
getFormFieldList(item) {
this.$nextTick(() => {
this.qdform = JSON.parse(JSON.stringify(item));
this.qdform.prcNum = this.prcNum;
this.qdform.prcName = this.prcName;
this.qdform["id"] = item.id;
this.projectId = item.projectId;
this.detailedId = item.detailedListId;
this.getStandData();
this.getStand();
if(item.form === undefined){
this.qdform = JSON.parse(JSON.stringify(item));
this.qdform.prcNum = this.prcNum;
this.qdform.prcName = this.prcName;
this.qdform["id"] = item.id;
}else{
this.qdform = item.form
this.dataList =item.form.dataList
}
});
},
//查询清单下的标准
src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+20 -11
View File
@@ -155,7 +155,7 @@
class="common-button-primary"
size="small"
v-btn-permission=""
@click="getProjectData">
@click="getProjectDataBtn">
查询
</el-button>
</el-form-item>
@@ -178,7 +178,7 @@
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectProjectChange"
ref="selection"
ref="projectSelection"
>
<el-table-column
type="selection"
@@ -281,7 +281,7 @@
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectListChange"
ref="selection"
ref="listSelection"
>
<el-table-column
type="selection"
@@ -372,7 +372,7 @@ export default {
},
data() {
return {
multipleSelection:[],
multipleSelection: [],
active: "1", //默认显示
commentText: "",
modalshowflag: false,
@@ -439,14 +439,18 @@ export default {
handleSelectionChange(val) {
// 单选
if (val.length > 1) {
this.$refs.table.clearSelection()
this.$refs.table.toggleRowSelection(val.pop())
this.$refs.table.clearSelection();
this.$refs.table.toggleRowSelection(val.pop());
}
this.multipleSelection = val
this.multipleSelection = val;
},
handleTabs(type) {
this.active = type;
},
getProjectDataBtn() {
this.page = 1;
this.getProjectData();
},
//查询项目列表
getProjectData() {
this.$http.get("sarStandProjectLibrary/queryProjectConfirm", {
@@ -489,6 +493,11 @@ export default {
}
},
//清单查询按钮
searchSarAccessBtn() {
this.pageNo = 1;
this.searchSarAccess();
},
//查询清单列表
searchSarAccess() {
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
@@ -593,8 +602,8 @@ export default {
selectListChange(data) {
// 单选
if (data.length > 1) {
this.$refs.selection.clearSelection()
this.$refs.selection.toggleRowSelection(data.pop())
this.$refs.selection.clearSelection();
this.$refs.selection.toggleRowSelection(data.pop());
}
this.multipleSelection = data
@@ -604,8 +613,8 @@ export default {
selectProjectChange(data) {
// 单选
if (data.length > 1) {
this.$refs.selection.clearSelection()
this.$refs.selection.toggleRowSelection(data.pop())
this.$refs.selection.clearSelection();
this.$refs.selection.toggleRowSelection(data.pop());
}
this.multipleSelection = data
src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+46 -13
View File
@@ -382,10 +382,13 @@
</div>
</el-drawer>
<ProcessFooter
show-submit
show-save
show-confirm
:submitLoading="isSubmit"
:approval="true"
:saveLoading="saveLoading"
@submit="handleSubmit"
@save="handleSave"
:approval="true"
>
</ProcessFooter>
</div>
@@ -395,7 +398,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process";
import { inboundLiaisonDetail, queryDetail, saveTaskForPub } from "api/process";
export default {
name: "xmqdqrStep2",
@@ -517,14 +520,22 @@ export default {
//动态表单读取
getFormFieldList(item) {
this.$nextTick(() => {
this.qdform = JSON.parse(JSON.stringify(item));
this.qdform.prcNum = this.prcNum;
this.qdform.prcName = this.prcName;
this.qdform["id"] = item.id;
// this.projectId = item.projectId;
this.detailedId = item.detailedListId;
// this.getStandData();
this.getStand();
if(item.form === undefined){
this.qdform = JSON.parse(JSON.stringify(item));
this.qdform.prcNum = this.prcNum;
this.qdform.prcName = this.prcName;
this.qdform["id"] = item.id;
// this.projectId = item.projectId;
//获取清单id 查询对应清单下的标准
this.detailedId = item.detailedListId;
// this.getStandData();
this.getStand();
}else{
this.qdform = item.form
this.dataList =item.form.dataList
this.detailedId = item.form.detailedListId;
this.getStand();
}
});
},
//查询清单下的标准
@@ -549,6 +560,26 @@ export default {
// });
// });
// },
//保存事件
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
this.qdform.dataList = this.dataList
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "10");
_formData.append('taskIds', this.taskIds)
_formData.append("json", JSON.stringify({
form: this.qdform,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
},
//提交事件
handleSubmit() {
this.isSubmit = true;
@@ -623,7 +654,7 @@ export default {
this.standList.map(item => {
let addIndex
addIndex = this.dataList.findIndex(items =>{
return items.standId === item.id
return items.id === item.id
})
if(addIndex > -1){
this.$message.warning('请勿重复添加数据')
@@ -638,6 +669,7 @@ export default {
},
//添加标准的查询按钮
search() {
this.page = 1;
this.getStand();
},
clearSearch() {
@@ -656,7 +688,8 @@ export default {
this.pageSize = pageSize;
this.getStand();
},
getStand(data) {
//查询清单下的标准
getStand() {
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
id: this.detailedId,
page: this.page,
src/pages/processCenter/pages/processDetail/index.vue
+40 -12
View File
@@ -29,7 +29,6 @@
v-if="tzclrEnable"
class="common-button-default"
@click="adjustmentHandler"
v-btn-permission="'39ETS7LEANXL8GG9MH8T'"
round
>调整处理人</el-button>
<!--临时屏蔽 start-->
@@ -113,17 +112,24 @@
</el-table-column>
</el-table>
<loading :loading="loading">流程列表加载中</loading>
<!-- 上汽全公司选人解决方案 -->
<org-table
title="调整处理人"
:visible.sync="drawerModal"
dialog-model
:config="orgTableConfig"
:max-selected="1"
max-selected-tips="处理人只能选择一个用户"
:excludeUser="excludeUser"
@confirm="addTree"
></org-table>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<!-- <org-table-->
<!-- title="调整处理人"-->
<!-- :visible.sync="drawerModal"-->
<!-- dialog-model-->
<!-- :config="orgTableConfig"-->
<!-- :max-selected="1"-->
<!-- max-selected-tips="处理人只能选择一个用户"-->
<!-- :excludeUser="excludeUser"-->
<!-- @confirm="addTree"-->
<!-- ></org-table>-->
</div>
</div>
</template>
@@ -140,6 +146,8 @@ export default {
loginPeople: '',
// 调整处理人抽屉状态
drawerModal: false,
drawerTitle: '',
nodeList: [],
tasksName: '',
selectPeople: '',
// loading
@@ -167,6 +175,25 @@ export default {
}
},
methods: {
checkedRole (data) {
this.assigneeNewLoading = true
changeAssigneeNew({
taskId: this.selectPeople.id, // 任务id
assignee: data[0].id, // 被委托人
userId: this.selectPeople.assigneeId, // 委托人
pId: this.selectPeople.processInstanceId // 流程实例
}).then(res => {
this.assigneeNewLoading = false
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
this.processNum()
this.processTable()
} else {
this.$message.warning(res.message)
}
})
},
/**
* @author liruohao
* @date 2019/4/22
@@ -821,6 +848,7 @@ export default {
adjustmentHandler () {
if (this.tableRow.length === 1 && !this.tableRow[0].endTime) {
this.drawerModal = true
this.drawerTitle = '调整处理人'
this.selectPeople = this.tableRow[0]
} else {
this.$message.warning('请选择一条未完成的数据')
src/pages/processCenter/pages/processList/index.vue
+4 -5
View File
@@ -40,11 +40,10 @@ export default {
title: '已发流程',
name: 'AlreadySend'
},
{
title: '监控流程',
name: 'MonitorProcess',
permission: 'XYK2MHR5UMBL6SJ5BCHV'
},
// {
// title: '监控流程',
// name: 'MonitorProcess',
// },
{
title: '草稿',
name: 'TaskDraft'
src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
+28
View File
@@ -128,6 +128,7 @@
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b9abd00768c8ed97be89547c2da3f0eb'">查看</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '强制撤回']">强制撤回</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -173,6 +174,33 @@ export default {
case '查看':
this.dealWith(command[0])
break
case '强制撤回':
this.rejectTaskToStart(command[0])
break
}
},
// 强制撤回
rejectTaskToStart (rows) {
if (rows.isEnd === '0') {
this.$confirm('您确认要强制撤回该任务吗', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
confirmButtonClass: 'common-button-primary',
roundButton: true
}).then(() => {
this.$http.get('lawss/activiti/forceRecall', {
prcId: rows.prcId
}, {
_this: this
}, res => {
this.$message.success('撤回成功')
this.queryProcess()
}, e => {
})
})
} else {
this.$message.warning('当前流程数据已完成，请选择未完成的流程数据')
}
},
resetSelect () { //清空
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+61
View File
@@ -134,6 +134,7 @@
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '办理']">办理</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '转办']">转办</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -149,13 +150,24 @@
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"></pagination>
<loading :loading="loading">数据获取中</loading>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
</div>
</div>
</template>
<script>
import {mapMutations, mapActions} from 'vuex'
import { changeAssigneeNew } from 'api/process'
import ProcessMixin from '../../../components/ProcessMixin'
import axios from 'axios'
export default {
name: 'ProcessCenter',
mixins: [ProcessMixin],
@@ -166,6 +178,12 @@ export default {
prcNum: '',
prcType: ''
},
assigneeNewLoading: false, // 调整处理人确定loading
// 调整处理人抽屉状态
drawerModal: false,
drawerTitle: '',
nodeList: [],
selectPeople:'',
total: 0,
pageNo: 1,
loading: false,
@@ -174,11 +192,54 @@ export default {
}
},
methods: {
checkedRole (data) {
this.assigneeNewLoading = true
changeAssigneeNew({
taskId: this.selectPeople.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.selectPeople.taskAssignee, // 委托人
pId: this.selectPeople.prcId // 流程实例
}).then(res => {
this.assigneeNewLoading = false
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
this.processNum()
this.queryProcess()
} 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.selectPeople.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)
})
},
// 转办处理人
adjustmentHandler (row) {
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
},
handleCommand (command) {
switch (command[1]) {
case '办理':
this.dealWith(command[0])
break
case '转办':
this.adjustmentHandler(command[0])
break
}
},
resetSelect () { //清空
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+79 -41
View File
@@ -127,7 +127,7 @@
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '办理']" v-btn-permission="'fa19fb2dc2cf3055a64732dab6c40cb9'">办理</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '办理']">办理</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -215,10 +215,32 @@ export default {
//草稿办理待开发
const { prcType, id } = row
const mes = JSON.parse(row.mes)
console.log(mes)
switch (prcType) {
// 标准入库、
case '1':
if (mes.taskInfo === '申请人发起') {
if(mes !== null && mes.taskInfo !== null){
if (mes.taskInfo === '申请人发起') {
this.$router.push({
name: 'bzrkStep1',
query: {
type: '1',
processName: '申请人发起流程',
bpnId: id,
verifySarStandard: true,
}
})
} else if (mes.taskInfo === '申请人修订') {
this.$router.push({
name: 'bzrkStep4',
query: {
type: '1',
processName: '申请人修订流程',
bpnId: id
}
})
}
}else {
this.$router.push({
name: 'bzrkStep1',
query: {
@@ -228,15 +250,6 @@ export default {
verifySarStandard: true,
}
})
} else if (mes.taskInfo === '申请人修订') {
this.$router.push({
name: 'bzrkStep4',
query: {
type: '1',
processName: '申请人修订流程',
bpnId: id
}
})
}
break
// 法规入库及评估流程
@@ -262,7 +275,28 @@ export default {
})
break
case '4':
if (mes.taskInfo === '引入法规标准清单') {
if(mes !== null && mes.taskInfo !== null){
if (mes.taskInfo === '引入法规标准清单') {
this.$router.push({
name: 'bzqdfbStep1-1',
query: {
type: '4',
processName: '标准清单发布流程',
bpnId: id,
verifySarStandard: true,
}
})
} else if (mes.taskInfo === '根据会签意见修订') {
this.$router.push({
name: 'bzqdfbStep1-3',
query: {
type: '4',
processName: '申请人修订流程',
bpnId: id
}
})
}
}else {
this.$router.push({
name: 'bzqdfbStep1-1',
query: {
@@ -272,19 +306,41 @@ export default {
verifySarStandard: true,
}
})
} else if (mes.taskInfo === '根据会签意见修订') {
this.$router.push({
name: 'bzqdfbStep1-3',
query: {
type: '4',
processName: '申请人修订流程',
bpnId: id
}
})
}
break
case '5':
if (mes.taskInfo === '选择已拆分标准') {
if(mes !== null && mes.taskInfo !== null){
if (mes.taskInfo === '选择已拆分标准') {
this.$router.push({
name: 'xmpgStep1-1',
query: {
type: '5',
processName: '项目合规评估流程-标准',
bpnId: id,
verifySarStandard: true,
}
})
}
// else if (mes.taskInfo === '分发责任人分发任务') {
// this.$router.push({
// name: 'bzqdfbStep1-3',
// query: {
// type: '5',
// processName: '项目合规评估流程-标准',
// bpnId: id
// }
// })
// }else if (mes.taskInfo === '责任人填写评估反馈') {
// this.$router.push({
// name: 'bzqdfbStep1-3',
// query: {
// type: '5',
// processName: '项目合规评估流程-标准',
// bpnId: id
// }
// })
// }
}else {
this.$router.push({
name: 'xmpgStep1-1',
query: {
@@ -295,25 +351,7 @@ export default {
}
})
}
// else if (mes.taskInfo === '分发责任人分发任务') {
// this.$router.push({
// name: 'bzqdfbStep1-3',
// query: {
// type: '5',
// processName: '项目合规评估流程-标准',
// bpnId: id
// }
// })
// }else if (mes.taskInfo === '责任人填写评估反馈') {
// this.$router.push({
// name: 'bzqdfbStep1-3',
// query: {
// type: '5',
// processName: '项目合规评估流程-标准',
// bpnId: id
// }
// })
// }
break
case '6':
this.$router.push({
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+2
View File
@@ -1377,10 +1377,12 @@ export default {
}, {
_this: this, loading: "loading"
}, res => {
this.detailedListVersion = res.data[0].detailedListVersion
if (res.data) {
this.$router.push({
name: "LocalProductDetail",
query: {
detailedListVersion: this.detailedListVersion,
tabName: this.ifMaintaince
}
});
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+3 -1
View File
@@ -47,7 +47,7 @@
<div class="action-bar">
<el-row>
<el-col :span="12">
<span style="font-size: 16px;font-weight: bold">清单版本: {{ }}</span>
<span style="font-size: 16px;font-weight: bold">清单版本: {{ detailedListVersion ? $moment(detailedListVersion).format('YYYY-MM-DD HH:mm:ss') : '-' }}</span>
</el-col>
<el-col :span="12" style="text-align: end">
<el-button
@@ -473,6 +473,7 @@ export default {
},
data() {
return {
detailedListVersion: '',
standSortOptions: [],
standCommonlySearch: {
standSort: '',
@@ -959,6 +960,7 @@ export default {
...mapGetters(['getLocalPro'])
},
mounted() {
this.detailedListVersion = this.$route.query.detailedListVersion
this.$nextTick(() => {
this.Height = $('.contaiiner').height() - $('.contaiinerCard').height() - 190
window.onresize = () => {
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+8 -3
View File
@@ -138,7 +138,7 @@
class="common-button-primary"
size="mini"
v-btn-permission="'0bdf3aecef5161bb66256ebcbbd4bdaa'"
@click="querySarProStateZero">查询</el-button>
@click="querySarProStateZeroBtn">查询</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
@@ -306,7 +306,12 @@ name: "technologyInvolveProject",
handleProjectCompliance (row) {
this.standId = row.standId
this.querySarProStateZero()
}, // 查看项目符合性
},
querySarProStateZeroBtn(){
this.sarProStateTotalPage = 1
this.querySarProStateZero()
},
// 查看项目符合性
querySarProStateZero () {
var form = this.sarProStateEO
form.position = this.sarProject.position
@@ -328,7 +333,7 @@ name: "technologyInvolveProject",
this.sarProStateEO.standNumber = ''
this.sarProStateEO.standName = ''
this.sarProStateEO.specificItem = ''
this.querySarProStateZero()
this.querySarProStateZeroBtn()
}, // 清空条件查询
clearSearchPro () {
this.sarProStateEO.standNumber = ''
src/pages/regulatoryRepository/partCodeApply/index.vue
+7 -2
View File
@@ -21,7 +21,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" size="mini" v-btn-permission="'02424c2bc370ee846aa5a6d60c49a6a5'"
class="common-button-primary" @click="getTableByPage('')">
class="common-button-primary" @click="getTableByPageBtn">
查询
</el-button>
</el-form-item>
@@ -203,6 +203,11 @@ export default {
})
}
},
// 查询之后跳回第一页
getTableByPageBtn(){
this.pageNo = 1
this.getTableByPage()
},
// 查询零部件table列表
getTableByPage() {
this.tableLoading.loadData = true
@@ -231,7 +236,7 @@ export default {
//零件分类号
partCategoryCode: ""
}
this.getTableByPage()
this.getTableByPageBtn()
},
// 分页事件
pageChange(page) {