From d480830a26ac93ae5012d84faa32950419b2f826 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Sun, 3 Apr 2022 22:12:39 +0800
Subject: [PATCH] feat: There is no way the, bug #52270
---
package-lock.json | 199 ++++++++++--------
.../InputForStandardsForLaws.vue | 29 ++-
.../pages/creatProcess/zcrk/step1.vue | 56 ++---
.../pages/creatProcess/zcrk/step3.vue | 63 +++---
vue.config.js | 5 +-
5 files changed, 180 insertions(+), 172 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index d3ff2e343..3e0b16665 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2665,7 +2665,7 @@
},
"@popperjs/core": {
"version": "2.11.0",
- "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.0.tgz",
+ "resolved": "https://registry.npmmirror.com/@popperjs/core/download/@popperjs/core-2.11.0.tgz",
"integrity": "sha512-zrsUxjLOKAzdewIDRWy9nsV1GQsKBCWaGwsZQlCgr6/q+vjyZhFgqedLfFBuI9anTPEUT4APq9Mu0SZBTzIcGQ=="
},
"@probe.gl/stats": {
@@ -3613,6 +3613,23 @@
"upath": "^1.1.1"
}
},
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
+ "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.nlark.com/color-name/download/color-name-1.1.4.tgz",
+ "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
+ "dev": true,
+ "optional": true
+ },
"commander": {
"version": "2.20.3",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -4558,6 +4575,94 @@
}
}
},
+ "vue-loader-v16": {
+ "version": "npm:vue-loader@16.8.3",
+ "resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.3.tgz",
+ "integrity": "sha1-1D5nXe9bqTRdbH8FkUwT2GGZcIc=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "chalk": "^4.1.0",
+ "hash-sum": "^2.0.0",
+ "loader-utils": "^2.0.0"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995651629&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
+ "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-convert": "^2.0.1"
+ }
+ },
+ "big.js": {
+ "version": "5.2.2",
+ "resolved": "https://registry.nlark.com/big.js/download/big.js-5.2.2.tgz",
+ "integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg=",
+ "dev": true,
+ "optional": true
+ },
+ "chalk": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmmirror.com/chalk/download/chalk-4.1.2.tgz",
+ "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "emojis-list": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz",
+ "integrity": "sha1-VXBmIEatKeLpFucariYKvf9Pang=",
+ "dev": true,
+ "optional": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
+ "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
+ "dev": true,
+ "optional": true
+ },
+ "json5": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npm.taobao.org/json5/download/json5-2.2.0.tgz",
+ "integrity": "sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "minimist": "^1.2.5"
+ }
+ },
+ "loader-utils": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmmirror.com/loader-utils/download/loader-utils-2.0.2.tgz?cache=0&sync_timestamp=1636687952028&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-2.0.2.tgz",
+ "integrity": "sha1-1uO0+4GHByGuTghoqxHdY4NowSk=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^2.1.2"
+ }
+ },
+ "supports-color": {
+ "version": "7.2.0",
+ "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1626703400240&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
+ "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ }
+ }
+ },
"vue-style-loader": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
@@ -10425,7 +10530,7 @@
"native-request": {
"version": "1.0.8",
"resolved": "https://registry.nlark.com/native-request/download/native-request-1.0.8.tgz",
- "integrity": "sha1-j2a/YG4PfqJ8DlmV6y9dA+M65vs=",
+ "integrity": "sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag==",
"dev": true,
"optional": true
},
@@ -13544,97 +13649,9 @@
},
"vue-lazyload": {
"version": "1.2.3",
- "resolved": "https://registry.nlark.com/vue-lazyload/download/vue-lazyload-1.2.3.tgz",
+ "resolved": "https://registry.npm.taobao.org/vue-lazyload/download/vue-lazyload-1.2.3.tgz?cache=0&sync_timestamp=1613791460988&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-lazyload%2Fdownload%2Fvue-lazyload-1.2.3.tgz",
"integrity": "sha1-kB+ewVx+bKeHgaK65KNDaGve2yw="
},
- "vue-loader-v16": {
- "version": "npm:vue-loader@16.8.3",
- "resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.3.tgz?cache=0&sync_timestamp=1636034706501&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.8.3.tgz",
- "integrity": "sha1-1D5nXe9bqTRdbH8FkUwT2GGZcIc=",
- "dev": true,
- "optional": true,
- "requires": {
- "chalk": "^4.1.0",
- "hash-sum": "^2.0.0",
- "loader-utils": "^2.0.0"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz",
- "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
- "dev": true,
- "optional": true,
- "requires": {
- "color-convert": "^2.0.1"
- }
- },
- "chalk": {
- "version": "4.1.2",
- "resolved": "https://registry.npmmirror.com/chalk/download/chalk-4.1.2.tgz",
- "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
- "dev": true,
- "optional": true,
- "requires": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- }
- },
- "color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
- "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
- "dev": true,
- "optional": true,
- "requires": {
- "color-name": "~1.1.4"
- }
- },
- "color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.nlark.com/color-name/download/color-name-1.1.4.tgz",
- "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
- "dev": true,
- "optional": true
- },
- "has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz",
- "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
- "dev": true,
- "optional": true
- },
- "hash-sum": {
- "version": "2.0.0",
- "resolved": "https://registry.nlark.com/hash-sum/download/hash-sum-2.0.0.tgz",
- "integrity": "sha1-gdAbtd6OpKIUrV1urRtSNGCwtFo=",
- "dev": true,
- "optional": true
- },
- "loader-utils": {
- "version": "2.0.2",
- "resolved": "https://registry.npmmirror.com/loader-utils/download/loader-utils-2.0.2.tgz?cache=0&sync_timestamp=1636687947060&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-2.0.2.tgz",
- "integrity": "sha1-1uO0+4GHByGuTghoqxHdY4NowSk=",
- "dev": true,
- "optional": true,
- "requires": {
- "big.js": "^5.2.2",
- "emojis-list": "^3.0.0",
- "json5": "^2.1.2"
- }
- },
- "supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmmirror.com/supports-color/download/supports-color-7.2.0.tgz",
- "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
- "dev": true,
- "optional": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
- }
- }
- },
"vue-router": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.0.tgz",
diff --git a/src/components/CustomFormComponents/InputForStandardsForLaws.vue b/src/components/CustomFormComponents/InputForStandardsForLaws.vue
index 312eb75b1..e29b58902 100644
--- a/src/components/CustomFormComponents/InputForStandardsForLaws.vue
+++ b/src/components/CustomFormComponents/InputForStandardsForLaws.vue
@@ -61,21 +61,20 @@
:maxlength="100">
-
-
-
-
-
+
+ 查询
+
+
+
+ 清空
+
diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
index 4b919a23e..c1ba9ddd4 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
@@ -441,13 +441,13 @@
placeholder="请输入代替标准号"
clearable
>
-
-
-
-
-
-
-
+ {{'手动查找'}}
@@ -639,20 +640,19 @@
+ 查询
+ size="small"
+ @click="getResetLawsNumRow">清空
+
@@ -693,7 +693,7 @@
label="文本状态"
width="130">
- {{ textStatusMap[scope.row.textStatus] }}
+ {{ scope.row.standStatusShow }}
@@ -1890,8 +1890,8 @@
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
- }else if(this.replaceLawType === 'bfbdtbzh'){
- this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
+ }else if(this.replaceLawType === 'DTWJHLAWS'){
+ this.form.DTWJHLAWS = this.form.DTWJHLAWS ? this.form.DTWJHLAWS + ',' +textArr.join(',') : textArr.join(',')
}else {
this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
}
@@ -2020,7 +2020,12 @@
},
// 文件预览及下载
handleFilePreview(file) {
- const attId = file.response.data.id
+ let attId = ""
+ if(file && file.id){
+ attId = file.id
+ }else {
+ attId = file.response.data.id
+ }
if (this.preview) {
if (attId) {
window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
@@ -2028,22 +2033,7 @@
this.$message.warning('文件不存在,下载失败')
}
} else {
- this.getBusStandFileByAttId(attId)
- .then(res => {
- if(res){
- const editFileInfo = res
- if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
- window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
- }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)
-
- }
- }
- }).catch(e => {
- console.log(e)
- this.$message.warning('文件不存在,预览失败')
- })
+ this.$preview(attId)
}
},
fileUpload (type) {
diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue
index f1025eb5b..1e40e7093 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue
@@ -439,13 +439,13 @@
placeholder="请输入代替标准号"
clearable
>
-
-
-
-
-
-
-
+ {{'手动查找'}}
+ {{'手动查找'}}
@@ -463,12 +470,12 @@
-
-
+
+
+
+
+
+
@@ -476,7 +483,7 @@
-
+
+ 查询
+ size="small"
+ @click="getResetLawsNumRow">清空
+
@@ -1991,26 +1997,21 @@
})
}
this.selectedListRep.map((item) => {
- let texts = ''
- if (item.standYear != null && item.standYear !== '') {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
- } else {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
- }
+ let texts = item.lawsNumber
textArr.push(texts)
textArr = [...new Set(textArr)]
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
- // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
- if(this.replaceLawType === 'dtbjh'){
- this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
+ // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
+ if(this.replaceLawType === 'YYBZZCLAWS'){
+ this.form.YYBZZCLAWS = this.form.YYBZZCLAWS ? this.form.YYBZZCLAWS + ',' + textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'yybj'){
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
- }else if(this.replaceLawType === 'bfbdtbzh'){
- this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
+ }else if(this.replaceLawType === 'DTWJHLAWS'){
+ this.form.DTWJHLAWS = this.form.DTWJHLAWS ? this.form.DTWJHLAWS + ',' +textArr.join(',') : textArr.join(',')
}else {
this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
}
diff --git a/vue.config.js b/vue.config.js
index dcab907a6..d5c7bc7bd 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -76,7 +76,8 @@ module.exports = {
}
},
devServer: {
- port: 9999,
+ port: 9090,
+ disableHostCheck: true,
proxy: {
'/api': {
target: interfaceUrl,
@@ -86,7 +87,7 @@ module.exports = {
}
},
'/onlyOffice': {
- target: 'http://10.96.10.171',
+ target: 'http://127.0.0.1',
changeOrigin: true,
pathRewrite: {
'^/onlyOffice': '/api'