diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 23c6ac1e2..0383d75d5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -183,7 +183,7 @@ align="center"> 编辑 - 查看比对 + 查看比对 @@ -335,83 +335,6 @@ - - - - - - - - - - - {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }} - {{ scope.row.standSortShow }} {{ scope.row.standNumber }} - - - - - - - {{ formatIssueDate(scope.row.issueTime) }} - - - - - {{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }} - - - - - {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }} - - - - - {{ textStatusMap[scope.row.textStatus] }} - - - - - - - - - - + :size="PLmodalType === 1 && form.itemsNum1 ? '1200px' : '800px'"> - - 查看比对 - - - - - - - - - - - - - - - - - - - - - + + + 无相似文本 + + 比对条款: {{ plForm.itemsNum }} + 相似度: {{ similarityDegree }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 确定 @@ -537,7 +472,8 @@ title="查看比对内容" :visible.sync="BDmodel" size="1100px"> - 相似度:{{ similarityDegree }} + 比对条款: {{ itemsNum }} + 相似度: {{ similarityDegree }} @@ -557,6 +493,8 @@ name: "bzjdStep1-1", data() { return { + itemsNum: '', + BDtext: false, pickerOptions: { disabledDate(time) { return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的 @@ -571,6 +509,7 @@ PLmodalshowflag: false, PLmodalTitle: '', plForm: { + itemsNum: '', itemsId: '', itemsId2: '', technicalRequir: '', @@ -593,8 +532,6 @@ itermsConditionsFlag: false, itermsConditionsTitle: '', textStatusMap: {}, - listModel2: false, - standInfoList2: [], sarType: '', loading: false, standId: '', @@ -666,7 +603,6 @@ type: '', drawerTitle: '', modalshowflag: false, - modalshowflag2: false, defaultProps: { children: 'children', label: 'name' @@ -675,7 +611,8 @@ itemList: [], zrType: '', zrIndex: '', - zrIdList: [] + zrIdList: [], + itemListOld: [] } }, components: { @@ -705,7 +642,7 @@ }, getBDList () { this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { - standHisId: this.oldNumber, + standHisId: this.form.oldNumber, leftOrRight: 'LEFT' }, { _this: this @@ -714,28 +651,29 @@ 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 + this.itemList[a].targetStand = res.data[b].targetStand } } } - }, 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 + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.form.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].targetStand === res.data[b].itemsDisplayNum) { + this.itemList[a].itemsId2 = res.data[b].itemsId + } } } - } + }, e => { + }) }, e => { }) }, - checkBD (id,id2) { + checkBD (id,id2, itemsNum) { let itemsEoPage = { oldItemId: id, newItemId: id2, @@ -747,6 +685,7 @@ if (res.data.leftString === '' && res.data.rightString === '') { this.$message.warning('暂无找到相似的文本') } else { + this.itemsNum = itemsNum this.leftData = res.data.leftString this.rightData = res.data.rightString this.BDmodel = true @@ -755,23 +694,39 @@ }) }, itemEdit (row, type, index) { - this.PLmodalType = type - this.PLmodalIndex = index - if (type === '1') { + let itemsEoPage = { + oldItemId: row.itemsId, + newItemId: row.itemsId2, + flag: 1 + } + this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { + _this: this + }, res => { + this.PLmodalType = type + this.PLmodalIndex = index this.PLmodalTitle = '编辑' - } - this.plForm = { - technicalRequir: row.technicalRequir, - changePoint: row.changePoint, - newData: row.newData, - onlineData: row.onlineData, - applyArctic: row.applyArctic, - zrUserId: row.zrUserId, - zrUserName: row.zrUserName, - itemsId: row.itemsId, - itemsId2: row.itemsId2 - } - this.PLmodalshowflag = true + if (res.data.leftString === '' && res.data.rightString === '') { + this.BDtext = true + } else { + this.BDtext = false + this.leftData = res.data.leftString + this.rightData = res.data.rightString + this.similarityDegree = res.data.similarityDegree + } + this.plForm = { + itemsNum: row.itemsNum, + technicalRequir: row.technicalRequir, + changePoint: row.changePoint, + newData: row.newData, + onlineData: row.onlineData, + applyArctic: row.applyArctic, + zrUserId: row.zrUserId, + zrUserName: row.zrUserName, + itemsId: row.itemsId, + itemsId2: row.itemsId2 + } + this.PLmodalshowflag = true + }) }, saveUserInfo2 () { if (this.PLmodalType === 1) { @@ -854,6 +809,7 @@ this.form.itemsName1 = bringData[0].oldStandName this.form.oldNumber = bringData[0].oldStandId this.listModel3 = false + this.getBDList() } else if (this.selectedList3.length > 1) { this.$message.warning("只能选择一条数据进行导入"); } else { @@ -927,30 +883,6 @@ }, e => { }) }, - sarStandCompareHis2 () { - var form = this.standCommonlySearch2 - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', form, { - _this: this - }, res => { - this.standInfoList2 = res.data.list - this.standInfoList2.forEach(item => { - if (item.attrInfoMap && item.attrInfoMap.XCXSSRQ) { - item.XCXSSRQ = item.attrInfoMap.XCXSSRQ - } - if (item.attrInfoMap && item.attrInfoMap.ZCCSSRQ) { - item.ZCCSSRQ = item.attrInfoMap.ZCCSSRQ - } - }) - - this.total2 = res.data.count - this.$http.get('sys/dictype/getDicTypeListCode', '', { - _this: this - }, res => { - this.setMap(res.data.WBZTCLASS) - }) - }, e => { - }) - }, pageChange (page) { this.standCommonlySearch.page = page this.sarStandCompareHis() @@ -961,16 +893,6 @@ this.standCommonlySearch.pageSize = pageSize this.sarStandCompareHis() }, - pageChange2 (page) { - this.standCommonlySearch2.page = page - this.sarStandCompareHis2() - }, - // 分页每页显示数改变后方法 - pageSizeChange2 (pageSize) { - this.$store.getters.userInfo.configContent = pageSize - this.standCommonlySearch2.pageSize = pageSize - this.sarStandCompareHis2() - }, /** 选择导入数据的方法操作 * */ handleSelection(data) { @@ -979,12 +901,6 @@ this.selectedList.push(data[i].id); } }, - handleSelection2 (data) { - this.selectedList2 = []; - for (let i = 0; i < data.length; i++) { - this.selectedList2.push(data[i].id); - } - }, closeDrawer() { this.listModel = false }, @@ -1008,7 +924,6 @@ this.form.statusId = bringData[0].id this.form.fileType = bringData[0].fileType this.listModel = false; - this.listModel3 = true this.getDbList() this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { infoId: bringData[0].id, @@ -1018,6 +933,7 @@ _this: this }, res => { if (res.ok) { + this.listModel3 = true res.data.list.forEach(item => { item.zrUserId = '' item.zrUserIdName = '' @@ -1045,40 +961,6 @@ this.$message.warning("请选择一条数据进行导入"); } }, - closeDrawer2() { - this.listModel2 = false - }, - enterDrawer2() { - if (this.selectedList2.length === 1) { - let deposit = new Map(); - this.standInfoList2.forEach(item => { - deposit.set(item.id, item); - }); - let bringData = []; - for (let i = 0; i < this.selectedList2.length; i++) { - bringData.push(deposit.get(this.selectedList2[i])); - } - // if (bringData[0].splitStatus === '0') { - // this.form.itemsNum1 = bringData[0].standNumSplit - // this.form.itemsName1 = bringData[0].standNameSplit - // } else { - // this.form.itemsNum1 = bringData[0].showNumber - // this.form.itemsName1 = bringData[0].standName - // } - if (bringData[0].standYear) { - this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear - } else { - this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber - } - this.form.itemsName1 = bringData[0].standName - this.form.oldNumber = bringData[0].id - this.listModel2 = false - } else if (this.selectedList2.length > 1) { - this.$message.warning("只能选择一条数据进行导入"); - } else { - this.$message.warning("请选择一条数据进行导入"); - } - }, /*** **********************************************/ /** 流程节点负责人的选择 *****************************/ saveUserInfo(data) { @@ -1242,7 +1124,6 @@ this.getData() this.sarStandCompareHis() - this.sarStandCompareHis2() this.tableHeight = $('.content').height() - 44 window.onresize = () => { this.tableHeight = $('.content').height() - 44 @@ -1263,6 +1144,9 @@ } position: relative; height: 100%; + .BDclass { + height: calc(~'100% - 53px'); + } .headerTabs { height: 52px; display: flex; diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index a47607970..55bda25a7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -190,7 +190,7 @@ align="center"> 编辑 - 查看比对 + 查看比对 @@ -343,86 +343,6 @@ - - - - - - - - - - - {{ scope.row.standSortShow }} {{ - scope.row.standNumber - }}-{{ scope.row.standYear }} - - {{ scope.row.standSortShow }} {{ scope.row.standNumber }} - - - - - - - {{ formatIssueDate(scope.row.issueTime) }} - - - - - {{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }} - - - - - {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }} - - - - - {{ textStatusMap[scope.row.textStatus] }} - - - - - - - - - - + :size="PLmodalType === 1 && form.itemsNum1 ? '1200px' : '800px'"> - - 查看比对 - - - - - - - - - - - - - - - - - - - - - + + + 无相似文本 + + 比对条款: {{ plForm.itemsNum }} + 相似度: {{ similarityDegree }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 确定 @@ -549,7 +481,8 @@ title="查看比对内容" :visible.sync="BDmodel" size="1100px"> - 相似度:{{ similarityDegree }} + 比对条款: {{ itemsNum }} + 相似度: {{ similarityDegree }} @@ -570,6 +503,8 @@ export default { name: "bzjdStep1", data() { return { + itemsNum: '', + BDtext: false, pickerOptions: { disabledDate(time) { return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的 @@ -584,6 +519,7 @@ export default { PLmodalshowflag: false, PLmodalTitle: '', plForm: { + itemsNum: '', itemsId: '', itemsId2: '', technicalRequir: '', @@ -595,7 +531,6 @@ export default { zrUserName: '', }, cxList: [], - bpnId: '', listModel3: false, standInfoList3: [], @@ -606,8 +541,6 @@ export default { itermsConditionsFlag: false, itermsConditionsTitle: '', textStatusMap: {}, - listModel2: false, - standInfoList2: [], sarType: '', loading: false, standId: '', @@ -662,7 +595,6 @@ export default { total: 0, total2: 0, selectedList: [], - selectedList2: [], data: [], roleForm: { applyUserIdName: this.$store.getters.userInfo.userName, @@ -724,7 +656,7 @@ export default { }, getBDList () { this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { - standHisId: this.oldNumber, + standHisId: this.form.oldNumber, leftOrRight: 'LEFT' }, { _this: this @@ -733,28 +665,29 @@ export default { 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 + this.itemList[a].targetStand = res.data[b].targetStand } } } - }, 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 + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.form.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].targetStand === res.data[b].itemsDisplayNum) { + this.itemList[a].itemsId2 = res.data[b].itemsId + } } } - } + }, e => { + }) }, e => { }) }, - checkBD (id,id2) { + checkBD (id,id2, itemsNum) { let itemsEoPage = { oldItemId: id, newItemId: id2, @@ -766,6 +699,7 @@ export default { if (res.data.leftString === '' && res.data.rightString === '') { this.$message.warning('暂无找到相似的文本') } else { + this.itemsNum = itemsNum this.leftData = res.data.leftString this.rightData = res.data.rightString this.BDmodel = true @@ -774,23 +708,39 @@ export default { }) }, itemEdit (row, type, index) { - this.PLmodalType = type - this.PLmodalIndex = index - if (type === '1') { + let itemsEoPage = { + oldItemId: row.itemsId, + newItemId: row.itemsId2, + flag: 1 + } + this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { + _this: this + }, res => { + this.PLmodalType = type + this.PLmodalIndex = index this.PLmodalTitle = '编辑' - } - this.plForm = { - technicalRequir: row.technicalRequir, - changePoint: row.changePoint, - newData: row.newData, - onlineData: row.onlineData, - applyArctic: row.applyArctic, - zrUserId: row.zrUserId, - zrUserName: row.zrUserName, - itemsId: row.itemsId, - itemsId2: row.itemsId2 - } - this.PLmodalshowflag = true + if (res.data.leftString === '' && res.data.rightString === '') { + this.BDtext = true + } else { + this.BDtext = false + this.leftData = res.data.leftString + this.rightData = res.data.rightString + this.similarityDegree = res.data.similarityDegree + } + this.plForm = { + itemsNum: row.itemsNum, + technicalRequir: row.technicalRequir, + changePoint: row.changePoint, + newData: row.newData, + onlineData: row.onlineData, + applyArctic: row.applyArctic, + zrUserId: row.zrUserId, + zrUserName: row.zrUserName, + itemsId: row.itemsId, + itemsId2: row.itemsId2 + } + this.PLmodalshowflag = true + }) }, saveUserInfo2 () { if (this.PLmodalType === 1) { @@ -872,6 +822,7 @@ export default { this.form.itemsName1 = bringData[0].oldStandName this.form.oldNumber = bringData[0].id this.listModel3 = false + this.getBDList() } else if (this.selectedList3.length > 1) { this.$message.warning("只能选择一条数据进行导入"); } else { @@ -942,29 +893,6 @@ export default { }, e => { }) }, - sarStandCompareHis2() { - var form = this.standCommonlySearch2 - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', form, { - _this: this - }, res => { - this.standInfoList2 = res.data.list - this.standInfoList2.forEach(item => { - if (item.attrInfoMap && item.attrInfoMap.XCXSSRQ) { - item.XCXSSRQ = item.attrInfoMap.XCXSSRQ - } - if (item.attrInfoMap && item.attrInfoMap.ZCCSSRQ) { - item.ZCCSSRQ = item.attrInfoMap.ZCCSSRQ - } - }) - this.total2 = res.data.count - this.$http.get('sys/dictype/getDicTypeListCode', '', { - _this: this - }, res => { - this.setMap(res.data.WBZTCLASS) - }) - }, e => { - }) - }, pageChange(page) { this.standCommonlySearch.page = page this.sarStandCompareHis() @@ -975,16 +903,6 @@ export default { this.standCommonlySearch.pageSize = pageSize this.sarStandCompareHis() }, - pageChange2(page) { - this.standCommonlySearch2.page = page - this.sarStandCompareHis2() - }, - // 分页每页显示数改变后方法 - pageSizeChange2(pageSize) { - this.$store.getters.userInfo.configContent = pageSize - this.standCommonlySearch2.pageSize = pageSize - this.sarStandCompareHis2() - }, /** 选择导入数据的方法操作 * */ handleSelection(data) { @@ -993,12 +911,6 @@ export default { this.selectedList.push(data[i].id); } }, - handleSelection2(data) { - this.selectedList2 = []; - for (let i = 0; i < data.length; i++) { - this.selectedList2.push(data[i].id); - } - }, closeDrawer() { this.listModel = false }, @@ -1022,7 +934,6 @@ export default { this.form.statusId = bringData[0].id this.form.fileType = bringData[0].fileType this.listModel = false; - this.listModel3 = true this.getDbList() this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { infoId: bringData[0].id, @@ -1032,6 +943,7 @@ export default { _this: this }, res => { if (res.ok) { + this.listModel3 = true res.data.list.forEach(item => { item.zrUserId = '' item.zrUserIdName = '' @@ -1049,7 +961,6 @@ export default { this.itemListOld = res.data.list.filter(item =>{ return item.workFlowShow === '0' }) - this.getBDList() } this.loading = false }) @@ -1059,33 +970,6 @@ export default { this.$message.warning("请选择一条数据进行导入"); } }, - closeDrawer2() { - this.listModel2 = false - }, - enterDrawer2() { - if (this.selectedList2.length === 1) { - let deposit = new Map(); - this.standInfoList2.forEach(item => { - deposit.set(item.id, item); - }); - let bringData = []; - for (let i = 0; i < this.selectedList2.length; i++) { - bringData.push(deposit.get(this.selectedList2[i])); - } - if (bringData[0].standYear) { - this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear - } else { - this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber - } - this.form.itemsName1 = bringData[0].standName - this.form.oldNumber = bringData[0].id - this.listModel2 = false - } else if (this.selectedList2.length > 1) { - this.$message.warning("只能选择一条数据进行导入"); - } else { - this.$message.warning("请选择一条数据进行导入"); - } - }, /*** **********************************************/ /** 流程节点负责人的选择 *****************************/ saveUserInfo(data) { @@ -1261,7 +1145,6 @@ export default { }) this.sarStandCompareHis() - this.sarStandCompareHis2() this.tableHeight = $('.content').height() - 44 window.onresize = () => { this.tableHeight = $('.content').height() - 44 @@ -1284,7 +1167,9 @@ export default { position: relative; height: 100%; - + .BDclass { + height: calc(~'100% - 53px'); + } .headerTabs { height: 52px; display: flex; diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 472b63a8a..fe4426427 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -191,7 +191,7 @@ align="center"> 编辑 - 查看比对 + 查看比对 @@ -292,27 +292,42 @@ size="800px"> - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - @@ -354,10 +354,21 @@ title="编辑" :visible.sync="modalshowflag2" :wrapperClosable="false" - size="800px"> + :size="form.itemsNum1 ? '1200px' : '800px'"> - - 查看比对 + + + 无相似文本 + + 比对条款: {{ editForm.itemsNum }} + 相似度: {{ similarityDegree }} + + + + + + + + 确定 @@ -430,7 +442,8 @@ title="查看比对内容" :visible.sync="BDmodel" size="1100px"> - 相似度:{{ similarityDegree }} + 比对条款: {{ itemsNum }} + 相似度: {{ similarityDegree }} @@ -451,6 +464,8 @@ name: "bzjdStep3", data() { return { + BDtext: false, + itemsNum: '', similarityDegree: '', BDmodel: false, oldNumber: '', @@ -485,6 +500,7 @@ applyArctic: '', // 适用车型 }, editForm: { + itemsNum: '', technicalRequir: '', // 核心技术要求 changePoint: '', // 国内标准的差异点 complianceRequir: '', // 符合性要求 @@ -557,7 +573,7 @@ }, e => { }) }, - checkBD (id,id2) { + checkBD (id,id2, itemsNum) { let itemsEoPage = { oldItemId: id, newItemId: id2, @@ -569,6 +585,7 @@ if (res.data.leftString === '' && res.data.rightString === '') { this.$message.warning('暂无找到相似的文本') } else { + this.itemsNum = itemsNum this.leftData = res.data.leftString this.rightData = res.data.rightString this.BDmodel = true @@ -577,19 +594,37 @@ }) }, 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 + let itemsEoPage = { + oldItemId: row.itemsId, + newItemId: row.itemsId2, + flag: 1 } + this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { + _this: this + }, res => { + if (res.data.leftString === '' && res.data.rightString === '') { + this.BDtext = true + } else { + this.BDtext = false + this.leftData = res.data.leftString + this.rightData = res.data.rightString + this.similarityDegree = res.data.similarityDegree + } + this.itemId = row.id + this.modalshowflag2 = true + this.editForm = { + itemsNum: row.itemsNum, + technicalRequir: row.technicalRequir, // 核心技术要求 + changePoint: row.changePoint, // 国内标准的差异点 + complianceRequir: row.complianceRequir || '', // 符合性要求 + complianceState: row.complianceState, // 合规性分析 + newData: row.newData, // 新车型实施日期 + onlineData: row.onlineData, // 在产车实施日期 + applyArctic: row.applyArctic, // 适用车型 + itemsId: row.itemsId, + itemsId2: row.itemsId2 + } + }) }, saveUserInfo2 () { for( let a = 0; a < this.itemList.length; a++) { @@ -682,7 +717,7 @@ if (this.idList.length > 0) { this.plForm.technicalRequir = '' this.plForm.changePoint = '' - this.plForm.complianceRequir = '1' + this.plForm.complianceRequir = '' this.plForm.complianceState = '' this.plForm.newData = '' this.plForm.onlineData = '' @@ -841,14 +876,13 @@ } else { itemList = data.itemList } - console.log(itemList); itemList.forEach(item => { item.unitDeptName = this.$store.getters.userInfo.institutionName item.onlineData = item.onlineData || '' item.newData = item.newData || '' item.complianceState = item.complianceState || '' item.oldNumber = item.oldNumber || '' - item.complianceRequir = item.complianceRequir || '1' + item.complianceRequir = item.complianceRequir || '' item.changePoint = item.changePoint || '' item.technicalRequir = item.technicalRequir || '' item.itemsTitle = item.itermsConditions @@ -893,6 +927,9 @@ .myText { line-height: 20px; } + .BDclass { + height: calc(~'100% - 53px'); + } .myDataPick { /deep/.el-form-item__content { margin-left: 0px !important; diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index ececf879d..3fbce2468 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -73,8 +73,8 @@ height="100%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" - row-key="id" > + @@ -151,39 +151,41 @@ - 符合 - 不符合 + {{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }} - 查看比对 + 查看比对 @@ -284,6 +286,7 @@ title="查看比对内容" :visible.sync="BDmodel" size="1100px"> + 比对条款: {{ itemsNum }} 相似度:{{ similarityDegree }} @@ -304,6 +307,7 @@ name: "bzjdStep4", data() { return { + itemsNum: '', similarityDegree: '', BDmodel: false, oldNumber: '', @@ -340,39 +344,7 @@ 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) { + checkBD (id,id2,itemsNum) { let itemsEoPage = { oldItemId: id, newItemId: id2, @@ -384,6 +356,7 @@ if (res.data.leftString === '' && res.data.rightString === '') { this.$message.warning('暂无找到相似的文本') } else { + this.itemsNum = itemsNum this.leftData = res.data.leftString this.rightData = res.data.rightString this.BDmodel = true @@ -522,7 +495,6 @@ 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 e3c67ea82..212b770b6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -73,20 +73,20 @@ height="100%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" - row-key="id" > + @@ -151,39 +151,41 @@ - 符合 - 不符合 + {{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }} - 查看比对 + 查看比对 @@ -289,6 +291,7 @@ title="查看比对内容" :visible.sync="BDmodel" size="1100px"> + 比对条款: {{ itemsNum }} 相似度:{{ similarityDegree }} @@ -310,6 +313,7 @@ name: "bzjdStep5", data() { return { + itemsNum: '', similarityDegree: '', BDmodel: false, oldNumber: '', @@ -346,39 +350,7 @@ 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) { + checkBD (id,id2,itemsNum) { let itemsEoPage = { oldItemId: id, newItemId: id2, @@ -390,6 +362,7 @@ if (res.data.leftString === '' && res.data.rightString === '') { this.$message.warning('暂无找到相似的文本') } else { + this.itemsNum = itemsNum this.leftData = res.data.leftString this.rightData = res.data.rightString this.BDmodel = true @@ -397,21 +370,6 @@ } }) }, - 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 }, @@ -525,7 +483,6 @@ this.json = data this.itemList = data.itemList this.loading = false - this.getBDList() }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index ffa5a74c1..c93f1e9da 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -73,21 +73,20 @@ height="100%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" - row-key="id" > @@ -152,39 +151,41 @@ - 符合 - 不符合 + {{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }} - 查看比对 + 查看比对 @@ -288,6 +289,7 @@ title="查看比对内容" :visible.sync="BDmodel" size="1100px"> + 比对条款: {{ itemsNum }} 相似度:{{ similarityDegree }} @@ -309,6 +311,7 @@ name: "bzjdStep6", data() { return { + itemsNum: '', similarityDegree: '', BDmodel: false, oldNumber: '', @@ -345,39 +348,7 @@ 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) { + checkBD (id,id2,itemsNum) { let itemsEoPage = { oldItemId: id, newItemId: id2, @@ -389,6 +360,7 @@ if (res.data.leftString === '' && res.data.rightString === '') { this.$message.warning('暂无找到相似的文本') } else { + this.itemsNum = itemsNum this.leftData = res.data.leftString this.rightData = res.data.rightString this.BDmodel = true @@ -507,9 +479,9 @@ } this.sarType = data.standInData || data.sarType this.json = data + console.log(data.itemList); this.itemList = data.itemList this.loading = false - this.getBDList() }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 7af7467dc..23563feee 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -576,8 +576,7 @@ export default { window.open('/static/pdf/phone/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) }, addfjList() { - this.$http.get('lawss/sarStandFile/queryFileInfoNew', { - type: '0', + this.$http.get('lawss/sarStandFile/querySourceFileInfo', { standId: this.form.standId }, { _this: this @@ -588,7 +587,7 @@ export default { this.fjList = res.data this.fzlistModel = true } else { - this.$message.warning('当前标准没有' + text + '文件') + this.$message.warning('当前标准没有文件') this.fjList = [] } }