commit

src/pages/processCenter/pages/creatProcess/bzjd/step3.vue

@@ -67,7 +67,6 @@
             </ProcessTitle>
             <div class="action-bar">
                 <el-button type="primary" :disabled="acceptShow" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button>
-                <el-button type="primary" v-if="form.itemsNum1" class="common-button-primary add-button" size="mini" @click="checkBD">查看比对</el-button>
             </div>
             <el-table border
                       ref="selection"
@@ -185,10 +184,11 @@
                 </el-table-column>
                 <el-table-column
                         label="操作"
-                        width="100"
+                        width="240"
                         align="center">
                     <template slot-scope="scope">
                         <el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row)">编辑</el-button>
+                        <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -292,7 +292,7 @@
                 size="800px">
             <div class="demo-drawer-content">
                 <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
-                    <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item"  v-if="!form.itemsNum1">
+                    <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
                         <el-input
                                 v-model="plForm.technicalRequir"
                                 placeholder="请输入核心技术要求"
@@ -357,6 +357,7 @@
                 size="800px">
             <div class="demo-drawer-content">
                 <el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
+                    <el-button style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(editForm.itemsId, editForm.itemsId2)">查看比对</el-button>
                     <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item"  v-if="!form.itemsNum1">
                         <el-input
                                 v-model="editForm.technicalRequir"
@@ -429,23 +430,10 @@
                 title="查看比对内容"
                 :visible.sync="BDmodel"
                 size="1100px">
+            <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
-                <div>
+                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
-                    <div v-for="(item1, index1) in leftData" :key="item1.id" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px;">
+                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
-                        <div style="line-height: 20px;">
-                            <span style="margin-right: 5px;">{{ item1.itemsNum }}</span><span v-html="item1.itemsName"></span>
-                            <div style="margin-top: 5px;" v-html="item1.itemsText"></div>
-                        </div>
-                    </div>
-                </div>
-                <div>
-                    <div v-for="(item2, index2) in rightData" :key="item2.id" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px;">
-                        <div style="line-height: 20px;">
-                            <span style="margin-right: 5px;">{{ item2.itemsNum }}</span><span v-html="item2.itemsName"></span>
-                            <div style="margin-top: 5px;" v-html="item2.itemsText"></div>
-                        </div>
-                    </div>
-                </div>
             </div>
         </el-dialog>
     </div>
@@ -463,11 +451,11 @@
         name: "bzjdStep3",
         data() {
             return {
+                similarityDegree: '',
                 BDmodel: false,
                 oldNumber: '',
-                leftData: [],
+                leftData: '',
-                rightData: [],
+                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 () {
+            checkBD (id,id2) {
-                this.BDmodel = true
+                let itemsEoPage = {
-                this.getBDList()
+                    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 => {

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">
                 </el-table-column>
@@ -173,6 +174,14 @@
                         prop="zrUserIdName"
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        label="操作"
+                        width="140"
+                        align="center">
+                    <template slot-scope="scope">
+                        <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
+                    </template>
+                </el-table-column>
             </el-table>
             <el-collapse accordion>
                 <el-collapse-item title="审批意见">
@@ -270,6 +279,16 @@
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>
         </el-dialog>
+        <el-dialog
+                title="查看比对内容"
+                :visible.sync="BDmodel"
+                size="1100px">
+            <div>相似度:{{ similarityDegree }}</div>
+            <div style="height: 600px;overflow: auto;display: flex;">
+                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
@@ -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 => {
                     })
                 })

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">
                 </el-table-column>
@@ -173,6 +174,14 @@
                         prop="zrUserIdName"
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        label="操作"
+                        width="140"
+                        align="center">
+                    <template slot-scope="scope">
+                        <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
+                    </template>
+                </el-table-column>
             </el-table>
             <el-collapse accordion>
                 <el-collapse-item title="回执说明">
@@ -275,6 +284,16 @@
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>
         </el-dialog>
+        <el-dialog
+                title="查看比对内容"
+                :visible.sync="BDmodel"
+                size="1100px">
+            <div>相似度:{{ similarityDegree }}</div>
+            <div style="height: 600px;overflow: auto;display: flex;">
+                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+            </div>
+        </el-dialog>
         <loading :loading="loading">加载中...</loading>
     </div>
 </template>
@@ -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
             },

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">
                 </el-table-column>
@@ -174,6 +175,14 @@
                         prop="zrUserIdName"
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        label="操作"
+                        width="140"
+                        align="center">
+                    <template slot-scope="scope">
+                        <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
+                    </template>
+                </el-table-column>
             </el-table>
             <el-collapse accordion>
                 <el-collapse-item title="审批意见">
@@ -274,6 +283,16 @@
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>
         </el-dialog>
+        <el-dialog
+                title="查看比对内容"
+                :visible.sync="BDmodel"
+                size="1100px">
+            <div>相似度:{{ similarityDegree }}</div>
+            <div style="height: 600px;overflow: auto;display: flex;">
+                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%;"></div>
+            </div>
+        </el-dialog>
         <loading :loading="loading">加载中...</loading>
     </div>
 </template>
@@ -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
             },