From 6ed6d88b8e581124911adb64acade4bc9c92d627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 15 Sep 2021 16:26:32 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=BB=B4=E5=BA=A6=E9=A1=B5=E9=9D=A2=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1-1.vue | 6 +- .../pages/creatProcess/xmpg/step1-2.vue | 22 +- .../pages/creatProcess/xmpg/step1-7.vue | 23 +- .../pages/creatProcess/xmpg/step1.vue | 6 +- .../pages/creatProcess/xmpg/step2.vue | 22 +- .../pages/creatProcess/xmpg/step3.vue | 198 ++++++++++-------- .../pages/creatProcess/xmpg/step4.vue | 23 +- .../pages/creatProcess/xmpg/step5.vue | 23 +- .../pages/creatProcess/xmpg/step6.vue | 23 +- .../pages/creatProcess/xmpg/step7.vue | 23 +- 10 files changed, 238 insertions(+), 131 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index fb9021132..03a84bfed 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -28,14 +28,16 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue index 18a0232bd..3d1c61169 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue @@ -25,26 +25,28 @@ @@ -284,6 +286,17 @@ export default { handleTabs(name) { this.active = name; }, + // 点击查看 + handlePreview(item) { + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.id, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ @@ -303,7 +316,6 @@ export default { */ getFormFieldList (item) { this.$nextTick(() => { - console.log(item); this.listForm = JSON.parse(JSON.stringify(item)) this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue index 1984c73f1..06374bbb5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue @@ -25,28 +25,30 @@ @@ -402,6 +404,17 @@ export default { handleTabs(name) { this.active = name; }, + //点击查看详情 + handlePreview(item){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.id, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank") + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ @@ -424,7 +437,7 @@ export default { this.listForm = JSON.parse(JSON.stringify(item)) this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName - this.listForm['id'] = item.id + this.listForm.id = item.id this.dataList = item.dataList }) }, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index df6bed631..e51aa3b71 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -28,14 +28,16 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 801ca865e..9d2296c0b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -25,26 +25,28 @@ @@ -352,6 +354,17 @@ export default { handleTabs(name) { this.active = name; }, + // 点击查看 + handlePreview(item) { + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.id, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ @@ -371,7 +384,6 @@ export default { */ getFormFieldList (item) { this.$nextTick(() => { - console.log(item); this.listForm = JSON.parse(JSON.stringify(item)) this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 423aa3dd0..1d3755fc8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -25,28 +25,30 @@ @@ -57,7 +59,8 @@
- 批量分发落实人 + 批量分发落实人 +
@@ -220,11 +224,11 @@ @@ -233,7 +237,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew } from "api/process"; +import { inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew } from "api/process"; export default { name: "xmpgStep3", @@ -274,8 +278,8 @@ export default { tabValue: "listOfCountries", selectedList: [], //选择清单的选择框 selectList: [], //选择标准的选择框 - lsIndex: '', - lsType: '', + lsIndex: "", + lsType: "", bringData: [], commentText: "", //填写会签意见 page: 1, @@ -289,7 +293,7 @@ export default { qualityEngineer: "", //质量工程师 breakdownList: [{ //分解单数据 implementer: "", - implementerId:'', + implementerId: "", applyArctic: "", busStandCover: "", claimType: "", @@ -302,7 +306,7 @@ export default { }], dataList: [{ implementer: "", - implementerId:'', + implementerId: "", projectLine: "", //产品线 uname: "",//产品线责任人 distributePerson: "", //分发责任人 @@ -327,7 +331,7 @@ export default { }, roleForm: { implementer: "", - implementerId: "", + implementerId: "" }, choiceForm: {}, //选择标准清单列表 user1: "", @@ -340,45 +344,45 @@ export default { }, methods: { //确认转办 - checkedTransferRole (data) { - this.assigneeNewLoading = true + checkedTransferRole(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 + this.isTransfer = false; if (res.success) { - this.drawerModal = false - this.$message.success('调整成功') + this.drawerModal = false; + this.$message.success("调整成功"); this.$router.push("/processCenter"); - this.processNum() + this.processNum(); } else { - this.$message.warning(res.message) + this.$message.warning(res.message); } - }) + }); }, // 请求转换流程图 - processNum (row) { + processNum(row) { axios.request({ - url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(), - responseType: 'blob', - method: 'get', + 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) - }) + this.processStep = window.URL.createObjectURL(res.data); + }); }, //转办事件 - handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + handleTransfer() { + this.drawerModal = true; + this.drawerTitle = "转办处理人"; + this.selectPeople = row; }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { @@ -397,13 +401,23 @@ export default { handleTabs(name) { this.active = name; }, + //点击查看详情 + handlePreview(item) { + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.id, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); @@ -417,7 +431,7 @@ export default { */ getFormFieldList(item) { this.listForm = JSON.parse(JSON.stringify(item)); - if(item.form === undefined){ + if (item.form === undefined) { this.listForm.prcNum = this.prcNum; this.listForm.prcName = this.prcName; this.listForm["id"] = item.id; @@ -425,12 +439,11 @@ export default { this.listForm.breakdownList = []; for (let i = 0; i < item.pepdtos.length; i++) { for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) { - console.log(item.pepdtos[i].xCXSSRQ === null); - if(item.pepdtos[i].xCXSSRQ === null){ - item.pepdtos[i].xCXSSRQ = '' + if (item.pepdtos[i].xCXSSRQ === null) { + item.pepdtos[i].xCXSSRQ = ""; } - if(item.pepdtos[i].zCCSSRQ === null){ - item.pepdtos[i].zCCSSRQ = '' + if (item.pepdtos[i].zCCSSRQ === null) { + item.pepdtos[i].zCCSSRQ = ""; } this.listForm.breakdownList.push({ itemsName: item.pepdtos[i].breakdownList[j].itemsName, @@ -449,54 +462,55 @@ export default { qualityEngineerName: item.pepdtos[i].qualityEngineerName, standNumber: item.pepdtos[i].standNumber, standName: item.pepdtos[i].standName, - xCXSSRQ : item.pepdtos[i].XCXSSRQ, - zCCSSRQ : item.pepdtos[i].ZCCSSRQ, + id: item.pepdtos[0].id, + xCXSSRQ: item.pepdtos[i].XCXSSRQ, + zCCSSRQ: item.pepdtos[i].ZCCSSRQ }); } } } else { - this.listForm = item.form - this.listForm.breakdownList = item.form.breakdownList + this.listForm = item.form; + this.listForm.breakdownList = item.form.breakdownList; } }, - checkedRole (data) { + checkedRole(data) { if (this.type === 1) { - this.listForm.breakdownList[this.lsIndex].implementerId = data[0].id - this.listForm.breakdownList[this.lsIndex].implementer = data[0].name - } else if(this.type === 2) { - this.listForm.breakdownList.forEach( item => { - this.selectList.forEach( items => { + this.listForm.breakdownList[this.lsIndex].implementerId = data[0].id; + this.listForm.breakdownList[this.lsIndex].implementer = data[0].name; + } else if (this.type === 2) { + this.listForm.breakdownList.forEach(item => { + this.selectList.forEach(items => { if (item === items) { - item.implementerId = data[0].id - item.implementer = data[0].name + item.implementerId = data[0].id; + item.implementer = data[0].name; } - }) - }) + }); + }); } - this.modalshowflag = false + this.modalshowflag = false; }, cancleUserInfo() { this.modalshowflag = false; }, - choiceZRRS (row, type, index) { - this.type = type + choiceZRRS(row, type, index) { + this.type = type; if (type === 1) { - this.drawerTitle = '选择责任人' - this.nodeList = [] - this.lsIndex = index - this.lsType = type - this.nodeList.push(row) - this.modalshowflag = true + this.drawerTitle = "选择责任人"; + this.nodeList = []; + this.lsIndex = index; + this.lsType = type; + this.nodeList.push(row); + this.modalshowflag = true; } else if (type === 2) { // 批量 if (this.selectList.length > 0) { - this.lsType = type - this.nodeList = [] - this.modalshowflag = true - this.drawerTitle = '批量选择责任人' + this.lsType = type; + this.nodeList = []; + this.modalshowflag = true; + this.drawerTitle = "批量选择责任人"; } else { - this.$message.warning('请选择要分发的数据') + this.$message.warning("请选择要分发的数据"); } } }, @@ -507,24 +521,24 @@ export default { }, //保存事件 - // handleSave() { - // this.saveLoading = true; - // let _formData = new FormData(); - // _formData.append("id", this.bpnId || ""); - // _formData.append("prcType", "5"); - // _formData.append('taskIds', this.taskIds) - // _formData.append("json", JSON.stringify({ - // form: this.listForm, - // commentText: this.commentText - // })); - // saveTaskForPub(_formData).then(res => { - // this.saveLoading = false; - // this.$message.success("保存成功"); - // this.bpnId = res.result; - // }).catch(e => { - // this.saveLoading = false; - // }); - // }, + handleSave() { + this.saveLoading = true; + let _formData = new FormData(); + _formData.append("id", this.bpnId || ""); + _formData.append("prcType", "5"); + _formData.append("taskIds", this.taskIds); + _formData.append("json", JSON.stringify({ + form: this.listForm, + commentText: this.commentText + })); + saveTaskForPub(_formData).then(res => { + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + }).catch(e => { + this.saveLoading = false; + }); + }, //提交事件 handleSubmit() { this.listForm.breakdownList.forEach(item => { @@ -543,7 +557,7 @@ export default { this.listForm.approvalOpinion = ""; this.listForm.signFlag = ""; const json = JSON.stringify(this.listForm.breakdownList); - this.isSubmit = true + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -555,7 +569,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } - this.isSubmit = false + this.isSubmit = false; }, e => { }); } else { @@ -573,7 +587,7 @@ export default { }, //标准表格选择框改变 selectStandChange(data) { - this.selectList = data + this.selectList = data; }, selectThree() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 703b60f80..f929be1c4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -25,28 +25,30 @@ @@ -492,6 +494,17 @@ export default { handleTabs(name) { this.active = name; }, + //点击查看详情 + handlePreview(item){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.id, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank") + }, //将时间戳转换为日期格式 getLocalTime(item) { return new Date(parseInt(item) * 1000).toLocaleDateString().replace(/:\d{1,2}$/, " "); @@ -509,7 +522,6 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); @@ -545,6 +557,7 @@ export default { this.listForm["id"] = item.id; this.listForm.standName = item.step3DTOS[0].standName; this.listForm.standNumber = item.step3DTOS[0].standNumber; + this.listForm.id = item.step3DTOS[0].id; this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName; this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName; this.listForm.itemsName = item.step3DTOS[0].itemsName; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index b838b003b..26b190f2d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -25,28 +25,30 @@ @@ -470,6 +472,17 @@ export default { handleTabs(name) { this.active = name; }, + //点击查看详情 + handlePreview(item){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.id, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank") + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ @@ -492,10 +505,10 @@ export default { 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.standName = item.standName this.listForm.standNumber = item.standNumber + this.listForm.id = item.id this.listForm.qualityEngineerName = item.qualityEngineerName this.listForm.certifiedEngineerName = item.certifiedEngineerName this.listForm.responsibleUnit = item.responsibleUnit diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index 51123b86d..b84dcec69 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -25,28 +25,30 @@ @@ -469,6 +471,17 @@ export default { handleTabs(name) { this.active = name; }, + //点击查看详情 + handlePreview(item){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.id, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank") + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ @@ -491,8 +504,8 @@ export default { 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.id = item.step3DTOS[0].id this.listForm.standName = item.step3DTOS[0].standName this.listForm.standNumber = item.step3DTOS[0].standNumber this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index d7f86783d..300c8af2a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -25,28 +25,30 @@ @@ -469,6 +471,17 @@ export default { handleTabs(name) { this.active = name; }, + //点击查看详情 + handlePreview(item){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.id, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank") + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ @@ -491,7 +504,7 @@ export default { this.listForm = JSON.parse(JSON.stringify(item)) this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName - this.listForm['id'] = item.id + this.listForm.id = item.id this.dataList = item.dataList }) }, From a3edd332f6d43bf2f512ebf1730eefe665efab8c Mon Sep 17 00:00:00 2001 From: "wangxiahui@91isoft.com" <140316hui> Date: Wed, 15 Sep 2021 16:46:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=A0=87=E5=87=86=20=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1-1.vue | 79 +++++++++--------- .../pages/creatProcess/xmpg/step1.vue | 80 ++++++++++--------- 2 files changed, 84 insertions(+), 75 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 03a84bfed..572a56578 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -401,6 +401,8 @@ export default { }, data() { return { + //用来判断提交事件条件是否满足 + satisfyFlag: true, active: "1", standModel: false, sarAccessListDatas: [], @@ -701,50 +703,53 @@ export default { //提交事件 handleSubmit() { if (this.dataList.length < 1) { + this.satisfyFlag = false this.$message.warning("请添加产品线信息"); } this.dataList.forEach(item => { if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) { + this.satisfyFlag = false this.$message.warning("请选择分发责任人"); - } else { - var json = Object.assign(this.listForm, this.roleForm); - this.isSubmit = true - this.$refs["listForm"].validate((valid) => { - if (valid) { - this.$refs["roleForm"].validate((valid) => { - if (valid) { - this.$http.get("lawss/activiti/startProcess", { type: "5" }, { - _this: this - }, res => { - if (res.ok) { - this.$http.post("lawss/activiti/completeTask", { - taskIds: res.data, - userId: this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); - } - }); - } else { - this.isSubmit = false - return this.$message.warning("请完善人员信息"); - } - }); - } else { - this.isSubmit = false - return this.$message.warning("请完善基础信息"); - } - }); } }); - + if(this.satisfyFlag){ + this.isSubmit = true; + this.listForm.commentText = this.commentText; + var json = Object.assign(this.listForm, this.roleForm); + this.$refs["listForm"].validate((valid) => { + if (valid) { + this.$refs["roleForm"].validate((valid) => { + if (valid) { + this.$http.get("lawss/activiti/startProcess", { type: "5" }, { + _this: this + }, res => { + if (res.ok) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }); + } + }); + } else { + this.isSubmit = false; + return this.$message.warning("请完善人员信息"); + } + }); + } else { + this.isSubmit = false; + return this.$message.warning("请完善基础信息"); + } + }); + } }, //选择拆分标准取消事件 closeDrawer() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index e51aa3b71..61a3c3345 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -389,6 +389,8 @@ export default { }, data() { return { + //用来判断提交事件条件是否满足 + satisfyFlag: true, active: "1", standModel: false, sarAccessListDatas: [], @@ -674,51 +676,53 @@ export default { //提交事件 handleSubmit() { if (this.dataList.length < 1) { + this.satisfyFlag = false this.$message.warning("请添加产品线信息"); } this.dataList.forEach(item => { if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) { + this.satisfyFlag = false this.$message.warning("请选择分发责任人"); - } else { - this.isSubmit = true; - this.listForm.commentText = this.commentText; - var json = Object.assign(this.listForm, this.roleForm); - this.$refs["listForm"].validate((valid) => { - if (valid) { - this.$refs["roleForm"].validate((valid) => { - if (valid) { - this.$http.get("lawss/activiti/startProcess", { type: "5" }, { - _this: this - }, res => { - if (res.ok) { - this.$http.post("lawss/activiti/completeTask", { - taskIds: res.data, - userId: this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }); - } - }); - } else { - this.isSubmit = false; - return this.$message.warning("请完善人员信息"); - } - }); - } else { - this.isSubmit = false; - return this.$message.warning("请完善基础信息"); - } - }); } }); - + if(this.satisfyFlag){ + this.isSubmit = true; + this.listForm.commentText = this.commentText; + var json = Object.assign(this.listForm, this.roleForm); + this.$refs["listForm"].validate((valid) => { + if (valid) { + this.$refs["roleForm"].validate((valid) => { + if (valid) { + this.$http.get("lawss/activiti/startProcess", { type: "5" }, { + _this: this + }, res => { + if (res.ok) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }); + } + }); + } else { + this.isSubmit = false; + return this.$message.warning("请完善人员信息"); + } + }); + } else { + this.isSubmit = false; + return this.$message.warning("请完善基础信息"); + } + }); + } }, //选择拆分标准取消事件 closeDrawer() { From c7f1466c4231e64e05e0874ea2b14b632e22e3c5 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 15 Sep 2021 17:26:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzzqyj/step1-1.vue | 37 +- .../pages/creatProcess/bzzqyj/step1.vue | 246 ++--- .../pages/creatProcess/bzzqyj/step2.vue | 12 +- .../pages/creatProcess/bzzqyj/step3.vue | 983 +++++++++--------- .../pages/creatProcess/bzzqyj/step4.vue | 786 +++++++------- .../pages/creatProcess/bzzqyj/step5.vue | 26 +- .../pages/creatProcess/bzzqyj/step6.vue | 37 +- .../pages/creatProcess/bzzqyj/step7.vue | 910 ++++++++-------- .../pages/creatProcess/bzzqyj/step8.vue | 912 ++++++++-------- .../pages/creatProcess/bzzqyj/step9.vue | 37 +- 10 files changed, 1991 insertions(+), 1995 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index a08c60aa6..fef4fc791 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -24,12 +24,10 @@
- -
+ +
选择标准
- - - - - - -
+ +
选择附件
- - { - // this.standInfoList = res.data.records - // this.total = res.data.total - // this.spinShow = false - // }, e => { - // }) }, pageChange(page) { this.standCommonlySearch.page = page @@ -561,11 +540,10 @@ export default { bringData.push(deposit.get(this.selectedList[i])); } if (bringData[0].standYear) { - this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + ' ' + bringData[0].standName } else { - this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + ' ' + bringData[0].standName } - this.form.cname = bringData[0].standName; this.listModel = false; } else if (this.selectedList.length > 1) { this.$message.warning("只能选择一条数据进行带入"); @@ -680,6 +658,9 @@ export default { } } + .el-input__icon { + width: 15px; + } position: relative; height: 100%; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index dd9019148..9486acad0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -12,11 +12,11 @@
@@ -24,46 +24,36 @@
- -
- 选择标准 + +
+ 选择标准
- - - - - + disabled + v-model="form.cid" + placeholder="请输入标准编号" + clearable + /> + v-model="form.endTime" + type="date" + placeholder="请选择结束日期"> - -
- 选择附件 -
- +
+ 选择附件 +
-
{{ item.fileName }}
+
+ {{ item.fileName }} +
@@ -75,11 +65,11 @@
+ type="textarea" + :rows="3" + resize="none" + placeholder="请输入意见" + v-model="commentText">
@@ -169,12 +159,12 @@
- {{ opt.label }} + + {{ opt.label }} @@ -207,15 +198,17 @@ 查询 + @click="sarStandCompareHisInfo">查询 + 清空 + class="common-button-default" + size="mini" + @click="clearSearchStand">清空 +
@@ -235,8 +228,12 @@ @@ -257,37 +254,37 @@
+ ref="selection" + :data="fjList" + tooltip-effect="dark" + style="width: 100%;padding:0 0 20px 0;" + height="100%" + border + @selection-change="handleSelection2" + :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"> @@ -309,7 +306,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import { saveTaskFirst } from 'api/process' +import {saveTaskFirst} from 'api/process' export default { name: "bzzqyjStep1", @@ -339,16 +336,13 @@ export default { }, formRules: { cid: [ - { required: true, message: '请输入标准编号', trigger: 'change' }, + {required: true, message: '请输入标准编号', trigger: 'change'}, ], endTime: [ - { required: true, message: '请输入标准结束日期', trigger: 'change' }, - ], - cname: [ - { required: true, message: '请输入标准名称', trigger: 'change' }, + {required: true, message: '请输入标准结束日期', trigger: 'change'}, ], fjListId: [ - { required: true, message: '请选择附件', trigger: 'change' }, + {required: true, message: '请选择附件', trigger: 'change'}, ] }, // 标准征求意见数据可库 @@ -380,16 +374,16 @@ export default { }, roleFormRules: { dockUserList: [ - { required: true, message: '请选择责任部门对接人', trigger: 'change' }, + {required: true, message: '请选择责任部门对接人', trigger: 'change'}, ], ministerUser: [ - { required: true, message: '请选择标准法规部部长', trigger: 'change' }, + {required: true, message: '请选择标准法规部部长', trigger: 'change'}, ], directorUser: [ - { required: true, message: '请选择技术管理中心主任', trigger: 'change' }, + {required: true, message: '请选择技术管理中心主任', trigger: 'change'}, ], presidentUser: [ - { required: true, message: '请选择工程研究院院长', trigger: 'change' }, + {required: true, message: '请选择工程研究院院长', trigger: 'change'}, ] }, nodeList: [], @@ -406,7 +400,7 @@ export default { ProcessFooter, ProcessTitle }, - mounted () { + mounted() { this.sarStandCompareHis() this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this @@ -420,7 +414,7 @@ export default { } }, methods: { - updataFj (item) { + updataFj(item) { let id let type = item.fileName.split('.') if (type[1] === 'pdf') { @@ -430,7 +424,7 @@ export default { } window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) }, - addfjList () { + addfjList() { this.$http.get('lawss/sarStandFile/queryFileInfo', { standId: this.form.standId }, {}, res => { @@ -438,18 +432,18 @@ export default { }) this.fzlistModel = true }, - handleSelection2 (data) { - if(data.length > 5) { + handleSelection2(data) { + if (data.length > 5) { this.$message.warning('最多选择5条附件') } else { this.addFjList = data } }, - closeDrawer2 () { + closeDrawer2() { this.fzlistModel = false this.addFjList = [] }, - enterDrawer2 () { + enterDrawer2() { this.fzlistModel = false this.form.fjList = this.addFjList let idList = [] @@ -462,7 +456,7 @@ export default { this.form.fjListId = idList.join(',') }, // 点击查看 - handlePreview (item) { + handlePreview(item) { let pageType if (item.standType === 'FOREIGN') { pageType = 'FOREIGN_STAND' @@ -485,7 +479,7 @@ export default { /** 标准征求意见库方法* * **********************************************/ // 清空 - clearSearchStand () { + clearSearchStand() { this.standCommonlySearch.page = 1 this.standCommonlySearch.standSort = '' this.standCommonlySearch.standNumber = '' @@ -498,32 +492,23 @@ export default { this.sarStandCompareHis() }, // 查询表格 - sarStandCompareHis () { + sarStandCompareHis() { this.spinShow = true var formData = this.standCommonlySearch this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { - _this: this - }, res => { + _this: this + }, res => { this.standInfoList = res.data.list this.total = res.data.count this.spinShow = false }) - // var form = this.standCommonlySearch - // this.$http.get('slrs/sar-public-idea/SelectAllPage', form, { - // _this: this - // }, res => { - // this.standInfoList = res.data.records - // this.total = res.data.total - // this.spinShow = false - // }, e => { - // }) }, - pageChange (page) { + pageChange(page) { this.standCommonlySearch.page = page this.sarStandCompareHis() }, // 分页每页显示数改变后方法 - pageSizeChange (pageSize) { + pageSizeChange(pageSize) { this.$store.getters.userInfo.configContent = pageSize this.standCommonlySearch.size = pageSize this.sarStandCompareHis() @@ -550,13 +535,12 @@ export default { bringData.push(deposit.get(this.selectedList[i])); } if (bringData[0].standYear) { - this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + ' ' + bringData[0].standName } else { - this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + ' ' + bringData[0].standName } this.form.standType = bringData[0].standType this.form.standId = bringData[0].id - this.form.cname = bringData[0].standName; this.listModel = false; } else if (this.selectedList.length > 1) { this.$message.warning("只能选择一条数据进行带入"); @@ -566,10 +550,10 @@ export default { }, /*** **********************************************/ /** 流程节点负责人的选择 *****************************/ - checkedRole2 (data) { + checkedRole2(data) { var idList = '' var nameList = '' - data.forEach( item => { + data.forEach(item => { if (nameList.length > 0) { nameList += ',' idList += ',' @@ -580,7 +564,7 @@ export default { this.roleForm.dockUserList = idList this.roleForm.dockUserListName = nameList }, - checkedRole (data) { + checkedRole(data) { if (this.type === 'ministerUser') { this.roleForm.ministerUser = data[0].id this.roleForm.ministerUserName = data[0].name @@ -592,14 +576,14 @@ export default { this.roleForm.presidentUserName = data[0].name } }, - choiceZRRS () { + choiceZRRS() { this.nodeList2 = [] - if ( this.roleForm.dockUserList.length > 0) { + if (this.roleForm.dockUserList.length > 0) { this.nodeList2 = this.roleForm.dockUserList.split(',') } this.modalshowflag2 = true }, - choiceZRR (type, title, id) { + choiceZRR(type, title, id) { this.nodeList = [] this.nodeList.push(id) this.type = type @@ -678,20 +662,27 @@ export default { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 3b464f68c..d99ad7a3a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -1,402 +1,408 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index c7688ae01..1ea8180f1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -24,7 +24,7 @@
- + - - -
-
{{ item.fileName }}
+
+ {{ item.fileName }} +
@@ -248,7 +242,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, processCreateStand, saveTaskForPub } from "api/process"; +import {inboundLiaisonDetail, processCreateStand, saveTaskForPub} from "api/process"; export default { name: "bzzqyjStep5", @@ -284,7 +278,7 @@ export default { }, formRules: { responUserList: [ - { required: true, message: "请选择责任人", trigger: "change" } + {required: true, message: "请选择责任人", trigger: "change"} ] }, json: {} @@ -296,7 +290,7 @@ export default { ProcessTitle }, methods: { - updataFj (item) { + updataFj(item) { let id let type = item.fileName.split('.') if (type[1] === 'pdf') { @@ -410,7 +404,7 @@ export default { item.type = false; }); this.json = data; - this.data = data.summaryList + this.data = data.info if (data.introduce) { } else { this.$http.get("slrs/sar-public-idea-all/getPublicIdea", { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index bc6e8f871..6d6dd5e6c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -24,7 +24,7 @@
- + - - -
-
{{ item.fileName }}
+
+ {{ item.fileName }} +
@@ -229,7 +223,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, processCreateStand } from "api/process"; +import {inboundLiaisonDetail, processCreateStand} from "api/process"; export default { name: "bzzqyjStep6", @@ -268,7 +262,7 @@ export default { }, formRules: { responUserList: [ - { required: true, message: "请选择责任人", trigger: "change" } + {required: true, message: "请选择责任人", trigger: "change"} ] }, json: {} @@ -280,7 +274,7 @@ export default { ProcessTitle }, methods: { - updataFj (item) { + updataFj(item) { let id let type = item.fileName.split('.') if (type[1] === 'pdf') { @@ -387,13 +381,14 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg); - this.form.cid = data.cid - this.form.endTime = data.endTime - this.form.cname = data.cname - this.form.fjList = data.fjList - this.form.fjListId = data.fjListId + this.form.fjList = data.fjList || data.form.fjList + this.form.fjListId = data.fjListId || data.form.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 = [] - data.summaryList.forEach( item => { + data.info.forEach(item => { if (item.state != '3') { arr.push(item) } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 2d116fc5f..d033f81c9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -1,462 +1,472 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 75efde0eb..41223f5aa 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -1,463 +1,473 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 2fb277a75..8e66c0be7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -24,7 +24,7 @@
- + - - -
-
{{ item.fileName }}
+
+ {{ item.fileName }} +
@@ -229,7 +223,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, processCreateStand } from "api/process"; +import {inboundLiaisonDetail, processCreateStand} from "api/process"; export default { name: "bzzqyjStep9", @@ -265,7 +259,7 @@ export default { }, formRules: { responUserList: [ - { required: true, message: "请选择责任人", trigger: "change" } + {required: true, message: "请选择责任人", trigger: "change"} ] }, json: {} @@ -277,7 +271,7 @@ export default { ProcessTitle }, methods: { - updataFj (item) { + updataFj(item) { let id let type = item.fileName.split('.') if (type[1] === 'pdf') { @@ -381,13 +375,14 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.cid = data.cid - this.form.endTime = data.endTime - this.form.cname = data.cname - this.form.fjList = data.fjList - this.form.fjListId = data.fjListId + this.form.fjList = data.fjList || data.form.fjList + this.form.fjListId = data.fjListId || data.form.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 = [] - data.summaryList.forEach( item => { + data.info.forEach(item => { if (item.state != '3') { arr.push(item) } From 195628f8611161ad81bee66197147caafb9ab839 Mon Sep 17 00:00:00 2001 From: "wangxiahui@91isoft.com" <140316hui> Date: Wed, 15 Sep 2021 17:47:25 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 328 +++++++++--------- .../pages/creatProcess/bzrk/step2.vue | 84 ++--- .../pages/creatProcess/bzrk/step3.vue | 60 ++-- .../pages/creatProcess/bzrk/step4.vue | 197 ++++++----- .../pages/creatProcess/bzrk/step5.vue | 70 ++-- 5 files changed, 362 insertions(+), 377 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 80759332a..b42326b30 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -299,6 +299,66 @@
+ + +
+ + + + 查看已上传的文件 + +
+
+ + + 点击上传 + +
+ + + +
+ + + + 查看已上传的文件 + +
+
+ + + 点击上传 + +
+
- - -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - -
- - - -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - -
- @@ -421,96 +421,96 @@
- - -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - -
- - - -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - -
- - - -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - -
- + + +
+ + + + 查看已上传的文件 + +
+
+ + + 点击上传 + +
+ + + +
+ + + + 查看已上传的文件 + +
+
+ + + 点击上传 + +
+ + + +
+ + + + 查看已上传的文件 + +
+
+ + + 点击上传 + +
+
@@ -788,6 +788,20 @@ @click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'" >{{'手动查找'}} + + + {{'手动查找'}} + {{'手动查找'}} - - - {{'手动查找'}} - diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 29e648d0a..4005a5006 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -241,17 +241,17 @@ - -
- -
- {{ form.bpgName }} + +
+ {{ form.ssgName }}
- -
- -
- {{ form.ssgName }} + +
+ {{ form.caName }}
- - @@ -267,22 +267,6 @@ - -
- -
- {{ form.zqyjgName }} -
-
- - - -
- - -
- {{ form.caName }} -
-
- - - -
-
{{ form.jdwjName }} @@ -291,6 +275,22 @@ - -
+ +
+ {{ form.bpgName }} +
+
+ - - +
+ + +
+ {{ form.zqyjgName }} +
+
+ - - +
+
@@ -469,14 +469,6 @@ - - -
{{ form.glwjName }} @@ -495,6 +487,14 @@ clearable > + + + - - - - - - - - -
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 0de89934e..de0ed6c3f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -234,17 +234,17 @@ - -
- -
- {{ form.bpgName }} + +
+ {{ form.ssgName }}
- -
- -
- {{ form.ssgName }} + +
+ {{ form.caName }}
- - @@ -260,22 +260,6 @@ - -
- -
- {{ form.zqyjgName }} -
-
- - - -
- - -
- {{ form.caName }} -
-
- - - -
-
{{ form.jdwjName }} @@ -284,6 +268,22 @@ - -
+ +
+ {{ form.bpgName }} +
+
+ - - +
+ + +
+ {{ form.zqyjgName }} +
+
+ - - +
+
@@ -488,14 +488,6 @@ clearable > - - - + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index ed0db369b..78cb67ab8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -292,34 +292,6 @@
- - -
- {{ form.bpgName }} - - 重新上传 - -
-
- - 点击上传 - -
-
+ + +
+ {{ form.caName }} + + 重新上传 + +
+
+ + 点击上传 + +
+ @@ -378,6 +378,62 @@
+ + +
+ {{ form.jdwjName }} + + 重新上传 + +
+
+ + 点击上传 + +
+ + + +
+ {{ form.bpgName }} + + 重新上传 + +
+
+ + 点击上传 + +
+
- - -
- {{ form.caName }} - - 重新上传 - -
-
- - 点击上传 - -
- - - -
- {{ form.jdwjName }} - - 重新上传 - -
-
- - 点击上传 - -
-
@@ -722,21 +722,6 @@ @click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'" >{{'手动查找'}} - - - - {{'手动查找'}} - {{'手动查找'}} + + + {{'手动查找'}} + diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index 840e35e6e..3c661c6c8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -228,17 +228,17 @@ - -
- -
- {{ form.bpgName }} + +
+ {{ form.ssgName }}
- -
- -
- {{ form.ssgName }} + +
+ {{ form.caName }}
- - @@ -254,22 +254,6 @@ - -
- -
- {{ form.zqyjgName }} -
-
- - - -
- - -
- {{ form.caName }} -
-
- - - -
-
{{ form.jdwjName }} @@ -278,6 +262,22 @@ - -
+ +
+ {{ form.bpgName }} +
+
+ - - +
+ + +
+ {{ form.zqyjgName }} +
+
+ - - +
+
@@ -485,6 +485,22 @@ + + + + + + - - - + +