diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 266344463..07e605e5a 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -66,6 +66,15 @@ :loading="submitLoading" v-if="showSubmit" >{{ submitBTNTextShow }} + 确认 @@ -131,6 +140,10 @@ export default { type: Boolean, default: false }, + showConfirm: { + type: Boolean, + default: false + }, // 是否显示委托按钮 showEntrust: { type: Boolean, diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index f5d40035c..8f68ca173 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -593,7 +593,7 @@ class="common-button-primary" size="small" v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'" - @click="getStandData"> + @click="getStandDataBtn"> 查询 @@ -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); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index a391d8d4e..f8f02eaf0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -563,7 +563,7 @@ class="common-button-primary" size="small" v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'" - @click="getStandData"> + @click="getStandDataBtn"> 查询 @@ -998,6 +998,10 @@ export default { }; this.getStandData(); }, + getStandDataBtn(){ + this.pageNo =1; + this.getStandData(); + }, //查询项目下的标准 getStandData() { this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index b6bb64a81..adcd8df25 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -272,7 +272,7 @@ class="common-button-primary" size="small" v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'" - @click="getStandData"> + @click="getStandDataBtn"> 查询 @@ -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对应 diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 5ea4fe86e..bf5ddd7f1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -289,7 +289,7 @@ @selection-change="handleSelection2" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"> - + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 7f5b9561e..a26fc9188 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -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 => { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index cec18bcd1..be1ddaff0 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -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 { - 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 } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index c38ec4a01..dda043f7d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -218,7 +218,7 @@ class="common-button-primary" size="small" v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'" - @click="getStandData"> + @click="getStandDataBtn"> 查询 @@ -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", { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 3f3b33a3b..db361dfff 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -94,8 +94,9 @@ prop="distributePerson" label="分发责任人"> @@ -106,11 +107,11 @@
+ type="textarea" + :rows="3" + resize="none" + placeholder="请输入意见" + v-model="commentText">
@@ -205,7 +206,7 @@ class="common-button-primary" size="small" v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'" - @click="getStandData"> + @click="getStandDataBtn"> 查询 @@ -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: { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index a4b8cd042..15fbf6f80 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -280,7 +280,7 @@ class="common-button-primary" size="small" v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'" - @click="getProjectData"> + @click="getProjectDataBtn"> 查询 @@ -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() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 78963c902..837978004 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -282,7 +282,7 @@ class="common-button-primary" size="small" v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'" - @click="getProjectData"> + @click="getProjectDataBtn"> 查询 @@ -305,7 +305,7 @@ :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectListChange" - ref="selection" + ref="listSelection" > 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() { diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue index 3c394b217..d1f2a26ed 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -156,7 +156,7 @@ class="common-button-primary" size="small" v-btn-permission="" - @click="getProjectData"> + @click="getProjectDataBtn"> 查询 @@ -179,7 +179,7 @@ :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectProjectChange" - ref="selection" + ref="projectSelection" > + @click="searchSarAccessBtn"> 查询 @@ -282,7 +282,7 @@ :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectListChange" - ref="selection" + ref="listSelection" > 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 diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue index fb27029e4..76bcc77c7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue @@ -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 + } }); }, //查询清单下的标准 diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 84e45ea32..67446e72b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -155,7 +155,7 @@ class="common-button-primary" size="small" v-btn-permission="" - @click="getProjectData"> + @click="getProjectDataBtn"> 查询 @@ -178,7 +178,7 @@ :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectProjectChange" - ref="selection" + ref="projectSelection" > 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 diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index d6786ff8b..e1d70fffc 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -382,10 +382,13 @@ @@ -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, diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index f450ea977..40c5d9a12 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -29,7 +29,6 @@ v-if="tzclrEnable" class="common-button-default" @click="adjustmentHandler" - v-btn-permission="'39ETS7LEANXL8GG9MH8T'" round >调整处理人 @@ -113,17 +112,24 @@ 流程列表加载中 - - + + + + + + + + + + + + @@ -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('请选择一条未完成的数据') diff --git a/src/pages/processCenter/pages/processList/index.vue b/src/pages/processCenter/pages/processList/index.vue index 33a6c4341..dc8e893b7 100644 --- a/src/pages/processCenter/pages/processList/index.vue +++ b/src/pages/processCenter/pages/processList/index.vue @@ -40,11 +40,10 @@ export default { title: '已发流程', name: 'AlreadySend' }, - { - title: '监控流程', - name: 'MonitorProcess', - permission: 'XYK2MHR5UMBL6SJ5BCHV' - }, + // { + // title: '监控流程', + // name: 'MonitorProcess', + // }, { title: '草稿', name: 'TaskDraft' diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue index 790046a7f..4844a5468 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue @@ -128,6 +128,7 @@ 查看 + 强制撤回 @@ -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 () { //清空 diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 0856bd2e9..23b76baf3 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -134,6 +134,7 @@ 办理 + 转办 @@ -149,13 +150,24 @@ @pageChange="pageChange" @pageSizeChange="pageSizeChange"> 数据获取中 + + +