Merge branch 'develop' into FOTON

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

@@ -469,9 +469,13 @@
                 size="1100px">
             <div>比对条款: {{ itemsNum }}</div>
             <div>相似度: {{ similarityDegree }}</div>
-            <div style="height: 600px;overflow: auto;display: flex;">
+            <div class="contentCom">
-                <div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                <div class="content-left">
-                <div v-html="rightData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                    <div v-for="(item,index) in leftData" v-html="item" :key="index"></div>
+                </div>
+                <div class="content-right">
+                    <div v-for="(item,index) in rightData" v-html="item" :key="index"></div>
+                </div>
             </div>
         </el-dialog>
     </div>
@@ -625,8 +629,19 @@
                         this.$message.warning('暂无找到相似的文本')
                     } else {
                         this.itemsNum = itemsNum
-                        this.leftData = res.data.leftString
+
-                        this.rightData = res.data.rightString
+                        this.leftData = []
+                        if((typeof res.data.leftString) === "string"){
+                            this.leftData.push(res.data.leftString)
+                        }else {
+                            this.leftData = res.data.leftString
+                        }
+                        this.rightData = []
+                        if((typeof res.data.rightString) === "string"){
+                            this.rightData.push(res.data.rightString)
+                        }else {
+                            this.rightData = res.data.rightString
+                        }
                         this.BDmodel = true
                         this.similarityDegree = res.data.similarityDegree
                     }
@@ -648,8 +663,18 @@
                         this.BDtext = true
                     } else {
                         this.BDtext = false
-                        this.leftData = res.data.leftString
+                        this.leftData = []
-                        this.rightData = res.data.rightString
+                        if((typeof res.data.leftString) === "string"){
+                            this.leftData.push(res.data.leftString)
+                        }else {
+                            this.leftData = res.data.leftString
+                        }
+                        this.rightData = []
+                        if((typeof res.data.rightString) === "string"){
+                            this.rightData.push(res.data.rightString)
+                        }else {
+                            this.rightData = res.data.rightString
+                        }
                         this.similarityDegree = res.data.similarityDegree
                     }
                     this.itemId = row.id
@@ -983,6 +1008,31 @@
                 padding: 0 20px 0;
             }
         }
+        .contentCom{
+            border-top: 1px solid #EDEDED;
+            min-height: 349px;
+            max-height: 549px;
+            display: flex;
+            display: -ms-flex;
+            display: -moz-flex;
+            display: -webkit-flex;
+            font-size: 15px;
+            .content-left{
+                border: 1px solid #EDEDED;
+                border-top-color: transparent;
+                flex: 0 0 50%;
+                line-height: 30px;
+                padding: 0 15px;
+            }
+            .content-right{
+                flex: 0 0 50%;
+                line-height: 30px;
+                padding: 0 15px;
+                border: 1px solid #EDEDED;
+                border-left-color: transparent;
+                border-top-color: transparent;
+            }
+        }
         .myText {
             line-height: 20px;
         }

src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue

@@ -40,7 +40,10 @@
                 </el-form>
             </div>
             <div class="demo-drawer-footer">
-                <el-button :loading="isSubmit" size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveUserInfo">
+              <el-button :loading="isSubmit" size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveUserInfo">
+                确定
+              </el-button>
+                <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="closePage">
                     提交
                 </el-button>
             </div>
@@ -143,6 +146,18 @@
                     }
                 }
             },
+          closePage(){
+            window.opener = null;
+            window.open("about:blank", "_top").close()
+            if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+              window.location.href = "about:blank";
+              window.close();
+            } else {
+              window.opener = null;
+              window.open("", "_self");
+              window.close();
+            }
+          }
         },
         mounted() {
           const attId = this.$route.query.attId

src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue

@@ -35,42 +35,6 @@
                           clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
-                  <el-date-picker
-                          v-model="form.endTime"
-                          type="date"
-                          :picker-options="pickerOptions"
-                          placeholder="请选择结束日期">
-                  </el-date-picker>
-                </el-form-item>
-                <el-form-item label="相关文件" prop="modelNameList" class="add-form-item form-item-disabled">
-                  <el-input
-                          disabled
-                          style="display: none;"
-                          v-model="form.modelNameList"
-                          clearable
-                  ></el-input>
-                  <div v-if="form.modelList.length > 0" class="fileClass" style="">
-                    <div v-for="(item, index) in form.modelList" :key="index" style="margin-right: 5px; padding-left: 10px;">
-                      <span @click="fileLook(item)">{{ item.name }}</span>
-                      <el-button
-                              size="small"
-                              @click="filesUpload(item)"
-                              icon="el-icon-download"
-                              style="height: 32px; margin-left: 5px;"
-                      ></el-button>
-                    </div>
-                  </div>
-                  <div class="addButton" style="padding-left: 10px">
-                    <el-button
-                            type="primary"
-                            class="common-button-primary"
-                            @click="fileUpload"
-                            size="small">
-                      点击上传
-                    </el-button>
-                  </div>
-                </el-form-item>
                 <el-form-item label="文本状态" prop="textType" class="add-form-item form-item-disabled">
                   <el-select :disabled="!form.cid" v-model="form.textType" placeholder="请选择">
                     <el-option
@@ -101,6 +65,42 @@
                     </div>
                   </div>
                 </el-form-item>
+                <el-form-item label="相关文件" prop="modelNameList" class="add-form-item form-item-disabled">
+                  <el-input
+                          disabled
+                          style="display: none;"
+                          v-model="form.modelNameList"
+                          clearable
+                  ></el-input>
+                  <div v-if="form.modelList.length > 0" class="fileClass" style="">
+                    <div v-for="(item, index) in form.modelList" :key="index" style="margin-right: 5px; padding-left: 10px;">
+                      <span @click="fileLook(item)">{{ item.name }}</span>
+                      <el-button
+                              size="small"
+                              @click="filesUpload(item)"
+                              icon="el-icon-download"
+                              style="height: 32px; margin-left: 5px;"
+                      ></el-button>
+                    </div>
+                  </div>
+                  <div class="addButton" style="padding-left: 10px">
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            @click="fileUpload"
+                            size="small">
+                      点击上传
+                    </el-button>
+                  </div>
+                </el-form-item>
+                <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
+                  <el-date-picker
+                          v-model="form.endTime"
+                          type="date"
+                          :picker-options="pickerOptions"
+                          placeholder="请选择结束日期">
+                  </el-date-picker>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -158,14 +158,14 @@
             <el-timeline-item timestamp="审核" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="ministerUser" style="margin-bottom: 0">
-                  <h4>标准法规部高级经理、责任部门高级经理</h4>
+                  <h4>标准法规部高级经理</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.ministerUser" style="display: none;"/>
                     <el-input
                             readonly
                             v-model="roleForm.ministerUserName"
-                            placeholder="选择标准法规部高级经理、责任部门高级经理"
+                            placeholder="选择标准法规部高级经理"
-                            @click.native="choiceZRR('ministerUser', '选择标准法规部高级经理、责任部门高级经理', roleForm.ministerUser)"
+                            @click.native="choiceZRR('ministerUser', '选择标准法规部高级经理', roleForm.ministerUser)"
                     />
                   </div>
                 </el-form-item>

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

@@ -35,12 +35,35 @@
                     clearable
                   />
                 </el-form-item>
-                <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
+                <el-form-item label="文本状态" prop="textType" class="add-form-item form-item-disabled">
-                  <el-date-picker :disabled="disabledXX"
+                  <el-select :disabled="!form.cid || disabledXX" v-model="form.textType" placeholder="请选择">
-                    v-model="form.endTime"
+                    <el-option
-                    type="date"
+                            v-for="(item, index) in textTypeList"
-                    placeholder="请选择结束日期">
+                            :key="index"
-                  </el-date-picker>
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="标准文本" prop="fjListId" class="add-form-item form-item-disabled">
+                  <div class="addButton" style="padding-left: 10px">
+                    <el-button size="small" type="primary" :disabled="!form.cid || disabledXX" @click="addfjList">选择文本</el-button>
+                  </div>
+                  <el-input :disabled="disabledXX"
+                            v-model="form.fjListId"
+                            style="display: none;"
+                  ></el-input>
+                  <div style="">
+                    <div class="fileClass" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                      <span @click="fileLook(item)" >{{ item.fileName }}</span>
+                      <el-button :disabled="disabledXX"
+                                 size="small"
+                                 @click="filesUpload(item)"
+                                 icon="el-icon-download"
+                                 style="height: 32px; margin-left: 5px;"
+                      ></el-button>
+                    </div>
+                  </div>
                 </el-form-item>
                 <el-form-item label="相关文件" prop="modelNameList" class="add-form-item form-item-disabled">
                   <el-input :disabled="disabledXX"
@@ -70,35 +93,12 @@
                     </el-button>
                   </div>
                 </el-form-item>
-                <el-form-item label="文本状态" prop="textType" class="add-form-item form-item-disabled">
+                <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
-                  <el-select :disabled="!form.cid || disabledXX" v-model="form.textType" placeholder="请选择">
+                  <el-date-picker :disabled="disabledXX"
-                    <el-option
+                                  v-model="form.endTime"
-                            v-for="(item, index) in textTypeList"
+                                  type="date"
-                            :key="index"
+                                  placeholder="请选择结束日期">
-                            :label="item.label"
+                  </el-date-picker>
-                            :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="标准文本" prop="fjListId" class="add-form-item form-item-disabled">
-                  <div class="addButton" style="padding-left: 10px">
-                    <el-button size="small" type="primary" :disabled="!form.cid || disabledXX" @click="addfjList">选择文本</el-button>
-                  </div>
-                  <el-input :disabled="disabledXX"
-                    v-model="form.fjListId"
-                    style="display: none;"
-                  ></el-input>
-                  <div style="">
-                    <div class="fileClass" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
-                      <span @click="fileLook(item)" >{{ item.fileName }}</span>
-                      <el-button :disabled="disabledXX"
-                              size="small"
-                              @click="filesUpload(item)"
-                              icon="el-icon-download"
-                              style="height: 32px; margin-left: 5px;"
-                      ></el-button>
-                    </div>
-                  </div>
                 </el-form-item>
               </el-col>
             </el-row>

src/pages/processCenter/pages/phone/bzzqyj/step6.vue

@@ -437,8 +437,19 @@
                 this.form.endTime = data.endTime || data.form.endTime;
                 this.form.textType = data.textType || data.form.textType
                 this.form.modelList = data.modelList || data.form.modelList
-                this.form.user7 = data.form ? data.form.user7 : (data.user7 ? data.user7 :  '')
+                  if(data.form){
-                this.form.user7Name = data.form ? data.form.user7Name : (data.user7Name ? data.user7Name :  '')
+                      let user7Id = data.form.user7
+                      if(user7Id){
+                          this.form.user7 =user7Id
+                          this.form.user7Name =data.form.user7Name
+                      }else{
+                          this.form.user7 = data.user7 ? data.user7 :  data.spId
+                          this.form.user7Name = data.user7Name ? data.user7Name :  data.spName
+                      }
+                  }else{
+                      this.form.user7 = data.user7 ? data.user7 :  data.spId
+                      this.form.user7Name = data.user7Name ? data.user7Name :  data.spName
+                  }
                 let newArr = data.info ? data.info : data.form.data
                 this.oldData = JSON.parse(JSON.stringify(newArr))
                 let arr = []

src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue

@@ -76,81 +76,8 @@ export default {
       if (fileSuffix === '.PNG' || fileSuffix === '.JPG' || fileSuffix === '.JPEG') {
         this.downloadFile(attId)
         return true
-      }
+      }else{
-
+        this.$preview(attId)
-      // 缺少文件
-      if (fileSuffix === '.PDG' || fileSuffix === '.pdg') {
-        this.getBusStandFileByAttId(attId)
-            .then(res => {
-              if (res) {
-                const editFileInfo = res
-                console.log(editFileInfo)
-                if (editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG') {
-                  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/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-              }
-              // switch (res.convertState) {
-              //   case 'ERROR':
-              //     this.$message.warning('文档转换失败')
-              //     break
-              //   case 'LODING':
-              //     this.$message.info('文档转换中，请稍后查看')
-              //     break
-              //   case 'SUCCESS':
-              //     const { convertFileInfo } = res
-              //     window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + convertFileInfo.id))
-              //     break
-              // }
-            }).catch(e => {
-          console.log(e)
-          this.$message.warning('文件不存在,预览失败')
-        })
-      } else {
-        this.$http.get('lawss/sarStandFile/queryConvertAtt', {
-          attId: attId
-        }, {
-          _this: this
-        }, res => {
-
-          console.log("res.data", res.data);
-          if (res.data) {
-            let fileObj = {}
-            fileObj.fileId = res.data.attId
-            fileObj.fileName = oldFileName
-            let fileList = []
-            let repeatData = 0
-            if (sessionStorage.getItem('fileInfo')) {
-              fileList = JSON.parse(sessionStorage.getItem('fileInfo'))
-              if (fileList != null && fileList.length > 0) {
-                for (let i = 0; i < fileList.length; i++) {
-                  if (fileList[i].fileId === res.data.attId) {
-                    repeatData = 1
-                    break
-                  }
-                }
-                if (repeatData === 0) {
-                  fileList.push(fileObj)
-                  fileList = JSON.stringify(fileList)
-                  sessionStorage.setItem('fileInfo', fileList)
-                }
-              }
-            } else {
-              fileList.push(fileObj)
-              fileList = JSON.stringify(fileList)
-              sessionStorage.setItem('fileInfo', fileList)
-            }
-            window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + res.data.attId))
-          } else {
-            this.$message.error('文档未转换成功或本地读取不到该文档')
-          }
-        }, e => {
-          this.$message.error('文档未转换成功或本地读取不到该文档')
-        })
       }
     },
     back() {