From e67ab551621178d5c606ac64a0dd8d16686a96cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 16 Dec 2021 16:57:06 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BD=93=E7=B3=BB=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 5801004e3..b12fe4d6a 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -1338,7 +1338,7 @@ width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" - :nodeKey="nodeKey" @popoverHide="popoverHide"> + :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> Date: Thu, 16 Dec 2021 17:48:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=92=A4=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 29 ++++++++++--------- .../pages/creatProcess/jrbzhxh/step1.vue | 11 ++++++- .../pages/creatProcess/qbfs/step1.vue | 12 +++++++- .../pages/creatProcess/qbfz/step1.vue | 12 +++++++- .../pages/creatProcess/qbzxdjhgk/step1.vue | 14 +++++++-- .../pages/creatProcess/wbsm/step1.vue | 12 +++++++- .../pages/creatProcess/xmpg/step1-1.vue | 25 +++++++++------- .../pages/creatProcess/xmpg/step1.vue | 13 ++++++++- .../pages/creatProcess/xmpg2/step1-1.vue | 22 +++++++------- .../pages/creatProcess/xmpg2/step1.vue | 12 +++++++- .../pages/creatProcess/xmqdqr/step1-1.vue | 21 ++++++++------ .../pages/creatProcess/xmqdqr/step1.vue | 13 ++++++++- 12 files changed, 143 insertions(+), 53 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 661379ce7..ba13e4698 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1124,15 +1124,26 @@ 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.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '4', + json: JSON.stringify({ + taskInfo: '引入法规标准清单', + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { @@ -1145,17 +1156,9 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } this.$router.push("/processCenter"); } - this.isSubmit = false; + this.isSubmit = false }); } }); diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue index 21eda1b26..99c95e502 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue @@ -185,7 +185,16 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", {type: "15"}, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '15', + json: JSON.stringify({ + taskInfo: '备案任务下发', + roleForm: this.roleForm, + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index 4b687c61d..cee4400f8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -583,7 +583,17 @@ export default { this.qbfsForm.fileList = this.fileList this.qbfsForm.commentText = this.commentText var json = Object.assign(this.qbfsForm, this.roleForm) - this.$http.get('lawss/activiti/startProcess', {type: '23'}, { + this.$http.post('lawss/activiti/startProcessRollBack', { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '23', + json: JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: this.qbfsForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index c93be5d1e..5f2df297e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -624,7 +624,17 @@ export default { this.isSubmit = true this.standardSearch.commentText = this.commentText var json = Object.assign(this.standardSearch, this.roleForm) - this.$http.get('lawss/activiti/startProcess', {type: '24'}, { + this.$http.post('lawss/activiti/startProcessRollBack', { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '24', + json: JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: this.standardSearch, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index cc933eb41..d0dc8ab97 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -474,9 +474,17 @@ export default { if (valid) { // this.isSubmit = true; var json = Object.assign(qbzxdFrom, this.roleForm); - console.log(json); - return - this.$http.get("lawss/activiti/startProcess", { type: "25" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '25', + json: JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: qbzxdFrom, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue index d88f83492..111d9af70 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue @@ -680,7 +680,17 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", {type: "16"}, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '16', + json: JSON.stringify({ + roleForm: this.roleForm, + dataList: this.dataList, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 99c1f4b43..aca7388ec 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -854,14 +854,14 @@ export default { if (this.dataList.length < 1) { this.satisfyFlag = false this.$message.warning("请添加产品线信息"); - }else{ + }else { this.satisfyFlag = true } this.dataList.forEach(item => { if (!item.distributePerson) { this.satisfyFlag = false this.$message.warning("请选择分发责任人"); - }else{ + }else { this.satisfyFlag = true } }); @@ -874,7 +874,18 @@ export default { if (valid) { this.$refs["roleForm"].validate((valid) => { if (valid) { - this.$http.get("lawss/activiti/startProcess", { type: "5" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '5', + json: JSON.stringify({ + taskInfo: "选择已拆分标准", + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { @@ -887,14 +898,6 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } this.$router.push("/processCenter"); } this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 13b74f4af..2909c7f85 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -867,7 +867,18 @@ export default { if (valid) { this.$refs["roleForm"].validate((valid) => { if (valid) { - this.$http.get("lawss/activiti/startProcess", { type: "5" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '5', + json: JSON.stringify({ + taskInfo: "选择已拆分标准", + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index ab5bfa4d4..05e50fb08 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -612,7 +612,17 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "6" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '6', + json: JSON.stringify({ + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { @@ -625,14 +635,6 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } this.$router.push("/processCenter"); } this.isSubmit = false; @@ -647,7 +649,7 @@ export default { return this.$message.warning("请完善基础信息"); } }); - } + } } }, choiceZRR(type, title, id) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index ccdd41aac..395c8b95f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -629,7 +629,17 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "6" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '6', + json: JSON.stringify({ + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue index 0cf0dad19..6179964e5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -655,7 +655,18 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "10" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '10', + json: JSON.stringify({ + taskInfo: "产品经理分发", + form: this.qdform, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { @@ -668,14 +679,6 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } this.$router.push("/processCenter"); } this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 028182e51..ab4dd630f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -659,7 +659,18 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "10" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '10', + json: JSON.stringify({ + taskInfo: "产品经理分发", + form: this.qdform, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { From 35de42ff245f798fc5ae494280a40074179dee3e Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 16 Dec 2021 18:04:25 +0800 Subject: [PATCH 3/5] commit --- .../pages/creatProcess/bzjd/step3.vue | 73 +++++++++------ .../pages/creatProcess/bzjd/step4.vue | 91 +++++++++++++++++++ .../pages/creatProcess/bzjd/step5.vue | 90 ++++++++++++++++++ .../pages/creatProcess/bzjd/step6.vue | 90 ++++++++++++++++++ 4 files changed, 317 insertions(+), 27 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index c36e59a94..84c33eb92 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -67,7 +67,6 @@
批量编辑 - 查看比对
@@ -292,7 +292,7 @@ size="800px">
- +
+ 查看比对 +
相似度:{{ similarityDegree }}
-
-
-
- {{ item1.itemsNum }} -
-
-
-
-
-
-
- {{ item2.itemsNum }} -
-
-
-
+
+
@@ -463,11 +451,11 @@ name: "bzjdStep3", data() { return { + similarityDegree: '', BDmodel: false, oldNumber: '', - leftData: [], - rightData: [], - + leftData: '', + rightData: '', modalshowflag2: false, itemId: '', drawerModal: false, @@ -504,6 +492,7 @@ newData: '', // 新车型实施日期 onlineData: '', // 在产车实施日期 applyArctic: '', // 适用车型 + itemsId: '', }, modalshowflag: false, sarType: '', @@ -543,7 +532,13 @@ }, { _this: this }, res => { - this.leftData = res.data + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsNum === res.data[b].itemsNum) { + this.itemList[a].itemsId = res.data[b].itemsId + } + } + } }, e => { }) this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { @@ -552,13 +547,34 @@ }, { _this: this }, res => { - this.rightData = res.data + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsNum === res.data[b].itemsNum) { + this.itemList[a].itemsId2 = res.data[b].itemsId + } + } + } }, e => { }) }, - checkBD () { - this.BDmodel = true - this.getBDList() + checkBD (id,id2) { + let itemsEoPage = { + oldItemId: id, + newItemId: id2, + flag: 1 + } + this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { + _this: this + }, res => { + if (res.data.leftString === '' && res.data.rightString === '') { + this.$message.warning('暂无找到相似的文本') + } else { + this.leftData = res.data.leftString + this.rightData = res.data.rightString + this.BDmodel = true + this.similarityDegree = res.data.similarityDegree + } + }) }, itemEdit (row) { this.itemId = row.id @@ -571,6 +587,8 @@ newData: row.newData, // 新车型实施日期 onlineData: row.onlineData, // 在产车实施日期 applyArctic: row.applyArctic, // 适用车型 + itemsId: row.itemsId, + itemsId2: row.itemsId2 } }, saveUserInfo2 () { @@ -829,6 +847,7 @@ item.itemsTitle = item.itermsConditions item.applyArctic = item.applyArctic || [] }) + this.getBDList() this.itemList = itemList this.loading = false }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 53cae2420..dfd12205e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -101,6 +101,7 @@ show-overflow-tooltip prop="technicalRequir" width="200" + v-if="!form.itemsNum1" label="核心技术要求" align="center"> @@ -173,6 +174,14 @@ prop="zrUserIdName" align="center"> + + + @@ -270,6 +279,16 @@ 关闭
+ +
相似度:{{ similarityDegree }}
+
+
+
+
+ @@ -284,6 +303,11 @@ name: "bzjdStep4", data() { return { + similarityDegree: '', + BDmodel: false, + oldNumber: '', + leftData: '', + rightData: '', drawerModal: false, //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, @@ -315,6 +339,72 @@ ProcessTitle }, methods: { + getBDList () { + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'LEFT' + }, { + _this: this + }, res => { + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsNum === res.data[b].itemsNum) { + this.itemList[a].itemsId = res.data[b].itemsId + } + } + } + }, e => { + }) + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'RIGHT' + }, { + _this: this + }, res => { + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsNum === res.data[b].itemsNum) { + this.itemList[a].itemsId2 = res.data[b].itemsId + } + } + } + }, e => { + }) + }, + checkBD (id,id2) { + let itemsEoPage = { + oldItemId: id, + newItemId: id2, + flag: 1 + } + this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { + _this: this + }, res => { + if (res.data.leftString === '' && res.data.rightString === '') { + this.$message.warning('暂无找到相似的文本') + } else { + this.leftData = res.data.leftString + this.rightData = res.data.rightString + this.BDmodel = true + this.similarityDegree = res.data.similarityDegree + } + }) + }, + itemEdit (row) { + this.itemId = row.id + this.modalshowflag2 = true + this.editForm = { + technicalRequir: row.technicalRequir, // 核心技术要求 + changePoint: row.changePoint, // 国内标准的差异点 + complianceRequir: row.complianceRequir || '1', // 符合性要求 + complianceState: row.complianceState, // 合规性分析 + newData: row.newData, // 新车型实施日期 + onlineData: row.onlineData, // 在产车实施日期 + applyArctic: row.applyArctic, // 适用车型 + itemsId: row.itemsId, + itemsId2: row.itemsId2 + } + }, phoneClick () { this.$router.push('/phoneBzjdStep4') }, @@ -431,6 +521,7 @@ this.json = data this.itemList = data.itemList this.loading = false + this.getBDList() }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 86a29e90e..34681ce08 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -101,6 +101,7 @@ show-overflow-tooltip prop="technicalRequir" width="200" + v-if="!form.itemsNum1" label="核心技术要求" align="center"> @@ -173,6 +174,14 @@ prop="zrUserIdName" align="center"> + + + @@ -275,6 +284,16 @@ 关闭 + +
相似度:{{ similarityDegree }}
+
+
+
+
+ 加载中... @@ -290,6 +309,11 @@ name: "bzjdStep5", data() { return { + similarityDegree: '', + BDmodel: false, + oldNumber: '', + leftData: '', + rightData: '', drawerModal: false, //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, @@ -321,6 +345,72 @@ ProcessTitle }, methods: { + getBDList () { + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'LEFT' + }, { + _this: this + }, res => { + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsNum === res.data[b].itemsNum) { + this.itemList[a].itemsId = res.data[b].itemsId + } + } + } + }, e => { + }) + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'RIGHT' + }, { + _this: this + }, res => { + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsNum === res.data[b].itemsNum) { + this.itemList[a].itemsId2 = res.data[b].itemsId + } + } + } + }, e => { + }) + }, + checkBD (id,id2) { + let itemsEoPage = { + oldItemId: id, + newItemId: id2, + flag: 1 + } + this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { + _this: this + }, res => { + if (res.data.leftString === '' && res.data.rightString === '') { + this.$message.warning('暂无找到相似的文本') + } else { + this.leftData = res.data.leftString + this.rightData = res.data.rightString + this.BDmodel = true + this.similarityDegree = res.data.similarityDegree + } + }) + }, + itemEdit (row) { + this.itemId = row.id + this.modalshowflag2 = true + this.editForm = { + technicalRequir: row.technicalRequir, // 核心技术要求 + changePoint: row.changePoint, // 国内标准的差异点 + complianceRequir: row.complianceRequir || '1', // 符合性要求 + complianceState: row.complianceState, // 合规性分析 + newData: row.newData, // 新车型实施日期 + onlineData: row.onlineData, // 在产车实施日期 + applyArctic: row.applyArctic, // 适用车型 + itemsId: row.itemsId, + itemsId2: row.itemsId2 + } + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index a521f2e7f..e063a5855 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -102,6 +102,7 @@ show-overflow-tooltip prop="technicalRequir" width="200" + v-if="!form.itemsNum1" label="核心技术要求" align="center"> @@ -174,6 +175,14 @@ prop="zrUserIdName" align="center"> + + + @@ -274,6 +283,16 @@ 关闭 + +
相似度:{{ similarityDegree }}
+
+
+
+
+ 加载中... @@ -289,6 +308,11 @@ name: "bzjdStep6", data() { return { + similarityDegree: '', + BDmodel: false, + oldNumber: '', + leftData: '', + rightData: '', drawerModal: false, //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, @@ -320,6 +344,72 @@ ProcessTitle }, methods: { + getBDList () { + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'LEFT' + }, { + _this: this + }, res => { + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsNum === res.data[b].itemsNum) { + this.itemList[a].itemsId = res.data[b].itemsId + } + } + } + }, e => { + }) + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'RIGHT' + }, { + _this: this + }, res => { + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsNum === res.data[b].itemsNum) { + this.itemList[a].itemsId2 = res.data[b].itemsId + } + } + } + }, e => { + }) + }, + checkBD (id,id2) { + let itemsEoPage = { + oldItemId: id, + newItemId: id2, + flag: 1 + } + this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { + _this: this + }, res => { + if (res.data.leftString === '' && res.data.rightString === '') { + this.$message.warning('暂无找到相似的文本') + } else { + this.leftData = res.data.leftString + this.rightData = res.data.rightString + this.BDmodel = true + this.similarityDegree = res.data.similarityDegree + } + }) + }, + itemEdit (row) { + this.itemId = row.id + this.modalshowflag2 = true + this.editForm = { + technicalRequir: row.technicalRequir, // 核心技术要求 + changePoint: row.changePoint, // 国内标准的差异点 + complianceRequir: row.complianceRequir || '1', // 符合性要求 + complianceState: row.complianceState, // 合规性分析 + newData: row.newData, // 新车型实施日期 + onlineData: row.onlineData, // 在产车实施日期 + applyArctic: row.applyArctic, // 适用车型 + itemsId: row.itemsId, + itemsId2: row.itemsId2 + } + }, handleTransfer() { this.drawerModal = true }, From 161364a52b1b206ee29efed3081af057e0ebd11d Mon Sep 17 00:00:00 2001 From: "wangxiahui@91isoft.com" <140316hui> Date: Thu, 16 Dec 2021 18:05:57 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E9=80=89=E4=BA=BA?= =?UTF-8?q?=E5=92=8C=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHd-rh/step1.vue | 21 ++++++++++++------- .../pages/creatProcess/bzhHd-rh/step2.vue | 2 +- .../pages/creatProcess/bzhHd-rh/step3.vue | 6 +++--- .../pages/creatProcess/bzhHh-hh/step1.vue | 18 ++++++++-------- .../pages/creatProcess/bzhHy-ch/step1.vue | 6 +++--- 5 files changed, 29 insertions(+), 24 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 792560783..13f2883aa 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -110,7 +110,7 @@ :action="uploadPath" name="file" :file-list="fileTextList" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" :on-success="handleOnsuccess" @@ -341,7 +341,7 @@

技术委员会常务副主任/总院院长

- +
@@ -352,8 +352,8 @@

总院技术委员会主任

- - + +
@@ -477,7 +477,8 @@ export default { feeUserId: '', engineerUser: '', engineerUserId: '', - + directorUserId: '', + directorUserName: '', }, rh_rules: {}, roleFormRules: { @@ -486,6 +487,7 @@ export default { leaderUser: [{required: true, message: "请选择标准法规部主管领导", trigger: ['blur', 'change']}], feeUser: [{required: true, message: "请选择费用管理部门人员", trigger: ['blur', 'change']}], engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}], + directorUserName: [{required: true, message: "请选择总院技术委员会主任", trigger: ['blur', 'change']}], }, roleShowflag: false, roleShowflagOne: false, @@ -556,11 +558,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 @@ -699,9 +701,12 @@ export default { if (this.type === 'leaderUser') { this.roleForm.leaderUser = data[0].name this.roleForm.leaderUserId = data[0].id - } else { + } else if(this.type === 'ngineerUser'){ this.roleForm.engineerUser = data[0].name this.roleForm.engineerUserId = data[0].id + } else { + this.roleForm.directorUserName = data[0].name + this.roleForm.directorUserId = data[0].id } this.roleShowflagOne = false }, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index 0c1ce8d08..41be31d75 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index c0b71a1bd..61cf5efe7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -184,7 +184,7 @@ :action="uploadPath" name="file" :file-list="fillFileList" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" :on-success="handleOnsuccess" @@ -506,11 +506,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue index 275d52ffd..321baa576 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue @@ -127,7 +127,7 @@ ref="uploadOtherFile" name="file" :file-list="upOtherData" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beforeUploadOther" :before-remove="beforeRemoveOther" :on-success="onsuccessOther" @@ -202,7 +202,7 @@ :action="actionPath" name="file" :file-list="reData" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" :on-success="handleOnsuccess" @@ -223,7 +223,7 @@ :action="actionPath" name="file" :file-list="themeData" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beforeUploadTheme" :before-remove="beforeRemoveTheme" :on-success="onsuccessTheme" @@ -420,11 +420,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 @@ -493,11 +493,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 @@ -553,11 +553,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 96510f1c9..939f0d879 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -124,7 +124,7 @@ :action="uploadPath" name="file" :file-list="ch_pageData.fileTextList" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" :on-success="handleOnsuccess" @@ -484,11 +484,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 From 95818728c894b29d15fc2355604745797337c18c Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 16 Dec 2021 18:16:31 +0800 Subject: [PATCH 5/5] feat: There is no way the, BUSS PROCESS --- src/api/process.js | 8 ++ src/components/CustomFormComponents/File.vue | 3 +- .../pages/creatProcess/qbrk/step1.vue | 5 +- .../pages/creatProcess/qbrk/step2.vue | 75 +++++++----- .../pages/creatProcess/qbrk/step3.vue | 85 +++++++------ .../pages/creatProcess/qbrk/step6.vue | 114 +++++++++++++----- .../pages/creatProcess/qbrk/stepC6.vue | 111 ++++++++++++----- 7 files changed, 275 insertions(+), 126 deletions(-) diff --git a/src/api/process.js b/src/api/process.js index 87fc515ef..1a8737f23 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -448,6 +448,14 @@ export function processModelHisOne (data) { }) } +export function processModelHisOneCount (data) { + return axios({ + url: '/api/lawss/activiti/processModelHisOneCount', + method: 'get', + params: data + }) +} + export function evaluationHisList (data) { return axios({ url: '/api/lawss/activiti/evaluationHisList', diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index a7c8735a7..dba1a65e4 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -76,6 +76,7 @@