Merge remote-tracking branch 'origin/develop' into develop

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',

src/components/CustomFormComponents/File.vue

@@ -76,6 +76,7 @@
 </template>
 
 <script>
+import { onlyOfficeUrl } from '@/sysConfig'
 import { getConvertFileByAttId,getBusStandFileByAttId } from 'api/process'
 let Base64 = require('js-base64').Base64;
 export default {
@@ -365,7 +366,7 @@ export default {
                     }else {
                       const nowTime = new Date().getTime()
                       // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-                      window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
+                      window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
                     }
                     // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
                   }

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 @@
                   <h4>技术委员会常务副主任/总院院长</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.engineerUserId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.engineerUser" placeholder="选择人员" @click.native="choiceZRROne('engineerUser', '选择人员', roleForm.engineerUser)">
+                    <el-input v-model="roleForm.engineerUser" placeholder="选择技术委员会常务副主任/总院院长" @click.native="choiceZRROne('engineerUser', '选择人员', roleForm.engineerUser)">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -352,8 +352,8 @@
                 <el-form-item prop="totalLeader" style="margin-bottom: 0">
                   <h4>总院技术委员会主任</h4>
                   <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.directorUserId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="选择总院技术委员会主任">
+                    <el-input v-model="roleForm.directorUserName" placeholder="选择总院技术委员会主任" @click.native="choiceZRROne('directorUserId', '选择人员', roleForm.directorUserName)">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -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
     },

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue

@@ -2,7 +2,7 @@
   <div class="bzrhStep2">
     <ProcessHeader toggle>
       <template slot="proName">外部标准化协会入会流程</template>
-      <template slot="proNode">选择人员确认</template>
+      <template slot="proNode">提名入会代表</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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
       }
       // 判断文件上传大小

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
       }
       // 判断文件上传大小

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
       }
       // 判断文件上传大小

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
             },

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.commentText = this.commentText
-        this.listForm.fileName = this.fileInfoList;
+        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.isSubmit = true
-                this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
+                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
                     });
                   }
                 });

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) {

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) {

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) {

src/pages/processCenter/pages/creatProcess/qbrk/step1.vue

@@ -993,6 +993,7 @@
 </template>
 
 <script>
+    import { onlyOfficeUrl } from '@/sysConfig'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
@@ -2246,8 +2247,8 @@
                                     window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
                                 }else {
                                     const nowTime = new Date().getTime()
-                                    // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
+                                    window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
-                                    window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
+
                                 }
                             }
                         }).catch(e => {

src/pages/processCenter/pages/creatProcess/qbrk/step2.vue

@@ -804,6 +804,7 @@
 </template>
 
 <script>
+    import { onlyOfficeUrl } from '@/sysConfig'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
@@ -2295,7 +2296,7 @@
                             editFileInfo.fileName = editFilePath[2]
                             editFileInfo.userName = this.$store.getters.userInfo.userName
                             const nowTime = new Date().getTime()
-                            window.open('http://127.0.0.1:8080/editor?oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName)
+                            window.open(onlyOfficeUrl+'/editor?pid='+this.pId+'&taskIds='+this.taskIds+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName)
                             this.isSubmit = false
                         }
                     }).catch(e => {
@@ -2437,35 +2438,49 @@
                 // }
                 this.$refs['formTongGuo'].validate((valid) => {
                     if (valid) {
-                        this.isSubmit = true
+                        this.processModelHisOne(this.pId,this.taskIds)
-                        this.saveLoading = true
+                            .then(res => {
-                        this.form.commentText = this.formTongGuo.commentText
+                                if(res){
-                        this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                    const editFileInfo = res
-                        const json = JSON.stringify(this.form);
+                                    if(editFileInfo && editFileInfo.editStatus === '1'){
-                        this.$http.post('lawss/activiti/completeTask', {
+                                        this.isSubmit = true
-                            taskIds: this.taskIds,
+                                        this.saveLoading = true
-                            userId : this.userId,
+                                        this.form.commentText = this.formTongGuo.commentText
-                            json: json
+                                        this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-                        }, {
+                                        const json = JSON.stringify(this.form);
-                            _this: this
+                                        this.$http.post('lawss/activiti/completeTask', {
-                        }, res => {
+                                            taskIds: this.taskIds,
-                            if (res.success) {
+                                            userId : this.userId,
-                                this.$message.success(res.message)
+                                            json: json
-                                // 流程提交之后，应该流转至待办任务页面
+                                        }, {
-                                this.isSubmit = false
+                                            _this: this
-                                this.saveLoading = false
+                                        }, res => {
-                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                            if (res.success) {
-                                // if(this.formTongGuo.approvalOpinion === '1'){
+                                                this.$message.success(res.message)
-                                //     this.$message.warning("驳回成功")
+                                                // 流程提交之后，应该流转至待办任务页面
-                                //     this.isSubmit = false
+                                                this.isSubmit = false
-                                //     // 流程提交之后，应该流转至待办任务页面
+                                                this.saveLoading = false
-                                //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                // }else{
+                                                // if(this.formTongGuo.approvalOpinion === '1'){
-                                //     this.processCreateLaws(json)
+                                                //     this.$message.warning("驳回成功")
-                                // }
+                                                //     this.isSubmit = false
-                            }else {
+                                                //     // 流程提交之后，应该流转至待办任务页面
-                                this.$message.success(res.message)
+                                                //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                            }
+                                                // }else{
+                                                //     this.processCreateLaws(json)
+                                                // }
+                                            }else {
+                                                this.$message.success(res.message)
+                                            }
+                                        })
+                                    }else {
+                                        this.$message.warning('请先在线编辑,再提交流程')
+                                    }
+
+                                }
+                            }).catch(e => {
+                            console.log(e)
+                            // this.$message.warning('文件不存在,预览失败')
                         })
               }})
             },

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

@@ -803,10 +803,11 @@
 </template>
 
 <script>
+    import { onlyOfficeUrl } from '@/sysConfig'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOne} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     let Base64 = require('js-base64').Base64;
@@ -2264,11 +2265,10 @@
             handleTabs(name) {
                 this.active = name
             },
-            processModelHisOne(pId,taskIds) {
+            processModelHisOneCount(pId) {
                 return new Promise((resolve, reject) => {
-                    processModelHisOne({
+                    processModelHisOneCount({
-                        pid: pId,
+                        pid: pId
-                        taskId: taskIds
                     }).then(res => {
                         if (res) {
                             resolve(res)
@@ -2283,7 +2283,7 @@
             // 在线编辑
             handleOnLineEdit(){
                 this.isSubmit = true
-                this.processModelHisOne(this.pId,this.taskIds)
+                this.processModelHisOneCount(this.pId,this.taskIds)
                     .then(res => {
                         console.log(res)
                         if(res){
@@ -2294,7 +2294,7 @@
                             editFileInfo.fileName = editFilePath[2]
                             editFileInfo.userName = this.$store.getters.userInfo.userName
                             const nowTime = new Date().getTime()
-                            window.open('http://127.0.0.1:8080/editor?oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName)
+                            window.open(onlyOfficeUrl+'/editor?pid='+this.pId+'&taskIds='+this.taskIds+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName)
                             this.isSubmit = false
                         }
                     }).catch(e => {
@@ -2436,36 +2436,49 @@
                 // }
                 this.$refs['formTongGuo'].validate((valid) => {
                     if (valid) {
-                        this.isSubmit = true
+                        this.processModelHisOneCount(this.pId)
-                        this.saveLoading = true
+                            .then(res => {
-                        this.form.commentText = this.formTongGuo.commentText
+                                if(res){
-                        this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                    const editFileInfo = res
-                        const json = JSON.stringify(this.form);
+                                    if(editFileInfo && editFileInfo.editStatus === '1'){
-                        this.$http.post('lawss/activiti/completeTask', {
+                                        this.isSubmit = true
-                            taskIds: this.taskIds,
+                                        this.saveLoading = true
-                            userId : this.userId,
+                                        this.form.commentText = this.formTongGuo.commentText
-                            json: json
+                                        this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-                        }, {
+                                        const json = JSON.stringify(this.form);
-                            _this: this
+                                        this.$http.post('lawss/activiti/completeTask', {
-                        }, res => {
+                                            taskIds: this.taskIds,
-                            if (res.success) {
+                                            userId : this.userId,
-                                this.$message.success(res.message)
+                                            json: json
-                                this.isSubmit = false
+                                        }, {
-                                this.saveLoading = false
+                                            _this: this
-                                // 流程提交之后，应该流转至待办任务页面
+                                        }, res => {
-                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                            if (res.success) {
+                                                this.$message.success(res.message)
+                                                // 流程提交之后，应该流转至待办任务页面
+                                                this.isSubmit = false
+                                                this.saveLoading = false
+                                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                                // if(this.formTongGuo.approvalOpinion === '1'){
+                                                //     this.$message.warning("驳回成功")
+                                                //     this.isSubmit = false
+                                                //     // 流程提交之后，应该流转至待办任务页面
+                                                //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                                // }else{
+                                                //     this.processCreateLaws(json)
+                                                // }
+                                            }else {
+                                                this.$message.success(res.message)
+                                            }
+                                        })
+                                    }else {
+                                        this.$message.warning('请先在线编辑,再提交流程')
+                                    }
 
-                                // if(this.formTongGuo.approvalOpinion === '1'){
+                                }
-                                //     this.$message.warning("驳回成功")
+                            }).catch(e => {
-                                //     this.isSubmit = false
+                            console.log(e)
-                                //     // 流程提交之后，应该流转至待办任务页面
+                            // this.$message.warning('文件不存在,预览失败')
-                                //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                // }else{
-                                //     this.processCreateLaws(json)
-                                // }
-                            }else {
-                                this.$message.success(res.message)
-                            }
                         })
               }})
             },

src/pages/processCenter/pages/creatProcess/qbrk/step6.vue

@@ -497,8 +497,10 @@
             v-show="verifySarStandard"
             show-save
             show-submit
+            show-edit
             :saveLoading="saveLoading"
             :submitLoading="isSubmit"
+            @onLineEdit="handleOnLineEdit"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -844,10 +846,11 @@
 </template>
 
 <script>
+    import { onlyOfficeUrl } from '@/sysConfig'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     let Base64 = require('js-base64').Base64;
@@ -2368,6 +2371,43 @@
             handleTabs(name) {
                 this.active = name
             },
+            processModelHisOneCount(pId) {
+                return new Promise((resolve, reject) => {
+                    processModelHisOneCount({
+                        pid: pId
+                    }).then(res => {
+                        if (res) {
+                            resolve(res)
+                        } else {
+                            reject()
+                        }
+                    }).catch(e => {
+                        reject(e)
+                    })
+                })
+            },
+            // 在线编辑
+            handleOnLineEdit(){
+                this.isSubmit = true
+                this.processModelHisOneCount(this.pId,this.taskIds)
+                    .then(res => {
+                        console.log(res)
+                        if(res){
+                            const editFileInfo = res
+                            const showName = this.$store.getters.userInfo.userName + editFileInfo.taskInfo
+                            const editFilePath = editFileInfo.editFilePath.split("/")
+                            editFileInfo.filePath = editFilePath[0]+'/'+editFilePath[1]+'/'
+                            editFileInfo.fileName = editFilePath[2]
+                            editFileInfo.userName = this.$store.getters.userInfo.userName
+                            const nowTime = new Date().getTime()
+                            window.open(onlyOfficeUrl+'/editor?pid='+this.pId+'&taskIds='+this.taskIds+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName)
+                            this.isSubmit = false
+                        }
+                    }).catch(e => {
+                    console.log(e)
+                    // this.$message.warning('文件不存在,预览失败')
+                })
+            },
             //保存
             handleSave() {
                 this.form.country=this.countryArr;
@@ -2502,35 +2542,49 @@
                 // }
                 this.$refs['formTongGuo'].validate((valid) => {
                     if (valid) {
-                        this.isSubmit = true
+                        this.processModelHisOneCount(this.pId)
-                        this.saveLoading = true
+                            .then(res => {
-                        this.form.commentText = this.formTongGuo.commentText
+                                if(res){
-                        this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                    const editFileInfo = res
-                        const json = JSON.stringify(this.form);
+                                    if(editFileInfo && editFileInfo.editStatus === '1'){
-                        this.$http.post('lawss/activiti/completeTask', {
+                                        this.isSubmit = true
-                            taskIds: this.taskIds,
+                                        this.saveLoading = true
-                            userId : this.userId,
+                                        this.form.commentText = this.formTongGuo.commentText
-                            json: json
+                                        this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-                        }, {
+                                        const json = JSON.stringify(this.form);
-                            _this: this
+                                        this.$http.post('lawss/activiti/completeTask', {
-                        }, res => {
+                                            taskIds: this.taskIds,
-                            if (res.success) {
+                                            userId : this.userId,
-                                this.$message.success(res.message)
+                                            json: json
-                                // 流程提交之后，应该流转至待办任务页面
+                                        }, {
-                                this.isSubmit = false
+                                            _this: this
-                                this.saveLoading = false
+                                        }, res => {
-                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                            if (res.success) {
-                                // if(this.formTongGuo.approvalOpinion === '1'){
+                                                this.$message.success(res.message)
-                                //     this.$message.warning("驳回成功")
+                                                // 流程提交之后，应该流转至待办任务页面
-                                //     this.isSubmit = false
+                                                this.isSubmit = false
-                                //     // 流程提交之后，应该流转至待办任务页面
+                                                this.saveLoading = false
-                                //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                // }else{
+                                                // if(this.formTongGuo.approvalOpinion === '1'){
-                                //     this.processCreateLaws(json)
+                                                //     this.$message.warning("驳回成功")
-                                // }
+                                                //     this.isSubmit = false
-                            }else {
+                                                //     // 流程提交之后，应该流转至待办任务页面
-                                this.$message.success(res.message)
+                                                //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                            }
+                                                // }else{
+                                                //     this.processCreateLaws(json)
+                                                // }
+                                            }else {
+                                                this.$message.success(res.message)
+                                            }
+                                        })
+                                    }else {
+                                        this.$message.warning('请先在线编辑,再提交流程')
+                                    }
+
+                                }
+                            }).catch(e => {
+                            console.log(e)
+                            // this.$message.warning('文件不存在,预览失败')
                         })
               }})
             },

src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue

@@ -455,7 +455,9 @@
             v-show="verifySarStandard"
             show-save
             show-submit
+            show-edit
             :saveLoading="saveLoading"
+            @onLineEdit="handleOnLineEdit"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -801,10 +803,11 @@
 </template>
 
 <script>
+    import { onlyOfficeUrl } from '@/sysConfig'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     let Base64 = require('js-base64').Base64;
@@ -2256,6 +2259,43 @@
             handleTabs(name) {
                 this.active = name
             },
+            processModelHisOneCount(pId) {
+                return new Promise((resolve, reject) => {
+                    processModelHisOneCount({
+                        pid: pId
+                    }).then(res => {
+                        if (res) {
+                            resolve(res)
+                        } else {
+                            reject()
+                        }
+                    }).catch(e => {
+                        reject(e)
+                    })
+                })
+            },
+            // 在线编辑
+            handleOnLineEdit(){
+                this.isSubmit = true
+                this.processModelHisOneCount(this.pId,this.taskIds)
+                    .then(res => {
+                        console.log(res)
+                        if(res){
+                            const editFileInfo = res
+                            const showName = this.$store.getters.userInfo.userName + editFileInfo.taskInfo
+                            const editFilePath = editFileInfo.editFilePath.split("/")
+                            editFileInfo.filePath = editFilePath[0]+'/'+editFilePath[1]+'/'
+                            editFileInfo.fileName = editFilePath[2]
+                            editFileInfo.userName = this.$store.getters.userInfo.userName
+                            const nowTime = new Date().getTime()
+                            window.open(onlyOfficeUrl+'/editor?pid='+this.pId+'&taskIds='+this.taskIds+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName)
+                            this.isSubmit = false
+                        }
+                    }).catch(e => {
+                    console.log(e)
+                    // this.$message.warning('文件不存在,预览失败')
+                })
+            },
             //保存
             handleSave() {
                 this.form.country=this.countryArr;
@@ -2396,32 +2436,49 @@
                 // }
                 this.$refs['formTongGuo'].validate((valid) => {
                     if (valid) {
-                        this.isSubmit = true
+                        this.processModelHisOneCount(this.pId)
-                        this.form.commentText = this.formTongGuo.commentText
+                            .then(res => {
-                        this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                if(res){
-                        const json = JSON.stringify(this.form);
+                                    const editFileInfo = res
-                        this.$http.post('lawss/activiti/completeTask', {
+                                    if(editFileInfo && editFileInfo.editStatus === '1'){
-                            taskIds: this.taskIds,
+                                        this.isSubmit = true
-                            userId : this.userId,
+                                        this.saveLoading = true
-                            json: json
+                                        this.form.commentText = this.formTongGuo.commentText
-                        }, {
+                                        this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-                            _this: this
+                                        const json = JSON.stringify(this.form);
-                        }, res => {
+                                        this.$http.post('lawss/activiti/completeTask', {
-                            if (res.success) {
+                                            taskIds: this.taskIds,
-                                this.$message.success(res.message)
+                                            userId : this.userId,
-                                // 流程提交之后，应该流转至待办任务页面
+                                            json: json
-                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                        }, {
-                                // if(this.formTongGuo.approvalOpinion === '1'){
+                                            _this: this
-                                //     this.$message.warning("驳回成功")
+                                        }, res => {
-                                //     this.isSubmit = false
+                                            if (res.success) {
-                                //     // 流程提交之后，应该流转至待办任务页面
+                                                this.$message.success(res.message)
-                                //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                                // 流程提交之后，应该流转至待办任务页面
-                                // }else{
+                                                this.isSubmit = false
-                                //     this.processCreateLaws(json)
+                                                this.saveLoading = false
-                                // }
+                                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                            }else {
+                                                // if(this.formTongGuo.approvalOpinion === '1'){
-                                this.$message.success(res.message)
+                                                //     this.$message.warning("驳回成功")
-                            }
+                                                //     this.isSubmit = false
+                                                //     // 流程提交之后，应该流转至待办任务页面
+                                                //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                                // }else{
+                                                //     this.processCreateLaws(json)
+                                                // }
+                                            }else {
+                                                this.$message.success(res.message)
+                                            }
+                                        })
+                                    }else {
+                                        this.$message.warning('请先在线编辑,再提交流程')
+                                    }
+
+                                }
+                            }).catch(e => {
+                            console.log(e)
+                            // this.$message.warning('文件不存在,预览失败')
                         })
               }})
             },

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);
+                  this.$http.post("lawss/activiti/startProcessRollBack", {
-                  return
+                    id: this.bpnId || '',
-                  this.$http.get("lawss/activiti/startProcess", { type: "25" }, {
+                    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) {

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) {

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;

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) {

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) {

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) {

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;

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) {

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -1338,7 +1338,7 @@
               width = "500"
               :data="standSystemOptions"
               :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
-              :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
+              :nodeKey="nodeKey" @popoverHide="popoverHide"  @popoverHideCancel="popoverHideCancel"></tree-select-new>
       <tree-select-new
               width = "500"
               :lazy=true
@@ -2226,6 +2226,9 @@ export default {
     },
     popoverHideModelCancel() {
       this.modalShowFlag4 = false
+    },
+    popoverHideCancel() {
+      this.modalShowFlag1 = false
     },
       popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
           if(checkedData) {