合并分支 'master' 到 'test_20230215'

Master

查看合并请求 laws-foton-slrs/foton-laws-system-front!23

src/common/onlineEdit/index.js

@@ -4,7 +4,7 @@
 import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
 import { processEditFile } from 'api/process'
 let Base64 = require('js-base64').Base64;
-export default (id,nodeName,userId,userName) => {
+export default (id,nodeName,userId,userName,query) => {
     processEditFile({
         id
     }).then(res => {
@@ -20,7 +20,33 @@ export default (id,nodeName,userId,userName) => {
                 editFileInfo.pId = editFileInfo.pid
             }
             const nowTime = new Date().getTime()
-            window.open(onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id +'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName)
+            if (query){
+                if (!query.standEnName || query.standEnName == 'null'){
+                    query.standEnName = ''
+                }
+                if (!query.DTQBBHBUSS || query.DTQBBHBUSS == 'null'){
+                    query.DTQBBHBUSS = ''
+                }
+                if (!query.standName || query.standName == 'null'){
+                    query.standName = ''
+                }
+                if (!query.issueTime || query.issueTime == 'null'){
+                    query.issueTime = ''
+                }
+                if (!query.putTime || query.putTime == 'null'){
+                    query.putTime = ''
+                }
+                window.open(onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+
+                    '&taskIds='+editFileInfo.taskId+'&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+'&standName='+query.standName+
+                    '&standEnName='+query.standEnName+'&standCode='+query.standCode+'&putTime='+query.putTime+
+                    '&issueTime='+query.issueTime+'&dtqbbhbuss='+query.DTQBBHBUSS+'&isEdit=123')
+            }else{
+                window.open(onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id +'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName)
+
+            }
         }
     }).catch(e => {
     })

src/common/onlineEditPreview/index.js

@@ -4,7 +4,7 @@
 import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
 import { processEditFile } from 'api/process'
 let Base64 = require('js-base64').Base64;
-export default (id,nodeName,userId,userName) => {
+export default (id,nodeName,userId,userName,query) => {
     processEditFile({
         id
     }).then(res => {

src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue

@@ -131,10 +131,38 @@
                   clearable
           ></el-input>
           <div style="display: flex;justify-content: space-between;margin-left: 12px;">
-            <div style="width: 80%;margin-top: 13px">
+            <div style="width: 80%;margin-top: 13px" v-if="isTrue">
-              <div v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;" class="fileClass">
+              <div v-for="(item,index) in FBGBUSSFileList" :key="index"
-                <span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name  }}</span>
+                   style="color: #409eff;cursor:pointer"
-                <span style="margin-left: 7px;" v-if="item.id !== ''">
+                   class="fileClass fileClassName">
+                                                <span style="width: 80%;"
+                                                      v-if="index == 0"
+                                                      @click="handleFilePreviewOne(item,'preview')">
+                                                    {{ item.name }}
+                                                </span>
+                <span v-else @click="handleFilePreview(item,'preview')">
+                                                    {{ item.name }}
+                                                </span>
+                <span style="width: 20%;margin-left: 15px;"
+                      v-if="item.id !== '' && index == 0">
+                                                <el-button type="primary" size="mini"
+                                                           plain icon="el-icon-edit"
+                                                           @click="handleFilePreviewOne(item,'onlineEdit')"></el-button>
+                                                </span>
+                <span style="margin-left: 7px;" v-if="item.id !== '' && index != 0">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
+                </span>
+              </div>
+            </div>
+            <div style="width: 80%;margin-top: 13px" v-if="!isTrue">
+              <div v-for="(item,index) in FBGBUSSFileList" :key="index"
+                   style="color: #409eff;cursor:pointer;"
+                   class="fileClass">
+                <span style="" @click="handleFilePreview(item,'preview')"
+                      :title="item.name">
+                  {{ item.name  }}
+                </span>
+                <span style="margin-left: 7px;" v-if="item.id !== '' && item.name != form.standName">
                     <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                 </span>
               </div>
@@ -702,6 +730,10 @@ export default {
       type: Boolean,
       default: false
     },
+    isTrue: {
+      type: Boolean,
+      default: false
+    },
   },
   filters: {
     ellipsis (value) {
@@ -905,6 +937,22 @@ export default {
         attId = file.id
       }else {
         attId = file.response.data.id
+      }
+      if (file.name == this.form.standName) {
+        let fileName = ""
+        let fileNam2 = ""
+        if (this.form.standName && this.form.standName !== '') {
+          fileName = this.form.standName + '-企业标准.docx'
+          fileNam2 = this.form.standName
+        } else {
+          fileName = '企业标准.docx'
+          fileNam2 = '企业标准'
+        }
+        let form = JSON.parse(JSON.stringify(this.form))
+        form.standCode = ''
+        form.issueDate = ''
+        this.$onlineEditPreview(file.id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, form)
+        return
       }
         if (type === 'down') {
             if (attId) {
@@ -916,6 +964,31 @@ export default {
             this.$preview(attId)
         }
     },
+    handleFilePreviewOne(file, type) {
+      let id = ""
+      let fileName = ""
+      let fileNam2 = ""
+      if (this.form.standName && this.form.standName !== '') {
+        fileName = this.form.standName + '-企业标准.docx'
+        fileNam2 = this.form.standName
+      } else {
+        fileName = '企业标准.docx'
+        fileNam2 = '企业标准'
+      }
+      if (file && file.id) {
+        id = file.id
+      } else {
+        id = file.response.data.id
+      }
+      if (this.form.issueTime){
+        this.form.issueTime = this.form.issueTime.slice(0,10)
+      }
+      if (type === 'preview') {
+        this.$onlineEditPreview(id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, this.form)
+      } else {
+        this.$onlineEdit(id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, this.form)
+      }
+    },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
       window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
@@ -1010,6 +1083,20 @@ export default {
       },
       deep: true //对象的深度验证
     },
+    'form.standName': {
+      handler: function (val) {
+        console.log(val);
+        if (val && val !== '') {
+          if (this.FBGBUSSFileList.length > 0) {
+            this.FBGBUSSFileList[0].name = val
+          }
+        } else {
+          if (this.FBGBUSSFileList.length > 0) {
+            this.FBGBUSSFileList[0].name = '企业标准'
+          }
+        }
+      }
+    },
   }
 }
 </script>

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

@@ -21,6 +21,7 @@
                 <formEditList
                         :key = "formKey"
                         :formSub = "form"
+                        :isTrue="true"
                         :FBGBUSSFileListSub = "FBGBUSSFileList"
                         :LSBBBUSSFileListSub = "LSBBBUSSFileList"
                         :BZSMBUSSFileListSub = "BZSMBUSSFileList"

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

@@ -21,6 +21,7 @@
                 <formEditList
                     :key = "formKey"
                     :formSub = "form"
+                    :isTrue="true"
                     :FBGBUSSFileListSub = "FBGBUSSFileList"
                     :LSBBBUSSFileListSub = "LSBBBUSSFileList"
                     :BZSMBUSSFileListSub = "BZSMBUSSFileList"

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

@@ -20,6 +20,7 @@
             <div style="flex: auto;" v-show="active === '1'">
                 <formList
                         :form = "form"
+                        :isTrue="true"
                         :FBGBUSSFileList = "FBGBUSSFileList"
                         :LSBBBUSSFileList = "LSBBBUSSFileList"
                         :BZSMBUSSFileList = "BZSMBUSSFileList"

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

@@ -145,6 +145,7 @@
                 <formEditList
                         :key = "formKey"
                         :formSub = "form"
+                        :is-true="true"
                         :FBGBUSSFileListSub = "FBGBUSSFileList"
                         :LSBBBUSSFileListSub = "LSBBBUSSFileList"
                         :BZSMBUSSFileListSub = "BZSMBUSSFileList"

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

@@ -21,6 +21,7 @@
                 <formEditList
                         :key = "formKey"
                         :formSub = "form"
+                        :isTrue="true"
                         :FBGBUSSFileListSub = "FBGBUSSFileList"
                         :LSBBBUSSFileListSub = "LSBBBUSSFileList"
                         :BZSMBUSSFileListSub = "BZSMBUSSFileList"

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

@@ -150,6 +150,7 @@
                 <formEditList
                         :key = "formKey"
                         :formSub = "form"
+                        :is-true="true"
                         :FBGBUSSFileListSub = "FBGBUSSFileList"
                         :LSBBBUSSFileListSub = "LSBBBUSSFileList"
                         :BZSMBUSSFileListSub = "BZSMBUSSFileList"