diff --git a/src/pages/details/otherStandardDetails/components/ResolveTable.vue b/src/pages/details/otherStandardDetails/components/ResolveTable.vue
new file mode 100644
index 000000000..cd6c49b41
--- /dev/null
+++ b/src/pages/details/otherStandardDetails/components/ResolveTable.vue
@@ -0,0 +1,390 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}
+
+
+
+
+
+
+
数据加载中...
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
diff --git a/src/pages/phone/domesticDetails.vue b/src/pages/phone/domesticDetails.vue
index 32bdeecc4..aa56b0568 100644
--- a/src/pages/phone/domesticDetails.vue
+++ b/src/pages/phone/domesticDetails.vue
@@ -2803,17 +2803,17 @@
const nowTime = new Date().getTime()
this.loadingText = true
if (editFileInfo.fileSuffix.toLowerCase() === 'pdf') {
- if (/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {
- //alert(navigator.userAgent);
- this.getFileInfo(editFileInfo.id)
- } else if (/(Android)/i.test(navigator.userAgent)) {
- //alert(navigator.userAgent);
+ // if (/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {
+ // //alert(navigator.userAgent);
+ // this.getFileInfo(editFileInfo.id)
+ // } else if (/(Android)/i.test(navigator.userAgent)) {
+ // //alert(navigator.userAgent);
+ // this.loadingText = false
+ // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
+ // } else {
this.loadingText = false
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
- } else {
- this.loadingText = false
- window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
- }
+ // }
// window.open('/#/phonePDF?fileId='+editFileInfo.id)
} else {
const nowTime = new Date().getTime()
diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue
index 89d232ba1..281de6f8c 100644
--- a/src/pages/processCenter/pages/components/ProcessMixin.vue
+++ b/src/pages/processCenter/pages/components/ProcessMixin.vue
@@ -141,8 +141,12 @@ export default {
* @date: 2020-11-25 15:47:12
* @auth: chenxiaoxi
*/
- getPrcName(prcType) {
+ getPrcName(prcType, taskInfo) {
let prcName = "";
+ if(prcType === '25' && taskInfo === '技术标准起草'){
+ prcName = '企标制修订-技术标准'
+ return prcName
+ }
this.processTypeList.map(item => {
if (item.value === prcType) {
prcName = item.label;
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
index 11352d498..aed3af715 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
@@ -134,7 +134,7 @@
-
+
-
+
-
+
@@ -1132,4 +1132,7 @@ export default {
/deep/ .fileClass{
line-height: 22px !important;
}
+ .uploadBtnFormItem /deep/ .el-form-item__error{
+ right: 45px !important;
+ }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
index 869892d72..df9345e42 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
@@ -1191,7 +1191,7 @@
_this: this
}, res => {
const obj = res.data
- let standSn = obj.newStandSn + 1
+ let standSn = (obj.newStandSn / 1) + 1
this.form.standSn = standSn
this.form.standNumber = standSn
this.form.standNum = standSn
@@ -2992,7 +2992,7 @@
_this: this
}, res => {
const obj = res.data
- let standSn = obj.newStandSn + 1
+ let standSn = (obj.newStandSn / 1) + 1
this.form.standSn = standSn
this.form.standNumber = standSn
this.form.standNum = standSn
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
index 955da075b..e85771ce7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
@@ -893,6 +893,7 @@
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
+ import { processEditFile } from 'api/process'
import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
import {getEvaluationIndex} from "api/businessApi";
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
@@ -1443,10 +1444,10 @@
emitDataLoading(boo){
this.dataLoading = boo
},
- previewShow(attId) {
+ previewShow(attId, label) {
this.iframeLoading = true
return new Promise((resolve, reject) => {
- if(attId.indexOf('ATT_FILE') === 0){
+ if(attId.indexOf('ATT_FILE') === 0){
getBusStandFileByAttId({
attId
}).then(res => {
@@ -1469,28 +1470,52 @@
}).catch(e => {
})
}else{
- axios({
- url: 'api/lawss/activiti/selectOnlineFile',
- method: 'get',
- params: attId
- }).then(res=>{
- if(res){
- const history = res;
- const editFileInfo = res.data
- if(editFileInfo.fileSuffix.toLowerCase() === 'pdg'){
- this.iframeUrl = 'book://ssreader/e0?url='+editFileInfo.downLoadUrl
- }else if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){
- this.iframeUrl = './static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)
- }else {
- const nowTime = new Date().getTime()
- // 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)
- this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))+'&office.preview.type=pdf';
- }
- this.iframeLoading = false
- this.$forceUpdate()
- resolve(history)
- }
- }).catch(e=>{})
+ processEditFile({
+ id:attId
+ }).then(res => {
+ if(res){
+ const editFileInfo = res
+ const showName = label
+ const editFilePath = editFileInfo.editFilePath.split("/")
+ editFileInfo.filePath = editFilePath[0]+'/'+editFilePath[1]+'/'
+ editFileInfo.fileName = editFilePath[2]
+ if(editFileInfo.pid){
+ editFileInfo.pId = editFileInfo.pid
+ }
+ editFileInfo.fileSuffix = 'docx'
+ const nowTime = new Date().getTime()
+ this.iframeUrl = onlyOfficeUrl+'/onlyOffice?oldFileName=' + showName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName
+ this.iframeLoading = false
+ resolve(res)
+ }
+ }).catch(e => {
+ })
+ // return
+ // axios({
+ // url: 'api/lawss/activiti/selectOnlineFile',
+ // method: 'get',
+ // params: attId
+ // }).then(res=>{
+ // if(res){
+ // const history = res;
+ // const editFileInfo = res.data
+ // if(editFileInfo.fileSuffix.toLowerCase() === 'pdg'){
+ // this.iframeUrl = 'book://ssreader/e0?url='+editFileInfo.downLoadUrl
+ // }else if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){
+ // this.iframeUrl = './static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)
+ // }else {
+ // const nowTime = new Date().getTime()
+ // // 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)
+ // this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))+'&office.preview.type=pdf';
+ // // 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
+ // }
+ // this.iframeLoading = false
+ // this.$forceUpdate()
+ // resolve(history)
+ // }
+ // }).catch(e=>{
+ // console.log(e);
+ // })
}
})
@@ -1498,7 +1523,7 @@
previewIframe(targetName, action){
let attId = targetName.name
this.iframeUrl = ""
- this.previewShow(attId)
+ this.previewShow(attId, targetName.label)
},
showDrawerClose () {
this.showForm.modelNum = ""
@@ -1696,7 +1721,7 @@
// }
if(this.FBGBUSSFileList.length > 0){
this.editableTabsValue = this.FBGBUSSFileList[0].id
- this.previewShow(this.FBGBUSSFileList[0].id)
+ this.previewShow(this.FBGBUSSFileList[0].id, this.FBGBUSSFileList[0].name)
}
this.showDrawer = true
this.showDrawerTitle = "新增征求意见"
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index acf5c66d5..aa9994893 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -87,7 +87,7 @@
width="180"
>
- {{ getPrcName(scope.row.prcType) }}
+ {{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}
{
if (res.ok) {
- if (res.data === '操作成功') {
+ if (res.message === '操作成功') {
this.$message.success(tips + '成功')
this.getData()
if(this.DrawerType === 'add'){