From 93f9c65625a98241368d31b000f6c9bb9615a672 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Mon, 23 Aug 2021 15:40:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85,?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0ocr=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../details/otherStandardDetails/index.vue | 49 +++++++++++--------
1 file changed, 28 insertions(+), 21 deletions(-)
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 3fc0d6699..139d7920a 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -287,6 +287,8 @@
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/>
+
+ OCR
上传时间：{{ dateFormat(file.modifyTime) }}
@@ -306,12 +308,12 @@
上传时间：{{ dateFormat(file.modifyTime) }}
-
-
-
-
-
-
+
+
+
+
+
+
@@ -383,6 +385,11 @@
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/>
+
+
+ OCR
+
+
上传时间：{{ dateFormat(file.modifyTime) }}
@@ -1513,6 +1520,14 @@ export default {
props: {},
watch: {},
methods: {
+ judgeSuffix(fileName){
+ if ('pdf'===fileName.substring(fileName.lastIndexOf('.') + 1)){
+ return true;
+ }else return false;
+ },
+ ocrFunction(file){
+ return "ocr"
+ },
FormatDate(date) {
return moment(date).format('YYYY-MM-DD');
},
@@ -2089,16 +2104,11 @@ export default {
},
// 分页点击后方法
pageChange(page) {
- console.log("page");
- console.log(page);
-
this.standItemSearch.page = page
this.selectSarStandItems()
},
// 分页每页显示数改变后方法
pageSizeChange(pageSize) {
- console.log("pageSize");
- console.log(pageSize);
// this.standItemSearch.pageSize = this.$store.getters.userInfo.configContent
this.standItemSearch.pageSize = pageSize;
this.selectSarStandItems()
@@ -2124,7 +2134,7 @@ export default {
if (this.sarStandardsInfoEO.replaceStandNum != null && this.sarStandardsInfoEO.replaceStandNum !== '') {
this.replaceNumList = this.sarStandardsInfoEO.replaceStandNum.split(',')
}
- // eslint-disable-next-line no-mixed-operators
+ // // eslint-disable-next-line no-mixed-operators
Object.keys((this.sarStandardsInfoEO && this.sarStandardsInfoEO.attrInfoMap) || {}).forEach((key) => {
if (this.sarStandardsInfoEO.attrInfoMap[key]) {
this.sarStandardsInfoEO[key] = this.sarStandardsInfoEO.attrInfoMap[key]
@@ -2502,9 +2512,7 @@ export default {
},
// 分解单-查看
handlePreview(item) {
- console.log(item);
this.standShowItemEO = item
- console.log(this.standShowItemEO);
this.showItemInfoModal = true
let fileList = []
item.defaultFileList = []
@@ -2608,8 +2616,6 @@ export default {
// const { data: { STAND: data } } = res
const {data = {}} = res
this.formFieldListData = data[this.$route.params.pageType]
- console.log('this.formFieldListData')
- console.log(this.formFieldListData);
// this.resolveFormFieldList()
resolve(data[this.$route.params.pageType])
} else {
@@ -2836,14 +2842,14 @@ export default {
this.setMap(res.data.SARPROPERTY) // 标准性质
}, e => {
})
- Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then((values) => {
+ Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then ((values) => {
const [displayLocation, standEO, formFieldList] = values
const dynamicFormField = standEO ? standEO.attrInfoMap : {}
formFieldList.forEach((field) => {
// 相关流程权限
- // if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
- // return
- // }
+ if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
+ return
+ }
displayLocation.forEach((location) => {
location.isShowImp = '0'
if (dynamicFormField) {
@@ -2893,6 +2899,8 @@ export default {
location.half = half
location.showAll = false
})
+ console.log(standEO);
+
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', {
id: this.$route.params.id
}, {
@@ -2911,7 +2919,6 @@ export default {
}
})
this.dynamicFormField = displayLocation
- console.log(this.dynamicFormField)
})
sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
this.loading = false
From da4f7a545c98ace217d348b278446760a7a24660 Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Mon, 23 Aug 2021 15:51:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E5=BA=93=E8=B0=83=E5=8F=96=E6=95=B0=E6=8D=AEbug=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9~~?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/details.vue | 153 ++++++------------
1 file changed, 45 insertions(+), 108 deletions(-)
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 10b8a91f7..04b1c3912 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -699,115 +699,52 @@ export default {
cancelStand() {
this.standModel = false;
},
- //如果张宇欢改好了就把这个放开，然后把底下那个注释了
- // okStand() {
- // let _this = this;
- // if (this.standList.length < 1) {
- // _this.$message.warning("请选择标准");
- // } else {
- // for (let i = 0; i < this.dataList.length; i++) {
- // let newStand = false;
- // for (let j = 0; j < this.standList.length; j++) {
- // if (this.standList[j].id == this.dataList[i].standId) {
- // newStand = true;
- // this.standList.splice(j, 1)
- // j--
- // }
- // }
- // if (newStand) {
- // _this.$message.warning("请勿重复添加数据");
- // } else {
- // // _this.dataList.push(item);
- // }
- // }
- // this.standardData = []
- // _this.standModel = false;
- // for (var i = 0; i < this.standList.length; i++) {
- // this.standList1.push({
- // standId: this.standList[i].id,
- // projectId: this.localProEO.id
- // })
- // }
- // if (this.standList1 != '') {
- // this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
- // _this: this
- // }, res => {
- // if (res.ok) {
- // // this.$message.success(res.message)
- // this.getDataList()
- // }
- // }, e => {
- // });
- // }
- // this.standList = []
- // this.standList1 = []
- // _this.standModel = false;
- // }
- // },
- //添加标准确定事件
- okStand(){
- if(this.standList.length > 0){
- this.standList.forEach(item => {
- let addIndex
- addIndex = this.dataList.findIndex(items => {
- return items.standId === item.id
- })
- if(addIndex > -1){
- this.$message.warning('请勿重复添加数据')
- }else{
- this.dataList.push(item)
- }
- })
- this.detailedListModel = false
- this.standModel = false
- }else{
- this.$message.warning('请至少选择一条数据进行添加')
- }
+
+ okStand() {
+ let _this = this;
+ if (this.standList.length < 1) {
+ _this.$message.warning("请选择标准");
+ } else {
+ for (let i = 0; i < this.dataList.length; i++) {
+ let newStand = false;
+ for (let j = 0; j < this.standList.length; j++) {
+ if (this.standList[j].id == this.dataList[i].standId) {
+ newStand = true;
+ this.standList.splice(j, 1)
+ j--
+ }
+ }
+ if (newStand) {
+ _this.$message.warning("请勿重复添加数据");
+ } else {
+ // _this.dataList.push(item);
+ }
+ }
+ this.standardData = []
+ _this.standModel = false;
+ for (var i = 0; i < this.standList.length; i++) {
+ this.standList1.push({
+ standId: this.standList[i].id,
+ projectId: this.localProEO.id
+ })
+ }
+ if (this.standList1 != '') {
+ this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
+ _this: this
+ }, res => {
+ if (res.ok) {
+ // this.$message.success(res.message)
+ this.getDataList()
+ }
+ }, e => {
+ });
+ }
+ this.standList = []
+ this.standList1 = []
+ _this.detailedListModel = false;
+ _this.standModel = false;
+ }
},
- // okStand() {
- // let _this = this;
- // if (this.standList.length < 1) {
- // _this.$message.warning("请选择标准");
- // } else {
- // for (let i = 0; i < this.dataList.length; i++) {
- // let newStand = false;
- // for (let j = 0; j < this.standList.length; j++) {
- // if (this.standList[j].id == this.dataList[i].standId) {
- // newStand = true;
- // this.standList.splice(j, 1)
- // j--
- // }
- // }
- // if (newStand) {
- // _this.$message.warning("请勿重复添加数据");
- // } else {
- // // _this.dataList.push(item);
- // }
- // }
- // this.standardData = []
- // _this.standModel = false;
- // for (var i = 0; i < this.standList.length; i++) {
- // this.standList1.push({
- // standId: this.standList[i].id,
- // projectId: this.localProEO.id
- // })
- // }
- // if (this.standList1 != '') {
- // this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
- // _this: this
- // }, res => {
- // if (res.ok) {
- // // this.$message.success(res.message)
- // this.getDataList()
- // }
- // }, e => {
- // });
- // }
- // this.standList = []
- // this.standList1 = []
- // _this.standModel = false;
- // }
- // },
//获取标准
getStandrd(data){
this.detailedId = data.id